Imported Debian patch 0.6.24+dfsg1-4~bpo80+1

ChangeLog

@@ -1,12 +1,6 @@
-**pnp-0.6.?? ??/??/2015**
+**pnp-0.6.?? ??/??/2013**
 
-**pnp-0.6.25 01/03/2015**
-  * Update:  FPDF Update to Version 1.7
-  * Bugfix:  Default source fixed by AWiddersheim
-  * Bugfix:  Fixed urlencoding of Host- and Servicenames by Andreas Doehler
-  * Bugfix:  Fixed Timeranges by AWiddersheim
-
-**pnp-0.6.24 07/30/2014**
+**pnp-0.6.24 07/30/2013**
   * Bugfix:  Fixed some more XSS issues
   * Bugfix:  Fixed PHP issue while running on PHP 5.6 ( Reported by Sven Nierlein )
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for pnp 0.6.25.
+# Generated by GNU Autoconf 2.61 for pnp 0.6.24.
 #
 # Report bugs to <pnp4nagios-devel@lists.sourceforge.net>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='pnp'
 PACKAGE_TARNAME='pnp'
-PACKAGE_VERSION='0.6.25'
-PACKAGE_STRING='pnp 0.6.25'
+PACKAGE_VERSION='0.6.24'
+PACKAGE_STRING='pnp 0.6.24'
 PACKAGE_BUGREPORT='pnp4nagios-devel@lists.sourceforge.net'
 
 ac_unique_file="src/"
