net-mgmt/nagvis: 1.7.2 -> 1.8.5

- For changes see the links to all changelogs on
  http://www.nagvis.org/

PR:		202151
Submitted by:	w.schwarzenfeld@utanet.at
Reported by:	peo@bsdlabs.com
Approved by:	derfi@vei.ru (maintainer timeout)

3 files changed, 97 insertions, 201 deletions

diff --git a/net-mgmt/nagvis/Makefile b/net-mgmt/nagvis/Makefile
index 6e926ed86406..b152c3fefd97 100644
--- a/net-mgmt/nagvis/Makefile
+++ b/net-mgmt/nagvis/Makefile
@@ -1,11 +1,11 @@
 # Created by: Andrew 'derfi' Sidorov <derfi@vei.ru>
 # $FreeBSD$
+# head/net-mgmt/nagvis/Makefile 412348 2016-04-01 14:17:44Z mat
 
 PORTNAME=	nagvis
-PORTVERSION=	1.7.2
-PORTREVISION=	1
+PORTVERSION=	1.8.5
 CATEGORIES=	net-mgmt
-MASTER_SITES=	SF/${PORTNAME}/NagVis%201.7
+MASTER_SITES=	http://www.nagvis.org/share/
 
 MAINTAINER=	derfi@vei.ru
 COMMENT=	Visualization addon for Nagios
@@ -20,6 +20,10 @@ MKLIVESTATUS_DESC=	Depend on mk-livestatus broker (preferred)
 NDO2DB_DESC=	Depend on ndo2db broker
 GRAPHVIZ_DESC=	Graphviz is needed for automaps
 
+USES=		gettext
+NLS_USES=	gettext
+NLS_CONFIGURE_OFF=	--disable-nls
+
 NO_BUILD=	yes
 USE_PHP=	gd gettext mbstring session json pdo pdo_sqlite
 WANT_PHP_WEB=	yes
diff --git a/net-mgmt/nagvis/distinfo b/net-mgmt/nagvis/distinfo
index 82d10df554dd..d622898bc654 100644
--- a/net-mgmt/nagvis/distinfo
+++ b/net-mgmt/nagvis/distinfo
@@ -1,2 +1,3 @@
-SHA256 (nagvis-1.7.2.tar.gz) = 9e82bd913e52befaa66b5d1958edcdbc3ad8bdee803c9c956b1c876b735246e0
-SIZE (nagvis-1.7.2.tar.gz) = 3488966
+TIMESTAMP = 1466888430
+SHA256 (nagvis-1.8.5.tar.gz) = e42a2451efcf8acf3bc317ab9b1b041a511c034c11ccedc634c2c69bf4814487
+SIZE (nagvis-1.8.5.tar.gz) = 1466361
diff --git a/net-mgmt/nagvis/pkg-plist b/net-mgmt/nagvis/pkg-plist
index 9644bbe08f53..7ecd773f09f0 100644
--- a/net-mgmt/nagvis/pkg-plist
+++ b/net-mgmt/nagvis/pkg-plist
@@ -1,7 +1,6 @@
 %%WWWDIR%%/ChangeLog
 %%WWWDIR%%/LICENCE
 %%WWWDIR%%/README
-%%WWWDIR%%/TODO
 %%WWWDIR%%/docs/cleanup_new_notes.sh
 %%WWWDIR%%/docs/de_DE/about.html
 %%WWWDIR%%/docs/de_DE/after_installation.html
@@ -21,13 +20,16 @@
 %%WWWDIR%%/docs/de_DE/extending/shapes.html
 %%WWWDIR%%/docs/de_DE/extending/templates.html
 %%WWWDIR%%/docs/de_DE/gadgets.html
+%%WWWDIR%%/docs/de_DE/geomap.html
 %%WWWDIR%%/docs/de_DE/header_templates.html
 %%WWWDIR%%/docs/de_DE/hover_templates.html
 %%WWWDIR%%/docs/de_DE/index.html
