5 files changed, 485 insertions, 412 deletions

diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index 383b9efadb6f..630278ab0a10 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pnp
-PORTVERSION=	0.6.7
+PORTVERSION=	0.6.10
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=pnp4nagios/PNP-0.6
@@ -28,7 +28,8 @@ OPTIONS=	PDF "Use built-in fpdf library to produce PDF views" ON
 LICENSE=	GPLv2
 PATCH_STRIP=	-p1
 USE_PERL5=	yes
-USE_PHP=	zlib gd xml pcre filter iconv json simplexml
+USE_PHP=	filter gd iconv json pcre simplexml xml zlib
+
 WANT_PHP_WEB=	yes
 USE_RC_SUBR=	npcd.sh
 MAN8=		npcd.8
@@ -42,6 +43,7 @@ NAGIOSGROUP?=	nagios
 PNP_STATE=	${NAGIOSDIR}/pnp
 PNP_RRDS=	${PNP_STATE}/rrd
 PNP_SPOOL=	${PNP_STATE}/perfspool
+PNP_URL?=	${NAGIOSHTMURL}/pnp
 FPDF_DIR?=	share/fpdf
 SPOOL_DIRS=	${PNP_STATE}:${NAGIOSUSER}:${NAGIOSGROUP}:0750%${PNP_RRDS}:${NAGIOSUSER}:${NAGIOSGROUP}:0750%${PNP_SPOOL}:${NAGIOSUSER}:${NAGIOSGROUP}:0750
 
@@ -51,7 +53,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-disable-pdf
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	\
-	--sysconfdir=${PREFIX}/etc/pnp \
+	--sysconfdir=${ETCDIR} \
 	--datarootdir=${WWWDIR} \
 	--datadir=${WWWDIR} \
 	--localstatedir=/var/log \
@@ -71,6 +73,7 @@ SUB_FILES=	pkg-install \
 		pkg-message
 SUB_LIST=	SPOOL_DIRS=${SPOOL_DIRS} \
 		PNP_RRDS=${PNP_RRDS} \
+		PNP_URL=${PNP_URL} \
 		NAGIOSUSER=${NAGIOSUSER} \
 		NAGIOSGROUP=${NAGIOSGROUP}
 
@@ -83,6 +86,8 @@ post-patch:
 	@${REINPLACE_CMD} \
   -e's|^\$$conf\['\''use_fpdf'\''\] = [[:digit:]];|$$conf['\''use_fpdf'\''] = ${PNP_USE_FPDF};|' \
   -e's|^\$$conf\['\''nagios_base'\''\] = "/nagios/cgi-bin";|$$conf\['\''nagios_base'\''\] = "${NAGIOSHTMURL}/cgi-bin";|' \
+  -e's|/usr/local/check_mk/|/usr/local/share/check_mk/|g' \
+  -e's|/usr/local/nagios/var/rw/live|/${NAGIOSDIR}/rw/live|' \
   "${WRKSRC}/sample-config/pnp/config.php.in"
 
 pre-install:
@@ -90,7 +95,7 @@ pre-install:
 
 post-install:
 .for m in ${MAN8}