@@ -1219,7 +1219,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pnp 0.6.25 to adapt to many kinds of systems.
+\`configure' configures pnp 0.6.24 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1284,7 +1284,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pnp 0.6.25:";;
+     short | recursive ) echo "Configuration of pnp 0.6.24:";;
    esac
   cat <<\_ACEOF
 
@@ -1380,7 +1380,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pnp configure 0.6.25
+pnp configure 0.6.24
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1394,7 +1394,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pnp $as_me 0.6.25, which was
+It was created by pnp $as_me 0.6.24, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1764,9 +1764,9 @@ _ACEOF
 
 
 PKG_NAME=pnp4nagios
-PKG_VERSION="0.6.25"
+PKG_VERSION="0.6.24"
 PKG_HOME_URL="http://www.pnp4nagios.org/pnp/start"
-PKG_REL_DATE="03-01-2015"
+PKG_REL_DATE="30-07-2014"
 
 
 
@@ -6330,7 +6330,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pnp $as_me 0.6.25, which was
+This file was extended by pnp $as_me 0.6.24, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6379,7 +6379,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-pnp config.status 0.6.25
+pnp config.status 0.6.24
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(pnp, 0.6.25, pnp4nagios-devel@lists.sourceforge.net)
+AC_INIT(pnp, 0.6.24, pnp4nagios-devel@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(src/)
 AC_CONFIG_HEADERS(include/config.h:include/config.h.in)
 AC_PREFIX_DEFAULT(/usr/local/pnp4nagios)
@@ -11,9 +11,9 @@ AC_DEFINE([DEFAULT_NAGIOS_USER], [nagios], [Default Nagios User])
 AC_DEFINE([DEFAULT_NAGIOS_GROUP], [nagios], [Default Nagios Group])
 
 PKG_NAME=pnp4nagios
-PKG_VERSION="0.6.25"
+PKG_VERSION="0.6.24"
 PKG_HOME_URL="http://www.pnp4nagios.org/pnp/start"
-PKG_REL_DATE="03-01-2015"
+PKG_REL_DATE="30-07-2014"
 AC_SUBST(PKG_NAME)
 AC_SUBST(PKG_VERSION)
 AC_SUBST(PKG_HOME_URL)

debian/README.Debian

@@ -0,0 +1,93 @@
+PNP4Nagios for Debian
+---------------------
+
+PNP4Nagios supports several modes of operation. They differ in the way how
+performance data is being processed and, thus, the efficiency of PNP. Detailed
+documentation is available at <http://docs.pnp4nagios.org/pnp-0.6/modes>.
+
+Using bulk mode for Nagios3
+---------------------------
+
+We recommend to use bulk mode with NPCD and npcdmod. This will facilitate an
+easy installation and fast processing of performance data. To enable NPCD, set
+'RUN' to 'yes' in /etc/default/npcd.
+
+In order to enable processing of performance data in Nagios, please change the
+"process_performance_data" statement in "/etc/nagios3/nagios.cfg" to
+"process_performance_data=1".
+
+To register the NPC event broker module (npcdmod), add the following line
+(without quotes) to "/etc/nagios3/nagios.cfg":
+
+"broker_module=/usr/lib/pnp4nagios/npcdmod.o config_file=/etc/pnp4nagios/npcd.cfg"
+
+Finally reload your Nagios server by running "service nagios3 reload". All
+performance data should be processed now.
+
+Using bulk mode for Icinga
+---------------------------
+
+We recommend to use bulk mode with NPCD and npcdmod. This will facilitate an
+easy installation and fast processing of performance data. To enable NPCD, set
+'RUN' to 'yes' in /etc/default/npcd.
+
+In order to enable processing of performance data in Icinga, please change the
+"process_performance_data" statement in "/etc/icinga/icinga.cfg" to
+"process_performance_data=1".
+
+To register the NPC event broker module (npcdmod), copy the file
+"/usr/share/doc/pnp4nagios-bin/examples/npcdmod.cfg" to
+"/etc/icinga/modules"
+
+Finally reload your Icinga server by running "service icinga reload". All
+performance data should be processed now.
+
+ -- Markus Frosch <lazyfrosch@debian.org>  Sun, 26 Oct 2014 15:49:10 +0100
+
+Add links for PNP4Nagios to Nagios / Icinga Webfrontend
+-------------------------------------------------------
+
+If you want links to PNP4Nagios for your monitored hosts and services in the
+Nagios web frontend just add
+
+- "action_url  /pnp4nagios/graph?host=$HOSTNAME$"
+  to your hosts or host template(s)
+
+- "action_url  /pnp4nagios/graph?host=$HOSTNAME$&srv=$SERVICEDESC$"
+  to your services or service template(s)
+
+For more information and different modes of operation, see
+<http://docs.pnp4nagios.org/pnp-0.6/config>.
+
+ -- Sven Velt <sven@velt.de>  Wed, 30 Sep 2009 13:55:35 +0000
+
+Using Gearman mode
+------------------
+
+Starting with version 0.6.12, PNP4Nagios may operate as a Gearman worker. This
+is useful in large, distributed setups using Nagios's mod_gearman. To use
+the PNP Gearman worker, you'll need a running mod_gearman environment. See
+<http://labs.consol.de/lang/en/nagios/mod-gearman/> for detailed setup
+instructions.
+
+In addition, the following configuration is required to get you started:
+
+- Enable processing of performance data in Nagios: set
+  'process_performance_data=1' in "/etc/nagios3/nagios.cfg" or
+  "/etc/icinga/icinga.cfg" and reload your monitoring system:
+  "service nagios3 reload" / "service icinga reload".
+
+- Enable the PNP Gearman worker daemon by setting 'RUN' to 'yes' in
+  /etc/default/pnp_gearman_worker. Check the Gearman related options in
+  "/etc/pnp4nagios/process_perfdata.cfg" (GEARMAN_HOST and encryption
+  settings) and start the Gearman worker: /etc/init.d/pnp_gearman_worker start
+
+- Enable distribution of performance data in mod_gearman by setting the
+  'perfdata=yes' option.
+
+When operating in Gearman mode, process_perfdata.pl requires the
+Gearman::Worker, MIME::Base64, and Crypt::Rijndael Perl modules. These are
+available in the libgearman-client-perl, perl, and libcrypt-rijndael-perl
+Debian packages (see packages suggested by pnp4nagios-bin).
+
+ -- Sebastian Harl <tokkee@debian.org>  Wed, 27 Apr 2011 09:32:52 +0200

debian/README.source

@@ -0,0 +1,4 @@
+This package uses quilt to manage all modifications to the upstream source.
+See /usr/share/doc/quilt/README.source for instructions how to generate the
+patched source, add a new modification, and remove an existing one.
+

debian/README.templates.d

@@ -0,0 +1,7 @@
+#
+# As of Debian version 0.6.16-1, the default config.php adds all directories
+# inside /etc/pnp4nagios/templates.d/ to the templates_dirs configuration.
+# This allows third-party packages to provide their own set of PNP4Nagios
+# templates and create a symlink to the template directory inside
+# /etc/pnp4nagios/templates.d.
+#

debian/TODO

@@ -0,0 +1,4 @@
+* Config split
+  - dependencies on -web
+  - apache
+  - testing testing testing

debian/changelog

@@ -0,0 +1,256 @@
+pnp4nagios (0.6.24+dfsg1-4~bpo80+1) jessie-backports; urgency=medium
+
+  * Backport to jessie-backports.
+  * Add myself to Uploaders.
+
+ -- Micah Anderson <micah@debian.org>  Tue, 08 Dec 2015 13:39:31 -0500
+
+pnp4nagios (0.6.24+dfsg1-4) unstable; urgency=medium
+
+  [ Peter Michael Green ]
+  * [d7b0b89] Fix FTBFS on arm64 due to outdated config.sub/guess
+    (Closes: #774047)
+
+  [ Markus Frosch ]
+  * [c672afa] Fix use of hardening flags with a patch
+
+ -- Markus Frosch <lazyfrosch@debian.org>  Wed, 01 Jul 2015 20:07:30 +0200
+
+pnp4nagios (0.6.24+dfsg1-3) unstable; urgency=medium
+
+  * [8021d79] Do JS minification with Python's jsmin (Closes: #769696)
+
+ -- Markus Frosch <lazyfrosch@debian.org>  Sat, 27 Dec 2014 22:37:09 +0100
+
+pnp4nagios (0.6.24+dfsg1-2) unstable; urgency=medium
+
+  * [36db791] Fix and clarify package descriptions
+
+ -- Markus Frosch <lazyfrosch@debian.org>  Mon, 27 Oct 2014 14:30:17 +0100
+
+pnp4nagios (0.6.24+dfsg1-1) unstable; urgency=medium
+
+  [ Sebastian Harl ]
+  * [48a705e9] Merged branch 'configsplit'.
+  * [bfcb36ca] README.Debian: Replaced c&p'ed Nagios with Icinga.
+  * [91a75610] README.Debian: Fixed typo (icingacfg → icinga.cfg).
+  * [9f1e4167] README.Debian: Improved typesetting a bit ;-)
+  * [a7f12f2d] README.Debian: Fixed typo (nagios → nagios3).
+    Also, made the document a bit more "DAU"-proof ;-)
+  * [009534c4] npcdmod.cfg: Fixed a few typos and improved wording.
+
+  [ Bernd Zeimetz ]
+  * [832a9632] Refreshing patches.
+
+  [ Markus Frosch ]
+  * [14693ff] Replace Sven Velt with Markus Frosch as secondary uploader
+              (Closes: #739098)
+  * [f2f01d4] Initial upstream branch
+  * [29d5377] Imported Upstream version 0.6.21
+  * [d4a4cdb] DFSG cleaned upstream version 0.6.21+dfsg1
+              (Closes: #737457) (Closes: #753457)
+  * [82701a7] Removed GBP config, we imported the tarball into GIT
+  * [45e91cc] Changes for the DFSG tarball, JQuery depends, links and cleanup
+  * [36ab52d] Switch to source format 3.0 (quilt)
+  * [fafe97f] Update watch file for DFSG versions
+  * [318fa21] Remove potential flattr code from documentation
+  * [913caf2] Control, Lintian and Standards Cleanup
+  * [28272e9] Add missing dependencies of config packages and fix arch
+  * [ce4e5ae] Modernize and split Apache configuration (Closes: #669839)
+  * [a79e4af] Prefer Icinga over Nagios3
+  * [cb1832a] Fill config packages
+  * [2a2c4f6] Modernize rules
+  * [0a244f8] Update copyright
+  * [311c9c5] Include default build flags
+  * [c37bcc4] Fix Apache configuration handling
+  * [a65f63a] Revert "DFSG cleaned upstream version 0.6.21+dfsg1"
+  * [b542e4a] Imported Upstream version 0.6.24
+  * [b920288] DFSG cleaned upstream version 0.6.24+dfsg1
+  * [b87ba16] Update patch privacy-warning for 0.6.24
+  * [eed3190] Add patch install_opts to avoid setting owners on dh_auto_install
+  * [46e24b7] Update README.Debian
+  * [7f49d88] Bump Standards version
+
+ -- Markus Frosch <lazyfrosch@debian.org>  Sun, 26 Oct 2014 16:02:13 +0100
+
+pnp4nagios (0.6.19-1) experimental; urgency=low
+
+  * New upstream release; thanks to Christoph Anton Mitterer for reporting
+    this (Closes: #682175).
+  * Uploading to experimental because of the Wheezy freeze.
+  * debian/pnp4nagios.postrm:
+    - Fixed typo: Apache's config files use file suffix .conf rather than
+      .cfg; this prevented /etc/apache2/conf.d/pnp4nagios.conf from being
+      removed on remove/purge; thanks to Andreas Beckmann for reporting this
+      (cf. #669839).
+  * debian/control:
+    - Optionally depend on php5-cgi instead of libapache2-mod-php5 to allow
+      for easier installations when not using Apache; thanks to Matthias
+      Wamser for reporting this (Closes: #671231).
+    - Updated standards-version to 3.9.4 -- no changes.
+    - Let pnp4nagios-bin suggest rrdtool which is used by the rrd_convert
+      helper script; thanks to Christoph Anton Mitterer for suggesting this
+      (cf. #684420).
+  * debian/patches:
+    - fix-npcd-path updated for 0.6.19.
+    - Added format-security; fixing a missing printf-style format argument.
+  * debian/rules:
+    - Manually clean-up auto-generated scripts/rrd_modify.pl.
+    - Use dpkg-buildflags to determine CPPFLAGS/CFLAGS.
+  * debian/icinga-module.cfg, debian/rules:
+    - Provide a sample Icinga module configuration; thanks to Christoph Anton
+      Mitterer for providing this (Closes: #683459).
+  * debian/nagios.cfg:
+    - Unified whitespacing; thanks to Christoph Anton Mitterer for the patch
+      (Closes: #683471).
+  * debian/pnp4nagios-bin.postinst:
+    - Don't use world-readable permissions for process_perfdata.cfg as this
+      would allow local users to read the Gearman shared key; thanks to
+      Christoph Anton Mitterer for reporting this; fixes CVE-2012-3457
+      (Closes: #683879).
+
+ -- Sebastian Harl <tokkee@debian.org>  Thu, 24 Jan 2013 16:30:51 +0100
+
+pnp4nagios (0.6.16-2) unstable; urgency=low
+
+  * debian/control:
+    - Adapted versioned build-dep on libjs-jquery-ui to the workaround used by
+      that package (1.8.14 -> 1.8.ooops.14). Thanks to Christoph Anton
+      Mitterer for reporting this (Closes: #683100).
+  * debian/patches/:
+    - adjust-template-path: Fixed the patch for empty templates.d and some
+      versions of glob() which in this case returns nothing resulting in PHP
+      syntax errors and a crash of PNP4Nagios; thanks to Christoph Anton
+      Mitterer for reporting this and pointing out a fix (Closes: #683138).
+
+ -- Sebastian Harl <tokkee@debian.org>  Sat, 24 Nov 2012 15:34:54 +0100
+
+pnp4nagios (0.6.16-1) unstable; urgency=low
+
+  * New upstream version.
+  * debian/control:
+    - Depend on jQuery >= 1.6.2 and jQuery-ui >= 1.8.14 (rather than
+      unversioned dependencies); this is what upstream did as well.
+  * debian/rules:
+    - Added recommended targets build-{arch,indep} depending on build-stamp.
+  * debian/pnp4nagios-bin.install:
+    - Install verify_pnp_config_v2.pl to /u/l/pnp4nagios/libexec/.
+  * debian/pnp4nagios-web.postinst:
+    - Call a2mod / restart apache2 only if the binaries are available; thanks
+      to Wouter Schoot for reporting this (Closes: #636218).
+  * debian/po/:
+    - Added Spanish debconf translations; thanks to Camaleón for providing
+      those (Closes: #632953).
+    - Added Portuguese debconf translations; thanks to Pedro Ribeiro for
+      providing those (Closes: #651432).
+    - Added Dutch debconf translations; thanks to Jeroen Schot for providing
+      those (Closes: #654214).
+    - Added Danish debconf translations; thanks to Joe Dalton for providing
+      those (Closes: #654816).
+    - Added Czech debconf translations; thanks to Michal Šimůnek for providing
+      those (Closes: #655132).
+  * debian/README.Debian:
+    - Added a note about installation with Icinga referring to the different
+      htpasswd.users file location; thanks to Alexander Reichle-Schmehl for
+      reporting this (Closes: #646587).
+  * debian/patches/adjust-template-path:
+    - Added support for /etc/pnp4nagios/templates.d.
+  * debian/README.templates.d:
+    - Added README file for the use of /etc/pnp4nagios/templates.d. The file
+      will be installed to that directory.
+
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 31 Jan 2012 14:00:47 +0100
+
+pnp4nagios (0.6.13-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/README.Debian:
+    - Added more verbose instructions about how to setup mod_gearman mode.
+  * debian/patches/:
+    - Removed manpage-hyphen -- applied upstream.
+  * debian/rules:
+    - Don't remove scripts/rc.pnp_gearman_worker in 'clean' -- this is now
+      taken care of in the upstream Makefile.
+  * debian/po/:
+    - Added Japanese debconf translation; thanks to Hideki Yamane for
+      providing the translation (Closes: #626386).
+    - Added Swedish debconf translation; thanks to Martin Bagge for providing
+      the translation (Closes: #628926).
+  * debian/control:
+    - Updated standards-version to 3.9.2 -- no changes.
+
+ -- Sebastian Harl <tokkee@debian.org>  Wed, 22 Jun 2011 12:42:18 +0200
+
+pnp4nagios (0.6.12-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/:
+    - Removed raise-process-perfdata-timeout -- a similar patch has been
+      included upstream.
+    - Added manpage-hyphen -- do not use hyphens as minus sign in npcd.8.
+  * debian/rules:
+    - npcd.cfg and process_perfdata.cfg are not longer installed as sample
+      configs by the upstream Makefile; so, don't rename those files.
+    - Do not pass --prefix to configure and set man-/infodir correctly. The
+      prefix is set by layout=debian and cannot be overwritten, thus do not
+      pretend this is possible. Also, do not use $prefix when setting man-/
+      infodir but specify the complete path.
+    - Do not install config_local.php and config.php.$PKG_VERSION.
+    - Remove generated scripts/rc.pnp_gearman_worker in 'clean'.
+  * debian/rules, debian/pnp4nagios-bin.install:
+    - Do not install npcd.8 using dh_installman; this is done by the upstream
+      Makefile now.
+  * debian/pnp4nagios-bin.pnp_gearman_worker.default,
+    pnp4nagios-bin.pnp_gearman_worker.init:
+    - Added init script for the PNP4Nagios Gearman worker daemon.
+    - The daemon is disabled by default.
+
+ -- Sebastian Harl <tokkee@debian.org>  Wed, 27 Apr 2011 09:05:48 +0200
+
+pnp4nagios (0.6.11-2) unstable; urgency=low
+
+  * debian/po/:
+    - Added French debconf translation; thanks to Christian Perrier for
+      providing the translation (Closes: #623181).
+    - Added German debconf translation.
+    - Added Russian debconf translation; thanks to Yuri Kozlov for providing
+      the translation (Closes: #623798).
+  * debian/pnp4nagios-web.postinst:
+    - Do not set permissions of /var/log/pnp4nagios/stats -- this is done in
+      pnp4nagios-bin.postinst which ships the directory. This fixes an error
+      when installing -web without -bin.
+
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 26 Apr 2011 11:48:54 +0200
+
+pnp4nagios (0.6.11-1) unstable; urgency=low
+
+  [ Sven Velt ]
+  * Initial release (Closes: #479031)
+  * Use "php-fpdf", "php-fpdf-tpl" and "php-fpdi" packages instead of bundled
+    copies.
+  * Do not use the bundled copy of Kohana2 but rather depend on
+    libkohana2-php.
+  * Ship all configuration in /etc and create appropriate symlinks.
+  * Ship upstream sample configs as default configs.
+  * debian/patches:
+    - Added adjust-template-path: install templates into /etc/ rather than
+      /usr/share/.
+    - Added apache-fix-path-to-userfile: fix config directory in the sample
+      httpd.conf.
+    - Added fix-nagios-url: fix cgi-bin path in config.php.
+    - Added fix-npcd-path: fix perfdata paths in npcd.cfg.
+    - Added fix-path-fpdi: FPDI is shipped in its own subdirectory -- adopt
+      path in pdf.php.
+    - Added raise-process-perfdata-timeout: set timeout to 10s in
+      process_perfdata.cfg; in large and/or virtualized setups, 5s might not
+      be enough.
+
+  [ Sebastian Harl ]
+  * Build the following binary packages:
+    - pnp4nagios-bin: NPCD and process_perfdata.pl
+    - pnp4nagios-web: web interface
+    - pnp4nagios: metapackage depending on the other two
+  * debian/watch: mangle upstream version to replace ".rc" with "~rc".
+  * Make Apache2 configuration optional using debconf.
+
+ -- Sebastian Harl <tokkee@debian.org>  Mon, 14 Feb 2011 13:15:46 +0100

debian/check_commands/check_nrpe.cfg

@@ -0,0 +1,15 @@
+#
+# Adapt the Template if check_command should not be the PNP Template
+#
+# check_command check_nrpe!check_disk!20%!10%
+# ________0__________|          |      |  |
+# ________1_____________________|      |  |
+# ________2____________________________|  |
+# ________3_______________________________|
+#
+CUSTOM_TEMPLATE = 1
+#
+# Change the RRD Datatype based on the check_command Name.
+# Defaults to GAUGE.
+#
+# DATATYPE = COUNTER

debian/check_commands/check_nrpe_1arg.cfg

@@ -0,0 +1,15 @@
+#
+# Adapt the Template if check_command should not be the PNP Template
+#
+# check_command check_nrpe!check_disk!20%!10%
+# ________0__________|          |      |  |
+# ________1_____________________|      |  |
+# ________2____________________________|  |
+# ________3_______________________________|
+#
+CUSTOM_TEMPLATE = 1
+#
+# Change the RRD Datatype based on the check_command Name.
+# Defaults to GAUGE.
+#
+# DATATYPE = COUNTER

debian/clean

@@ -0,0 +1,2 @@
+scripts/rrd_modify.pl
+share/pnp/media/js/jquery.imgareaselect.min.js

debian/compat

@@ -0,0 +1 @@
+8

debian/control

@@ -0,0 +1,120 @@
+Source: pnp4nagios
+Section: net
+Priority: optional
+Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel@lists.alioth.debian.org>
+Uploaders:
+    Markus Frosch <lazyfrosch@debian.org>,
+ Micah Anderson <micah@debian.org>
+Build-Depends:
+    autotools-dev,
+    debhelper (>= 8),
+    dh-autoreconf,
+    quilt,
+    rrdtool,
+    librrds-perl,
+    python,
+    python-jsmin
+Standards-Version: 3.9.6
+Homepage: http://www.pnp4nagios.org/
+Vcs-Git: git://anonscm.debian.org/pkg-nagios/pkg-pnp4nagios.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-nagios/pkg-pnp4nagios.git
+
+Package: pnp4nagios
+Architecture: all
+Depends:
+    ${misc:Depends},
+    pnp4nagios-bin,
+    pnp4nagios-web,
+Description: monitoring addon to create graphs from performance data
+ PNP is a graphing tool for Nagios, Icinga or similar frameworks that
+ analyzes performance data provided by plugins and stores them
+ automatically into Round Robin Databases (RRD).
+ .
+ It offers integration into the Nagios and Icinga Frontends.
+ .
+ PNP's goal is to be easily configurable and maintainable.
+ .
+ This is a metapackage depending on all parts of PNP4Nagios.
+
+Package: pnp4nagios-bin
+Architecture: any
+Depends:
+    ${misc:Depends},
+    ${perl:Depends},
+    ${shlibs:Depends},
+    librrds-perl,
+    adduser
+Recommends: pnp4nagios-web, icinga | nagios3
+Suggests: rrdtool, rrdcached, perl, libgearman-client-perl, libcrypt-rijndael-perl
+Description: monitoring addon to create graphs from performance data - binaries
+ PNP is a graphing tool for Nagios, Icinga or similar frameworks that
+ analyzes performance data provided by plugins and stores them
+ automatically into Round Robin Databases (RRD).
+ .
+ It offers integration into the Nagios and Icinga Frontends.
+ .
+ PNP's goal is to be easily configurable and maintainable.
+ .
+ This package contains the NPCD-related binaries and process_perfdata.pl.
+
+Package: pnp4nagios-web-config-icinga
+Architecture: all
+Depends: pnp4nagios-web (=${source:Version}), ${misc:Depends}
+Recommends: apache2 | httpd
+Suggests: icinga, icinga-cgi
+Conflicts: pnp4nagios-web-config-nagios3
+Replaces: pnp4nagios-web (<< 0.6.21)
+Description: monitoring addon to create graphs from performance data - Icinga Classic config
+ PNP is a graphing tool for Nagios, Icinga or similar frameworks that
+ analyzes performance data provided by plugins and stores them
+ automatically into Round Robin Databases (RRD).
+ .
+ It offers integration into the Nagios and Icinga Frontends.
+ .
+ PNP's goal is to be easily configurable and maintainable.
+ .
+ This package contains the icinga-cgi configuration for pnp4nagios-web.
+
+Package: pnp4nagios-web-config-nagios3
+Architecture: all
+Depends: pnp4nagios-web (=${source:Version}), ${misc:Depends}
+Recommends: apache2 | httpd
+Suggests: nagios3, nagios3-cgi
+Conflicts: pnp4nagios-web-config-icinga
+Replaces: pnp4nagios-web (<< 0.6.21)
+Description: monitoring addon to create graphs from performance data - Nagios3 CGI config
+ PNP is a graphing tool for Nagios, Icinga or similar frameworks that
+ analyzes performance data provided by plugins and stores them
+ automatically into Round Robin Databases (RRD).
+ .
+ It offers integration into the Nagios and Icinga Frontends.
+ .
+ PNP's goal is to be easily configurable and maintainable.
+ .
+ This package contains the nagios3-cgi configuration for pnp4nagios-web.
+
+Package: pnp4nagios-web
+Architecture: all
+Depends:
+    ${misc:Depends},
+    libapache2-mod-php5 | php5-cgi | php5,
+    php5-gd,
+    libkohana2-php,
+    libfpdi-php,
+    libjs-jquery (>= 1.6.2),
+    libjs-jquery-ui (>= 1.8.ooops.14),
+    libjs-jquery-mobile,
+    rrdtool,
+    adduser
+Recommends: pnp4nagios-bin, pnp4nagios-web-config-icinga | pnp4nagios-web-config-nagios3
+Suggests: rrdcached
+Description: monitoring addon to create graphs from performance data - web interface
+ PNP is a graphing tool for Nagios, Icinga or similar frameworks that
+ analyzes performance data provided by plugins and stores them
+ automatically into Round Robin Databases (RRD).
+ .
+ It offers integration into the Nagios and Icinga Frontends.
+ .
+ PNP's goal is to be easily configurable and maintainable.
+ .
+ This package contains the web-interface for PNP4Nagios.

debian/copyright

@@ -0,0 +1,489 @@
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: PNP4Nagios
+Upstream-Contact: Jörg Linge <pitchfork@pnp4nagios.org>
+Source: http://docs.pnp4nagios.org/pnp-0.6/about#download
+
+Files: *
+Copyright:
+ 2005-2014 Jörg Linge <pitchfork@pnp4nagios.org>
+License: GPL-2+
+Comment: See the file THANKS for a list of contributors.
+
+Files:
+ scripts/verify_pnp_config.pl.in
+Copyright:
+ 2008-2010 Wolfgang Nieder
+License: GPL-2+
+
+Files: include/*
+Copyright:
+ 1999-2008 Ethan Galstad <nagios@nagios.org>
+License: GPL-2
+
+Files: include/npcdmod.h
+Copyright:
+ 2008 Hendrik Baecker
+License: GPL-2
+
+Files: lib/kohana/*
+Copyright:
+ 2007-2009 Kohana Team
+License: BSD-3-clause
+Comment: See <http://kohanaframework.org/team> for the list of team members.
+
+Files:
+ lib/kohana/system/core/utf8.php
+ lib/kohana/system/core/utf8/*
+Copyright:
+ 2007, Kohana Team
+ 2005, Harry Fuecks
+License: LGPL-2.1
+
+Files: lib/kohana/system/fonts/*
+Copyright:
+ 2003, Bitstream, Inc.
+ 2006, Tavmjong Bah.
+License: fonts-copyright
+
+Files: lib/kohana/system/libraries/drivers/Database/Pdosqlite.php
+Copyright:
+ Doutu
+ Greg MacLellan
+License: BSD-3-clause
+
+Files:
+ scripts/verify_pnp_config_v2.pl
+ scripts/rrd_modify.pl.in
+Copyright:
+ 2005-2012, PNP4Nagios Developer Team
+License: GPL-2+
+
+Files: share/pnp/templates.dist/check_apachestatus.php
+Copyright:
+ Roman Ovchinnikov <coolthecold@gmail.com>
+License: GPL-2+
+
+Files: share/pnp/templates.dist/check_ntp_time.php
+Copyright:
+ Mathias Kettner
+License: GPL-2+
+
+Files: share/pnp/templates.dist/check_esx3.php
+Copyright:
+ 2009 op5 AB (author: Mattias Ryrlen <dev@op5.com>)
+ Joerg Linge <joerg.linge@pnp4nagios.org>
+License: GPL-2
+
+Files: share/pnp/templates.dist/check_messpc_temp.php
+Copyright:
+ Joerg Peter Geissler <lairdofglencairn@nagios-wiki.de>
+License: GPL-2+
+
+Files: check_mssql_health.php
+Copyright:
+ 2009-2011 Gerhard Lausser <gerhard.lausser@consol.de>
+ 2011 Joerg Linge <support@pnp4nagios.org>
+License: GPL-2+
+
+Files: share/pnp/templates.dist/check_multi_nagiostats.php
+Copyright:
+ 2009 Matthias Flacke
+License: GPL-2+
+
+Files: share/pnp/templates.dist/check_mysql_health.php
+Copyright:
+ 2009 Gerhard Lausser <gerhard.lausser@consol.de>
+License: GPL-2+
+
+Files: share/pnp/templates.dist/check_openmanage.php
+Copyright:
+ 2008-2011 Trond Hasle Amundsen <t.h.amundsen@usit.uio.no>
+License: GPL-3+
+
+Files: share/pnp/application/lib/json.php
+Copyright:
+ 2005 Michal Migurski <mike-json@teczno.com>
+ Matt Knapp <mdknapp@gmail.com>
+ Brett Stimmerman <brettstimmerman@gmail.com>
+License: BSD-2-clause
+
+Files: share/pnp/application/vendor/fpdf/*
+Copyright:
+ 2008 Olivier Plathey <olivier@fpdf.org>
+License: FPDF-license
+
+Files:
+ share/pnp/application/vendor/fpdf/fpdf_tpl.php
+ share/pnp/application/vendor/fpdf/fpdi*
+ share/pnp/application/vendor/fpdf/pdf_context.php
+ share/pnp/application/vendor/fpdf/pdf_parser.php
+ share/pnp/application/vendor/fpdf/filters/*
+Copyright:
+ 2004-2009 Setasign - Jan Slabon
+License: Apache-2.0
+
+Files:
+ share/pnp/media/css/jquery.mobile.min.css
+ share/pnp/media/js/jquery.mobile.min.js
+Copyright:
+ 2010 jQuery Project
+License: MIT and GPL-2+
+
+Files:
+ share/pnp/media/js/jquery.imgareaselect.min.js
+Copyright:
+ 2008-2011 Michal Wojciechowski (odyniec.net)
+License: MIT and GPL-2+
+
+Files:
+ share/pnp/media/js/jquery-ui.min.js
+ share/pnp/media/css/ui-*
+Copyright:
+ 2010-2011 Brandon Aaron
+ 2010-2011 Paul Bakaus (paulbakaus.com)
+ 2010-2011 David Bolter
+ 2010-2011 Rich Caloggero
+ 2010-2011 Chi Cheng (cloudream@gmail.com)
+ 2010-2011 Colin Clark (http://colin.atrc.utoronto.ca/)
+ 2010-2011 Michelle D'Souza
+ 2010-2011 Aaron Eisenberger (aaronchi@gmail.com)
+ 2010-2011 Ariel Flesler
+ 2010-2011 Bohdan Ganicky
+ 2010-2011 Scott González
+ 2010-2011 Marc Grabanski (m@marcgrabanski.com)
+ 2010-2011 Klaus Hartl (stilbuero.de)
+ 2010-2011 Scott Jehl
+ 2010-2011 Cody Lindley
+ 2010-2011 Eduardo Lundgren (eduardolundgren@gmail.com)
+ 2010-2011 Todd Parker
+ 2010-2011 John Resig
+ 2010-2011 Patty Toland
+ 2010-2011 Ca-Phun Ung (yelotofu.com)
+ 2010-2011 Keith Wood (kbwood@virginbroadband.com.au)
+ 2010-2011 Maggie Costello Wachs
+ 2010-2011 Richard D. Worth (rdworth.org)
+ 2010-2011 Jörn Zaefferer (bassistance.de)
+License: MIT and GPL-2+
+
+Files:
+ share/pnp/media/js/jquery-ui-timepicker-addon.js
+Copyright:
+ 2011 Trent Richardson
+License: MIT and GPL-2+
+
+Files: share/pnp/media/js/jquery.cluetip.js
+Copyright:
+ 2009 Karl Swedberg
+License: MIT and GPL-2+
+Comment: Copyright and license extracted from upstream website and sources.
+
+Files: share/pnp/media/js/jquery-min.js
+Copyright:
+ 2010-2011 John Resig
+ 2010-2011 The Dojo Foundation
+License: MIT and BSD-3-clause and GPL-2+
+Comment: License details extracted from upstream website.
+
+Files: src/*
+Copyright:
+ 2006-2010 Hendrik Baecker <andurin@process-zero.de>
+License: GPL-2
+
+Files: src/utils.c
+Copyright:
+ 2006-2009 Hendrik Baecker <andurin@process-zero.de>
+ 1999-2006 Ethan Galstad <nagios@nagios.org>
+License: GPL-2
+
+Files: debian/*
+Copyright:
+ 2009-2011, Sven Velt <sven@velt.de>
+ 2011, Sebastian Harl <tokkee@debian.org>
+ 2014, Markus Frosch <lazyfrosch@debian.org>
+License: BSD-2-clause
+
+Files:
+ debian/pnp4nagios-bin.npcd.init
+Copyright:
+ 2007 Javier Fernandez-Sanguino <jfs@debian.org>
+ 2009 Sven Velt <sven@velt.de>
+License: BSD-2-clause
+
+Files:
+ debian/pnp4nagios-bin.pnp_gearman_worker.init
+Copyright:
+ 2007, Javier Fernandez-Sanguino <jfs@debian.org>
+ 2011, Sebastian Harl <tokkee@debian.org>
+License: BSD-2-clause
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+     http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the full text of the Apache License, Version 2.0
+ can be found in the file `/usr/share/common-licenses/Apache-2.0'.
+
+License: BSD-3-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+    *  Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+ .
+    *  Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+ .
+    *  Neither the name of the Kohana nor the names of its contributors may
+       be used to endorse or promote products derived from this software
+       without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: BSD-2-clause
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+ .
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: LGPL-2.1
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+License: GPL-2
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; version 2.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file `/usr/share/common-licenses/GPL-2'. The latest
+ version of the library can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ .
+ On Debian systems, the full text of the GNU General Public License version 2
+ can be found in the file `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License version 3
+ can be found in the file `/usr/share/common-licenses/GPL-3'.
+
+License: FPDF-license
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software to use, copy, modify, distribute, sublicense, and/or sell
+ copies of the software, and to permit persons to whom the software is
+ furnished to do so.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED.
+
+License: fonts-copyright
+ Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+ Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
+ .
+ Bitstream Vera Fonts Copyright
+ ------------------------------
+ .
+ Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+ a trademark of Bitstream, Inc.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of the fonts accompanying this license ("Fonts") and associated
+ documentation files (the "Font Software"), to reproduce and distribute the
+ Font Software, including without limitation the rights to use, copy, merge,
+ publish, distribute, and/or sell copies of the Font Software, and to permit
+ persons to whom the Font Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright and trademark notices and this permission notice shall
+ be included in all copies of one or more of the Font Software typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in particular
+ the designs of glyphs or characters in the Fonts may be modified and
+ additional glyphs or characters may be added to the Fonts, only if the fonts
+ are renamed to names not containing either the words "Bitstream" or the word
+ "Vera".
+ .
+ This License becomes null and void to the extent applicable to Fonts or Font
+ Software that has been modified and is distributed under the "Bitstream
+ Vera" names.
+ .
+ The Font Software may be sold as part of a larger software package but no
+ copy of one or more of the Font Software typefaces may be sold by itself.
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+ TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+ FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+ FONT SOFTWARE.
+ .
+ Except as contained in this notice, the names of Gnome, the Gnome
+ Foundation, and Bitstream Inc., shall not be used in advertising or
+ otherwise to promote the sale, use or other dealings in this Font Software
+ without prior written authorization from the Gnome Foundation or Bitstream
+ Inc., respectively. For further information, contact: fonts at gnome dot
+ org.
+ .
+ Arev Fonts Copyright
+ ------------------------------
+ .
+ Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the fonts accompanying this license ("Fonts") and
+ associated documentation files (the "Font Software"), to reproduce
+ and distribute the modifications to the Bitstream Vera Font Software,
+ including without limitation the rights to use, copy, merge, publish,
+ distribute, and/or sell copies of the Font Software, and to permit
+ persons to whom the Font Software is furnished to do so, subject to
+ the following conditions:
+ .
+ The above copyright and trademark notices and this permission notice
+ shall be included in all copies of one or more of the Font Software
+ typefaces.
+ .
+ The Font Software may be modified, altered, or added to, and in
+ particular the designs of glyphs or characters in the Fonts may be
+ modified and additional glyphs or characters may be added to the
+ Fonts, only if the fonts are renamed to names not containing either
+ the words "Tavmjong Bah" or the word "Arev".
+ .
+ This License becomes null and void to the extent applicable to Fonts
+ or Font Software that has been modified and is distributed under the
+ "Tavmjong Bah Arev" names.
+ .
+ The Font Software may be sold as part of a larger software package but
+ no copy of one or more of the Font Software typefaces may be sold by
+ itself.
+ .
+ THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+ TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+ OTHER DEALINGS IN THE FONT SOFTWARE.
+ .
+ Except as contained in this notice, the name of Tavmjong Bah shall not
+ be used in advertising or otherwise to promote the sale, use or other
+ dealings in this Font Software without prior written authorization
+ from Tavmjong Bah. For further information, contact: tavmjong @ free
+ . fr.

debian/docs

@@ -0,0 +1 @@
+AUTHORS

debian/icinga-module.cfg

@@ -0,0 +1,11 @@
+# This is a sample module definition for Icinga.
+#
+# Copy this file to /etc/icinga/modules/ in order to activate it.
+
+define module {
+	module_name	npcdmod
+	module_type	neb
+	path		/usr/lib/pnp4nagios/npcdmod.o
+	args		config_file=/etc/pnp4nagios/npcd.cfg
+}
+

debian/icinga/config.icinga.php

@@ -0,0 +1,2 @@
+<?php
+$conf['nagios_base'] = "/cgi-bin/icinga";

debian/icinga/npcdmod.cfg

@@ -0,0 +1,15 @@
+# Icinga configuration for PNP4Nagios's npcdmod
+#
+# In order to enable the npcdmod event broker module in Icinga, you'll have to
+# put a file similar to this one into /etc/icinga/modules/.
+#
+# ATTENTION: DO NOT load the same module here AND via broker_module in
+# icinga.cfg. This can lead to problems with races on ressources.
+#
+
+define module{
+        module_name     npcdmod
+        module_type     neb
+        path            /usr/lib/pnp4nagios/npcdmod.o
+        args            config_file=/etc/pnp4nagios/npcd.cfg
+}

debian/icinga/pnp4nagios.conf

@@ -0,0 +1,24 @@
+Alias /pnp4nagios "/usr/share/pnp4nagios/html"
+
+<Directory "/usr/share/pnp4nagios/html">
+   	AllowOverride None
+
+   	AuthName "Icinga Access"
+   	AuthType Basic
+   	AuthUserFile /etc/icinga/htpasswd.users
+   	Require valid-user
+	<IfModule mod_rewrite.c>
+		# Turn on URL rewriting
+		RewriteEngine On
+		Options symLinksIfOwnerMatch
+		# Installation directory
+		RewriteBase /pnp4nagios/
+		# Protect application and system files from being viewed
+		RewriteRule "^(?:application|modules|system)/" - [F]
+		# Allow any files or directories that exist to be displayed directly
+		RewriteCond "%{REQUEST_FILENAME}" !-f
+		RewriteCond "%{REQUEST_FILENAME}" !-d
+		# Rewrite all other URLs to index.php/URL
+		RewriteRule "^.*$" "index.php/$0" [PT]
+	</IfModule>
+</Directory>

debian/nagios.cfg

@@ -0,0 +1,34 @@
+define command {
+	command_name	pnp-synchronous-service
+	command_line	/usr/bin/perl /usr/lib/pnp4nagios/libexec/process_perfdata.pl
+}
+
+define command {
+	command_name	pnp-synchronous-host
+	command_line	/usr/bin/perl /usr/lib/pnp4nagios/libexec/process_perfdata.pl -d HOSTPERFDATA
+}
+
+##############################################################################
+
+define command {
+	command_name	pnp-bulk-service
+	command_line	/usr/bin/perl /usr/lib/pnp4nagios/libexec/process_perfdata.pl --bulk=/var/spool/pnp4nagios/nagios/service-perfdata
+}
+
+define command {
+	command_name	pnp-bulk-host
+	command_line	/usr/bin/perl /usr/lib/pnp4nagios/libexec/process_perfdata.pl --bulk=/var/spool/pnp4nagios/nagios/host-perfdata
+}
+
+##############################################################################
+
+define command {
+	command_name	pnp-bulknpcd-service
+	command_line	/bin/mv /var/spool/pnp4nagios/nagios/service-perfdata /var/spool/pnp4nagios/npcd/service-perfdata.$TIMET$
+}
+
+define command {
+	command_name	pnp-bulknpcd-host
+	command_line	/bin/mv /var/spool/pnp4nagios/nagios/host-perfdata /var/spool/pnp4nagios/npcd/host-perfdata.$TIMET$
+}
+

debian/nagios3/config.nagios3.php

@@ -0,0 +1,2 @@
+<?php
+$conf['nagios_base'] = "/cgi-bin/nagios3";

debian/nagios3/pnp4nagios.conf

@@ -0,0 +1,24 @@
+Alias /pnp4nagios "/usr/share/pnp4nagios/html"
+
+<Directory "/usr/share/pnp4nagios/html">
+   	AllowOverride None
+
+   	AuthName "Nagios Access"
+   	AuthType Basic
+   	AuthUserFile /etc/nagios3/htpasswd.users
+   	Require valid-user
+	<IfModule mod_rewrite.c>
+		# Turn on URL rewriting
+		RewriteEngine On
+		Options symLinksIfOwnerMatch
+		# Installation directory
+		RewriteBase /pnp4nagios/
+		# Protect application and system files from being viewed
+		RewriteRule "^(?:application|modules|system)/" - [F]
+		# Allow any files or directories that exist to be displayed directly
+		RewriteCond "%{REQUEST_FILENAME}" !-f
+		RewriteCond "%{REQUEST_FILENAME}" !-d
+		# Rewrite all other URLs to index.php/URL
+		RewriteRule "^.*$" "index.php/$0" [PT]
+	</IfModule>
+</Directory>

debian/patches/adjust-template-path

@@ -0,0 +1,29 @@
+Description: Install templates into /etc/ rather than /usr/share/.
+ Also, add support for templates.d directory.
+Author: Sven Velt <sven@velt.de>, Sebastian Harl <tokkee@debian.org
+Forwarded: not-needed
+
+--- a/sample-config/pnp/config.php.in
++++ b/sample-config/pnp/config.php.in
+@@ -230,13 +230,19 @@ $conf['RRD_DAEMON_OPTS'] = '';
+ # Add your own template directories here
+ # First match wins!
+ #$conf['template_dirs'][] = '/usr/local/check_mk/pnp-templates';
+-$conf['template_dirs'][] = '@datarootdir@/templates';
++$conf['template_dirs'][] = '@sysconfdir@/templates';
++$templates_d = glob("/etc/pnp4nagios/templates.d/*", GLOB_ONLYDIR);
++if (is_array($templates_d) && (count($templates_d) > 0)) {
++	foreach ($templates_d as $dirname) {
++		$conf['template_dirs'][] = "$dirname";
++	}
++}
+ $conf['template_dirs'][] = '@datarootdir@/templates.dist';
+ 
+ #
+ # Directory to search for special templates
+ #
+-$conf['special_template_dir'] = '@datarootdir@/templates.special';
++$conf['special_template_dir'] = '@sysconfdir@/templates.special';
+ 
+ #
+ # Regex to detect mobile devices

debian/patches/apache-fix-path-to-userfile

@@ -0,0 +1,15 @@
+Description: Fix config directory in the sample httpd.conf.
+Author: Sven Velt <sven@velt.de>
+Forwarded: not-needed
+
+--- a/sample-config/httpd.conf.in
++++ b/sample-config/httpd.conf.in
+@@ -11,7 +11,7 @@
+    	#
+    	AuthName "Nagios Access"
+    	AuthType Basic
+-   	AuthUserFile /usr/local/nagios/etc/htpasswd.users
++   	AuthUserFile /etc/nagios3/htpasswd.users
+    	Require valid-user
+ 	<IfModule mod_rewrite.c>
+ 		# Turn on URL rewriting

debian/patches/config_instances

@@ -0,0 +1,28 @@
+Description: Include a instance based config
+Author: Markus Frosch <lazyfrosch@debian.org>
+Last-Update: 2014-09-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/sample-config/pnp/config.php.in
++++ b/sample-config/pnp/config.php.in
+@@ -89,7 +89,8 @@
+ #
+ # Link back to Nagios or Thruk ( www.thruk.org ) 
+ #
+-$conf['nagios_base'] = "/cgi-bin/nagios3";
++## Debian: please see /etc/pnp4nagios/config.<NAME>.php
++##$conf['nagios_base'] = "/cgi-bin/nagios3";
+ 
+ #
+ # Link back to check_mk´s multisite ( http://mathias-kettner.de/checkmk_multisite.html )
+@@ -278,4 +279,10 @@
+                              '#F6E8C3','#C7EAE5','#DFC27D','#80CDC1','#BF812D','#35978F','#8C510A','#01665E');
+ $scheme['mixed3']   = array ('#67001F','#80CDC1','#B2182B','#35978F','#D6604D','#01665E','#F4A582','#003C30',
+                              '#FDDBC7','#92C5DE','#D1E5F0','#2166AC','#4393C3','#8C510A','#053061','#BF812D');
++
++if (file_exists('/etc/pnp4nagios/config.icinga.php')) {
++    include '/etc/pnp4nagios/config.icinga.php';
++} else if (file_exists('/etc/pnp4nagios/config.nagios3.php')) {
++    include '/etc/pnp4nagios/config.nagios3.php';
++}
+ ?>

debian/patches/fix-nagios-url

@@ -0,0 +1,15 @@
+Description: Fix cgi-bin path in config.php.
+Author: Sven Velt <sven@velt.de>
+Forwarded: not-needed
+
+--- a/sample-config/pnp/config.php.in
++++ b/sample-config/pnp/config.php.in
+@@ -89,7 +89,7 @@ $conf['temp'] = "/var/tmp";
+ #
+ # Link back to Nagios or Thruk ( www.thruk.org ) 
+ #
+-$conf['nagios_base'] = "/nagios/cgi-bin";
++$conf['nagios_base'] = "/cgi-bin/nagios3";
+ 
+ #
+ # Link back to check_mk´s multisite ( http://mathias-kettner.de/checkmk_multisite.html )

debian/patches/fix-npcd-path

@@ -0,0 +1,24 @@
+Description: Fix perfdata paths in npcd.cfg.
+Author: Sven Velt <sven@velt.de>
+Forwarded: not-needed
+
+--- a/sample-config/pnp/npcd.cfg-sample.in
++++ b/sample-config/pnp/npcd.cfg-sample.in
+@@ -76,7 +76,7 @@
+ # perfdata_spool_dir = </path/to/directory/>
+ #
+ 
+-perfdata_spool_dir = @PERFDATA_SPOOL_DIR@
++perfdata_spool_dir = @PERFDATA_SPOOL_DIR@/npcd/
+ 
+ 
+ # Execute following command for each found file
+@@ -163,7 +163,7 @@
+ # perfdata_file = </path/to/file>
+ #
+ 
+-perfdata_file = @localstatedir@/perfdata.dump
++perfdata_file = @PERFDATA_SPOOL_DIR@/nagios/perfdata.dump
+ 
+ 
+ # perfdata_spool_filename - declare the destination

debian/patches/fix-path-fpdi

@@ -0,0 +1,15 @@
+Description: FPDI is shipped in its own subdirectory -- adopt path in pdf.php.
+Author: Sven Velt <sven@velt.de>
+Forwarded: not-needed
+
+--- a/share/pnp/application/controllers/pdf.php
++++ b/share/pnp/application/controllers/pdf.php
+@@ -268,7 +268,7 @@ class Pdf_Controller extends System_Cont
+ *
+ */
+ require Kohana::find_file('vendor/fpdf', 'fpdf');
+-require Kohana::find_file('vendor/fpdf', 'fpdi');
++require Kohana::find_file('vendor/fpdi', 'fpdi');
+ class PDF extends FPDI {
+         //Page header
+         function Header() {

debian/patches/hardening

@@ -0,0 +1,26 @@
+Description: Fix use of flags in Makefiles
+ To pass all hardening flags to gcc.
+Author: Markus Frosch <lazyfrosch@debian.org>
+Last-Update: 2015-07-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -83,7 +83,7 @@
+ #
+ ###############################
+ npcd: npcd.c $(NPCDOBJS) $(NPCDHEAD)
+-	$(CC) $(CFLAGS) -o $@ npcd.c $(NPCDOBJS) -lpthread
++	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ npcd.c $(NPCDOBJS) $(LDFLAGS) -lpthread
+ 
+ ###############################
+ #
+@@ -91,7 +91,7 @@
+ #
+ ###############################
+ npcdmod.o: npcdmod.c
+-	$(CC) $(MOD_CFLAGS) $(CFLAGS) -o npcdmod.o npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) -fPIC
++	$(CC) $(MOD_CFLAGS) $(CFLAGS) $(CPPFLAGS) -o npcdmod.o npcdmod.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS) -fPIC
+ 
+ ###############################
+ #

debian/patches/install_opts

@@ -0,0 +1,16 @@
+Description: Disable INSTALL_OPTS
+Author: Markus Frosch <lazyfrosch@debian.org>
+Last-Update: 2014-10-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/configure.ac
++++ b/configure.ac
+@@ -116,7 +116,7 @@
+ AC_SUBST(nagios_grp)
+ AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_USER,"$nagios_user")
+ AC_DEFINE_UNQUOTED(DEFAULT_NAGIOS_GROUP,"$nagios_grp")
+-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
++INSTALL_OPTS=""
+ AC_SUBST(INSTALL_OPTS)
+ 
+ # Checks for programs.

debian/patches/privacy-warning

@@ -0,0 +1,23 @@
+Description: Remove flattr link code from documentation
+ The code is actually not used, because the flattr JS stuff is not included.
+ .
+ But we are disabling it anyways.
+Author: Markus Frosch <markus@lazyfrosch.de>
+Last-Update: 2014-10-26
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/share/pnp/documents/de_DE/start.html
++++ b/share/pnp/documents/de_DE/start.html
+@@ -12,12 +12,6 @@
+ </div>
+ 
+ <p>
+-
+-<div class="flattr_left"><a class="FlattrButton" style="display:none;" title="PNP Dokumentation" href="http://docs.pnp4nagios.org/de/pnp-0.6/start" rev="flattr;uid:44827;category:text;language:de;tags:;">PNP4Nagios Dokumentation Version 0.6.x[...]</a></div>
+-</p>
+-
+-<p>
+-
+ <a href="/_detail/pnp-0.6/gallery/pnp-preview-05-08-2009.png?id=de%3Apnp-0.6%3Astart" class="media" title="pnp-0.6:gallery:pnp-preview-05-08-2009.png"><img src="/_media/pnp-0.6/gallery/pnp-preview-05-08-2009.png?w=215" class="mediaright" align="right" title="Theme &quot;smoothness&quot;" alt="Theme &quot;smoothness&quot;" width="215" /></a>
+ </p>
+ 

debian/patches/series

@@ -0,0 +1,9 @@
+fix-path-fpdi
+apache-fix-path-to-userfile
+fix-npcd-path
+fix-nagios-url
+adjust-template-path
+privacy-warning
+config_instances
+install_opts
+hardening

debian/pnp4nagios-bin.examples

@@ -0,0 +1 @@
+debian/icinga/npcdmod.cfg

debian/pnp4nagios-bin.install

@@ -0,0 +1,12 @@
+etc/pnp4nagios/nagios.cfg
+etc/pnp4nagios/check_commands/
+etc/pnp4nagios/*.cfg
+usr/lib/pnp4nagios/
+../../scripts/verify_pnp_config_v2.pl /usr/lib/pnp4nagios/libexec/
+usr/sbin/npcd
+usr/share/doc/pnp4nagios/examples/*.cfg
+usr/share/doc/pnp4nagios/examples/check_commands/
+usr/share/man/man8/npcd.8
+var/log/pnp4nagios/stats/
+var/lib/pnp4nagios/perfdata/
+var/spool/pnp4nagios/

debian/pnp4nagios-bin.npcd.default

@@ -0,0 +1,7 @@
+# Default settings for the NPCD init script.
+
+# Should NPCD be started? ("yes" to enable)
+RUN="no"
+
+# Additional options that are passed to the daemon.
+DAEMON_OPTS="-d -f /etc/pnp4nagios/npcd.cfg"

debian/pnp4nagios-bin.npcd.init

@@ -0,0 +1,204 @@
+#!/bin/sh
+#
+# init.d script for NPCD of PNP4Nagios
+#
+# Based on a example script of Javier Fernandez-Sanguino
+# Copyright (c) 2007 Javier Fernandez-Sanguino <jfs@debian.org>
+# Copyright (c) 2009 Sven Velt <sven@velt.de>
+#
+### BEGIN INIT INFO
+# Provides:          npcd
+# Required-Start:    $network $local_fs $remote_fs
+# Required-Stop:     $network $local_fs $remote_fs
+# Should-Start:
+# Should-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Nagios Performance C Daemon
+# Description:       Speed up processing of Nagios' performance data
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+DAEMON=/usr/sbin/npcd
+NAME=npcd
+DESC="Nagios Performance C Daemon (PNP4Nagios)"
+LOGDIR=/var/log/pnp4nagios
+
+PIDFILE=/var/run/$NAME.pid
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+# Default options, these can be overriden by the information
+# at /etc/default/$NAME
+DAEMON_OPTS=""
+DIETIME=10
+STARTTIME=2
+LOGFILE=$LOGDIR/$NAME.log
+
+# Include defaults if available
+if [ -f /etc/default/npcd ] ; then
+	. /etc/default/npcd
+fi
+
+# Check if RUN is set to "yes" in /etc/defaults/npcd
+if [ "x$RUN" != "xyes" ] ; then
+	echo "$NAME has been disabled in /etc/default/npcd."
+	exit 0
+fi
+
+set -e
+
+# Check if a given process pid's cmdline matches a given name
+running_pid() {
+	pid=$1
+	name=$2
+	[ -z "$pid" ] && return 1
+	[ ! -d /proc/$pid ] &&  return 1
+	cmd=`cat /proc/$pid/cmdline | tr "\000" "\n" | head -n 1 | cut -d : -f 1`
+	# Is this the expected server
+	[ "$cmd" != "$name" ] &&  return 1
+	return 0
+}
+
+# Check if the process is running looking at /proc
+# (works for all users)
+running() {
+	# No pidfile, probably no daemon present
+	[ ! -f "$PIDFILE" ] && return 1
+	pid=`cat $PIDFILE`
+	running_pid $pid $DAEMON || return 1
+	return 0
+}
+
+# Start the process using the wrapper
+start_server() {
+	start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
+	errcode=$?
+	return $errcode
+}
+
+# Stop the process using the wrapper
+stop_server() {
+	killproc -p $PIDFILE $DAEMON
+	errcode=$?
+	return $errcode
+}
+
+reload_server() {
+	[ ! -f "$PIDFILE" ] && return 1
+	pid=pidofproc $PIDFILE # This is the daemon's pid
+	# Send a SIGHUP
+	kill -1 $pid
+	return $?
+}
+
+# Force the process to die killing it manually
+force_stop() {
+	[ ! -e "$PIDFILE" ] && return
+	if running ; then
+		kill -15 $pid
+		# Is it really dead?
+		sleep "$DIETIME"s
+		if running ; then
+			kill -9 $pid
+			sleep "$DIETIME"s
+			if running ; then
+				echo "Cannot kill $NAME (pid=$pid)!"
+				exit 1
+			fi
+		fi
+	fi
+	rm -f $PIDFILE
+}
+
+case "$1" in
+	start)
+		log_daemon_msg "Starting $DESC" "$NAME"
+		# Check if it's running first
+		if running ;  then
+			log_progress_msg "apparently already running"
+			log_end_msg 0
+			exit 0
+		fi
+		if start_server ; then
+			# NOTE: Some servers might die some time after they start,
+			# this code will detect this issue if STARTTIME is set
+			# to a reasonable value
+			[ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
+			if  running ;  then
+				# It's ok, the server started and is running
+				log_end_msg 0
+			else
+				# It is not running after we did start
+				log_end_msg 1
+			fi
+		else
+			# Either we could not start it
+			log_end_msg 1
+		fi
+		;;
+	stop)
+		log_daemon_msg "Stopping $DESC" "$NAME"
+		if running ; then
+			# Only stop the server if we see it running
+			errcode=0
+			stop_server || errcode=$?
+			log_end_msg $errcode
+		else
+			# If it's not running don't do anything
+			log_progress_msg "apparently not running"
+			log_end_msg 0
+			exit 0
+		fi
+		;;
+	force-stop)
+		# First try to stop gracefully the program
+		$0 stop
+		if running; then
+			# If it's still running try to kill it more forcefully
+			log_daemon_msg "Stopping (force) $DESC" "$NAME"
+			errcode=0
+			force_stop || errcode=$?
+			log_end_msg $errcode
+		fi
+		;;
+	restart|force-reload)
+		log_daemon_msg "Restarting $DESC" "$NAME"
+		errcode=0
+		stop_server || errcode=$?
+		# Wait some sensible amount, some server need this
+		[ -n "$DIETIME" ] && sleep $DIETIME
+		start_server || errcode=$?
+		[ -n "$STARTTIME" ] && sleep $STARTTIME
+		running || errcode=$?
+		log_end_msg $errcode
+		;;
+	status)
+
+		log_daemon_msg "Checking status of $DESC" "$NAME"
+		if running ;  then
+			log_progress_msg "running"
+			log_end_msg 0
+		else
+			log_progress_msg "apparently not running"
+			log_end_msg 1
+			exit 1
+		fi
+		;;
+		# Use this if the daemon cannot reload
+		reload)
+		log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+		log_warning_msg "cannot re-read the config file (use restart)."
+		exit 1
+		;;
+	*)
+		N=/etc/init.d/$NAME
+		echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+		exit 1
+		;;
+esac
+
+exit 0

debian/pnp4nagios-bin.pnp_gearman_worker.default

@@ -0,0 +1,11 @@
+# Default settings for the pnp_gearman_worker init script.
+
+# Should the gearman worker daemon be started? ("yes" to enable)
+RUN="no"
+
+# Additional options that are passed to the daemon.
+DAEMON_OPTS="--config=/etc/pnp4nagios/process_perfdata.cfg"
+
+# Change to this user before starting the daemon.
+# Note: the daemon refuses to start as root.
+USER=nagios

debian/pnp4nagios-bin.pnp_gearman_worker.init

@@ -0,0 +1,210 @@
+#!/bin/sh
+#
+# init.d script for the Gearman worker daemon of PNP4Nagios
+#
+# Based on an example script for NPCD of Javier Fernandez-Sanguino
+# Copyright (c) 2007 Javier Fernandez-Sanguino <jfs@debian.org>
+# Copyright (c) 2011 Sebastian Harl <tokkee@debian.org>
+#
+### BEGIN INIT INFO
+# Provides:          pnp_gearman_worker
+# Required-Start:    $network $local_fs $remote_fs
+# Required-Stop:     $network $local_fs $remote_fs
+# Should-Start:
+# Should-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: PNP4Nagios Gearman worker daemon
+# Description:       Processing of Nagios' perf data in distributed setups
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+DAEMON=/usr/lib/pnp4nagios/libexec/process_perfdata.pl
+NAME=pnp_gearman_worker
+DESC="PNP4Nagios Gearman worker daemon"
+
+PIDFILE=/var/run/pnp4nagios/$NAME.pid
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+# Default options, these can be overriden by the information
+# at /etc/default/$NAME
+DAEMON_OPTS=""
+DIETIME=10
+STARTTIME=2
+USER=nagios
+
+if [ -f /etc/default/pnp_gearman_worker ] ; then
+	. /etc/default/pnp_gearman_worker
+fi
+
+if [ "x$RUN" != "xyes" ] ; then
+	echo "$NAME has been disabled in /etc/default/pnp_gearman_worker."
+	exit 0
+fi
+
+set -e
+
+# Check if a given process pid's cmdline matches a given name
+running_pid() {
+	pid=$1
+	name=$2
+	[ -z "$pid" ] && return 1
+	[ ! -d /proc/$pid ] &&  return 1
+	cmd=`cat /proc/$pid/cmdline | tr "\000" "\n" | head -n 1 | cut -d : -f 1`
+	# Is this the expected server
+	[ "$cmd" != "$name" ] &&  return 1
+	return 0
+}
+
+# Check if the process is running looking at /proc
+# (works for all users)
+running() {
+	# No pidfile, probably no daemon present
+	[ ! -f "$PIDFILE" ] && return 1
+	pid=`cat $PIDFILE`
+	running_pid "$pid" $DAEMON \
+		|| running_pid "$pid" "/usr/bin/perl" || return 1
+	return 0
+}
+
+# Start the process using the wrapper
+start_server() {
+	if ! perl -MGearman::Worker -e '1;' > /dev/null 2>&1 \
+			|| ! perl -MMIME::Base64 -e '1;' > /dev/null 2>&1 \
+			|| ! perl -MCrypt::Rijndael -e '1;' > /dev/null 2>&1; then
+		echo "$NAME requires the Gearman::Worker, MIME::Base64 and" >&2
+		echo "Crypt::Rijndael Perl modules. Make sure that the packages" >&2
+		echo "perl, libgearman-client-perl and libcrypt-rijndael-perl" >&2
+		echo "are installed." >&2
+		exit 1
+	fi
+
+	if [ -d /var/run/pnp4nagios ]; then
+		chmod 755 /var/run/pnp4nagios
+		chown nagios.nagios /var/run/pnp4nagios
+	else
+		install -d -m 755 -o nagios -g nagios /var/run/pnp4nagios
+	fi
+
+	start_opts="--start --quiet --oknodo --pidfile $PIDFILE"
+	if [ -n "$USER" ]; then
+		start_opts="$start_opts --chuid $USER"
+	fi
+	start-stop-daemon $start_opts --exec $DAEMON -- \
+		--pidfile=$PIDFILE --gearman --daemon $DAEMON_OPTS
+	errcode=$?
+	return $errcode
+}
+
+# Stop the process using the wrapper
+stop_server() {
+	killproc -p $PIDFILE $DAEMON
+	errcode=$?
+	return $errcode
+}
+
+# Force the process to die killing it manually
+force_stop() {
+	[ ! -e "$PIDFILE" ] && return
+	if running ; then
+		kill -15 $pid
+		# Is it really dead?
+		sleep "$DIETIME"s
+		if running ; then
+			kill -9 $pid
+			sleep "$DIETIME"s
+			if running ; then
+				echo "Cannot kill $NAME (pid=$pid)!"
+				exit 1
+			fi
+		fi
+	fi
+	rm -f $PIDFILE
+}
+
+case "$1" in
+	start)
+		log_daemon_msg "Starting $DESC" "$NAME"
+		# Check if it's running first
+		if running ;  then
+			log_progress_msg "apparently already running"
+			log_end_msg 0
+			exit 0
+		fi
+		if start_server ; then
+			# NOTE: Some servers might die some time after they start,
+			# this code will detect this issue if STARTTIME is set
+			# to a reasonable value
+			[ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
+			if  running ;  then
+				# It's ok, the server started and is running
+				log_end_msg 0
+			else
+				# It is not running after we did start
+				log_end_msg 1
+			fi
+		else
+			# Either we could not start it
+			log_end_msg 1
+		fi
+		;;
+	stop)
+		log_daemon_msg "Stopping $DESC" "$NAME"
+		if running ; then
+			# Only stop the server if we see it running
+			errcode=0
+			stop_server || errcode=$?
+			log_end_msg $errcode
+		else
+			# If it's not running don't do anything
+			log_progress_msg "apparently not running"
+			log_end_msg 0
+			exit 0
+		fi
+		;;
+	force-stop)
+		# First try to stop gracefully the program
+		$0 stop
+		if running; then
+			# If it's still running try to kill it more forcefully
+			log_daemon_msg "Stopping (force) $DESC" "$NAME"
+			errcode=0
+			force_stop || errcode=$?
+			log_end_msg $errcode
+		fi
+		;;
+	restart|force-reload)
+		log_daemon_msg "Restarting $DESC" "$NAME"
+		errcode=0
+		stop_server || errcode=$?
+		# Wait some sensible amount, some server need this
+		[ -n "$DIETIME" ] && sleep $DIETIME
+		start_server || errcode=$?
+		[ -n "$STARTTIME" ] && sleep $STARTTIME
+		running || errcode=$?
+		log_end_msg $errcode
+		;;
+	status)
+
+		log_daemon_msg "Checking status of $DESC" "$NAME"
+		if running ;  then
+			log_progress_msg "running"
+			log_end_msg 0
+		else
+			log_progress_msg "apparently not running"
+			log_end_msg 1
+			exit 1
+		fi
+		;;
+	*)
+		N=/etc/init.d/$NAME
+		echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+		exit 1
+		;;
+esac
+
+exit 0

debian/pnp4nagios-bin.postinst

@@ -0,0 +1,78 @@
+#!/bin/sh
+# postinst script for pnp4nagios-bin
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+setperm() {
+	user="$1"
+	group="$2"
+	mode="$3"
+	file="$4"
+	shift 4
+	# only do something when no setting exists
+	if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
+		chown "$user":"$group" "$file"
+		chmod "$mode" "$file"
+	fi
+}
+
+case "$1" in
+	configure)
+		if ! getent passwd nagios > /dev/null ; then
+			echo 'Adding system-user for nagios' 1>&2
+			adduser --system --group --home /var/lib/nagios \
+				--disabled-login --force-badname nagios > /dev/null
+		fi
+		setperm nagios www-data	750 /var/lib/pnp4nagios
+		setperm nagios nagios   755 /var/lib/pnp4nagios/perfdata
+		setperm nagios www-data	750 /var/log/pnp4nagios
+		setperm nagios nagios	750 /var/log/pnp4nagios/stats
+		setperm nagios nagios	770 /var/spool/pnp4nagios
+		setperm nagios nagios	770 /var/spool/pnp4nagios/nagios
+		setperm nagios nagios	770 /var/spool/pnp4nagios/npcd
+
+		setperm root nagios	640 /etc/pnp4nagios/process_perfdata.cfg
+
+		if [ -d /etc/nagios3/conf.d/ ]; then
+			if [ ! -e /etc/nagios3/conf.d/pnp4nagios.cfg ]; then
+				ln -s /etc/pnp4nagios/nagios.cfg /etc/nagios3/conf.d/pnp4nagios.cfg
+			fi
+		fi
+		if [ -d /etc/icinga/objects/ ]; then
+			if [ ! -e /etc/icinga/objects/pnp4nagios.cfg ]; then
+				ln -s /etc/pnp4nagios/nagios.cfg /etc/icinga/objects/pnp4nagios.cfg
+			fi
+		fi
+
+	;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+

debian/pnp4nagios-bin.postrm

@@ -0,0 +1,57 @@
+#!/bin/sh
+# postrm script for pnp4nagios-bin
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+	purge|remove)
+		if [ -d /etc/nagios3/conf.d/ ]; then
+			if [ -L /etc/nagios3/conf.d/pnp4nagios.cfg ]; then
+				ls -l /etc/nagios3/conf.d/pnp4nagios.cfg | grep -q /etc/pnp4nagios/nagios.cfg
+				if [ $? -eq 0 ]; then
+					rm -f /etc/nagios3/conf.d/pnp4nagios.cfg
+				fi
+			fi
+		fi
+		if [ -d /etc/icinga/objects/ ]; then
+			if [ -L /etc/icinga/objects/pnp4nagios.cfg ]; then
+				ls -l /etc/icinga/objects/pnp4nagios.cfg | grep -q /etc/pnp4nagios/nagios.cfg
+				if [ $? -eq 0 ]; then
+					rm -f /etc/icinga/objects/pnp4nagios.cfg
+				fi
+			fi
+		fi
+
+	;;
+	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+	;;
+
+	*)
+		echo "postrm called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+

debian/pnp4nagios-web-config-icinga.install

@@ -0,0 +1,2 @@
+debian/icinga/config.icinga.php etc/pnp4nagios
+debian/icinga/pnp4nagios.conf   etc/apache2/conf-available

debian/pnp4nagios-web-config-icinga.lintian-overrides

@@ -0,0 +1,7 @@
+# ignoring apache2 warning
+# this is actually not a problem, because the handling is backwards compatible
+apache2-reverse-dependency-calls-invoke-rc.d postrm
+apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
+apache2-reverse-dependency-calls-invoke-rc.d postinst
+# we actually want that
+non-standard-apache2-configuration-name pnp4nagios.conf != pnp4nagios-web-config-icinga.conf

debian/pnp4nagios-web-config-icinga.postinst

@@ -0,0 +1,63 @@
+#!/bin/sh
+# postinst script for pnp4nagios-web-config-icinga
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+	configure)
+        echo "enabling Apache2 config..."
+
+        COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+
+        # NEW method for Apache >= 2.4
+        if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
+            . /usr/share/apache2/apache2-maintscript-helper
+
+            apache2_invoke enmod rewrite
+            apache2_invoke enconf pnp4nagios
+
+            # remove OLD Apache 2.2 link
+            [ -L /etc/apache2/conf.d/pnp4nagios-web.conf ] && rm /etc/apache2/conf.d/pnp4nagios-web.conf
+
+        # OLD methods for Apache < 2.4
+        elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
+            # enable mod rewrite
+            [ -f /etc/apache2/mods-enabled/rewrite.load ] || a2enmod rewrite
+
+            # create symlink if not existing
+            [ -f /etc/apache2/conf.d/pnp4nagios.conf ] || ln -vs ../conf-available/pnp4nagios.conf /etc/apache2/conf.d/pnp4nagios.conf
+
+            # reload webserver
+            [ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload
+        fi
+	;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/pnp4nagios-web-config-icinga.postrm

@@ -0,0 +1,54 @@
+#!/bin/sh
+# postrm script for pnp4nagios-web-config-icinga
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+	purge|remove)
+		# Apache2
+		if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+			echo "disabling Apache2 configuration ..."
+			. /usr/share/apache2/apache2-maintscript-helper
+			apache2_invoke disconf pnp4nagios-web
+		fi
+
+		if [ -L /etc/apache2/conf.d/pnp4nagios-web.conf ]; then
+			echo "removing link /etc/apache2/conf.d/pnp4nagios-web.conf ..."
+			# remove link to config
+			rm -f /etc/apache2/conf.d/pnp4nagios-web.conf
+			# reload webserver
+			[ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload || true
+		fi
+	;;
+	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+	;;
+
+	*)
+		echo "postrm called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+

debian/pnp4nagios-web-config-nagios3.install

@@ -0,0 +1,2 @@
+debian/nagios3/config.nagios3.php etc/pnp4nagios
+debian/nagios3/pnp4nagios.conf    etc/apache2/conf-available

debian/pnp4nagios-web-config-nagios3.lintian-overrides

@@ -0,0 +1,7 @@
+# ignoring apache2 warning
+# this is actually not a problem, because the handling is backwards compatible
+apache2-reverse-dependency-calls-invoke-rc.d postrm
+apache2-reverse-dependency-calls-wrapper-script postinst a2enmod
+apache2-reverse-dependency-calls-invoke-rc.d postinst
+# we actually want that
+non-standard-apache2-configuration-name pnp4nagios.conf != pnp4nagios-web-config-nagios3.conf

debian/pnp4nagios-web-config-nagios3.postinst

@@ -0,0 +1,63 @@
+#!/bin/sh
+# postinst script for pnp4nagios-web-config-nagios3
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+	configure)
+        echo "enabling Apache2 config..."
+
+        COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
+
+        # NEW method for Apache >= 2.4
+        if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
+            . /usr/share/apache2/apache2-maintscript-helper
+
+            apache2_invoke enmod rewrite
+            apache2_invoke enconf pnp4nagios
+
+            # remove OLD Apache 2.2 link
+            [ -L /etc/apache2/conf.d/pnp4nagios-web.conf ] && rm /etc/apache2/conf.d/pnp4nagios-web.conf
+
+        # OLD methods for Apache < 2.4
+        elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
+            # enable mod rewrite
+            [ -f /etc/apache2/mods-enabled/rewrite.load ] || a2enmod rewrite
+
+            # create symlink if not existing
+            [ -f /etc/apache2/conf.d/pnp4nagios.conf ] || ln -vs ../conf-available/pnp4nagios.conf /etc/apache2/conf.d/pnp4nagios.conf
+
+            # reload webserver
+            [ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload
+        fi
+	;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0

debian/pnp4nagios-web-config-nagios3.postrm

@@ -0,0 +1,54 @@
+#!/bin/sh
+# postrm script for pnp4nagios-web-config-nagios3
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+	purge|remove)
+		# Apache2
+		if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+			echo "disabling Apache2 configuration ..."
+			. /usr/share/apache2/apache2-maintscript-helper
+			apache2_invoke disconf pnp4nagios-web
+		fi
+
+		if [ -L /etc/apache2/conf.d/pnp4nagios-web.conf ]; then
+			echo "removing link /etc/apache2/conf.d/pnp4nagios-web.conf ..."
+			# remove link to config
+			rm -f /etc/apache2/conf.d/pnp4nagios-web.conf
+			# reload webserver
+			[ -x $(which invoke-rc.d) ] && invoke-rc.d apache2 reload || true
+		fi
+	;;
+	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+	;;
+
+	*)
+		echo "postrm called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+

debian/pnp4nagios-web.examples

@@ -0,0 +1 @@
+sample-config/httpd.conf

debian/pnp4nagios-web.install

@@ -0,0 +1,13 @@
+etc/pnp4nagios/config.php
+etc/pnp4nagios/background.pdf
+etc/pnp4nagios/templates/
+etc/pnp4nagios/templates.d/
+etc/pnp4nagios/pages/
+etc/pnp4nagios/templates.special/
+etc/pnp4nagios/pnp4nagios_release
+usr/share/doc/pnp4nagios/examples/templates.special/
+usr/share/doc/pnp4nagios/examples/pages/
+usr/share/doc/pnp4nagios/examples/ssi/
+usr/share/pnp4nagios/html/
+var/log/pnp4nagios/kohana/
+var/lib/pnp4nagios/

debian/pnp4nagios-web.links

@@ -0,0 +1,6 @@
+/usr/share/php/fpdf /usr/share/pnp4nagios/html/application/vendor/fpdf
+/usr/share/php/fpdi /usr/share/pnp4nagios/html/application/vendor/fpdi
+/usr/share/javascript/jquery/jquery.min.js /usr/share/pnp4nagios/html/media/js/jquery-min.js
+/usr/share/javascript/jquery-ui/jquery-ui.js /usr/share/pnp4nagios/html/media/js/jquery-ui.min.js
+/usr/share/javascript/jquery-mobile/jquery.mobile.min.js /usr/share/pnp4nagios/html/media/js/jquery.mobile.min.js
+/usr/share/javascript/jquery-mobile/jquery.mobile.min.css /usr/share/pnp4nagios/html/media/css/jquery.mobile.min.css

debian/pnp4nagios-web.postinst

@@ -0,0 +1,60 @@
+#!/bin/sh
+# postinst script for pnp4nagios-web
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+setperm() {
+	user="$1"
+	group="$2"
+	mode="$3"
+	file="$4"
+	shift 4
+	# only do something when no setting exists
+	if ! dpkg-statoverride --list "$file" >/dev/null 2>&1; then
+		chown "$user":"$group" "$file"
+		chmod "$mode" "$file"
+	fi
+}
+
+case "$1" in
+	configure)
+		if ! getent passwd nagios > /dev/null ; then
+			echo 'Adding system-user for nagios' 1>&2
+			adduser --system --group --home /var/lib/nagios \
+				--disabled-login --force-badname nagios > /dev/null
+		fi
+		setperm nagios www-data	750 /var/lib/pnp4nagios
+		setperm nagios nagios   755 /var/lib/pnp4nagios/perfdata
+		setperm nagios www-data	750 /var/log/pnp4nagios
+	;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+	;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 1
+	;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+

debian/rules

@@ -0,0 +1,113 @@
+#!/usr/bin/make -f
+# debian/rules for PNP4Nagios
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+CFLAGS += -Wextra
+
+%:
+	dh $@ --with autoreconf,autotools_dev
+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--with-layout=debian \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--without-kohana \
+		--with-kohana_system=/usr/share/php/kohana2/system
+
+override_dh_auto_build:
+	dh_auto_build -- all
+	python -m jsmin share/pnp/media/js/jquery.imgareaselect.js \
+	              > share/pnp/media/js/jquery.imgareaselect.min.js
+
+override_dh_auto_install:
+	dh_auto_install -- install-config
+
+	# Ignore install.php (for future debugging don't delete it)
+	touch debian/tmp/usr/share/pnp4nagios/html/install.ignore
+
+	mkdir -p debian/tmp/usr/share/doc/pnp4nagios/examples/
+
+	# Move template config dir to /etc/pnp4nagios/templates
+	rmdir debian/tmp/usr/share/pnp4nagios/html/templates
+	mkdir debian/tmp/etc/pnp4nagios/templates
+	mv debian/tmp/usr/share/pnp4nagios/html/templates.special \
+		debian/tmp/usr/share/doc/pnp4nagios/examples/
+	mkdir debian/tmp/etc/pnp4nagios/templates.special
+
+	mkdir -p debian/tmp/usr/sbin/
+	mv debian/tmp/usr/bin/npcd \
+		debian/tmp/usr/sbin/
+
+	mv debian/tmp/etc/pnp4nagios/rra.cfg-sample \
+		debian/tmp/etc/pnp4nagios/rra.cfg
+
+	mv debian/tmp/etc/pnp4nagios/nagios.cfg-sample \
+		debian/tmp/usr/share/doc/pnp4nagios/examples/nagios.cfg
+
+	mv debian/tmp/etc/pnp4nagios/misccommands.cfg-sample \
+		debian/tmp/usr/share/doc/pnp4nagios/examples/misccommands.cfg
+
+	mkdir debian/tmp/usr/share/doc/pnp4nagios/examples/check_commands
+	mv debian/tmp/etc/pnp4nagios/check_commands/check_nwstat.cfg-sample \
+		debian/tmp/usr/share/doc/pnp4nagios/examples/check_commands/check_nwstat.cfg
+
+	mkdir debian/tmp/usr/share/doc/pnp4nagios/examples/pages
+	mv debian/tmp/etc/pnp4nagios/pages/web_traffic.cfg-sample \
+		debian/tmp/usr/share/doc/pnp4nagios/examples/pages/web_traffic.cfg
+
+	cp -av contrib/ssi debian/tmp/usr/share/doc/pnp4nagios/examples/
+	rm -fv debian/tmp/usr/share/doc/pnp4nagios/examples/ssi/*.in
+
+	# Icinga module sample configuration
+	cp debian/icinga-module.cfg debian/tmp/usr/share/doc/pnp4nagios/examples/
+
+	# Remove external PHP classes/libraries: FPDF, FPDF-TPL, FPDI
+	rm -r debian/tmp/usr/share/pnp4nagios/html/application/vendor/fpdf
+
+	# remove source files
+	rm debian/tmp/usr/share/pnp4nagios/html/media/js/jquery.imgareaselect.Debian.txt
+	rm debian/tmp/usr/share/pnp4nagios/html/media/js/jquery.imgareaselect.js
+
+	# Remove external JavaScript files: jQuery and jQuery-UI
+	# no longer present in DFSG tarball
+	#rm debian/tmp/usr/share/pnp4nagios/html/media/js/jquery-min.js
+	#rm debian/tmp/usr/share/pnp4nagios/html/media/js/jquery-ui.min.js
+
+	# Clean up some files
+	rmdir debian/tmp/usr/bin
+	mv debian/tmp/etc/pnp4nagios/check_commands/check_all_local_disks.cfg-sample \
+		debian/tmp/etc/pnp4nagios/check_commands/check_all_local_disks.cfg
+	rm debian/tmp/etc/pnp4nagios/check_commands/check_nrpe.cfg-sample
+
+	# Add Debian specific config and placeholder files
+	#touch debian/tmp/etc/pnp4nagios/pages/.placeholder
+	cp -av debian/nagios.cfg debian/tmp/etc/pnp4nagios/
+	cp -av debian/check_commands/* debian/tmp/etc/pnp4nagios/check_commands/
+
+	# Remove unnecessary config files (duplicates)
+	rm -f debian/tmp/etc/pnp4nagios/config_local.php
+	rm -f debian/tmp/etc/pnp4nagios/config.php.0.6*
+
+	# Add subdirs to /var/spool/pnp4nagios/ to prepare for different modes
+	mkdir debian/tmp/var/spool/pnp4nagios/nagios
+	mkdir debian/tmp/var/spool/pnp4nagios/npcd
+
+	# Delete not used and empty directories
+	#rmdir debian/tmp/usr/share/pnp4nagios/html/application/logs/
+	rmdir debian/tmp/usr/share/pnp4nagios/html/application/cache/
+	rmdir debian/tmp/usr/share/pnp4nagios/html/application/hooks/
+	#rmdir debian/tmp/usr/share/pnp4nagios/html/application/libraries/
+
+	mkdir debian/tmp/etc/pnp4nagios/templates.d
+	cp debian/README.templates.d debian/tmp/etc/pnp4nagios/templates.d/README
+
+override_dh_installinit:
+	dh_installinit -ppnp4nagios-bin --name=npcd
+	dh_installinit -ppnp4nagios-bin --name=pnp_gearman_worker
+
+# vi: noexpandtab ts=4 sw=4 :

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/watch

@@ -0,0 +1,3 @@
+version=3
+opts="dversionmangle=s/\+dfsg\d*//,uversionmangle=s/\.rc/~rc/" \
+http://sf.net/pnp4nagios/pnp4nagios-(.+)\.tar\.gz

scripts/check_pnp_rrds.pl.in

@@ -1,7 +1,7 @@
 #!@PERL@
 # nagios: -epn
 ## check_pnp_rrds - PNP4Nagios.
-## Copyright (c) 2006-2015 Joerg Linge (http://www.pnp4nagios.org)
+## Copyright (c) 2006-2009 Joerg Linge (http://www.pnp4nagios.org)
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

scripts/process_perfdata.pl.in

@@ -1,7 +1,7 @@
 #!@PERL@
 # nagios: -epn
 ## @PKG_NAME@–@PKG_VERSION@
-## Copyright (c) 2005-2015 Joerg Linge (http://www.pnp4nagios.org)
+## Copyright (c) 2005-2010 Joerg Linge (http://www.pnp4nagios.org)
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License
@@ -1548,7 +1548,7 @@ sub read_keyfile {
 sub print_help {
     print <<EOD;
 
-  Copyright (c) 2005-2015 Joerg Linge <pitchfork\@pnp4nagios.org>
+  Copyright (c) 2005-2010 Joerg Linge <pitchfork\@pnp4nagios.org>
   Use process_perfdata.pl to store Nagios Plugin Performance Data into RRD Databases
 
   Options:

scripts/rrd_convert.pl.in

@@ -1,6 +1,6 @@
 #!@PERL@
 ## @PKG_NAME@–@PKG_VERSION@ rrd_convert.pl
-## Copyright (c) 2006-2015 Joerg Linge (http://www.pnp4nagios.org)
+## Copyright (c) 2006-2010 Joerg Linge (http://www.pnp4nagios.org)
 ##
 ## This program is free software; you can redistribute it and/or
 ## modify it under the terms of the GNU General Public License

scripts/rrd_modify.pl.in

@@ -2,7 +2,7 @@
 # nagios: -epn
 ## @PKG_NAME@–@PKG_VERSION@
 #
-# Copyright (c) 2006-2015 PNP4Nagios Developer Team (http://www.pnp4nagios.org)
+# Copyright (c) 2012 PNP4Nagios Developer Team (http://www.pnp4nagios.org)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License

share/pnp/application/controllers/graph.php

@@ -48,7 +48,7 @@ class Graph_Controller extends System_Controller  {
         if($this->host != "" && $this->service != ""){
             $this->service = pnp::clean($this->service);
             $this->host    = pnp::clean($this->host);
-            $this->url     = "?host=".urlencode($this->host)."&srv=".urlencode($this->service);
+            $this->url     = "?host=".$this->host."&srv=".$this->service;
             $services      = $this->data->getServices($this->host);
             #Landingpage for mobile devices
             if($this->isMobileDevice()){

share/pnp/application/controllers/system.php

@@ -23,13 +23,13 @@ class System_Controller extends Template_Controller {
         // Check for mod_rewrite
         $this->check_mod_rewrite();
 
-        $this->start             = $this->input->get('start',FALSE);
-        $this->end               = $this->input->get('end',FALSE);
+        $this->start             = pnp::clean($this->input->get('start',FALSE));
+        $this->end               = pnp::clean($this->input->get('end',FALSE));
         $this->theme             = pnp::clean($this->input->get('theme',FALSE));
         $this->view              = pnp::clean($this->input->get('view', ""));
         $this->host              = pnp::clean($this->input->get('host',NULL));
         $this->service           = pnp::clean($this->input->get('srv',NULL));
-        $this->source            = pnp::clean($this->input->get('source',NULL));
+        $this->source            = pnp::clean($this->input->get('source',0));
         $this->version           = pnp::clean($this->input->get('version',NULL));
         $this->tpl               = pnp::clean($this->input->get('tpl'));
         $this->controller        = Router::$controller;

share/pnp/application/controllers/zoom.php

@@ -70,7 +70,7 @@ class Zoom_Controller extends System_Controller  {
             $this->template->source  = $this->source;
             $this->template->end     = $this->end;
             $this->template->start   = $this->start;
-            $this->url               = "?host=".urlencode($this->host)."&srv=".urlencode($this->service);
+            $this->url               = "?host=".$this->host."&srv=".$this->service;
             $this->template->graph_height = $this->graph_height;
             $this->template->graph_width  = $this->graph_width;
         }else{

share/pnp/application/helpers/pnp.php

@@ -44,8 +44,6 @@ class pnp_Core {
     *
     */
     public static function zoom_icon($host,$service,$start,$end,$source,$view,$graph_width,$graph_height){
-        $service = urlencode(urlencode($service));
-        $host = urlencode(urlencode($host));
         print "<a href=\"javascript:Gzoom('".url::base(TRUE)."zoom?host=$host&srv=$service&view=$view&source=$source&end=$end&start=$start&graph_width=$graph_width&graph_height=$graph_height');\" title=\"Zoom into the Graph\"><img src=\"".url::base()."media/images/zoom.png\"></a>\n";
     }
 

share/pnp/application/models/data.php

@@ -661,7 +661,7 @@ class Data_Model extends System_Model
             if(!is_numeric($end)){
                 $timestamp = strtotime($end);
                 if(!$timestamp){
-                    throw new Kohana_User_Exception('Wrong Format', "End -> $end");
+                    throw new Kohana_User_Exception('Wrong Format', "$end");
                 }else{
                     $end = $timestamp;
                 }

share/pnp/application/vendor/fpdf/font/courier.php

@@ -1,8 +1,7 @@
-<?php
-$type = 'Core';
-$name = 'Courier';
-$up = -100;
-$ut = 50;
-for($i=0;$i<=255;$i++)
-	$cw[chr($i)] = 600;
-?>
+<?php
+for($i=0;$i<=255;$i++)
+	$fpdf_charwidths['courier'][chr($i)]=600;
+$fpdf_charwidths['courierB']=$fpdf_charwidths['courier'];
+$fpdf_charwidths['courierI']=$fpdf_charwidths['courier'];
+$fpdf_charwidths['courierBI']=$fpdf_charwidths['courier'];
+?>

share/pnp/application/vendor/fpdf/font/courierb.php

@@ -1,8 +0,0 @@
-<?php
-$type = 'Core';
-$name = 'Courier-Bold';
-$up = -100;
-$ut = 50;
-for($i=0;$i<=255;$i++)
-	$cw[chr($i)] = 600;
-?>

share/pnp/application/vendor/fpdf/font/courierbi.php

@@ -1,8 +0,0 @@
-<?php
-$type = 'Core';
-$name = 'Courier-BoldOblique';
-$up = -100;
-$ut = 50;
-for($i=0;$i<=255;$i++)
-	$cw[chr($i)] = 600;
-?>

share/pnp/application/vendor/fpdf/font/courieri.php

@@ -1,8 +0,0 @@
-<?php
-$type = 'Core';
-$name = 'Courier-Oblique';
-$up = -100;
-$ut = 50;
-for($i=0;$i<=255;$i++)
-	$cw[chr($i)] = 600;
-?>

share/pnp/application/vendor/fpdf/font/helvetica.php

@@ -1,19 +1,15 @@
-<?php
-$type = 'Core';
-$name = 'Helvetica';
-$up = -100;
-$ut = 50;
-$cw = array(
-	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
-	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
-	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
-	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
-	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
-	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
-	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
-	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
-	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
-?>
+<?php
+$fpdf_charwidths['helvetica']=array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
+	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
+	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
+	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
+	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+?>

share/pnp/application/vendor/fpdf/font/helveticab.php

@@ -1,19 +1,15 @@
-<?php
-$type = 'Core';
-$name = 'Helvetica-Bold';
-$up = -100;
-$ut = 50;
-$cw = array(
-	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
-	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
-	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
-	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
-	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
-	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
-	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
-	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
-	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
-?>
+<?php
+$fpdf_charwidths['helveticaB']=array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
+	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
+	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+?>

share/pnp/application/vendor/fpdf/font/helveticabi.php

@@ -1,19 +1,15 @@
-<?php
-$type = 'Core';
-$name = 'Helvetica-BoldOblique';
-$up = -100;
-$ut = 50;
-$cw = array(
-	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
-	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
-	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
-	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
-	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
-	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
-	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
-	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
-	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
-?>
+<?php
+$fpdf_charwidths['helveticaBI']=array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>333,'"'=>474,'#'=>556,'$'=>556,'%'=>889,'&'=>722,'\''=>238,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>333,';'=>333,'<'=>584,'='=>584,'>'=>584,'?'=>611,'@'=>975,'A'=>722,
+	'B'=>722,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>556,'K'=>722,'L'=>611,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>584,'_'=>556,'`'=>333,'a'=>556,'b'=>611,'c'=>556,'d'=>611,'e'=>556,'f'=>333,'g'=>611,'h'=>611,'i'=>278,'j'=>278,'k'=>556,'l'=>278,'m'=>889,
+	'n'=>611,'o'=>611,'p'=>611,'q'=>611,'r'=>389,'s'=>556,'t'=>333,'u'=>611,'v'=>556,'w'=>778,'x'=>556,'y'=>556,'z'=>500,'{'=>389,'|'=>280,'}'=>389,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>278,chr(131)=>556,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>278,chr(146)=>278,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>556,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>280,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>611,chr(182)=>556,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>556,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>611,chr(241)=>611,
+	chr(242)=>611,chr(243)=>611,chr(244)=>611,chr(245)=>611,chr(246)=>611,chr(247)=>584,chr(248)=>611,chr(249)=>611,chr(250)=>611,chr(251)=>611,chr(252)=>611,chr(253)=>556,chr(254)=>611,chr(255)=>556);
+?>