+%%WWWDIR%%/docs/de_DE/install_omd_site.html
 %%WWWDIR%%/docs/de_DE/installation_instructions.html
 %%WWWDIR%%/docs/de_DE/installer.html
 %%WWWDIR%%/docs/de_DE/lines_weathermap_style.html
 %%WWWDIR%%/docs/de_DE/map_config_format_description.html
+%%WWWDIR%%/docs/de_DE/maps.html
 %%WWWDIR%%/docs/de_DE/nagvis_config_format_description.html
 %%WWWDIR%%/docs/de_DE/system_requirements.html
 %%WWWDIR%%/docs/de_DE/toc.html
@@ -39,16 +41,19 @@
 %%WWWDIR%%/docs/en_US/auth.html
 %%WWWDIR%%/docs/en_US/auth_modules.html
 %%WWWDIR%%/docs/en_US/auth_old_style.html
+%%WWWDIR%%/docs/en_US/authorisation_groups.html
 %%WWWDIR%%/docs/en_US/authorisation_modules.html
 %%WWWDIR%%/docs/en_US/authorisation_roles_perms.html
 %%WWWDIR%%/docs/en_US/automap.html
 %%WWWDIR%%/docs/en_US/automap_config_format.html
+%%WWWDIR%%/docs/en_US/backend_mkbi.html
 %%WWWDIR%%/docs/en_US/backend_mklivestatus.html
 %%WWWDIR%%/docs/en_US/backend_nagiosbp.html
 %%WWWDIR%%/docs/en_US/backend_ndomy.html
 %%WWWDIR%%/docs/en_US/backends.html
 %%WWWDIR%%/docs/en_US/changelog.html
 %%WWWDIR%%/docs/en_US/context_templates.html
+%%WWWDIR%%/docs/en_US/dynmap.html
 %%WWWDIR%%/docs/en_US/extending/custom_context_actions.html
 %%WWWDIR%%/docs/en_US/extending/iconsets.html
 %%WWWDIR%%/docs/en_US/extending/languages.html
@@ -102,11 +107,11 @@
 %%WWWDIR%%/etc/maps/demo-load.cfg
 %%WWWDIR%%/etc/maps/demo-muc-srv1.cfg
 %%WWWDIR%%/etc/maps/demo-overview.cfg
-%%WWWDIR%%/etc/nagvis.ini.php-sample
+%%WWWDIR%%/%%ETCDIR%%.ini.php-sample
+%%WWWDIR%%/etc/perms.db-sample
 %%WWWDIR%%/install_lib
 %%WWWDIR%%/nagvis-make-admin
 %%WWWDIR%%/omd_install.sh
-%%WWWDIR%%/pack
 %%WWWDIR%%/share/config.php
 %%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendMessage.php
 %%WWWDIR%%/share/frontend/nagvis-js/classes/FrontendModInfo.php
@@ -276,10 +281,11 @@
 %%WWWDIR%%/share/frontend/nagvis-js/js/ExtWzJsGraphics.js
 %%WWWDIR%%/share/frontend/nagvis-js/js/ManageBackends.js
 %%WWWDIR%%/share/frontend/nagvis-js/js/ManageBackgrounds.js
-%%WWWDIR%%/share/frontend/nagvis-js/js/ManageMaps.js
 %%WWWDIR%%/share/frontend/nagvis-js/js/ManageShapes.js
 %%WWWDIR%%/share/frontend/nagvis-js/js/MapManageTmpl.js
+%%WWWDIR%%/share/frontend/nagvis-js/js/NagVisAggr.js
 %%WWWDIR%%/share/frontend/nagvis-js/js/NagVisContainer.js
+%%WWWDIR%%/share/frontend/nagvis-js/js/NagVisDynGroup.js
 %%WWWDIR%%/share/frontend/nagvis-js/js/NagVisHost.js
 %%WWWDIR%%/share/frontend/nagvis-js/js/NagVisHostgroup.js
 %%WWWDIR%%/share/frontend/nagvis-js/js/NagVisLine.js