-	${INSTALL_MAN} ${WRKSRC}/man/${m} ${MAN1PREFIX}/man/man8/${m}
+	${INSTALL_MAN} ${WRKSRC}/man/${m} ${MAN8PREFIX}/man/man8/${m}
 .endfor
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/net-mgmt/pnp/distinfo b/net-mgmt/pnp/distinfo
index 8994d7176183..16207908dbb0 100644
--- a/net-mgmt/pnp/distinfo
+++ b/net-mgmt/pnp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pnp4nagios-0.6.7.tar.gz) = 010128d1ed13afed1cc313264b10807b60b7dc596d0e9e86c0ac7208d0df5878
-SIZE (pnp4nagios-0.6.7.tar.gz) = 1874012
+SHA256 (pnp4nagios-0.6.10.tar.gz) = c99180dd2a36d799f48a73a9ac63d8877e0e1f36a0847a9ce7103bf2a4e86bc8
+SIZE (pnp4nagios-0.6.10.tar.gz) = 1950868
diff --git a/net-mgmt/pnp/files/patch-0030-nuke-libraries-directory b/net-mgmt/pnp/files/patch-0030-nuke-libraries-directory
new file mode 100644
index 000000000000..4697140cc23a
--- /dev/null
+++ b/net-mgmt/pnp/files/patch-0030-nuke-libraries-directory
@@ -0,0 +1,28 @@
+From ef870c19bfafbac8139c676bde7cafb2420ebdba Mon Sep 17 00:00:00 2001
+From: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
+Date: Tue, 28 Dec 2010 18:32:10 +0300
+Subject: [PATCH] PNP: remove creation of an empty directory
+
+$SHARE/application/libraries contains nothing after the installtion,
+so it looks like a remains of some old directory layout.
+
+Signed-off-by: Eygene Ryabinkin <rea-fbsd@codelabs.ru>
+---
+ share/Makefile.in |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/share/Makefile.in b/share/Makefile.in
+index 709ade7..1c75db2 100644
+--- a/share/Makefile.in
++++ b/share/Makefile.in
+@@ -43,7 +43,6 @@ install:
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/i18n/es_ES
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/i18n/ru_RU
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/i18n/fr_FR
+-	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/libraries
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/models
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/views
+ 	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(DATAROOTDIR)/application/vendor
+-- 
+1.7.3.2
+
diff --git a/net-mgmt/pnp/files/pkg-message.in b/net-mgmt/pnp/files/pkg-message.in
index fa225545d909..88e5ecd44d27 100644
--- a/net-mgmt/pnp/files/pkg-message.in
+++ b/net-mgmt/pnp/files/pkg-message.in
@@ -12,7 +12,7 @@ We recommend to start with the following restrictive Apache
 configuration for the PNP area:
 {{{
 # PNP graphing tool
-Alias /nagios/pnp %%WWWDIR%%
+Alias %%PNP_URL%% %%WWWDIR%%
 <Directory "%%WWWDIR%%/">
     Order deny,allow
     Allow from all
diff --git a/net-mgmt/pnp/pkg-plist b/net-mgmt/pnp/pkg-plist
index 00264893bec1..42735f3abc7d 100644
--- a/net-mgmt/pnp/pkg-plist
+++ b/net-mgmt/pnp/pkg-plist
@@ -1,335 +1,19 @@
-bin/npcd
-etc/pnp/check_commands/check_nwstat.cfg-sample
-etc/pnp/check_commands/check_nrpe.cfg-sample
-etc/pnp/check_commands/check_all_local_disks.cfg-sample
-etc/pnp/pages/web_traffic.cfg-sample
-etc/pnp/pnp4nagios_release
-etc/pnp/config.php-sample
-etc/pnp/background.pdf-sample
-etc/pnp/process_perfdata.cfg-sample
-etc/pnp/rra.cfg-sample
-etc/pnp/misccommands.cfg-sample
-etc/pnp/nagios.cfg-sample
-etc/pnp/npcd.cfg-sample
-lib/npcdmod.o
-lib/kohana/system/controllers/captcha.php
-lib/kohana/system/controllers/template.php
-lib/kohana/system/i18n/de_DE/validation.php
-lib/kohana/system/i18n/de_DE/core.php
-lib/kohana/system/i18n/de_DE/pagination.php
-lib/kohana/system/i18n/de_DE/captcha.php
-lib/kohana/system/i18n/de_DE/encrypt.php
-lib/kohana/system/i18n/de_DE/orm.php
-lib/kohana/system/i18n/de_DE/image.php
-lib/kohana/system/i18n/de_DE/session.php
-lib/kohana/system/i18n/de_DE/database.php
-lib/kohana/system/i18n/de_DE/calendar.php
-lib/kohana/system/i18n/de_DE/profiler.php
-lib/kohana/system/i18n/de_DE/cache.php
-lib/kohana/system/i18n/de_DE/upload.php
-lib/kohana/system/i18n/de_DE/event.php
-lib/kohana/system/i18n/de_DE/errors.php
-lib/kohana/system/i18n/de_DE/swift.php
-lib/kohana/system/i18n/nl_NL/validation.php
-lib/kohana/system/i18n/nl_NL/core.php
-lib/kohana/system/i18n/nl_NL/pagination.php
-lib/kohana/system/i18n/nl_NL/captcha.php
-lib/kohana/system/i18n/nl_NL/encrypt.php
-lib/kohana/system/i18n/nl_NL/orm.php
-lib/kohana/system/i18n/nl_NL/image.php
-lib/kohana/system/i18n/nl_NL/session.php
-lib/kohana/system/i18n/nl_NL/database.php
-lib/kohana/system/i18n/nl_NL/calendar.php
-lib/kohana/system/i18n/nl_NL/profiler.php
-lib/kohana/system/i18n/nl_NL/cache.php
-lib/kohana/system/i18n/nl_NL/upload.php
-lib/kohana/system/i18n/nl_NL/event.php
-lib/kohana/system/i18n/nl_NL/errors.php
-lib/kohana/system/i18n/nl_NL/swift.php
-lib/kohana/system/i18n/es_ES/validation.php
-lib/kohana/system/i18n/es_ES/core.php
-lib/kohana/system/i18n/es_ES/pagination.php
-lib/kohana/system/i18n/es_ES/captcha.php
-lib/kohana/system/i18n/es_ES/encrypt.php
-lib/kohana/system/i18n/es_ES/orm.php
-lib/kohana/system/i18n/es_ES/image.php
-lib/kohana/system/i18n/es_ES/session.php
-lib/kohana/system/i18n/es_ES/database.php
-lib/kohana/system/i18n/es_ES/calendar.php
-lib/kohana/system/i18n/es_ES/profiler.php
-lib/kohana/system/i18n/es_ES/cache.php
-lib/kohana/system/i18n/es_ES/upload.php
-lib/kohana/system/i18n/es_ES/event.php
-lib/kohana/system/i18n/es_ES/errors.php
-lib/kohana/system/i18n/es_ES/swift.php
-lib/kohana/system/i18n/ru_RU/validation.php
-lib/kohana/system/i18n/ru_RU/core.php
-lib/kohana/system/i18n/ru_RU/pagination.php
-lib/kohana/system/i18n/ru_RU/captcha.php
-lib/kohana/system/i18n/ru_RU/encrypt.php
-lib/kohana/system/i18n/ru_RU/orm.php
-lib/kohana/system/i18n/ru_RU/image.php
-lib/kohana/system/i18n/ru_RU/session.php
-lib/kohana/system/i18n/ru_RU/database.php
-lib/kohana/system/i18n/ru_RU/calendar.php
-lib/kohana/system/i18n/ru_RU/profiler.php
-lib/kohana/system/i18n/ru_RU/cache.php
-lib/kohana/system/i18n/ru_RU/upload.php
-lib/kohana/system/i18n/ru_RU/event.php
-lib/kohana/system/i18n/ru_RU/errors.php
-lib/kohana/system/i18n/ru_RU/swift.php
-lib/kohana/system/i18n/en_US/validation.php
-lib/kohana/system/i18n/en_US/core.php
-lib/kohana/system/i18n/en_US/pagination.php
-lib/kohana/system/i18n/en_US/captcha.php
-lib/kohana/system/i18n/en_US/encrypt.php
-lib/kohana/system/i18n/en_US/orm.php
-lib/kohana/system/i18n/en_US/image.php
-lib/kohana/system/i18n/en_US/session.php
-lib/kohana/system/i18n/en_US/database.php
-lib/kohana/system/i18n/en_US/calendar.php
-lib/kohana/system/i18n/en_US/profiler.php
-lib/kohana/system/i18n/en_US/cache.php
-lib/kohana/system/i18n/en_US/upload.php
-lib/kohana/system/i18n/en_US/event.php
-lib/kohana/system/i18n/en_US/errors.php
-lib/kohana/system/i18n/en_US/swift.php
-lib/kohana/system/i18n/fr_FR/validation.php
-lib/kohana/system/i18n/fr_FR/core.php
-lib/kohana/system/i18n/fr_FR/pagination.php
-lib/kohana/system/i18n/fr_FR/captcha.php
-lib/kohana/system/i18n/fr_FR/encrypt.php
-lib/kohana/system/i18n/fr_FR/orm.php
-lib/kohana/system/i18n/fr_FR/image.php
-lib/kohana/system/i18n/fr_FR/session.php
-lib/kohana/system/i18n/fr_FR/database.php
-lib/kohana/system/i18n/fr_FR/calendar.php
-lib/kohana/system/i18n/fr_FR/profiler.php
-lib/kohana/system/i18n/fr_FR/cache.php
-lib/kohana/system/i18n/fr_FR/upload.php
-lib/kohana/system/i18n/fr_FR/event.php
-lib/kohana/system/i18n/fr_FR/errors.php
-lib/kohana/system/i18n/fr_FR/swift.php
-lib/kohana/system/i18n/it_IT/validation.php
-lib/kohana/system/i18n/it_IT/core.php
-lib/kohana/system/i18n/it_IT/pagination.php
-lib/kohana/system/i18n/it_IT/captcha.php
-lib/kohana/system/i18n/it_IT/encrypt.php
-lib/kohana/system/i18n/it_IT/orm.php
-lib/kohana/system/i18n/it_IT/image.php
-lib/kohana/system/i18n/it_IT/session.php
-lib/kohana/system/i18n/it_IT/database.php
-lib/kohana/system/i18n/it_IT/calendar.php
-lib/kohana/system/i18n/it_IT/profiler.php
-lib/kohana/system/i18n/it_IT/cache.php
-lib/kohana/system/i18n/it_IT/upload.php
-lib/kohana/system/i18n/it_IT/event.php
-lib/kohana/system/i18n/it_IT/errors.php
-lib/kohana/system/i18n/it_IT/swift.php
-lib/kohana/system/helpers/remote.php
-lib/kohana/system/helpers/url.php
-lib/kohana/system/helpers/feed.php
-lib/kohana/system/helpers/expires.php
-lib/kohana/system/helpers/text.php
-lib/kohana/system/helpers/email.php
-lib/kohana/system/helpers/download.php
-lib/kohana/system/helpers/format.php
-lib/kohana/system/helpers/form.php
-lib/kohana/system/helpers/arr.php
-lib/kohana/system/helpers/html.php
-lib/kohana/system/helpers/valid.php
-lib/kohana/system/helpers/date.php
-lib/kohana/system/helpers/file.php
-lib/kohana/system/helpers/request.php
-lib/kohana/system/helpers/upload.php
-lib/kohana/system/helpers/cookie.php
-lib/kohana/system/helpers/security.php
-lib/kohana/system/helpers/num.php
-lib/kohana/system/helpers/inflector.php
-lib/kohana/system/libraries/drivers/Database/Mssql.php
-lib/kohana/system/libraries/drivers/Database/Pdosqlite.php
-lib/kohana/system/libraries/drivers/Database/Mysqli.php
-lib/kohana/system/libraries/drivers/Database/Pgsql.php
-lib/kohana/system/libraries/drivers/Database/Mysql.php
-lib/kohana/system/libraries/drivers/Captcha/Alpha.php
-lib/kohana/system/libraries/drivers/Captcha/Math.php
-lib/kohana/system/libraries/drivers/Captcha/Word.php
-lib/kohana/system/libraries/drivers/Captcha/Riddle.php
-lib/kohana/system/libraries/drivers/Captcha/Basic.php
-lib/kohana/system/libraries/drivers/Captcha/Black.php
-lib/kohana/system/libraries/drivers/Cache/Eaccelerator.php
-lib/kohana/system/libraries/drivers/Cache/Apc.php
-lib/kohana/system/libraries/drivers/Cache/Memcache.php
-lib/kohana/system/libraries/drivers/Cache/Xcache.php
-lib/kohana/system/libraries/drivers/Cache/File.php
-lib/kohana/system/libraries/drivers/Cache/Sqlite.php
-lib/kohana/system/libraries/drivers/Image/GraphicsMagick.php
-lib/kohana/system/libraries/drivers/Image/GD.php
-lib/kohana/system/libraries/drivers/Image/ImageMagick.php
-lib/kohana/system/libraries/drivers/Session/Cookie.php
-lib/kohana/system/libraries/drivers/Session/Cache.php
-lib/kohana/system/libraries/drivers/Session/Database.php
-lib/kohana/system/libraries/drivers/Captcha.php
-lib/kohana/system/libraries/drivers/Cache.php
-lib/kohana/system/libraries/drivers/Session.php
-lib/kohana/system/libraries/drivers/Image.php
-lib/kohana/system/libraries/drivers/Database.php
-lib/kohana/system/libraries/Pagination.php
-lib/kohana/system/libraries/ORM_Tree.php
-lib/kohana/system/libraries/Encrypt.php
-lib/kohana/system/libraries/Calendar.php
-lib/kohana/system/libraries/Database_Expression.php
-lib/kohana/system/libraries/Event_Observer.php
-lib/kohana/system/libraries/Event_Subject.php
-lib/kohana/system/libraries/Captcha.php
-lib/kohana/system/libraries/Cache.php
-lib/kohana/system/libraries/Session.php
-lib/kohana/system/libraries/Image.php
-lib/kohana/system/libraries/Validation.php
-lib/kohana/system/libraries/ORM_Versioned.php
-lib/kohana/system/libraries/Controller.php
-lib/kohana/system/libraries/Profiler.php
-lib/kohana/system/libraries/Model.php
-lib/kohana/system/libraries/View.php
-lib/kohana/system/libraries/Router.php
-lib/kohana/system/libraries/ORM_Iterator.php
-lib/kohana/system/libraries/URI.php
-lib/kohana/system/libraries/Profiler_Table.php
-lib/kohana/system/libraries/ORM.php
-lib/kohana/system/libraries/Calendar_Event.php
-lib/kohana/system/libraries/Tagcloud.php
-lib/kohana/system/libraries/Input.php
-lib/kohana/system/libraries/Database.php
-lib/kohana/system/config/locale.php
-lib/kohana/system/config/routes.php
-lib/kohana/system/config/pagination.php
-lib/kohana/system/config/sql_types.php
-lib/kohana/system/config/captcha.php
-lib/kohana/system/config/email.php
-lib/kohana/system/config/image.php
-lib/kohana/system/config/cache_sqlite.php
-lib/kohana/system/config/cache_memcache.php
-lib/kohana/system/config/session.php
-lib/kohana/system/config/database.php
-lib/kohana/system/config/credit_cards.php
-lib/kohana/system/config/http.php
-lib/kohana/system/config/mimes.php
-lib/kohana/system/config/profiler.php
-lib/kohana/system/config/view.php
-lib/kohana/system/config/cache.php
-lib/kohana/system/config/encryption.php
-lib/kohana/system/config/upload.php
-lib/kohana/system/config/cookie.php
-lib/kohana/system/config/user_agents.php
-lib/kohana/system/config/inflector.php
-lib/kohana/system/config/cache_xcache.php
-lib/kohana/system/core/utf8/transliterate_to_ascii.php
-lib/kohana/system/core/utf8/ucfirst.php
-lib/kohana/system/core/utf8/ord.php
-lib/kohana/system/core/utf8/strrpos.php
-lib/kohana/system/core/utf8/strtolower.php
-lib/kohana/system/core/utf8/substr.php
-lib/kohana/system/core/utf8/str_pad.php
-lib/kohana/system/core/utf8/strcspn.php
-lib/kohana/system/core/utf8/trim.php
-lib/kohana/system/core/utf8/rtrim.php
-lib/kohana/system/core/utf8/strcasecmp.php
-lib/kohana/system/core/utf8/strtoupper.php
-lib/kohana/system/core/utf8/str_split.php
-lib/kohana/system/core/utf8/strpos.php
-lib/kohana/system/core/utf8/stristr.php
-lib/kohana/system/core/utf8/ucwords.php
-lib/kohana/system/core/utf8/str_ireplace.php
-lib/kohana/system/core/utf8/strlen.php
-lib/kohana/system/core/utf8/to_unicode.php
-lib/kohana/system/core/utf8/substr_replace.php
-lib/kohana/system/core/utf8/from_unicode.php
-lib/kohana/system/core/utf8/strrev.php
-lib/kohana/system/core/utf8/strspn.php
-lib/kohana/system/core/utf8/ltrim.php
-lib/kohana/system/core/Event.php
-lib/kohana/system/core/Benchmark.php
-lib/kohana/system/core/Bootstrap.php
-lib/kohana/system/core/Kohana.php
-lib/kohana/system/core/utf8.php
-lib/kohana/system/views/kohana/template.php
-lib/kohana/system/views/pagination/digg.php
-lib/kohana/system/views/pagination/punbb.php
-lib/kohana/system/views/pagination/extended.php
-lib/kohana/system/views/pagination/classic.php
-lib/kohana/system/views/kohana_profiler_table.php
-lib/kohana/system/views/kohana_error_page.php
-lib/kohana/system/views/kohana_calendar.php
-lib/kohana/system/views/kohana_profiler_table.css
-lib/kohana/system/views/kohana_profiler.php
-lib/kohana/system/views/kohana_error_disabled.php
-lib/kohana/system/views/kohana_errors.css
-lib/kohana/system/fonts/LICENSE
-lib/kohana/system/fonts/DejaVuSerif.ttf
-libexec/process_perfdata.pl
-libexec/check_pnp_rrds.pl
-libexec/verify_pnp_config.pl
-libexec/rrd_convert.pl
-%%WWWDIR%%/documents/_media/bulk-npcd.png
-%%WWWDIR%%/documents/_media/bulk-npcdmod.png
-%%WWWDIR%%/documents/_media/bulk.png
-%%WWWDIR%%/documents/_media/nagiospowered-72x72.png
-%%WWWDIR%%/documents/_media/pnp-preview-05-08-2009.png
-%%WWWDIR%%/documents/_media/popup.png
-%%WWWDIR%%/documents/_media/srv_info.png
-%%WWWDIR%%/documents/_media/synchronous.png
-%%WWWDIR%%/documents/en_US/about.html
-%%WWWDIR%%/documents/en_US/advanced.html
-%%WWWDIR%%/documents/en_US/config.html
-%%WWWDIR%%/documents/en_US/doc_complete.html
-%%WWWDIR%%/documents/en_US/dwnld.html
-%%WWWDIR%%/documents/en_US/install.html
-%%WWWDIR%%/documents/en_US/modes.html
-%%WWWDIR%%/documents/en_US/new-features.html
-%%WWWDIR%%/documents/en_US/npcd.html
-%%WWWDIR%%/documents/en_US/pages.html
-%%WWWDIR%%/documents/en_US/perfdata_format.html
-%%WWWDIR%%/documents/en_US/rrd_convert.html
-%%WWWDIR%%/documents/en_US/rrdcached.html
-%%WWWDIR%%/documents/en_US/start.html
-%%WWWDIR%%/documents/en_US/timeranges.html
-%%WWWDIR%%/documents/en_US/tpl.html
-%%WWWDIR%%/documents/en_US/tpl_custom.html
-%%WWWDIR%%/documents/en_US/tpl_helper.html
-%%WWWDIR%%/documents/en_US/tpl_special.html
-%%WWWDIR%%/documents/en_US/upgrade.html
-%%WWWDIR%%/documents/en_US/verify.html
-%%WWWDIR%%/documents/en_US/verify_pnp_config.html
-%%WWWDIR%%/documents/en_US/webfe.html
-%%WWWDIR%%/documents/en_US/webfe_cfg.html
-%%WWWDIR%%/documents/en_US/wrapper.html
-%%WWWDIR%%/documents/en_US/xport.html
-%%WWWDIR%%/documents/de_DE/about.html
-%%WWWDIR%%/documents/de_DE/advanced.html
-%%WWWDIR%%/documents/de_DE/config.html
-%%WWWDIR%%/documents/de_DE/doc_complete.html
-%%WWWDIR%%/documents/de_DE/dwnld.html
-%%WWWDIR%%/documents/de_DE/install.html
-%%WWWDIR%%/documents/de_DE/modes.html
-%%WWWDIR%%/documents/de_DE/new-features.html
-%%WWWDIR%%/documents/de_DE/npcd.html
-%%WWWDIR%%/documents/de_DE/pages.html
-%%WWWDIR%%/documents/de_DE/perfdata_format.html
-%%WWWDIR%%/documents/de_DE/rrd_convert.html
-%%WWWDIR%%/documents/de_DE/rrdcached.html
-%%WWWDIR%%/documents/de_DE/start.html
-%%WWWDIR%%/documents/de_DE/timeranges.html
-%%WWWDIR%%/documents/de_DE/tpl.html
-%%WWWDIR%%/documents/de_DE/tpl_custom.html
-%%WWWDIR%%/documents/de_DE/tpl_helper.html
-%%WWWDIR%%/documents/de_DE/tpl_special.html
-%%WWWDIR%%/documents/de_DE/upgrade.html
-%%WWWDIR%%/documents/de_DE/verify.html
-%%WWWDIR%%/documents/de_DE/verify_pnp_config.html
-%%WWWDIR%%/documents/de_DE/webfe.html
-%%WWWDIR%%/documents/de_DE/webfe_cfg.html
-%%WWWDIR%%/documents/de_DE/wrapper.html
-%%WWWDIR%%/documents/de_DE/xport.html
+%%ETCDIR%%/background.pdf-sample
+%%ETCDIR%%/check_commands/check_all_local_disks.cfg-sample
+%%ETCDIR%%/check_commands/check_nrpe.cfg-sample
+%%ETCDIR%%/check_commands/check_nwstat.cfg-sample
+%%ETCDIR%%/config.php-sample
+%%ETCDIR%%/misccommands.cfg-sample
+%%ETCDIR%%/nagios.cfg-sample
+%%ETCDIR%%/npcd.cfg-sample
+%%ETCDIR%%/pages/web_traffic.cfg-sample
+%%ETCDIR%%/pnp4nagios_release
+%%ETCDIR%%/process_perfdata.cfg-sample
+%%ETCDIR%%/rra.cfg-sample
+%%WWWDIR%%/application/config/config.php
+%%WWWDIR%%/application/config/locale.php
+%%WWWDIR%%/application/config/routes.php
+%%WWWDIR%%/application/config/session.php
 %%WWWDIR%%/application/controllers/ajax.php
 %%WWWDIR%%/application/controllers/debug.php
 %%WWWDIR%%/application/controllers/docs.php
@@ -345,10 +29,6 @@ libexec/rrd_convert.pl
 %%WWWDIR%%/application/controllers/xml.php
 %%WWWDIR%%/application/controllers/xport.php
 %%WWWDIR%%/application/controllers/zoom.php
-%%WWWDIR%%/application/config/config.php
-%%WWWDIR%%/application/config/locale.php
-%%WWWDIR%%/application/config/routes.php
-%%WWWDIR%%/application/config/session.php
 %%WWWDIR%%/application/helpers/nagios.php
 %%WWWDIR%%/application/helpers/pnp.php
 %%WWWDIR%%/application/helpers/rrd.php
@@ -358,13 +38,40 @@ libexec/rrd_convert.pl
 %%WWWDIR%%/application/i18n/en_US/error.php
 %%WWWDIR%%/application/i18n/es_ES/common.php
 %%WWWDIR%%/application/i18n/es_ES/error.php
-%%WWWDIR%%/application/i18n/ru_RU/common.php
-%%WWWDIR%%/application/i18n/ru_RU/error.php
 %%WWWDIR%%/application/i18n/fr_FR/common.php
 %%WWWDIR%%/application/i18n/fr_FR/error.php
+%%WWWDIR%%/application/i18n/ru_RU/common.php
+%%WWWDIR%%/application/i18n/ru_RU/error.php
+%%WWWDIR%%/application/lib/json.php
+%%WWWDIR%%/application/lib/jsonwrapper.php
+%%WWWDIR%%/application/lib/jsonwrapper_inner.php
+%%WWWDIR%%/application/models/auth.php
 %%WWWDIR%%/application/models/config.php
 %%WWWDIR%%/application/models/data.php
 %%WWWDIR%%/application/models/rrdtool.php
+%%WWWDIR%%/application/models/system.php
+%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85.php
+%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85_FPDI.php
+%%WWWDIR%%/application/vendor/fpdf/filters/FilterLZW.php
+%%WWWDIR%%/application/vendor/fpdf/filters/FilterLZW_FPDI.php
+%%WWWDIR%%/application/vendor/fpdf/font/courier.php
+%%WWWDIR%%/application/vendor/fpdf/font/helvetica.php
+%%WWWDIR%%/application/vendor/fpdf/font/helveticab.php
+%%WWWDIR%%/application/vendor/fpdf/font/helveticabi.php
+%%WWWDIR%%/application/vendor/fpdf/font/helveticai.php
+%%WWWDIR%%/application/vendor/fpdf/font/symbol.php
+%%WWWDIR%%/application/vendor/fpdf/font/times.php
+%%WWWDIR%%/application/vendor/fpdf/font/timesb.php
+%%WWWDIR%%/application/vendor/fpdf/font/timesbi.php
+%%WWWDIR%%/application/vendor/fpdf/font/timesi.php
+%%WWWDIR%%/application/vendor/fpdf/font/zapfdingbats.php
+%%WWWDIR%%/application/vendor/fpdf/fpdf.php
+%%WWWDIR%%/application/vendor/fpdf/fpdf_tpl.php
+%%WWWDIR%%/application/vendor/fpdf/fpdi.php
+%%WWWDIR%%/application/vendor/fpdf/fpdi2tcpdf_bridge.php
+%%WWWDIR%%/application/vendor/fpdf/fpdi_pdf_parser.php
+%%WWWDIR%%/application/vendor/fpdf/pdf_context.php
+%%WWWDIR%%/application/vendor/fpdf/pdf_parser.php
 %%WWWDIR%%/application/views/basket_box.php
 %%WWWDIR%%/application/views/debug.php
 %%WWWDIR%%/application/views/docs.php
@@ -392,32 +99,103 @@ libexec/rrd_convert.pl
 %%WWWDIR%%/application/views/widget_menu.sample.php
 %%WWWDIR%%/application/views/zoom.php
 %%WWWDIR%%/application/views/zoom_header.php
-%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85.php
-%%WWWDIR%%/application/vendor/fpdf/filters/FilterASCII85_FPDI.php
-%%WWWDIR%%/application/vendor/fpdf/filters/FilterLZW.php
-%%WWWDIR%%/application/vendor/fpdf/filters/FilterLZW_FPDI.php
-%%WWWDIR%%/application/vendor/fpdf/font/courier.php
-%%WWWDIR%%/application/vendor/fpdf/font/helvetica.php
-%%WWWDIR%%/application/vendor/fpdf/font/helveticab.php
-%%WWWDIR%%/application/vendor/fpdf/font/helveticabi.php
-%%WWWDIR%%/application/vendor/fpdf/font/helveticai.php
-%%WWWDIR%%/application/vendor/fpdf/font/symbol.php
-%%WWWDIR%%/application/vendor/fpdf/font/times.php
-%%WWWDIR%%/application/vendor/fpdf/font/timesb.php
-%%WWWDIR%%/application/vendor/fpdf/font/timesbi.php
-%%WWWDIR%%/application/vendor/fpdf/font/timesi.php
-%%WWWDIR%%/application/vendor/fpdf/font/zapfdingbats.php
-%%WWWDIR%%/application/vendor/fpdf/fpdf.php
-%%WWWDIR%%/application/vendor/fpdf/fpdf_tpl.php
-%%WWWDIR%%/application/vendor/fpdf/fpdi.php
-%%WWWDIR%%/application/vendor/fpdf/fpdi2tcpdf_bridge.php
-%%WWWDIR%%/application/vendor/fpdf/fpdi_pdf_parser.php
-%%WWWDIR%%/application/vendor/fpdf/pdf_context.php
-%%WWWDIR%%/application/vendor/fpdf/pdf_parser.php
-%%WWWDIR%%/media/js/jquery-min.js
-%%WWWDIR%%/media/js/jquery-ui.min.js
-%%WWWDIR%%/media/js/jquery.cluetip.js
-%%WWWDIR%%/media/js/zoom.js
+%%WWWDIR%%/documents/_media/bulk-npcd.png
+%%WWWDIR%%/documents/_media/bulk-npcdmod.png
+%%WWWDIR%%/documents/_media/bulk.png
+%%WWWDIR%%/documents/_media/nagiospowered-72x72.png
+%%WWWDIR%%/documents/_media/pnp-preview-05-08-2009.png
+%%WWWDIR%%/documents/_media/popup.png
+%%WWWDIR%%/documents/_media/srv_info.png
+%%WWWDIR%%/documents/_media/synchronous.png
+%%WWWDIR%%/documents/de_DE/about.html
+%%WWWDIR%%/documents/de_DE/advanced.html
+%%WWWDIR%%/documents/de_DE/config.html
+%%WWWDIR%%/documents/de_DE/doc_complete.html
+%%WWWDIR%%/documents/de_DE/dwnld.html
+%%WWWDIR%%/documents/de_DE/install.html
+%%WWWDIR%%/documents/de_DE/modes.html
+%%WWWDIR%%/documents/de_DE/new-features.html
+%%WWWDIR%%/documents/de_DE/npcd.html
+%%WWWDIR%%/documents/de_DE/pages.html
+%%WWWDIR%%/documents/de_DE/perfdata_format.html
+%%WWWDIR%%/documents/de_DE/rrd_convert.html
+%%WWWDIR%%/documents/de_DE/rrdcached.html
+%%WWWDIR%%/documents/de_DE/start.html
+%%WWWDIR%%/documents/de_DE/timeranges.html
+%%WWWDIR%%/documents/de_DE/tpl.html
+%%WWWDIR%%/documents/de_DE/tpl_custom.html
+%%WWWDIR%%/documents/de_DE/tpl_helper.html
+%%WWWDIR%%/documents/de_DE/tpl_helper_pnp.html
+%%WWWDIR%%/documents/de_DE/tpl_special.html
+%%WWWDIR%%/documents/de_DE/upgrade.html
+%%WWWDIR%%/documents/de_DE/verify.html
+%%WWWDIR%%/documents/de_DE/verify_pnp_config.html
+%%WWWDIR%%/documents/de_DE/webfe.html
+%%WWWDIR%%/documents/de_DE/webfe_cfg.html
+%%WWWDIR%%/documents/de_DE/wrapper.html
+%%WWWDIR%%/documents/de_DE/xport.html
+%%WWWDIR%%/documents/en_US/about.html
+%%WWWDIR%%/documents/en_US/advanced.html
+%%WWWDIR%%/documents/en_US/config.html
+%%WWWDIR%%/documents/en_US/doc_complete.html
+%%WWWDIR%%/documents/en_US/dwnld.html
+%%WWWDIR%%/documents/en_US/install.html
+%%WWWDIR%%/documents/en_US/modes.html
+%%WWWDIR%%/documents/en_US/new-features.html
+%%WWWDIR%%/documents/en_US/npcd.html
+%%WWWDIR%%/documents/en_US/pages.html
+%%WWWDIR%%/documents/en_US/perfdata_format.html
+%%WWWDIR%%/documents/en_US/rrd_convert.html
+%%WWWDIR%%/documents/en_US/rrdcached.html
+%%WWWDIR%%/documents/en_US/start.html
+%%WWWDIR%%/documents/en_US/timeranges.html
+%%WWWDIR%%/documents/en_US/tpl.html
+%%WWWDIR%%/documents/en_US/tpl_custom.html
+%%WWWDIR%%/documents/en_US/tpl_helper.html
+%%WWWDIR%%/documents/en_US/tpl_helper_pnp.html
+%%WWWDIR%%/documents/en_US/tpl_special.html
+%%WWWDIR%%/documents/en_US/upgrade.html
+%%WWWDIR%%/documents/en_US/verify.html
+%%WWWDIR%%/documents/en_US/verify_pnp_config.html
+%%WWWDIR%%/documents/en_US/webfe.html
+%%WWWDIR%%/documents/en_US/webfe_cfg.html
+%%WWWDIR%%/documents/en_US/wrapper.html
+%%WWWDIR%%/documents/en_US/xport.html
+%%WWWDIR%%/documents/images/smileys/delete.gif
+%%WWWDIR%%/documents/images/smileys/fixme.gif
+%%WWWDIR%%/documents/images/smileys/icon_arrow.gif
+%%WWWDIR%%/documents/images/smileys/icon_biggrin.gif
+%%WWWDIR%%/documents/images/smileys/icon_confused.gif
+%%WWWDIR%%/documents/images/smileys/icon_cool.gif
+%%WWWDIR%%/documents/images/smileys/icon_cry.gif
+%%WWWDIR%%/documents/images/smileys/icon_doubt.gif
+%%WWWDIR%%/documents/images/smileys/icon_doubt2.gif
+%%WWWDIR%%/documents/images/smileys/icon_eek.gif
+%%WWWDIR%%/documents/images/smileys/icon_evil.gif
+%%WWWDIR%%/documents/images/smileys/icon_exclaim.gif
+%%WWWDIR%%/documents/images/smileys/icon_frown.gif
+%%WWWDIR%%/documents/images/smileys/icon_fun.gif
+%%WWWDIR%%/documents/images/smileys/icon_idea.gif
+%%WWWDIR%%/documents/images/smileys/icon_kaddi.gif
+%%WWWDIR%%/documents/images/smileys/icon_lol.gif
+%%WWWDIR%%/documents/images/smileys/icon_mrgreen.gif
+%%WWWDIR%%/documents/images/smileys/icon_neutral.gif
+%%WWWDIR%%/documents/images/smileys/icon_question.gif
+%%WWWDIR%%/documents/images/smileys/icon_razz.gif
+%%WWWDIR%%/documents/images/smileys/icon_redface.gif
+%%WWWDIR%%/documents/images/smileys/icon_rolleyes.gif
+%%WWWDIR%%/documents/images/smileys/icon_sad.gif
+%%WWWDIR%%/documents/images/smileys/icon_silenced.gif
+%%WWWDIR%%/documents/images/smileys/icon_smile.gif
+%%WWWDIR%%/documents/images/smileys/icon_smile2.gif
+%%WWWDIR%%/documents/images/smileys/icon_surprised.gif
+%%WWWDIR%%/documents/images/smileys/icon_twisted.gif
+%%WWWDIR%%/documents/images/smileys/icon_wink.gif
+%%WWWDIR%%/index.php
+%%WWWDIR%%/install.php
+%%WWWDIR%%/media/css/autocomplete.css
+%%WWWDIR%%/media/css/common.css
+%%WWWDIR%%/media/css/shadow.png
 %%WWWDIR%%/media/css/ui-lightness/images/ui-anim_basic_16x16.gif
 %%WWWDIR%%/media/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 %%WWWDIR%%/media/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png
@@ -434,21 +212,20 @@ libexec/rrd_convert.pl
 %%WWWDIR%%/media/css/ui-lightness/images/ui-icons_ffd27a_256x240.png
 %%WWWDIR%%/media/css/ui-lightness/images/ui-icons_ffffff_256x240.png
 %%WWWDIR%%/media/css/ui-lightness/jquery-ui.css
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-anim_basic_16x16.gif
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_75_dadada_1x400.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_222222_256x240.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_2e83ff_256x240.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_454545_256x240.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_888888_256x240.png
-%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_cd0a0a_256x240.png
-%%WWWDIR%%/media/css/ui-smoothness/jquery-ui.css
+%%WWWDIR%%/media/css/ui-multisite/images/contentframe_background.jpg
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_0_aaaaaa_40x100.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_75_709aa5_40x100.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_55_fbf9ee_1x400.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_65_709aa5_1x400.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_75_709aa5_1x400.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_highlight-soft_75_8eaeb8_1x100.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_inset-soft_95_fef1ec_1x100.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_222222_256x240.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_2e83ff_256x240.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_454545_256x240.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_888888_256x240.png
+%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_cd0a0a_256x240.png
+%%WWWDIR%%/media/css/ui-multisite/jquery-ui.css
 %%WWWDIR%%/media/css/ui-redmond/images/ui-anim_basic_16x16.gif
 %%WWWDIR%%/media/css/ui-redmond/images/ui-bg_flat_0_aaaaaa_40x100.png
 %%WWWDIR%%/media/css/ui-redmond/images/ui-bg_flat_55_fbec88_40x100.png
@@ -466,24 +243,23 @@ libexec/rrd_convert.pl
 %%WWWDIR%%/media/css/ui-redmond/images/ui-icons_d8e7f3_256x240.png
 %%WWWDIR%%/media/css/ui-redmond/images/ui-icons_f9bd01_256x240.png
 %%WWWDIR%%/media/css/ui-redmond/jquery-ui.css
-%%WWWDIR%%/media/css/ui-multisite/images/contentframe_background.jpg
-%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_0_aaaaaa_40x100.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_flat_75_709aa5_40x100.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_55_fbf9ee_1x400.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_65_709aa5_1x400.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_glass_75_709aa5_1x400.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_highlight-soft_75_8eaeb8_1x100.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-bg_inset-soft_95_fef1ec_1x100.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_222222_256x240.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_2e83ff_256x240.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_454545_256x240.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_888888_256x240.png
-%%WWWDIR%%/media/css/ui-multisite/images/ui-icons_cd0a0a_256x240.png
-%%WWWDIR%%/media/css/ui-multisite/jquery-ui.css
-%%WWWDIR%%/media/css/autocomplete.css
-%%WWWDIR%%/media/css/common.css
-%%WWWDIR%%/media/css/shadow.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-anim_basic_16x16.gif
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_flat_75_ffffff_40x100.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_65_ffffff_1x400.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_75_dadada_1x400.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_222222_256x240.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_2e83ff_256x240.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_454545_256x240.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_888888_256x240.png
+%%WWWDIR%%/media/css/ui-smoothness/images/ui-icons_cd0a0a_256x240.png
+%%WWWDIR%%/media/css/ui-smoothness/jquery-ui.css
 %%WWWDIR%%/media/images/add.png
+%%WWWDIR%%/media/images/back.png
 %%WWWDIR%%/media/images/calendar.gif
 %%WWWDIR%%/media/images/calendar.png
 %%WWWDIR%%/media/images/de_DE.png
@@ -506,6 +282,10 @@ libexec/rrd_convert.pl
 %%WWWDIR%%/media/images/trends.gif
 %%WWWDIR%%/media/images/xml.png
 %%WWWDIR%%/media/images/zoom.png
+%%WWWDIR%%/media/js/jquery-min.js
+%%WWWDIR%%/media/js/jquery-ui.min.js
+%%WWWDIR%%/media/js/jquery.cluetip.js
+%%WWWDIR%%/media/js/zoom.js
 %%WWWDIR%%/templates.dist/check-host-alive.php
 %%WWWDIR%%/templates.dist/check_dell_bladechassis.php
 %%WWWDIR%%/templates.dist/check_disk.php
@@ -538,12 +318,12 @@ libexec/rrd_convert.pl
 %%WWWDIR%%/templates.dist/check_openmanage.php
 %%WWWDIR%%/templates.dist/check_oracle_connection-time.php
 %%WWWDIR%%/templates.dist/check_oracle_health.php
-%%WWWDIR%%/templates.dist/check_ping.php
 %%WWWDIR%%/templates.dist/check_oracle_health_connection-time.php
 %%WWWDIR%%/templates.dist/check_oracle_health_pga-in-memory-sort-ratio.php
 %%WWWDIR%%/templates.dist/check_oracle_health_redo-io-traffic.php
 %%WWWDIR%%/templates.dist/check_oracle_health_switch-interval.php
 %%WWWDIR%%/templates.dist/check_oracle_health_tablespace-usage.php
+%%WWWDIR%%/templates.dist/check_ping.php
 %%WWWDIR%%/templates.dist/check_ping_tick.php
 %%WWWDIR%%/templates.dist/check_pnp_rrds.php
 %%WWWDIR%%/templates.dist/check_smtp.php
@@ -561,8 +341,266 @@ libexec/rrd_convert.pl
 %%WWWDIR%%/templates.special/advanced_loop.php-sample
 %%WWWDIR%%/templates.special/loop.php-sample
 %%WWWDIR%%/templates.special/static.php-sample
-%%WWWDIR%%/index.php
-%%WWWDIR%%/install.php
+bin/npcd
+lib/kohana/system/config/cache.php
+lib/kohana/system/config/cache_memcache.php
+lib/kohana/system/config/cache_sqlite.php
+lib/kohana/system/config/cache_xcache.php
+lib/kohana/system/config/captcha.php
+lib/kohana/system/config/cookie.php
+lib/kohana/system/config/credit_cards.php
+lib/kohana/system/config/database.php
+lib/kohana/system/config/email.php
+lib/kohana/system/config/encryption.php
+lib/kohana/system/config/http.php
+lib/kohana/system/config/image.php
+lib/kohana/system/config/inflector.php
+lib/kohana/system/config/locale.php
+lib/kohana/system/config/mimes.php
+lib/kohana/system/config/pagination.php
+lib/kohana/system/config/profiler.php
+lib/kohana/system/config/routes.php
+lib/kohana/system/config/session.php
+lib/kohana/system/config/sql_types.php
+lib/kohana/system/config/upload.php
+lib/kohana/system/config/user_agents.php
+lib/kohana/system/config/view.php
+lib/kohana/system/controllers/captcha.php
+lib/kohana/system/controllers/template.php
+lib/kohana/system/core/Benchmark.php
+lib/kohana/system/core/Bootstrap.php
+lib/kohana/system/core/Event.php
+lib/kohana/system/core/Kohana.php
+lib/kohana/system/core/utf8.php
+lib/kohana/system/core/utf8/from_unicode.php
+lib/kohana/system/core/utf8/ltrim.php
+lib/kohana/system/core/utf8/ord.php
+lib/kohana/system/core/utf8/rtrim.php
+lib/kohana/system/core/utf8/str_ireplace.php
+lib/kohana/system/core/utf8/str_pad.php
+lib/kohana/system/core/utf8/str_split.php
+lib/kohana/system/core/utf8/strcasecmp.php
+lib/kohana/system/core/utf8/strcspn.php
+lib/kohana/system/core/utf8/stristr.php
+lib/kohana/system/core/utf8/strlen.php
+lib/kohana/system/core/utf8/strpos.php
+lib/kohana/system/core/utf8/strrev.php
+lib/kohana/system/core/utf8/strrpos.php
+lib/kohana/system/core/utf8/strspn.php
+lib/kohana/system/core/utf8/strtolower.php
+lib/kohana/system/core/utf8/strtoupper.php
+lib/kohana/system/core/utf8/substr.php
+lib/kohana/system/core/utf8/substr_replace.php
+lib/kohana/system/core/utf8/to_unicode.php
+lib/kohana/system/core/utf8/transliterate_to_ascii.php
+lib/kohana/system/core/utf8/trim.php
+lib/kohana/system/core/utf8/ucfirst.php
+lib/kohana/system/core/utf8/ucwords.php
+lib/kohana/system/fonts/DejaVuSerif.ttf
+lib/kohana/system/fonts/LICENSE
+lib/kohana/system/helpers/arr.php
+lib/kohana/system/helpers/cookie.php
+lib/kohana/system/helpers/date.php
+lib/kohana/system/helpers/download.php
+lib/kohana/system/helpers/email.php
+lib/kohana/system/helpers/expires.php
+lib/kohana/system/helpers/feed.php
+lib/kohana/system/helpers/file.php
+lib/kohana/system/helpers/form.php
+lib/kohana/system/helpers/format.php
+lib/kohana/system/helpers/html.php
+lib/kohana/system/helpers/inflector.php
+lib/kohana/system/helpers/num.php
+lib/kohana/system/helpers/remote.php
+lib/kohana/system/helpers/request.php
+lib/kohana/system/helpers/security.php
+lib/kohana/system/helpers/text.php
+lib/kohana/system/helpers/upload.php
+lib/kohana/system/helpers/url.php
+lib/kohana/system/helpers/valid.php
+lib/kohana/system/i18n/de_DE/cache.php
+lib/kohana/system/i18n/de_DE/calendar.php
+lib/kohana/system/i18n/de_DE/captcha.php
+lib/kohana/system/i18n/de_DE/core.php
+lib/kohana/system/i18n/de_DE/database.php
+lib/kohana/system/i18n/de_DE/encrypt.php
+lib/kohana/system/i18n/de_DE/errors.php
+lib/kohana/system/i18n/de_DE/event.php
+lib/kohana/system/i18n/de_DE/image.php
+lib/kohana/system/i18n/de_DE/orm.php
+lib/kohana/system/i18n/de_DE/pagination.php
+lib/kohana/system/i18n/de_DE/profiler.php
+lib/kohana/system/i18n/de_DE/session.php
+lib/kohana/system/i18n/de_DE/swift.php
+lib/kohana/system/i18n/de_DE/upload.php
+lib/kohana/system/i18n/de_DE/validation.php
+lib/kohana/system/i18n/en_US/cache.php
+lib/kohana/system/i18n/en_US/calendar.php
+lib/kohana/system/i18n/en_US/captcha.php
+lib/kohana/system/i18n/en_US/core.php
+lib/kohana/system/i18n/en_US/database.php
+lib/kohana/system/i18n/en_US/encrypt.php
+lib/kohana/system/i18n/en_US/errors.php
+lib/kohana/system/i18n/en_US/event.php
+lib/kohana/system/i18n/en_US/image.php
+lib/kohana/system/i18n/en_US/orm.php
+lib/kohana/system/i18n/en_US/pagination.php
+lib/kohana/system/i18n/en_US/profiler.php
+lib/kohana/system/i18n/en_US/session.php
+lib/kohana/system/i18n/en_US/swift.php
+lib/kohana/system/i18n/en_US/upload.php
+lib/kohana/system/i18n/en_US/validation.php
+lib/kohana/system/i18n/es_ES/cache.php
+lib/kohana/system/i18n/es_ES/calendar.php
+lib/kohana/system/i18n/es_ES/captcha.php
+lib/kohana/system/i18n/es_ES/core.php
+lib/kohana/system/i18n/es_ES/database.php
+lib/kohana/system/i18n/es_ES/encrypt.php
+lib/kohana/system/i18n/es_ES/errors.php
+lib/kohana/system/i18n/es_ES/event.php
+lib/kohana/system/i18n/es_ES/image.php
+lib/kohana/system/i18n/es_ES/orm.php
+lib/kohana/system/i18n/es_ES/pagination.php
+lib/kohana/system/i18n/es_ES/profiler.php
+lib/kohana/system/i18n/es_ES/session.php
+lib/kohana/system/i18n/es_ES/swift.php
+lib/kohana/system/i18n/es_ES/upload.php
+lib/kohana/system/i18n/es_ES/validation.php
+lib/kohana/system/i18n/fr_FR/cache.php
+lib/kohana/system/i18n/fr_FR/calendar.php
+lib/kohana/system/i18n/fr_FR/captcha.php
+lib/kohana/system/i18n/fr_FR/core.php
+lib/kohana/system/i18n/fr_FR/database.php
+lib/kohana/system/i18n/fr_FR/encrypt.php
+lib/kohana/system/i18n/fr_FR/errors.php
+lib/kohana/system/i18n/fr_FR/event.php
+lib/kohana/system/i18n/fr_FR/image.php
+lib/kohana/system/i18n/fr_FR/orm.php
+lib/kohana/system/i18n/fr_FR/pagination.php
+lib/kohana/system/i18n/fr_FR/profiler.php
+lib/kohana/system/i18n/fr_FR/session.php
+lib/kohana/system/i18n/fr_FR/swift.php
+lib/kohana/system/i18n/fr_FR/upload.php
+lib/kohana/system/i18n/fr_FR/validation.php
+lib/kohana/system/i18n/it_IT/cache.php
+lib/kohana/system/i18n/it_IT/calendar.php
+lib/kohana/system/i18n/it_IT/captcha.php
+lib/kohana/system/i18n/it_IT/core.php
+lib/kohana/system/i18n/it_IT/database.php
+lib/kohana/system/i18n/it_IT/encrypt.php
+lib/kohana/system/i18n/it_IT/errors.php
+lib/kohana/system/i18n/it_IT/event.php
+lib/kohana/system/i18n/it_IT/image.php
+lib/kohana/system/i18n/it_IT/orm.php
+lib/kohana/system/i18n/it_IT/pagination.php
+lib/kohana/system/i18n/it_IT/profiler.php
+lib/kohana/system/i18n/it_IT/session.php
+lib/kohana/system/i18n/it_IT/swift.php
+lib/kohana/system/i18n/it_IT/upload.php
+lib/kohana/system/i18n/it_IT/validation.php
+lib/kohana/system/i18n/nl_NL/cache.php
+lib/kohana/system/i18n/nl_NL/calendar.php
+lib/kohana/system/i18n/nl_NL/captcha.php
+lib/kohana/system/i18n/nl_NL/core.php
+lib/kohana/system/i18n/nl_NL/database.php
+lib/kohana/system/i18n/nl_NL/encrypt.php
+lib/kohana/system/i18n/nl_NL/errors.php
+lib/kohana/system/i18n/nl_NL/event.php
+lib/kohana/system/i18n/nl_NL/image.php
+lib/kohana/system/i18n/nl_NL/orm.php
+lib/kohana/system/i18n/nl_NL/pagination.php
+lib/kohana/system/i18n/nl_NL/profiler.php
+lib/kohana/system/i18n/nl_NL/session.php
+lib/kohana/system/i18n/nl_NL/swift.php
+lib/kohana/system/i18n/nl_NL/upload.php
+lib/kohana/system/i18n/nl_NL/validation.php
+lib/kohana/system/i18n/ru_RU/cache.php
+lib/kohana/system/i18n/ru_RU/calendar.php
+lib/kohana/system/i18n/ru_RU/captcha.php
+lib/kohana/system/i18n/ru_RU/core.php
+lib/kohana/system/i18n/ru_RU/database.php
+lib/kohana/system/i18n/ru_RU/encrypt.php
+lib/kohana/system/i18n/ru_RU/errors.php
+lib/kohana/system/i18n/ru_RU/event.php
+lib/kohana/system/i18n/ru_RU/image.php
+lib/kohana/system/i18n/ru_RU/orm.php
+lib/kohana/system/i18n/ru_RU/pagination.php
+lib/kohana/system/i18n/ru_RU/profiler.php
+lib/kohana/system/i18n/ru_RU/session.php
+lib/kohana/system/i18n/ru_RU/swift.php
+lib/kohana/system/i18n/ru_RU/upload.php
+lib/kohana/system/i18n/ru_RU/validation.php
+lib/kohana/system/libraries/Cache.php
+lib/kohana/system/libraries/Calendar.php
+lib/kohana/system/libraries/Calendar_Event.php
+lib/kohana/system/libraries/Captcha.php
+lib/kohana/system/libraries/Controller.php
+lib/kohana/system/libraries/Database.php
+lib/kohana/system/libraries/Database_Expression.php
+lib/kohana/system/libraries/Encrypt.php
+lib/kohana/system/libraries/Event_Observer.php
+lib/kohana/system/libraries/Event_Subject.php
+lib/kohana/system/libraries/Image.php
+lib/kohana/system/libraries/Input.php
+lib/kohana/system/libraries/Model.php
+lib/kohana/system/libraries/ORM.php
+lib/kohana/system/libraries/ORM_Iterator.php
+lib/kohana/system/libraries/ORM_Tree.php
+lib/kohana/system/libraries/ORM_Versioned.php
+lib/kohana/system/libraries/Pagination.php
+lib/kohana/system/libraries/Profiler.php
+lib/kohana/system/libraries/Profiler_Table.php
+lib/kohana/system/libraries/Router.php
+lib/kohana/system/libraries/Session.php
+lib/kohana/system/libraries/Tagcloud.php
+lib/kohana/system/libraries/URI.php
+lib/kohana/system/libraries/Validation.php
+lib/kohana/system/libraries/View.php
+lib/kohana/system/libraries/drivers/Cache.php
+lib/kohana/system/libraries/drivers/Cache/Apc.php
+lib/kohana/system/libraries/drivers/Cache/Eaccelerator.php
+lib/kohana/system/libraries/drivers/Cache/File.php
+lib/kohana/system/libraries/drivers/Cache/Memcache.php
+lib/kohana/system/libraries/drivers/Cache/Sqlite.php
+lib/kohana/system/libraries/drivers/Cache/Xcache.php
+lib/kohana/system/libraries/drivers/Captcha.php
+lib/kohana/system/libraries/drivers/Captcha/Alpha.php
+lib/kohana/system/libraries/drivers/Captcha/Basic.php
+lib/kohana/system/libraries/drivers/Captcha/Black.php
+lib/kohana/system/libraries/drivers/Captcha/Math.php
+lib/kohana/system/libraries/drivers/Captcha/Riddle.php
+lib/kohana/system/libraries/drivers/Captcha/Word.php
+lib/kohana/system/libraries/drivers/Database.php
+lib/kohana/system/libraries/drivers/Database/Mssql.php
+lib/kohana/system/libraries/drivers/Database/Mysql.php
+lib/kohana/system/libraries/drivers/Database/Mysqli.php
+lib/kohana/system/libraries/drivers/Database/Pdosqlite.php
+lib/kohana/system/libraries/drivers/Database/Pgsql.php
+lib/kohana/system/libraries/drivers/Image.php
+lib/kohana/system/libraries/drivers/Image/GD.php
+lib/kohana/system/libraries/drivers/Image/GraphicsMagick.php
+lib/kohana/system/libraries/drivers/Image/ImageMagick.php
+lib/kohana/system/libraries/drivers/Session.php
+lib/kohana/system/libraries/drivers/Session/Cache.php
+lib/kohana/system/libraries/drivers/Session/Cookie.php
+lib/kohana/system/libraries/drivers/Session/Database.php
+lib/kohana/system/views/kohana/template.php
+lib/kohana/system/views/kohana_calendar.php
+lib/kohana/system/views/kohana_error_disabled.php
+lib/kohana/system/views/kohana_error_page.php
+lib/kohana/system/views/kohana_errors.css
+lib/kohana/system/views/kohana_profiler.php
+lib/kohana/system/views/kohana_profiler_table.css
+lib/kohana/system/views/kohana_profiler_table.php
+lib/kohana/system/views/pagination/classic.php
+lib/kohana/system/views/pagination/digg.php
+lib/kohana/system/views/pagination/extended.php
+lib/kohana/system/views/pagination/punbb.php
+lib/npcdmod.o
+libexec/check_pnp_rrds.pl
+libexec/process_perfdata.pl
+libexec/rrd_convert.pl
+libexec/verify_pnp_config.pl
 @dirrm %%WWWDIR%%/media/js
 @dirrm %%WWWDIR%%/media/images
 @dirrm %%WWWDIR%%/media/css/ui-smoothness/images
@@ -575,9 +613,11 @@ libexec/rrd_convert.pl
 @dirrm %%WWWDIR%%/media/css/ui-lightness
 @dirrm %%WWWDIR%%/media/css
 @dirrm %%WWWDIR%%/media
-@dirrm %%WWWDIR%%/documents/en_US
-@dirrm %%WWWDIR%%/documents/de_DE
 @dirrm %%WWWDIR%%/documents/_media
+@dirrm %%WWWDIR%%/documents/de_DE
+@dirrm %%WWWDIR%%/documents/en_US
+@dirrm %%WWWDIR%%/documents/images/smileys
+@dirrm %%WWWDIR%%/documents/images
 @dirrm %%WWWDIR%%/documents
 @dirrm %%WWWDIR%%/application/views
 @dirrm %%WWWDIR%%/application/vendor/fpdf/font
@@ -585,7 +625,7 @@ libexec/rrd_convert.pl
 @dirrm %%WWWDIR%%/application/vendor/fpdf
 @dirrm %%WWWDIR%%/application/vendor
 @dirrm %%WWWDIR%%/application/models
-@dirrm %%WWWDIR%%/application/libraries
+@dirrm %%WWWDIR%%/application/lib
 @dirrm %%WWWDIR%%/application/i18n/ru_RU
 @dirrm %%WWWDIR%%/application/i18n/fr_FR
 @dirrm %%WWWDIR%%/application/i18n/es_ES
@@ -628,6 +668,6 @@ libexec/rrd_convert.pl
 @dirrm lib/kohana/system/config
 @dirrm lib/kohana/system
 @dirrm lib/kohana
-@dirrmtry etc/pnp/check_commands
-@dirrmtry etc/pnp/pages
-@dirrmtry etc/pnp
+@dirrmtry %%ETCDIR%%/check_commands
+@dirrmtry %%ETCDIR%%/pages
+@dirrmtry %%ETCDIR%%