share/pnp/application/vendor/fpdf/font/helveticai.php

@@ -1,19 +1,15 @@
-<?php
-$type = 'Core';
-$name = 'Helvetica-Oblique';
-$up = -100;
-$ut = 50;
-$cw = array(
-	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
-	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
-	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
-	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
-	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
-	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
-	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
-	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
-	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
-?>
+<?php
+$fpdf_charwidths['helveticaI']=array(
+	chr(0)=>278,chr(1)=>278,chr(2)=>278,chr(3)=>278,chr(4)=>278,chr(5)=>278,chr(6)=>278,chr(7)=>278,chr(8)=>278,chr(9)=>278,chr(10)=>278,chr(11)=>278,chr(12)=>278,chr(13)=>278,chr(14)=>278,chr(15)=>278,chr(16)=>278,chr(17)=>278,chr(18)=>278,chr(19)=>278,chr(20)=>278,chr(21)=>278,
+	chr(22)=>278,chr(23)=>278,chr(24)=>278,chr(25)=>278,chr(26)=>278,chr(27)=>278,chr(28)=>278,chr(29)=>278,chr(30)=>278,chr(31)=>278,' '=>278,'!'=>278,'"'=>355,'#'=>556,'$'=>556,'%'=>889,'&'=>667,'\''=>191,'('=>333,')'=>333,'*'=>389,'+'=>584,
+	','=>278,'-'=>333,'.'=>278,'/'=>278,'0'=>556,'1'=>556,'2'=>556,'3'=>556,'4'=>556,'5'=>556,'6'=>556,'7'=>556,'8'=>556,'9'=>556,':'=>278,';'=>278,'<'=>584,'='=>584,'>'=>584,'?'=>556,'@'=>1015,'A'=>667,
+	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>722,'I'=>278,'J'=>500,'K'=>667,'L'=>556,'M'=>833,'N'=>722,'O'=>778,'P'=>667,'Q'=>778,'R'=>722,'S'=>667,'T'=>611,'U'=>722,'V'=>667,'W'=>944,
+	'X'=>667,'Y'=>667,'Z'=>611,'['=>278,'\\'=>278,']'=>278,'^'=>469,'_'=>556,'`'=>333,'a'=>556,'b'=>556,'c'=>500,'d'=>556,'e'=>556,'f'=>278,'g'=>556,'h'=>556,'i'=>222,'j'=>222,'k'=>500,'l'=>222,'m'=>833,
+	'n'=>556,'o'=>556,'p'=>556,'q'=>556,'r'=>333,'s'=>500,'t'=>278,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>500,'{'=>334,'|'=>260,'}'=>334,'~'=>584,chr(127)=>350,chr(128)=>556,chr(129)=>350,chr(130)=>222,chr(131)=>556,
+	chr(132)=>333,chr(133)=>1000,chr(134)=>556,chr(135)=>556,chr(136)=>333,chr(137)=>1000,chr(138)=>667,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>222,chr(146)=>222,chr(147)=>333,chr(148)=>333,chr(149)=>350,chr(150)=>556,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>500,chr(155)=>333,chr(156)=>944,chr(157)=>350,chr(158)=>500,chr(159)=>667,chr(160)=>278,chr(161)=>333,chr(162)=>556,chr(163)=>556,chr(164)=>556,chr(165)=>556,chr(166)=>260,chr(167)=>556,chr(168)=>333,chr(169)=>737,chr(170)=>370,chr(171)=>556,chr(172)=>584,chr(173)=>333,chr(174)=>737,chr(175)=>333,
+	chr(176)=>400,chr(177)=>584,chr(178)=>333,chr(179)=>333,chr(180)=>333,chr(181)=>556,chr(182)=>537,chr(183)=>278,chr(184)=>333,chr(185)=>333,chr(186)=>365,chr(187)=>556,chr(188)=>834,chr(189)=>834,chr(190)=>834,chr(191)=>611,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>278,chr(205)=>278,chr(206)=>278,chr(207)=>278,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>584,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>667,chr(222)=>667,chr(223)=>611,chr(224)=>556,chr(225)=>556,chr(226)=>556,chr(227)=>556,chr(228)=>556,chr(229)=>556,chr(230)=>889,chr(231)=>500,chr(232)=>556,chr(233)=>556,chr(234)=>556,chr(235)=>556,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>556,chr(241)=>556,
+	chr(242)=>556,chr(243)=>556,chr(244)=>556,chr(245)=>556,chr(246)=>556,chr(247)=>584,chr(248)=>611,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+?>

share/pnp/application/vendor/fpdf/font/symbol.php

@@ -1,19 +1,15 @@
-<?php
-$type = 'Core';
-$name = 'Symbol';
-$up = -100;
-$ut = 50;
-$cw = array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>713,'#'=>500,'$'=>549,'%'=>833,'&'=>778,'\''=>439,'('=>333,')'=>333,'*'=>500,'+'=>549,
-	','=>250,'-'=>549,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>549,'='=>549,'>'=>549,'?'=>444,'@'=>549,'A'=>722,
-	'B'=>667,'C'=>722,'D'=>612,'E'=>611,'F'=>763,'G'=>603,'H'=>722,'I'=>333,'J'=>631,'K'=>722,'L'=>686,'M'=>889,'N'=>722,'O'=>722,'P'=>768,'Q'=>741,'R'=>556,'S'=>592,'T'=>611,'U'=>690,'V'=>439,'W'=>768,
-	'X'=>645,'Y'=>795,'Z'=>611,'['=>333,'\\'=>863,']'=>333,'^'=>658,'_'=>500,'`'=>500,'a'=>631,'b'=>549,'c'=>549,'d'=>494,'e'=>439,'f'=>521,'g'=>411,'h'=>603,'i'=>329,'j'=>603,'k'=>549,'l'=>549,'m'=>576,
-	'n'=>521,'o'=>549,'p'=>549,'q'=>521,'r'=>549,'s'=>603,'t'=>439,'u'=>576,'v'=>713,'w'=>686,'x'=>493,'y'=>686,'z'=>494,'{'=>480,'|'=>200,'}'=>480,'~'=>549,chr(127)=>0,chr(128)=>0,chr(129)=>0,chr(130)=>0,chr(131)=>0,
-	chr(132)=>0,chr(133)=>0,chr(134)=>0,chr(135)=>0,chr(136)=>0,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>0,chr(141)=>0,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
-	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>750,chr(161)=>620,chr(162)=>247,chr(163)=>549,chr(164)=>167,chr(165)=>713,chr(166)=>500,chr(167)=>753,chr(168)=>753,chr(169)=>753,chr(170)=>753,chr(171)=>1042,chr(172)=>987,chr(173)=>603,chr(174)=>987,chr(175)=>603,
-	chr(176)=>400,chr(177)=>549,chr(178)=>411,chr(179)=>549,chr(180)=>549,chr(181)=>713,chr(182)=>494,chr(183)=>460,chr(184)=>549,chr(185)=>549,chr(186)=>549,chr(187)=>549,chr(188)=>1000,chr(189)=>603,chr(190)=>1000,chr(191)=>658,chr(192)=>823,chr(193)=>686,chr(194)=>795,chr(195)=>987,chr(196)=>768,chr(197)=>768,
-	chr(198)=>823,chr(199)=>768,chr(200)=>768,chr(201)=>713,chr(202)=>713,chr(203)=>713,chr(204)=>713,chr(205)=>713,chr(206)=>713,chr(207)=>713,chr(208)=>768,chr(209)=>713,chr(210)=>790,chr(211)=>790,chr(212)=>890,chr(213)=>823,chr(214)=>549,chr(215)=>250,chr(216)=>713,chr(217)=>603,chr(218)=>603,chr(219)=>1042,
-	chr(220)=>987,chr(221)=>603,chr(222)=>987,chr(223)=>603,chr(224)=>494,chr(225)=>329,chr(226)=>790,chr(227)=>790,chr(228)=>786,chr(229)=>713,chr(230)=>384,chr(231)=>384,chr(232)=>384,chr(233)=>384,chr(234)=>384,chr(235)=>384,chr(236)=>494,chr(237)=>494,chr(238)=>494,chr(239)=>494,chr(240)=>0,chr(241)=>329,
-	chr(242)=>274,chr(243)=>686,chr(244)=>686,chr(245)=>686,chr(246)=>384,chr(247)=>384,chr(248)=>384,chr(249)=>384,chr(250)=>384,chr(251)=>384,chr(252)=>494,chr(253)=>494,chr(254)=>494,chr(255)=>0);
-?>
+<?php
+$fpdf_charwidths['symbol']=array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>713,'#'=>500,'$'=>549,'%'=>833,'&'=>778,'\''=>439,'('=>333,')'=>333,'*'=>500,'+'=>549,
+	','=>250,'-'=>549,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>549,'='=>549,'>'=>549,'?'=>444,'@'=>549,'A'=>722,
+	'B'=>667,'C'=>722,'D'=>612,'E'=>611,'F'=>763,'G'=>603,'H'=>722,'I'=>333,'J'=>631,'K'=>722,'L'=>686,'M'=>889,'N'=>722,'O'=>722,'P'=>768,'Q'=>741,'R'=>556,'S'=>592,'T'=>611,'U'=>690,'V'=>439,'W'=>768,
+	'X'=>645,'Y'=>795,'Z'=>611,'['=>333,'\\'=>863,']'=>333,'^'=>658,'_'=>500,'`'=>500,'a'=>631,'b'=>549,'c'=>549,'d'=>494,'e'=>439,'f'=>521,'g'=>411,'h'=>603,'i'=>329,'j'=>603,'k'=>549,'l'=>549,'m'=>576,
+	'n'=>521,'o'=>549,'p'=>549,'q'=>521,'r'=>549,'s'=>603,'t'=>439,'u'=>576,'v'=>713,'w'=>686,'x'=>493,'y'=>686,'z'=>494,'{'=>480,'|'=>200,'}'=>480,'~'=>549,chr(127)=>0,chr(128)=>0,chr(129)=>0,chr(130)=>0,chr(131)=>0,
+	chr(132)=>0,chr(133)=>0,chr(134)=>0,chr(135)=>0,chr(136)=>0,chr(137)=>0,chr(138)=>0,chr(139)=>0,chr(140)=>0,chr(141)=>0,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
+	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>750,chr(161)=>620,chr(162)=>247,chr(163)=>549,chr(164)=>167,chr(165)=>713,chr(166)=>500,chr(167)=>753,chr(168)=>753,chr(169)=>753,chr(170)=>753,chr(171)=>1042,chr(172)=>987,chr(173)=>603,chr(174)=>987,chr(175)=>603,
+	chr(176)=>400,chr(177)=>549,chr(178)=>411,chr(179)=>549,chr(180)=>549,chr(181)=>713,chr(182)=>494,chr(183)=>460,chr(184)=>549,chr(185)=>549,chr(186)=>549,chr(187)=>549,chr(188)=>1000,chr(189)=>603,chr(190)=>1000,chr(191)=>658,chr(192)=>823,chr(193)=>686,chr(194)=>795,chr(195)=>987,chr(196)=>768,chr(197)=>768,
+	chr(198)=>823,chr(199)=>768,chr(200)=>768,chr(201)=>713,chr(202)=>713,chr(203)=>713,chr(204)=>713,chr(205)=>713,chr(206)=>713,chr(207)=>713,chr(208)=>768,chr(209)=>713,chr(210)=>790,chr(211)=>790,chr(212)=>890,chr(213)=>823,chr(214)=>549,chr(215)=>250,chr(216)=>713,chr(217)=>603,chr(218)=>603,chr(219)=>1042,
+	chr(220)=>987,chr(221)=>603,chr(222)=>987,chr(223)=>603,chr(224)=>494,chr(225)=>329,chr(226)=>790,chr(227)=>790,chr(228)=>786,chr(229)=>713,chr(230)=>384,chr(231)=>384,chr(232)=>384,chr(233)=>384,chr(234)=>384,chr(235)=>384,chr(236)=>494,chr(237)=>494,chr(238)=>494,chr(239)=>494,chr(240)=>0,chr(241)=>329,
+	chr(242)=>274,chr(243)=>686,chr(244)=>686,chr(245)=>686,chr(246)=>384,chr(247)=>384,chr(248)=>384,chr(249)=>384,chr(250)=>384,chr(251)=>384,chr(252)=>494,chr(253)=>494,chr(254)=>494,chr(255)=>0);
+?>