@@ -318,87 +324,15 @@
 %%WWWDIR%%/share/frontend/nagvis-js/locale/ru_RU/LC_MESSAGES/nagvis.mo
 %%WWWDIR%%/share/frontend/nagvis-js/locale/ru_RU/LC_MESSAGES/nagvis.po
 %%WWWDIR%%/share/index.php
-%%WWWDIR%%/share/netmap/GeocodeService.php
-%%WWWDIR%%/share/netmap/Host.php
-%%WWWDIR%%/share/netmap/HostGroup.php
-%%WWWDIR%%/share/netmap/Link.php
-%%WWWDIR%%/share/netmap/LinkService.php
-%%WWWDIR%%/share/netmap/Location.php
-%%WWWDIR%%/share/netmap/LocationService.php
-%%WWWDIR%%/share/netmap/NagVisService.php
-%%WWWDIR%%/share/netmap/NagiosService.php
-%%WWWDIR%%/share/netmap/Service.php
-%%WWWDIR%%/share/netmap/ServiceGroup.php
-%%WWWDIR%%/share/netmap/Settings.php
-%%WWWDIR%%/share/netmap/SettingsService.php
-%%WWWDIR%%/share/netmap/State.php
-%%WWWDIR%%/share/netmap/Viewpoint.php
-%%WWWDIR%%/share/netmap/ViewpointService.php
-%%WWWDIR%%/share/netmap/amf-server.php
-%%WWWDIR%%/share/netmap/crossdomain.xml
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Constants.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Exception.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Parse/Amf0/Deserializer.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Parse/Amf0/Serializer.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Parse/Amf3/Deserializer.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Parse/Amf3/Serializer.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Parse/Deserializer.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Parse/InputStream.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Parse/OutputStream.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Parse/Serializer.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Parse/TypeLoader.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Request.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Request/Http.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Response.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Response/Http.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Server.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Server/Exception.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Util/BinaryStream.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Value/ByteArray.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Value/MessageBody.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Value/MessageHeader.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Value/Messaging/AbstractMessage.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Value/Messaging/AcknowledgeMessage.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Value/Messaging/AsyncMessage.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Value/Messaging/CommandMessage.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Value/Messaging/ErrorMessage.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Value/Messaging/RemotingMessage.php
-%%WWWDIR%%/share/netmap/library/Zend/Amf/Value/TraitsInfo.php
-%%WWWDIR%%/share/netmap/library/Zend/Date.php
-%%WWWDIR%%/share/netmap/library/Zend/Date/Cities.php
-%%WWWDIR%%/share/netmap/library/Zend/Date/DateObject.php
-%%WWWDIR%%/share/netmap/library/Zend/Date/Exception.php
-%%WWWDIR%%/share/netmap/library/Zend/Exception.php
-%%WWWDIR%%/share/netmap/library/Zend/Loader.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Abstract.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Cache.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Definition.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Exception.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Interface.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Method/Callback.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Method/Definition.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Method/Parameter.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Method/Prototype.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Reflection.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Reflection/Class.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Reflection/Exception.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Reflection/Function.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Reflection/Function/Abstract.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Reflection/Method.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Reflection/Node.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Reflection/Parameter.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Reflection/Prototype.php
-%%WWWDIR%%/share/netmap/library/Zend/Server/Reflection/ReturnValue.php
-%%WWWDIR%%/share/netmap/library/Zend/Version.php
-%%WWWDIR%%/share/netmap/modules/gmap/GMapModule.swf
-%%WWWDIR%%/share/netmap/shell.html
-%%WWWDIR%%/share/netmap/shell.swf
+%%WWWDIR%%/share/server/core/actions/rdp.php
+%%WWWDIR%%/share/server/core/actions/win_ssh.php
 %%WWWDIR%%/share/server/core/ajax_handler.php
 %%WWWDIR%%/share/server/core/classes/CoreAuthHandler.php
 %%WWWDIR%%/share/server/core/classes/CoreAuthModMySQL.php
 %%WWWDIR%%/share/server/core/classes/CoreAuthModSQLite.php
 %%WWWDIR%%/share/server/core/classes/CoreAuthModule.php
 %%WWWDIR%%/share/server/core/classes/CoreAuthorisationHandler.php
