tags 545680 + patch thanks Dear maintainer,
In accordance with Developer Reference 5.11.1 I've prepared an NMU for nagvis (versioned as 1:1.3.1-3.1) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. The attached patch is bit confusing, as dpatch seems have updates some timestamps. As it is dpatch's default behavious I left it the way it is. The patch actually only fixes ajax_handler.php as show in the inital mail. Best Regards, Alexander
diff -u nagvis-1.3.1/debian/changelog nagvis-1.3.1/debian/changelog
--- nagvis-1.3.1/debian/changelog
+++ nagvis-1.3.1/debian/changelog
@@ -1,3 +1,11 @@
+nagvis (1:1.3.1-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Updated debian/patches/patchname.dpatch to include some more includes
+ in ajax_handler.php and wui/form_handler.php (Closes: #545680)
+
+ -- Alexander Reichle-Schmehl <toli...@debian.org> Mon, 01 Feb 2010 11:33:49 +0100
+
nagvis (1:1.3.1-3) unstable; urgency=low
* adjust pathnames.dpatch to form_handler.php from correct location, thanks
diff -u nagvis-1.3.1/debian/patches/pathnames.dpatch nagvis-1.3.1/debian/patches/pathnames.dpatch
--- nagvis-1.3.1/debian/patches/pathnames.dpatch
+++ nagvis-1.3.1/debian/patches/pathnames.dpatch
@@ -6,8 +6,8 @@
@DPATCH@
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
+--- nagvis-1.3.1~/etc/nagvis.ini.php-sample 2008-06-04 19:57:06.000000000 +0200
++++ nagvis-1.3.1/etc/nagvis.ini.php-sample 2010-02-01 11:32:05.000000000 +0100
@@ -84,11 +84,11 @@
; path options
[paths]
@@ -32,9 +32,89 @@
; map rotation pools
; in this example the browser switches between the maps demo and demo2 every 15
+diff -urNad nagvis-1.3.1~/nagvis/ajax_handler.php nagvis-1.3.1/nagvis/ajax_handler.php
+--- nagvis-1.3.1~/nagvis/ajax_handler.php 2008-06-11 23:16:17.000000000 +0200
++++ nagvis-1.3.1/nagvis/ajax_handler.php 2010-02-01 11:33:06.000000000 +0100
+@@ -26,45 +26,45 @@
+ @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("./includes/functions/getuser.php");
++require("/usr/share/nagvis/includes/functions/debug.php");
++require("/usr/share/nagvis/includes/functions/oldPhpVersionFixes.php");
++require("/usr/share/nagvis/includes/functions/getuser.php");
+
+ // Include needed global classes
+-require("./includes/classes/GlobalMainCfg.php");
+-require("./includes/classes/GlobalMapCfg.php");
+-require("./includes/classes/GlobalLanguage.php");
+-require("./includes/classes/GlobalPage.php");
+-require("./includes/classes/GlobalMap.php");
+-require("./includes/classes/GlobalBackground.php");
+-require("./includes/classes/GlobalGraphic.php");
+-require("./includes/classes/GlobalBackendMgmt.php");
++require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
++require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
++require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
++require("/usr/share/nagvis/includes/classes/GlobalPage.php");
++require("/usr/share/nagvis/includes/classes/GlobalMap.php");
++require("/usr/share/nagvis/includes/classes/GlobalBackground.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");
+
+ /**
+ * This is a coustom error handling function for submitting PHP errors to the
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
+--- nagvis-1.3.1~/nagvis/draw.php 2008-06-05 23:11:33.000000000 +0200
++++ nagvis-1.3.1/nagvis/draw.php 2010-02-01 11:32:05.000000000 +0100
@@ -27,43 +27,43 @@
@session_start();
@@ -109,8 +189,8 @@
// Load the main configuration
$MAINCFG = new GlobalMainCfg(CONST_MAINCFG);
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
+--- nagvis-1.3.1~/nagvis/includes/classes/GlobalMainCfg.php 2008-08-13 21:45:26.000000000 +0200
++++ nagvis-1.3.1/nagvis/includes/classes/GlobalMainCfg.php 2010-02-01 11:32:05.000000000 +0100
@@ -173,7 +173,7 @@
'match' => MATCH_STRING_PATH),
'var' => Array('must' => 0,
@@ -221,8 +301,8 @@
$this->validConfig['paths']['htmlheadertemplateimages']['default'] = $this->validConfig['paths']['htmlimages']['default'].'templates/header/';
$this->validConfig['paths']['htmlicon']['default'] = $htmlBase.'/nagvis/images/iconsets/';
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
+--- nagvis-1.3.1~/nagvis/includes/defines/global.php 2008-08-22 21:01:15.000000000 +0200
++++ nagvis-1.3.1/nagvis/includes/defines/global.php 2010-02-01 11:32:05.000000000 +0100
@@ -37,13 +37,13 @@
define('DEBUGLEVEL', 4);
@@ -240,8 +320,8 @@
// 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
+--- nagvis-1.3.1~/nagvis/index.php 2008-06-05 23:11:33.000000000 +0200
++++ nagvis-1.3.1/nagvis/index.php 2010-02-01 11:32:05.000000000 +0100
@@ -26,44 +26,44 @@
@session_start();
@@ -318,8 +398,8 @@
// Load the main configuration
$MAINCFG = new GlobalMainCfg(CONST_MAINCFG);
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
+--- nagvis-1.3.1~/wui/ajax_handler.php 2008-03-29 02:01:07.000000000 +0100
++++ nagvis-1.3.1/wui/ajax_handler.php 2010-02-01 11:32:05.000000000 +0100
@@ -29,22 +29,22 @@
@session_start();
@@ -354,8 +434,8 @@
// Load the main configuration
$MAINCFG = new WuiMainCfg(CONST_MAINCFG);
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
+--- nagvis-1.3.1~/wui/form_handler.php 2008-03-29 02:01:07.000000000 +0100
++++ nagvis-1.3.1/wui/form_handler.php 2010-02-01 11:33:40.000000000 +0100
@@ -29,26 +29,26 @@
@session_start();
@@ -395,9 +475,27 @@
// Load the main configuration
$MAINCFG = new WuiMainCfg(CONST_MAINCFG);
+@@ -635,7 +635,7 @@
+ } else {
+ // Include page specific global/wui classes
+ require("../nagvis/includes/classes/GlobalForm.php");
+- require("./includes/classes/WuiShapeManagement.php");
++ require("/usr/share/nagvis/includes/classes/WuiShapeManagement.php");
+
+ $FRONTEND = new WuiShapeManagement($MAINCFG);
+ $FRONTEND->uploadShape($_FILES['shape_image']);
+@@ -652,7 +652,7 @@
+ } else {
+ // Include page specific global/wui classes
+ require("../nagvis/includes/classes/GlobalForm.php");
+- require("./includes/classes/WuiShapeManagement.php");
++ require("/usr/share/nagvis/includes/classes/WuiShapeManagement.php");
+
+ $FRONTEND = new WuiShapeManagement($MAINCFG);
+ $FRONTEND->deleteShape($_POST['shape_image']);
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
+--- nagvis-1.3.1~/wui/includes/classes/WuiAddModify.php 2008-05-23 11:15:21.000000000 +0200
++++ nagvis-1.3.1/wui/includes/classes/WuiAddModify.php 2010-02-01 11:32:05.000000000 +0100
@@ -51,10 +51,10 @@
$this->LANG = new GlobalLanguage($MAINCFG,'wui:addModify');
@@ -414,8 +512,8 @@
'allowedUsers' => Array('EVERYONE'));
parent::GlobalPage($MAINCFG,$prop,'wui:addModify');
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
+--- nagvis-1.3.1~/wui/includes/classes/WuiBackendManagement.php 2008-05-01 19:18:59.000000000 +0200
++++ nagvis-1.3.1/wui/includes/classes/WuiBackendManagement.php 2010-02-01 11:32:05.000000000 +0100
@@ -48,10 +48,10 @@
$this->LANG = new GlobalLanguage($MAINCFG,'wui:backendManagement');
@@ -432,8 +530,8 @@
'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
'languageRoot' => 'wui:backendManagement');
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
+--- nagvis-1.3.1~/wui/includes/classes/WuiBackgroundManagement.php 2008-05-01 19:18:59.000000000 +0200
++++ nagvis-1.3.1/wui/includes/classes/WuiBackgroundManagement.php 2010-02-01 11:32:05.000000000 +0100
@@ -46,10 +46,10 @@
$this->LANG = new GlobalLanguage($MAINCFG,'wui:backgroundManagement');
@@ -450,8 +548,8 @@
'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
'languageRoot' => 'wui:backgroundManagement');
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
+--- nagvis-1.3.1~/wui/includes/classes/WuiEditMainCfg.php 2008-05-01 21:33:17.000000000 +0200
++++ nagvis-1.3.1/wui/includes/classes/WuiEditMainCfg.php 2010-02-01 11:32:05.000000000 +0100
@@ -43,8 +43,8 @@
$this->LANG = new GlobalLanguage($MAINCFG,'wui:editMainCfg');
@@ -464,8 +562,8 @@
'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
'languageRoot' => 'wui:editMainCfg');
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
+--- nagvis-1.3.1~/wui/includes/classes/WuiFrontend.php 2008-05-18 22:53:20.000000000 +0200
++++ nagvis-1.3.1/wui/includes/classes/WuiFrontend.php 2010-02-01 11:32:05.000000000 +0100
@@ -44,13 +44,13 @@
$this->LANG = new GlobalLanguage($this->MAINCFG,'wui:global');
@@ -488,8 +586,8 @@
'allowedUsers' => $this->MAPCFG->getValue('global', 0,'allowed_for_config'),
'languageRoot' => 'wui:global');
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
+--- nagvis-1.3.1~/wui/includes/classes/WuiMap.php 2008-05-01 22:33:58.000000000 +0200
++++ nagvis-1.3.1/wui/includes/classes/WuiMap.php 2010-02-01 11:32:05.000000000 +0100
@@ -144,7 +144,7 @@
$ret = array_merge($ret,$this->parseObjects());
$ret = array_merge($ret,$this->parseInvisible());
@@ -500,8 +598,8 @@
return $ret;
}
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
+--- nagvis-1.3.1~/wui/includes/classes/WuiMapManagement.php 2008-05-01 19:18:59.000000000 +0200
++++ nagvis-1.3.1/wui/includes/classes/WuiMapManagement.php 2010-02-01 11:32:05.000000000 +0100
@@ -49,10 +49,10 @@
$this->LANG = new GlobalLanguage($MAINCFG,'wui:mapManagement');
@@ -518,8 +616,8 @@
'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
'languageRoot' => 'wui:mapManagement');
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
+--- nagvis-1.3.1~/wui/includes/classes/WuiShapeManagement.php 2008-05-01 19:18:59.000000000 +0200
++++ nagvis-1.3.1/wui/includes/classes/WuiShapeManagement.php 2010-02-01 11:32:05.000000000 +0100
@@ -47,10 +47,10 @@
$this->LANG = new GlobalLanguage($MAINCFG,'wui:shapeManagement');
@@ -536,8 +634,8 @@
'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
'languageRoot' => 'wui:shapeManagement');
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
+--- nagvis-1.3.1~/wui/index.php 2008-06-06 13:19:25.000000000 +0200
++++ nagvis-1.3.1/wui/index.php 2010-02-01 11:32:05.000000000 +0100
@@ -29,25 +29,25 @@
@session_start();
signature.asc
Description: Digital signature
