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.2.2~/etc/nagvis.ini.php-sample nagvis-1.2.2/etc/nagvis.ini.php-sample
   9 --- nagvis-1.2.2~/etc/nagvis.ini.php-sample     2007-10-03 13:57:48.000000000 +0200
  10 +++ nagvis-1.2.2/etc/nagvis.ini.php-sample      2008-03-18 18:00:30.000000000 +0100
  11 @@ -59,11 +59,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="/nagios2/nagvis"
  20  ; absolute html NagVis cgi path
  21 -;htmlcgi="/nagios/cgi-bin"
  22 +;htmlcgi="/nagios2/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 @@ -87,7 +87,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="/nagios2/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.2.2~/nagvis/draw.php nagvis-1.2.2/nagvis/draw.php
  36 --- nagvis-1.2.2~/nagvis/draw.php       2007-10-20 16:28:44.000000000 +0200
  37 +++ nagvis-1.2.2/nagvis/draw.php        2008-03-18 18:00:30.000000000 +0100
  38 @@ -14,23 +14,23 @@
  39
  40  @session_start();
  41
  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 -require("./includes/functions/debug.php");
  48 +require("/usr/share/nagvis/includes/functions/debug.php");
  49
  50 -require("./includes/classes/GlobalGraphic.php");
  51 -require("./includes/classes/GlobalMainCfg.php");
  52 -require("./includes/classes/GlobalMapCfg.php");
  53 -require("./includes/classes/GlobalMap.php");
  54 -require("./includes/classes/GlobalPage.php");
  55 -require("./includes/classes/GlobalBackground.php");
  56 -require("./includes/classes/GlobalLanguage.php");
  57 -require("./includes/classes/GlobalBackendMgmt.php");
  58 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
  59 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
  60 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
  61 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
  62 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
  63 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
  64 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
  65 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
  66
  67 -require("./includes/classes/NagVisMap.php");
  68 -require("./includes/classes/NagVisBackground.php");
  69 -require("./includes/classes/NagVisMapCfg.php");
  70 +require("/usr/share/nagvis/includes/classes/NagVisMap.php");
  71 +require("/usr/share/nagvis/includes/classes/NagVisBackground.php");
  72 +require("/usr/share/nagvis/includes/classes/NagVisMapCfg.php");
  73
  74  $MAINCFG = new GlobalMainCfg(CONST_MAINCFG);
  75
  76 diff -urNad nagvis-1.2.2~/nagvis/includes/classes/GlobalMainCfg.php nagvis-1.2.2/nagvis/includes/classes/GlobalMainCfg.php
  77 --- nagvis-1.2.2~/nagvis/includes/classes/GlobalMainCfg.php     2007-12-03 22:42:10.000000000 +0100
  78 +++ nagvis-1.2.2/nagvis/includes/classes/GlobalMainCfg.php      2008-03-18 18:27:11.000000000 +0100
  79 @@ -131,43 +131,43 @@
  80                                         'match' => MATCH_STRING_PATH),
  81                                 'htmlbase' => Array('must' => 1,
  82                                         'editable' => 1,
  83 -                                       'default' => '/nagios/nagvis',
  84 +                                       'default' => '/nagios2/nagvis',
  85                                         'match' => MATCH_STRING_PATH),
  86                                 'htmlcgi' => Array('must' => 1,
  87                                         'editable' => 1,
  88 -                                       'default' => '/nagios/cgi-bin',
  89 +                                       'default' => '/nagios2/cgi-bin',
  90                                         'match' => MATCH_STRING_PATH),
  91                                 'htmlimages' => Array('must' => 0,
  92                                         'editable' => 0,
  93 -                                       'default' => '/nagios/nagvis/nagvis/images/',
  94 +                                       'default' => '/nagios2/nagvis/nagvis/images/',
  95                                         'match' => MATCH_STRING_PATH),
  96                                 'htmlhovertemplates' => Array('must' => 0,
  97                                         'editable' => 0,
  98 -                                       'default' => '/nagios/nagvis/nagvis/etc/templates/hover/',
  99 +                                       'default' => '/nagios2/nagvis/nagvis/etc/templates/hover/',
 100                                         'match' => MATCH_STRING_PATH),
 101                                 'htmlheadertemplates' => Array('must' => 0,
 102                                         'editable' => 0,
 103 -                                       'default' => '/nagios/nagvis/nagvis/etc/templates/header/',
 104 +                                       'default' => '/nagios2/nagvis/nagvis/etc/templates/header/',
 105                                         'match' => MATCH_STRING_PATH),
 106                                 'htmlhovertemplateimages' => Array('must' => 0,
 107                                         'editable' => 0,
 108 -                                       'default' => '/nagios/nagvis/nagvis/images/templates/hover/',
 109 +                                       'default' => '/nagios2/nagvis/nagvis/images/templates/hover/',
 110                                         'match' => MATCH_STRING_PATH),
 111                                 'htmlheadertemplateimages' => Array('must' => 0,
 112                                         'editable' => 0,
 113 -                                       'default' => '/nagios/nagvis/nagvis/images/templates/header/',
 114 +                                       'default' => '/nagios2/nagvis/nagvis/images/templates/header/',
 115                                         'match' => MATCH_STRING_PATH),
 116                                 'htmlicon' => Array('must' => 0,
 117                                         'editable' => 0,
 118 -                                       'default' => '/nagios/nagvis/nagvis/images/iconsets/',
 119 +                                       'default' => '/nagios2/nagvis/nagvis/images/iconsets/',
 120                                         'match' => MATCH_STRING_PATH),
 121                                 'htmlshape' => Array('must' => 0,
 122                                         'editable' => 0,
 123 -                                       'default' => '/nagios/nagvis/nagvis/images/shape/',
 124 +                                       'default' => '/nagios2/nagvis/nagvis/images/shape/',
 125                                         'match' => MATCH_STRING_PATH),
 126                                 'htmlmap' => Array('must' => 0,
 127                                         'editable' => 0,
 128 -                                       'default' => '/nagios/nagvis/nagvis/images/maps/',
 129 +                                       'default' => '/nagios2/nagvis/nagvis/images/maps/',
 130                                         'match' => MATCH_STRING_PATH)),
 131                         'backend' => Array(
 132                                 'backendtype' => Array('must' => 1,
 133 @@ -226,7 +226,7 @@
 134                                                         'match' => MATCH_STRING_NO_SPACE),
 135                                                 'cgi' => Array('must' => 1,
 136                                                         'editable' => 1,
 137 -                                                       'default' => '/usr/local/nagios/sbin/',
 138 +                                                       'default' => '/usr/lib/cgi-bin/nagios2/',
 139                                                         'match' => MATCH_STRING_PATH)))),
 140                         'rotation' => Array('rotationid' => Array('must' => 1,
 141                                 'editable' => 1,
 142 @@ -281,14 +281,14 @@
 143                 $this->validConfig['paths']['icon']['default'] = $base.'nagvis/images/iconsets/';
 144                 $this->validConfig['paths']['shape']['default'] = $base.'nagvis/images/shapes/';
 145                 $this->validConfig['paths']['language']['default'] = $base.'nagvis/includes/languages/';
 146 -               $this->validConfig['paths']['class']['default'] = $base.'nagvis/includes/classes/';
 147 +               $this->validConfig['paths']['class']['default'] = '/usr/share/nagvis/includes/classes/';
 148                 $this->validConfig['paths']['map']['default'] = $base.'nagvis/images/maps/';
 149 -               $this->validConfig['paths']['hovertemplate']['default'] = $base.'nagvis/templates/hover/';
 150 -               $this->validConfig['paths']['headertemplate']['default'] = $base.'nagvis/templates/header/';
 151 -               $this->validConfig['paths']['mapcfg']['default'] = $base.'etc/maps/';
 152 +               $this->validConfig['paths']['hovertemplate']['default'] = '/etc/nagvis/templates/hover/';
 153 +               $this->validConfig['paths']['headertemplate']['default'] = '/etc/nagvis/templates/header/';
 154 +               $this->validConfig['paths']['mapcfg']['default'] = $base.'nagvis/etc/maps/';
 155                 $this->validConfig['paths']['htmlimages']['default'] = $htmlBase.'/nagvis/images/';
 156 -               $this->validConfig['paths']['htmlhovertemplates']['default'] = $htmlBase.'/nagvis/templates/hover/';
 157 -               $this->validConfig['paths']['htmlheadertemplates']['default'] = $htmlBase.'/nagvis/templates/header/';
 158 +               $this->validConfig['paths']['htmlhovertemplates']['default'] = $htmlBase.'/nagvis/etc/templates/hover/';
 159 +               $this->validConfig['paths']['htmlheadertemplates']['default'] = $htmlBase.'/nagvis/etc/templates/header/';
 160                 $this->validConfig['paths']['htmlhovertemplateimages']['default'] = $this->validConfig['paths']['htmlimages']['default'].'templates/hover/';
 161                 $this->validConfig['paths']['htmlheadertemplateimages']['default'] = $this->validConfig['paths']['htmlimages']['default'].'templates/header/';
 162                 $this->validConfig['paths']['htmlicon']['default'] = $htmlBase.'/nagvis/images/iconsets/';
 163 @@ -821,4 +821,4 @@
 164                 }
 165         }
 166  }
 167 -?>
 168 \ No newline at end of file
 169 +?>
 170 diff -urNad nagvis-1.2.2~/nagvis/includes/defines/global.php nagvis-1.2.2/nagvis/includes/defines/global.php
 171 --- nagvis-1.2.2~/nagvis/includes/defines/global.php    2008-01-28 22:03:32.000000000 +0100
 172 +++ nagvis-1.2.2/nagvis/includes/defines/global.php     2008-03-18 18:00:30.000000000 +0100
 173 @@ -16,5 +16,5 @@
 174  define('DEBUGFILE', '/var/log/nagvis-debug.log');
 175
 176  define('CONST_VERSION', '1.2.2');
 177 -define('CONST_MAINCFG', '../etc/nagvis.ini.php');
 178 +define('CONST_MAINCFG', '/etc/nagvis/nagvis.ini.php');
 179  ?>
 180 diff -urNad nagvis-1.2.2~/nagvis/index.php nagvis-1.2.2/nagvis/index.php
 181 --- nagvis-1.2.2~/nagvis/index.php      2007-12-13 08:50:14.000000000 +0100
 182 +++ nagvis-1.2.2/nagvis/index.php       2008-03-18 18:00:30.000000000 +0100
 183 @@ -14,23 +14,23 @@
 184
 185  @session_start();
 186
 187 -require("./includes/defines/global.php");
 188 -require("./includes/defines/matches.php");
 189 +require("/usr/share/nagvis/includes/defines/global.php");
 190 +require("/usr/share/nagvis/includes/defines/matches.php");
 191
 192 -require("./includes/functions/debug.php");
 193 +require("/usr/share/nagvis/includes/functions/debug.php");
 194
 195 -require("./includes/classes/GlobalMainCfg.php");
 196 -require("./includes/classes/GlobalMapCfg.php");
 197 -require("./includes/classes/GlobalLanguage.php");
 198 -require("./includes/classes/GlobalPage.php");
 199 -require("./includes/classes/GlobalMap.php");
 200 -require("./includes/classes/GlobalBackground.php");
 201 -require("./includes/classes/GlobalGraphic.php");
 202 -require("./includes/classes/GlobalBackendMgmt.php");
 203 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
 204 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
 205 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
 206 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
 207 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
 208 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
 209 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
 210 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
 211
 212 -require("./includes/classes/NagVisMapCfg.php");
 213 -require("./includes/classes/NagVisMap.php");
 214 -require("./includes/classes/NagVisFrontend.php");
 215 +require("/usr/share/nagvis/includes/classes/NagVisMapCfg.php");
 216 +require("/usr/share/nagvis/includes/classes/NagVisMap.php");
 217 +require("/usr/share/nagvis/includes/classes/NagVisFrontend.php");
 218
 219  $MAINCFG = new GlobalMainCfg(CONST_MAINCFG);
 220
 221 diff -urNad nagvis-1.2.2~/wui/ajax_handler.php nagvis-1.2.2/wui/ajax_handler.php
 222 --- nagvis-1.2.2~/wui/ajax_handler.php  2007-10-20 16:28:44.000000000 +0200
 223 +++ nagvis-1.2.2/wui/ajax_handler.php   2008-03-18 18:00:30.000000000 +0100
 224 @@ -2,19 +2,19 @@
 225
 226  @session_start();
 227
 228 -require("../nagvis/includes/defines/global.php");
 229 -require("../nagvis/includes/defines/matches.php");
 230 +require("/usr/share/nagvis/includes/defines/global.php");
 231 +require("/usr/share/nagvis/includes/defines/matches.php");
 232
 233 -require("../nagvis/includes/functions/debug.php");
 234 +require("/usr/share/nagvis/includes/functions/debug.php");
 235
 236 -require("../nagvis/includes/classes/GlobalMainCfg.php");
 237 -require("../nagvis/includes/classes/GlobalMapCfg.php");
 238 -require("../nagvis/includes/classes/GlobalLanguage.php");
 239 -require("../nagvis/includes/classes/GlobalPage.php");
 240 -require("../nagvis/includes/classes/GlobalBackendMgmt.php");
 241 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
 242 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
 243 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
 244 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
 245 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
 246
 247 -require("./includes/classes/WuiMainCfg.php");
 248 -require("./includes/classes/WuiMapCfg.php");
 249 +require("/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php");
 250 +require("/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php");
 251
 252  $MAINCFG = new WuiMainCfg(CONST_MAINCFG);
 253
 254 diff -urNad nagvis-1.2.2~/wui/form_handler.php nagvis-1.2.2/wui/form_handler.php
 255 --- nagvis-1.2.2~/wui/form_handler.php  2008-01-03 13:08:28.000000000 +0100
 256 +++ nagvis-1.2.2/wui/form_handler.php   2008-03-18 18:34:55.000000000 +0100
 257 @@ -11,20 +11,20 @@
 258
 259  @session_start();
 260
 261 -require('../nagvis/includes/defines/global.php');
 262 -require('../nagvis/includes/defines/matches.php');
 263 +require('/usr/share/nagvis/includes/defines/global.php');
 264 +require('/usr/share/nagvis/includes/defines/matches.php');
 265
 266 -require('../nagvis/includes/functions/debug.php');
 267 +require('/usr/share/nagvis/includes/functions/debug.php');
 268
 269 -require('../nagvis/includes/classes/GlobalLanguage.php');
 270 -require('../nagvis/includes/classes/GlobalMainCfg.php');
 271 -require('../nagvis/includes/classes/GlobalPage.php');
 272 -require('../nagvis/includes/classes/GlobalMapCfg.php');
 273 -require('../nagvis/includes/classes/GlobalBackground.php');
 274 +require('/usr/share/nagvis/includes/classes/GlobalLanguage.php');
 275 +require('/usr/share/nagvis/includes/classes/GlobalMainCfg.php');
 276 +require('/usr/share/nagvis/includes/classes/GlobalPage.php');
 277 +require('/usr/share/nagvis/includes/classes/GlobalMapCfg.php');
 278 +require('/usr/share/nagvis/includes/classes/GlobalBackground.php');
 279
 280 -require('./includes/classes/WuiMainCfg.php');
 281 -require('./includes/classes/WuiMapCfg.php');
 282 -require('./includes/classes/WuiBackground.php');
 283 +require('/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php');
 284 +require('/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php');
 285 +require('/usr/share/nagvis/wui/includes/classes/WuiBackground.php');
 286
 287  $MAINCFG = new WuiMainCfg(CONST_MAINCFG);
 288
 289 diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiAddModify.php nagvis-1.2.2/wui/includes/classes/WuiAddModify.php
 290 --- nagvis-1.2.2~/wui/includes/classes/WuiAddModify.php 2007-10-03 14:13:56.000000000 +0200
 291 +++ nagvis-1.2.2/wui/includes/classes/WuiAddModify.php  2008-03-18 18:00:30.000000000 +0100
 292 @@ -29,10 +29,10 @@
 293                 $this->LANG = new GlobalLanguage($MAINCFG,'wui:addModify');
 294
 295                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 296 -                                         'cssIncludes'=>Array('./includes/css/wui.css'),
 297 -                                         'jsIncludes'=>Array('./includes/js/addmodify.js',
 298 -                                                                                 './includes/js/ajax.js',
 299 -                                                                                 './includes/js/wui.js'),
 300 +                                         'cssIncludes'=>Array('./css/wui.css'),
 301 +                                         'jsIncludes'=>Array('./js/addmodify.js',
 302 +                                                                                 './js/ajax.js',
 303 +                                                                                 './js/wui.js'),
 304                                           'extHeader'=>Array(''),
 305                                           'allowedUsers' => Array('EVERYONE'));
 306                 parent::GlobalPage($MAINCFG,$prop,'wui:addModify');
 307 diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiBackendManagement.php nagvis-1.2.2/wui/includes/classes/WuiBackendManagement.php
 308 --- nagvis-1.2.2~/wui/includes/classes/WuiBackendManagement.php 2007-10-03 14:13:56.000000000 +0200
 309 +++ nagvis-1.2.2/wui/includes/classes/WuiBackendManagement.php  2008-03-18 18:00:30.000000000 +0100
 310 @@ -26,10 +26,10 @@
 311                 $this->LANG = new GlobalLanguage($MAINCFG,'wui:backendManagement');
 312
 313                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 314 -                                         'cssIncludes'=>Array('./includes/css/wui.css'),
 315 -                                         'jsIncludes'=>Array('./includes/js/wui.js',
 316 -                                                                                       './includes/js/BackendManagement.js',
 317 -                                                                                       './includes/js/ajax.js'),
 318 +                                         'cssIncludes'=>Array('./css/wui.css'),
 319 +                                         'jsIncludes'=>Array('./js/wui.js',
 320 +                                                                                       './js/BackendManagement.js',
 321 +                                                                                       './js/ajax.js'),
 322                                           'extHeader'=>Array(''),
 323                                           'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
 324                                           'languageRoot' => 'wui:backendManagement');
 325 diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiBackgroundManagement.php nagvis-1.2.2/wui/includes/classes/WuiBackgroundManagement.php
 326 --- nagvis-1.2.2~/wui/includes/classes/WuiBackgroundManagement.php      2007-10-03 15:33:09.000000000 +0200
 327 +++ nagvis-1.2.2/wui/includes/classes/WuiBackgroundManagement.php       2008-03-18 18:00:30.000000000 +0100
 328 @@ -26,10 +26,10 @@
 329                 $this->LANG = new GlobalLanguage($MAINCFG,'wui:backgroundManagement');
 330
 331                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 332 -                                         'cssIncludes'=>Array('./includes/css/wui.css'),
 333 -                                         'jsIncludes'=>Array('./includes/js/BackgroundManagement.js',
 334 -                                                                                       './includes/js/ajax.js',
 335 -                                                                                       './includes/js/wui.js'),
 336 +                                         'cssIncludes'=>Array('./css/wui.css'),
 337 +                                         'jsIncludes'=>Array('./js/BackgroundManagement.js',
 338 +                                                                                       './js/ajax.js',
 339 +                                                                                       './js/wui.js'),
 340                                           'extHeader'=>Array(''),
 341                                           'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
 342                                           'languageRoot' => 'wui:backgroundManagement');
 343 diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiEditMainCfg.php nagvis-1.2.2/wui/includes/classes/WuiEditMainCfg.php
 344 --- nagvis-1.2.2~/wui/includes/classes/WuiEditMainCfg.php       2007-10-19 17:07:30.000000000 +0200
 345 +++ nagvis-1.2.2/wui/includes/classes/WuiEditMainCfg.php        2008-03-18 18:00:30.000000000 +0100
 346 @@ -23,8 +23,8 @@
 347                 $this->LANG = new GlobalLanguage($MAINCFG,'wui:editMainCfg');
 348
 349                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 350 -                                         'cssIncludes'=>Array('./includes/css/wui.css'),
 351 -                                         'jsIncludes'=>Array('./includes/js/wui.js'),
 352 +                                         'cssIncludes'=>Array('./css/wui.css'),
 353 +                                         'jsIncludes'=>Array('./js/wui.js'),
 354                                           'extHeader'=>Array(''),
 355                                           'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
 356                                           'languageRoot' => 'wui:editMainCfg');
 357 diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiFrontend.php nagvis-1.2.2/wui/includes/classes/WuiFrontend.php
 358 --- nagvis-1.2.2~/wui/includes/classes/WuiFrontend.php  2007-10-03 14:13:56.000000000 +0200
 359 +++ nagvis-1.2.2/wui/includes/classes/WuiFrontend.php   2008-03-18 18:00:30.000000000 +0100
 360 @@ -24,13 +24,13 @@
 361                 $this->LANG = new GlobalLanguage($this->MAINCFG,'wui:global');
 362
 363                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 364 -                                         'cssIncludes'=>Array('../nagvis/includes/css/style.css','./includes/css/wui.css','./includes/css/office_xp/office_xp.css'),
 365 -                                         'jsIncludes'=>Array('./includes/js/wui.js',
 366 -                                                 './includes/js/ajax.js',
 367 -                                                 './includes/js/jsdomenu.js',
 368 -                                                 './includes/js/jsdomenu.inc.js',
 369 -                                                 './includes/js/wz_jsgraphics.js',
 370 -                                                 './includes/js/wz_dragdrop.js'),
 371 +                                         'cssIncludes'=>Array('../nagvis/includes/css/style.css','./css/wui.css','./css/office_xp/office_xp.css'),
 372 +                                         'jsIncludes'=>Array('./js/wui.js',
 373 +                                                 './js/ajax.js',
 374 +                                                 './js/jsdomenu.js',
 375 +                                                 './js/jsdomenu.inc.js',
 376 +                                                 './js/wz_jsgraphics.js',
 377 +                                                 './js/wz_dragdrop.js'),
 378                                           'extHeader'=>Array("<style type=\"text/css\">body.main { background-color: ".$this->MAPCFG->getValue('global',0, 'background_color')."; }</style>"),
 379                                           'allowedUsers' => $this->MAPCFG->getValue('global', 0,'allowed_for_config'),
 380                                           'languageRoot' => 'wui:global');
 381 diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiMap.php nagvis-1.2.2/wui/includes/classes/WuiMap.php
 382 --- nagvis-1.2.2~/wui/includes/classes/WuiMap.php       2008-01-28 22:33:19.000000000 +0100
 383 +++ nagvis-1.2.2/wui/includes/classes/WuiMap.php        2008-03-18 18:00:30.000000000 +0100
 384 @@ -126,7 +126,7 @@
 385                 $ret = array_merge($ret,$this->parseObjects());
 386                 $ret = array_merge($ret,$this->parseInvisible());
 387                 $ret = array_merge($ret,$this->makeObjectsMoveable());
 388 -               $ret = array_merge($ret,Array("<script type=\"text/javascript\" src=\"./includes/js/wz_tooltip.js\"></script>"));
 389 +               $ret = array_merge($ret,Array("<script type=\"text/javascript\" src=\"./js/wz_tooltip.js\"></script>"));
 390
 391                 if (DEBUG&&DEBUGLEVEL&1) debug('End method WuiMap::parseMap(): Array(HTML)');
 392                 return $ret;
 393 diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiMapManagement.php nagvis-1.2.2/wui/includes/classes/WuiMapManagement.php
 394 --- nagvis-1.2.2~/wui/includes/classes/WuiMapManagement.php     2007-10-03 14:13:56.000000000 +0200
 395 +++ nagvis-1.2.2/wui/includes/classes/WuiMapManagement.php      2008-03-18 18:00:30.000000000 +0100
 396 @@ -29,10 +29,10 @@
 397                 $this->LANG = new GlobalLanguage($MAINCFG,'wui:mapManagement');
 398
 399                 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 400 -                                         'cssIncludes'=>Array('./includes/css/wui.css'),
 401 -                                         'jsIncludes'=>Array('./includes/js/map_management.js',
 402 -                                                                                       './includes/js/ajax.js',
 403 -                                                                                       './includes/js/wui.js'),
 404 +                                         'cssIncludes'=>Array('./css/wui.css'),
 405 +                                         'jsIncludes'=>Array('./js/map_management.js',
 406 +                                                                                       './js/ajax.js',
 407 +                                                                                       './js/wui.js'),
 408                                           'extHeader'=>Array(''),
 409                                           'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
 410                                           'languageRoot' => 'wui:mapManagement');
 411 diff -urNad nagvis-1.2.2~/wui/includes/classes/WuiShapeManagement.php nagvis-1.2.2/wui/includes/classes/WuiShapeManagement.php
 412 --- nagvis-1.2.2~/wui/includes/classes/WuiShapeManagement.php   2007-10-03 14:13:56.000000000 +0200
 413 +++ nagvis-1.2.2/wui/includes/classes/WuiShapeManagement.php    2008-03-18 18:00:30.000000000 +0100
 414 @@ -21,10 +21,10 @@
 415          $this->LANG = new GlobalLanguage($MAINCFG,'wui:shapeManagement');
 416
 417          $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
 418 -                    'cssIncludes'=>Array('./includes/css/wui.css'),
 419 -                    'jsIncludes'=>Array('./includes/js/ShapeManagement.js',
 420 -                        './includes/js/ajax.js',
 421 -                        './includes/js/wui.js'),
 422 +                    'cssIncludes'=>Array('./css/wui.css'),
 423 +                    'jsIncludes'=>Array('./js/ShapeManagement.js',
 424 +                        './js/ajax.js',
 425 +                        './js/wui.js'),
 426                      'extHeader'=>Array(''),
 427                      'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
 428                      'languageRoot' => 'wui:shapeManagement');
 429 diff -urNad nagvis-1.2.2~/wui/index.php nagvis-1.2.2/wui/index.php
 430 --- nagvis-1.2.2~/wui/index.php 2007-10-20 16:28:44.000000000 +0200
 431 +++ nagvis-1.2.2/wui/index.php  2008-03-18 18:00:30.000000000 +0100
 432 @@ -14,21 +14,21 @@
 433
 434  @session_start();
 435
 436 -require("../nagvis/includes/defines/global.php");
 437 -require("../nagvis/includes/defines/matches.php");
 438 +require("/usr/share/nagvis/includes/defines/global.php");
 439 +require("/usr/share/nagvis/includes/defines/matches.php");
 440
 441 -require("../nagvis/includes/functions/debug.php");
 442 +require("/usr/share/nagvis/includes/functions/debug.php");
 443
 444 -require("../nagvis/includes/classes/GlobalMainCfg.php");
 445 -require("../nagvis/includes/classes/GlobalMapCfg.php");
 446 -require("../nagvis/includes/classes/GlobalLanguage.php");
 447 -require("../nagvis/includes/classes/GlobalPage.php");
 448 -require("../nagvis/includes/classes/GlobalMap.php");
 449 -require("../nagvis/includes/classes/GlobalBackground.php");
 450 -require("../nagvis/includes/classes/GlobalGraphic.php");
 451 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
 452 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
 453 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
 454 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
 455 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
 456 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
 457 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
 458
 459 -require("./includes/classes/WuiMainCfg.php");
 460 -require("./includes/classes/WuiMapCfg.php");
 461 +require("/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php");
 462 +require("/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php");
 463
 464  $MAINCFG = new WuiMainCfg(CONST_MAINCFG);
 465
 466 @@ -40,40 +40,40 @@
 467  // Display the wanted page, if nothing is set, display the map
 468  switch($_GET['page']) {
 469         case 'edit_config':
 470 -               require("../nagvis/includes/classes/GlobalForm.php");
 471 -               require("./includes/classes/WuiEditMainCfg.php");
 472 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 473 +               require("/usr/share/nagvis/wui//includes/classes/WuiEditMainCfg.php");
 474
 475                 $FRONTEND = new WuiEditMainCfg($MAINCFG);
 476                 $FRONTEND->getForm();
 477                 $FRONTEND->printPage();
 478         break;
 479         case 'shape_management':
 480 -               require("../nagvis/includes/classes/GlobalForm.php");
 481 -               require("./includes/classes/WuiShapeManagement.php");
 482 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 483 +               require("/usr/share/nagvis/wui/includes/classes/WuiShapeManagement.php");
 484                 $FRONTEND = new WuiShapeManagement($MAINCFG);
 485                 $FRONTEND->getForm();
 486         break;
 487         case 'background_management':
 488 -               require("../nagvis/includes/classes/GlobalForm.php");
 489 -               require("./includes/classes/WuiBackgroundManagement.php");
 490 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 491 +               require("/usr/share/nagvis/wui/includes/classes/WuiBackgroundManagement.php");
 492                 $FRONTEND = new WuiBackgroundManagement($MAINCFG);
 493                 $FRONTEND->getForm();
 494         break;
 495         case 'map_management':
 496 -               require("../nagvis/includes/classes/GlobalForm.php");
 497 -               require("./includes/classes/WuiMapManagement.php");
 498 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 499 +               require("/usr/share/nagvis/wui/includes/classes/WuiMapManagement.php");
 500                 $FRONTEND = new WuiMapManagement($MAINCFG);
 501                 $FRONTEND->getForm();
 502         break;
 503         case 'backend_management':
 504 -               require("../nagvis/includes/classes/GlobalForm.php");
 505 -               require("./includes/classes/WuiBackendManagement.php");
 506 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 507 +               require("/usr/share/nagvis/wui/includes/classes/WuiBackendManagement.php");
 508                 $FRONTEND = new WuiBackendManagement($MAINCFG);
 509                 $FRONTEND->getForm();
 510         break;
 511         case 'addmodify':
 512 -               require("../nagvis/includes/classes/GlobalForm.php");
 513 -               require("./includes/classes/WuiAddModify.php");
 514 +               require("/usr/share/nagvis/includes/classes/GlobalForm.php");
 515 +               require("/usr/share/nagvis/wui/includes/classes/WuiAddModify.php");
 516
 517                 $MAPCFG = new WuiMapCfg($MAINCFG,$_GET['map']);
 518                 $MAPCFG->readMapConfig();
 519 @@ -92,8 +92,8 @@
 520                 $FRONTEND->getForm();
 521         break;
 522         default:
 523 -               require("./includes/classes/WuiFrontend.php");
 524 -               require("./includes/classes/WuiMap.php");
 525 +               require("/usr/share/nagvis/wui/includes/classes/WuiFrontend.php");
 526 +               require("/usr/share/nagvis/wui/includes/classes/WuiMap.php");
 527
 528                 if(!isset($_GET['map'])) {
 529                         $_GET['map'] = '';