+%%WWWDIR%%/share/server/core/classes/CoreAuthorisationModGroups.php
 %%WWWDIR%%/share/server/core/classes/CoreAuthorisationModMultisite.php
 %%WWWDIR%%/share/server/core/classes/CoreAuthorisationModMySQL.php
 %%WWWDIR%%/share/server/core/classes/CoreAuthorisationModSQLite.php
@@ -438,23 +372,20 @@
 %%WWWDIR%%/share/server/core/classes/CoreUserCfg.php
 %%WWWDIR%%/share/server/core/classes/GlobalBackendInterface.php
 %%WWWDIR%%/share/server/core/classes/GlobalBackendTest.php
-%%WWWDIR%%/share/server/core/classes/GlobalBackendmerlinmy.php
+%%WWWDIR%%/share/server/core/classes/GlobalBackendmkbi.php
 %%WWWDIR%%/share/server/core/classes/GlobalBackendmklivestatus.php
 %%WWWDIR%%/share/server/core/classes/GlobalBackendnagiosbp.php
 %%WWWDIR%%/share/server/core/classes/GlobalBackendndomy.php
 %%WWWDIR%%/share/server/core/classes/GlobalBackground.php
 %%WWWDIR%%/share/server/core/classes/GlobalCore.php
 %%WWWDIR%%/share/server/core/classes/GlobalFileCache.php
-%%WWWDIR%%/share/server/core/classes/GlobalIndexPage.php
 %%WWWDIR%%/share/server/core/classes/GlobalLanguage.php
 %%WWWDIR%%/share/server/core/classes/GlobalMainCfg.php
-%%WWWDIR%%/share/server/core/classes/GlobalMap.php
 %%WWWDIR%%/share/server/core/classes/GlobalMapCfg.php
 %%WWWDIR%%/share/server/core/classes/NagVisContextMenu.php
 %%WWWDIR%%/share/server/core/classes/NagVisHoverMenu.php
 %%WWWDIR%%/share/server/core/classes/NagVisHoverUrl.php
 %%WWWDIR%%/share/server/core/classes/NagVisMap.php
-%%WWWDIR%%/share/server/core/classes/NagVisMapCfg.php
 %%WWWDIR%%/share/server/core/classes/NagVisUrl.php
 %%WWWDIR%%/share/server/core/classes/NagVisViewAck.php
 %%WWWDIR%%/share/server/core/classes/NagVisViewChangePassword.php
@@ -462,14 +393,16 @@
 %%WWWDIR%%/share/server/core/classes/NagVisViewSearch.php
 %%WWWDIR%%/share/server/core/classes/NagVisViewToStaticMap.php
 %%WWWDIR%%/share/server/core/classes/NagVisViewUserMgmt.php
-%%WWWDIR%%/share/server/core/classes/WuiViewEditMainCfg.php
-%%WWWDIR%%/share/server/core/classes/WuiViewManageBackends.php
-%%WWWDIR%%/share/server/core/classes/WuiViewManageBackgrounds.php
-%%WWWDIR%%/share/server/core/classes/WuiViewManageMaps.php
-%%WWWDIR%%/share/server/core/classes/WuiViewManageShapes.php
-%%WWWDIR%%/share/server/core/classes/WuiViewMapAddModify.php
-%%WWWDIR%%/share/server/core/classes/WuiViewMapManageTmpl.php
+%%WWWDIR%%/share/server/core/classes/ViewEditMainCfg.php
+%%WWWDIR%%/share/server/core/classes/ViewManageBackends.php
+%%WWWDIR%%/share/server/core/classes/ViewManageBackgrounds.php
+%%WWWDIR%%/share/server/core/classes/ViewManageMaps.php
+%%WWWDIR%%/share/server/core/classes/ViewManageShapes.php
+%%WWWDIR%%/share/server/core/classes/ViewMapAddModify.php
+%%WWWDIR%%/share/server/core/classes/ViewMapManageTmpl.php
+%%WWWDIR%%/share/server/core/classes/objects/NagVisAggr.php
 %%WWWDIR%%/share/server/core/classes/objects/NagVisContainer.php
