@@ -69,28 +69,28 @@ |
||
| 69 | 69 | */ |
| 70 | 70 | switch (ENVIRONMENT) |
| 71 | 71 | { |
| 72 | - case 'testing': |
|
| 73 | - case 'development': |
|
| 74 | - error_reporting(-1); |
|
| 75 | - ini_set('display_errors', 1); |
|
| 76 | - break; |
|
| 72 | + case 'testing': |
|
| 73 | + case 'development': |
|
| 74 | + error_reporting(-1); |
|
| 75 | + ini_set('display_errors', 1); |
|
| 76 | + break; |
|
| 77 | 77 | |
| 78 | - case 'production': |
|
| 79 | - ini_set('display_errors', 0); |
|
| 80 | - if (version_compare(PHP_VERSION, '5.3', '>=')) |
|
| 81 | - { |
|
| 82 | - error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); |
|
| 83 | - } |
|
| 84 | - else |
|
| 85 | - { |
|
| 86 | - error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
|
| 87 | - } |
|
| 88 | - break; |
|
| 78 | + case 'production': |
|
| 79 | + ini_set('display_errors', 0); |
|
| 80 | + if (version_compare(PHP_VERSION, '5.3', '>=')) |
|
| 81 | + { |
|
| 82 | + error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); |
|
| 83 | + } |
|
| 84 | + else |
|
| 85 | + { |
|
| 86 | + error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
|
| 87 | + } |
|
| 88 | + break; |
|
| 89 | 89 | |
| 90 | - default: |
|
| 91 | - header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
|
| 92 | - echo 'The application environment is not set correctly.'; |
|
| 93 | - exit(1); // EXIT_ERROR |
|
| 90 | + default: |
|
| 91 | + header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
|
| 92 | + echo 'The application environment is not set correctly.'; |
|
| 93 | + exit(1); // EXIT_ERROR |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | /* |
@@ -80,8 +80,7 @@ discard block |
||
| 80 | 80 | if (version_compare(PHP_VERSION, '5.3', '>=')) |
| 81 | 81 | { |
| 82 | 82 | error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED); |
| 83 | - } |
|
| 84 | - else |
|
| 83 | + } else |
|
| 85 | 84 | { |
| 86 | 85 | error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE); |
| 87 | 86 | } |
@@ -204,8 +203,7 @@ discard block |
||
| 204 | 203 | if (($_temp = realpath($system_path)) !== FALSE) |
| 205 | 204 | { |
| 206 | 205 | $system_path = $_temp.DIRECTORY_SEPARATOR; |
| 207 | - } |
|
| 208 | - else |
|
| 206 | + } else |
|
| 209 | 207 | { |
| 210 | 208 | // Ensure there's a trailing slash |
| 211 | 209 | $system_path = strtr( |
@@ -247,8 +245,7 @@ discard block |
||
| 247 | 245 | if (($_temp = realpath($application_folder)) !== FALSE) |
| 248 | 246 | { |
| 249 | 247 | $application_folder = $_temp; |
| 250 | - } |
|
| 251 | - else |
|
| 248 | + } else |
|
| 252 | 249 | { |
| 253 | 250 | $application_folder = strtr( |
| 254 | 251 | rtrim($application_folder, '/\\'), |
@@ -256,16 +253,14 @@ discard block |
||
| 256 | 253 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
| 257 | 254 | ); |
| 258 | 255 | } |
| 259 | - } |
|
| 260 | - elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR)) |
|
| 256 | + } elseif (is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR)) |
|
| 261 | 257 | { |
| 262 | 258 | $application_folder = BASEPATH.strtr( |
| 263 | 259 | trim($application_folder, '/\\'), |
| 264 | 260 | '/\\', |
| 265 | 261 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
| 266 | 262 | ); |
| 267 | - } |
|
| 268 | - else |
|
| 263 | + } else |
|
| 269 | 264 | { |
| 270 | 265 | header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
| 271 | 266 | echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF; |
@@ -278,14 +273,12 @@ discard block |
||
| 278 | 273 | if ( ! isset($view_folder[0]) && is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR)) |
| 279 | 274 | { |
| 280 | 275 | $view_folder = APPPATH.'views'; |
| 281 | - } |
|
| 282 | - elseif (is_dir($view_folder)) |
|
| 276 | + } elseif (is_dir($view_folder)) |
|
| 283 | 277 | { |
| 284 | 278 | if (($_temp = realpath($view_folder)) !== FALSE) |
| 285 | 279 | { |
| 286 | 280 | $view_folder = $_temp; |
| 287 | - } |
|
| 288 | - else |
|
| 281 | + } else |
|
| 289 | 282 | { |
| 290 | 283 | $view_folder = strtr( |
| 291 | 284 | rtrim($view_folder, '/\\'), |
@@ -293,16 +286,14 @@ discard block |
||
| 293 | 286 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
| 294 | 287 | ); |
| 295 | 288 | } |
| 296 | - } |
|
| 297 | - elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR)) |
|
| 289 | + } elseif (is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR)) |
|
| 298 | 290 | { |
| 299 | 291 | $view_folder = APPPATH.strtr( |
| 300 | 292 | trim($view_folder, '/\\'), |
| 301 | 293 | '/\\', |
| 302 | 294 | DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR |
| 303 | 295 | ); |
| 304 | - } |
|
| 305 | - else |
|
| 296 | + } else |
|
| 306 | 297 | { |
| 307 | 298 | header('HTTP/1.1 503 Service Unavailable.', TRUE, 503); |
| 308 | 299 | echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF; |