Changeset a42ace5079b711cff1c0078740ad0bb7a735e0fc

Timestamp:

01/28/12 18:44:10 (4 months ago)

Author:

Xemle <xemle@phtagr.org>

Children:

e2681da508f3815896c5e70ee7e22b7019dc8286

Parents:

ee4c2b7fedeac65c7bf3af2de933963981702433

git-committer:

Xemle <xemle@phtagr.org> / 2012-01-28T18:44:10Z+0100

Message:

Migrate basic configuration files to CakePHP 2.0

Files:

• Config/bootstrap.php (modified) (5 diffs)
• Config/core.php (modified) (14 diffs)
• Config/routes.php (modified) (3 diffs)
• webroot/index.php (modified) (5 diffs)
• webroot/test.php (modified) (3 diffs)

Config/bootstrap.php

@@ -1 +1 @@
 <?php
 /**
- * This file is loaded automatically by the app/webroot/index.php file after the core bootstrap.php
+ * This file is loaded automatically by the app/webroot/index.php file after core.php
  *
- * This is an application wide file to load any function that is not used within a class
- * define. You can also use this to include or require any files in your application.
+ * This file should load/create any application wide configuration settings, such as 
+ * Caching, Logging, loading additional configuration files.
  *
- * PHP versions 4 and 5
+ * You should also use this file to include any files that provide global functions/constants
+ * that your application uses.
+ *
+ * PHP 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       app.Config
  * @since         CakePHP(tm) v 0.10.8.2117
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 
+// Setup a 'default' cache configuration for use in the application.
+Cache::config('default', array('engine' => 'File'));
+
 /**
  * The settings below can be used to set additional paths to models, views and controllers.
- * This is related to Ticket #470 (https://trac.cakephp.org/ticket/470)
  *
  * App::build(array(
- *     'plugins' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'),
- *     'models' =>  array('/full/path/to/models/', '/next/full/path/to/models/'),
- *     'views' => array('/full/path/to/views/', '/next/full/path/to/views/'),
- *     'controllers' => array('/full/path/to/controllers/', '/next/full/path/to/controllers/'),
- *     'datasources' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'),
- *     'behaviors' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'),
- *     'components' => array('/full/path/to/components/', '/next/full/path/to/components/'),
- *     'helpers' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
- *     'vendors' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
- *     'shells' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
+ *     'Plugin' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'),
+ *     'Model' =>  array('/full/path/to/models/', '/next/full/path/to/models/'),
+ *     'View' => array('/full/path/to/views/', '/next/full/path/to/views/'),
+ *     'Controller' => array('/full/path/to/controllers/', '/next/full/path/to/controllers/'),
+ *     'Model/Datasource' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'),
+ *     'Model/Behavior' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'),
+ *     'Controller/Component' => array('/full/path/to/components/', '/next/full/path/to/components/'),
+ *     'View/Helper' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
+ *     'Vendor' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
+ *     'Console/Command' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
  *     'locales' => array('/full/path/to/locale/', '/next/full/path/to/locale/')
  * ));
@@ -43 +47 @@
 
 /**
- * As of 1.3, additional rules for the inflector are added below
+ * Custom Inflector rules, can be set to correctly pluralize or singularize table, model, controller names or whatever other
+ * string is passed to the inflection functions
  *
  * Inflector::rules('singular', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
@@ -51 +56 @@
 Inflector::rules('plural', array('uninflected' => array('[Bb]rowser')));
 Inflector::rules('singular', array('uninflected' => array('pos')));
+
+/**
+ * Plugins need to be loaded manually, you can either load them one by one or all of them in a single call
+ * Uncomment one of the lines below, as you need. make sure you read the documentation on CakePlugin to use more
+ * advanced ways of loading plugins
+ *
+ * CakePlugin::loadAll(); // Loads all plugins at once
+ * CakePlugin::load('DebugKit'); //Loads a single plugin named DebugKit
+ *
+ */
+
+/**
+ * User storage directory
+ */
+if (!defined('USER_DIR')) {
+  define('USER_DIR', APP . 'users' . DS);
+}
+
+/**
+ * Configuration directory
+ */
+if (!defined('CONFIGS')) {
+  define('CONFIGS', APP . 'Config' . DS);
+}
 
 define('ROLE_NOBODY', 0);