+%%WWWDIR%%/share/server/core/classes/objects/NagVisDynGroup.php
 %%WWWDIR%%/share/server/core/classes/objects/NagVisHost.php
 %%WWWDIR%%/share/server/core/classes/objects/NagVisHostgroup.php
 %%WWWDIR%%/share/server/core/classes/objects/NagVisLine.php
@@ -481,10 +414,6 @@
 %%WWWDIR%%/share/server/core/classes/objects/NagVisStatefulObject.php
 %%WWWDIR%%/share/server/core/classes/objects/NagVisStatelessObject.php
 %%WWWDIR%%/share/server/core/classes/objects/NagVisTextbox.php
-%%WWWDIR%%/share/server/core/classes/objects/NagiosHost.php
-%%WWWDIR%%/share/server/core/classes/objects/NagiosHostgroup.php
-%%WWWDIR%%/share/server/core/classes/objects/NagiosService.php
-%%WWWDIR%%/share/server/core/classes/objects/NagiosServicegroup.php
 %%WWWDIR%%/share/server/core/defines/global.php
 %%WWWDIR%%/share/server/core/defines/matches.php
 %%WWWDIR%%/share/server/core/ext/php-gettext-1.0.9/AUTHORS
@@ -496,13 +425,14 @@
 %%WWWDIR%%/share/server/core/functions/autoload.php
 %%WWWDIR%%/share/server/core/functions/core.php
 %%WWWDIR%%/share/server/core/functions/debug.php
+%%WWWDIR%%/share/server/core/functions/html.php
 %%WWWDIR%%/share/server/core/functions/index.php
 %%WWWDIR%%/share/server/core/functions/nagvisErrorHandler.php
 %%WWWDIR%%/share/server/core/functions/oldPhpVersionFixes.php
 %%WWWDIR%%/share/server/core/mapcfg/default.php
-%%WWWDIR%%/share/server/core/sources/.gitignore
 %%WWWDIR%%/share/server/core/sources/automap.php
 %%WWWDIR%%/share/server/core/sources/automap_pos.php
+%%WWWDIR%%/share/server/core/sources/dynmap.php
 %%WWWDIR%%/share/server/core/sources/filter.php
 %%WWWDIR%%/share/server/core/sources/general.php
 %%WWWDIR%%/share/server/core/sources/geomap.php
@@ -511,74 +441,126 @@
 %%WWWDIR%%/share/userfiles/gadgets/std_html_bar.php
 %%WWWDIR%%/share/userfiles/gadgets/std_speedometer.php
 %%WWWDIR%%/share/userfiles/gadgets/std_speedometer2.php
