|
|
@@ -21,9 +21,9 @@
|
|
|
/**
|
|
|
* Use the DS to separate the directories in other defines
|
|
|
*/
|
|
|
- if (!defined('DS')) {
|
|
|
- define('DS', DIRECTORY_SEPARATOR);
|
|
|
- }
|
|
|
+if (!defined('DS')) {
|
|
|
+ define('DS', DIRECTORY_SEPARATOR);
|
|
|
+}
|
|
|
/**
|
|
|
* These defines should only be edited if you have cake installed in
|
|
|
* a directory layout other than the way it is distributed.
|
|
|
@@ -34,16 +34,16 @@
|
|
|
* The full path to the directory which holds "app", WITHOUT a trailing DS.
|
|
|
*
|
|
|
*/
|
|
|
- if (!defined('ROOT')) {
|
|
|
- define('ROOT', dirname(dirname(dirname(__FILE__))));
|
|
|
- }
|
|
|
+if (!defined('ROOT')) {
|
|
|
+ define('ROOT', dirname(dirname(dirname(__FILE__))));
|
|
|
+}
|
|
|
/**
|
|
|
* The actual directory name for the "app".
|
|
|
*
|
|
|
*/
|
|
|
- if (!defined('APP_DIR')) {
|
|
|
- define('APP_DIR', basename(dirname(dirname(__FILE__))));
|
|
|
- }
|
|
|
+if (!defined('APP_DIR')) {
|
|
|
+ define('APP_DIR', basename(dirname(dirname(__FILE__))));
|
|
|
+}
|
|
|
|
|
|
/**
|
|
|
* The absolute path to the "cake" directory, WITHOUT a trailing DS.
|
|
|
@@ -63,30 +63,30 @@
|
|
|
* Change at your own risk.
|
|
|
*
|
|
|
*/
|
|
|
- if (!defined('WEBROOT_DIR')) {
|
|
|
- define('WEBROOT_DIR', basename(dirname(__FILE__)));
|
|
|
- }
|
|
|
- if (!defined('WWW_ROOT')) {
|
|
|
- define('WWW_ROOT', dirname(__FILE__) . DS);
|
|
|
- }
|
|
|
+if (!defined('WEBROOT_DIR')) {
|
|
|
+ define('WEBROOT_DIR', basename(dirname(__FILE__)));
|
|
|
+}
|
|
|
+if (!defined('WWW_ROOT')) {
|
|
|
+ define('WWW_ROOT', dirname(__FILE__) . DS);
|
|
|
+}
|
|
|
|
|
|
- if (!defined('CAKE_CORE_INCLUDE_PATH')) {
|
|
|
- if (function_exists('ini_set')) {
|
|
|
- ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
|
|
|
- }
|
|
|
- if (!include('Cake' . DS . 'bootstrap.php')) {
|
|
|
- $failed = true;
|
|
|
- }
|
|
|
- } else {
|
|
|
- if (!include(CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
|
|
|
- $failed = true;
|
|
|
- }
|
|
|
+if (!defined('CAKE_CORE_INCLUDE_PATH')) {
|
|
|
+ if (function_exists('ini_set')) {
|
|
|
+ ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
|
|
|
+ }
|
|
|
+ if (!include ('Cake' . DS . 'bootstrap.php')) {
|
|
|
+ $failed = true;
|
|
|
}
|
|
|
- if (!empty($failed)) {
|
|
|
- trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
|
|
|
+} else {
|
|
|
+ if (!include (CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php')) {
|
|
|
+ $failed = true;
|
|
|
}
|
|
|
+}
|
|
|
+if (!empty($failed)) {
|
|
|
+ trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
|
|
|
+}
|
|
|
|
|
|
- App::uses('Dispatcher', 'Routing');
|
|
|
+App::uses('Dispatcher', 'Routing');
|
|
|
|
|
|
- $Dispatcher = new Dispatcher();
|
|
|
- $Dispatcher->dispatch(new CakeRequest(), new CakeResponse(array('charset' => Configure::read('App.encoding'))));
|
|
|
+$Dispatcher = new Dispatcher();
|
|
|
+$Dispatcher->dispatch(new CakeRequest(), new CakeResponse(array('charset' => Configure::read('App.encoding'))));
|