1b6e98ece44c6354d4e797dae4dfca8cdadbaf9b
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.
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 17:57:06.000000000 +0000
10 +++ nagvis-1.3.1/etc/nagvis.ini.php-sample 2008-09-27 12:52:10.000000000 +0000
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"
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"
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/draw.php nagvis-1.3.1/nagvis/draw.php
36 --- nagvis-1.3.1~/nagvis/draw.php 2008-06-05 21:11:33.000000000 +0000
37 +++ nagvis-1.3.1/nagvis/draw.php 2008-09-27 12:52:10.000000000 +0000
38 @@ -27,43 +27,43 @@
39 @session_start();
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");
47 // Include defines
48 -require("./includes/functions/debug.php");
49 -require("./includes/functions/oldPhpVersionFixes.php");
50 +require("/usr/share/nagvis/includes/functions/debug.php");
51 +require("/usr/share/nagvis/includes/functions/oldPhpVersionFixes.php");
53 // Include needed global classes
54 -require("./includes/classes/GlobalGraphic.php");
55 -require("./includes/classes/GlobalMainCfg.php");
56 -require("./includes/classes/GlobalMapCfg.php");
57 -require("./includes/classes/GlobalMap.php");
58 -require("./includes/classes/GlobalPage.php");
59 -require("./includes/classes/GlobalBackground.php");
60 -require("./includes/classes/GlobalLanguage.php");
61 -require("./includes/classes/GlobalBackendMgmt.php");
62 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
63 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
64 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
65 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
66 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
67 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
68 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
69 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
71 // Include needed frontend classes
72 -require("./includes/classes/NagVisMap.php");
73 -require("./includes/classes/NagVisBackground.php");
74 -require("./includes/classes/NagVisMapCfg.php");
75 +require("/usr/share/nagvis/includes/classes/NagVisMap.php");
76 +require("/usr/share/nagvis/includes/classes/NagVisBackground.php");
77 +require("/usr/share/nagvis/includes/classes/NagVisMapCfg.php");
79 // Include needed object classes
80 -require("./includes/classes/objects/NagVisObject.php");
81 -require("./includes/classes/objects/NagVisStatefulObject.php");
82 -require("./includes/classes/objects/NagVisStatelessObject.php");
83 -require("./includes/classes/objects/NagiosHost.php");
84 -require("./includes/classes/objects/NagVisHost.php");
85 -require("./includes/classes/objects/NagiosService.php");
86 -require("./includes/classes/objects/NagVisService.php");
87 -require("./includes/classes/objects/NagiosHostgroup.php");
88 -require("./includes/classes/objects/NagVisHostgroup.php");
89 -require("./includes/classes/objects/NagiosServicegroup.php");
90 -require("./includes/classes/objects/NagVisServicegroup.php");
91 -require("./includes/classes/objects/NagVisMapObj.php");
92 -require("./includes/classes/objects/NagVisShape.php");
93 -require("./includes/classes/objects/NagVisTextbox.php");
94 +require("/usr/share/nagvis/includes/classes/objects/NagVisObject.php");
95 +require("/usr/share/nagvis/includes/classes/objects/NagVisStatefulObject.php");
96 +require("/usr/share/nagvis/includes/classes/objects/NagVisStatelessObject.php");
97 +require("/usr/share/nagvis/includes/classes/objects/NagiosHost.php");
98 +require("/usr/share/nagvis/includes/classes/objects/NagVisHost.php");
99 +require("/usr/share/nagvis/includes/classes/objects/NagiosService.php");
100 +require("/usr/share/nagvis/includes/classes/objects/NagVisService.php");
101 +require("/usr/share/nagvis/includes/classes/objects/NagiosHostgroup.php");
102 +require("/usr/share/nagvis/includes/classes/objects/NagVisHostgroup.php");
103 +require("/usr/share/nagvis/includes/classes/objects/NagiosServicegroup.php");
104 +require("/usr/share/nagvis/includes/classes/objects/NagVisServicegroup.php");
105 +require("/usr/share/nagvis/includes/classes/objects/NagVisMapObj.php");
106 +require("/usr/share/nagvis/includes/classes/objects/NagVisShape.php");
107 +require("/usr/share/nagvis/includes/classes/objects/NagVisTextbox.php");
109 // Load the main configuration
110 $MAINCFG = new GlobalMainCfg(CONST_MAINCFG);
111 diff -urNad nagvis-1.3.1~/nagvis/includes/classes/GlobalMainCfg.php nagvis-1.3.1/nagvis/includes/classes/GlobalMainCfg.php
112 --- nagvis-1.3.1~/nagvis/includes/classes/GlobalMainCfg.php 2008-08-13 19:45:26.000000000 +0000
113 +++ nagvis-1.3.1/nagvis/includes/classes/GlobalMainCfg.php 2008-09-27 12:53:09.000000000 +0000
114 @@ -173,7 +173,7 @@
115 'match' => MATCH_STRING_PATH),
116 'var' => Array('must' => 0,
117 'editable' => 0,
118 - 'default' => '',
119 + 'default' => '/var/lib/nagvis/',
120 'match' => MATCH_STRING_PATH),
121 'mapcfg' => Array('must' => 0,
122 'editable' => 0,
123 @@ -189,47 +189,47 @@
124 'match' => MATCH_STRING_PATH),
125 'htmlbase' => Array('must' => 1,
126 'editable' => 1,
127 - 'default' => '/nagios/nagvis',
128 + 'default' => '/nagios3/nagvis',
129 'match' => MATCH_STRING_PATH),
130 'htmlcgi' => Array('must' => 1,
131 'editable' => 1,
132 - 'default' => '/nagios/cgi-bin',
133 + 'default' => '/nagios3/cgi-bin',
134 'match' => MATCH_STRING_URL),
135 'htmlimages' => Array('must' => 0,
136 'editable' => 0,
137 - 'default' => '/nagios/nagvis/nagvis/images/',
138 + 'default' => '/nagios3/nagvis/nagvis/images/',
139 'match' => MATCH_STRING_PATH),
140 'htmlhovertemplates' => Array('must' => 0,
141 'editable' => 0,
142 - 'default' => '/nagios/nagvis/nagvis/etc/templates/hover/',
143 + 'default' => '/nagios3/nagvis/nagvis/etc/templates/hover/',
144 'match' => MATCH_STRING_PATH),
145 'htmlheadertemplates' => Array('must' => 0,
146 'editable' => 0,
147 - 'default' => '/nagios/nagvis/nagvis/etc/templates/header/',
148 + 'default' => '/nagios3/nagvis/nagvis/etc/templates/header/',
149 'match' => MATCH_STRING_PATH),
150 'htmlhovertemplateimages' => Array('must' => 0,
151 'editable' => 0,
152 - 'default' => '/nagios/nagvis/nagvis/images/templates/hover/',
153 + 'default' => '/nagios3/nagvis/nagvis/images/templates/hover/',
154 'match' => MATCH_STRING_PATH),
155 'htmlheadertemplateimages' => Array('must' => 0,
156 'editable' => 0,
157 - 'default' => '/nagios/nagvis/nagvis/images/templates/header/',
158 + 'default' => '/nagios3/nagvis/nagvis/images/templates/header/',
159 'match' => MATCH_STRING_PATH),
160 'htmlicon' => Array('must' => 0,
161 'editable' => 0,
162 - 'default' => '/nagios/nagvis/nagvis/images/iconsets/',
163 + 'default' => '/nagios3/nagvis/nagvis/images/iconsets/',
164 'match' => MATCH_STRING_PATH),
165 'htmlshape' => Array('must' => 0,
166 'editable' => 0,
167 - 'default' => '/nagios/nagvis/nagvis/images/shape/',
168 + 'default' => '/nagios3/nagvis/nagvis/images/shape/',
169 'match' => MATCH_STRING_PATH),
170 'htmlmap' => Array('must' => 0,
171 'editable' => 0,
172 - 'default' => '/nagios/nagvis/nagvis/images/maps/',
173 + 'default' => '/nagios3/nagvis/nagvis/images/maps/',
174 'match' => MATCH_STRING_PATH),
175 'htmlvar' => Array('must' => 0,
176 'editable' => 0,
177 - 'default' => '/nagios/var/',
178 + 'default' => '/nagios3/var/',
179 'match' => MATCH_STRING_PATH)),
180 'backend' => Array(
181 'backendtype' => Array('must' => 1,
182 @@ -288,7 +288,7 @@
183 'match' => MATCH_STRING_NO_SPACE),
184 'cgi' => Array('must' => 1,
185 'editable' => 1,
186 - 'default' => '/usr/local/nagios/sbin/',
187 + 'default' => '/usr/lib/cgi-bin/nagios3/',
188 'match' => MATCH_STRING_PATH)))),
189 'rotation' => Array(
190 'rotationid' => Array('must' => 1,
191 @@ -314,7 +314,7 @@
192 'match' => MATCH_STRING_NO_SPACE_EMPTY),
193 'graphvizpath' => Array('must' => 0,
194 'editable' => 0,
195 - 'default' => '/usr/local/bin/',
196 + 'default' => '/usr/bin/',
197 'match' => MATCH_STRING_PATH),
198 'defaultparams' => Array('must' => 0,
199 'editable' => 0,
200 @@ -361,15 +361,15 @@
201 $this->validConfig['paths']['images']['default'] = $base.'nagvis/images/';
202 $this->validConfig['paths']['shape']['default'] = $base.'nagvis/images/shapes/';
203 $this->validConfig['paths']['language']['default'] = $base.'nagvis/includes/languages/';
204 - $this->validConfig['paths']['class']['default'] = $base.'nagvis/includes/classes/';
205 + $this->validConfig['paths']['class']['default'] = '/usr/share/nagvis/includes/classes/';
206 $this->validConfig['paths']['map']['default'] = $base.'nagvis/images/maps/';
207 - $this->validConfig['paths']['var']['default'] = $base.'var/';
208 - $this->validConfig['paths']['hovertemplate']['default'] = $base.'nagvis/templates/hover/';
209 - $this->validConfig['paths']['headertemplate']['default'] = $base.'nagvis/templates/header/';
210 - $this->validConfig['paths']['mapcfg']['default'] = $base.'etc/maps/';
211 + $this->validConfig['paths']['var']['default'] = '/var/lib/nagvis/';
212 + $this->validConfig['paths']['hovertemplate']['default'] = '/etc/nagvis/templates/hover/';
213 + $this->validConfig['paths']['headertemplate']['default'] = '/etc/nagvis/templates/header/';
214 + $this->validConfig['paths']['mapcfg']['default'] = $base.'nagvis/etc/maps/';
215 $this->validConfig['paths']['htmlimages']['default'] = $htmlBase.'/nagvis/images/';
216 - $this->validConfig['paths']['htmlhovertemplates']['default'] = $htmlBase.'/nagvis/templates/hover/';
217 - $this->validConfig['paths']['htmlheadertemplates']['default'] = $htmlBase.'/nagvis/templates/header/';
218 + $this->validConfig['paths']['htmlhovertemplates']['default'] = $htmlBase.'/nagvis/etc/templates/hover/';
219 + $this->validConfig['paths']['htmlheadertemplates']['default'] = $htmlBase.'/nagvis/etc/templates/header/';
220 $this->validConfig['paths']['htmlhovertemplateimages']['default'] = $this->validConfig['paths']['htmlimages']['default'].'templates/hover/';
221 $this->validConfig['paths']['htmlheadertemplateimages']['default'] = $this->validConfig['paths']['htmlimages']['default'].'templates/header/';
222 $this->validConfig['paths']['htmlicon']['default'] = $htmlBase.'/nagvis/images/iconsets/';
223 diff -urNad nagvis-1.3.1~/nagvis/includes/defines/global.php nagvis-1.3.1/nagvis/includes/defines/global.php
224 --- nagvis-1.3.1~/nagvis/includes/defines/global.php 2008-08-22 19:01:15.000000000 +0000
225 +++ nagvis-1.3.1/nagvis/includes/defines/global.php 2008-09-27 12:52:10.000000000 +0000
226 @@ -37,13 +37,13 @@
227 define('DEBUGLEVEL', 4);
229 // Path to the debug file
230 -define('DEBUGFILE', '../var/nagvis-debug.log');
231 +define('DEBUGFILE', '/var/log/nagvis-debug.log');
233 // NagVis Version
234 define('CONST_VERSION', '1.3.1');
236 // Path to the main configuration file
237 -define('CONST_MAINCFG', '../etc/nagvis.ini.php');
238 +define('CONST_MAINCFG', '/etc/nagvis/nagvis.ini.php');
240 // Needed minimal PHP version
241 define('CONST_NEEDED_PHP_VERSION', '5.0');
242 diff -urNad nagvis-1.3.1~/nagvis/index.php nagvis-1.3.1/nagvis/index.php
243 --- nagvis-1.3.1~/nagvis/index.php 2008-06-05 21:11:33.000000000 +0000
244 +++ nagvis-1.3.1/nagvis/index.php 2008-09-27 12:52:10.000000000 +0000
245 @@ -26,44 +26,44 @@
246 @session_start();
248 // Include defines
249 -require("./includes/defines/global.php");
250 -require("./includes/defines/matches.php");
251 +require("/usr/share/nagvis/includes/defines/global.php");
252 +require("/usr/share/nagvis/includes/defines/matches.php");
254 // Include functions
255 -require("./includes/functions/debug.php");
256 -require("./includes/functions/oldPhpVersionFixes.php");
257 +require("/usr/share/nagvis/includes/functions/debug.php");
258 +require("/usr/share/nagvis/includes/functions/oldPhpVersionFixes.php");
260 // Include needed global classes
261 -require("./includes/classes/GlobalMainCfg.php");
262 -require("./includes/classes/GlobalMapCfg.php");
263 -require("./includes/classes/GlobalLanguage.php");
264 -require("./includes/classes/GlobalPage.php");
265 -require("./includes/classes/GlobalMap.php");
266 -require("./includes/classes/GlobalBackground.php");
267 -require("./includes/classes/GlobalGraphic.php");
268 -require("./includes/classes/GlobalBackendMgmt.php");
269 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
270 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
271 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
272 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
273 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
274 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
275 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
276 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
278 // Include needed nagvis classes
279 -require("./includes/classes/NagVisMapCfg.php");
280 -require("./includes/classes/NagVisMap.php");
281 -require("./includes/classes/NagVisFrontend.php");
282 -require("./includes/classes/NagVisAutoMap.php");
283 +require("/usr/share/nagvis/includes/classes/NagVisMapCfg.php");
284 +require("/usr/share/nagvis/includes/classes/NagVisMap.php");
285 +require("/usr/share/nagvis/includes/classes/NagVisFrontend.php");
286 +require("/usr/share/nagvis/includes/classes/NagVisAutoMap.php");
288 // Include needed nagvis object classes
289 -require("./includes/classes/objects/NagVisObject.php");
290 -require("./includes/classes/objects/NagVisStatefulObject.php");
291 -require("./includes/classes/objects/NagVisStatelessObject.php");
292 -require("./includes/classes/objects/NagiosHost.php");
293 -require("./includes/classes/objects/NagVisHost.php");
294 -require("./includes/classes/objects/NagiosService.php");
295 -require("./includes/classes/objects/NagVisService.php");
296 -require("./includes/classes/objects/NagiosHostgroup.php");
297 -require("./includes/classes/objects/NagVisHostgroup.php");
298 -require("./includes/classes/objects/NagiosServicegroup.php");
299 -require("./includes/classes/objects/NagVisServicegroup.php");
300 -require("./includes/classes/objects/NagVisMapObj.php");
301 -require("./includes/classes/objects/NagVisShape.php");
302 -require("./includes/classes/objects/NagVisTextbox.php");
303 +require("/usr/share/nagvis/includes/classes/objects/NagVisObject.php");
304 +require("/usr/share/nagvis/includes/classes/objects/NagVisStatefulObject.php");
305 +require("/usr/share/nagvis/includes/classes/objects/NagVisStatelessObject.php");
306 +require("/usr/share/nagvis/includes/classes/objects/NagiosHost.php");
307 +require("/usr/share/nagvis/includes/classes/objects/NagVisHost.php");
308 +require("/usr/share/nagvis/includes/classes/objects/NagiosService.php");
309 +require("/usr/share/nagvis/includes/classes/objects/NagVisService.php");
310 +require("/usr/share/nagvis/includes/classes/objects/NagiosHostgroup.php");
311 +require("/usr/share/nagvis/includes/classes/objects/NagVisHostgroup.php");
312 +require("/usr/share/nagvis/includes/classes/objects/NagiosServicegroup.php");
313 +require("/usr/share/nagvis/includes/classes/objects/NagVisServicegroup.php");
314 +require("/usr/share/nagvis/includes/classes/objects/NagVisMapObj.php");
315 +require("/usr/share/nagvis/includes/classes/objects/NagVisShape.php");
316 +require("/usr/share/nagvis/includes/classes/objects/NagVisTextbox.php");
318 // Load the main configuration
319 $MAINCFG = new GlobalMainCfg(CONST_MAINCFG);
320 diff -urNad nagvis-1.3.1~/wui/ajax_handler.php nagvis-1.3.1/wui/ajax_handler.php
321 --- nagvis-1.3.1~/wui/ajax_handler.php 2008-03-29 01:01:07.000000000 +0000
322 +++ nagvis-1.3.1/wui/ajax_handler.php 2008-09-27 12:52:10.000000000 +0000
323 @@ -29,22 +29,22 @@
324 @session_start();
326 // Include defines
327 -require("../nagvis/includes/defines/global.php");
328 -require("../nagvis/includes/defines/matches.php");
329 +require("/usr/share/nagvis/includes/defines/global.php");
330 +require("/usr/share/nagvis/includes/defines/matches.php");
332 // Include functions
333 -require("../nagvis/includes/functions/debug.php");
334 +require("/usr/share/nagvis/includes/functions/debug.php");
336 // Include needed global classes
337 -require("../nagvis/includes/classes/GlobalMainCfg.php");
338 -require("../nagvis/includes/classes/GlobalMapCfg.php");
339 -require("../nagvis/includes/classes/GlobalLanguage.php");
340 -require("../nagvis/includes/classes/GlobalPage.php");
341 -require("../nagvis/includes/classes/GlobalBackendMgmt.php");
342 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
343 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
344 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
345 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
346 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
348 // Include needed wui specific classes
349 -require("./includes/classes/WuiMainCfg.php");
350 -require("./includes/classes/WuiMapCfg.php");
351 +require("/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php");
352 +require("/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php");
354 // Load the main configuration
355 $MAINCFG = new WuiMainCfg(CONST_MAINCFG);
356 diff -urNad nagvis-1.3.1~/wui/form_handler.php nagvis-1.3.1/wui/form_handler.php
357 --- nagvis-1.3.1~/wui/form_handler.php 2008-03-29 01:01:07.000000000 +0000
358 +++ nagvis-1.3.1/wui/form_handler.php 2008-09-27 12:52:10.000000000 +0000
359 @@ -29,26 +29,26 @@
360 @session_start();
362 // Include defines
363 -require('../nagvis/includes/defines/global.php');
364 -require('../nagvis/includes/defines/matches.php');
365 +require('/usr/share/nagvis/includes/defines/global.php');
366 +require('/usr/share/nagvis/includes/defines/matches.php');
368 // Include global functions
369 -require('../nagvis/includes/functions/debug.php');
370 +require('/usr/share/nagvis/includes/functions/debug.php');
372 // Include needed WUI specific functions
373 -require('./includes/functions/form_handler.php');
374 +require('/usr/share/nagvis/wui/includes/functions/form_handler.php');
376 // Include needed global classes
377 -require('../nagvis/includes/classes/GlobalLanguage.php');
378 -require('../nagvis/includes/classes/GlobalMainCfg.php');
379 -require('../nagvis/includes/classes/GlobalPage.php');
380 -require('../nagvis/includes/classes/GlobalMapCfg.php');
381 -require('../nagvis/includes/classes/GlobalBackground.php');
382 +require('/usr/share/nagvis/includes/classes/GlobalLanguage.php');
383 +require('/usr/share/nagvis/includes/classes/GlobalMainCfg.php');
384 +require('/usr/share/nagvis/includes/classes/GlobalPage.php');
385 +require('/usr/share/nagvis/includes/classes/GlobalMapCfg.php');
386 +require('/usr/share/nagvis/includes/classes/GlobalBackground.php');
388 // Include needed WUI specific classes
389 -require('./includes/classes/WuiMainCfg.php');
390 -require('./includes/classes/WuiMapCfg.php');
391 -require('./includes/classes/WuiBackground.php');
392 +require('/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php');
393 +require('/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php');
394 +require('/usr/share/nagvis/wui/includes/classes/WuiBackground.php');
396 // Load the main configuration
397 $MAINCFG = new WuiMainCfg(CONST_MAINCFG);
398 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiAddModify.php nagvis-1.3.1/wui/includes/classes/WuiAddModify.php
399 --- nagvis-1.3.1~/wui/includes/classes/WuiAddModify.php 2008-05-23 09:15:21.000000000 +0000
400 +++ nagvis-1.3.1/wui/includes/classes/WuiAddModify.php 2008-09-27 12:52:10.000000000 +0000
401 @@ -51,10 +51,10 @@
402 $this->LANG = new GlobalLanguage($MAINCFG,'wui:addModify');
404 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
405 - 'cssIncludes'=>Array('./includes/css/wui.css'),
406 - 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/addmodify.js',
407 - './includes/js/ajax.js',
408 - './includes/js/wui.js'),
409 + 'cssIncludes'=>Array('./css/wui.css'),
410 + 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/addmodify.js',
411 + './js/ajax.js',
412 + './js/wui.js'),
413 'extHeader'=>Array(''),
414 'allowedUsers' => Array('EVERYONE'));
415 parent::GlobalPage($MAINCFG,$prop,'wui:addModify');
416 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiBackendManagement.php nagvis-1.3.1/wui/includes/classes/WuiBackendManagement.php
417 --- nagvis-1.3.1~/wui/includes/classes/WuiBackendManagement.php 2008-05-01 17:18:59.000000000 +0000
418 +++ nagvis-1.3.1/wui/includes/classes/WuiBackendManagement.php 2008-09-27 12:52:10.000000000 +0000
419 @@ -48,10 +48,10 @@
420 $this->LANG = new GlobalLanguage($MAINCFG,'wui:backendManagement');
422 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
423 - 'cssIncludes'=>Array('./includes/css/wui.css'),
424 - 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/wui.js',
425 - './includes/js/BackendManagement.js',
426 - './includes/js/ajax.js'),
427 + 'cssIncludes'=>Array('./css/wui.css'),
428 + 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/wui.js',
429 + './js/BackendManagement.js',
430 + './js/ajax.js'),
431 'extHeader'=>Array(''),
432 'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
433 'languageRoot' => 'wui:backendManagement');
434 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiBackgroundManagement.php nagvis-1.3.1/wui/includes/classes/WuiBackgroundManagement.php
435 --- nagvis-1.3.1~/wui/includes/classes/WuiBackgroundManagement.php 2008-05-01 17:18:59.000000000 +0000
436 +++ nagvis-1.3.1/wui/includes/classes/WuiBackgroundManagement.php 2008-09-27 12:52:10.000000000 +0000
437 @@ -46,10 +46,10 @@
438 $this->LANG = new GlobalLanguage($MAINCFG,'wui:backgroundManagement');
440 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
441 - 'cssIncludes'=>Array('./includes/css/wui.css'),
442 - 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/BackgroundManagement.js',
443 - './includes/js/ajax.js',
444 - './includes/js/wui.js'),
445 + 'cssIncludes'=>Array('./css/wui.css'),
446 + 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/BackgroundManagement.js',
447 + './js/ajax.js',
448 + './js/wui.js'),
449 'extHeader'=>Array(''),
450 'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
451 'languageRoot' => 'wui:backgroundManagement');
452 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiEditMainCfg.php nagvis-1.3.1/wui/includes/classes/WuiEditMainCfg.php
453 --- nagvis-1.3.1~/wui/includes/classes/WuiEditMainCfg.php 2008-05-01 19:33:17.000000000 +0000
454 +++ nagvis-1.3.1/wui/includes/classes/WuiEditMainCfg.php 2008-09-27 12:52:10.000000000 +0000
455 @@ -43,8 +43,8 @@
456 $this->LANG = new GlobalLanguage($MAINCFG,'wui:editMainCfg');
458 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
459 - 'cssIncludes'=>Array('./includes/css/wui.css'),
460 - 'jsIncludes'=>Array('./includes/js/wui.js','./includes/js/EditMainCfg.js'),
461 + 'cssIncludes'=>Array('./css/wui.css'),
462 + 'jsIncludes'=>Array('./js/wui.js','./js/EditMainCfg.js'),
463 'extHeader'=>Array(''),
464 'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
465 'languageRoot' => 'wui:editMainCfg');
466 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiFrontend.php nagvis-1.3.1/wui/includes/classes/WuiFrontend.php
467 --- nagvis-1.3.1~/wui/includes/classes/WuiFrontend.php 2008-05-18 20:53:20.000000000 +0000
468 +++ nagvis-1.3.1/wui/includes/classes/WuiFrontend.php 2008-09-27 12:52:10.000000000 +0000
469 @@ -44,13 +44,13 @@
470 $this->LANG = new GlobalLanguage($this->MAINCFG,'wui:global');
472 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
473 - 'cssIncludes'=>Array('../nagvis/includes/css/style.css','./includes/css/wui.css','./includes/css/office_xp/office_xp.css'),
474 - 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/wui.js',
475 - './includes/js/ajax.js',
476 - './includes/js/jsdomenu.js',
477 - './includes/js/jsdomenu.inc.js',
478 - './includes/js/wz_jsgraphics.js',
479 - './includes/js/wz_dragdrop.js'),
480 + 'cssIncludes'=>Array('../nagvis/includes/css/style.css','./css/wui.css','./css/office_xp/office_xp.css'),
481 + 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/wui.js',
482 + './js/ajax.js',
483 + './js/jsdomenu.js',
484 + './js/jsdomenu.inc.js',
485 + './js/wz_jsgraphics.js',
486 + './js/wz_dragdrop.js'),
487 'extHeader'=>Array("<style type=\"text/css\">body.main { background-color: ".$this->MAPCFG->getValue('global',0, 'background_color')."; }</style>"),
488 'allowedUsers' => $this->MAPCFG->getValue('global', 0,'allowed_for_config'),
489 'languageRoot' => 'wui:global');
490 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiMap.php nagvis-1.3.1/wui/includes/classes/WuiMap.php
491 --- nagvis-1.3.1~/wui/includes/classes/WuiMap.php 2008-05-01 20:33:58.000000000 +0000
492 +++ nagvis-1.3.1/wui/includes/classes/WuiMap.php 2008-09-27 12:52:10.000000000 +0000
493 @@ -144,7 +144,7 @@
494 $ret = array_merge($ret,$this->parseObjects());
495 $ret = array_merge($ret,$this->parseInvisible());
496 $ret = array_merge($ret,$this->makeObjectsMoveable());
497 - $ret = array_merge($ret,Array("<script type=\"text/javascript\" src=\"./includes/js/wz_tooltip.js\"></script>"));
498 + $ret = array_merge($ret,Array("<script type=\"text/javascript\" src=\"./js/wz_tooltip.js\"></script>"));
500 return $ret;
501 }
502 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiMapManagement.php nagvis-1.3.1/wui/includes/classes/WuiMapManagement.php
503 --- nagvis-1.3.1~/wui/includes/classes/WuiMapManagement.php 2008-05-01 17:18:59.000000000 +0000
504 +++ nagvis-1.3.1/wui/includes/classes/WuiMapManagement.php 2008-09-27 12:52:10.000000000 +0000
505 @@ -49,10 +49,10 @@
506 $this->LANG = new GlobalLanguage($MAINCFG,'wui:mapManagement');
508 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
509 - 'cssIncludes'=>Array('./includes/css/wui.css'),
510 - 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/map_management.js',
511 - './includes/js/ajax.js',
512 - './includes/js/wui.js'),
513 + 'cssIncludes'=>Array('./css/wui.css'),
514 + 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/map_management.js',
515 + './js/ajax.js',
516 + './js/wui.js'),
517 'extHeader'=>Array(''),
518 'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
519 'languageRoot' => 'wui:mapManagement');
520 diff -urNad nagvis-1.3.1~/wui/includes/classes/WuiShapeManagement.php nagvis-1.3.1/wui/includes/classes/WuiShapeManagement.php
521 --- nagvis-1.3.1~/wui/includes/classes/WuiShapeManagement.php 2008-05-01 17:18:59.000000000 +0000
522 +++ nagvis-1.3.1/wui/includes/classes/WuiShapeManagement.php 2008-09-27 12:52:10.000000000 +0000
523 @@ -47,10 +47,10 @@
524 $this->LANG = new GlobalLanguage($MAINCFG,'wui:shapeManagement');
526 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
527 - 'cssIncludes'=>Array('./includes/css/wui.css'),
528 - 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./includes/js/ShapeManagement.js',
529 - './includes/js/ajax.js',
530 - './includes/js/wui.js'),
531 + 'cssIncludes'=>Array('./css/wui.css'),
532 + 'jsIncludes'=>Array('../nagvis/includes/js/ajax.js','./js/ShapeManagement.js',
533 + './js/ajax.js',
534 + './js/wui.js'),
535 'extHeader'=>Array(''),
536 'allowedUsers' => $this->MAINCFG->getValue('wui','allowedforconfig'),
537 'languageRoot' => 'wui:shapeManagement');
538 diff -urNad nagvis-1.3.1~/wui/index.php nagvis-1.3.1/wui/index.php
539 --- nagvis-1.3.1~/wui/index.php 2008-06-06 11:19:25.000000000 +0000
540 +++ nagvis-1.3.1/wui/index.php 2008-09-27 12:52:10.000000000 +0000
541 @@ -29,25 +29,25 @@
542 @session_start();
544 // Include defines
545 -require("../nagvis/includes/defines/global.php");
546 -require("../nagvis/includes/defines/matches.php");
547 +require("/usr/share/nagvis/includes/defines/global.php");
548 +require("/usr/share/nagvis/includes/defines/matches.php");
550 // Include functions
551 -require("../nagvis/includes/functions/debug.php");
552 -require("../nagvis/includes/functions/oldPhpVersionFixes.php");
553 +require("/usr/share/nagvis/includes/functions/debug.php");
554 +require("/usr/share/nagvis/includes/functions/oldPhpVersionFixes.php");
556 // Include needed global classes
557 -require("../nagvis/includes/classes/GlobalMainCfg.php");
558 -require("../nagvis/includes/classes/GlobalMapCfg.php");
559 -require("../nagvis/includes/classes/GlobalLanguage.php");
560 -require("../nagvis/includes/classes/GlobalPage.php");
561 -require("../nagvis/includes/classes/GlobalMap.php");
562 -require("../nagvis/includes/classes/GlobalBackground.php");
563 -require("../nagvis/includes/classes/GlobalGraphic.php");
564 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
565 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
566 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
567 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
568 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
569 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
570 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
572 // Include needed wui specific classes
573 -require("./includes/classes/WuiMainCfg.php");
574 -require("./includes/classes/WuiMapCfg.php");
575 +require("/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php");
576 +require("/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php");
578 // Load the main configuration
579 $MAINCFG = new WuiMainCfg(CONST_MAINCFG);
580 @@ -61,8 +61,8 @@
581 switch($_GET['page']) {
582 case 'edit_config':
583 // Include page specific global/wui classes
584 - require("../nagvis/includes/classes/GlobalForm.php");
585 - require("./includes/classes/WuiEditMainCfg.php");
586 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
587 + require("/usr/share/nagvis/wui/includes/classes/WuiEditMainCfg.php");
589 $FRONTEND = new WuiEditMainCfg($MAINCFG);
590 $FRONTEND->getForm();
591 @@ -70,40 +70,40 @@
592 break;
593 case 'shape_management':
594 // Include page specific global/wui classes
595 - require("../nagvis/includes/classes/GlobalForm.php");
596 - require("./includes/classes/WuiShapeManagement.php");
597 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
598 + require("/usr/share/nagvis/wui/includes/classes/WuiShapeManagement.php");
600 $FRONTEND = new WuiShapeManagement($MAINCFG);
601 $FRONTEND->getForm();
602 break;
603 case 'background_management':
604 // Include page specific global/wui classes
605 - require("../nagvis/includes/classes/GlobalForm.php");
606 - require("./includes/classes/WuiBackgroundManagement.php");
607 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
608 + require("/usr/share/nagvis/wui/includes/classes/WuiBackgroundManagement.php");
610 $FRONTEND = new WuiBackgroundManagement($MAINCFG);
611 $FRONTEND->getForm();
612 break;
613 case 'map_management':
614 // Include page specific global/wui classes
615 - require("../nagvis/includes/classes/GlobalForm.php");
616 - require("./includes/classes/WuiMapManagement.php");
617 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
618 + require("/usr/share/nagvis/wui/includes/classes/WuiMapManagement.php");
620 $FRONTEND = new WuiMapManagement($MAINCFG);
621 $FRONTEND->getForm();
622 break;
623 case 'backend_management':
624 // Include page specific global/wui classes
625 - require("../nagvis/includes/classes/GlobalForm.php");
626 - require("./includes/classes/WuiBackendManagement.php");
627 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
628 + require("/usr/share/nagvis/wui/includes/classes/WuiBackendManagement.php");
630 $FRONTEND = new WuiBackendManagement($MAINCFG);
631 $FRONTEND->getForm();
632 break;
633 case 'addmodify':
634 // Include page specific global/wui classes
635 - require("../nagvis/includes/classes/GlobalForm.php");
636 - require("./includes/classes/WuiAddModify.php");
637 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
638 + require("/usr/share/nagvis/wui/includes/classes/WuiAddModify.php");
640 $MAPCFG = new WuiMapCfg($MAINCFG,$_GET['map']);
641 $MAPCFG->readMapConfig();
642 @@ -125,8 +125,8 @@
643 // Default is the wui map
645 // Include page specific global/wui classes
646 - require("./includes/classes/WuiFrontend.php");
647 - require("./includes/classes/WuiMap.php");
648 + require("/usr/share/nagvis/wui/includes/classes/WuiFrontend.php");
649 + require("/usr/share/nagvis/wui/includes/classes/WuiMap.php");
651 // Set empty map if none is set
652 if(!isset($_GET['map'])) {