17a4478d1d1dca3add8676110c8d3a622708fd63
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.2.1~/nagvis/draw.php nagvis-1.2.1/nagvis/draw.php
9 --- nagvis-1.2.1~/nagvis/draw.php 2007-10-20 16:28:44.000000000 +0200
10 +++ nagvis-1.2.1/nagvis/draw.php 2008-01-10 10:31:11.000000000 +0100
11 @@ -14,23 +14,23 @@
13 @session_start();
15 -require("./includes/defines/global.php");
16 -require("./includes/defines/matches.php");
17 +require("/usr/share/nagvis/includes/defines/global.php");
18 +require("/usr/share/nagvis/includes/defines/matches.php");
20 -require("./includes/functions/debug.php");
21 +require("/usr/share/nagvis/includes/functions/debug.php");
23 -require("./includes/classes/GlobalGraphic.php");
24 -require("./includes/classes/GlobalMainCfg.php");
25 -require("./includes/classes/GlobalMapCfg.php");
26 -require("./includes/classes/GlobalMap.php");
27 -require("./includes/classes/GlobalPage.php");
28 -require("./includes/classes/GlobalBackground.php");
29 -require("./includes/classes/GlobalLanguage.php");
30 -require("./includes/classes/GlobalBackendMgmt.php");
31 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
32 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
33 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
34 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
35 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
36 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
37 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
38 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
40 -require("./includes/classes/NagVisMap.php");
41 -require("./includes/classes/NagVisBackground.php");
42 -require("./includes/classes/NagVisMapCfg.php");
43 +require("/usr/share/nagvis/includes/classes/NagVisMap.php");
44 +require("/usr/share/nagvis/includes/classes/NagVisBackground.php");
45 +require("/usr/share/nagvis/includes/classes/NagVisMapCfg.php");
47 $MAINCFG = new GlobalMainCfg(CONST_MAINCFG);
49 diff -urNad nagvis-1.2.1~/nagvis/index.php nagvis-1.2.1/nagvis/index.php
50 --- nagvis-1.2.1~/nagvis/index.php 2007-12-13 08:50:14.000000000 +0100
51 +++ nagvis-1.2.1/nagvis/index.php 2008-01-10 10:28:50.000000000 +0100
52 @@ -14,23 +14,23 @@
54 @session_start();
56 -require("./includes/defines/global.php");
57 -require("./includes/defines/matches.php");
58 +require("/usr/share/nagvis/includes/defines/global.php");
59 +require("/usr/share/nagvis/includes/defines/matches.php");
61 -require("./includes/functions/debug.php");
62 +require("/usr/share/nagvis/includes/functions/debug.php");
64 -require("./includes/classes/GlobalMainCfg.php");
65 -require("./includes/classes/GlobalMapCfg.php");
66 -require("./includes/classes/GlobalLanguage.php");
67 -require("./includes/classes/GlobalPage.php");
68 -require("./includes/classes/GlobalMap.php");
69 -require("./includes/classes/GlobalBackground.php");
70 -require("./includes/classes/GlobalGraphic.php");
71 -require("./includes/classes/GlobalBackendMgmt.php");
72 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
73 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
74 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
75 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
76 +require("/usr/share/nagvis/includes/classes/GlobalMap.php");
77 +require("/usr/share/nagvis/includes/classes/GlobalBackground.php");
78 +require("/usr/share/nagvis/includes/classes/GlobalGraphic.php");
79 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
81 -require("./includes/classes/NagVisMapCfg.php");
82 -require("./includes/classes/NagVisMap.php");
83 -require("./includes/classes/NagVisFrontend.php");
84 +require("/usr/share/nagvis/includes/classes/NagVisMapCfg.php");
85 +require("/usr/share/nagvis/includes/classes/NagVisMap.php");
86 +require("/usr/share/nagvis/includes/classes/NagVisFrontend.php");
88 $MAINCFG = new GlobalMainCfg(CONST_MAINCFG);
90 diff -urNad nagvis-1.2.1~/wui/ajax_handler.php nagvis-1.2.1/wui/ajax_handler.php
91 --- nagvis-1.2.1~/wui/ajax_handler.php 2007-10-20 16:28:44.000000000 +0200
92 +++ nagvis-1.2.1/wui/ajax_handler.php 2008-01-10 10:32:43.000000000 +0100
93 @@ -2,19 +2,19 @@
95 @session_start();
97 -require("../nagvis/includes/defines/global.php");
98 -require("../nagvis/includes/defines/matches.php");
99 +require("/usr/share/nagvis/includes/defines/global.php");
100 +require("/usr/share/nagvis/includes/defines/matches.php");
102 -require("../nagvis/includes/functions/debug.php");
103 +require("/usr/share/nagvis/includes/functions/debug.php");
105 -require("../nagvis/includes/classes/GlobalMainCfg.php");
106 -require("../nagvis/includes/classes/GlobalMapCfg.php");
107 -require("../nagvis/includes/classes/GlobalLanguage.php");
108 -require("../nagvis/includes/classes/GlobalPage.php");
109 -require("../nagvis/includes/classes/GlobalBackendMgmt.php");
110 +require("/usr/share/nagvis/includes/classes/GlobalMainCfg.php");
111 +require("/usr/share/nagvis/includes/classes/GlobalMapCfg.php");
112 +require("/usr/share/nagvis/includes/classes/GlobalLanguage.php");
113 +require("/usr/share/nagvis/includes/classes/GlobalPage.php");
114 +require("/usr/share/nagvis/includes/classes/GlobalBackendMgmt.php");
116 -require("./includes/classes/WuiMainCfg.php");
117 -require("./includes/classes/WuiMapCfg.php");
118 +require("/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php");
119 +require("/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php");
121 $MAINCFG = new WuiMainCfg(CONST_MAINCFG);
123 diff -urNad nagvis-1.2.1~/wui/index.php nagvis-1.2.1/wui/index.php
124 --- nagvis-1.2.1~/wui/index.php 2007-10-20 16:28:44.000000000 +0200
125 +++ nagvis-1.2.1/wui/index.php 2008-01-10 10:36:36.000000000 +0100
126 @@ -14,21 +14,21 @@
128 @session_start();
130 -require("../nagvis/includes/defines/global.php");
131 -require("../nagvis/includes/defines/matches.php");
132 +require("/usr/share/nagvis/nagvis/includes/defines/global.php");
133 +require("/usr/share/nagvis/nagvis/includes/defines/matches.php");
135 -require("../nagvis/includes/functions/debug.php");
136 +require("/usr/share/nagvis/nagvis/includes/functions/debug.php");
138 -require("../nagvis/includes/classes/GlobalMainCfg.php");
139 -require("../nagvis/includes/classes/GlobalMapCfg.php");
140 -require("../nagvis/includes/classes/GlobalLanguage.php");
141 -require("../nagvis/includes/classes/GlobalPage.php");
142 -require("../nagvis/includes/classes/GlobalMap.php");
143 -require("../nagvis/includes/classes/GlobalBackground.php");
144 -require("../nagvis/includes/classes/GlobalGraphic.php");
145 +require("/usr/share/nagvis/nagvis/includes/classes/GlobalMainCfg.php");
146 +require("/usr/share/nagvis/nagvis/includes/classes/GlobalMapCfg.php");
147 +require("/usr/share/nagvis/nagvis/includes/classes/GlobalLanguage.php");
148 +require("/usr/share/nagvis/nagvis/includes/classes/GlobalPage.php");
149 +require("/usr/share/nagvis/nagvis/includes/classes/GlobalMap.php");
150 +require("/usr/share/nagvis/nagvis/includes/classes/GlobalBackground.php");
151 +require("/usr/share/nagvis/nagvis/includes/classes/GlobalGraphic.php");
153 -require("./includes/classes/WuiMainCfg.php");
154 -require("./includes/classes/WuiMapCfg.php");
155 +require("/usr/share/nagvis/wui/includes/classes/WuiMainCfg.php");
156 +require("/usr/share/nagvis/wui/includes/classes/WuiMapCfg.php");
158 $MAINCFG = new WuiMainCfg(CONST_MAINCFG);
160 @@ -40,40 +40,40 @@
161 // Display the wanted page, if nothing is set, display the map
162 switch($_GET['page']) {
163 case 'edit_config':
164 - require("../nagvis/includes/classes/GlobalForm.php");
165 - require("./includes/classes/WuiEditMainCfg.php");
166 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
167 + require("/usr/share/nagvis/wui//includes/classes/WuiEditMainCfg.php");
169 $FRONTEND = new WuiEditMainCfg($MAINCFG);
170 $FRONTEND->getForm();
171 $FRONTEND->printPage();
172 break;
173 case 'shape_management':
174 - require("../nagvis/includes/classes/GlobalForm.php");
175 - require("./includes/classes/WuiShapeManagement.php");
176 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
177 + require("/usr/share/nagvis/wui/includes/classes/WuiShapeManagement.php");
178 $FRONTEND = new WuiShapeManagement($MAINCFG);
179 $FRONTEND->getForm();
180 break;
181 case 'background_management':
182 - require("../nagvis/includes/classes/GlobalForm.php");
183 - require("./includes/classes/WuiBackgroundManagement.php");
184 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
185 + require("/usr/share/nagvis/wui/includes/classes/WuiBackgroundManagement.php");
186 $FRONTEND = new WuiBackgroundManagement($MAINCFG);
187 $FRONTEND->getForm();
188 break;
189 case 'map_management':
190 - require("../nagvis/includes/classes/GlobalForm.php");
191 - require("./includes/classes/WuiMapManagement.php");
192 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
193 + require("/usr/share/nagvis/wui/includes/classes/WuiMapManagement.php");
194 $FRONTEND = new WuiMapManagement($MAINCFG);
195 $FRONTEND->getForm();
196 break;
197 case 'backend_management':
198 - require("../nagvis/includes/classes/GlobalForm.php");
199 - require("./includes/classes/WuiBackendManagement.php");
200 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
201 + require("/usr/share/nagvis/wui/includes/classes/WuiBackendManagement.php");
202 $FRONTEND = new WuiBackendManagement($MAINCFG);
203 $FRONTEND->getForm();
204 break;
205 case 'addmodify':
206 - require("../nagvis/includes/classes/GlobalForm.php");
207 - require("./includes/classes/WuiAddModify.php");
208 + require("/usr/share/nagvis/includes/classes/GlobalForm.php");
209 + require("/usr/share/nagvis/wui/includes/classes/WuiAddModify.php");
211 $MAPCFG = new WuiMapCfg($MAINCFG,$_GET['map']);
212 $MAPCFG->readMapConfig();
213 @@ -92,8 +92,8 @@
214 $FRONTEND->getForm();
215 break;
216 default:
217 - require("./includes/classes/WuiFrontend.php");
218 - require("./includes/classes/WuiMap.php");
219 + require("/usr/share/nagvis/wui/includes/classes/WuiFrontend.php");
220 + require("/usr/share/nagvis/wui/includes/classes/WuiMap.php");
222 if(!isset($_GET['map'])) {
223 $_GET['map'] = '';