-%%WWWDIR%%/share/userfiles/images/gadgets/.gitignore
+%%WWWDIR%%/share/userfiles/gadgets/std_table.php
 %%WWWDIR%%/share/userfiles/images/iconsets/20x20.gif
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_critical.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_critical_ack.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_critical_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_critical_stale.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_down.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_down_ack.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_down_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_down_stale.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_error.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_ok.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_ok_ack.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_ok_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_ok_stale.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_pending.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_unchecked.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_unknown.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_unknown_ack.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_unknown_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_unknown_stale.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_unreachable.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_unreachable_ack.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_unreachable_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_unreachable_stale.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_up.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_up_ack.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_up_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_up_stale.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_warning.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_warning_ack.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_warning_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_area_warning_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_critical.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_critical_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_critical_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_big_critical_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_down.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_down_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_down_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_big_down_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_error.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_ok.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_ok_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_big_ok_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_pending.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_unchecked.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_unknown.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_unknown_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_unknown_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_big_unknown_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_unreachable.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_unreachable_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_unreachable_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_big_unreachable_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_up.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_up_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_big_up_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_warning.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_warning_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_big_warning_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_big_warning_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_critical.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_critical_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_critical_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_critical_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_down.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_down_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_down_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_down_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_error.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_ok.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_ok_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_ok_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_pending.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unchecked.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unknown.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unknown_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unknown_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unknown_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unreachable.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unreachable_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unreachable_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_unreachable_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_up.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_up_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_up_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_warning.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_warning_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_dot_warning_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_dot_warning_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_critical.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_critical_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_critical_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_critical_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_down.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_down_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_down_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_down_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_error.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_ok.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_ok_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_ok_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_pending.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unchecked.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unknown.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unknown_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unknown_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unknown_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unreachable.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unreachable_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unreachable_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_unreachable_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_up.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_up_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_up_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_warning.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_warning_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_medium_warning_dt.png
+%%WWWDIR%%/share/userfiles/images/iconsets/std_medium_warning_stale.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_small_critical.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_small_critical_ack.png
 %%WWWDIR%%/share/userfiles/images/iconsets/std_small_critical_dt.png
@@ -606,28 +588,27 @@
 %%WWWDIR%%/share/userfiles/images/maps/demo-host.png
 %%WWWDIR%%/share/userfiles/images/maps/demo-load.png
 %%WWWDIR%%/share/userfiles/images/maps/demo-overview.png
+%%WWWDIR%%/share/userfiles/images/shapes/demo-nagvis-sponsors.png
 %%WWWDIR%%/share/userfiles/images/shapes/demo-wan-cloud.png
 %%WWWDIR%%/share/userfiles/images/shapes/demo_traffic_load_legend.png
 %%WWWDIR%%/share/userfiles/images/shapes/std_dummy.png
+%%WWWDIR%%/share/userfiles/images/shapes/std_nagvis.png
 %%WWWDIR%%/share/userfiles/images/templates/default.control_delete.gif
 %%WWWDIR%%/share/userfiles/images/templates/default.control_drag.gif
 %%WWWDIR%%/share/userfiles/images/templates/default.control_modify.gif
 %%WWWDIR%%/share/userfiles/images/templates/default.control_togglemid.gif
 %%WWWDIR%%/share/userfiles/images/templates/default.folder_closed.gif
 %%WWWDIR%%/share/userfiles/images/templates/default.folder_open.gif
-%%WWWDIR%%/share/userfiles/images/templates/default.header.png
 %%WWWDIR%%/share/userfiles/images/templates/default.header_down.png
 %%WWWDIR%%/share/userfiles/images/templates/default.header_hide.png
-%%WWWDIR%%/share/userfiles/images/templates/default.header_over.png
 %%WWWDIR%%/share/userfiles/images/templates/default.header_show.png
-%%WWWDIR%%/share/userfiles/scripts/.gitignore
+%%WWWDIR%%/share/userfiles/images/templates/default.zoombar_bg.gif
 %%WWWDIR%%/share/userfiles/scripts/std_lq.php
 %%WWWDIR%%/share/userfiles/sounds/std_critical.mp3
 %%WWWDIR%%/share/userfiles/sounds/std_down.mp3
 %%WWWDIR%%/share/userfiles/sounds/std_error.mp3
 %%WWWDIR%%/share/userfiles/sounds/std_unreachable.mp3
 %%WWWDIR%%/share/userfiles/sounds/std_warning.mp3
-%%WWWDIR%%/share/userfiles/styles/.gitignore
 %%WWWDIR%%/share/userfiles/templates/default.changePassword.html
 %%WWWDIR%%/share/userfiles/templates/default.context.css
 %%WWWDIR%%/share/userfiles/templates/default.context.html
