[Pkg-nagios-changes] [pkg-nagvis] 03/08: Merge tag 'upstream/1.7.9+dfsg1'
Markus Frosch
lazyfrosch-guest at moszumanska.debian.org
Thu Dec 12 19:51:11 UTC 2013
This is an automated email from the git hooks/post-receive script.
lazyfrosch-guest pushed a commit to branch master
in repository pkg-nagvis.
commit f04a5b9233d4b1270641ce0b0220cc4b11902390
Merge: 8e07869 a63479e
Author: Markus Frosch <markus at lazyfrosch.de>
Date: Thu Dec 12 19:03:55 2013 +0100
Merge tag 'upstream/1.7.9+dfsg1'
DFSG cleaned upstream version 1.7.9+dfsg1
.f12 | 32 +-
ChangeLog | 262 +++++
TODO | 485 ++++++---
docs/de_DE/after_installation.html | 4 +-
docs/de_DE/automap.html | 61 +-
docs/de_DE/geomap.html | 122 +++
docs/de_DE/header_templates.html | 1 -
docs/de_DE/index.html | 2 +-
docs/de_DE/install_omd_site.html | 59 ++
docs/de_DE/installation_instructions.html | 12 +-
docs/de_DE/installer.html | 6 +-
docs/de_DE/maps.html | 174 ++++
docs/de_DE/system_requirements.html | 6 +-
docs/de_DE/toc.html | 8 +-
docs/de_DE/update_instructions.html | 1 +
docs/de_DE/user_interface.html | 26 +-
docs/de_DE/welcome.html | 6 +-
docs/en_US/about.html | 12 +-
docs/en_US/after_installation.html | 5 +-
docs/en_US/automap.html | 60 +-
docs/en_US/automap_config_format.html | 4 +-
docs/en_US/backend_mklivestatus.html | 6 +-
docs/en_US/backend_nagiosbp.html | 2 +-
docs/en_US/backend_ndomy.html | 4 +-
docs/en_US/context_templates.html | 6 +
docs/en_US/extending/custom_context_actions.html | 4 +
docs/en_US/extending/iconsets.html | 68 +-
docs/en_US/geomap.html | 126 +++
docs/en_US/header_templates.html | 1 -
docs/en_US/index.html | 2 +-
docs/en_US/install_omd_site.html | 6 +-
docs/en_US/installation_instructions.html | 193 ++--
docs/en_US/installer.html | 8 +-
docs/en_US/map_config_format_description.html | 170 ++-
docs/en_US/maps.html | 181 ++++
docs/en_US/nagvis_config_format_description.html | 280 ++++-
docs/en_US/system_requirements.html | 4 +-
docs/en_US/toc.html | 12 +-
docs/en_US/update_instructions.html | 2 +
docs/en_US/user_interface.html | 19 +-
docs/en_US/welcome.html | 6 +-
docs/general/css/style.css | 6 +-
etc/automaps/__automap.cfg | 46 -
etc/automaps/demo-overview.cfg | 10 -
etc/geomap/demo-locations.csv | 2 +
etc/maps/demo-automap.cfg | 14 +
etc/maps/demo-automap2.cfg | 18 +
etc/maps/demo-geomap.cfg | 11 +
etc/maps/demo-germany.cfg | 7 +
etc/maps/demo-ham-racks.cfg | 7 +
etc/maps/demo-load.cfg | 7 +
etc/maps/demo-muc-srv1.cfg | 7 +
etc/maps/demo-overview.cfg | 21 +
etc/nagvis.ini.php-sample | 131 ++-
install.sh | 142 +--
install_lib | 92 ++
omd_install.sh | 60 +-
pack | 19 +-
.../nagvis-js/classes/FrontendModAutoMap.php | 192 ----
.../frontend/nagvis-js/classes/FrontendModMap.php | 33 +-
.../nagvis-js/classes/FrontendModRotation.php | 7 +-
.../nagvis-js/classes/NagVisAutoMapView.php | 146 ---
.../nagvis-js/classes/NagVisHeaderMenu.php | 38 +-
.../frontend/nagvis-js/classes/NagVisInfoView.php | 4 +-
.../frontend/nagvis-js/classes/NagVisLoginView.php | 1 +
share/frontend/nagvis-js/classes/NagVisMapView.php | 58 +-
.../nagvis-js/classes/NagVisOverviewView.php | 7 +-
share/frontend/nagvis-js/classes/NagVisUrlView.php | 17 +-
.../nagvis-js/images/internal/dimension.png | Bin 0 -> 288 bytes
share/frontend/nagvis-js/index.php | 1 -
share/frontend/nagvis-js/js/ExtGenericResize.js | 12 +-
share/frontend/nagvis-js/js/NagVisContainer.js | 133 +++
share/frontend/nagvis-js/js/NagVisLine.js | 5 +-
share/frontend/nagvis-js/js/NagVisObject.js | 356 +++----
share/frontend/nagvis-js/js/NagVisService.js | 1 +
share/frontend/nagvis-js/js/NagVisShape.js | 17 +-
.../frontend/nagvis-js/js/NagVisStatefulObject.js | 230 ++--
.../frontend/nagvis-js/js/NagVisStatelessObject.js | 2 +
share/frontend/nagvis-js/js/NagVisTextbox.js | 24 +-
share/frontend/nagvis-js/js/ajax.js | 29 +-
share/frontend/nagvis-js/js/ajaxActions.js | 26 +-
share/frontend/nagvis-js/js/edit.js | 73 +-
share/frontend/nagvis-js/js/frontend.js | 994 ++++++++----------
share/frontend/nagvis-js/js/frontendHover.js | 40 +-
share/frontend/nagvis-js/js/frontendMessage.js | 18 +-
share/frontend/nagvis-js/js/hover.js | 18 +-
share/frontend/nagvis-js/js/lines.js | 78 +-
share/frontend/nagvis-js/js/nagvis.js | 265 ++++-
.../nagvis-js/locale/de_DE/LC_MESSAGES/nagvis.mo | Bin 45866 -> 45866 bytes
.../nagvis-js/locale/de_DE/LC_MESSAGES/nagvis.po | 832 +++++++++++----
.../nagvis-js/locale/en_US/LC_MESSAGES/nagvis.mo | Bin 23505 -> 23505 bytes
.../nagvis-js/locale/en_US/LC_MESSAGES/nagvis.po | 1098 +++++++++++---------
share/server/core/actions/rdp.php | 74 ++
share/server/core/actions/win_ssh.php | 59 ++
share/server/core/ajax_handler.php | 2 +-
share/server/core/classes/CoreAuthHandler.php | 15 +-
.../core/classes/CoreAuthorisationHandler.php | 5 +-
.../core/classes/CoreAuthorisationModMultisite.php | 9 +-
.../core/classes/CoreAuthorisationModMySQL.php | 8 +-
.../core/classes/CoreAuthorisationModSQLite.php | 8 +-
.../core/classes/CoreAuthorisationModule.php | 4 +-
share/server/core/classes/CoreBackendMgmt.php | 6 +-
share/server/core/classes/CoreExceptions.php | 2 +
.../server/core/classes/CoreLogonDialogHandler.php | 15 +-
share/server/core/classes/CoreLogonMultisite.php | 60 +-
share/server/core/classes/CoreModAction.php | 175 ++++
share/server/core/classes/CoreModAutoMap.php | 281 -----
share/server/core/classes/CoreModGeneral.php | 42 +-
share/server/core/classes/CoreModMap.php | 187 +++-
share/server/core/classes/CoreModMultisite.php | 22 +-
share/server/core/classes/CoreModOverview.php | 16 +-
share/server/core/classes/CoreModule.php | 47 +
share/server/core/classes/CoreMySQLHandler.php | 84 +-
share/server/core/classes/CoreRotation.php | 7 +-
share/server/core/classes/CoreSQLiteHandler.php | 72 +-
share/server/core/classes/CoreSessionHandler.php | 11 +
.../server/core/classes/GlobalBackendInterface.php | 2 +-
share/server/core/classes/GlobalBackendTest.php | 33 +-
.../server/core/classes/GlobalBackendmerlinmy.php | 25 +-
.../core/classes/GlobalBackendmklivestatus.php | 166 ++-
.../server/core/classes/GlobalBackendnagiosbp.php | 4 +
share/server/core/classes/GlobalBackendndomy.php | 24 +
share/server/core/classes/GlobalCore.php | 96 +-
share/server/core/classes/GlobalFileCache.php | 4 +-
share/server/core/classes/GlobalIndexPage.php | 225 ++--
share/server/core/classes/GlobalLanguage.php | 2 +-
share/server/core/classes/GlobalMainCfg.php | 551 +++++++---
share/server/core/classes/GlobalMap.php | 6 +-
share/server/core/classes/GlobalMapCfg.php | 608 ++++++++---
share/server/core/classes/NagVisAutoMap.php | 841 ---------------
share/server/core/classes/NagVisAutomapCfg.php | 178 ----
share/server/core/classes/NagVisContextMenu.php | 19 +
share/server/core/classes/NagVisMap.php | 13 +-
share/server/core/classes/NagVisViewAck.php | 128 +++
.../core/classes/NagVisViewAutomapModifyParams.php | 103 --
...wAutomapToMap.php => NagVisViewToStaticMap.php} | 10 +-
share/server/core/classes/WuiViewEditMainCfg.php | 15 +-
share/server/core/classes/WuiViewMapAddModify.php | 106 +-
.../core/classes/objects/NagVisContainer.php | 55 +
share/server/core/classes/objects/NagVisHost.php | 112 --
share/server/core/classes/objects/NagVisMapObj.php | 31 +-
share/server/core/classes/objects/NagVisObject.php | 14 +-
.../core/classes/objects/NagVisStatefulObject.php | 26 +-
share/server/core/classes/objects/NagiosHost.php | 354 +------
share/server/core/defines/global.php | 7 +-
share/server/core/defines/matches.php | 25 +-
share/server/core/functions/core.php | 13 +
share/server/core/functions/oldPhpVersionFixes.php | 6 +
share/server/core/mapcfg/default.php | 172 ++-
share/server/core/sources/.gitignore | 0
share/server/core/sources/automap.php | 574 ++++++++++
share/server/core/sources/automap_pos.php | 355 +++++++
share/server/core/sources/filter.php | 75 ++
share/server/core/sources/general.php | 65 ++
share/server/core/sources/geomap.php | 415 ++++++++
share/userfiles/images/iconsets/std_big_ack.png | Bin 1813 -> 0 bytes
.../images/iconsets/std_big_critical_ack.png | Bin 0 -> 2060 bytes
.../images/iconsets/std_big_critical_dt.png | Bin 0 -> 2504 bytes
.../userfiles/images/iconsets/std_big_down_ack.png | Bin 0 -> 1974 bytes
.../userfiles/images/iconsets/std_big_down_dt.png | Bin 0 -> 2216 bytes
.../userfiles/images/iconsets/std_big_downtime.png | Bin 2393 -> 0 bytes
share/userfiles/images/iconsets/std_big_ok_dt.png | Bin 0 -> 2495 bytes
share/userfiles/images/iconsets/std_big_sack.png | Bin 1881 -> 0 bytes
.../images/iconsets/std_big_sdowntime.png | Bin 2372 -> 0 bytes
.../images/iconsets/std_big_unknown_ack.png | Bin 0 -> 2050 bytes
.../images/iconsets/std_big_unknown_dt.png | Bin 0 -> 2505 bytes
.../images/iconsets/std_big_unreachable_ack.png | Bin 0 -> 2039 bytes
.../images/iconsets/std_big_unreachable_dt.png | Bin 0 -> 2255 bytes
share/userfiles/images/iconsets/std_big_up_dt.png | Bin 0 -> 2223 bytes
.../images/iconsets/std_big_warning_ack.png | Bin 0 -> 2033 bytes
.../images/iconsets/std_big_warning_dt.png | Bin 0 -> 2519 bytes
.../userfiles/images/iconsets/std_dot_critical.png | Bin 0 -> 216 bytes
.../images/iconsets/std_dot_critical_ack.png | Bin 0 -> 237 bytes
.../images/iconsets/std_dot_critical_dt.png | Bin 0 -> 237 bytes
share/userfiles/images/iconsets/std_dot_down.png | Bin 0 -> 216 bytes
.../userfiles/images/iconsets/std_dot_down_ack.png | Bin 0 -> 237 bytes
.../userfiles/images/iconsets/std_dot_down_dt.png | Bin 0 -> 227 bytes
share/userfiles/images/iconsets/std_dot_error.png | Bin 0 -> 222 bytes
share/userfiles/images/iconsets/std_dot_ok.png | Bin 0 -> 219 bytes
share/userfiles/images/iconsets/std_dot_ok_dt.png | Bin 0 -> 240 bytes
.../userfiles/images/iconsets/std_dot_pending.png | Bin 0 -> 218 bytes
.../images/iconsets/std_dot_unchecked.png | Bin 0 -> 218 bytes
.../userfiles/images/iconsets/std_dot_unknown.png | Bin 0 -> 219 bytes
.../images/iconsets/std_dot_unknown_ack.png | Bin 0 -> 243 bytes
.../images/iconsets/std_dot_unknown_dt.png | Bin 0 -> 230 bytes
.../images/iconsets/std_dot_unreachable.png | Bin 0 -> 226 bytes
.../images/iconsets/std_dot_unreachable_ack.png | Bin 0 -> 244 bytes
.../images/iconsets/std_dot_unreachable_dt.png | Bin 0 -> 232 bytes
share/userfiles/images/iconsets/std_dot_up.png | Bin 0 -> 219 bytes
share/userfiles/images/iconsets/std_dot_up_dt.png | Bin 0 -> 240 bytes
.../userfiles/images/iconsets/std_dot_warning.png | Bin 0 -> 220 bytes
.../images/iconsets/std_dot_warning_ack.png | Bin 0 -> 240 bytes
.../images/iconsets/std_dot_warning_dt.png | Bin 0 -> 240 bytes
share/userfiles/images/iconsets/std_medium_ack.png | Bin 1284 -> 0 bytes
.../images/iconsets/std_medium_critical_ack.png | Bin 0 -> 1680 bytes
.../images/iconsets/std_medium_critical_dt.png | Bin 0 -> 1657 bytes
.../images/iconsets/std_medium_down_ack.png | Bin 0 -> 1541 bytes
.../images/iconsets/std_medium_down_dt.png | Bin 0 -> 1461 bytes
.../images/iconsets/std_medium_downtime.png | Bin 1406 -> 0 bytes
.../userfiles/images/iconsets/std_medium_ok_dt.png | Bin 0 -> 1661 bytes
.../userfiles/images/iconsets/std_medium_sack.png | Bin 1379 -> 0 bytes
.../images/iconsets/std_medium_sdowntime.png | Bin 1480 -> 0 bytes
.../images/iconsets/std_medium_unknown_ack.png | Bin 0 -> 1680 bytes
.../images/iconsets/std_medium_unknown_dt.png | Bin 0 -> 1668 bytes
.../images/iconsets/std_medium_unreachable_ack.png | Bin 0 -> 1564 bytes
.../images/iconsets/std_medium_unreachable_dt.png | Bin 0 -> 1470 bytes
.../userfiles/images/iconsets/std_medium_up_dt.png | Bin 0 -> 1449 bytes
.../images/iconsets/std_medium_warning_ack.png | Bin 0 -> 1676 bytes
.../images/iconsets/std_medium_warning_dt.png | Bin 0 -> 1664 bytes
share/userfiles/images/iconsets/std_small_ack.png | Bin 799 -> 0 bytes
.../images/iconsets/std_small_critical_ack.png | Bin 0 -> 1397 bytes
.../images/iconsets/std_small_critical_dt.png | Bin 0 -> 1407 bytes
.../images/iconsets/std_small_down_ack.png | Bin 0 -> 1418 bytes
.../images/iconsets/std_small_down_dt.png | Bin 0 -> 1533 bytes
.../images/iconsets/std_small_downtime.png | Bin 906 -> 0 bytes
.../userfiles/images/iconsets/std_small_ok_dt.png | Bin 0 -> 1407 bytes
share/userfiles/images/iconsets/std_small_sack.png | Bin 858 -> 0 bytes
.../images/iconsets/std_small_sdowntime.png | Bin 955 -> 0 bytes
.../images/iconsets/std_small_unknown_ack.png | Bin 0 -> 1398 bytes
.../images/iconsets/std_small_unknown_dt.png | Bin 0 -> 1407 bytes
.../images/iconsets/std_small_unreachable_ack.png | Bin 0 -> 1418 bytes
.../images/iconsets/std_small_unreachable_dt.png | Bin 0 -> 1534 bytes
.../userfiles/images/iconsets/std_small_up_dt.png | Bin 0 -> 1533 bytes
.../images/iconsets/std_small_warning_ack.png | Bin 0 -> 1398 bytes
.../images/iconsets/std_small_warning_dt.png | Bin 0 -> 1406 bytes
.../images/shapes/demo-nagvis-sponsors.png | Bin 0 -> 4667 bytes
share/userfiles/images/shapes/std_nagvis.png | Bin 0 -> 1394 bytes
share/userfiles/scripts/.gitignore | 0
share/userfiles/scripts/std_lq.php | 201 ++++
share/userfiles/templates/default.automap.html | 22 -
.../templates/default.automapModifyParams.html | 35 -
share/userfiles/templates/default.context.html | 42 +-
share/userfiles/templates/default.css | 46 +-
share/userfiles/templates/default.header.html | 37 +-
share/userfiles/templates/default.header.js | 17 +-
share/userfiles/templates/default.index.html | 2 +
share/userfiles/templates/default.info.html | 2 +
share/userfiles/templates/default.login.html | 1 +
share/userfiles/templates/default.map.html | 1 +
share/userfiles/templates/default.overview.html | 1 +
....automapToMap.html => default.toStaticMap.html} | 6 +-
share/userfiles/templates/default.url.html | 1 +
.../templates/default.wuiMapAddModify.html | 16 +-
243 files changed, 9294 insertions(+), 5608 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagvis.git
More information about the Pkg-nagios-changes
mailing list