share/pnp/application/vendor/fpdf/font/times.php

@@ -1,19 +1,15 @@
-<?php
-$type = 'Core';
-$name = 'Times-Roman';
-$up = -100;
-$ut = 50;
-$cw = array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>408,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>180,'('=>333,')'=>333,'*'=>500,'+'=>564,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>564,'='=>564,'>'=>564,'?'=>444,'@'=>921,'A'=>722,
-	'B'=>667,'C'=>667,'D'=>722,'E'=>611,'F'=>556,'G'=>722,'H'=>722,'I'=>333,'J'=>389,'K'=>722,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>556,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>722,'W'=>944,
-	'X'=>722,'Y'=>722,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>469,'_'=>500,'`'=>333,'a'=>444,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
-	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>333,'s'=>389,'t'=>278,'u'=>500,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>480,'|'=>200,'}'=>480,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>444,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>889,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>444,chr(148)=>444,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>980,
-	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>200,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>564,chr(173)=>333,chr(174)=>760,chr(175)=>333,
-	chr(176)=>400,chr(177)=>564,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>453,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>444,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>564,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>722,chr(222)=>556,chr(223)=>500,chr(224)=>444,chr(225)=>444,chr(226)=>444,chr(227)=>444,chr(228)=>444,chr(229)=>444,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>564,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500);
-?>
+<?php
+$fpdf_charwidths['times']=array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>408,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>180,'('=>333,')'=>333,'*'=>500,'+'=>564,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>278,';'=>278,'<'=>564,'='=>564,'>'=>564,'?'=>444,'@'=>921,'A'=>722,
+	'B'=>667,'C'=>667,'D'=>722,'E'=>611,'F'=>556,'G'=>722,'H'=>722,'I'=>333,'J'=>389,'K'=>722,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>556,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>722,'W'=>944,
+	'X'=>722,'Y'=>722,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>469,'_'=>500,'`'=>333,'a'=>444,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
+	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>333,'s'=>389,'t'=>278,'u'=>500,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>480,'|'=>200,'}'=>480,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>444,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>889,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>444,chr(148)=>444,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>980,
+	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>200,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>564,chr(173)=>333,chr(174)=>760,chr(175)=>333,
+	chr(176)=>400,chr(177)=>564,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>453,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>444,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>564,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>722,chr(222)=>556,chr(223)=>500,chr(224)=>444,chr(225)=>444,chr(226)=>444,chr(227)=>444,chr(228)=>444,chr(229)=>444,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>564,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>500,chr(254)=>500,chr(255)=>500);
+?>