@@ -125 +154 @@
 define("LOCATION_COUNTRY", 0x04);
 
-/** Add pear path within vendor path to the include_path */
+/** 
+ * Add pear path within vendor path to the include_path 
+ */
 if (function_exists('ini_set') && function_exists('ini_get')) {
   $path = ini_get('include_path');
@@ -131 +162 @@
   ini_set('include_path', $vendorPearPath . PATH_SEPARATOR . ini_get('include_path'));
 }
-//EOF
-?>
+

Config/core.php

@@ -5 +5 @@
  * Use it to configure core behavior of Cake.
  *
- * PHP versions 4 and 5
+ * PHP 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       app.Config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
@@ -34 +33 @@
  * In development mode, you need to click the flash message to continue.
  */
-        Configure::write('debug', 0);
-
-/**
- * CakePHP Log Level:
- *
- * In case of Production Mode CakePHP gives you the possibility to continue logging errors.
- *
- * The following parameters can be used:
- *  Boolean: Set true/false to activate/deactivate logging
- *    Configure::write('log', true);
- *
- *  Integer: Use built-in PHP constants to set the error level (see error_reporting)
- *    Configure::write('log', E_ERROR | E_WARNING);
- *    Configure::write('log', E_ALL ^ E_NOTICE);
- */
-        Configure::write('log', true);
+        Configure::write('debug', 1);
+
+/**
+ * Configure the Error handler used to handle errors for your application.  By default
+ * ErrorHandler::handleError() is used.  It will display errors using Debugger, when debug > 0
+ * and log errors with CakeLog when debug = 0.
+ *
+ * Options:
+ *
+ * - `handler` - callback - The callback to handle errors. You can set this to any callback type,
+ *    including anonymous functions.
+ * - `level` - int - The level of errors you are interested in capturing.
+ * - `trace` - boolean - Include stack traces for errors in log files.
+ *
+ * @see ErrorHandler for more information on error handling and configuration.
+ */
+        Configure::write('Error', array(
+                'handler' => 'ErrorHandler::handleError',
+                'level' => E_ALL & ~E_DEPRECATED,
+                'trace' => true
+        ));
+
+/**
+ * Configure the Exception handler used for uncaught exceptions.  By default,
+ * ErrorHandler::handleException() is used. It will display a HTML page for the exception, and
+ * while debug > 0, framework errors like Missing Controller will be displayed.  When debug = 0,
+ * framework errors will be coerced into generic HTTP errors.
+ *
+ * Options:
+ *
+ * - `handler` - callback - The callback to handle exceptions. You can set this to any callback type,
+ *   including anonymous functions.
+ * - `renderer` - string - The class responsible for rendering uncaught exceptions.  If you choose a custom class you
+ *   should place the file for that class in app/Lib/Error. This class needs to implement a render method.
+ * - `log` - boolean - Should Exceptions be logged?
+ *
+ * @see ErrorHandler for more information on exception handling and configuration.
+ */
+        Configure::write('Exception', array(
+                'handler' => 'ErrorHandler::handleException',
+                'renderer' => 'ExceptionRenderer',
+                'log' => true
+        ));
 
 /**
@@ -56 +82 @@
         Configure::write('App.encoding', 'UTF-8');
 
-/**
+ /**
  * In some php versions escapeshellarg() removes special characters like german
  * umlaut. This bug causes wrong system calls to files like import of media
@@ -66 +92 @@
  *          http://bugs.php.net/bug.php?id=44564
  */
-  //setlocale(LC_CTYPE, "UTF8", "en_US.UTF-8");
-
+//setlocale(LC_CTYPE, "UTF8", "en_US.UTF-8");
+ 
 /**
  * To configure CakePHP *not* to use mod_rewrite and to
@@ -96 +122 @@
  *      `manager_index()` and `/manager/controller/index`
  *
- * [Note Routing.admin is deprecated in 1.3.  Use Routing.prefixes instead]
- */
+ */
+        //Configure::write('Routing.prefixes', array('admin'));
         Configure::write('Routing.prefixes', array('admin'));
 
@@ -110 +136 @@
  *
  * If set to true, for view caching you must still use the controller
