debian/patches/pathnames.dpatch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## pathnames.dpatch by  <hfrenzel@scunc.net>
   3 ##
   4 ## All lines beginning with `## DP:' are a description of the patch.
   5 ## DP: No description.
   6
   7 @DPATCH@
   8 diff -urNad nagvis-1.3.1~/etc/nagvis.ini.php-sample nagvis-1.3.1/etc/nagvis.ini.php-sample
   9 --- nagvis-1.3.1~/etc/nagvis.ini.php-sample     2008-06-04 19:57:06.000000000 +0200
  10 +++ nagvis-1.3.1/etc/nagvis.ini.php-sample      2009-08-23 12:52:15.000000000 +0200
  11 @@ -84,11 +84,11 @@
  12  ; path options
  13  [paths]
  14  ; absolute physical NagVis path
  15 -;base="/usr/local/nagios/share/nagvis/"
  16 +;base="/usr/share/nagvis/"
  17  ; absolute html NagVis path
  18 -;htmlbase="/nagios/nagvis"
  19 +;htmlbase="/nagios3/nagvis"
  20  ; absolute html NagVis cgi path
  21 -;htmlcgi="/nagios/cgi-bin"
  22 +;htmlcgi="/nagios3/cgi-bin"
  23
  24  ; options for the NDO-Backend
  25  ; in this example the ID of the Backend is "ndomy_1" you can define another ID.
  26 @@ -112,7 +112,7 @@
  27  ; maximum delay of the NDO Database in Seconds
  28  ;maxtimewithoutupdate=180
  29  ; path to the cgi-bin of this backend
  30 -;htmlcgi="/nagios/cgi-bin"
  31 +;htmlcgi="/nagios3/cgi-bin"
  32
  33  ; map rotation pools
  34  ; in this example the browser switches between the maps demo and demo2 every 15
  35 diff -urNad nagvis-1.3.1~/nagvis/ajax_handler.php nagvis-1.3.1/nagvis/ajax_handler.php
  36 --- nagvis-1.3.1~/nagvis/ajax_handler.php       2008-06-11 23:16:17.000000000 +0200
  37 +++ nagvis-1.3.1/nagvis/ajax_handler.php        2009-08-23 12:53:44.000000000 +0200
  38 @@ -26,45 +26,45 @@
  39  @session_start();
  40
  41  // Include defines
  42 -require("./includes/defines/global.php");
  43 -require("./includes/defines/matches.php");
  44 +require("/usr/share/nagvis/includes/defines/global.php");
  45 +require("/usr/share/nagvis/includes/defines/matches.php");
  46
  47  // Include functions
  48 -require("./includes/functions/debug.php");
  49 -require("./includes/functions/oldPhpVersionFixes.php");
  50 -require("./includes/functions/getuser.php");
  51 +require("/usr/share/nagvis/includes/functions/debug.php");
  52 +require("/usr/share/nagvis/includes/functions/oldPhpVersionFixes.php");
  53 +require("/usr/share/nagvis/includes/functions/getuser.php");
  54
  55  // Include needed global classes
  56 -require("./includes/classes/GlobalMainCfg.php");
  57 -require("./includes/classes/GlobalMapCfg.php");
  58 -require("./includes/classes/GlobalLanguage.php");
  59 -require("./includes/classes/GlobalPage.php");
  60 -require("./includes/classes/GlobalMap.php");
  61 -require("./includes/classes/GlobalBackground.php");
  62 -require("./includes/classes/GlobalGraphic.php");
  63 -require("./includes/classes/GlobalBackendMgmt.php");
  64 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
  65 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
  66 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
  67 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
  68 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
  69 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
  70 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
  71 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
  72
  73  // Include needed nagvis classes
  74 -require("./includes/classes/NagVisMapCfg.php");
  75 -require("./includes/classes/NagVisMap.php");
  76 -require("./includes/classes/NagVisFrontend.php");
  77 -require("./includes/classes/NagVisAutoMap.php");
  78 +require("/usr/share/nagvis/includes/classes/NagVisMapCfg.php");
  79 +require("/usr/share/nagvis/includes/classes/NagVisMap.php");
  80 +require("/usr/share/nagvis/includes/classes/NagVisFrontend.php");
  81 +require("/usr/share/nagvis/includes/classes/NagVisAutoMap.php");
  82
  83  // Include needed nagvis object classes
  84 -require("./includes/classes/objects/NagVisObject.php");
  85 -require("./includes/classes/objects/NagVisStatefulObject.php");
  86 -require("./includes/classes/objects/NagVisStatelessObject.php");
  87 -require("./includes/classes/objects/NagiosHost.php");
  88 -require("./includes/classes/objects/NagVisHost.php");
  89 -require("./includes/classes/objects/NagiosService.php");
  90 -require("./includes/classes/objects/NagVisService.php");
  91 -require("./includes/classes/objects/NagiosHostgroup.php");
  92 -require("./includes/classes/objects/NagVisHostgroup.php");
  93 -require("./includes/classes/objects/NagiosServicegroup.php");
  94 -require("./includes/classes/objects/NagVisServicegroup.php");
  95 -require("./includes/classes/objects/NagVisMapObj.php");
  96 -require("./includes/classes/objects/NagVisShape.php");
  97 -require("./includes/classes/objects/NagVisTextbox.php");
  98 +require("/usr/share/nagvis/includes/classes/objects/NagVisObject.php");
  99 +require("/usr/share/nagvis/includes/classes/objects/NagVisStatefulObject.php");
 100 +require("/usr/share/nagvis/includes/classes/objects/NagVisStatelessObject.php");
 101 +require("/usr/share/nagvis/includes/classes/objects/NagiosHost.php");
 102 +require("/usr/share/nagvis/includes/classes/objects/NagVisHost.php");
 103 +require("/usr/share/nagvis/includes/classes/objects/NagiosService.php");
 104 +require("/usr/share/nagvis/includes/classes/objects/NagVisService.php");
 105 +require("/usr/share/nagvis/includes/classes/objects/NagiosHostgroup.php");
 106 +require("/usr/share/nagvis/includes/classes/objects/NagVisHostgroup.php");
 107 +require("/usr/share/nagvis/includes/classes/objects/NagiosServicegroup.php");
 108 +require("/usr/share/nagvis/includes/classes/objects/NagVisServicegroup.php");
 109 +require("/usr/share/nagvis/includes/classes/objects/NagVisMapObj.php");
 110 +require("/usr/share/nagvis/includes/classes/objects/NagVisShape.php");
 111 +require("/usr/share/nagvis/includes/classes/objects/NagVisTextbox.php");
 112
 113  /**
 114   * This is a coustom error handling function for submitting PHP errors to the
 115 diff -urNad nagvis-1.3.1~/nagvis/draw.php nagvis-1.3.1/nagvis/draw.php
 116 --- nagvis-1.3.1~/nagvis/draw.php       2008-06-05 23:11:33.000000000 +0200
 117 +++ nagvis-1.3.1/nagvis/draw.php        2009-08-23 12:52:15.000000000 +0200
 118 @@ -27,43 +27,43 @@
 119  @session_start();
 120
 121  // Include defines
 122 -require("./includes/defines/global.php");
 123 -require("./includes/defines/matches.php");
 124 +require("/usr/share/nagvis/includes/defines/global.php");
 125 +require("/usr/share/nagvis/includes/defines/matches.php");
 126
 127  // Include defines
 128 -require("./includes/functions/debug.php");
 129 -require("./includes/functions/oldPhpVersionFixes.php");
 130 +require("/usr/share/nagvis/includes/functions/debug.php");
 131 +require("/usr/share/nagvis/includes/functions/oldPhpVersionFixes.php");
 132
 133  // Include needed global classes
 134 -require("./includes/classes/GlobalGraphic.php");
 135 -require("./includes/classes/GlobalMainCfg.php");
 136 -require("./includes/classes/GlobalMapCfg.php");
 137 -require("./includes/classes/GlobalMap.php");
 138 -require("./includes/classes/GlobalPage.php");
 139 -require("./includes/classes/GlobalBackground.php");
 140 -require("./includes/classes/GlobalLanguage.php");
 141 -require("./includes/classes/GlobalBackendMgmt.php");
 142 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
 143 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
 144 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
 145 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
 146 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
 147 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
 148 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
 149 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
 150
 151  // Include needed frontend classes
 152 -require("./includes/classes/NagVisMap.php");
 153 -require("./includes/classes/NagVisBackground.php");
 154 -require("./includes/classes/NagVisMapCfg.php");
 155 +require("/usr/share/nagvis/includes/classes/NagVisMap.php");
 156 +require("/usr/share/nagvis/includes/classes/NagVisBackground.php");
 157 +require("/usr/share/nagvis/includes/classes/NagVisMapCfg.php");
 158
 159  // Include needed object classes
 160 -require("./includes/classes/objects/NagVisObject.php");
 161 -require("./includes/classes/objects/NagVisStatefulObject.php");
 162 -require("./includes/classes/objects/NagVisStatelessObject.php");
 163 -require("./includes/classes/objects/NagiosHost.php");
 164 -require("./includes/classes/objects/NagVisHost.php");
 165 -require("./includes/classes/objects/NagiosService.php");
 166 -require("./includes/classes/objects/NagVisService.php");
 167 -require("./includes/classes/objects/NagiosHostgroup.php");
 168 -require("./includes/classes/objects/NagVisHostgroup.php");
 169 -require("./includes/classes/objects/NagiosServicegroup.php");
 170 -require("./includes/classes/objects/NagVisServicegroup.php");
 171 -require("./includes/classes/objects/NagVisMapObj.php");
 172 -require("./includes/classes/objects/NagVisShape.php");
 173 -require("./includes/classes/objects/NagVisTextbox.php");
 174 +require("/usr/share/nagvis/includes/classes/objects/NagVisObject.php");
 175 +require("/usr/share/nagvis/includes/classes/objects/NagVisStatefulObject.php");
 176 +require("/usr/share/nagvis/includes/classes/objects/NagVisStatelessObject.php");
 177 +require("/usr/share/nagvis/includes/classes/objects/NagiosHost.php");
 178 +require("/usr/share/nagvis/includes/classes/objects/NagVisHost.php");
 179 +require("/usr/share/nagvis/includes/classes/objects/NagiosService.php");
 180 +require("/usr/share/nagvis/includes/classes/objects/NagVisService.php");
 181 +require("/usr/share/nagvis/includes/classes/objects/NagiosHostgroup.php");
 182 +require("/usr/share/nagvis/includes/classes/objects/NagVisHostgroup.php");
 183 +require("/usr/share/nagvis/includes/classes/objects/NagiosServicegroup.php");
 184 +require("/usr/share/nagvis/includes/classes/objects/NagVisServicegroup.php");
 185 +require("/usr/share/nagvis/includes/classes/objects/NagVisMapObj.php");
 186 +require("/usr/share/nagvis/includes/classes/objects/NagVisShape.php");
 187 +require("/usr/share/nagvis/includes/classes/objects/NagVisTextbox.php");
 188
 189  // Load the main configuration
 190  $MAINCFG = new GlobalMainCfg(CONST_MAINCFG);
 191 diff -urNad nagvis-1.3.1~/nagvis/includes/classes/GlobalMainCfg.php nagvis-1.3.1/nagvis/includes/classes/GlobalMainCfg.php
 192 --- nagvis-1.3.1~/nagvis/includes/classes/GlobalMainCfg.php     2008-08-13 21:45:26.000000000 +0200
 193 +++ nagvis-1.3.1/nagvis/includes/classes/GlobalMainCfg.php      2009-08-23 12:52:15.000000000 +0200
 194 @@ -173,7 +173,7 @@
 195                                         'match' => MATCH_STRING_PATH),
 196                                 'var' => Array('must' => 0,
 197                                         'editable' => 0,
 198 -                                       'default' => '',
 199 +                                       'default' => '/var/lib/nagvis/',
 200                                         'match' => MATCH_STRING_PATH),
 201                                 'mapcfg' => Array('must' => 0,
 202                                         'editable' => 0,
 203 @@ -189,47 +189,47 @@
 204                                         'match' => MATCH_STRING_PATH),
 205                                 'htmlbase' => Array('must' => 1,
 206                                         'editable' => 1,
 207 -                                       'default' => '/nagios/nagvis',
 208 +                                       'default' => '/nagios3/nagvis',
 209                                         'match' => MATCH_STRING_PATH),
 210                                 'htmlcgi' => Array('must' => 1,
 211                                         'editable' => 1,
 212 -                                       'default' => '/nagios/cgi-bin',
 213 +                                       'default' => '/nagios3/cgi-bin',
 214                                         'match' => MATCH_STRING_URL),
 215                                 'htmlimages' => Array('must' => 0,
 216                                         'editable' => 0,
 217 -                                       'default' => '/nagios/nagvis/nagvis/images/',
 218 +                                       'default' => '/nagios3/nagvis/nagvis/images/',
 219                                         'match' => MATCH_STRING_PATH),
 220                                 'htmlhovertemplates' => Array('must' => 0,
 221                                         'editable' => 0,
 222 -                                       'default' => '/nagios/nagvis/nagvis/etc/templates/hover/',
 223 +                                       'default' => '/nagios3/nagvis/nagvis/etc/templates/hover/',
 224                                         'match' => MATCH_STRING_PATH),
 225                                 'htmlheadertemplates' => Array('must' => 0,
 226                                         'editable' => 0,
 227 -                                       'default' => '/nagios/nagvis/nagvis/etc/templates/header/',
 228 +                                       'default' => '/nagios3/nagvis/nagvis/etc/templates/header/',
 229                                         'match' => MATCH_STRING_PATH),
 230                                 'htmlhovertemplateimages' => Array('must' => 0,
 231                                         'editable' => 0,
 232 -                                       'default' => '/nagios/nagvis/nagvis/images/templates/hover/',
 233 +                                       'default' => '/nagios3/nagvis/nagvis/images/templates/hover/',
 234                                         'match' => MATCH_STRING_PATH),
 235                                 'htmlheadertemplateimages' => Array('must' => 0,
 236                                         'editable' => 0,
 237 -                                       'default' => '/nagios/nagvis/nagvis/images/templates/header/',
 238 +                                       'default' => '/nagios3/nagvis/nagvis/images/templates/header/',
 239                                         'match' => MATCH_STRING_PATH),
 240                                 'htmlicon' => Array('must' => 0,
 241                                         'editable' => 0,
 242 -                                       'default' => '/nagios/nagvis/nagvis/images/iconsets/',
 243 +                                       'default' => '/nagios3/nagvis/nagvis/images/iconsets/',
 244                                         'match' => MATCH_STRING_PATH),
 245                                 'htmlshape' => Array('must' => 0,
 246                                         'editable' => 0,
 247 -                                       'default' => '/nagios/nagvis/nagvis/images/shape/',
 248 +                                       'default' => '/nagios3/nagvis/nagvis/images/shape/',
 249                                         'match' => MATCH_STRING_PATH),
 250                                 'htmlmap' => Array('must' => 0,
 251                                         'editable' => 0,
 252 -                                       'default' => '/nagios/nagvis/nagvis/images/maps/',
 253 +                                       'default' => '/nagios3/nagvis/nagvis/images/maps/',
 254                                         'match' => MATCH_STRING_PATH),
 255                                 'htmlvar' => Array('must' => 0,
 256                                         'editable' => 0,
 257 -                                       'default' => '/nagios/var/',
 258 +                                       'default' => '/nagios3/var/',
 259                                         'match' => MATCH_STRING_PATH)),
 260                         'backend' => Array(
 261                                 'backendtype' => Array('must' => 1,
 262 @@ -288,7 +288,7 @@
 263                                                         'match' => MATCH_STRING_NO_SPACE),
 264                                                 'cgi' => Array('must' => 1,
 265                                                         'editable' => 1,
 266 -                                                       'default' => '/usr/local/nagios/sbin/',
 267 +                                                       'default' => '/usr/lib/cgi-bin/nagios3/',
 268                                                         'match' => MATCH_STRING_PATH)))),
 269                         'rotation' => Array(
 270                                 'rotationid' => Array('must' => 1,
 271 @@ -314,7 +314,7 @@
 272                                         'match' => MATCH_STRING_NO_SPACE_EMPTY),
 273                                 'graphvizpath' => Array('must' => 0,
 274                                         'editable' => 0,
 275 -                                       'default' => '/usr/local/bin/',
 276 +                                       'default' => '/usr/bin/',
 277                                         'match' => MATCH_STRING_PATH),
 278                                 'defaultparams' => Array('must' => 0,
 279                                         'editable' => 0,
 280 @@ -361,15 +361,15 @@
 281                 $this->validConfig['paths']['images']['default'] = $base.'nagvis/images/';
 282                 $this->validConfig['paths']['shape']['default'] = $base.'nagvis/images/shapes/';
 283                 $this->validConfig['paths']['language']['default'] = $base.'nagvis/includes/languages/';
 284 -               $this->validConfig['paths']['class']['default'] = $base.'nagvis/includes/classes/';
 285 +               $this->validConfig['paths']['class']['default'] = '/usr/share/nagvis/includes/classes/';
 286                 $this->validConfig['paths']['map']['default'] = $base.'nagvis/images/maps/';
 287 -               $this->validConfig['paths']['var']['default'] = $base.'var/';
 288 -               $this->validConfig['paths']['hovertemplate']['default'] = $base.'nagvis/templates/hover/';
 289 -               $this->validConfig['paths']['headertemplate']['default'] = $base.'nagvis/templates/header/';
 290 -               $this->validConfig['paths']['mapcfg']['default'] = $base.'etc/maps/';
 291 +               $this->validConfig['paths']['var']['default'] = '/var/lib/nagvis/';
 292 +               $this->validConfig['paths']['hovertemplate']['default'] = '/etc/nagvis/templates/hover/';
 293 +               $this->validConfig['paths']['headertemplate']['default'] = '/etc/nagvis/templates/header/';
 294 +               $this->validConfig['paths']['mapcfg']['default'] = $base.'nagvis/etc/maps/';
 295                 $this->validConfig['paths']['htmlimages']['default'] = $htmlBase.'/nagvis/images/';
 296 -               $this->validConfig['paths']['htmlhovertemplates']['default'] = $htmlBase.'/nagvis/templates/hover/';
 297 -               $this->validConfig['paths']['htmlheadertemplates']['default'] = $htmlBase.'/nagvis/templates/header/';
 298 +               $this->validConfig['paths']['htmlhovertemplates']['default'] = $htmlBase.'/nagvis/etc/templates/hover/';
 299 +               $this->validConfig['paths']['htmlheadertemplates']['default'] = $htmlBase.'/nagvis/etc/templates/header/';
 300                 $this->validConfig['paths']['htmlhovertemplateimages']['default'] = $this->validConfig['paths']['htmlimages']['default'].'templates/hover/';
 301                 $this->validConfig['paths']['htmlheadertemplateimages']['default'] = $this->validConfig['paths']['htmlimages']['default'].'templates/header/';
 302                 $this->validConfig['paths']['htmlicon']['default'] = $htmlBase.'/nagvis/images/iconsets/';
 303 diff -urNad nagvis-1.3.1~/nagvis/includes/defines/global.php nagvis-1.3.1/nagvis/includes/defines/global.php
 304 --- nagvis-1.3.1~/nagvis/includes/defines/global.php    2008-08-22 21:01:15.000000000 +0200
 305 +++ nagvis-1.3.1/nagvis/includes/defines/global.php     2009-08-23 12:52:15.000000000 +0200
 306 @@ -37,13 +37,13 @@
 307  define('DEBUGLEVEL', 4);
 308
 309  // Path to the debug file
 310 -define('DEBUGFILE', '../var/nagvis-debug.log');
 311 +define('DEBUGFILE', '/var/log/nagvis-debug.log');
 312
 313  // NagVis Version
 314  define('CONST_VERSION', '1.3.1');
 315
 316  // Path to the main configuration file
 317 -define('CONST_MAINCFG', '../etc/nagvis.ini.php');
 318 +define('CONST_MAINCFG', '/etc/nagvis/nagvis.ini.php');
 319
 320  // Needed minimal PHP version
 321  define('CONST_NEEDED_PHP_VERSION', '5.0');
 322 diff -urNad nagvis-1.3.1~/nagvis/index.php nagvis-1.3.1/nagvis/index.php
 323 --- nagvis-1.3.1~/nagvis/index.php      2008-06-05 23:11:33.000000000 +0200
 324 +++ nagvis-1.3.1/nagvis/index.php       2009-08-23 12:52:15.000000000 +0200
 325 @@ -26,44 +26,44 @@
 326  @session_start();
 327
 328  // Include defines
 329 -require("./includes/defines/global.php");
 330 -require("./includes/defines/matches.php");
 331 +require("/usr/share/nagvis/includes/defines/global.php");
 332 +require("/usr/share/nagvis/includes/defines/matches.php");
 333
 334  // Include functions
 335 -require("./includes/functions/debug.php");
 336 -require("./includes/functions/oldPhpVersionFixes.php");
 337 +require("/usr/share/nagvis/includes/functions/debug.php");
 338 +require("/usr/share/nagvis/includes/functions/oldPhpVersionFixes.php");
 339
 340  // Include needed global classes
 341 -require("./includes/classes/GlobalMainCfg.php");
 342 -require("./includes/classes/GlobalMapCfg.php");
 343 -require("./includes/classes/GlobalLanguage.php");
 344 -require("./includes/classes/GlobalPage.php");
 345 -require("./includes/classes/GlobalMap.php");
 346 -require("./includes/classes/GlobalBackground.php");
 347 -require("./includes/classes/GlobalGraphic.php");
 348 -require("./includes/classes/GlobalBackendMgmt.php");
 349 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
 350 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
 351 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
 352 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
 353 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
 354 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
 355 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
 356 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
 357
 358  // Include needed nagvis classes
 359 -require("./includes/classes/NagVisMapCfg.php");
 360 -require("./includes/classes/NagVisMap.php");
 361 -require("./includes/classes/NagVisFrontend.php");
 362 -require("./includes/classes/NagVisAutoMap.php");
 363 +require("/usr/share/nagvis/includes/classes/NagVisMapCfg.php");
 364 +require("/usr/share/nagvis/includes/classes/NagVisMap.php");
 365 +require("/usr/share/nagvis/includes/classes/NagVisFrontend.php");
 366 +require("/usr/share/nagvis/includes/classes/NagVisAutoMap.php");
 367
 368  // Include needed nagvis object classes
 369 -require("./includes/classes/objects/NagVisObject.php");
 370 -require("./includes/classes/objects/NagVisStatefulObject.php");
 371 -require("./includes/classes/objects/NagVisStatelessObject.php");
 372 -require("./includes/classes/objects/NagiosHost.php");
 373 -require("./includes/classes/objects/NagVisHost.php");
 374 -require("./includes/classes/objects/NagiosService.php");
 375 -require("./includes/classes/objects/NagVisService.php");
 376 -require("./includes/classes/objects/NagiosHostgroup.php");
 377 -require("./includes/classes/objects/NagVisHostgroup.php");
 378 -require("./includes/classes/objects/NagiosServicegroup.php");
 379 -require("./includes/classes/objects/NagVisServicegroup.php");
 380 -require("./includes/classes/objects/NagVisMapObj.php");
 381 -require("./includes/classes/objects/NagVisShape.php");
 382 -require("./includes/classes/objects/NagVisTextbox.php");
 383 +require("/usr/share/nagvis/includes/classes/objects/NagVisObject.php");
 384 +require("/usr/share/nagvis/includes/classes/objects/NagVisStatefulObject.php");
 385 +require("/usr/share/nagvis/includes/classes/objects/NagVisStatelessObject.php");
 386 +require("/usr/share/nagvis/includes/classes/objects/NagiosHost.php");
 387 +require("/usr/share/nagvis/includes/classes/objects/NagVisHost.php");
 388 +require("/usr/share/nagvis/includes/classes/objects/NagiosService.php");
 389 +require("/usr/share/nagvis/includes/classes/objects/NagVisService.php");
 390 +require("/usr/share/nagvis/includes/classes/objects/NagiosHostgroup.php");
 391 +require("/usr/share/nagvis/includes/classes/objects/NagVisHostgroup.php");
 392 +require("/usr/share/nagvis/includes/classes/objects/NagiosServicegroup.php");
 393 +require("/usr/share/nagvis/includes/classes/objects/NagVisServicegroup.php");
 394 +require("/usr/share/nagvis/includes/classes/objects/NagVisMapObj.php");
 395 +require("/usr/share/nagvis/includes/classes/objects/NagVisShape.php");
 396 +require("/usr/share/nagvis/includes/classes/objects/NagVisTextbox.php");
 397
 398  // Load the main configuration
 399  $MAINCFG = new GlobalMainCfg(CONST_MAINCFG);
 400 diff -urNad nagvis-1.3.1~/wui/ajax_handler.php nagvis-1.3.1/wui/ajax_handler.php
 401 --- nagvis-1.3.1~/wui/ajax_handler.php  2008-03-29 02:01:07.000000000 +0100
 402 +++ nagvis-1.3.1/wui/ajax_handler.php   2009-08-23 12:52:15.000000000 +0200
 403 @@ -29,22 +29,22 @@
 404  @session_start();
 405
 406  // Include defines
 407 -require("../nagvis/includes/defines/global.php");
 408 -require("../nagvis/includes/defines/matches.php");
 409 +require("/usr/share/nagvis/includes/defines/global.php");
 410 +require("/usr/share/nagvis/includes/defines/matches.php");
 411
 412  // Include functions
 413 -require("../nagvis/includes/functions/debug.php");
 414 +require("/usr/share/nagvis/includes/functions/debug.php");
 415
 416  // Include needed global classes
 417 -require("../nagvis/includes/classes/GlobalMainCfg.php");
 418 -require("../nagvis/includes/classes/GlobalMapCfg.php");
 419 -require("../nagvis/includes/classes/GlobalLanguage.php");
 420 -require("../nagvis/includes/classes/GlobalPage.php");
 421 -require("../nagvis/includes/classes/GlobalBackendMgmt.php");
 422 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
 423 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
 424 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
 425 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
 426 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
 427
 428  // Include needed wui specific classes
 429 -require("./includes/classes/WuiMainCfg.php");
 430 -require("./includes/classes/WuiMapCfg.php");
 431 +require("/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php");
 432 +require("/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php");
 433
 434  // Load the main configuration
 435  $MAINCFG = new WuiMainCfg(CONST_MAINCFG);
 436 diff -urNad nagvis-1.3.1~/wui/form_handler.php nagvis-1.3.1/wui/form_handler.php
 437 --- nagvis-1.3.1~/wui/form_handler.php  2008-03-29 02:01:07.000000000 +0100
 438 +++ nagvis-1.3.1/wui/form_handler.php   2009-08-23 12:52:15.000000000 +0200
 439 @@ -29,26 +29,26 @@
 440  @session_start();
 441
 442  // Include defines
 443 -require('../nagvis/includes/defines/global.php');
 444 -require('../nagvis/includes/defines/matches.php');
 445 +require('/usr/share/nagvis/includes/defines/global.php');
 446 +require('/usr/share/nagvis/includes/defines/matches.php');
 447
 448  // Include global functions
 449 -require('../nagvis/includes/functions/debug.php');
 450 +require('/usr/share/nagvis/includes/functions/debug.php');
 451
 452  // Include needed WUI specific functions
 453 -require('./includes/functions/form_handler.php');
 454 +require('/usr/share/nagvis/htdocs/wui/includes/form_handler.php');
 455
 456  // Include needed global classes
 457 -require('../nagvis/includes/classes/GlobalLanguage.php');
 458 -require('../nagvis/includes/classes/GlobalMainCfg.php');
 459 -require('../nagvis/includes/classes/GlobalPage.php');
 460 -require('../nagvis/includes/classes/GlobalMapCfg.php');
 461 -require('../nagvis/includes/classes/GlobalBackground.php');
 462 +require('/usr/share/nagvis/includes/classes/GlobalLanguage.php');
 463 +require('/usr/share/nagvis/includes/classes/GlobalMainCfg.php');
 464 +require('/usr/share/nagvis/includes/classes/GlobalPage.php');
 465 +require('/usr/share/nagvis/includes/classes/GlobalMapCfg.php');
 466 +require('/usr/share/nagvis/includes/classes/GlobalBackground.php');
 467
 468  // Include needed WUI specific classes
 469 -require('./includes/classes/WuiMainCfg.php');
 470 -require('./includes/classes/WuiMapCfg.php');
 471 -require('./includes/classes/WuiBackground.php');
 472 +require('/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php');
 473 +require('/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php');
 474 +require('/usr/share/nagvis/wui/includes/classes/WuiBackground.php');
 475
 476  // Load the main configuration
 477  $MAINCFG = new WuiMainCfg(CONST_MAINCFG);
 478 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiAddModify.php nagvis-1.3.1/wui/includes/classes/WuiAddModify.php
 479 --- nagvis-1.3.1~/wui/includes/classes/WuiAddModify.php 2008-05-23 11:15:21.000000000 +0200
 480 +++ nagvis-1.3.1/wui/includes/classes/WuiAddModify.php  2009-08-23 12:52:15.000000000 +0200
 481 @@ -51,10 +51,10 @@
 482                 $this->LANG = new GlobalLanguage($MAINCFG,'wui:addModify');
 483
 484                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 485 -                                         'cssIncludes'=>Array('./includes/css/wui.css'),
 486 -                                         'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/addmodify.js',
 487 -                                                                                 './includes/js/ajax.js',
 488 -                                                                                 './includes/js/wui.js'),
 489 +                                         'cssIncludes'=>Array('./css/wui.css'),
 490 +                                         'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/addmodify.js',
 491 +                                                                                 './js/ajax.js',
 492 +                                                                                 './js/wui.js'),
 493                                           'extHeader'=>Array(''),
 494                                           'allowedUsers' => Array('EVERYONE'));
 495                 parent::GlobalPage($MAINCFG,$prop,'wui:addModify');
 496 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiBackendManagement.php nagvis-1.3.1/wui/includes/classes/WuiBackendManagement.php
 497 --- nagvis-1.3.1~/wui/includes/classes/WuiBackendManagement.php 2008-05-01 19:18:59.000000000 +0200
 498 +++ nagvis-1.3.1/wui/includes/classes/WuiBackendManagement.php  2009-08-23 12:52:15.000000000 +0200
 499 @@ -48,10 +48,10 @@
 500                 $this->LANG = new GlobalLanguage($MAINCFG,'wui:backendManagement');
 501
 502                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 503 -                                         'cssIncludes'=>Array('./includes/css/wui.css'),
 504 -                                         'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/wui.js',
 505 -                                                                                       './includes/js/BackendManagement.js',
 506 -                                                                                       './includes/js/ajax.js'),
 507 +                                         'cssIncludes'=>Array('./css/wui.css'),
 508 +                                         'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/wui.js',
 509 +                                                                                       './js/BackendManagement.js',
 510 +                                                                                       './js/ajax.js'),
 511                                           'extHeader'=>Array(''),
 512                                           'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
 513                                           'languageRoot' => 'wui:backendManagement');
 514 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiBackgroundManagement.php nagvis-1.3.1/wui/includes/classes/WuiBackgroundManagement.php
 515 --- nagvis-1.3.1~/wui/includes/classes/WuiBackgroundManagement.php      2008-05-01 19:18:59.000000000 +0200
 516 +++ nagvis-1.3.1/wui/includes/classes/WuiBackgroundManagement.php       2009-08-23 12:52:15.000000000 +0200
 517 @@ -46,10 +46,10 @@
 518                 $this->LANG = new GlobalLanguage($MAINCFG,'wui:backgroundManagement');
 519
 520                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 521 -                                         'cssIncludes'=>Array('./includes/css/wui.css'),
 522 -                                         'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/BackgroundManagement.js',
 523 -                                                                                       './includes/js/ajax.js',
 524 -                                                                                       './includes/js/wui.js'),
 525 +                                         'cssIncludes'=>Array('./css/wui.css'),
 526 +                                         'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/BackgroundManagement.js',
 527 +                                                                                       './js/ajax.js',
 528 +                                                                                       './js/wui.js'),
 529                                           'extHeader'=>Array(''),
 530                                           'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
 531                                           'languageRoot' => 'wui:backgroundManagement');
 532 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiEditMainCfg.php nagvis-1.3.1/wui/includes/classes/WuiEditMainCfg.php
 533 --- nagvis-1.3.1~/wui/includes/classes/WuiEditMainCfg.php       2008-05-01 21:33:17.000000000 +0200
 534 +++ nagvis-1.3.1/wui/includes/classes/WuiEditMainCfg.php        2009-08-23 12:52:15.000000000 +0200
 535 @@ -43,8 +43,8 @@
 536                 $this->LANG = new GlobalLanguage($MAINCFG,'wui:editMainCfg');
 537
 538                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 539 -                                         'cssIncludes'=>Array('./includes/css/wui.css'),
 540 -                                         'jsIncludes'=>Array('./includes/js/wui.js','./includes/js/EditMainCfg.js'),
 541 +                                         'cssIncludes'=>Array('./css/wui.css'),
 542 +                                         'jsIncludes'=>Array('./js/wui.js','./js/EditMainCfg.js'),
 543                                           'extHeader'=>Array(''),
 544                                           'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
 545                                           'languageRoot' => 'wui:editMainCfg');
 546 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiFrontend.php nagvis-1.3.1/wui/includes/classes/WuiFrontend.php
 547 --- nagvis-1.3.1~/wui/includes/classes/WuiFrontend.php  2008-05-18 22:53:20.000000000 +0200
 548 +++ nagvis-1.3.1/wui/includes/classes/WuiFrontend.php   2009-08-23 12:52:15.000000000 +0200
 549 @@ -44,13 +44,13 @@
 550                 $this->LANG = new GlobalLanguage($this->MAINCFG,'wui:global');
 551
 552                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 553 -                                         'cssIncludes'=>Array('../nagvis/includes/css/style.css','./includes/css/wui.css','./includes/css/office_xp/office_xp.css'),
 554 -                                         'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/wui.js',
 555 -                                                 './includes/js/ajax.js',
 556 -                                                 './includes/js/jsdomenu.js',
 557 -                                                 './includes/js/jsdomenu.inc.js',
 558 -                                                 './includes/js/wz_jsgraphics.js',
 559 -                                                 './includes/js/wz_dragdrop.js'),
 560 +                                         'cssIncludes'=>Array('../nagvis/includes/css/style.css','./css/wui.css','./css/office_xp/office_xp.css'),
 561 +                                         'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/wui.js',
 562 +                                                 './js/ajax.js',
 563 +                                                 './js/jsdomenu.js',
 564 +                                                 './js/jsdomenu.inc.js',
 565 +                                                 './js/wz_jsgraphics.js',
 566 +                                                 './js/wz_dragdrop.js'),
 567                                           'extHeader'=>Array("<style type=\"text/css\">body.main { background-color: ".$this->MAPCFG->getValue('global',0, 'background_color')."; }</style>"),
 568                                           'allowedUsers' => $this->MAPCFG->getValue('global', 0,'allowed_for_config'),
 569                                           'languageRoot' => 'wui:global');
 570 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiMap.php nagvis-1.3.1/wui/includes/classes/WuiMap.php
 571 --- nagvis-1.3.1~/wui/includes/classes/WuiMap.php       2008-05-01 22:33:58.000000000 +0200
 572 +++ nagvis-1.3.1/wui/includes/classes/WuiMap.php        2009-08-23 12:52:15.000000000 +0200
 573 @@ -144,7 +144,7 @@
 574                 $ret = array_merge($ret,$this->parseObjects());
 575                 $ret = array_merge($ret,$this->parseInvisible());
 576                 $ret = array_merge($ret,$this->makeObjectsMoveable());
 577 -               $ret = array_merge($ret,Array("<script type=\"text/javascript\" src=\"./includes/js/wz_tooltip.js\"></script>"));
 578 +               $ret = array_merge($ret,Array("<script type=\"text/javascript\" src=\"./js/wz_tooltip.js\"></script>"));
 579
 580                 return $ret;
 581         }
 582 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiMapManagement.php nagvis-1.3.1/wui/includes/classes/WuiMapManagement.php
 583 --- nagvis-1.3.1~/wui/includes/classes/WuiMapManagement.php     2008-05-01 19:18:59.000000000 +0200
 584 +++ nagvis-1.3.1/wui/includes/classes/WuiMapManagement.php      2009-08-23 12:52:15.000000000 +0200
 585 @@ -49,10 +49,10 @@
 586                 $this->LANG = new GlobalLanguage($MAINCFG,'wui:mapManagement');
 587
 588                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 589 -                                         'cssIncludes'=>Array('./includes/css/wui.css'),
 590 -                                         'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/map_management.js',
 591 -                                                                                       './includes/js/ajax.js',
 592 -                                                                                       './includes/js/wui.js'),
 593 +                                         'cssIncludes'=>Array('./css/wui.css'),
 594 +                                         'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/map_management.js',
 595 +                                                                                       './js/ajax.js',
 596 +                                                                                       './js/wui.js'),
 597                                           'extHeader'=>Array(''),
 598                                           'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
 599                                           'languageRoot' => 'wui:mapManagement');
 600 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiShapeManagement.php nagvis-1.3.1/wui/includes/classes/WuiShapeManagement.php
 601 --- nagvis-1.3.1~/wui/includes/classes/WuiShapeManagement.php   2008-05-01 19:18:59.000000000 +0200
 602 +++ nagvis-1.3.1/wui/includes/classes/WuiShapeManagement.php    2009-08-23 12:52:15.000000000 +0200
 603 @@ -47,10 +47,10 @@
 604          $this->LANG = new GlobalLanguage($MAINCFG,'wui:shapeManagement');
 605
 606          $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 607 -                    'cssIncludes'=>Array('./includes/css/wui.css'),
 608 -                    'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/ShapeManagement.js',
 609 -                        './includes/js/ajax.js',
 610 -                        './includes/js/wui.js'),
 611 +                    'cssIncludes'=>Array('./css/wui.css'),
 612 +                    'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/ShapeManagement.js',
 613 +                        './js/ajax.js',
 614 +                        './js/wui.js'),
 615                      'extHeader'=>Array(''),
 616                      'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
 617                      'languageRoot' => 'wui:shapeManagement');
 618 diff -urNad nagvis-1.3.1~/wui/index.php nagvis-1.3.1/wui/index.php
 619 --- nagvis-1.3.1~/wui/index.php 2008-06-06 13:19:25.000000000 +0200
 620 +++ nagvis-1.3.1/wui/index.php  2009-08-23 12:52:15.000000000 +0200
 621 @@ -29,25 +29,25 @@
 622  @session_start();
 623
 624  // Include defines
 625 -require("../nagvis/includes/defines/global.php");
 626 -require("../nagvis/includes/defines/matches.php");
 627 +require("/usr/share/nagvis/includes/defines/global.php");
 628 +require("/usr/share/nagvis/includes/defines/matches.php");
 629
 630  // Include functions
 631 -require("../nagvis/includes/functions/debug.php");
 632 -require("../nagvis/includes/functions/oldPhpVersionFixes.php");
 633 +require("/usr/share/nagvis/includes/functions/debug.php");
 634 +require("/usr/share/nagvis/includes/functions/oldPhpVersionFixes.php");
 635
 636  // Include needed global classes
 637 -require("../nagvis/includes/classes/GlobalMainCfg.php");
 638 -require("../nagvis/includes/classes/GlobalMapCfg.php");
 639 -require("../nagvis/includes/classes/GlobalLanguage.php");
 640 -require("../nagvis/includes/classes/GlobalPage.php");
 641 -require("../nagvis/includes/classes/GlobalMap.php");
 642 -require("../nagvis/includes/classes/GlobalBackground.php");
 643 -require("../nagvis/includes/classes/GlobalGraphic.php");
 644 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
 645 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
 646 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
 647 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
 648 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
 649 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
 650 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
 651
 652  // Include needed wui specific classes
 653 -require("./includes/classes/WuiMainCfg.php");
 654 -require("./includes/classes/WuiMapCfg.php");
 655 +require("/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php");
 656 +require("/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php");
 657
 658  // Load the main configuration
 659  $MAINCFG = new WuiMainCfg(CONST_MAINCFG);
 660 @@ -61,8 +61,8 @@
 661  switch($_GET['page']) {
 662         case 'edit_config':
 663                 // Include page specific global/wui classes
 664 -               require("../nagvis/includes/classes/GlobalForm.php");
 665 -               require("./includes/classes/WuiEditMainCfg.php");
 666 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 667 +               require("/usr/share/nagvis/wui/includes/classes/WuiEditMainCfg.php");
 668
 669                 $FRONTEND = new WuiEditMainCfg($MAINCFG);
 670                 $FRONTEND->getForm();
 671 @@ -70,40 +70,40 @@
 672         break;
 673         case 'shape_management':
 674                 // Include page specific global/wui classes
 675 -               require("../nagvis/includes/classes/GlobalForm.php");
 676 -               require("./includes/classes/WuiShapeManagement.php");
 677 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 678 +               require("/usr/share/nagvis/wui/includes/classes/WuiShapeManagement.php");
 679
 680                 $FRONTEND = new WuiShapeManagement($MAINCFG);
 681                 $FRONTEND->getForm();
 682         break;
 683         case 'background_management':
 684                 // Include page specific global/wui classes
 685 -               require("../nagvis/includes/classes/GlobalForm.php");
 686 -               require("./includes/classes/WuiBackgroundManagement.php");
 687 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 688 +               require("/usr/share/nagvis/wui/includes/classes/WuiBackgroundManagement.php");
 689
 690                 $FRONTEND = new WuiBackgroundManagement($MAINCFG);
 691                 $FRONTEND->getForm();
 692         break;
 693         case 'map_management':
 694                 // Include page specific global/wui classes
 695 -               require("../nagvis/includes/classes/GlobalForm.php");
 696 -               require("./includes/classes/WuiMapManagement.php");
 697 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 698 +               require("/usr/share/nagvis/wui/includes/classes/WuiMapManagement.php");
 699
 700                 $FRONTEND = new WuiMapManagement($MAINCFG);
 701                 $FRONTEND->getForm();
 702         break;
 703         case 'backend_management':
 704                 // Include page specific global/wui classes
 705 -               require("../nagvis/includes/classes/GlobalForm.php");
 706 -               require("./includes/classes/WuiBackendManagement.php");
 707 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 708 +               require("/usr/share/nagvis/wui/includes/classes/WuiBackendManagement.php");
 709
 710                 $FRONTEND = new WuiBackendManagement($MAINCFG);
 711                 $FRONTEND->getForm();
 712         break;
 713         case 'addmodify':
 714                 // Include page specific global/wui classes
 715 -               require("../nagvis/includes/classes/GlobalForm.php");
 716 -               require("./includes/classes/WuiAddModify.php");
 717 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 718 +               require("/usr/share/nagvis/wui/includes/classes/WuiAddModify.php");
 719
 720                 $MAPCFG = new WuiMapCfg($MAINCFG,$_GET['map']);
 721                 $MAPCFG->readMapConfig();
 722 @@ -125,8 +125,8 @@
 723                 // Default is the wui map
 724
 725                 // Include page specific global/wui classes
 726 -               require("./includes/classes/WuiFrontend.php");
 727 -               require("./includes/classes/WuiMap.php");
 728 +               require("/usr/share/nagvis/wui/includes/classes/WuiFrontend.php");
 729 +               require("/usr/share/nagvis/wui/includes/classes/WuiMap.php");
 730
 731                 // Set empty map if none is set
 732                 if(!isset($_GET['map'])) {