c292a53119caadb789e64b55654975ae15f311b7
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.1rc3~/nagvis/draw.php nagvis-1.1rc3/nagvis/draw.php
9 --- nagvis-1.1rc3~/nagvis/draw.php 2007-04-14 20:56:59.000000000 +0200
10 +++ nagvis-1.1rc3/nagvis/draw.php 2007-07-24 19:59:28.000000000 +0200
11 @@ -12,20 +12,20 @@
12 ## For developer guidlines have a look at http://www.nagvis.org ##
13 ##########################################################################
15 -require("./includes/classes/class.GlobalDebug.php");
16 -require("./includes/classes/class.GlobalGraphic.php");
17 -require("./includes/classes/class.GlobalMainCfg.php");
18 -require("./includes/classes/class.GlobalMapCfg.php");
19 -require("./includes/classes/class.GlobalMap.php");
20 -require("./includes/classes/class.GlobalPage.php");
21 -require("./includes/classes/class.GlobalLanguage.php");
22 -require("./includes/classes/class.GlobalBackendMgmt.php");
23 +require("/usr/share/nagvis/includes/classes/class.GlobalDebug.php");
24 +require("/usr/share/nagvis/includes/classes/class.GlobalGraphic.php");
25 +require("/usr/share/nagvis/includes/classes/class.GlobalMainCfg.php");
26 +require("/usr/share/nagvis/includes/classes/class.GlobalMapCfg.php");
27 +require("/usr/share/nagvis/includes/classes/class.GlobalMap.php");
28 +require("/usr/share/nagvis/includes/classes/class.GlobalPage.php");
29 +require("/usr/share/nagvis/includes/classes/class.GlobalLanguage.php");
30 +require("/usr/share/nagvis/includes/classes/class.GlobalBackendMgmt.php");
32 -require("./includes/classes/class.NagVisMap.php");
33 -require("./includes/classes/class.NagVisBackground.php");
34 -require("./includes/classes/class.NagVisMapCfg.php");
35 +require("/usr/share/nagvis/includes/classes/class.NagVisMap.php");
36 +require("/usr/share/nagvis/includes/classes/class.NagVisBackground.php");
37 +require("/usr/share/nagvis/includes/classes/class.NagVisMapCfg.php");
39 -$MAINCFG = new GlobalMainCfg('./etc/config.ini.php');
40 +$MAINCFG = new GlobalMainCfg('/etc/nagvis/config.ini.php');
42 $MAPCFG = new NagVisMapCfg($MAINCFG,$_GET['map']);
43 $MAPCFG->readMapConfig();
44 @@ -37,4 +37,4 @@
45 $BACKGROUND = new NagVisBackground($MAINCFG,$MAPCFG,$LANG,$BACKEND);
46 $BACKGROUND->parseObjects();
47 $BACKGROUND->parseMap();
48 -?>
49 \ No newline at end of file
50 +?>
51 diff -urNad nagvis-1.1rc3~/nagvis/etc/config.ini.php.dist nagvis-1.1rc3/nagvis/etc/config.ini.php.dist
52 --- nagvis-1.1rc3~/nagvis/etc/config.ini.php.dist 2007-06-08 14:37:34.000000000 +0200
53 +++ nagvis-1.1rc3/nagvis/etc/config.ini.php.dist 2007-07-24 19:59:28.000000000 +0200
54 @@ -57,11 +57,11 @@
55 ; path options
56 [paths]
57 ; absolute physical NagVis path
58 -;base="/usr/local/nagios/share/nagvis/"
59 +;base="/usr/share/nagvis/htdocs"
60 ; absolute html NagVis path
61 -;htmlbase="/nagios/nagvis"
62 +;htmlbase="/nagios2/nagvis"
63 ; absolute html NagVis cgi path
64 -;htmlcgi="/nagios/cgi-bin"
65 +;htmlcgi="/nagios2/cgi-bin"
67 ; options for the NDO-Backend
68 ; in this example the ID of the Backend is "ndomy_1" you can define another ID.
69 diff -urNad nagvis-1.1rc3~/nagvis/includes/classes/class.GlobalMainCfg.php nagvis-1.1rc3/nagvis/includes/classes/class.GlobalMainCfg.php
70 --- nagvis-1.1rc3~/nagvis/includes/classes/class.GlobalMainCfg.php 2007-07-24 00:31:44.000000000 +0200
71 +++ nagvis-1.1rc3/nagvis/includes/classes/class.GlobalMainCfg.php 2007-07-24 19:59:28.000000000 +0200
72 @@ -123,43 +123,43 @@
73 'type' => 'string'),
74 'htmlbase' => Array('must' => 1,
75 'editable' => 1,
76 - 'default' => '/nagios/nagvis',
77 + 'default' => '/nagios2/nagvis',
78 'type' => 'string'),
79 'htmlcgi' => Array('must' => 1,
80 'editable' => 1,
81 - 'default' => '/nagios/cgi-bin',
82 + 'default' => '/nagios2/cgi-bin',
83 'type' => 'string'),
84 'htmlimages' => Array('must' => 0,
85 'editable' => 0,
86 - 'default' => '/nagios/nagvis/nagvis/images/',
87 + 'default' => '/nagios2/nagvis/nagvis/images/',
88 'type' => 'string'),
89 'htmlhovertemplates' => Array('must' => 0,
90 'editable' => 0,
91 - 'default' => '/nagios/nagvis/nagvis/etc/templates/hover/',
92 + 'default' => '/nagios2/nagvis/nagvis/etc/templates/hover/',
93 'type' => 'string'),
94 'htmlheadertemplates' => Array('must' => 0,
95 'editable' => 0,
96 - 'default' => '/nagios/nagvis/nagvis/etc/templates/header/',
97 + 'default' => '/nagios2/nagvis/nagvis/etc/templates/header/',
98 'type' => 'string'),
99 'htmlhovertemplateimages' => Array('must' => 0,
100 'editable' => 0,
101 - 'default' => '/nagios/nagvis/nagvis/images/templates/hover/',
102 + 'default' => '/nagios2/nagvis/nagvis/images/templates/hover/',
103 'type' => 'string'),
104 'htmlheadertemplateimages' => Array('must' => 0,
105 'editable' => 0,
106 - 'default' => '/nagios/nagvis/nagvis/images/templates/header/',
107 + 'default' => '/nagios2/nagvis/nagvis/images/templates/header/',
108 'type' => 'string'),
109 'htmlicon' => Array('must' => 0,
110 'editable' => 0,
111 - 'default' => '/nagios/nagvis/nagvis/images/iconsets/',
112 + 'default' => '/nagios2/nagvis/nagvis/images/iconsets/',
113 'type' => 'string'),
114 'htmlshape' => Array('must' => 0,
115 'editable' => 0,
116 - 'default' => '/nagios/nagvis/nagvis/images/shape/',
117 + 'default' => '/nagvis/nagvis/images/shape/',
118 'type' => 'string'),
119 'htmlmap' => Array('must' => 0,
120 'editable' => 0,
121 - 'default' => '/nagios/nagvis/nagvis/images/maps/',
122 + 'default' => '/nagios2/nagvis/nagvis/images/maps/',
123 'type' => 'string'),
124 'htmldoku' => Array('must' => 1,
125 'editable' => 0,
126 @@ -216,7 +216,7 @@
127 'type' => 'string'),
128 'cgi' => Array('must' => 1,
129 'editable' => 1,
130 - 'default' => '/usr/local/nagios/sbin/',
131 + 'default' => '/usr/lib/cgi-bin/nagios2/',
132 'type' => 'string')))),
133 'internal' => Array('version' => Array('must' => 1,
134 'editable' => 0,
135 @@ -251,11 +251,11 @@
136 * @author Lars Michelsen <lars@vertical-visions.de>
137 */
138 function setPathsByBase($base,$htmlBase) {
139 - $this->validConfig['paths']['cfg']['default'] = $base.'nagvis/etc/';
140 + $this->validConfig['paths']['cfg']['default'] = '/etc/nagvis/';
141 $this->validConfig['paths']['icon']['default'] = $base.'nagvis/images/iconsets/';
142 $this->validConfig['paths']['shape']['default'] = $base.'nagvis/images/shapes/';
143 - $this->validConfig['paths']['language']['default'] = $base.'nagvis/includes/languages/';
144 - $this->validConfig['paths']['class']['default'] = $base.'nagvis/includes/classes/';
145 + $this->validConfig['paths']['language']['default'] = $base.'nagvis/languages/';
146 + $this->validConfig['paths']['class']['default'] = '/usr/share/nagvis/includes/classes/';
147 $this->validConfig['paths']['map']['default'] = $base.'nagvis/images/maps/';
148 $this->validConfig['paths']['hovertemplate']['default'] = $base.'nagvis/etc/templates/hover/';
149 $this->validConfig['paths']['headertemplate']['default'] = $base.'nagvis/etc/templates/header/';
150 diff -urNad nagvis-1.1rc3~/nagvis/includes/classes/class.NagVisFrontend.php nagvis-1.1rc3/nagvis/includes/classes/class.NagVisFrontend.php
151 --- nagvis-1.1rc3~/nagvis/includes/classes/class.NagVisFrontend.php 2007-07-11 15:55:47.000000000 +0200
152 +++ nagvis-1.1rc3/nagvis/includes/classes/class.NagVisFrontend.php 2007-07-24 19:59:28.000000000 +0200
153 @@ -25,8 +25,8 @@
154 $this->BACKEND = &$BACKEND;
155 $this->LANG = new GlobalLanguage($MAINCFG,'nagvis:global');
156 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
157 - 'cssIncludes'=>Array('./includes/css/style.css'),
158 - 'jsIncludes'=>Array('./includes/js/nagvis.js','./includes/js/overlib.js','./includes/js/overlib_shadow.js'),
159 + 'cssIncludes'=>Array('css/style.css'),
160 + 'jsIncludes'=>Array('js/nagvis.js','js/overlib.js','js/overlib_shadow.js'),
161 'extHeader'=>Array('<META http-equiv="refresh" CONTENT="'.$this->MAINCFG->getValue('global', 'refreshtime').';'.$this->getNextRotate().'">',
162 '<style type="text/css">body.main { background-color: '.$this->MAPCFG->getValue('global',0, 'background_color').'; }</style>'),
163 'allowedUsers'=> $this->MAPCFG->getValue('global',0, 'allowed_user'),
164 diff -urNad nagvis-1.1rc3~/nagvis/index.php nagvis-1.1rc3/nagvis/index.php
165 --- nagvis-1.1rc3~/nagvis/index.php 2007-06-06 16:55:01.000000000 +0200
166 +++ nagvis-1.1rc3/nagvis/index.php 2007-07-24 19:59:28.000000000 +0200
167 @@ -12,20 +12,20 @@
168 ## For developer guidlines have a look at http://www.nagvis.org ##
169 ##########################################################################
171 -require("./includes/classes/class.GlobalDebug.php");
172 -require("./includes/classes/class.GlobalMainCfg.php");
173 -require("./includes/classes/class.GlobalMapCfg.php");
174 -require("./includes/classes/class.GlobalLanguage.php");
175 -require("./includes/classes/class.GlobalPage.php");
176 -require("./includes/classes/class.GlobalMap.php");
177 -require("./includes/classes/class.GlobalGraphic.php");
178 -require("./includes/classes/class.GlobalBackendMgmt.php");
179 +require("/usr/share/nagvis/includes/classes/class.GlobalDebug.php");
180 +require("/usr/share/nagvis/includes/classes/class.GlobalMainCfg.php");
181 +require("/usr/share/nagvis/includes/classes/class.GlobalMapCfg.php");
182 +require("/usr/share/nagvis/includes/classes/class.GlobalLanguage.php");
183 +require("/usr/share/nagvis/includes/classes/class.GlobalPage.php");
184 +require("/usr/share/nagvis/includes/classes/class.GlobalMap.php");
185 +require("/usr/share/nagvis/includes/classes/class.GlobalGraphic.php");
186 +require("/usr/share/nagvis/includes/classes/class.GlobalBackendMgmt.php");
188 -require("./includes/classes/class.NagVisMapCfg.php");
189 -require("./includes/classes/class.NagVisMap.php");
190 -require("./includes/classes/class.NagVisFrontend.php");
191 +require("/usr/share/nagvis/includes/classes/class.NagVisMapCfg.php");
192 +require("/usr/share/nagvis/includes/classes/class.NagVisMap.php");
193 +require("/usr/share/nagvis/includes/classes/class.NagVisFrontend.php");
195 -$MAINCFG = new GlobalMainCfg('./etc/config.ini.php');
196 +$MAINCFG = new GlobalMainCfg('/etc/nagvis/config.ini.php');
198 if(!isset($_GET['map'])) {
199 $_GET['map'] = '';
200 @@ -59,4 +59,4 @@
202 $FRONTEND->printPage();
203 }
204 -?>
205 \ No newline at end of file
206 +?>
207 diff -urNad nagvis-1.1rc3~/wui/ajax_handler.php nagvis-1.1rc3/wui/ajax_handler.php
208 --- nagvis-1.1rc3~/wui/ajax_handler.php 2007-03-24 03:06:52.000000000 +0100
209 +++ nagvis-1.1rc3/wui/ajax_handler.php 2007-07-24 19:59:28.000000000 +0200
210 @@ -1,16 +1,16 @@
211 <?php
213 -require("../nagvis/includes/classes/class.GlobalDebug.php");
214 -require("../nagvis/includes/classes/class.GlobalMainCfg.php");
215 -require("../nagvis/includes/classes/class.GlobalMapCfg.php");
216 -require("../nagvis/includes/classes/class.GlobalLanguage.php");
217 -require("../nagvis/includes/classes/class.GlobalPage.php");
218 -require("../nagvis/includes/classes/class.GlobalBackendMgmt.php");
219 +require("/usr/share/nagvis/includes/classes/class.GlobalDebug.php");
220 +require("/usr/share/nagvis/includes/classes/class.GlobalMainCfg.php");
221 +require("/usr/share/nagvis/includes/classes/class.GlobalMapCfg.php");
222 +require("/usr/share/nagvis/includes/classes/class.GlobalLanguage.php");
223 +require("/usr/share/nagvis/includes/classes/class.GlobalPage.php");
224 +require("/usr/share/nagvis/includes/classes/class.GlobalBackendMgmt.php");
226 -require("./includes/classes/class.WuiMainCfg.php");
227 -require("./includes/classes/class.WuiMapCfg.php");
228 +require("/usr/share/nagvis/wui/includes/classes/class.WuiMainCfg.php");
229 +require("/usr/share/nagvis/wui/includes/classes/class.WuiMapCfg.php");
231 -$MAINCFG = new WuiMainCfg('../nagvis/etc/config.ini.php');
232 +$MAINCFG = new WuiMainCfg('/etc/nagvis/config.ini.php');
234 switch($_GET['action']) {
235 case 'getObjects':
236 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiAddModify.php nagvis-1.1rc3/wui/includes/classes/class.WuiAddModify.php
237 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiAddModify.php 2007-07-20 21:02:09.000000000 +0200
238 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiAddModify.php 2007-07-24 19:59:28.000000000 +0200
239 @@ -29,10 +29,10 @@
240 $this->LANG = new GlobalLanguage($MAINCFG,'wui:addModify');
242 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
243 - 'cssIncludes'=>Array('./includes/css/wui.css'),
244 - 'jsIncludes'=>Array('./includes/js/addmodify.js',
245 - './includes/js/ajax.js',
246 - './includes/js/wui.js'),
247 + 'cssIncludes'=>Array('css/wui.css'),
248 + 'jsIncludes'=>Array('js/addmodify.js',
249 + 'js/ajax.js',
250 + 'js/wui.js'),
251 'extHeader'=>Array(''),
252 'allowedUsers' => Array('EVERYONE'));
253 parent::GlobalPage($MAINCFG,$prop,'wui:addModify');
254 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiBackendManagement.php nagvis-1.1rc3/wui/includes/classes/class.WuiBackendManagement.php
255 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiBackendManagement.php 2007-07-13 20:57:57.000000000 +0200
256 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiBackendManagement.php 2007-07-24 19:59:28.000000000 +0200
257 @@ -26,10 +26,10 @@
258 $this->LANG = new GlobalLanguage($MAINCFG,'wui:backendManagement');
260 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
261 - 'cssIncludes'=>Array('./includes/css/wui.css'),
262 - 'jsIncludes'=>Array('./includes/js/wui.js',
263 - './includes/js/BackendManagement.js',
264 - './includes/js/ajax.js'),
265 + 'cssIncludes'=>Array('css/wui.css'),
266 + 'jsIncludes'=>Array('js/wui.js',
267 + 'js/BackendManagement.js',
268 + 'js/ajax.js'),
269 'extHeader'=>Array(''),
270 'allowedUsers' => Array('EVERYONE'),
271 'languageRoot' => 'wui:backendManagement');
272 @@ -277,4 +277,4 @@
273 return $ret;
274 }
275 }
276 -?>
277 \ No newline at end of file
278 +?>
279 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiBackgroundManagement.php nagvis-1.1rc3/wui/includes/classes/class.WuiBackgroundManagement.php
280 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiBackgroundManagement.php 2007-07-13 20:57:57.000000000 +0200
281 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiBackgroundManagement.php 2007-07-24 19:59:28.000000000 +0200
282 @@ -26,10 +26,10 @@
283 $this->LANG = new GlobalLanguage($MAINCFG,'wui:backgroundManagement');
285 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
286 - 'cssIncludes'=>Array('./includes/css/wui.css'),
287 - 'jsIncludes'=>Array('./includes/js/BackgroundManagement.js',
288 - './includes/js/ajax.js',
289 - './includes/js/wui.js'),
290 + 'cssIncludes'=>Array('css/wui.css'),
291 + 'jsIncludes'=>Array('js/BackgroundManagement.js',
292 + 'js/ajax.js',
293 + 'js/wui.js'),
294 'extHeader'=>Array(''),
295 'allowedUsers' => Array('EVERYONE'),
296 'languageRoot' => 'wui:backgroundManagement');
297 @@ -198,4 +198,4 @@
298 return $ret;
299 }
300 }
301 -?>
302 \ No newline at end of file
303 +?>
304 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiEditMainCfg.php nagvis-1.1rc3/wui/includes/classes/class.WuiEditMainCfg.php
305 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiEditMainCfg.php 2007-07-13 20:57:57.000000000 +0200
306 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiEditMainCfg.php 2007-07-24 19:59:28.000000000 +0200
307 @@ -23,8 +23,8 @@
308 $this->LANG = new GlobalLanguage($MAINCFG,'wui:editMainCfg');
310 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
311 - 'cssIncludes'=>Array('./includes/css/wui.css'),
312 - 'jsIncludes'=>Array('./includes/js/wui.js'),
313 + 'cssIncludes'=>Array('css/wui.css'),
314 + 'jsIncludes'=>Array('js/wui.js'),
315 'extHeader'=>Array(''),
316 'allowedUsers' => Array('EVERYONE'),
317 'languageRoot' => 'wui:editMainCfg');
318 @@ -289,4 +289,4 @@
319 return $ret;
320 }
321 }
322 -?>
323 \ No newline at end of file
324 +?>
325 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiFrontend.php nagvis-1.1rc3/wui/includes/classes/class.WuiFrontend.php
326 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiFrontend.php 2007-07-11 22:54:50.000000000 +0200
327 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiFrontend.php 2007-07-24 20:01:38.000000000 +0200
328 @@ -24,13 +24,13 @@
329 $this->LANG = new GlobalLanguage($this->MAINCFG,'wui:global');
331 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
332 - 'cssIncludes'=>Array('../nagvis/includes/css/style.css','./includes/css/wui.css','./includes/css/office_xp/office_xp.css'),
333 - 'jsIncludes'=>Array('./includes/js/wui.js',
334 - './includes/js/ajax.js',
335 - './includes/js/jsdomenu.js',
336 - './includes/js/jsdomenu.inc.js',
337 - './includes/js/wz_jsgraphics.js',
338 - './includes/js/wz_dragdrop.js'),
339 + 'cssIncludes'=>Array('../nagvis/css/style.css','css/wui.css','css/office_xp/office_xp.css'),
340 + 'jsIncludes'=>Array('js/wui.js',
341 + 'js/ajax.js',
342 + 'js/jsdomenu.js',
343 + 'js/jsdomenu.inc.js',
344 + 'js/wz_jsgraphics.js',
345 + 'js/wz_dragdrop.js'),
346 'extHeader'=>Array("<style type=\"text/css\">body.main { background-color: ".$this->MAPCFG->getValue('global',0, 'background_color')."; }</style>"),
347 'allowedUsers' => $this->MAPCFG->getValue('global', 0,'allowed_for_config'),
348 'languageRoot' => 'wui:global');
349 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiMap.php nagvis-1.1rc3/wui/includes/classes/class.WuiMap.php
350 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiMap.php 2007-07-22 12:25:12.000000000 +0200
351 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiMap.php 2007-07-24 19:59:28.000000000 +0200
352 @@ -114,7 +114,7 @@
353 $ret = array_merge($ret,$this->parseObjects());
354 $ret = array_merge($ret,$this->parseInvisible());
355 $ret = array_merge($ret,$this->makeObjectsMoveable());
356 - $ret = array_merge($ret,Array("<script type=\"text/javascript\" src=\"./includes/js/wz_tooltip.js\"></script>"));
357 + $ret = array_merge($ret,Array("<script type=\"text/javascript\" src=\"js/wz_tooltip.js\"></script>"));
359 if (DEBUG&&DEBUGLEVEL&1) debug('End method WuiMap::parseMap(): Array(HTML)');
360 return $ret;
361 @@ -535,4 +535,4 @@
362 if (DEBUG&&DEBUGLEVEL&1) debug('Start method WuiMap::parseInvisible(): Array(HTML)');
363 return $arr;
364 }
365 -}
366 \ No newline at end of file
367 +}
368 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiMapManagement.php nagvis-1.1rc3/wui/includes/classes/class.WuiMapManagement.php
369 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiMapManagement.php 2007-07-13 20:57:57.000000000 +0200
370 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiMapManagement.php 2007-07-24 19:59:28.000000000 +0200
371 @@ -29,10 +29,10 @@
372 $this->LANG = new GlobalLanguage($MAINCFG,'wui:mapManagement');
374 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
375 - 'cssIncludes'=>Array('./includes/css/wui.css'),
376 - 'jsIncludes'=>Array('./includes/js/map_management.js',
377 - './includes/js/ajax.js',
378 - './includes/js/wui.js'),
379 + 'cssIncludes'=>Array('css/wui.css'),
380 + 'jsIncludes'=>Array('js/map_management.js',
381 + 'js/ajax.js',
382 + 'js/wui.js'),
383 'extHeader'=>Array(''),
384 'allowedUsers' => Array('EVERYONE'),
385 'languageRoot' => 'wui:mapManagement');
386 @@ -340,4 +340,4 @@
387 return array_merge($FORM->getSubmitLine($label),$FORM->closeForm());
388 }
389 }
390 -?>
391 \ No newline at end of file
392 +?>
393 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiShapeManagement.php nagvis-1.1rc3/wui/includes/classes/class.WuiShapeManagement.php
394 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiShapeManagement.php 2007-06-20 18:16:07.000000000 +0200
395 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiShapeManagement.php 2007-07-24 19:59:28.000000000 +0200
396 @@ -21,10 +21,10 @@
397 $this->LANG = new GlobalLanguage($MAINCFG,'wui:shapeManagement');
399 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
400 - 'cssIncludes'=>Array('./includes/css/wui.css'),
401 - 'jsIncludes'=>Array('./includes/js/ShapeManagement.js',
402 - './includes/js/ajax.js',
403 - './includes/js/wui.js'),
404 + 'cssIncludes'=>Array('css/wui.css'),
405 + 'jsIncludes'=>Array('js/ShapeManagement.js',
406 + 'js/ajax.js',
407 + 'js/wui.js'),
408 'extHeader'=>Array(''),
409 'allowedUsers' => Array('EVERYONE'),
410 'languageRoot' => 'wui:shapeManagement');
411 @@ -155,4 +155,4 @@
412 if (DEBUG&&DEBUGLEVEL&1) debug('End method WuiShapeManagement::getJsLang(): Array(JS)');
413 return $ret;
414 }
415 -}
416 \ No newline at end of file
417 +}
418 diff -urNad nagvis-1.1rc3~/wui/index.php nagvis-1.1rc3/wui/index.php
419 --- nagvis-1.1rc3~/wui/index.php 2007-06-08 01:53:59.000000000 +0200
420 +++ nagvis-1.1rc3/wui/index.php 2007-07-24 19:59:28.000000000 +0200
421 @@ -12,18 +12,18 @@
422 ## For developer guidlines have a look at http://www.nagvis.org ##
423 ##########################################################################
425 -require("../nagvis/includes/classes/class.GlobalDebug.php");
426 -require("../nagvis/includes/classes/class.GlobalMainCfg.php");
427 -require("../nagvis/includes/classes/class.GlobalMapCfg.php");
428 -require("../nagvis/includes/classes/class.GlobalLanguage.php");
429 -require("../nagvis/includes/classes/class.GlobalPage.php");
430 -require("../nagvis/includes/classes/class.GlobalMap.php");
431 -require("../nagvis/includes/classes/class.GlobalGraphic.php");
432 +require("/usr/share/nagvis/includes/classes/class.GlobalDebug.php");
433 +require("/usr/share/nagvis/includes/classes/class.GlobalMainCfg.php");
434 +require("/usr/share/nagvis/includes/classes/class.GlobalMapCfg.php");
435 +require("/usr/share/nagvis/includes/classes/class.GlobalLanguage.php");
436 +require("/usr/share/nagvis/includes/classes/class.GlobalPage.php");
437 +require("/usr/share/nagvis/includes/classes/class.GlobalMap.php");
438 +require("/usr/share/nagvis/includes/classes/class.GlobalGraphic.php");
440 -require("./includes/classes/class.WuiMainCfg.php");
441 -require("./includes/classes/class.WuiMapCfg.php");
442 +require("/usr/share/nagvis/wui/includes/classes/class.WuiMainCfg.php");
443 +require("/usr/share/nagvis/wui/includes/classes/class.WuiMapCfg.php");
445 -$MAINCFG = new WuiMainCfg('../nagvis/etc/config.ini.php');
446 +$MAINCFG = new WuiMainCfg('/etc/nagvis/config.ini.php');
448 // If not set, initialize $_GET['page']
449 if(!isset($_GET['page'])) {
450 @@ -33,40 +33,40 @@
451 // Display the wanted page, if nothing is set, display the map
452 switch($_GET['page']) {
453 case 'edit_config':
454 - require("../nagvis/includes/classes/class.GlobalForm.php");
455 - require("./includes/classes/class.WuiEditMainCfg.php");
456 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
457 + require("/usr/share/nagvis/wui/includes/classes/class.WuiEditMainCfg.php");
459 $FRONTEND = new WuiEditMainCfg($MAINCFG);
460 $FRONTEND->getForm();
461 $FRONTEND->printPage();
462 break;
463 case 'shape_management':
464 - require("../nagvis/includes/classes/class.GlobalForm.php");
465 - require("./includes/classes/class.WuiShapeManagement.php");
466 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
467 + require("/usr/share/nagvis/wui/includes/classes/class.WuiShapeManagement.php");
468 $FRONTEND = new WuiShapeManagement($MAINCFG);
469 $FRONTEND->getForm();
470 break;
471 case 'background_management':
472 - require("../nagvis/includes/classes/class.GlobalForm.php");
473 - require("./includes/classes/class.WuiBackgroundManagement.php");
474 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
475 + require("/usr/share/nagvis/wui/includes/classes/class.WuiBackgroundManagement.php");
476 $FRONTEND = new WuiBackgroundManagement($MAINCFG);
477 $FRONTEND->getForm();
478 break;
479 case 'map_management':
480 - require("../nagvis/includes/classes/class.GlobalForm.php");
481 - require("./includes/classes/class.WuiMapManagement.php");
482 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
483 + require("/usr/share/nagvis/wui/includes/classes/class.WuiMapManagement.php");
484 $FRONTEND = new WuiMapManagement($MAINCFG);
485 $FRONTEND->getForm();
486 break;
487 case 'backend_management':
488 - require("../nagvis/includes/classes/class.GlobalForm.php");
489 - require("./includes/classes/class.WuiBackendManagement.php");
490 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
491 + require("/usr/share/nagvis/wui/includes/classes/class.WuiBackendManagement.php");
492 $FRONTEND = new WuiBackendManagement($MAINCFG);
493 $FRONTEND->getForm();
494 break;
495 case 'addmodify':
496 - require("../nagvis/includes/classes/class.GlobalForm.php");
497 - require("./includes/classes/class.WuiAddModify.php");
498 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
499 + require("/usr/share/nagvis/wui/includes/classes/class.WuiAddModify.php");
501 $MAPCFG = new WuiMapCfg($MAINCFG,$_GET['map']);
502 $MAPCFG->readMapConfig();
503 @@ -85,8 +85,8 @@
504 $FRONTEND->getForm();
505 break;
506 default:
507 - require("./includes/classes/class.WuiFrontend.php");
508 - require("./includes/classes/class.WuiMap.php");
509 + require("/usr/share/nagvis/wui/includes/classes/class.WuiFrontend.php");
510 + require("/usr/share/nagvis/wui/includes/classes/class.WuiMap.php");
512 if(!isset($_GET['map'])) {
513 $_GET['map'] = '';
514 @@ -118,4 +118,4 @@
516 // print the HTML page
517 $FRONTEND->printPage();
518 -?>
519 \ No newline at end of file
520 +?>
521 diff -urNad nagvis-1.1rc3~/wui/wui.function.inc.php nagvis-1.1rc3/wui/wui.function.inc.php
522 --- nagvis-1.1rc3~/wui/wui.function.inc.php 2007-07-11 22:30:42.000000000 +0200
523 +++ nagvis-1.1rc3/wui/wui.function.inc.php 2007-07-24 19:59:28.000000000 +0200
524 @@ -9,15 +9,15 @@
525 # http://www.walterzorn.com #
526 #################################################################################
528 -require('../nagvis/includes/classes/class.GlobalDebug.php');
529 -require('../nagvis/includes/classes/class.GlobalLanguage.php');
530 -require('../nagvis/includes/classes/class.GlobalMainCfg.php');
531 -require('../nagvis/includes/classes/class.GlobalPage.php');
532 -require('../nagvis/includes/classes/class.GlobalMapCfg.php');
533 -require('./includes/classes/class.WuiMainCfg.php');
534 -require('./includes/classes/class.WuiMapCfg.php');
535 +require('/usr/share/nagvis/includes/classes/class.GlobalDebug.php');
536 +require('/usr/share/nagvis/includes/classes/class.GlobalLanguage.php');
537 +require('/usr/share/nagvis/includes/classes/class.GlobalMainCfg.php');
538 +require('/usr/share/nagvis/includes/classes/class.GlobalPage.php');
539 +require('/usr/share/nagvis/includes/classes/class.GlobalMapCfg.php');
540 +require('/usr/share/nagvis/wui/includes/classes/class.WuiMainCfg.php');
541 +require('/usr/share/nagvis/wui/includes/classes/class.WuiMapCfg.php');
543 -$MAINCFG = new WuiMainCfg('../nagvis/etc/config.ini.php');
544 +$MAINCFG = new WuiMainCfg('/etc/nagvis/config.ini.php');
546 ############################################
547 function getArrayFromProperties($properties) {