- * var $cacheAction inside your controllers to define caching settings.
- * You can either set it controller-wide by setting var $cacheAction = true,
+ * public $cacheAction inside your controllers to define caching settings.
+ * You can either set it controller-wide by setting public $cacheAction = true,
  * or in each action using $this->cacheAction = true.
  *
@@ -124 +150 @@
 
 /**
- * The preferred session handling method. Valid values:
- *
- * 'php'                        Uses settings defined in your php.ini.
- * 'cake'               Saves session files in CakePHP's /tmp directory.
- * 'database'   Uses CakePHP's database sessions.
- *
- * To define a custom session handler, save it at /app/config/<name>.php.
- * Set the value of 'Session.save' to <name> to utilize it in CakePHP.
- *
- * To use database sessions, run the app/config/schema/sessions.php schema using
- * the cake shell command: cake schema run create Sessions
- *
- */
-        Configure::write('Session.save', 'php');
-
-/**
- * The model name to be used for the session model.
- *
- * 'Session.save' must be set to 'database' in order to utilize this constant.
- *
- * The model name set here should *not* be used elsewhere in your application.
- */
-        //Configure::write('Session.model', 'Session');
-
-/**
- * The name of the table used to store CakePHP database sessions.
- *
- * 'Session.save' must be set to 'database' in order to utilize this constant.
- *
- * The table name set here should *not* include any table prefix defined elsewhere.
- *
- * Please note that if you set a value for Session.model (above), any value set for
- * Session.table will be ignored.
- *
- * [Note: Session.table is deprecated as of CakePHP 1.3]
- */
-        //Configure::write('Session.table', 'cake_sessions');
-
-/**
- * The DATABASE_CONFIG::$var to use for database session handling.
- *
- * 'Session.save' must be set to 'database' in order to utilize this constant.
- */
-        //Configure::write('Session.database', 'default');
-
-/**
- * The name of CakePHP's session cookie.
- *
- * Note the guidelines for Session names states: "The session name references
- * the session id in cookies and URLs. It should contain only alphanumeric
- * characters."
- * @link http://php.net/session_name
- */
-        Configure::write('Session.cookie', 'CAKEPHP');
-
-/**
- * Session time out time (in seconds).
- * Actual value depends on 'Security.level' setting.
- */
-        Configure::write('Session.timeout', '120');
-
-/**
- * If set to false, sessions are not automatically started.
- */
-        Configure::write('Session.start', true);
-
-/**
- * When set to false, HTTP_USER_AGENT will not be checked
- * in the session
- */
-        Configure::write('Session.checkAgent', true);
-
-/**
- * The level of CakePHP security. The session timeout time defined
- * in 'Session.timeout' is multiplied according to the settings here.
- * Valid values:
- *
- * 'high'       Session timeout in 'Session.timeout' x 10
- * 'medium'     Session timeout in 'Session.timeout' x 5040
- * 'low'                Session timeout in 'Session.timeout' x 2628000
- *
- * CakePHP session IDs are also regenerated between requests if
- * 'Security.level' is set to 'high'.
+ * Configuration of phTagr's logger
+ */
+  Configure::write('Logger.enable', true);
+  Configure::write('Logger.level', 1);
+  Configure::write('Logger.file', TMP.'logs'.DS.'logger.log');
+
+/**
+ * Session configuration.
+ *
+ * Contains an array of settings to use for session configuration. The defaults key is
+ * used to define a default preset to use for sessions, any settings declared here will override
+ * the settings of the default config.
+ *
+ * ## Options
+ *
+ * - `Session.cookie` - The name of the cookie to use. Defaults to 'CAKEPHP'
+ * - `Session.timeout` - The number of minutes you want sessions to live for. This timeout is handled by CakePHP
+ * - `Session.cookieTimeout` - The number of minutes you want session cookies to live for.
+ * - `Session.checkAgent` - Do you want the user agent to be checked when starting sessions? You might want to set the
+ *    value to false, when dealing with older versions of IE, Chrome Frame or certain web-browsing devices and AJAX
+ * - `Session.defaults` - The default configuration set to use as a basis for your session.
+ *    There are four builtins: php, cake, cache, database.
+ * - `Session.handler` - Can be used to enable a custom session handler.  Expects an array of of callables,
+ *    that can be used with `session_save_handler`.  Using this option will automatically add `session.save_handler`
+ *    to the ini array.
+ * - `Session.autoRegenerate` - Enabling this setting, turns on automatic renewal of sessions, and
+ *    sessionids that change frequently. See CakeSession::$requestCountdown.
+ * - `Session.ini` - An associative array of additional ini values to set.
+ *
+ * The built in defaults are:
+ *
+ * - 'php' - Uses settings defined in your php.ini.
+ * - 'cake' - Saves session files in CakePHP's /tmp directory.
+ * - 'database' - Uses CakePHP's database sessions.
+ * - 'cache' - Use the Cache class to save sessions.
+ *
+ * To define a custom session handler, save it at /app/Model/Datasource/Session/<name>.php.
+ * Make sure the class implements `CakeSessionHandlerInterface` and set Session.handler to <name>
+ *
+ * To use database sessions, run the app/Config/Schema/sessions.php schema using
+ * the cake shell command: cake schema create Sessions
+ *
+ */
+        Configure::write('Session', array(
+                'defaults' => 'php'
+        ));
+
+/**
+ * The level of CakePHP security.
  */
         Configure::write('Security.level', 'medium');