share/pnp/application/vendor/fpdf/font/timesb.php

@@ -1,19 +1,15 @@
-<?php
-$type = 'Core';
-$name = 'Times-Bold';
-$up = -100;
-$ut = 50;
-$cw = array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
-	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
-	'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
-	'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
-	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
-	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
-?>
+<?php
+$fpdf_charwidths['timesB']=array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>555,'#'=>500,'$'=>500,'%'=>1000,'&'=>833,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>930,'A'=>722,
+	'B'=>667,'C'=>722,'D'=>722,'E'=>667,'F'=>611,'G'=>778,'H'=>778,'I'=>389,'J'=>500,'K'=>778,'L'=>667,'M'=>944,'N'=>722,'O'=>778,'P'=>611,'Q'=>778,'R'=>722,'S'=>556,'T'=>667,'U'=>722,'V'=>722,'W'=>1000,
+	'X'=>722,'Y'=>722,'Z'=>667,'['=>333,'\\'=>278,']'=>333,'^'=>581,'_'=>500,'`'=>333,'a'=>500,'b'=>556,'c'=>444,'d'=>556,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>333,'k'=>556,'l'=>278,'m'=>833,
+	'n'=>556,'o'=>500,'p'=>556,'q'=>556,'r'=>444,'s'=>389,'t'=>333,'u'=>556,'v'=>500,'w'=>722,'x'=>500,'y'=>500,'z'=>444,'{'=>394,'|'=>220,'}'=>394,'~'=>520,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>1000,chr(141)=>350,chr(142)=>667,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>444,chr(159)=>722,chr(160)=>250,chr(161)=>333,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>300,chr(171)=>500,chr(172)=>570,chr(173)=>333,chr(174)=>747,chr(175)=>333,
+	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>556,chr(182)=>540,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>330,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>722,chr(193)=>722,chr(194)=>722,chr(195)=>722,chr(196)=>722,chr(197)=>722,
+	chr(198)=>1000,chr(199)=>722,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>778,chr(211)=>778,chr(212)=>778,chr(213)=>778,chr(214)=>778,chr(215)=>570,chr(216)=>778,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>722,chr(222)=>611,chr(223)=>556,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>500,chr(254)=>556,chr(255)=>500);
+?>