@@ -642,110 +623,20 @@
 %%WWWDIR%%/share/userfiles/templates/default.login.html
 %%WWWDIR%%/share/userfiles/templates/default.manageRoles.html
 %%WWWDIR%%/share/userfiles/templates/default.map.html
-%%WWWDIR%%/share/userfiles/templates/default.multisiteMaps.html
 %%WWWDIR%%/share/userfiles/templates/default.overview.html
 %%WWWDIR%%/share/userfiles/templates/default.search.html
 %%WWWDIR%%/share/userfiles/templates/default.toStaticMap.html
 %%WWWDIR%%/share/userfiles/templates/default.url.html
 %%WWWDIR%%/share/userfiles/templates/default.userMgmt.html
-%%WWWDIR%%/share/userfiles/templates/default.wuiEditMainCfg.html
 %%WWWDIR%%/share/userfiles/templates/default.wuiManageBackends.html
 %%WWWDIR%%/share/userfiles/templates/default.wuiManageBackgrounds.html
-%%WWWDIR%%/share/userfiles/templates/default.wuiManageMaps.html
 %%WWWDIR%%/share/userfiles/templates/default.wuiManageShapes.html
 %%WWWDIR%%/share/userfiles/templates/default.wuiMapAddModify.html
 %%WWWDIR%%/share/userfiles/templates/default.wuiMapManageTmpl.html