@@ -225 +217 @@
  * useful for invalidating browser caches.
  *
- * Set to `true` to apply timestamps, when debug = 0, or set to 'force' to always enable
- * timestamping.
+ * Set to `true` to apply timestamps when debug > 0. Set to 'force' to always enable
+ * timestamping regardless of debug value.
  */
         //Configure::write('Asset.timestamp', true);
+
 /**
  * Compress CSS output by removing comments, whitespace, repeating tags, etc.
@@ -237 +230 @@
  */
         //Configure::write('Asset.filter.css', 'css.php');
-/**
- * Configuration for PHamlP. See http://code.google.com/p/phamlp/ for details.
- */
-        Configure::write('Asset.filter.css', 'sass.php');
-        Configure::write('Sass.cache_location', TMP . DS . 'cache' . DS . 'sass');
-        //Configure::write('Sass.style', 'compressed');
-        Configure::write('Sass.extensions', array('Compass' => array('fonts_path' => '../fonts')));
 
 /**
@@ -254 +240 @@
 
 /**
+ * Configuration for PHamlP. See http://code.google.com/p/phamlp/ for details.
+ */
+  Configure::write('Asset.filter.css', 'sass.php');
+  Configure::write('Sass.cache_location', TMP . DS . 'cache' . DS . 'sass');
+  //Configure::write('Sass.style', 'compressed');
+  Configure::write('Sass.extensions', array('Compass' => array('fonts_path' => '../fonts')));
+
+/**
  * The classname and database used in CakePHP's
  * access control lists.
@@ -260 +254 @@
         Configure::write('Acl.database', 'default');
 
-/** 
+/**
  * Set here your external SMTP server configuration if your local machine does
  * not have an SMPT server. If SMTP.host is not set PHP's function mail() is
@@ -301 +295 @@
  *      ));
  *
- *
  * APC (http://pecl.php.net/package/APC)
  *
@@ -317 +310 @@
  *              'duration'=> 3600, //[optional]
  *              'probability'=> 100, //[optional]
- *              'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
+ *              'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
  *              'user' => 'user', //user from xcache.admin.user settings
- *      'password' => 'password', //plaintext password (xcache.admin.pass)
- *      ));
- *
- *
- * Memcache (http://www.danga.com/memcached/)
+ *              'password' => 'password', //plaintext password (xcache.admin.pass)
+ *      ));
+ *
+ * Memcache (http://memcached.org/)
  *
  *       Cache::config('default', array(
@@ -333 +325 @@
  *                      '127.0.0.1:11211' // localhost, default port 11211
  *              ), //[optional]
+ *              'persistent' => true, // [optional] set this to false for non-persistent connections
  *              'compress' => false, // [optional] compress data in Memcache (slower, but uses less memory)
  *      ));
  *
- */
-        Cache::config('default', array('engine' => 'File'));
-
-/**
- * Configure the Logger settings
- */
-  Configure::write('Logger.enable', true);
-  Configure::write('Logger.level', 1);
-  Configure::write('Logger.file', TMP.'logs'.DS.'logger.log');
-
-/**
- * Define the path to the user directory where the uploaded media and the cache
- * files of preview are stored
- */
-  if (!defined('USER_DIR')) {
-    //define('USER_DIR', 'DIRECTORY NAME OF USERS DATA');
-    define('USER_DIR', APP.'users'.DS);
-  }
-?>
+ *  Wincache (http://php.net/wincache)
+ *
+ *       Cache::config('default', array(
+ *              'engine' => 'Wincache', //[required]
+ *              'duration'=> 3600, //[optional]
+ *              'probability'=> 100, //[optional]
+ *              'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
+ *      ));
+ */
+
+/**
+ * Pick the caching engine to use.  If APC is enabled use it.
+ * If running via cli - apc is disabled by default. ensure it's available and enabled in this case
+ *
+ */
+$engine = 'File';
+if (extension_loaded('apc') && function_exists('apc_dec') && (php_sapi_name() !== 'cli' || ini_get('apc.enable_cli'))) {
+        $engine = 'Apc';
+}
+
+// In development mode, caches should expire quickly.
+$duration = '+999 days';
+if (Configure::read('debug') >= 1) {
+        $duration = '+10 seconds';
+}
+
+/**
+ * Configure the cache used for general framework caching.  Path information,
+ * object listings, and translation cache files are stored with this configuration.
+ */
+Cache::config('_cake_core_', array(
+        'engine' => $engine,
+        'prefix' => 'cake_core_',
+        'path' => CACHE . 'persistent' . DS,
+        'serialize' => ($engine === 'File'),
+        'duration' => $duration
+));
+
+/**
+ * Configure the cache for model and datasource caches.  This cache configuration
+ * is used to store schema descriptions, and table listings in connections.
+ */
+Cache::config('_cake_model_', array(
+        'engine' => $engine,
+        'prefix' => 'cake_model_',
+        'path' => CACHE . 'models' . DS,
+        'serialize' => ($engine === 'File'),
+        'duration' => $duration
+));

Config/routes.php

@@ -7 +7 @@
  * different urls to chosen controllers and their actions (functions).
  *
- * PHP versions 4 and 5
+ * PHP 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.config
+ * @package       app.Config
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
@@ -25 +24 @@
  * Here, we are connecting '/' (base path) to controller called 'Pages',
  * its action called 'display', and we pass a param to select the view file
- * to use (in this case, /app/views/pages/home.ctp)...
+ * to use (in this case, /app/View/Pages/home.ctp)...
  */
-        //Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+        Router::connect('/', array('controller' => 'home', 'action' => 'index'));
 /**
  * ...and connect the rest of 'Pages' controller's urls.
@@ -34 +33 @@
 
 /**
- * Routes for phTagr
+ * Load all plugin routes.  See the CakePlugin documentation on 
+ * how to customize the loading of plugin routes.
  */
-        Router::connect('/', array('controller' => 'home', 'action' => 'index'));
-        Router::connect('/webdav/*', array('controller' => 'webdav', 'action' => 'index'));
-?>
+        CakePlugin::routes();
+
+/**
+ * Load the CakePHP default routes. Remove this if you do not want to use
+ * the built-in default routes.
+ */
+        require CAKE . 'Config' . DS . 'routes.php';

webroot/index.php

@@ -5 +5 @@
  * The Front Controller for handling every request
  *
- * PHP versions 4 and 5
+ * PHP 5
  *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
  * Licensed under The MIT License
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
- * @package       cake
- * @subpackage    cake.app.webroot
+ * @package       app.webroot
  * @since         CakePHP(tm) v 0.2.9
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
@@ -46 +45 @@
                 define('APP_DIR', basename(dirname(dirname(__FILE__))));
         }
