diff options
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 43 |
1 files changed, 27 insertions, 16 deletions
@@ -11,9 +11,9 @@ * * This can be set to anything, but default usage is: * - * development - * testing - * production + * development + * testing + * production * * NOTE: If you change these, also change the error_reporting() code below * @@ -28,12 +28,14 @@ * By default development will show errors but testing and live will hide them. */ +if (defined('ENVIRONMENT')) +{ switch (ENVIRONMENT) { case 'development': error_reporting(E_ALL); break; - + case 'testing': case 'production': error_reporting(0); @@ -42,6 +44,7 @@ default: exit('The application environment is not set correctly.'); } +} /* *--------------------------------------------------------------- @@ -49,7 +52,7 @@ *--------------------------------------------------------------- * * This variable must contain the name of your "system" folder. - * Include the path if the folder is not in the same directory + * Include the path if the folder is not in the same directory * as this file. * */ @@ -62,7 +65,7 @@ * * If you want this front controller to use a different "application" * folder then the default one you can set its name here. The folder - * can also be renamed or relocated anywhere on your server. If + * can also be renamed or relocated anywhere on your server. If * you do, use a full server path. For more info please see the user guide: * http://codeigniter.com/user_guide/general/managing_apps.html * @@ -78,24 +81,24 @@ * * Normally you will set your default controller in the routes.php file. * You can, however, force a custom routing by hard-coding a - * specific controller class/function here. For most applications, you + * specific controller class/function here. For most applications, you * WILL NOT set your routing here, but it's an option for those * special instances where you might want to override the standard * routing in a specific front controller that shares a common CI installation. * - * IMPORTANT: If you set the routing here, NO OTHER controller will be + * IMPORTANT: If you set the routing here, NO OTHER controller will be * callable. In essence, this preference limits your application to ONE - * specific controller. Leave the function name blank if you need + * specific controller. Leave the function name blank if you need * to call functions dynamically via the URI. * * Un-comment the $routing array below to use this feature * */ - // The directory name, relative to the "controllers" folder. Leave blank + // The directory name, relative to the "controllers" folder. Leave blank // if your controller is not in a sub-folder within the "controllers" folder // $routing['directory'] = ''; - // The controller class file name. Example: Mycontroller.php + // The controller class file name. Example: Mycontroller // $routing['controller'] = ''; // The controller function you wish to be called. @@ -104,7 +107,7 @@ /* * ------------------------------------------------------------------- - * CUSTOM CONFIG VALUES + * CUSTOM CONFIG VALUES * ------------------------------------------------------------------- * * The $assign_to_config array below will be passed dynamically to the @@ -122,14 +125,21 @@ // -------------------------------------------------------------------- -// END OF USER CONFIGURABLE SETTINGS. DO NOT EDIT BELOW THIS LINE +// END OF USER CONFIGURABLE SETTINGS. DO NOT EDIT BELOW THIS LINE // -------------------------------------------------------------------- /* * --------------------------------------------------------------- - * Resolve the system path for increased reliability + * Resolve the system path for increased reliability * --------------------------------------------------------------- */ + + // Set the current directory correctly for CLI requests + if (defined('STDIN')) + { + chdir(dirname(__FILE__)); + } + if (realpath($system_path) !== FALSE) { $system_path = realpath($system_path).'/'; @@ -146,13 +156,14 @@ /* * ------------------------------------------------------------------- - * Now that we know the path, set the main path constants + * Now that we know the path, set the main path constants * ------------------------------------------------------------------- */ // The name of THIS file define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME)); // The PHP file extension + // this global constant is deprecated. define('EXT', '.php'); // Path to the system folder @@ -188,7 +199,7 @@ * And away we go... * */ -require_once BASEPATH.'core/CodeIgniter'.EXT; +require_once BASEPATH.'core/CodeIgniter.php'; /* End of file index.php */ /* Location: ./index.php */
\ No newline at end of file |