share/pnp/application/vendor/fpdf/font/timesbi.php

@@ -1,19 +1,15 @@
-<?php
-$type = 'Core';
-$name = 'Times-BoldItalic';
-$up = -100;
-$ut = 50;
-$cw = array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>389,'"'=>555,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>832,'A'=>667,
-	'B'=>667,'C'=>667,'D'=>722,'E'=>667,'F'=>667,'G'=>722,'H'=>778,'I'=>389,'J'=>500,'K'=>667,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>611,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>667,'W'=>889,
-	'X'=>667,'Y'=>611,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>570,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
-	'n'=>556,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>556,'v'=>444,'w'=>667,'x'=>500,'y'=>444,'z'=>389,'{'=>348,'|'=>220,'}'=>348,'~'=>570,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
-	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>389,chr(159)=>611,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>266,chr(171)=>500,chr(172)=>606,chr(173)=>333,chr(174)=>747,chr(175)=>333,
-	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>576,chr(182)=>500,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>300,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
-	chr(198)=>944,chr(199)=>667,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>570,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>611,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>444,chr(254)=>500,chr(255)=>444);
-?>
+<?php
+$fpdf_charwidths['timesBI']=array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>389,'"'=>555,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>278,'('=>333,')'=>333,'*'=>500,'+'=>570,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>570,'='=>570,'>'=>570,'?'=>500,'@'=>832,'A'=>667,
+	'B'=>667,'C'=>667,'D'=>722,'E'=>667,'F'=>667,'G'=>722,'H'=>778,'I'=>389,'J'=>500,'K'=>667,'L'=>611,'M'=>889,'N'=>722,'O'=>722,'P'=>611,'Q'=>722,'R'=>667,'S'=>556,'T'=>611,'U'=>722,'V'=>667,'W'=>889,
+	'X'=>667,'Y'=>611,'Z'=>611,'['=>333,'\\'=>278,']'=>333,'^'=>570,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>333,'g'=>500,'h'=>556,'i'=>278,'j'=>278,'k'=>500,'l'=>278,'m'=>778,
+	'n'=>556,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>556,'v'=>444,'w'=>667,'x'=>500,'y'=>444,'z'=>389,'{'=>348,'|'=>220,'}'=>348,'~'=>570,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>500,chr(133)=>1000,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>556,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>611,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>500,chr(148)=>500,chr(149)=>350,chr(150)=>500,chr(151)=>1000,chr(152)=>333,chr(153)=>1000,
+	chr(154)=>389,chr(155)=>333,chr(156)=>722,chr(157)=>350,chr(158)=>389,chr(159)=>611,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>220,chr(167)=>500,chr(168)=>333,chr(169)=>747,chr(170)=>266,chr(171)=>500,chr(172)=>606,chr(173)=>333,chr(174)=>747,chr(175)=>333,
+	chr(176)=>400,chr(177)=>570,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>576,chr(182)=>500,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>300,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>667,chr(193)=>667,chr(194)=>667,chr(195)=>667,chr(196)=>667,chr(197)=>667,
+	chr(198)=>944,chr(199)=>667,chr(200)=>667,chr(201)=>667,chr(202)=>667,chr(203)=>667,chr(204)=>389,chr(205)=>389,chr(206)=>389,chr(207)=>389,chr(208)=>722,chr(209)=>722,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>570,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>611,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>722,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>556,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>570,chr(248)=>500,chr(249)=>556,chr(250)=>556,chr(251)=>556,chr(252)=>556,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+?>

share/pnp/application/vendor/fpdf/font/timesi.php

