@@ -1,40 +1,40 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * CodeIgniter |
|
| 4 | - * |
|
| 5 | - * An open source application development framework for PHP |
|
| 6 | - * |
|
| 7 | - * This content is released under the MIT License (MIT) |
|
| 8 | - * |
|
| 9 | - * Copyright (c) 2014 - 2015, British Columbia Institute of Technology |
|
| 10 | - * |
|
| 11 | - * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
| 12 | - * of this software and associated documentation files (the "Software"), to deal |
|
| 13 | - * in the Software without restriction, including without limitation the rights |
|
| 14 | - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
| 15 | - * copies of the Software, and to permit persons to whom the Software is |
|
| 16 | - * furnished to do so, subject to the following conditions: |
|
| 17 | - * |
|
| 18 | - * The above copyright notice and this permission notice shall be included in |
|
| 19 | - * all copies or substantial portions of the Software. |
|
| 20 | - * |
|
| 21 | - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
| 22 | - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
| 23 | - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
| 24 | - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
| 25 | - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
| 26 | - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|
| 27 | - * THE SOFTWARE. |
|
| 28 | - * |
|
| 29 | - * @package CodeIgniter |
|
| 30 | - * @author EllisLab Dev Team |
|
| 31 | - * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) |
|
| 32 | - * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) |
|
| 33 | - * @license http://opensource.org/licenses/MIT MIT License |
|
| 34 | - * @link http://codeigniter.com |
|
| 35 | - * @since Version 1.0.0 |
|
| 36 | - * @filesource |
|
| 37 | - */ |
|
| 3 | + * CodeIgniter |
|
| 4 | + * |
|
| 5 | + * An open source application development framework for PHP |
|
| 6 | + * |
|
| 7 | + * This content is released under the MIT License (MIT) |
|
| 8 | + * |
|
| 9 | + * Copyright (c) 2014 - 2015, British Columbia Institute of Technology |
|
| 10 | + * |
|
| 11 | + * Permission is hereby granted, free of charge, to any person obtaining a copy |
|
| 12 | + * of this software and associated documentation files (the "Software"), to deal |
|
| 13 | + * in the Software without restriction, including without limitation the rights |
|
| 14 | + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
| 15 | + * copies of the Software, and to permit persons to whom the Software is |
|
| 16 | + * furnished to do so, subject to the following conditions: |
|
| 17 | + * |
|
| 18 | + * The above copyright notice and this permission notice shall be included in |
|
| 19 | + * all copies or substantial portions of the Software. |
|
| 20 | + * |
|
| 21 | + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
| 22 | + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
| 23 | + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE |
|
| 24 | + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
| 25 | + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
| 26 | + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|
| 27 | + * THE SOFTWARE. |
|
| 28 | + * |
|
| 29 | + * @package CodeIgniter |
|
| 30 | + * @author EllisLab Dev Team |
|
| 31 | + * @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/) |
|
| 32 | + * @copyright Copyright (c) 2014 - 2015, British Columbia Institute of Technology (http://bcit.ca/) |
|
| 33 | + * @license http://opensource.org/licenses/MIT MIT License |
|
| 34 | + * @link http://codeigniter.com |
|
| 35 | + * @since Version 1.0.0 |
|
| 36 | + * @filesource |
|
| 37 | + */ |
|
| 38 | 38 | defined('BASEPATH') OR exit('No direct script access allowed'); |
| 39 | 39 | |
| 40 | 40 | /** |
@@ -169,12 +169,10 @@ discard block |
||
| 169 | 169 | file_exists(APPPATH.'vendor/autoload.php') |
| 170 | 170 | ? require_once(APPPATH.'vendor/autoload.php') |
| 171 | 171 | : log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.'); |
| 172 | - } |
|
| 173 | - elseif (file_exists($composer_autoload)) |
|
| 172 | + } elseif (file_exists($composer_autoload)) |
|
| 174 | 173 | { |
| 175 | 174 | require_once($composer_autoload); |
| 176 | - } |
|
| 177 | - else |
|
| 175 | + } else |
|
| 178 | 176 | { |
| 179 | 177 | log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload); |
| 180 | 178 | } |
@@ -253,8 +251,7 @@ discard block |
||
| 253 | 251 | // This is required for mb_convert_encoding() to strip invalid characters. |
| 254 | 252 | // That's utilized by CI_Utf8, but it's also done for consistency with iconv. |
| 255 | 253 | mb_substitute_character('none'); |
| 256 | - } |
|
| 257 | - else |
|
| 254 | + } else |
|
| 258 | 255 | { |
| 259 | 256 | define('MB_ENABLED', FALSE); |
| 260 | 257 | } |
@@ -267,8 +264,7 @@ discard block |
||
| 267 | 264 | // iconv.internal_encoding is deprecated starting with PHP 5.6 |
| 268 | 265 | // and it's usage triggers E_DEPRECATED messages. |
| 269 | 266 | @ini_set('iconv.internal_encoding', $charset); |
| 270 | - } |
|
| 271 | - else |
|
| 267 | + } else |
|
| 272 | 268 | { |
| 273 | 269 | define('ICONV_ENABLED', FALSE); |
| 274 | 270 | } |
@@ -378,8 +374,7 @@ discard block |
||
| 378 | 374 | if (! CIPHPUnitTest::wiredesignzHmvcInstalled()) |
| 379 | 375 | { |
| 380 | 376 | return CI_Controller::get_instance(); |
| 381 | - } |
|
| 382 | - else |
|
| 377 | + } else |
|
| 383 | 378 | { |
| 384 | 379 | return CI::$APP; |
| 385 | 380 | } |
@@ -424,16 +419,14 @@ discard block |
||
| 424 | 419 | if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php')) |
| 425 | 420 | { |
| 426 | 421 | $e404 = TRUE; |
| 427 | - } |
|
| 428 | - else |
|
| 422 | + } else |
|
| 429 | 423 | { |
| 430 | 424 | require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php'); |
| 431 | 425 | |
| 432 | 426 | if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method)) |
| 433 | 427 | { |
| 434 | 428 | $e404 = TRUE; |
| 435 | - } |
|
| 436 | - elseif (method_exists($class, '_remap')) |
|
| 429 | + } elseif (method_exists($class, '_remap')) |
|
| 437 | 430 | { |
| 438 | 431 | $params = array($method, array_slice($URI->rsegments, 2)); |
| 439 | 432 | $method = '_remap'; |
@@ -475,8 +468,7 @@ discard block |
||
| 475 | 468 | $RTR->directory = ''; |
| 476 | 469 | } |
| 477 | 470 | } |
| 478 | - } |
|
| 479 | - else |
|
| 471 | + } else |
|
| 480 | 472 | { |
| 481 | 473 | $e404 = FALSE; |
| 482 | 474 | } |
@@ -492,8 +484,7 @@ discard block |
||
| 492 | 484 | 1 => $class, |
| 493 | 485 | 2 => $method |
| 494 | 486 | ); |
| 495 | - } |
|
| 496 | - else |
|
| 487 | + } else |
|
| 497 | 488 | { |
| 498 | 489 | show_404($RTR->directory.$class.'/'.$method); |
| 499 | 490 | } |