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 diff -urNad nagvis-1.1rc3~/wui/ajax_handler.php nagvis-1.1rc3/wui/ajax_handler.php
201 --- nagvis-1.1rc3~/wui/ajax_handler.php 2007-03-24 03:06:52.000000000 +0100
202 +++ nagvis-1.1rc3/wui/ajax_handler.php 2007-07-24 19:59:28.000000000 +0200
203 @@ -1,16 +1,16 @@
204 <?php
206 -require("../nagvis/includes/classes/class.GlobalDebug.php");
207 -require("../nagvis/includes/classes/class.GlobalMainCfg.php");
208 -require("../nagvis/includes/classes/class.GlobalMapCfg.php");
209 -require("../nagvis/includes/classes/class.GlobalLanguage.php");
210 -require("../nagvis/includes/classes/class.GlobalPage.php");
211 -require("../nagvis/includes/classes/class.GlobalBackendMgmt.php");
212 +require("/usr/share/nagvis/includes/classes/class.GlobalDebug.php");
213 +require("/usr/share/nagvis/includes/classes/class.GlobalMainCfg.php");
214 +require("/usr/share/nagvis/includes/classes/class.GlobalMapCfg.php");
215 +require("/usr/share/nagvis/includes/classes/class.GlobalLanguage.php");
216 +require("/usr/share/nagvis/includes/classes/class.GlobalPage.php");
217 +require("/usr/share/nagvis/includes/classes/class.GlobalBackendMgmt.php");
219 -require("./includes/classes/class.WuiMainCfg.php");
220 -require("./includes/classes/class.WuiMapCfg.php");
221 +require("/usr/share/nagvis/wui/includes/classes/class.WuiMainCfg.php");
222 +require("/usr/share/nagvis/wui/includes/classes/class.WuiMapCfg.php");
224 -$MAINCFG = new WuiMainCfg('../nagvis/etc/config.ini.php');
225 +$MAINCFG = new WuiMainCfg('/etc/nagvis/config.ini.php');
227 switch($_GET['action']) {
228 case 'getObjects':
229 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiAddModify.php nagvis-1.1rc3/wui/includes/classes/class.WuiAddModify.php
230 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiAddModify.php 2007-07-20 21:02:09.000000000 +0200
231 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiAddModify.php 2007-07-24 19:59:28.000000000 +0200
232 @@ -29,10 +29,10 @@
233 $this->LANG = new GlobalLanguage($MAINCFG,'wui:addModify');
235 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
236 - 'cssIncludes'=>Array('./includes/css/wui.css'),
237 - 'jsIncludes'=>Array('./includes/js/addmodify.js',
238 - './includes/js/ajax.js',
239 - './includes/js/wui.js'),
240 + 'cssIncludes'=>Array('css/wui.css'),
241 + 'jsIncludes'=>Array('js/addmodify.js',
242 + 'js/ajax.js',
243 + 'js/wui.js'),
244 'extHeader'=>Array(''),
245 'allowedUsers' => Array('EVERYONE'));
246 parent::GlobalPage($MAINCFG,$prop,'wui:addModify');
247 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiBackendManagement.php nagvis-1.1rc3/wui/includes/classes/class.WuiBackendManagement.php
248 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiBackendManagement.php 2007-07-13 20:57:57.000000000 +0200
249 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiBackendManagement.php 2007-07-24 19:59:28.000000000 +0200
250 @@ -26,10 +26,10 @@
251 $this->LANG = new GlobalLanguage($MAINCFG,'wui:backendManagement');
253 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
254 - 'cssIncludes'=>Array('./includes/css/wui.css'),
255 - 'jsIncludes'=>Array('./includes/js/wui.js',
256 - './includes/js/BackendManagement.js',
257 - './includes/js/ajax.js'),
258 + 'cssIncludes'=>Array('css/wui.css'),
259 + 'jsIncludes'=>Array('js/wui.js',
260 + 'js/BackendManagement.js',
261 + 'js/ajax.js'),
262 'extHeader'=>Array(''),
263 'allowedUsers' => Array('EVERYONE'),
264 'languageRoot' => 'wui:backendManagement');
265 @@ -277,4 +277,4 @@
266 return $ret;
267 }
268 }
269 -?>
270 \ No newline at end of file
271 +?>
272 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiBackgroundManagement.php nagvis-1.1rc3/wui/includes/classes/class.WuiBackgroundManagement.php
273 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiBackgroundManagement.php 2007-07-13 20:57:57.000000000 +0200
274 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiBackgroundManagement.php 2007-07-24 19:59:28.000000000 +0200
275 @@ -26,10 +26,10 @@
276 $this->LANG = new GlobalLanguage($MAINCFG,'wui:backgroundManagement');
278 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
279 - 'cssIncludes'=>Array('./includes/css/wui.css'),
280 - 'jsIncludes'=>Array('./includes/js/BackgroundManagement.js',
281 - './includes/js/ajax.js',
282 - './includes/js/wui.js'),
283 + 'cssIncludes'=>Array('css/wui.css'),
284 + 'jsIncludes'=>Array('js/BackgroundManagement.js',
285 + 'js/ajax.js',
286 + 'js/wui.js'),
287 'extHeader'=>Array(''),
288 'allowedUsers' => Array('EVERYONE'),
289 'languageRoot' => 'wui:backgroundManagement');
290 @@ -198,4 +198,4 @@
291 return $ret;
292 }
293 }
294 -?>
295 \ No newline at end of file
296 +?>
297 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiEditMainCfg.php nagvis-1.1rc3/wui/includes/classes/class.WuiEditMainCfg.php
298 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiEditMainCfg.php 2007-07-13 20:57:57.000000000 +0200
299 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiEditMainCfg.php 2007-07-24 19:59:28.000000000 +0200
300 @@ -23,8 +23,8 @@
301 $this->LANG = new GlobalLanguage($MAINCFG,'wui:editMainCfg');
303 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
304 - 'cssIncludes'=>Array('./includes/css/wui.css'),
305 - 'jsIncludes'=>Array('./includes/js/wui.js'),
306 + 'cssIncludes'=>Array('css/wui.css'),
307 + 'jsIncludes'=>Array('js/wui.js'),
308 'extHeader'=>Array(''),
309 'allowedUsers' => Array('EVERYONE'),
310 'languageRoot' => 'wui:editMainCfg');
311 @@ -289,4 +289,4 @@
312 return $ret;
313 }
314 }
315 -?>
316 \ No newline at end of file
317 +?>
318 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiFrontend.php nagvis-1.1rc3/wui/includes/classes/class.WuiFrontend.php
319 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiFrontend.php 2007-07-11 22:54:50.000000000 +0200
320 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiFrontend.php 2007-07-24 20:01:38.000000000 +0200
321 @@ -24,13 +24,13 @@
322 $this->LANG = new GlobalLanguage($this->MAINCFG,'wui:global');
324 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
325 - 'cssIncludes'=>Array('../nagvis/includes/css/style.css','./includes/css/wui.css','./includes/css/office_xp/office_xp.css'),
326 - 'jsIncludes'=>Array('./includes/js/wui.js',
327 - './includes/js/ajax.js',
328 - './includes/js/jsdomenu.js',
329 - './includes/js/jsdomenu.inc.js',
330 - './includes/js/wz_jsgraphics.js',
331 - './includes/js/wz_dragdrop.js'),
332 + 'cssIncludes'=>Array('../nagvis/css/style.css','css/wui.css','css/office_xp/office_xp.css'),
333 + 'jsIncludes'=>Array('js/wui.js',
334 + 'js/ajax.js',
335 + 'js/jsdomenu.js',
336 + 'js/jsdomenu.inc.js',
337 + 'js/wz_jsgraphics.js',
338 + 'js/wz_dragdrop.js'),
339 'extHeader'=>Array("<style type=\"text/css\">body.main { background-color: ".$this->MAPCFG->getValue('global',0, 'background_color')."; }</style>"),
340 'allowedUsers' => $this->MAPCFG->getValue('global', 0,'allowed_for_config'),
341 'languageRoot' => 'wui:global');
342 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiMap.php nagvis-1.1rc3/wui/includes/classes/class.WuiMap.php
343 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiMap.php 2007-07-22 12:25:12.000000000 +0200
344 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiMap.php 2007-07-24 19:59:28.000000000 +0200
345 @@ -114,7 +114,7 @@
346 $ret = array_merge($ret,$this->parseObjects());
347 $ret = array_merge($ret,$this->parseInvisible());
348 $ret = array_merge($ret,$this->makeObjectsMoveable());
349 - $ret = array_merge($ret,Array("<script type=\"text/javascript\" src=\"./includes/js/wz_tooltip.js\"></script>"));
350 + $ret = array_merge($ret,Array("<script type=\"text/javascript\" src=\"js/wz_tooltip.js\"></script>"));
352 if (DEBUG&&DEBUGLEVEL&1) debug('End method WuiMap::parseMap(): Array(HTML)');
353 return $ret;
354 @@ -535,4 +535,4 @@
355 if (DEBUG&&DEBUGLEVEL&1) debug('Start method WuiMap::parseInvisible(): Array(HTML)');
356 return $arr;
357 }
358 -}
359 \ No newline at end of file
360 +}
361 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiMapManagement.php nagvis-1.1rc3/wui/includes/classes/class.WuiMapManagement.php
362 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiMapManagement.php 2007-07-13 20:57:57.000000000 +0200
363 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiMapManagement.php 2007-07-24 19:59:28.000000000 +0200
364 @@ -29,10 +29,10 @@
365 $this->LANG = new GlobalLanguage($MAINCFG,'wui:mapManagement');
367 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
368 - 'cssIncludes'=>Array('./includes/css/wui.css'),
369 - 'jsIncludes'=>Array('./includes/js/map_management.js',
370 - './includes/js/ajax.js',
371 - './includes/js/wui.js'),
372 + 'cssIncludes'=>Array('css/wui.css'),
373 + 'jsIncludes'=>Array('js/map_management.js',
374 + 'js/ajax.js',
375 + 'js/wui.js'),
376 'extHeader'=>Array(''),
377 'allowedUsers' => Array('EVERYONE'),
378 'languageRoot' => 'wui:mapManagement');
379 @@ -340,4 +340,4 @@
380 return array_merge($FORM->getSubmitLine($label),$FORM->closeForm());
381 }
382 }
383 -?>
384 \ No newline at end of file
385 +?>
386 diff -urNad nagvis-1.1rc3~/wui/includes/classes/class.WuiShapeManagement.php nagvis-1.1rc3/wui/includes/classes/class.WuiShapeManagement.php
387 --- nagvis-1.1rc3~/wui/includes/classes/class.WuiShapeManagement.php 2007-06-20 18:16:07.000000000 +0200
388 +++ nagvis-1.1rc3/wui/includes/classes/class.WuiShapeManagement.php 2007-07-24 19:59:28.000000000 +0200
389 @@ -21,10 +21,10 @@
390 $this->LANG = new GlobalLanguage($MAINCFG,'wui:shapeManagement');
392 $prop = Array('title'=>$MAINCFG->getValue('internal', 'title'),
393 - 'cssIncludes'=>Array('./includes/css/wui.css'),
394 - 'jsIncludes'=>Array('./includes/js/ShapeManagement.js',
395 - './includes/js/ajax.js',
396 - './includes/js/wui.js'),
397 + 'cssIncludes'=>Array('css/wui.css'),
398 + 'jsIncludes'=>Array('js/ShapeManagement.js',
399 + 'js/ajax.js',
400 + 'js/wui.js'),
401 'extHeader'=>Array(''),
402 'allowedUsers' => Array('EVERYONE'),
403 'languageRoot' => 'wui:shapeManagement');
404 @@ -155,4 +155,4 @@
405 if (DEBUG&&DEBUGLEVEL&1) debug('End method WuiShapeManagement::getJsLang(): Array(JS)');
406 return $ret;
407 }
408 -}
409 \ No newline at end of file
410 +}
411 diff -urNad nagvis-1.1rc3~/wui/index.php nagvis-1.1rc3/wui/index.php
412 --- nagvis-1.1rc3~/wui/index.php 2007-06-08 01:53:59.000000000 +0200
413 +++ nagvis-1.1rc3/wui/index.php 2007-07-24 19:59:28.000000000 +0200
414 @@ -12,18 +12,18 @@
415 ## For developer guidlines have a look at http://www.nagvis.org ##
416 ##########################################################################
418 -require("../nagvis/includes/classes/class.GlobalDebug.php");
419 -require("../nagvis/includes/classes/class.GlobalMainCfg.php");
420 -require("../nagvis/includes/classes/class.GlobalMapCfg.php");
421 -require("../nagvis/includes/classes/class.GlobalLanguage.php");
422 -require("../nagvis/includes/classes/class.GlobalPage.php");
423 -require("../nagvis/includes/classes/class.GlobalMap.php");
424 -require("../nagvis/includes/classes/class.GlobalGraphic.php");
425 +require("/usr/share/nagvis/includes/classes/class.GlobalDebug.php");
426 +require("/usr/share/nagvis/includes/classes/class.GlobalMainCfg.php");
427 +require("/usr/share/nagvis/includes/classes/class.GlobalMapCfg.php");
428 +require("/usr/share/nagvis/includes/classes/class.GlobalLanguage.php");
429 +require("/usr/share/nagvis/includes/classes/class.GlobalPage.php");
430 +require("/usr/share/nagvis/includes/classes/class.GlobalMap.php");
431 +require("/usr/share/nagvis/includes/classes/class.GlobalGraphic.php");
433 -require("./includes/classes/class.WuiMainCfg.php");
434 -require("./includes/classes/class.WuiMapCfg.php");
435 +require("/usr/share/nagvis/wui/includes/classes/class.WuiMainCfg.php");
436 +require("/usr/share/nagvis/wui/includes/classes/class.WuiMapCfg.php");
438 -$MAINCFG = new WuiMainCfg('../nagvis/etc/config.ini.php');
439 +$MAINCFG = new WuiMainCfg('/etc/nagvis/config.ini.php');
441 // If not set, initialize $_GET['page']
442 if(!isset($_GET['page'])) {
443 @@ -33,40 +33,40 @@
444 // Display the wanted page, if nothing is set, display the map
445 switch($_GET['page']) {
446 case 'edit_config':
447 - require("../nagvis/includes/classes/class.GlobalForm.php");
448 - require("./includes/classes/class.WuiEditMainCfg.php");
449 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
450 + require("/usr/share/nagvis/wui/includes/classes/class.WuiEditMainCfg.php");
452 $FRONTEND = new WuiEditMainCfg($MAINCFG);
453 $FRONTEND->getForm();
454 $FRONTEND->printPage();
455 break;
456 case 'shape_management':
457 - require("../nagvis/includes/classes/class.GlobalForm.php");
458 - require("./includes/classes/class.WuiShapeManagement.php");
459 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
460 + require("/usr/share/nagvis/wui/includes/classes/class.WuiShapeManagement.php");
461 $FRONTEND = new WuiShapeManagement($MAINCFG);
462 $FRONTEND->getForm();
463 break;
464 case 'background_management':
465 - require("../nagvis/includes/classes/class.GlobalForm.php");
466 - require("./includes/classes/class.WuiBackgroundManagement.php");
467 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
468 + require("/usr/share/nagvis/wui/includes/classes/class.WuiBackgroundManagement.php");
469 $FRONTEND = new WuiBackgroundManagement($MAINCFG);
470 $FRONTEND->getForm();
471 break;
472 case 'map_management':
473 - require("../nagvis/includes/classes/class.GlobalForm.php");
474 - require("./includes/classes/class.WuiMapManagement.php");
475 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
476 + require("/usr/share/nagvis/wui/includes/classes/class.WuiMapManagement.php");
477 $FRONTEND = new WuiMapManagement($MAINCFG);
478 $FRONTEND->getForm();
479 break;
480 case 'backend_management':
481 - require("../nagvis/includes/classes/class.GlobalForm.php");
482 - require("./includes/classes/class.WuiBackendManagement.php");
483 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
484 + require("/usr/share/nagvis/wui/includes/classes/class.WuiBackendManagement.php");
485 $FRONTEND = new WuiBackendManagement($MAINCFG);
486 $FRONTEND->getForm();
487 break;
488 case 'addmodify':
489 - require("../nagvis/includes/classes/class.GlobalForm.php");
490 - require("./includes/classes/class.WuiAddModify.php");
491 + require("/usr/share/nagvis/includes/classes/class.GlobalForm.php");
492 + require("/usr/share/nagvis/wui/includes/classes/class.WuiAddModify.php");
494 $MAPCFG = new WuiMapCfg($MAINCFG,$_GET['map']);
495 $MAPCFG->readMapConfig();
496 @@ -85,8 +85,8 @@
497 $FRONTEND->getForm();
498 break;
499 default:
500 - require("./includes/classes/class.WuiFrontend.php");
501 - require("./includes/classes/class.WuiMap.php");
502 + require("/usr/share/nagvis/wui/includes/classes/class.WuiFrontend.php");
503 + require("/usr/share/nagvis/wui/includes/classes/class.WuiMap.php");
505 if(!isset($_GET['map'])) {
506 $_GET['map'] = '';
507 @@ -118,4 +118,4 @@
509 // print the HTML page
510 $FRONTEND->printPage();
511 -?>
512 \ No newline at end of file
513 +?>
514 diff -urNad nagvis-1.1rc3~/wui/wui.function.inc.php nagvis-1.1rc3/wui/wui.function.inc.php
515 --- nagvis-1.1rc3~/wui/wui.function.inc.php 2007-07-11 22:30:42.000000000 +0200
516 +++ nagvis-1.1rc3/wui/wui.function.inc.php 2007-07-24 19:59:28.000000000 +0200
517 @@ -9,15 +9,15 @@
518 # http://www.walterzorn.com #
519 #################################################################################
521 -require('../nagvis/includes/classes/class.GlobalDebug.php');
522 -require('../nagvis/includes/classes/class.GlobalLanguage.php');
523 -require('../nagvis/includes/classes/class.GlobalMainCfg.php');
524 -require('../nagvis/includes/classes/class.GlobalPage.php');
525 -require('../nagvis/includes/classes/class.GlobalMapCfg.php');
526 -require('./includes/classes/class.WuiMainCfg.php');
527 -require('./includes/classes/class.WuiMapCfg.php');
528 +require('/usr/share/nagvis/includes/classes/class.GlobalDebug.php');
529 +require('/usr/share/nagvis/includes/classes/class.GlobalLanguage.php');
530 +require('/usr/share/nagvis/includes/classes/class.GlobalMainCfg.php');
531 +require('/usr/share/nagvis/includes/classes/class.GlobalPage.php');
532 +require('/usr/share/nagvis/includes/classes/class.GlobalMapCfg.php');
533 +require('/usr/share/nagvis/wui/includes/classes/class.WuiMainCfg.php');
534 +require('/usr/share/nagvis/wui/includes/classes/class.WuiMapCfg.php');
536 -$MAINCFG = new WuiMainCfg('../nagvis/etc/config.ini.php');
537 +$MAINCFG = new WuiMainCfg('/etc/nagvis/config.ini.php');
539 ############################################
540 function getArrayFromProperties($properties) {