-%%WWWDIR%%/uifx/README
-%%WWWDIR%%/uifx/deploy.wscp
-%%WWWDIR%%/uifx/html-template/AC_OETags.js
-%%WWWDIR%%/uifx/html-template/history/history.css
-%%WWWDIR%%/uifx/html-template/history/history.js
-%%WWWDIR%%/uifx/html-template/history/historyFrame.html
-%%WWWDIR%%/uifx/html-template/index.template.html
-%%WWWDIR%%/uifx/html-template/playerProductInstall.swf
-%%WWWDIR%%/uifx/libs/AutoComplete-1.0.swc
-%%WWWDIR%%/uifx/libs/Mate_08_8_1.swc
-%%WWWDIR%%/uifx/libs/flexlib.swc
-%%WWWDIR%%/uifx/libs/map_flex_1_9.swc
-%%WWWDIR%%/uifx/src/lib/ui/EdgeBox.mxml
-%%WWWDIR%%/uifx/src/lib/ui/EdgeBoxGroup.as
-%%WWWDIR%%/uifx/src/modules/gmap/GMapModule.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/css/Main.css
-%%WWWDIR%%/uifx/src/modules/gmap/data/CurrentLink.as
-%%WWWDIR%%/uifx/src/modules/gmap/data/CurrentLocation.as
-%%WWWDIR%%/uifx/src/modules/gmap/data/HostGroupsData.as
-%%WWWDIR%%/uifx/src/modules/gmap/data/HostsData.as
-%%WWWDIR%%/uifx/src/modules/gmap/data/LinksData.as
-%%WWWDIR%%/uifx/src/modules/gmap/data/LocationsData.as
-%%WWWDIR%%/uifx/src/modules/gmap/data/LocationsExtData.as
-%%WWWDIR%%/uifx/src/modules/gmap/data/NagVisMapsData.as
-%%WWWDIR%%/uifx/src/modules/gmap/data/ServiceGroupsData.as
-%%WWWDIR%%/uifx/src/modules/gmap/data/ServicesData.as
-%%WWWDIR%%/uifx/src/modules/gmap/data/SettingsData.as
-%%WWWDIR%%/uifx/src/modules/gmap/data/ViewpointsData.as
-%%WWWDIR%%/uifx/src/modules/gmap/domain/Link.as
-%%WWWDIR%%/uifx/src/modules/gmap/domain/Location.as
-%%WWWDIR%%/uifx/src/modules/gmap/domain/Settings.as
-%%WWWDIR%%/uifx/src/modules/gmap/domain/Viewpoint.as
-%%WWWDIR%%/uifx/src/modules/gmap/domain/nagios/Host.as
-%%WWWDIR%%/uifx/src/modules/gmap/domain/nagios/HostGroup.as
-%%WWWDIR%%/uifx/src/modules/gmap/domain/nagios/Service.as
-%%WWWDIR%%/uifx/src/modules/gmap/domain/nagios/ServiceGroup.as
-%%WWWDIR%%/uifx/src/modules/gmap/events/AddressEvent.as
-%%WWWDIR%%/uifx/src/modules/gmap/events/LinkEvent.as
-%%WWWDIR%%/uifx/src/modules/gmap/events/LocationEvent.as
-%%WWWDIR%%/uifx/src/modules/gmap/events/ModeEvent.as
-%%WWWDIR%%/uifx/src/modules/gmap/events/NagiosObjectEvent.as
-%%WWWDIR%%/uifx/src/modules/gmap/events/SettingsEvent.as
-%%WWWDIR%%/uifx/src/modules/gmap/events/SetupEvent.as
-%%WWWDIR%%/uifx/src/modules/gmap/events/ViewpointEvent.as
-%%WWWDIR%%/uifx/src/modules/gmap/img/cog.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/connect.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/control_fastforward.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/eye.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/find.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/key.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/pin.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_ack.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_critical.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_down.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_downtime.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_error.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_ok.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_pending.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_sack.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_sdowntime.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_unknown.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_up.png
-%%WWWDIR%%/uifx/src/modules/gmap/img/std_small_warning.png
-%%WWWDIR%%/uifx/src/modules/gmap/mate/GeneralEM.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/mate/LinksEM.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/mate/LocationsEM.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/mate/NagiosEM.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/mate/PreinitEM.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/mate/StartupEM.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/mate/UIInitEM.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/mate/ViewpointsEM.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/mediator/MainMD.as
-%%WWWDIR%%/uifx/src/modules/gmap/mediator/MapMD.as
-%%WWWDIR%%/uifx/src/modules/gmap/mediator/Poller.as
-%%WWWDIR%%/uifx/src/modules/gmap/view/DialogLink.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/view/DialogLocation.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/view/DialogSearch.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/view/DialogSettings.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/view/DialogViewpoint.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/view/MainView.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/view/controls/GMapControl.mxml
-%%WWWDIR%%/uifx/src/modules/gmap/view/controls/GMapLinkControl.as
-%%WWWDIR%%/uifx/src/modules/gmap/view/controls/GMapLinksControl.as
-%%WWWDIR%%/uifx/src/modules/gmap/view/controls/GMapLocationControl.as
-%%WWWDIR%%/uifx/src/modules/gmap/view/controls/GMapLocationsControl.as
-%%WWWDIR%%/uifx/src/modules/gmap/view/controls/GMapLocationsExtControl.as
-%%WWWDIR%%/uifx/src/modules/gmap/view/controls/LinkLine.as
-%%WWWDIR%%/uifx/src/modules/gmap/view/controls/LocationMarker.as
-%%WWWDIR%%/uifx/src/services-config.xml
-%%WWWDIR%%/uifx/src/shell.mxml
-@dir %%WWWDIR%%/var/tmpl/compile
-@dir %%WWWDIR%%/var/tmpl/cache
-@dir %%WWWDIR%%/share/var
+%%WWWDIR%%/share/userfiles/templates/on-demand-filter.header.html
 @dir %%WWWDIR%%/etc/automaps
+@dir %%WWWDIR%%/share/userfiles/images/gadgets
+@dir %%WWWDIR%%/share/userfiles/styles
+@dir %%WWWDIR%%/share/var
+@dir %%WWWDIR%%/var/tmpl/cache
+@dir %%WWWDIR%%/var/tmpl/compile