+
+/**
+ * phTagr uses not CakePHP's standard directory structure
+ *
+ */
         if (!defined('APP')) {
                 define('APP', ROOT . DS);
@@ -52 +56 @@
  * The absolute path to the "cake" directory, WITHOUT a trailing DS.
  *
+ * Un-comment this line to specify a fixed path to CakePHP.
+ * This should point at the directory containing `Cake`.
+ *
+ * For ease of development CakePHP uses PHP's include_path.  If you
+ * cannot modify your include_path set this value.
+ *
+ * Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
  */
-        if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-                define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'cakephp');
-        }
+        //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
+  // CakePHP is in phTagr's directory 'cakephp'
+        define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'cakephp' . DS . 'lib');
 
 /**
@@ -68 +79 @@
                 define('WWW_ROOT', dirname(__FILE__) . DS);
         }
-        if (!defined('CORE_PATH')) {
-                if (function_exists('ini_set') && ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'))) {
-                        define('APP_PATH', null);
-                        define('CORE_PATH', ROOT . DS . 'cakephp' . DS);
-                } else {
-                        define('APP_PATH', ROOT . DS . APP_DIR . DS);
-                        define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
-                }
-        }
+
+/**
+ * Fast media delivery without CakePHP 
+ */
         if (isset($_GET['url']) && preg_match('/media\/\w+\/\d+/', $_GET['url'])) {
                 require APP . DS . 'fast_file_responder.php';
@@ -88 +94 @@
                 }
         }