@@ -1,19 +1,15 @@
-<?php
-$type = 'Core';
-$name = 'Times-Italic';
-$up = -100;
-$ut = 50;
-$cw = array(
-	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
-	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
-	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
-	'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
-	'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
-	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
-	chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
-	chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333,
-	chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
-	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
-	chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
-	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
-?>
+<?php
+$fpdf_charwidths['timesI']=array(
+	chr(0)=>250,chr(1)=>250,chr(2)=>250,chr(3)=>250,chr(4)=>250,chr(5)=>250,chr(6)=>250,chr(7)=>250,chr(8)=>250,chr(9)=>250,chr(10)=>250,chr(11)=>250,chr(12)=>250,chr(13)=>250,chr(14)=>250,chr(15)=>250,chr(16)=>250,chr(17)=>250,chr(18)=>250,chr(19)=>250,chr(20)=>250,chr(21)=>250,
+	chr(22)=>250,chr(23)=>250,chr(24)=>250,chr(25)=>250,chr(26)=>250,chr(27)=>250,chr(28)=>250,chr(29)=>250,chr(30)=>250,chr(31)=>250,' '=>250,'!'=>333,'"'=>420,'#'=>500,'$'=>500,'%'=>833,'&'=>778,'\''=>214,'('=>333,')'=>333,'*'=>500,'+'=>675,
+	','=>250,'-'=>333,'.'=>250,'/'=>278,'0'=>500,'1'=>500,'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>333,';'=>333,'<'=>675,'='=>675,'>'=>675,'?'=>500,'@'=>920,'A'=>611,
+	'B'=>611,'C'=>667,'D'=>722,'E'=>611,'F'=>611,'G'=>722,'H'=>722,'I'=>333,'J'=>444,'K'=>667,'L'=>556,'M'=>833,'N'=>667,'O'=>722,'P'=>611,'Q'=>722,'R'=>611,'S'=>500,'T'=>556,'U'=>722,'V'=>611,'W'=>833,
+	'X'=>611,'Y'=>556,'Z'=>556,'['=>389,'\\'=>278,']'=>389,'^'=>422,'_'=>500,'`'=>333,'a'=>500,'b'=>500,'c'=>444,'d'=>500,'e'=>444,'f'=>278,'g'=>500,'h'=>500,'i'=>278,'j'=>278,'k'=>444,'l'=>278,'m'=>722,
+	'n'=>500,'o'=>500,'p'=>500,'q'=>500,'r'=>389,'s'=>389,'t'=>278,'u'=>500,'v'=>444,'w'=>667,'x'=>444,'y'=>444,'z'=>389,'{'=>400,'|'=>275,'}'=>400,'~'=>541,chr(127)=>350,chr(128)=>500,chr(129)=>350,chr(130)=>333,chr(131)=>500,
+	chr(132)=>556,chr(133)=>889,chr(134)=>500,chr(135)=>500,chr(136)=>333,chr(137)=>1000,chr(138)=>500,chr(139)=>333,chr(140)=>944,chr(141)=>350,chr(142)=>556,chr(143)=>350,chr(144)=>350,chr(145)=>333,chr(146)=>333,chr(147)=>556,chr(148)=>556,chr(149)=>350,chr(150)=>500,chr(151)=>889,chr(152)=>333,chr(153)=>980,
+	chr(154)=>389,chr(155)=>333,chr(156)=>667,chr(157)=>350,chr(158)=>389,chr(159)=>556,chr(160)=>250,chr(161)=>389,chr(162)=>500,chr(163)=>500,chr(164)=>500,chr(165)=>500,chr(166)=>275,chr(167)=>500,chr(168)=>333,chr(169)=>760,chr(170)=>276,chr(171)=>500,chr(172)=>675,chr(173)=>333,chr(174)=>760,chr(175)=>333,
+	chr(176)=>400,chr(177)=>675,chr(178)=>300,chr(179)=>300,chr(180)=>333,chr(181)=>500,chr(182)=>523,chr(183)=>250,chr(184)=>333,chr(185)=>300,chr(186)=>310,chr(187)=>500,chr(188)=>750,chr(189)=>750,chr(190)=>750,chr(191)=>500,chr(192)=>611,chr(193)=>611,chr(194)=>611,chr(195)=>611,chr(196)=>611,chr(197)=>611,
+	chr(198)=>889,chr(199)=>667,chr(200)=>611,chr(201)=>611,chr(202)=>611,chr(203)=>611,chr(204)=>333,chr(205)=>333,chr(206)=>333,chr(207)=>333,chr(208)=>722,chr(209)=>667,chr(210)=>722,chr(211)=>722,chr(212)=>722,chr(213)=>722,chr(214)=>722,chr(215)=>675,chr(216)=>722,chr(217)=>722,chr(218)=>722,chr(219)=>722,
+	chr(220)=>722,chr(221)=>556,chr(222)=>611,chr(223)=>500,chr(224)=>500,chr(225)=>500,chr(226)=>500,chr(227)=>500,chr(228)=>500,chr(229)=>500,chr(230)=>667,chr(231)=>444,chr(232)=>444,chr(233)=>444,chr(234)=>444,chr(235)=>444,chr(236)=>278,chr(237)=>278,chr(238)=>278,chr(239)=>278,chr(240)=>500,chr(241)=>500,
+	chr(242)=>500,chr(243)=>500,chr(244)=>500,chr(245)=>500,chr(246)=>500,chr(247)=>675,chr(248)=>500,chr(249)=>500,chr(250)=>500,chr(251)=>500,chr(252)=>500,chr(253)=>444,chr(254)=>500,chr(255)=>444);
+?>

share/pnp/application/vendor/fpdf/font/zapfdingbats.php

@@ -1,19 +1,15 @@
-<?php
-$type = 'Core';
-$name = 'ZapfDingbats';
-$up = -100;
-$ut = 50;
-$cw = array(
-	chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
-	chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
-	','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
-	'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
-	'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
-	'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
-	chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
-	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
-	chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
-	chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
-	chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
-	chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
-?>
+<?php
+$fpdf_charwidths['zapfdingbats']=array(
+	chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
+	chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
+	','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
+	'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
+	'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
+	'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
+	chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
+	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
+	chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
+	chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
+	chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
+	chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
+?>

share/pnp/application/views/zoom.php

@@ -57,7 +57,6 @@ jQuery.noConflict();
 <div style="position:relative;">
 <?php 
 echo "<div start=$start end=$end style=\"width:".$graph_width."px; height:".$graph_height."px; position:absolute; top:33px\" class=\"graph\" id=\"".$this->url."\" ></div>";
-$srv = urlencode($srv);
 if(!empty($tpl)){
     echo "<img class=\"graph\" src=\"image?source=$source"
 	."&tpl=$tpl"

share/pnp/documents/de_DE/about.html

@@ -45,7 +45,7 @@ und die Performancedaten
 <p>
 
 Wie man unschwer erkennt, sind die Performancedaten auf die maschinelle Verarbeitung ausgelegt. Das Format ist in den
- <a href="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200" class="urlextern" title="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200"  rel="nofollow">Developer Guidelines</a>
+ <a href="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201" class="urlextern" title="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201"  rel="nofollow">Developer Guidelines</a>
 festgelegt (einen Auszug davon gibt es <a href="/de/pnp-0.6/perfdata_format" class="wikilink1" title="de:pnp-0.6:perfdata_format">an dieser Stelle</a>), es soll aber hier noch einmal kurz erl&auml;utert werden.
 
 </p>
@@ -69,7 +69,7 @@ Mehrere Datenreihen werden durch Leerzeichen getrennt. Die eigentlichen Daten d&
 </p>
 
 </div>
-<!-- SECTION "Anforderungen an Plugins" [27-1898] -->
+<!-- SECTION "Anforderungen an Plugins" [27-1903] -->
 <h2><a name="benoetigte_software" id="benoetigte_software">Ben&ouml;tigte Software</a></h2>
 <div class="level2">
 <ul>
@@ -87,7 +87,7 @@ Achtung: wird RRDtool ohne Paket-Manager installiert, fehlen anschließend m&oum
 </ul>
 
 </div>
-<!-- SECTION "Ben&ouml;tigte Software" [1899-2514] -->
+<!-- SECTION "Ben&ouml;tigte Software" [1904-2519] -->
 <h2><a name="lizenz" id="lizenz">Lizenz</a></h2>
 <div class="level2">
 
@@ -97,7 +97,7 @@ PNP ist unter der <a href="http://www.gnu.de/documents/gpl-2.0.de.html" class="u
 </p>
 
 </div>
-<!-- SECTION "Lizenz" [2515-2620] -->
+<!-- SECTION "Lizenz" [2520-2625] -->
 <h2><a name="download" id="download">Download</a></h2>
 <div class="level2">
 
@@ -123,7 +123,7 @@ Die aktuelle Entwicklung ist jederzeit unter <a href="https://github.com/lingej/
 </p>
 
 </div>
-<!-- SECTION "Download" [2621-3390] -->
+<!-- SECTION "Download" [2626-3395] -->
 <h2><a name="support" id="support">Support</a></h2>
 <div class="level2">
 
@@ -160,7 +160,7 @@ Weiterhin k&ouml;nnen die Mailinglisten auf Sourceforge verwendet werden. Dort i
 </p>
 
 </div>
-<!-- SECTION "Support" [3391-4705] -->
+<!-- SECTION "Support" [3396-4710] -->
 <h2><a name="datenhaltung" id="datenhaltung">Datenhaltung</a></h2>
 <div class="level2">
 
@@ -183,4 +183,4 @@ Durch die Speicherung in diesem Format &auml;ndert sich die Dateigr&ouml;ße nac
 </p>
 
 </div>
-<!-- SECTION "Datenhaltung" [4706-] -->
+<!-- SECTION "Datenhaltung" [4711-] -->

share/pnp/documents/de_DE/doc_complete.html

@@ -120,7 +120,7 @@ und die Performancedaten
 <p>
 
 Wie man unschwer erkennt, sind die Performancedaten auf die maschinelle Verarbeitung ausgelegt. Das Format ist in den
- <a href="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200" class="urlextern" title="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200"  rel="nofollow">Developer Guidelines</a>
+ <a href="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201" class="urlextern" title="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201"  rel="nofollow">Developer Guidelines</a>
 festgelegt (einen Auszug davon gibt es <a href="/de/pnp-0.6/perfdata_format" class="wikilink1" title="de:pnp-0.6:perfdata_format">an dieser Stelle</a>), es soll aber hier noch einmal kurz erl&auml;utert werden.
 
 </p>
@@ -3360,7 +3360,7 @@ Es bleibt Drittanbietern &uuml;berlassen, aus den Performance-Daten Graphen zu e
 </p>
 
 <p>
-Quelle: <a href="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200" class="urlextern" title="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200"  rel="nofollow">https://www.monitoring-plugins.org/doc/guidelines.html#AEN200</a>
+Quelle: <a href="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201" class="urlextern" title="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201"  rel="nofollow">http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201</a>
 
 </p>
 <div class="inclmeta level">

share/pnp/documents/de_DE/perfdata_format.html

@@ -57,6 +57,6 @@ Es bleibt Drittanbietern überlassen, aus den Performance-Daten Graphen zu e
 </p>
 
 <p>
-Quelle: <a href="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200" class="urlextern" title="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200"  rel="nofollow">https://www.monitoring-plugins.org/doc/guidelines.html#AEN200</a>
+Quelle: <a href="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201" class="urlextern" title="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201"  rel="nofollow">http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201</a>
 
 </p>

share/pnp/documents/en_US/about.html

@@ -44,7 +44,7 @@ and the performance data
 
 <p>
 
-Performance data is designed for automatic processing. The format is specified within the <a href="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200" class="urlextern" title="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200"  rel="nofollow">Developer Guidelines</a> (you&#039;ll find an excerpt <a href="/pnp-0.6/perfdata_format" class="wikilink1" title="pnp-0.6:perfdata_format">here</a>) but should be exemplified here nonetheless:
+Performance data is designed for automatic processing. The format is specified within the <a href="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201" class="urlextern" title="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201"  rel="nofollow">Developer Guidelines</a> (you&#039;ll find an excerpt <a href="/pnp-0.6/perfdata_format" class="wikilink1" title="pnp-0.6:perfdata_format">here</a>) but should be exemplified here nonetheless:
 
 </p>
 <pre class="code">  rta=2.687ms;3000.000;5000.000;0;
@@ -67,7 +67,7 @@ Several data series are separated by blanks. The actual data must not contains a
 </p>
 
 </div>
-<!-- SECTION "System requirements" [27-1693] -->
+<!-- SECTION "System requirements" [27-1698] -->
 <h2><a name="required_software" id="required_software">Required Software</a></h2>
 <div class="level2">
 <ul>
@@ -85,7 +85,7 @@ Attention: installing RRDtool without a packet manager might lead to missing dej
 </ul>
 
 </div>
-<!-- SECTION "Required Software" [1694-2240] -->
+<!-- SECTION "Required Software" [1699-2245] -->
 <h2><a name="license" id="license">License</a></h2>
 <div class="level2">
 
@@ -95,7 +95,7 @@ PNP is licensed under <a href="http://www.gnu.org/licenses/gpl-2.0.txt" class="u
 </p>
 
 </div>
-<!-- SECTION "License" [2241-2335] -->
+<!-- SECTION "License" [2246-2340] -->
 <h2><a name="download" id="download">Download</a></h2>
 <div class="level2">
 
@@ -119,7 +119,7 @@ The current development can be viewed anytime at <a href="https://github.com/lin
 </p>
 
 </div>
-<!-- SECTION "Download" [2336-2991] -->
+<!-- SECTION "Download" [2341-2996] -->
 <h2><a name="support" id="support">Support</a></h2>
 <div class="level2">
 
@@ -154,7 +154,7 @@ The mailing lists on Sourceforge can be used to request support (and are limited
 </p>
 
 </div>
-<!-- SECTION "Support" [2992-4298] -->
+<!-- SECTION "Support" [2997-4303] -->
 <h2><a name="storage" id="storage">Storage</a></h2>
 <div class="level2">
 
@@ -172,7 +172,7 @@ Using this storage format the size of the files will stay the same over time. Pe
 </p>
 
 </div>
-<!-- SECTION "Storage" [4299-5055] -->
+<!-- SECTION "Storage" [4304-5060] -->
 <h2><a name="statistics_and_links_to_sourceforge" id="statistics_and_links_to_sourceforge">Statistics and links to Sourceforge</a></h2>
 <div class="level2">
 <ul class="rss"><li><div class="li"><em>An error occurred while fetching this feed: </em><a href="http://sourceforge.net/export/rss2_projsummary.php?group_id=191615" class="urlextern" title="http://sourceforge.net/export/rss2_projsummary.php?group_id=191615"  rel="nofollow">http://sourceforge.net/export/rss2_projsummary.php?group_id=191615</a></div></li></ul>
@@ -183,4 +183,4 @@ Using this storage format the size of the files will stay the same over time. Pe
 </p>
 
 </div>
-<!-- SECTION "Statistics and links to Sourceforge" [5056-] -->
+<!-- SECTION "Statistics and links to Sourceforge" [5061-] -->

share/pnp/documents/en_US/doc_complete.html

@@ -113,7 +113,7 @@ and the performance data
 
 <p>
 
-Performance data is designed for automatic processing. The format is specified within the <a href="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200" class="urlextern" title="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200"  rel="nofollow">Developer Guidelines</a> (you&#039;ll find an excerpt <a href="/pnp-0.6/perfdata_format" class="wikilink1" title="pnp-0.6:perfdata_format">here</a>) but should be exemplified here nonetheless:
+Performance data is designed for automatic processing. The format is specified within the <a href="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201" class="urlextern" title="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201"  rel="nofollow">Developer Guidelines</a> (you&#039;ll find an excerpt <a href="/pnp-0.6/perfdata_format" class="wikilink1" title="pnp-0.6:perfdata_format">here</a>) but should be exemplified here nonetheless:
 
 </p>
 <pre class="code">  rta=2.687ms;3000.000;5000.000;0;
@@ -423,7 +423,7 @@ Changes can be tracked on <a href="http://pnp4nagios.git.sourceforge.net/git/git
 </p>
 
 <p>
-The current Version is <a href="https://sourceforge.net/projects/pnp4nagios/files/latest" class="urlextern" title="https://sourceforge.net/projects/pnp4nagios/files/latest"  rel="nofollow"> pnp4nagios-0.6.24.tar.gz</a>
+The current Version is <a href="https://sourceforge.net/projects/pnp4nagios/files/latest" class="urlextern" title="https://sourceforge.net/projects/pnp4nagios/files/latest"  rel="nofollow"> pnp4nagios-0.6.22.tar.gz</a>
 </p>
 
 </div>
@@ -443,7 +443,7 @@ This is allways the latest GIT HEAD Version
 
 <p>
 
-Last Update: Sat Jan  3 13:30:01 CET 2015
+Last Update: Wed Jul 30 06:30:01 CEST 2014
 </p>
 
 </div>
@@ -455,20 +455,16 @@ Last Update: Sat Jan  3 13:30:01 CET 2015
 
 <strong>pnp-0.6.?? ??/??/2013</strong>
 </p>
-
-<p>
-<strong>pnp-0.6.24 07/30/2014</strong>
-</p>
 <ul>
-<li class="level1"><div class="li"> Bugfix:  Fixed some more XSS issues</div>
+<li class="level1"><div class="li"> Bugfix: Fixed some more XSS issues</div>
 </li>
-<li class="level1"><div class="li"> Bugfix:  Fixed <acronym title="Hypertext Preprocessor">PHP</acronym> issue while running on <acronym title="Hypertext Preprocessor">PHP</acronym> 5.6 ( Reported by Sven Nierlein )</div>
+<li class="level1"><div class="li"> Bugfix: Fixed <acronym title="Hypertext Preprocessor">PHP</acronym> issue while running on <acronym title="Hypertext Preprocessor">PHP</acronym> 5.6 ( Reported by Sven Nierlein )</div>
 </li>
 </ul>
 
 <p>
 
-<strong>pnp-0.6.22 06/04/2014</strong>
+<strong>pnp-0.6.22 04/06/2014</strong>
 </p>
 <ul>
 <li class="level1"><div class="li"> Bugfix:  Fixed livestatus socket parsing ( Pekka Panula )</div>
@@ -3739,7 +3735,7 @@ It is up to third party programs to convert the Nagios plugins performance data
 </p>
 
 <p>
-Origin: <a href="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200" class="urlextern" title="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200"  rel="nofollow">https://www.monitoring-plugins.org/doc/guidelines.html#AEN200</a>
+Origin: <a href="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201" class="urlextern" title="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201"  rel="nofollow">http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201</a>
 
 </p>
 <div class="inclmeta level">

share/pnp/documents/en_US/dwnld.html

@@ -15,7 +15,7 @@ Changes can be tracked on <a href="http://pnp4nagios.git.sourceforge.net/git/git
 </p>
 
 <p>
-The current Version is <a href="https://sourceforge.net/projects/pnp4nagios/files/latest" class="urlextern" title="https://sourceforge.net/projects/pnp4nagios/files/latest"  rel="nofollow"> pnp4nagios-0.6.24.tar.gz</a>
+The current Version is <a href="https://sourceforge.net/projects/pnp4nagios/files/latest" class="urlextern" title="https://sourceforge.net/projects/pnp4nagios/files/latest"  rel="nofollow"> pnp4nagios-0.6.22.tar.gz</a>
 </p>
 
 </div>
@@ -35,36 +35,21 @@ This is allways the latest GIT HEAD Version
 
 <p>
 
-Last Update: Sat Jan  3 14:08:23 CET 2015
+Last Update: Wed Jul 30 12:30:45 CEST 2014
 </p>
 
 </div>
-<!-- SECTION "Latest Devel Version" [327-549] -->
+<!-- SECTION "Latest Devel Version" [327-550] -->
 <h2><a name="changelog" id="changelog">ChangeLog</a></h2>
 <div class="level2">
 
 <p>
 
-<strong>pnp-0.6.?? ??/??/2015</strong>
+<strong>pnp-0.6.?? ??/??/2013</strong>
 </p>
 
 <p>
-<strong>pnp-0.6.25 01/03/2015</strong>
-</p>
-<ul>
-<li class="level1"><div class="li"> Update:  FPDF Update to Version 1.7</div>
-</li>
-<li class="level1"><div class="li"> Bugfix:  Default source fixed by AWiddersheim</div>
-</li>
-<li class="level1"><div class="li"> Bugfix:  Fixed urlencoding of Host- and Servicenames by Andreas Doehler</div>
-</li>
-<li class="level1"><div class="li"> Bugfix:  Fixed Timeranges by AWiddersheim</div>
-</li>
-</ul>
-
-<p>
-
-<strong>pnp-0.6.24 07/30/2014</strong>
+<strong>pnp-0.6.24 07/30/2013</strong>
 </p>
 <ul>
 <li class="level1"><div class="li"> Bugfix:  Fixed some more XSS issues</div>
@@ -490,4 +475,4 @@ Last Update: Sat Jan  3 14:08:23 CET 2015
 </ul>
 
 </div>
-<!-- SECTION "ChangeLog" [550-] -->
+<!-- SECTION "ChangeLog" [551-] -->

share/pnp/documents/en_US/perfdata_format.html

@@ -56,6 +56,6 @@ It is up to third party programs to convert the Nagios plugins performance data
 </p>
 
 <p>
-Origin: <a href="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200" class="urlextern" title="https://www.monitoring-plugins.org/doc/guidelines.html#AEN200"  rel="nofollow">https://www.monitoring-plugins.org/doc/guidelines.html#AEN200</a>
+Origin: <a href="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201" class="urlextern" title="http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201"  rel="nofollow">http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201</a>
 
 </p>

share/pnp/media/js/jquery.imgareaselect.Debian.txt

@@ -0,0 +1,14 @@
+/*
+ * imgAreaSelect jQuery plugin
+ * version 0.9.10
+ *
+ * Copyright (c) 2008-2013 Michal Wojciechowski (odyniec.net)
+ *
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://odyniec.net/projects/imgareaselect/
+ *
+ * Added to the DFSG tarball by
+ * Markus Frosch <markus@lazyfrosch.de>
+ */

share/pnp/media/js/jquery.imgareaselect.js

@@ -0,0 +1,730 @@
+/*
+ * imgAreaSelect jQuery plugin
+ * version 0.9.10
+ *
+ * Copyright (c) 2008-2013 Michal Wojciechowski (odyniec.net)
+ *
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://odyniec.net/projects/imgareaselect/
+ *
+ */
+
+(function($) {
+
+var abs = Math.abs,
+    max = Math.max,
+    min = Math.min,
+    round = Math.round;
+
+function div() {
+    return $('<div/>');
+}
+
+$.imgAreaSelect = function (img, options) {
+    var
+
+        $img = $(img),
+
+        imgLoaded,
+
+        $box = div(),
+        $area = div(),
+        $border = div().add(div()).add(div()).add(div()),
+        $outer = div().add(div()).add(div()).add(div()),
+        $handles = $([]),
+
+        $areaOpera,
+
+        left, top,
+
+        imgOfs = { left: 0, top: 0 },
+
+        imgWidth, imgHeight,
+
+        $parent,
+
+        parOfs = { left: 0, top: 0 },
+
+        zIndex = 0,
+
+        position = 'absolute',
+
+        startX, startY,
+
+        scaleX, scaleY,
+
+        resize,
+
+        minWidth, minHeight, maxWidth, maxHeight,
+
+        aspectRatio,
+
+        shown,
+
+        x1, y1, x2, y2,
+
+        selection = { x1: 0, y1: 0, x2: 0, y2: 0, width: 0, height: 0 },
+
+        docElem = document.documentElement,
+
+        ua = navigator.userAgent,
+
+        $p, d, i, o, w, h, adjusted;
+
+    function viewX(x) {
+        return x + imgOfs.left - parOfs.left;
+    }
+
+    function viewY(y) {
+        return y + imgOfs.top - parOfs.top;
+    }
+
+    function selX(x) {
+        return x - imgOfs.left + parOfs.left;
+    }
+
+    function selY(y) {
+        return y - imgOfs.top + parOfs.top;
+    }
+
+    function evX(event) {
+        return event.pageX - parOfs.left;
+    }
+
+    function evY(event) {
+        return event.pageY - parOfs.top;
+    }
+
+    function getSelection(noScale) {
+        var sx = noScale || scaleX, sy = noScale || scaleY;
+
+        return { x1: round(selection.x1 * sx),
+            y1: round(selection.y1 * sy),
+            x2: round(selection.x2 * sx),
+            y2: round(selection.y2 * sy),
+            width: round(selection.x2 * sx) - round(selection.x1 * sx),
+            height: round(selection.y2 * sy) - round(selection.y1 * sy) };
+    }
+
+    function setSelection(x1, y1, x2, y2, noScale) {
+        var sx = noScale || scaleX, sy = noScale || scaleY;
+
+        selection = {
+            x1: round(x1 / sx || 0),
+            y1: round(y1 / sy || 0),
+            x2: round(x2 / sx || 0),
+            y2: round(y2 / sy || 0)
+        };
+
+        selection.width = selection.x2 - selection.x1;
+        selection.height = selection.y2 - selection.y1;
+    }
+
+    function adjust() {
+        if (!imgLoaded || !$img.width())
+            return;
+
+        imgOfs = { left: round($img.offset().left), top: round($img.offset().top) };
+
+        imgWidth = $img.innerWidth();
+        imgHeight = $img.innerHeight();
+
+        imgOfs.top += ($img.outerHeight() - imgHeight) >> 1;
+        imgOfs.left += ($img.outerWidth() - imgWidth) >> 1;
+
+        minWidth = round(options.minWidth / scaleX) || 0;
+        minHeight = round(options.minHeight / scaleY) || 0;
+        maxWidth = round(min(options.maxWidth / scaleX || 1<<24, imgWidth));
+        maxHeight = round(min(options.maxHeight / scaleY || 1<<24, imgHeight));
+
+        if ($().jquery == '1.3.2' && position == 'fixed' &&
+            !docElem['getBoundingClientRect'])
+        {
+            imgOfs.top += max(document.body.scrollTop, docElem.scrollTop);
+            imgOfs.left += max(document.body.scrollLeft, docElem.scrollLeft);
+        }
+
+        parOfs = /absolute|relative/.test($parent.css('position')) ?
+            { left: round($parent.offset().left) - $parent.scrollLeft(),
+                top: round($parent.offset().top) - $parent.scrollTop() } :
+            position == 'fixed' ?
+                { left: $(document).scrollLeft(), top: $(document).scrollTop() } :
+                { left: 0, top: 0 };
+
+        left = viewX(0);
+        top = viewY(0);
+
+        if (selection.x2 > imgWidth || selection.y2 > imgHeight)
+            doResize();
+    }
+
+    function update(resetKeyPress) {
+        if (!shown) return;
+
+        $box.css({ left: viewX(selection.x1), top: viewY(selection.y1) })
+            .add($area).width(w = selection.width).height(h = selection.height);
+
+        $area.add($border).add($handles).css({ left: 0, top: 0 });
+
+        $border
+            .width(max(w - $border.outerWidth() + $border.innerWidth(), 0))
+            .height(max(h - $border.outerHeight() + $border.innerHeight(), 0));
+
+        $($outer[0]).css({ left: left, top: top,
+            width: selection.x1, height: imgHeight });
+        $($outer[1]).css({ left: left + selection.x1, top: top,
+            width: w, height: selection.y1 });
+        $($outer[2]).css({ left: left + selection.x2, top: top,
+            width: imgWidth - selection.x2, height: imgHeight });
+        $($outer[3]).css({ left: left + selection.x1, top: top + selection.y2,
+            width: w, height: imgHeight - selection.y2 });
+
+        w -= $handles.outerWidth();
+        h -= $handles.outerHeight();
+
+        switch ($handles.length) {
+        case 8:
+            $($handles[4]).css({ left: w >> 1 });
+            $($handles[5]).css({ left: w, top: h >> 1 });
+            $($handles[6]).css({ left: w >> 1, top: h });
+            $($handles[7]).css({ top: h >> 1 });
+        case 4:
+            $handles.slice(1,3).css({ left: w });
+            $handles.slice(2,4).css({ top: h });
+        }
+
+        if (resetKeyPress !== false) {
+            if ($.imgAreaSelect.onKeyPress != docKeyPress)
+                $(document).unbind($.imgAreaSelect.keyPress,
+                    $.imgAreaSelect.onKeyPress);
+
+            if (options.keys)
+                $(document)[$.imgAreaSelect.keyPress](
+                    $.imgAreaSelect.onKeyPress = docKeyPress);
+        }
+
+        if (msie && $border.outerWidth() - $border.innerWidth() == 2) {
+            $border.css('margin', 0);
+            setTimeout(function () { $border.css('margin', 'auto'); }, 0);
+        }
+    }
+
+    function doUpdate(resetKeyPress) {
+        adjust();
+        update(resetKeyPress);
+        x1 = viewX(selection.x1); y1 = viewY(selection.y1);
+        x2 = viewX(selection.x2); y2 = viewY(selection.y2);
+    }
+
+    function hide($elem, fn) {
+        options.fadeSpeed ? $elem.fadeOut(options.fadeSpeed, fn) : $elem.hide();
+
+    }
+
+    function areaMouseMove(event) {
+        var x = selX(evX(event)) - selection.x1,
+            y = selY(evY(event)) - selection.y1;
+
+        if (!adjusted) {
+            adjust();
+            adjusted = true;
+
+            $box.one('mouseout', function () { adjusted = false; });
+        }
+
+        resize = '';
+
+        if (options.resizable) {
+            if (y <= options.resizeMargin)
+                resize = 'n';
+            else if (y >= selection.height - options.resizeMargin)
+                resize = 's';
+            if (x <= options.resizeMargin)
+                resize += 'w';
+            else if (x >= selection.width - options.resizeMargin)
+                resize += 'e';
+        }
+
+        $box.css('cursor', resize ? resize + '-resize' :
+            options.movable ? 'move' : '');
+        if ($areaOpera)
+            $areaOpera.toggle();
+    }
+
+    function docMouseUp(event) {
+        $('body').css('cursor', '');
+        if (options.autoHide || selection.width * selection.height == 0)
+            hide($box.add($outer), function () { $(this).hide(); });
+
+        $(document).unbind('mousemove', selectingMouseMove);
+        $box.mousemove(areaMouseMove);
+
+        options.onSelectEnd(img, getSelection());
+    }
+
+    function areaMouseDown(event) {
+        if (event.which != 1) return false;
+
+        adjust();
+
+        if (resize) {
+            $('body').css('cursor', resize + '-resize');
+
+            x1 = viewX(selection[/w/.test(resize) ? 'x2' : 'x1']);
+            y1 = viewY(selection[/n/.test(resize) ? 'y2' : 'y1']);
+
+            $(document).mousemove(selectingMouseMove)
+                .one('mouseup', docMouseUp);
+            $box.unbind('mousemove', areaMouseMove);
+        }
+        else if (options.movable) {
+            startX = left + selection.x1 - evX(event);
+            startY = top + selection.y1 - evY(event);
+
+            $box.unbind('mousemove', areaMouseMove);
+
+            $(document).mousemove(movingMouseMove)
+                .one('mouseup', function () {
+                    options.onSelectEnd(img, getSelection());
+
+                    $(document).unbind('mousemove', movingMouseMove);
+                    $box.mousemove(areaMouseMove);
+                });
+        }
+        else
+            $img.mousedown(event);
+
+        return false;
+    }
+
+    function fixAspectRatio(xFirst) {
+        if (aspectRatio)
+            if (xFirst) {
+                x2 = max(left, min(left + imgWidth,
+                    x1 + abs(y2 - y1) * aspectRatio * (x2 > x1 || -1)));
+
+                y2 = round(max(top, min(top + imgHeight,
+                    y1 + abs(x2 - x1) / aspectRatio * (y2 > y1 || -1))));
+                x2 = round(x2);
+            }
+            else {
+                y2 = max(top, min(top + imgHeight,
+                    y1 + abs(x2 - x1) / aspectRatio * (y2 > y1 || -1)));
+                x2 = round(max(left, min(left + imgWidth,
+                    x1 + abs(y2 - y1) * aspectRatio * (x2 > x1 || -1))));
+                y2 = round(y2);
+            }
+    }
+
+    function doResize() {
+        x1 = min(x1, left + imgWidth);
+        y1 = min(y1, top + imgHeight);
+
+        if (abs(x2 - x1) < minWidth) {
+            x2 = x1 - minWidth * (x2 < x1 || -1);
+
+            if (x2 < left)
+                x1 = left + minWidth;
+            else if (x2 > left + imgWidth)
+                x1 = left + imgWidth - minWidth;
+        }
+
+        if (abs(y2 - y1) < minHeight) {
+            y2 = y1 - minHeight * (y2 < y1 || -1);
+
+            if (y2 < top)
+                y1 = top + minHeight;
+            else if (y2 > top + imgHeight)
+                y1 = top + imgHeight - minHeight;
+        }
+
+        x2 = max(left, min(x2, left + imgWidth));
+        y2 = max(top, min(y2, top + imgHeight));
+
+        fixAspectRatio(abs(x2 - x1) < abs(y2 - y1) * aspectRatio);
+
+        if (abs(x2 - x1) > maxWidth) {
+            x2 = x1 - maxWidth * (x2 < x1 || -1);
+            fixAspectRatio();
+        }
+
+        if (abs(y2 - y1) > maxHeight) {
+            y2 = y1 - maxHeight * (y2 < y1 || -1);
+            fixAspectRatio(true);
+        }
+
+        selection = { x1: selX(min(x1, x2)), x2: selX(max(x1, x2)),
+            y1: selY(min(y1, y2)), y2: selY(max(y1, y2)),
+            width: abs(x2 - x1), height: abs(y2 - y1) };
+
+        update();
+
+        options.onSelectChange(img, getSelection());
+    }
+
+    function selectingMouseMove(event) {
+        x2 = /w|e|^$/.test(resize) || aspectRatio ? evX(event) : viewX(selection.x2);
+        y2 = /n|s|^$/.test(resize) || aspectRatio ? evY(event) : viewY(selection.y2);
+
+        doResize();
+
+        return false;
+
+    }
+
+    function doMove(newX1, newY1) {
+        x2 = (x1 = newX1) + selection.width;
+        y2 = (y1 = newY1) + selection.height;
+
+        $.extend(selection, { x1: selX(x1), y1: selY(y1), x2: selX(x2),
+            y2: selY(y2) });
+
+        update();
+
+        options.onSelectChange(img, getSelection());
+    }
+
+    function movingMouseMove(event) {
+        x1 = max(left, min(startX + evX(event), left + imgWidth - selection.width));
+        y1 = max(top, min(startY + evY(event), top + imgHeight - selection.height));
+
+        doMove(x1, y1);
+
+        event.preventDefault();
+
+        return false;
+    }
+
+    function startSelection() {
+        $(document).unbind('mousemove', startSelection);
+        adjust();
+
+        x2 = x1;
+        y2 = y1;
+
+        doResize();
+
+        resize = '';
+
+        if (!$outer.is(':visible'))
+            $box.add($outer).hide().fadeIn(options.fadeSpeed||0);
+
+        shown = true;
+
+        $(document).unbind('mouseup', cancelSelection)
+            .mousemove(selectingMouseMove).one('mouseup', docMouseUp);
+        $box.unbind('mousemove', areaMouseMove);
+
+        options.onSelectStart(img, getSelection());
+    }
+
+    function cancelSelection() {
+        $(document).unbind('mousemove', startSelection)
+            .unbind('mouseup', cancelSelection);
+        hide($box.add($outer));
+
+        setSelection(selX(x1), selY(y1), selX(x1), selY(y1));
+
+        if (!(this instanceof $.imgAreaSelect)) {
+            options.onSelectChange(img, getSelection());
+            options.onSelectEnd(img, getSelection());
+        }
+    }
+
+    function imgMouseDown(event) {
+        if (event.which != 1 || $outer.is(':animated')) return false;
+
+        adjust();
+        startX = x1 = evX(event);
+        startY = y1 = evY(event);
+
+        $(document).mousemove(startSelection).mouseup(cancelSelection);
+
+        return false;
+    }
+
+    function windowResize() {
+        doUpdate(false);
+    }
+
+    function imgLoad() {
+        imgLoaded = true;
+
+        setOptions(options = $.extend({
+            classPrefix: 'imgareaselect',
+            movable: true,
+            parent: 'body',
+            resizable: true,
+            resizeMargin: 10,
+            onInit: function () {},
+            onSelectStart: function () {},
+            onSelectChange: function () {},
+            onSelectEnd: function () {}
+        }, options));
+
+        $box.add($outer).css({ visibility: '' });
+
+        if (options.show) {
+            shown = true;
+            adjust();
+            update();
+            $box.add($outer).hide().fadeIn(options.fadeSpeed||0);
+        }
+
+        setTimeout(function () { options.onInit(img, getSelection()); }, 0);
+    }
+
+    var docKeyPress = function(event) {
+        var k = options.keys, d, t, key = event.keyCode;
+
+        d = !isNaN(k.alt) && (event.altKey || event.originalEvent.altKey) ? k.alt :
+            !isNaN(k.ctrl) && event.ctrlKey ? k.ctrl :
+            !isNaN(k.shift) && event.shiftKey ? k.shift :
+            !isNaN(k.arrows) ? k.arrows : 10;
+
+        if (k.arrows == 'resize' || (k.shift == 'resize' && event.shiftKey) ||
+            (k.ctrl == 'resize' && event.ctrlKey) ||
+            (k.alt == 'resize' && (event.altKey || event.originalEvent.altKey)))
+        {
+            switch (key) {
+            case 37:
+                d = -d;
+            case 39:
+                t = max(x1, x2);
+                x1 = min(x1, x2);
+                x2 = max(t + d, x1);
+                fixAspectRatio();
+                break;
+            case 38:
+                d = -d;
+            case 40:
+                t = max(y1, y2);
+                y1 = min(y1, y2);
+                y2 = max(t + d, y1);
+                fixAspectRatio(true);
+                break;
+            default:
+                return;
+            }
+
+            doResize();
+        }
+        else {
+            x1 = min(x1, x2);
+            y1 = min(y1, y2);
+
+            switch (key) {
+            case 37:
+                doMove(max(x1 - d, left), y1);
+                break;
+            case 38:
+                doMove(x1, max(y1 - d, top));
+                break;
+            case 39:
+                doMove(x1 + min(d, imgWidth - selX(x2)), y1);
+                break;
+            case 40:
+                doMove(x1, y1 + min(d, imgHeight - selY(y2)));
+                break;
+            default:
+                return;
+            }
+        }
+
+        return false;
+    };
+
+    function styleOptions($elem, props) {
+        for (var option in props)
+            if (options[option] !== undefined)
+                $elem.css(props[option], options[option]);
+    }
+
+    function setOptions(newOptions) {
+        if (newOptions.parent)
+            ($parent = $(newOptions.parent)).append($box.add($outer));
+
+        $.extend(options, newOptions);
+
+        adjust();
+
+        if (newOptions.handles != null) {
+            $handles.remove();
+            $handles = $([]);
+
+            i = newOptions.handles ? newOptions.handles == 'corners' ? 4 : 8 : 0;
+
+            while (i--)
+                $handles = $handles.add(div());
+
+            $handles.addClass(options.classPrefix + '-handle').css({
+                position: 'absolute',
+                fontSize: 0,
+                zIndex: zIndex + 1 || 1
+            });
+
+            if (!parseInt($handles.css('width')) >= 0)
+                $handles.width(5).height(5);
+
+            if (o = options.borderWidth)
+                $handles.css({ borderWidth: o, borderStyle: 'solid' });
+
+            styleOptions($handles, { borderColor1: 'border-color',
+                borderColor2: 'background-color',
+                borderOpacity: 'opacity' });
+        }
+
+        scaleX = options.imageWidth / imgWidth || 1;
+        scaleY = options.imageHeight / imgHeight || 1;
+
+        if (newOptions.x1 != null) {
+            setSelection(newOptions.x1, newOptions.y1, newOptions.x2,
+                newOptions.y2);
+            newOptions.show = !newOptions.hide;
+        }
+
+        if (newOptions.keys)
+            options.keys = $.extend({ shift: 1, ctrl: 'resize' },
+                newOptions.keys);
+
+        $outer.addClass(options.classPrefix + '-outer');
+        $area.addClass(options.classPrefix + '-selection');
+        for (i = 0; i++ < 4;)
+            $($border[i-1]).addClass(options.classPrefix + '-border' + i);
+
+        styleOptions($area, { selectionColor: 'background-color',
+            selectionOpacity: 'opacity' });
+        styleOptions($border, { borderOpacity: 'opacity',
+            borderWidth: 'border-width' });
+        styleOptions($outer, { outerColor: 'background-color',
+            outerOpacity: 'opacity' });
+        if (o = options.borderColor1)
+            $($border[0]).css({ borderStyle: 'solid', borderColor: o });
+        if (o = options.borderColor2)
+            $($border[1]).css({ borderStyle: 'dashed', borderColor: o });
+
+        $box.append($area.add($border).add($areaOpera)).append($handles);
+
+        if (msie) {
+            if (o = ($outer.css('filter')||'').match(/opacity=(\d+)/))
+                $outer.css('opacity', o[1]/100);
+            if (o = ($border.css('filter')||'').match(/opacity=(\d+)/))
+                $border.css('opacity', o[1]/100);
+        }
+
+        if (newOptions.hide)
+            hide($box.add($outer));
+        else if (newOptions.show && imgLoaded) {
+            shown = true;
+            $box.add($outer).fadeIn(options.fadeSpeed||0);
+            doUpdate();
+        }
+
+        aspectRatio = (d = (options.aspectRatio || '').split(/:/))[0] / d[1];
+
+        $img.add($outer).unbind('mousedown', imgMouseDown);
+
+        if (options.disable || options.enable === false) {
+            $box.unbind('mousemove', areaMouseMove).unbind('mousedown', areaMouseDown);
+            $(window).unbind('resize', windowResize);
+        }
+        else {
+            if (options.enable || options.disable === false) {
+                if (options.resizable || options.movable)
+                    $box.mousemove(areaMouseMove).mousedown(areaMouseDown);
+
+                $(window).resize(windowResize);
+            }
+
+            if (!options.persistent)
+                $img.add($outer).mousedown(imgMouseDown);
+        }
+
+        options.enable = options.disable = undefined;
+    }
+
+    this.remove = function () {
+        setOptions({ disable: true });
+        $box.add($outer).remove();
+    };
+
+    this.getOptions = function () { return options; };
+
+    this.setOptions = setOptions;
+
+    this.getSelection = getSelection;
+
+    this.setSelection = setSelection;
+
+    this.cancelSelection = cancelSelection;
+
+    this.update = doUpdate;
+
+    var msie = (/msie ([\w.]+)/i.exec(ua)||[])[1],
+        opera = /opera/i.test(ua),
+        safari = /webkit/i.test(ua) && !/chrome/i.test(ua);
+
+    $p = $img;
+
+    while ($p.length) {
+        zIndex = max(zIndex,
+            !isNaN($p.css('z-index')) ? $p.css('z-index') : zIndex);
+        if ($p.css('position') == 'fixed')
+            position = 'fixed';
+
+        $p = $p.parent(':not(body)');
+    }
+
+    zIndex = options.zIndex || zIndex;
+
+    if (msie)
+        $img.attr('unselectable', 'on');
+
+    $.imgAreaSelect.keyPress = msie || safari ? 'keydown' : 'keypress';
+
+    if (opera)
+
+        $areaOpera = div().css({ width: '100%', height: '100%',
+            position: 'absolute', zIndex: zIndex + 2 || 2 });
+
+    $box.add($outer).css({ visibility: 'hidden', position: position,
+        overflow: 'hidden', zIndex: zIndex || '0' });
+    $box.css({ zIndex: zIndex + 2 || 2 });
+    $area.add($border).css({ position: 'absolute', fontSize: 0 });
+
+    img.complete || img.readyState == 'complete' || !$img.is('img') ?
+        imgLoad() : $img.one('load', imgLoad);
+
+    if (!imgLoaded && msie && msie >= 7)
+        img.src = img.src;
+};
+
+$.fn.imgAreaSelect = function (options) {
+    options = options || {};
+
+    this.each(function () {
+        if ($(this).data('imgAreaSelect')) {
+            if (options.remove) {
+                $(this).data('imgAreaSelect').remove();
+                $(this).removeData('imgAreaSelect');
+            }
+            else
+                $(this).data('imgAreaSelect').setOptions(options);
+        }
+        else if (!options.remove) {
+            if (options.enable === undefined && options.disable === undefined)
+                options.enable = true;
+
+            $(this).data('imgAreaSelect', new $.imgAreaSelect(this, options));
+        }
+    });
+
+    if (options.instance)
+        return $(this).data('imgAreaSelect');
+
+    return this;
+};
+
+})(jQuery);

share/pnp/templates.dist/check_mssql_health.php

@@ -72,7 +72,7 @@ foreach ($this->DS as $KEY=>$VAL) {
         $def[$defcnt] .= rrd::area("ag","#$green");
         $def[$defcnt] .= rrd::area("ay","#$yellow");
         $def[$defcnt] .= rrd::area("ar","#$red");
-        $def[$defcnt] .= rrd::line1("fullscans","#000000", "Full table scans");
+        $def[$defcnt] .= rrd::line1("fullscans","#000000", "Full table sacns");
         $def[$defcnt] .= rrd::gprint("fullscans",array("MAX", "AVERAGE", "LAST"),"%3.2lf");
         $defcnt++;
     }
@@ -359,14 +359,6 @@ foreach ($this->DS as $KEY=>$VAL) {
         $defcnt++;
     }
 
-    if(preg_match('/^sql_runtime$/', $VAL['NAME'])) {
-        $ds_name[$defcnt] = "SQL runtime";
-        $opt[$defcnt] = "--vertical-label \"Seconds\" --title \"Execution time of the SQL statement\" ";
-        $def[$defcnt] = "";
-        $def[$defcnt] .= rrd::def("runtime",$VAL['RRDFILE'],$VAL['DS'],"AVERAGE:reduce=LAST") ;
-        $def[$defcnt] .= rrd::area("runtime","#111111");
-        $def[$defcnt] .= rrd::gprint("runtime",array("LAST", "MAX", "AVERAGE"),"%3.2lf Seconds") ;
-        $defcnt++;
-    }
 }
 ?>
+