From 29358ac400cc10eeccff58090a192afb99fb6e6f Mon Sep 17 00:00:00 2001 From: hfrenzel-guest Date: Sat, 27 Sep 2008 15:39:08 +0000 Subject: [PATCH] prepared new upstream release git-svn-id: svn://svn.debian.org/svn/pkg-nagios/nagvis/trunk@1583 98d490a6-b407-0410-aaaa-fdee166ba3f5 --- debian/changelog | 9 + debian/control | 2 +- debian/dirs | 1 + debian/links | 1 + debian/patches/pathnames.dpatch | 355 +++++++++++++++++++++----------- debian/postinst | 7 +- 6 files changed, 255 insertions(+), 120 deletions(-) diff --git a/debian/changelog b/debian/changelog index 86d69bc..28a5346 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +nagvis (1:1.3.1-1) UNRELEASED; urgency=low + + * NOT RELEASED YET + * New upstream version with many new features and bugfixes + + See http://docs.nagvis.org/1.3/en_US/changelog.html for more info. + + added graphviz to Depends + + -- Hendrik Frenzel Sat, 27 Sep 2008 12:04:13 +0200 + nagvis (1:1.2.2-5) unstable; urgency=low * changed from nagios2 to nagios3 support (Closes: 479290) diff --git a/debian/control b/debian/control index 4f72cf7..d300027 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Dm-Upload-Allowed: yes Package: nagvis Architecture: all -Depends: nagios3, ndoutils-mysql, libapache2-mod-php5, php5-mysql, php5-gd, ucf, dbconfig-common +Depends: nagios3, ndoutils-mysql, libapache2-mod-php5, php5-mysql, php5-gd, ucf, dbconfig-common, graphviz Description: Visualization addon for Nagios NagVis can be used to visualize Nagios Data, e.g. to display IT processes like a mail system or a network infrastructure. diff --git a/debian/dirs b/debian/dirs index c58a8db..88bd9fd 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,2 +1,3 @@ etc/nagvis/maps etc/nagvis/templates +var/lib/nagvis diff --git a/debian/links b/debian/links index bb1865f..8daf3e7 100644 --- a/debian/links +++ b/debian/links @@ -3,3 +3,4 @@ etc/nagvis/maps usr/share/nagvis/htdocs/nagvis/images/maps etc/nagvis/templates usr/share/nagvis/htdocs/nagvis/etc/templates etc/nagvis/templates usr/share/nagvis/htdocs/nagvis/images/templates usr/share/nagvis/htdocs usr/share/nagios3/htdocs/nagvis +var/lib/nagvis usr/share/nagvis/htdocs/var diff --git a/debian/patches/pathnames.dpatch b/debian/patches/pathnames.dpatch index 813af91..1b6e98e 100755 --- a/debian/patches/pathnames.dpatch +++ b/debian/patches/pathnames.dpatch @@ -5,10 +5,10 @@ ## DP: No description. @DPATCH@ -diff -urNad nagvis-1.2.2~/etc/nagvis.ini.php-sample nagvis-1.2.2/etc/nagvis.ini.php-sample ---- nagvis-1.2.2~/etc/nagvis.ini.php-sample 2007-10-03 13:57:48.000000000 +0200 -+++ nagvis-1.2.2/etc/nagvis.ini.php-sample 2008-03-18 18:00:30.000000000 +0100 -@@ -59,11 +59,11 @@ +diff -urNad nagvis-1.3.1~/etc/nagvis.ini.php-sample nagvis-1.3.1/etc/nagvis.ini.php-sample +--- nagvis-1.3.1~/etc/nagvis.ini.php-sample 2008-06-04 17:57:06.000000000 +0000 ++++ nagvis-1.3.1/etc/nagvis.ini.php-sample 2008-09-27 12:52:10.000000000 +0000 +@@ -84,11 +84,11 @@ ; path options [paths] ; absolute physical NagVis path @@ -23,7 +23,7 @@ diff -urNad nagvis-1.2.2~/etc/nagvis.ini.php-sample nagvis-1.2.2/etc/nagvis.ini. ; options for the NDO-Backend ; in this example the ID of the Backend is "ndomy_1" you can define another ID. -@@ -87,7 +87,7 @@ +@@ -112,7 +112,7 @@ ; maximum delay of the NDO Database in Seconds ;maxtimewithoutupdate=180 ; path to the cgi-bin of this backend @@ -32,21 +32,25 @@ diff -urNad nagvis-1.2.2~/etc/nagvis.ini.php-sample nagvis-1.2.2/etc/nagvis.ini. ; map rotation pools ; in this example the browser switches between the maps demo and demo2 every 15 -diff -urNad nagvis-1.2.2~/nagvis/draw.php nagvis-1.2.2/nagvis/draw.php ---- nagvis-1.2.2~/nagvis/draw.php 2007-10-20 16:28:44.000000000 +0200 -+++ nagvis-1.2.2/nagvis/draw.php 2008-03-18 18:00:30.000000000 +0100 -@@ -14,23 +14,23 @@ - +diff -urNad nagvis-1.3.1~/nagvis/draw.php nagvis-1.3.1/nagvis/draw.php +--- nagvis-1.3.1~/nagvis/draw.php 2008-06-05 21:11:33.000000000 +0000 ++++ nagvis-1.3.1/nagvis/draw.php 2008-09-27 12:52:10.000000000 +0000 +@@ -27,43 +27,43 @@ @session_start(); + // Include defines -require("./includes/defines/global.php"); -require("./includes/defines/matches.php"); +require("/usr/share/nagvis/includes/defines/global.php"); +require("/usr/share/nagvis/includes/defines/matches.php"); + // Include defines -require("./includes/functions/debug.php"); +-require("./includes/functions/oldPhpVersionFixes.php"); +require("/usr/share/nagvis/includes/functions/debug.php"); ++require("/usr/share/nagvis/includes/functions/oldPhpVersionFixes.php"); + // Include needed global classes -require("./includes/classes/GlobalGraphic.php"); -require("./includes/classes/GlobalMainCfg.php"); -require("./includes/classes/GlobalMapCfg.php"); @@ -64,6 +68,7 @@ diff -urNad nagvis-1.2.2~/nagvis/draw.php nagvis-1.2.2/nagvis/draw.php +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php"); +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php"); + // Include needed frontend classes -require("./includes/classes/NagVisMap.php"); -require("./includes/classes/NagVisBackground.php"); -require("./includes/classes/NagVisMapCfg.php"); @@ -71,12 +76,51 @@ diff -urNad nagvis-1.2.2~/nagvis/draw.php nagvis-1.2.2/nagvis/draw.php +require("/usr/share/nagvis/includes/classes/NagVisBackground.php"); +require("/usr/share/nagvis/includes/classes/NagVisMapCfg.php"); + // Include needed object classes +-require("./includes/classes/objects/NagVisObject.php"); +-require("./includes/classes/objects/NagVisStatefulObject.php"); +-require("./includes/classes/objects/NagVisStatelessObject.php"); +-require("./includes/classes/objects/NagiosHost.php"); +-require("./includes/classes/objects/NagVisHost.php"); +-require("./includes/classes/objects/NagiosService.php"); +-require("./includes/classes/objects/NagVisService.php"); +-require("./includes/classes/objects/NagiosHostgroup.php"); +-require("./includes/classes/objects/NagVisHostgroup.php"); +-require("./includes/classes/objects/NagiosServicegroup.php"); +-require("./includes/classes/objects/NagVisServicegroup.php"); +-require("./includes/classes/objects/NagVisMapObj.php"); +-require("./includes/classes/objects/NagVisShape.php"); +-require("./includes/classes/objects/NagVisTextbox.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisObject.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisStatefulObject.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisStatelessObject.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagiosHost.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisHost.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagiosService.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisService.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagiosHostgroup.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisHostgroup.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagiosServicegroup.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisServicegroup.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisMapObj.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisShape.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisTextbox.php"); + + // Load the main configuration $MAINCFG = new GlobalMainCfg(CONST_MAINCFG); - -diff -urNad nagvis-1.2.2~/nagvis/includes/classes/GlobalMainCfg.php nagvis-1.2.2/nagvis/includes/classes/GlobalMainCfg.php ---- nagvis-1.2.2~/nagvis/includes/classes/GlobalMainCfg.php 2007-12-03 22:42:10.000000000 +0100 -+++ nagvis-1.2.2/nagvis/includes/classes/GlobalMainCfg.php 2008-03-18 18:27:11.000000000 +0100 -@@ -131,43 +131,43 @@ +diff -urNad nagvis-1.3.1~/nagvis/includes/classes/GlobalMainCfg.php nagvis-1.3.1/nagvis/includes/classes/GlobalMainCfg.php +--- nagvis-1.3.1~/nagvis/includes/classes/GlobalMainCfg.php 2008-08-13 19:45:26.000000000 +0000 ++++ nagvis-1.3.1/nagvis/includes/classes/GlobalMainCfg.php 2008-09-27 12:53:09.000000000 +0000 +@@ -173,7 +173,7 @@ + 'match' => MATCH_STRING_PATH), + 'var' => Array('must' => 0, + 'editable' => 0, +- 'default' => '', ++ 'default' => '/var/lib/nagvis/', + 'match' => MATCH_STRING_PATH), + 'mapcfg' => Array('must' => 0, + 'editable' => 0, +@@ -189,47 +189,47 @@ 'match' => MATCH_STRING_PATH), 'htmlbase' => Array('must' => 1, 'editable' => 1, @@ -87,7 +131,7 @@ diff -urNad nagvis-1.2.2~/nagvis/includes/classes/GlobalMainCfg.php nagvis-1.2.2 'editable' => 1, - 'default' => '/nagios/cgi-bin', + 'default' => '/nagios3/cgi-bin', - 'match' => MATCH_STRING_PATH), + 'match' => MATCH_STRING_URL), 'htmlimages' => Array('must' => 0, 'editable' => 0, - 'default' => '/nagios/nagvis/nagvis/images/', @@ -127,28 +171,44 @@ diff -urNad nagvis-1.2.2~/nagvis/includes/classes/GlobalMainCfg.php nagvis-1.2.2 'editable' => 0, - 'default' => '/nagios/nagvis/nagvis/images/maps/', + 'default' => '/nagios3/nagvis/nagvis/images/maps/', + 'match' => MATCH_STRING_PATH), + 'htmlvar' => Array('must' => 0, + 'editable' => 0, +- 'default' => '/nagios/var/', ++ 'default' => '/nagios3/var/', 'match' => MATCH_STRING_PATH)), 'backend' => Array( 'backendtype' => Array('must' => 1, -@@ -226,7 +226,7 @@ +@@ -288,7 +288,7 @@ 'match' => MATCH_STRING_NO_SPACE), 'cgi' => Array('must' => 1, 'editable' => 1, - 'default' => '/usr/local/nagios/sbin/', + 'default' => '/usr/lib/cgi-bin/nagios3/', 'match' => MATCH_STRING_PATH)))), - 'rotation' => Array('rotationid' => Array('must' => 1, - 'editable' => 1, -@@ -281,14 +281,14 @@ - $this->validConfig['paths']['icon']['default'] = $base.'nagvis/images/iconsets/'; + 'rotation' => Array( + 'rotationid' => Array('must' => 1, +@@ -314,7 +314,7 @@ + 'match' => MATCH_STRING_NO_SPACE_EMPTY), + 'graphvizpath' => Array('must' => 0, + 'editable' => 0, +- 'default' => '/usr/local/bin/', ++ 'default' => '/usr/bin/', + 'match' => MATCH_STRING_PATH), + 'defaultparams' => Array('must' => 0, + 'editable' => 0, +@@ -361,15 +361,15 @@ + $this->validConfig['paths']['images']['default'] = $base.'nagvis/images/'; $this->validConfig['paths']['shape']['default'] = $base.'nagvis/images/shapes/'; $this->validConfig['paths']['language']['default'] = $base.'nagvis/includes/languages/'; - $this->validConfig['paths']['class']['default'] = $base.'nagvis/includes/classes/'; + $this->validConfig['paths']['class']['default'] = '/usr/share/nagvis/includes/classes/'; $this->validConfig['paths']['map']['default'] = $base.'nagvis/images/maps/'; +- $this->validConfig['paths']['var']['default'] = $base.'var/'; - $this->validConfig['paths']['hovertemplate']['default'] = $base.'nagvis/templates/hover/'; - $this->validConfig['paths']['headertemplate']['default'] = $base.'nagvis/templates/header/'; - $this->validConfig['paths']['mapcfg']['default'] = $base.'etc/maps/'; ++ $this->validConfig['paths']['var']['default'] = '/var/lib/nagvis/'; + $this->validConfig['paths']['hovertemplate']['default'] = '/etc/nagvis/templates/hover/'; + $this->validConfig['paths']['headertemplate']['default'] = '/etc/nagvis/templates/header/'; + $this->validConfig['paths']['mapcfg']['default'] = $base.'nagvis/etc/maps/'; @@ -160,38 +220,44 @@ diff -urNad nagvis-1.2.2~/nagvis/includes/classes/GlobalMainCfg.php nagvis-1.2.2 $this->validConfig['paths']['htmlhovertemplateimages']['default'] = $this->validConfig['paths']['htmlimages']['default'].'templates/hover/'; $this->validConfig['paths']['htmlheadertemplateimages']['default'] = $this->validConfig['paths']['htmlimages']['default'].'templates/header/'; $this->validConfig['paths']['htmlicon']['default'] = $htmlBase.'/nagvis/images/iconsets/'; -@@ -821,4 +821,4 @@ - } - } - } --?> -\ No newline at end of file -+?> -diff -urNad nagvis-1.2.2~/nagvis/includes/defines/global.php nagvis-1.2.2/nagvis/includes/defines/global.php ---- nagvis-1.2.2~/nagvis/includes/defines/global.php 2008-01-28 22:03:32.000000000 +0100 -+++ nagvis-1.2.2/nagvis/includes/defines/global.php 2008-03-18 18:00:30.000000000 +0100 -@@ -16,5 +16,5 @@ - define('DEBUGFILE', '/var/log/nagvis-debug.log'); - - define('CONST_VERSION', '1.2.2'); +diff -urNad nagvis-1.3.1~/nagvis/includes/defines/global.php nagvis-1.3.1/nagvis/includes/defines/global.php +--- nagvis-1.3.1~/nagvis/includes/defines/global.php 2008-08-22 19:01:15.000000000 +0000 ++++ nagvis-1.3.1/nagvis/includes/defines/global.php 2008-09-27 12:52:10.000000000 +0000 +@@ -37,13 +37,13 @@ + define('DEBUGLEVEL', 4); + + // Path to the debug file +-define('DEBUGFILE', '../var/nagvis-debug.log'); ++define('DEBUGFILE', '/var/log/nagvis-debug.log'); + + // NagVis Version + define('CONST_VERSION', '1.3.1'); + + // Path to the main configuration file -define('CONST_MAINCFG', '../etc/nagvis.ini.php'); +define('CONST_MAINCFG', '/etc/nagvis/nagvis.ini.php'); - ?> -diff -urNad nagvis-1.2.2~/nagvis/index.php nagvis-1.2.2/nagvis/index.php ---- nagvis-1.2.2~/nagvis/index.php 2007-12-13 08:50:14.000000000 +0100 -+++ nagvis-1.2.2/nagvis/index.php 2008-03-18 18:00:30.000000000 +0100 -@@ -14,23 +14,23 @@ + // Needed minimal PHP version + define('CONST_NEEDED_PHP_VERSION', '5.0'); +diff -urNad nagvis-1.3.1~/nagvis/index.php nagvis-1.3.1/nagvis/index.php +--- nagvis-1.3.1~/nagvis/index.php 2008-06-05 21:11:33.000000000 +0000 ++++ nagvis-1.3.1/nagvis/index.php 2008-09-27 12:52:10.000000000 +0000 +@@ -26,44 +26,44 @@ @session_start(); + // Include defines -require("./includes/defines/global.php"); -require("./includes/defines/matches.php"); +require("/usr/share/nagvis/includes/defines/global.php"); +require("/usr/share/nagvis/includes/defines/matches.php"); + // Include functions -require("./includes/functions/debug.php"); +-require("./includes/functions/oldPhpVersionFixes.php"); +require("/usr/share/nagvis/includes/functions/debug.php"); ++require("/usr/share/nagvis/includes/functions/oldPhpVersionFixes.php"); + // Include needed global classes -require("./includes/classes/GlobalMainCfg.php"); -require("./includes/classes/GlobalMapCfg.php"); -require("./includes/classes/GlobalLanguage.php"); @@ -209,30 +275,65 @@ diff -urNad nagvis-1.2.2~/nagvis/index.php nagvis-1.2.2/nagvis/index.php +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php"); +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php"); + // Include needed nagvis classes -require("./includes/classes/NagVisMapCfg.php"); -require("./includes/classes/NagVisMap.php"); -require("./includes/classes/NagVisFrontend.php"); +-require("./includes/classes/NagVisAutoMap.php"); +require("/usr/share/nagvis/includes/classes/NagVisMapCfg.php"); +require("/usr/share/nagvis/includes/classes/NagVisMap.php"); +require("/usr/share/nagvis/includes/classes/NagVisFrontend.php"); - ++require("/usr/share/nagvis/includes/classes/NagVisAutoMap.php"); + + // Include needed nagvis object classes +-require("./includes/classes/objects/NagVisObject.php"); +-require("./includes/classes/objects/NagVisStatefulObject.php"); +-require("./includes/classes/objects/NagVisStatelessObject.php"); +-require("./includes/classes/objects/NagiosHost.php"); +-require("./includes/classes/objects/NagVisHost.php"); +-require("./includes/classes/objects/NagiosService.php"); +-require("./includes/classes/objects/NagVisService.php"); +-require("./includes/classes/objects/NagiosHostgroup.php"); +-require("./includes/classes/objects/NagVisHostgroup.php"); +-require("./includes/classes/objects/NagiosServicegroup.php"); +-require("./includes/classes/objects/NagVisServicegroup.php"); +-require("./includes/classes/objects/NagVisMapObj.php"); +-require("./includes/classes/objects/NagVisShape.php"); +-require("./includes/classes/objects/NagVisTextbox.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisObject.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisStatefulObject.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisStatelessObject.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagiosHost.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisHost.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagiosService.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisService.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagiosHostgroup.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisHostgroup.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagiosServicegroup.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisServicegroup.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisMapObj.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisShape.php"); ++require("/usr/share/nagvis/includes/classes/objects/NagVisTextbox.php"); + + // Load the main configuration $MAINCFG = new GlobalMainCfg(CONST_MAINCFG); - -diff -urNad nagvis-1.2.2~/wui/ajax_handler.php nagvis-1.2.2/wui/ajax_handler.php ---- nagvis-1.2.2~/wui/ajax_handler.php 2007-10-20 16:28:44.000000000 +0200 -+++ nagvis-1.2.2/wui/ajax_handler.php 2008-03-18 18:00:30.000000000 +0100 -@@ -2,19 +2,19 @@ - +diff -urNad nagvis-1.3.1~/wui/ajax_handler.php nagvis-1.3.1/wui/ajax_handler.php +--- nagvis-1.3.1~/wui/ajax_handler.php 2008-03-29 01:01:07.000000000 +0000 ++++ nagvis-1.3.1/wui/ajax_handler.php 2008-09-27 12:52:10.000000000 +0000 +@@ -29,22 +29,22 @@ @session_start(); + // Include defines -require("../nagvis/includes/defines/global.php"); -require("../nagvis/includes/defines/matches.php"); +require("/usr/share/nagvis/includes/defines/global.php"); +require("/usr/share/nagvis/includes/defines/matches.php"); + // Include functions -require("../nagvis/includes/functions/debug.php"); +require("/usr/share/nagvis/includes/functions/debug.php"); + // Include needed global classes -require("../nagvis/includes/classes/GlobalMainCfg.php"); -require("../nagvis/includes/classes/GlobalMapCfg.php"); -require("../nagvis/includes/classes/GlobalLanguage.php"); @@ -244,28 +345,35 @@ diff -urNad nagvis-1.2.2~/wui/ajax_handler.php nagvis-1.2.2/wui/ajax_handler.php +require("/usr/share/nagvis/includes/classes/GlobalPage.php"); +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php"); + // Include needed wui specific classes -require("./includes/classes/WuiMainCfg.php"); -require("./includes/classes/WuiMapCfg.php"); +require("/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php"); +require("/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php"); + // Load the main configuration $MAINCFG = new WuiMainCfg(CONST_MAINCFG); - -diff -urNad nagvis-1.2.2~/wui/form_handler.php nagvis-1.2.2/wui/form_handler.php ---- nagvis-1.2.2~/wui/form_handler.php 2008-01-03 13:08:28.000000000 +0100 -+++ nagvis-1.2.2/wui/form_handler.php 2008-03-18 18:34:55.000000000 +0100 -@@ -11,20 +11,20 @@ - +diff -urNad nagvis-1.3.1~/wui/form_handler.php nagvis-1.3.1/wui/form_handler.php +--- nagvis-1.3.1~/wui/form_handler.php 2008-03-29 01:01:07.000000000 +0000 ++++ nagvis-1.3.1/wui/form_handler.php 2008-09-27 12:52:10.000000000 +0000 +@@ -29,26 +29,26 @@ @session_start(); + // Include defines -require('../nagvis/includes/defines/global.php'); -require('../nagvis/includes/defines/matches.php'); +require('/usr/share/nagvis/includes/defines/global.php'); +require('/usr/share/nagvis/includes/defines/matches.php'); + // Include global functions -require('../nagvis/includes/functions/debug.php'); +require('/usr/share/nagvis/includes/functions/debug.php'); + // Include needed WUI specific functions +-require('./includes/functions/form_handler.php'); ++require('/usr/share/nagvis/wui/includes/functions/form_handler.php'); + + // Include needed global classes -require('../nagvis/includes/classes/GlobalLanguage.php'); -require('../nagvis/includes/classes/GlobalMainCfg.php'); -require('../nagvis/includes/classes/GlobalPage.php'); @@ -277,6 +385,7 @@ diff -urNad nagvis-1.2.2~/wui/form_handler.php nagvis-1.2.2/wui/form_handler.php +require('/usr/share/nagvis/includes/classes/GlobalMapCfg.php'); +require('/usr/share/nagvis/includes/classes/GlobalBackground.php'); + // Include needed WUI specific classes -require('./includes/classes/WuiMainCfg.php'); -require('./includes/classes/WuiMapCfg.php'); -require('./includes/classes/WuiBackground.php'); @@ -284,92 +393,92 @@ diff -urNad nagvis-1.2.2~/wui/form_handler.php nagvis-1.2.2/wui/form_handler.php +require('/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php'); +require('/usr/share/nagvis/wui/includes/classes/WuiBackground.php'); + // Load the main configuration $MAINCFG = new WuiMainCfg(CONST_MAINCFG); - -diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiAddModify.php nagvis-1.2.2/wui/includes/classes/WuiAddModify.php ---- nagvis-1.2.2~/wui/includes/classes/WuiAddModify.php 2007-10-03 14:13:56.000000000 +0200 -+++ nagvis-1.2.2/wui/includes/classes/WuiAddModify.php 2008-03-18 18:00:30.000000000 +0100 -@@ -29,10 +29,10 @@ +diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiAddModify.php nagvis-1.3.1/wui/includes/classes/WuiAddModify.php +--- nagvis-1.3.1~/wui/includes/classes/WuiAddModify.php 2008-05-23 09:15:21.000000000 +0000 ++++ nagvis-1.3.1/wui/includes/classes/WuiAddModify.php 2008-09-27 12:52:10.000000000 +0000 +@@ -51,10 +51,10 @@ $this->LANG = new GlobalLanguage($MAINCFG,'wui:addModify'); $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'), - 'cssIncludes'=>Array('./includes/css/wui.css'), -- 'jsIncludes'=>Array('./includes/js/addmodify.js', +- 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/addmodify.js', - './includes/js/ajax.js', - './includes/js/wui.js'), + 'cssIncludes'=>Array('./css/wui.css'), -+ 'jsIncludes'=>Array('./js/addmodify.js', ++ 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/addmodify.js', + './js/ajax.js', + './js/wui.js'), 'extHeader'=>Array(''), 'allowedUsers' => Array('EVERYONE')); parent::GlobalPage($MAINCFG,$prop,'wui:addModify'); -diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiBackendManagement.php nagvis-1.2.2/wui/includes/classes/WuiBackendManagement.php ---- nagvis-1.2.2~/wui/includes/classes/WuiBackendManagement.php 2007-10-03 14:13:56.000000000 +0200 -+++ nagvis-1.2.2/wui/includes/classes/WuiBackendManagement.php 2008-03-18 18:00:30.000000000 +0100 -@@ -26,10 +26,10 @@ +diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiBackendManagement.php nagvis-1.3.1/wui/includes/classes/WuiBackendManagement.php +--- nagvis-1.3.1~/wui/includes/classes/WuiBackendManagement.php 2008-05-01 17:18:59.000000000 +0000 ++++ nagvis-1.3.1/wui/includes/classes/WuiBackendManagement.php 2008-09-27 12:52:10.000000000 +0000 +@@ -48,10 +48,10 @@ $this->LANG = new GlobalLanguage($MAINCFG,'wui:backendManagement'); $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'), - 'cssIncludes'=>Array('./includes/css/wui.css'), -- 'jsIncludes'=>Array('./includes/js/wui.js', +- 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/wui.js', - './includes/js/BackendManagement.js', - './includes/js/ajax.js'), + 'cssIncludes'=>Array('./css/wui.css'), -+ 'jsIncludes'=>Array('./js/wui.js', ++ 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/wui.js', + './js/BackendManagement.js', + './js/ajax.js'), 'extHeader'=>Array(''), 'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'), 'languageRoot' => 'wui:backendManagement'); -diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiBackgroundManagement.php nagvis-1.2.2/wui/includes/classes/WuiBackgroundManagement.php ---- nagvis-1.2.2~/wui/includes/classes/WuiBackgroundManagement.php 2007-10-03 15:33:09.000000000 +0200 -+++ nagvis-1.2.2/wui/includes/classes/WuiBackgroundManagement.php 2008-03-18 18:00:30.000000000 +0100 -@@ -26,10 +26,10 @@ +diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiBackgroundManagement.php nagvis-1.3.1/wui/includes/classes/WuiBackgroundManagement.php +--- nagvis-1.3.1~/wui/includes/classes/WuiBackgroundManagement.php 2008-05-01 17:18:59.000000000 +0000 ++++ nagvis-1.3.1/wui/includes/classes/WuiBackgroundManagement.php 2008-09-27 12:52:10.000000000 +0000 +@@ -46,10 +46,10 @@ $this->LANG = new GlobalLanguage($MAINCFG,'wui:backgroundManagement'); $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'), - 'cssIncludes'=>Array('./includes/css/wui.css'), -- 'jsIncludes'=>Array('./includes/js/BackgroundManagement.js', +- 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/BackgroundManagement.js', - './includes/js/ajax.js', - './includes/js/wui.js'), + 'cssIncludes'=>Array('./css/wui.css'), -+ 'jsIncludes'=>Array('./js/BackgroundManagement.js', ++ 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/BackgroundManagement.js', + './js/ajax.js', + './js/wui.js'), 'extHeader'=>Array(''), 'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'), 'languageRoot' => 'wui:backgroundManagement'); -diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiEditMainCfg.php nagvis-1.2.2/wui/includes/classes/WuiEditMainCfg.php ---- nagvis-1.2.2~/wui/includes/classes/WuiEditMainCfg.php 2007-10-19 17:07:30.000000000 +0200 -+++ nagvis-1.2.2/wui/includes/classes/WuiEditMainCfg.php 2008-03-18 18:00:30.000000000 +0100 -@@ -23,8 +23,8 @@ +diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiEditMainCfg.php nagvis-1.3.1/wui/includes/classes/WuiEditMainCfg.php +--- nagvis-1.3.1~/wui/includes/classes/WuiEditMainCfg.php 2008-05-01 19:33:17.000000000 +0000 ++++ nagvis-1.3.1/wui/includes/classes/WuiEditMainCfg.php 2008-09-27 12:52:10.000000000 +0000 +@@ -43,8 +43,8 @@ $this->LANG = new GlobalLanguage($MAINCFG,'wui:editMainCfg'); $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'), - 'cssIncludes'=>Array('./includes/css/wui.css'), -- 'jsIncludes'=>Array('./includes/js/wui.js'), +- 'jsIncludes'=>Array('./includes/js/wui.js','./includes/js/EditMainCfg.js'), + 'cssIncludes'=>Array('./css/wui.css'), -+ 'jsIncludes'=>Array('./js/wui.js'), ++ 'jsIncludes'=>Array('./js/wui.js','./js/EditMainCfg.js'), 'extHeader'=>Array(''), 'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'), 'languageRoot' => 'wui:editMainCfg'); -diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiFrontend.php nagvis-1.2.2/wui/includes/classes/WuiFrontend.php ---- nagvis-1.2.2~/wui/includes/classes/WuiFrontend.php 2007-10-03 14:13:56.000000000 +0200 -+++ nagvis-1.2.2/wui/includes/classes/WuiFrontend.php 2008-03-18 18:00:30.000000000 +0100 -@@ -24,13 +24,13 @@ +diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiFrontend.php nagvis-1.3.1/wui/includes/classes/WuiFrontend.php +--- nagvis-1.3.1~/wui/includes/classes/WuiFrontend.php 2008-05-18 20:53:20.000000000 +0000 ++++ nagvis-1.3.1/wui/includes/classes/WuiFrontend.php 2008-09-27 12:52:10.000000000 +0000 +@@ -44,13 +44,13 @@ $this->LANG = new GlobalLanguage($this->MAINCFG,'wui:global'); $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'), - 'cssIncludes'=>Array('../nagvis/includes/css/style.css','./includes/css/wui.css','./includes/css/office_xp/office_xp.css'), -- 'jsIncludes'=>Array('./includes/js/wui.js', +- 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/wui.js', - './includes/js/ajax.js', - './includes/js/jsdomenu.js', - './includes/js/jsdomenu.inc.js', - './includes/js/wz_jsgraphics.js', - './includes/js/wz_dragdrop.js'), + 'cssIncludes'=>Array('../nagvis/includes/css/style.css','./css/wui.css','./css/office_xp/office_xp.css'), -+ 'jsIncludes'=>Array('./js/wui.js', ++ 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/wui.js', + './js/ajax.js', + './js/jsdomenu.js', + './js/jsdomenu.inc.js', @@ -378,69 +487,73 @@ diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiFrontend.php nagvis-1.2.2/wui/ 'extHeader'=>Array(""), 'allowedUsers' => $this->MAPCFG->getValue('global', 0,'allowed_for_config'), 'languageRoot' => 'wui:global'); -diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiMap.php nagvis-1.2.2/wui/includes/classes/WuiMap.php ---- nagvis-1.2.2~/wui/includes/classes/WuiMap.php 2008-01-28 22:33:19.000000000 +0100 -+++ nagvis-1.2.2/wui/includes/classes/WuiMap.php 2008-03-18 18:00:30.000000000 +0100 -@@ -126,7 +126,7 @@ +diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiMap.php nagvis-1.3.1/wui/includes/classes/WuiMap.php +--- nagvis-1.3.1~/wui/includes/classes/WuiMap.php 2008-05-01 20:33:58.000000000 +0000 ++++ nagvis-1.3.1/wui/includes/classes/WuiMap.php 2008-09-27 12:52:10.000000000 +0000 +@@ -144,7 +144,7 @@ $ret = array_merge($ret,$this->parseObjects()); $ret = array_merge($ret,$this->parseInvisible()); $ret = array_merge($ret,$this->makeObjectsMoveable()); - $ret = array_merge($ret,Array("")); + $ret = array_merge($ret,Array("")); - if (DEBUG&&DEBUGLEVEL&1) debug('End method WuiMap::parseMap(): Array(HTML)'); return $ret; -diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiMapManagement.php nagvis-1.2.2/wui/includes/classes/WuiMapManagement.php ---- nagvis-1.2.2~/wui/includes/classes/WuiMapManagement.php 2007-10-03 14:13:56.000000000 +0200 -+++ nagvis-1.2.2/wui/includes/classes/WuiMapManagement.php 2008-03-18 18:00:30.000000000 +0100 -@@ -29,10 +29,10 @@ + } +diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiMapManagement.php nagvis-1.3.1/wui/includes/classes/WuiMapManagement.php +--- nagvis-1.3.1~/wui/includes/classes/WuiMapManagement.php 2008-05-01 17:18:59.000000000 +0000 ++++ nagvis-1.3.1/wui/includes/classes/WuiMapManagement.php 2008-09-27 12:52:10.000000000 +0000 +@@ -49,10 +49,10 @@ $this->LANG = new GlobalLanguage($MAINCFG,'wui:mapManagement'); $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'), - 'cssIncludes'=>Array('./includes/css/wui.css'), -- 'jsIncludes'=>Array('./includes/js/map_management.js', +- 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/map_management.js', - './includes/js/ajax.js', - './includes/js/wui.js'), + 'cssIncludes'=>Array('./css/wui.css'), -+ 'jsIncludes'=>Array('./js/map_management.js', ++ 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/map_management.js', + './js/ajax.js', + './js/wui.js'), 'extHeader'=>Array(''), 'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'), 'languageRoot' => 'wui:mapManagement'); -diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiShapeManagement.php nagvis-1.2.2/wui/includes/classes/WuiShapeManagement.php ---- nagvis-1.2.2~/wui/includes/classes/WuiShapeManagement.php 2007-10-03 14:13:56.000000000 +0200 -+++ nagvis-1.2.2/wui/includes/classes/WuiShapeManagement.php 2008-03-18 18:00:30.000000000 +0100 -@@ -21,10 +21,10 @@ +diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiShapeManagement.php nagvis-1.3.1/wui/includes/classes/WuiShapeManagement.php +--- nagvis-1.3.1~/wui/includes/classes/WuiShapeManagement.php 2008-05-01 17:18:59.000000000 +0000 ++++ nagvis-1.3.1/wui/includes/classes/WuiShapeManagement.php 2008-09-27 12:52:10.000000000 +0000 +@@ -47,10 +47,10 @@ $this->LANG = new GlobalLanguage($MAINCFG,'wui:shapeManagement'); $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'), - 'cssIncludes'=>Array('./includes/css/wui.css'), -- 'jsIncludes'=>Array('./includes/js/ShapeManagement.js', +- 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/ShapeManagement.js', - './includes/js/ajax.js', - './includes/js/wui.js'), + 'cssIncludes'=>Array('./css/wui.css'), -+ 'jsIncludes'=>Array('./js/ShapeManagement.js', ++ 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/ShapeManagement.js', + './js/ajax.js', + './js/wui.js'), 'extHeader'=>Array(''), 'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'), 'languageRoot' => 'wui:shapeManagement'); -diff -urNad nagvis-1.2.2~/wui/index.php nagvis-1.2.2/wui/index.php ---- nagvis-1.2.2~/wui/index.php 2007-10-20 16:28:44.000000000 +0200 -+++ nagvis-1.2.2/wui/index.php 2008-03-18 18:00:30.000000000 +0100 -@@ -14,21 +14,21 @@ - +diff -urNad nagvis-1.3.1~/wui/index.php nagvis-1.3.1/wui/index.php +--- nagvis-1.3.1~/wui/index.php 2008-06-06 11:19:25.000000000 +0000 ++++ nagvis-1.3.1/wui/index.php 2008-09-27 12:52:10.000000000 +0000 +@@ -29,25 +29,25 @@ @session_start(); + // Include defines -require("../nagvis/includes/defines/global.php"); -require("../nagvis/includes/defines/matches.php"); +require("/usr/share/nagvis/includes/defines/global.php"); +require("/usr/share/nagvis/includes/defines/matches.php"); + // Include functions -require("../nagvis/includes/functions/debug.php"); +-require("../nagvis/includes/functions/oldPhpVersionFixes.php"); +require("/usr/share/nagvis/includes/functions/debug.php"); ++require("/usr/share/nagvis/includes/functions/oldPhpVersionFixes.php"); + // Include needed global classes -require("../nagvis/includes/classes/GlobalMainCfg.php"); -require("../nagvis/includes/classes/GlobalMapCfg.php"); -require("../nagvis/includes/classes/GlobalLanguage.php"); @@ -456,59 +569,69 @@ diff -urNad nagvis-1.2.2~/wui/index.php nagvis-1.2.2/wui/index.php +require("/usr/share/nagvis/includes/classes/GlobalBackground.php"); +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php"); + // Include needed wui specific classes -require("./includes/classes/WuiMainCfg.php"); -require("./includes/classes/WuiMapCfg.php"); +require("/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php"); +require("/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php"); + // Load the main configuration $MAINCFG = new WuiMainCfg(CONST_MAINCFG); - -@@ -40,40 +40,40 @@ - // Display the wanted page, if nothing is set, display the map +@@ -61,8 +61,8 @@ switch($_GET['page']) { case 'edit_config': + // Include page specific global/wui classes - require("../nagvis/includes/classes/GlobalForm.php"); - require("./includes/classes/WuiEditMainCfg.php"); + require("/usr/share/nagvis/includes/classes/GlobalForm.php"); -+ require("/usr/share/nagvis/wui//includes/classes/WuiEditMainCfg.php"); ++ require("/usr/share/nagvis/wui/includes/classes/WuiEditMainCfg.php"); $FRONTEND = new WuiEditMainCfg($MAINCFG); $FRONTEND->getForm(); - $FRONTEND->printPage(); +@@ -70,40 +70,40 @@ break; case 'shape_management': + // Include page specific global/wui classes - require("../nagvis/includes/classes/GlobalForm.php"); - require("./includes/classes/WuiShapeManagement.php"); + require("/usr/share/nagvis/includes/classes/GlobalForm.php"); + require("/usr/share/nagvis/wui/includes/classes/WuiShapeManagement.php"); + $FRONTEND = new WuiShapeManagement($MAINCFG); $FRONTEND->getForm(); break; case 'background_management': + // Include page specific global/wui classes - require("../nagvis/includes/classes/GlobalForm.php"); - require("./includes/classes/WuiBackgroundManagement.php"); + require("/usr/share/nagvis/includes/classes/GlobalForm.php"); + require("/usr/share/nagvis/wui/includes/classes/WuiBackgroundManagement.php"); + $FRONTEND = new WuiBackgroundManagement($MAINCFG); $FRONTEND->getForm(); break; case 'map_management': + // Include page specific global/wui classes - require("../nagvis/includes/classes/GlobalForm.php"); - require("./includes/classes/WuiMapManagement.php"); + require("/usr/share/nagvis/includes/classes/GlobalForm.php"); + require("/usr/share/nagvis/wui/includes/classes/WuiMapManagement.php"); + $FRONTEND = new WuiMapManagement($MAINCFG); $FRONTEND->getForm(); break; case 'backend_management': + // Include page specific global/wui classes - require("../nagvis/includes/classes/GlobalForm.php"); - require("./includes/classes/WuiBackendManagement.php"); + require("/usr/share/nagvis/includes/classes/GlobalForm.php"); + require("/usr/share/nagvis/wui/includes/classes/WuiBackendManagement.php"); + $FRONTEND = new WuiBackendManagement($MAINCFG); $FRONTEND->getForm(); break; case 'addmodify': + // Include page specific global/wui classes - require("../nagvis/includes/classes/GlobalForm.php"); - require("./includes/classes/WuiAddModify.php"); + require("/usr/share/nagvis/includes/classes/GlobalForm.php"); @@ -516,14 +639,14 @@ diff -urNad nagvis-1.2.2~/wui/index.php nagvis-1.2.2/wui/index.php $MAPCFG = new WuiMapCfg($MAINCFG,$_GET['map']); $MAPCFG->readMapConfig(); -@@ -92,8 +92,8 @@ - $FRONTEND->getForm(); - break; - default: +@@ -125,8 +125,8 @@ + // Default is the wui map + + // Include page specific global/wui classes - require("./includes/classes/WuiFrontend.php"); - require("./includes/classes/WuiMap.php"); + require("/usr/share/nagvis/wui/includes/classes/WuiFrontend.php"); + require("/usr/share/nagvis/wui/includes/classes/WuiMap.php"); + // Set empty map if none is set if(!isset($_GET['map'])) { - $_GET['map'] = ''; diff --git a/debian/postinst b/debian/postinst index c40784c..761d1b2 100644 --- a/debian/postinst +++ b/debian/postinst @@ -48,11 +48,12 @@ case "$1" in test -d $f && setperm www-data www-data 0755 $f done setperm www-data www-data 0775 /usr/share/nagvis/htdocs/nagvis/etc/maps + setperm www-data www-data 0755 /var/lib/nagvis ucf /usr/share/nagvis/debian/apache.conf /etc/nagvis/apache.conf - if [ ! -f /etc/apache2/conf.d/nagvis.conf ]; then - ln -s /etc/nagvis/apache.conf /etc/apache2/conf.d/nagvis.conf - fi + #if [ ! -f /etc/apache2/conf.d/nagvis.conf ]; then + # ln -s /etc/nagvis/apache.conf /etc/apache2/conf.d/nagvis.conf + #fi ;; -- 2.30.2