-        if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
+
+        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 (!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);
         }
-        if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') {
+
+        if (isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'] == '/favicon.ico') {
                 return;
-        } else {
-                $Dispatcher = new Dispatcher();
-                $Dispatcher->dispatch();
         }
-?>
+
+        App::uses('Dispatcher', 'Routing');
+
+        $Dispatcher = new Dispatcher();
+        $Dispatcher->dispatch(new CakeRequest(), new CakeResponse(array('charset' => Configure::read('App.encoding'))));

webroot/test.php

@@ -3 +3 @@
  * Web Access Frontend for TestSuite
  *
- * PHP versions 4 and 5
+ * PHP 5
  *
  * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
- * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
- *  Licensed under The Open Group Test Suite License
- *  Redistributions of files must retain the above copyright notice.
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice
  *
- * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @copyright     Copyright 2005-2011, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://book.cakephp.org/view/1196/Testing
- * @package       cake
- * @subpackage    cake.app.webroot
+ * @package       app.webroot
  * @since         CakePHP(tm) v 1.2.0.4433
- * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 set_time_limit(0);
@@ -46 +45 @@
                 define('APP_DIR', basename(dirname(dirname(__FILE__))));
         }
+/**
+ * phTagr uses not CakePHP's standard directory structure
+ *
+ */
         if (!defined('APP')) {
                 define('APP', ROOT . DS);
         }
+
 /**
- * The absolute path to the "cake" directory, WITHOUT a trailing DS.
+ * The absolute path to the "Cake" directory, WITHOUT a trailing DS.
  *
+ * For ease of development CakePHP uses PHP's include_path.  If you
+ * need to cannot modify your include_path, you can set this path.
+ *
+ * Leaving this constant undefined will result in it being defined in Cake/bootstrap.php
  */
-        if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-                define('CAKE_CORE_INCLUDE_PATH', ROOT);
-        }
+        //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
+        // CakePHP is in phTagr's directory 'cakephp'
+        define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'cakephp' . DS . 'lib');
 
 /**
@@ -68 +76 @@
         define('WWW_ROOT', dirname(__FILE__) . DS);
 }
-if (!defined('CORE_PATH')) {
-        if (function_exists('ini_set') && ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'))) {
-                define('APP_PATH', null);
-                define('CORE_PATH', ROOT . DS . 'cakephp' . DS);
-        } else {
-                define('APP_PATH', ROOT . DS . APP_DIR . DS);
-                define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . 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 (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
+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);
 }
 
-$corePath = App::core('cake');
-if (isset($corePath[0])) {
-        define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
-} else {
-        define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH);
+if (Configure::read('debug') < 1) {
+        die(__d('cake_dev', 'Debug setting does not allow access to this url.'));
 }
 
-if (Configure::read('debug') < 1) {
-        die(__('Debug setting does not allow access to this url.', true));
-}
+require_once CAKE . 'TestSuite' . DS . 'CakeTestSuiteDispatcher.php';
 
-require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php';
-
-$Dispatcher = new CakeTestSuiteDispatcher();
-$Dispatcher->dispatch();
-?>
+CakeTestSuiteDispatcher::run();