Merge lp:~alexharrington/xibo/1.1-fix-translations into lp:~dangarner/xibo/translate-xibo
- 1.1-fix-translations
- Merge into translate-xibo
Proposed by
Alex Harrington
Status: | Merged |
---|---|
Approved by: | Dan Garner |
Approved revision: | 53 |
Merged at revision: | not available |
Proposed branch: | lp:~alexharrington/xibo/1.1-fix-translations |
Merge into: | lp:~dangarner/xibo/translate-xibo |
Diff against target: | None lines |
To merge this branch: | bzr merge lp:~alexharrington/xibo/1.1-fix-translations |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dan Garner | Approve | ||
Review via email: mp+5905@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'server/config/config.class.php' | |||
2 | --- server/config/config.class.php 2009-04-05 19:44:26 +0000 | |||
3 | +++ server/config/config.class.php 2009-04-26 15:11:53 +0000 | |||
4 | @@ -120,182 +120,149 @@ | |||
5 | 120 | $output .= '<div class="checks">'; | 120 | $output .= '<div class="checks">'; |
6 | 121 | 121 | ||
7 | 122 | // Check for PHP version | 122 | // Check for PHP version |
9 | 123 | $message = 'PHP Version 5.0.2 or later'; | 123 | $message = __('PHP Version 5.0.2 or later'); |
10 | 124 | 124 | ||
11 | 125 | if ($this->CheckPHP()) | 125 | if ($this->CheckPHP()) |
12 | 126 | { | 126 | { |
14 | 127 | $output .= $imgGood.$message.'<br />'; | 127 | $output .= $imgGood.' '.$message.'<br />'; |
15 | 128 | } | 128 | } |
16 | 129 | else | 129 | else |
17 | 130 | { | 130 | { |
18 | 131 | $this->envFault = true; | 131 | $this->envFault = true; |
19 | 132 | 132 | ||
26 | 133 | $output .= $imgBad.$message.'<br />'; | 133 | $output .= $imgBad.' '.$message.'<br />'; |
27 | 134 | $output .= <<<END | 134 | $output .= '<div class="check_explain"> <p>' . __("Xibo requires PHP version 5.0.2 or later.") . '</p></div>'; |
22 | 135 | <div class="check_explain"> | ||
23 | 136 | <p>Xibo requires PHP version 5.0.2 or later.</p> | ||
24 | 137 | </div> | ||
25 | 138 | END; | ||
28 | 139 | } | 135 | } |
29 | 140 | 136 | ||
30 | 141 | // Check for file system permissions | 137 | // Check for file system permissions |
32 | 142 | $message = 'Filesystem Permissions'; | 138 | $message = __('Filesystem Permissions'); |
33 | 143 | 139 | ||
34 | 144 | if ($this->CheckFsPermissions()) | 140 | if ($this->CheckFsPermissions()) |
35 | 145 | { | 141 | { |
37 | 146 | $output .= $imgGood.$message.'<br />'; | 142 | $output .= $imgGood.' '.$message.'<br />'; |
38 | 147 | } | 143 | } |
39 | 148 | else | 144 | else |
40 | 149 | { | 145 | { |
41 | 150 | $this->envFault = true; | 146 | $this->envFault = true; |
42 | 151 | 147 | ||
44 | 152 | $output .= $imgBad.$message.'<br />'; | 148 | $output .= $imgBad.' '.$message.'<br />'; |
45 | 149 | $output .= '<div class="check_explain"><p>' . __("Xibo needs to be able to write to the following:"); | ||
46 | 153 | $output .= <<<END | 150 | $output .= <<<END |
47 | 154 | <div class="check_explain"> | ||
48 | 155 | <p>Xibo needs to be able to write to the following | ||
49 | 156 | <ul> | 151 | <ul> |
50 | 157 | <li> settings.php | 152 | <li> settings.php |
51 | 158 | <li> install.php | 153 | <li> install.php |
53 | 159 | <li> upgrade.php | 154 | <li> upgrade.php |
54 | 160 | </ul> | 155 | </ul> |
55 | 161 | Please fix this, and retest.</p> | ||
56 | 162 | </div> | ||
57 | 163 | END; | 156 | END; |
58 | 157 | $output .= __('Please fix this, and retest.') . '</p></div>'; | ||
59 | 164 | } | 158 | } |
60 | 165 | 159 | ||
61 | 166 | // Check for MySQL | 160 | // Check for MySQL |
63 | 167 | $message = 'MySQL'; | 161 | $message = __('MySQL Extension'); |
64 | 168 | 162 | ||
65 | 169 | if ($this->CheckMySQL()) | 163 | if ($this->CheckMySQL()) |
66 | 170 | { | 164 | { |
68 | 171 | $output .= $imgGood.$message.'<br />'; | 165 | $output .= $imgGood.' '.$message.'<br />'; |
69 | 172 | } | 166 | } |
70 | 173 | else | 167 | else |
71 | 174 | { | 168 | { |
72 | 175 | $this->envFault = true; | 169 | $this->envFault = true; |
73 | 176 | 170 | ||
80 | 177 | $output .= $imgBad.$message.'<br />'; | 171 | $output .= $imgBad.' '.$message.'<br />'; |
81 | 178 | $output .= <<<END | 172 | $output .= '<div class="check_explain"><p>' . __('Xibo requires a MySQL database. Ensure PHP MySQL client extension is installed') . '</p></div>'; |
76 | 179 | <div class="check_explain"> | ||
77 | 180 | <p>Xibo requires a MySQL database.</p> | ||
78 | 181 | </div> | ||
79 | 182 | END; | ||
82 | 183 | } | 173 | } |
83 | 184 | 174 | ||
84 | 185 | // Check for JSON | 175 | // Check for JSON |
86 | 186 | $message = 'JSON Extension'; | 176 | $message = __('JSON Extension'); |
87 | 187 | 177 | ||
88 | 188 | if ($this->CheckJson()) | 178 | if ($this->CheckJson()) |
89 | 189 | { | 179 | { |
91 | 190 | $output .= $imgGood.$message.'<br />'; | 180 | $output .= $imgGood.' '.$message.'<br />'; |
92 | 191 | } | 181 | } |
93 | 192 | else | 182 | else |
94 | 193 | { | 183 | { |
95 | 194 | $this->envFault = true; | 184 | $this->envFault = true; |
96 | 195 | 185 | ||
103 | 196 | $output .= $imgBad.$message.'<br />'; | 186 | $output .= $imgBad.' '.$message.'<br />'; |
104 | 197 | $output .= <<<END | 187 | $output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP JSON extension to function.') . '</p></div>'; |
99 | 198 | <div class="check_explain"> | ||
100 | 199 | <p>Xibo needs the PHP JSON extension to function.</p> | ||
101 | 200 | </div> | ||
102 | 201 | END; | ||
105 | 202 | } | 188 | } |
106 | 203 | 189 | ||
107 | 204 | // Check for GD (graphics) | 190 | // Check for GD (graphics) |
109 | 205 | $message = 'GD Extension'; | 191 | $message = __('GD Extension'); |
110 | 206 | 192 | ||
111 | 207 | if ($this->CheckGd()) | 193 | if ($this->CheckGd()) |
112 | 208 | { | 194 | { |
114 | 209 | $output .= $imgGood.$message.'<br />'; | 195 | $output .= $imgGood.' '.$message.'<br />'; |
115 | 210 | } | 196 | } |
116 | 211 | else | 197 | else |
117 | 212 | { | 198 | { |
118 | 213 | $this->envFault = true; | 199 | $this->envFault = true; |
119 | 214 | 200 | ||
126 | 215 | $output .= $imgBad.$message.'<br />'; | 201 | $output .= $imgBad.' '.$message.'<br />'; |
127 | 216 | $output .= <<<END | 202 | $output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP GD extension to function.') . '</p></div>'; |
122 | 217 | <div class="check_explain"> | ||
123 | 218 | <p>Xibo needs the PHP GD extension to function.</p> | ||
124 | 219 | </div> | ||
125 | 220 | END; | ||
128 | 221 | } | 203 | } |
129 | 222 | 204 | ||
130 | 223 | 205 | ||
131 | 224 | // Check for Calendar | 206 | // Check for Calendar |
133 | 225 | $message = 'Calendar Extension'; | 207 | $message = __('Calendar Extension'); |
134 | 226 | 208 | ||
135 | 227 | if ($this->CheckCal()) | 209 | if ($this->CheckCal()) |
136 | 228 | { | 210 | { |
138 | 229 | $output .= $imgGood.$message.'<br />'; | 211 | $output .= $imgGood.' '.$message.'<br />'; |
139 | 230 | } | 212 | } |
140 | 231 | else | 213 | else |
141 | 232 | { | 214 | { |
142 | 233 | $this->envFault = true; | 215 | $this->envFault = true; |
143 | 234 | 216 | ||
150 | 235 | $output .= $imgBad.$message.'<br />'; | 217 | $output .= $imgBad.' '.$message.'<br />'; |
151 | 236 | $output .= <<<END | 218 | $output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP Calendar extension to function.') . '</p></div>'; |
146 | 237 | <div class="check_explain"> | ||
147 | 238 | <p>Xibo needs the PHP Calendar extension to function.</p> | ||
148 | 239 | </div> | ||
149 | 240 | END; | ||
152 | 241 | } | 219 | } |
153 | 242 | 220 | ||
154 | 243 | // Check for DOM | 221 | // Check for DOM |
156 | 244 | $message = 'DOM Extension'; | 222 | $message = __('DOM Extension'); |
157 | 245 | 223 | ||
158 | 246 | if ($this->CheckDom()) | 224 | if ($this->CheckDom()) |
159 | 247 | { | 225 | { |
161 | 248 | $output .= $imgGood.$message.'<br />'; | 226 | $output .= $imgGood.' '.$message.'<br />'; |
162 | 249 | } | 227 | } |
163 | 250 | else | 228 | else |
164 | 251 | { | 229 | { |
165 | 252 | $this->envFault = true; | 230 | $this->envFault = true; |
166 | 253 | 231 | ||
173 | 254 | $output .= $imgBad.$message.'<br />'; | 232 | $output .= $imgBad.' '.$message.'<br />'; |
174 | 255 | $output .= <<<END | 233 | $output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP DOM core functionality enabled.') . '</p></div>'; |
169 | 256 | <div class="check_explain"> | ||
170 | 257 | <p>Xibo needs the PHP DOM core functionality enabled.</p> | ||
171 | 258 | </div> | ||
172 | 259 | END; | ||
175 | 260 | } | 234 | } |
176 | 261 | 235 | ||
177 | 262 | // Check for DOM XML | 236 | // Check for DOM XML |
179 | 263 | $message = 'DOM XML Extension'; | 237 | $message = __('DOM XML Extension'); |
180 | 264 | 238 | ||
181 | 265 | if ($this->CheckDomXml()) | 239 | if ($this->CheckDomXml()) |
182 | 266 | { | 240 | { |
184 | 267 | $output .= $imgGood.$message.'<br />'; | 241 | $output .= $imgGood.' '.$message.'<br />'; |
185 | 268 | } | 242 | } |
186 | 269 | else | 243 | else |
187 | 270 | { | 244 | { |
188 | 271 | $this->envFault = true; | 245 | $this->envFault = true; |
189 | 272 | 246 | ||
196 | 273 | $output .= $imgBad.$message.'<br />'; | 247 | $output .= $imgBad.' '.$message.'<br />'; |
197 | 274 | $output .= <<<END | 248 | $output .= '<div class="check_explain"><p>' . __('Xibo needs the PHP DOM XML extension to function.') . '</p></div>'; |
192 | 275 | <div class="check_explain"> | ||
193 | 276 | <p>Xibo needs the PHP DOM XML extension to function.</p> | ||
194 | 277 | </div> | ||
195 | 278 | END; | ||
198 | 279 | } | 249 | } |
199 | 280 | 250 | ||
202 | 281 | // Check to see if we are allowed to open remote URL's (homecall will not work otherwise) | 251 | // Check to see if we are allowed to open remote URLs (homecall will not work otherwise) |
203 | 282 | $message = 'Allow PHP to open external URL\'s'; | 252 | $message = __("Allow PHP to open external URLs"); |
204 | 283 | 253 | ||
205 | 284 | if (ini_get('allow_url_fopen')) | 254 | if (ini_get('allow_url_fopen')) |
206 | 285 | { | 255 | { |
208 | 286 | $output .= $imgGood.$message.'<br />'; | 256 | $output .= $imgGood.' '.$message.'<br />'; |
209 | 287 | } | 257 | } |
210 | 288 | else | 258 | else |
211 | 289 | { | 259 | { |
213 | 290 | $this->envFault = true; | 260 | // Not a fault as this will not block installation/upgrade. Informational. |
214 | 261 | $this->envFault = false; | ||
215 | 291 | 262 | ||
223 | 292 | $output .= $imgBad.$message.'<br />'; | 263 | $output .= $imgBad.' '.$message.'<br />'; |
224 | 293 | $output .= <<<END | 264 | $output .= '<div class="check_explain"><p>' . __('You must have allow_url_fopen = On in your PHP.ini file for statistics gathering to function.') . '<br />'; |
225 | 294 | <div class="check_explain"> | 265 | $output .= __('If you do not intend to enable homecall you need not worry about this problem.') . '</p></div>'; |
219 | 295 | <p>You must have allow_url_fopen = On in your PHP.ini file for homecall to function.<br /> | ||
220 | 296 | If you do not intend to enable homecall you need not worry about this problem.</p> | ||
221 | 297 | </div> | ||
222 | 298 | END; | ||
226 | 299 | } | 266 | } |
227 | 300 | 267 | ||
228 | 301 | $output .= '</div>'; | 268 | $output .= '</div>'; |
229 | @@ -394,4 +361,4 @@ | |||
230 | 394 | } | 361 | } |
231 | 395 | } | 362 | } |
232 | 396 | 363 | ||
233 | 397 | ?> | ||
234 | 398 | \ No newline at end of file | 364 | \ No newline at end of file |
235 | 365 | ?> | ||
236 | 399 | 366 | ||
237 | === modified file 'server/install.php' | |||
238 | --- server/install.php 2009-04-08 18:54:13 +0000 | |||
239 | +++ server/install.php 2009-04-26 15:11:53 +0000 | |||
240 | @@ -19,13 +19,6 @@ | |||
241 | 19 | * along with Xibo. If not, see <http://www.gnu.org/licenses/>. | 19 | * along with Xibo. If not, see <http://www.gnu.org/licenses/>. |
242 | 20 | */ | 20 | */ |
243 | 21 | 21 | ||
244 | 22 | // Start default to fr_FR | ||
245 | 23 | $locale = "fr_FR"; | ||
246 | 24 | if (isset($_GET["locale"])) $locale = $_GET["locale"]; | ||
247 | 25 | putenv("LC_ALL=$locale"); | ||
248 | 26 | setlocale(LC_ALL, $locale); | ||
249 | 27 | bindtextdomain("default", "./locale"); | ||
250 | 28 | textdomain("default"); | ||
251 | 29 | 22 | ||
252 | 30 | DEFINE('XIBO', true); | 23 | DEFINE('XIBO', true); |
253 | 31 | 24 | ||
254 | @@ -37,6 +30,10 @@ | |||
255 | 37 | include('install/header.inc'); | 30 | include('install/header.inc'); |
256 | 38 | include('config/config.class.php'); | 31 | include('config/config.class.php'); |
257 | 39 | include('config/db_config.php'); | 32 | include('config/db_config.php'); |
258 | 33 | |||
259 | 34 | // Setup the translations for gettext | ||
260 | 35 | require_once("lib/app/translationengine.class.php"); | ||
261 | 36 | TranslationEngine::InitLocale($db); | ||
262 | 40 | 37 | ||
263 | 41 | $fault = false; | 38 | $fault = false; |
264 | 42 | 39 | ||
265 | @@ -65,113 +62,6 @@ | |||
266 | 65 | <?php | 62 | <?php |
267 | 66 | echo $cObj->CheckEnvironment(); | 63 | echo $cObj->CheckEnvironment(); |
268 | 67 | if ($cObj->EnvironmentFault()) { | 64 | if ($cObj->EnvironmentFault()) { |
269 | 68 | ## Filesystem Permissions | ||
270 | 69 | if (checkFsPermissions()) { | ||
271 | 70 | ?> | ||
272 | 71 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("Filesystem Permissions"); ?><br /> | ||
273 | 72 | <?php | ||
274 | 73 | } | ||
275 | 74 | else { | ||
276 | 75 | $fault = true; | ||
277 | 76 | ?> | ||
278 | 77 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("Filesystem Permissions"); ?></br> | ||
279 | 78 | <div class="check_explain"> | ||
280 | 79 | <?php echo __("Xibo needs to be able to write to the following"); ?> | ||
281 | 80 | <ul> | ||
282 | 81 | <li> settings.php | ||
283 | 82 | <li> install.php | ||
284 | 83 | <li> upgrade.php | ||
285 | 84 | </ul> | ||
286 | 85 | <?php echo __("Please fix this, and retest."); ?><br /> | ||
287 | 86 | </div> | ||
288 | 87 | <?php | ||
289 | 88 | } | ||
290 | 89 | ## PHP5 | ||
291 | 90 | if (checkPHP()) { | ||
292 | 91 | ?> | ||
293 | 92 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("PHP Version"); ?><br /> | ||
294 | 93 | <?php | ||
295 | 94 | } | ||
296 | 95 | else { | ||
297 | 96 | $fault = true; | ||
298 | 97 | ?> | ||
299 | 98 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("PHP Version"); ?><br /> | ||
300 | 99 | <div class="check_explain"> | ||
301 | 100 | <?php echo __("Xibo requires PHP version 5 or later."); ?><br /> | ||
302 | 101 | <?php echo __("Please fix this, and retest."); ?><br /> | ||
303 | 102 | </div> | ||
304 | 103 | <?php | ||
305 | 104 | } | ||
306 | 105 | ## MYSQL | ||
307 | 106 | if (checkMySQL()) { | ||
308 | 107 | ?> | ||
309 | 108 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("PHP MySQL Extension"); ?><br /> | ||
310 | 109 | <?php | ||
311 | 110 | } | ||
312 | 111 | else { | ||
313 | 112 | $fault = true; | ||
314 | 113 | ?> | ||
315 | 114 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("PHP MySQL Extension"); ?><br /> | ||
316 | 115 | <div class="check_explain"> | ||
317 | 116 | <?php echo __("Xibo needs to access a MySQL database to function."); ?><br /> | ||
318 | 117 | <?php echo __("Please install MySQL and the appropriate MySQL extension and retest."); ?><br /> | ||
319 | 118 | </div> | ||
320 | 119 | <?php | ||
321 | 120 | } | ||
322 | 121 | ## JSON | ||
323 | 122 | if (checkJson()) { | ||
324 | 123 | ?> | ||
325 | 124 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("PHP JSON Extension"); ?><br /> | ||
326 | 125 | <?php | ||
327 | 126 | } | ||
328 | 127 | else { | ||
329 | 128 | $fault = true; | ||
330 | 129 | ?> | ||
331 | 130 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("PHP JSON Extension"); ?><br /> | ||
332 | 131 | <div class="check_explain"> | ||
333 | 132 | <?php echo __("Xibo needs the PHP JSON extension to function."); ?><br /> | ||
334 | 133 | <?php echo __("Please install the PHP JSON extension and retest."); ?><br /> | ||
335 | 134 | </div> | ||
336 | 135 | <?php | ||
337 | 136 | } | ||
338 | 137 | ## GD | ||
339 | 138 | if (checkGd()) { | ||
340 | 139 | ?> | ||
341 | 140 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("PHP GD Extension"); ?><br /> | ||
342 | 141 | <?php | ||
343 | 142 | } | ||
344 | 143 | else { | ||
345 | 144 | $fault = true; | ||
346 | 145 | ?> | ||
347 | 146 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("PHP GD Extension"); ?><br /> | ||
348 | 147 | <div class="check_explain"> | ||
349 | 148 | <?php echo __("Xibo needs to manipulate images to function."); ?><br /> | ||
350 | 149 | <?php echo __("Please install the GD libraries and extension and retest."); ?><br /> | ||
351 | 150 | </div> | ||
352 | 151 | <?php | ||
353 | 152 | } | ||
354 | 153 | ## Calendar | ||
355 | 154 | if (checkCal()) { | ||
356 | 155 | ?> | ||
357 | 156 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("PHP Calendar Extension"); ?><br /> | ||
358 | 157 | <?php | ||
359 | 158 | } | ||
360 | 159 | else { | ||
361 | 160 | $fault = true; | ||
362 | 161 | ?> | ||
363 | 162 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("PHP Calendar Extension"); ?><br /> | ||
364 | 163 | <div class="check_explain"> | ||
365 | 164 | <?php echo __("Xibo needs the calendar extension to function."); ?><br /> | ||
366 | 165 | <?php echo __("Please install the calendar extension and retest."); ?><br /> | ||
367 | 166 | </div> | ||
368 | 167 | <?php | ||
369 | 168 | } | ||
370 | 169 | ?> | ||
371 | 170 | <br /><br /> | ||
372 | 171 | </div> | ||
373 | 172 | <?php | ||
374 | 173 | if ($fault) { | ||
375 | 174 | >>>>>>> MERGE-SOURCE | ||
376 | 175 | ?> | 65 | ?> |
377 | 176 | <form action="install.php" method="POST"> | 66 | <form action="install.php" method="POST"> |
378 | 177 | <input type="hidden" name="xibo_step" value="1" /> | 67 | <input type="hidden" name="xibo_step" value="1" /> |
379 | 178 | 68 | ||
380 | === modified file 'server/upgrade.php' | |||
381 | --- server/upgrade.php 2009-04-08 18:56:00 +0000 | |||
382 | +++ server/upgrade.php 2009-04-26 15:11:53 +0000 | |||
383 | @@ -19,20 +19,20 @@ | |||
384 | 19 | * along with Xibo. If not, see <http://www.gnu.org/licenses/>. | 19 | * along with Xibo. If not, see <http://www.gnu.org/licenses/>. |
385 | 20 | */ | 20 | */ |
386 | 21 | 21 | ||
396 | 22 | // Start default to fr_FR | 22 | DEFINE('XIBO', true); |
397 | 23 | $locale = "fr_FR"; | 23 | |
398 | 24 | if (isset($_GET["locale"])) $locale = $_GET["locale"]; | 24 | if (! checkPHP()) { |
399 | 25 | putenv("LC_ALL=$locale"); | 25 | die(__("Xibo requires PHP 5.0.2 or later")); |
400 | 26 | setlocale(LC_ALL, $locale); | 26 | } |
392 | 27 | bindtextdomain("default", "./locale"); | ||
393 | 28 | textdomain("default"); | ||
394 | 29 | |||
395 | 30 | DEFINE('XIBO', true); | ||
401 | 31 | 27 | ||
402 | 32 | include('lib/app/kit.class.php'); | 28 | include('lib/app/kit.class.php'); |
403 | 33 | include('config/db_config.php'); | 29 | include('config/db_config.php'); |
404 | 34 | include('config/config.class.php'); | 30 | include('config/config.class.php'); |
406 | 35 | require('settings.php'); | 31 | require('settings.php'); |
407 | 32 | |||
408 | 33 | // Setup the translations for gettext | ||
409 | 34 | require_once("lib/app/translationengine.class.php"); | ||
410 | 35 | TranslationEngine::InitLocale($db); | ||
411 | 36 | 36 | ||
412 | 37 | // Once we've calculated the upgrade in step 2 below, we need | 37 | // Once we've calculated the upgrade in step 2 below, we need |
413 | 38 | // to have included the appropriate upgrade php files | 38 | // to have included the appropriate upgrade php files |
414 | @@ -129,112 +129,6 @@ | |||
415 | 129 | $cObj = new Config($db); | 129 | $cObj = new Config($db); |
416 | 130 | echo $cObj->CheckEnvironment(); | 130 | echo $cObj->CheckEnvironment(); |
417 | 131 | if ($cObj->EnvironmentFault()) { | 131 | if ($cObj->EnvironmentFault()) { |
418 | 132 | ## Filesystem Permissions | ||
419 | 133 | if (checkFsPermissions()) { | ||
420 | 134 | ?> | ||
421 | 135 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("Filesystem Permissions"); ?><br /> | ||
422 | 136 | <?php | ||
423 | 137 | } | ||
424 | 138 | else { | ||
425 | 139 | $fault = true; | ||
426 | 140 | ?> | ||
427 | 141 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("Filesystem Permissions"); ?></br> | ||
428 | 142 | <div class="check_explain"> | ||
429 | 143 | <?php echo __("Xibo needs to be able to write to the following"); ?> | ||
430 | 144 | <ul> | ||
431 | 145 | <li> settings.php | ||
432 | 146 | <li> install.php | ||
433 | 147 | <li> upgrade.php | ||
434 | 148 | </ul> | ||
435 | 149 | <?php echo __("Please fix this, and retest."); ?><br /> | ||
436 | 150 | </div> | ||
437 | 151 | <?php | ||
438 | 152 | } | ||
439 | 153 | ## PHP5 | ||
440 | 154 | if (checkPHP()) { | ||
441 | 155 | ?> | ||
442 | 156 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("PHP Version"); ?><br /> | ||
443 | 157 | <?php | ||
444 | 158 | } | ||
445 | 159 | else { | ||
446 | 160 | $fault = true; | ||
447 | 161 | ?> | ||
448 | 162 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("PHP Version"); ?><br /> | ||
449 | 163 | <div class="check_explain"> | ||
450 | 164 | <?php echo __("Xibo requires PHP version 5.02 or later."); ?><br /> | ||
451 | 165 | <?php echo __("Please fix this, and retest."); ?><br /> | ||
452 | 166 | </div> | ||
453 | 167 | <?php | ||
454 | 168 | } | ||
455 | 169 | ## MYSQL | ||
456 | 170 | if (checkMySQL()) { | ||
457 | 171 | ?> | ||
458 | 172 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("PHP MySQL Extension"); ?><br /> | ||
459 | 173 | <?php | ||
460 | 174 | } | ||
461 | 175 | else { | ||
462 | 176 | $fault = true; | ||
463 | 177 | ?> | ||
464 | 178 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("PHP MySQL Extension"); ?><br /> | ||
465 | 179 | <div class="check_explain"> | ||
466 | 180 | <?php echo __("Xibo needs to access a MySQL database to function."); ?><br /> | ||
467 | 181 | <?php echo __("Please install MySQL and the appropriate MySQL extension and retest."); ?><br /> | ||
468 | 182 | </div> | ||
469 | 183 | <?php | ||
470 | 184 | } | ||
471 | 185 | ## JSON | ||
472 | 186 | if (checkJson()) { | ||
473 | 187 | ?> | ||
474 | 188 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("PHP JSON Extension"); ?><br /> | ||
475 | 189 | <?php | ||
476 | 190 | } | ||
477 | 191 | else { | ||
478 | 192 | $fault = true; | ||
479 | 193 | ?> | ||
480 | 194 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("PHP JSON Extension"); ?><br /> | ||
481 | 195 | <div class="check_explain"> | ||
482 | 196 | <?php echo __("Xibo needs the PHP JSON extension to function."); ?><br /> | ||
483 | 197 | <?php echo __("Please install the PHP JSON extension and retest."); ?><br /> | ||
484 | 198 | </div> | ||
485 | 199 | <?php | ||
486 | 200 | } | ||
487 | 201 | ## GD | ||
488 | 202 | if (checkGd()) { | ||
489 | 203 | ?> | ||
490 | 204 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("PHP GD Extension"); ?><br /> | ||
491 | 205 | <?php | ||
492 | 206 | } | ||
493 | 207 | else { | ||
494 | 208 | $fault = true; | ||
495 | 209 | ?> | ||
496 | 210 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("PHP GD Extension"); ?><br /> | ||
497 | 211 | <div class="check_explain"> | ||
498 | 212 | <?php echo __("Xibo needs to manipulate images to function."); ?><br /> | ||
499 | 213 | <?php echo __("Please install the GD libraries and extension and retest."); ?><br /> | ||
500 | 214 | </div> | ||
501 | 215 | <?php | ||
502 | 216 | } | ||
503 | 217 | ## Calendar | ||
504 | 218 | if (checkCal()) { | ||
505 | 219 | ?> | ||
506 | 220 | <img src="install/dot_green.gif" align="absmiddle"> <?php echo __("PHP Calendar Extension"); ?><br /> | ||
507 | 221 | <?php | ||
508 | 222 | } | ||
509 | 223 | else { | ||
510 | 224 | $fault = true; | ||
511 | 225 | ?> | ||
512 | 226 | <img src="install/dot_red.gif" align="absmiddle"> <?php echo __("PHP Calendar Extension"); ?><br /> | ||
513 | 227 | <div class="check_explain"> | ||
514 | 228 | <?php echo __("Xibo needs the calendar extension to function."); ?><br /> | ||
515 | 229 | <?php echo __("Please install the calendar extension and retest."); ?><br /> | ||
516 | 230 | </div> | ||
517 | 231 | <?php | ||
518 | 232 | } | ||
519 | 233 | ?> | ||
520 | 234 | <br /><br /> | ||
521 | 235 | </div> | ||
522 | 236 | <?php | ||
523 | 237 | if ($fault) { | ||
524 | 238 | $_SESSION['step'] = 1; | 132 | $_SESSION['step'] = 1; |
525 | 239 | ?> | 133 | ?> |
526 | 240 | <form action="upgrade.php" method="POST"> | 134 | <form action="upgrade.php" method="POST"> |
527 | @@ -704,4 +598,4 @@ | |||
528 | 704 | } | 598 | } |
529 | 705 | } | 599 | } |
530 | 706 | 600 | ||
531 | 707 | ?> | ||
532 | 708 | \ No newline at end of file | 601 | \ No newline at end of file |
533 | 602 | ?> |
Looks fine to me, will merge