diff --git a/cake/console/cake.php b/cake/console/cake.php
index e3c1a099b..2d47289d8 100644
--- a/cake/console/cake.php
+++ b/cake/console/cake.php
@@ -396,10 +396,7 @@ class ConsoleDispatcher {
$app = $this->params['app'];
}
}
-
- if(strpos($this->params['working'], 'scripts')) {
- $this->params['working'] = dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . $app;
- }
+ $this->params['working'] = dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . $app;
}
/**
* Removes first argument and shifts other arguments up
diff --git a/cake/console/libs/bake.php b/cake/console/libs/bake.php
index 3bc59dc00..cf5df5bed 100644
--- a/cake/console/libs/bake.php
+++ b/cake/console/libs/bake.php
@@ -662,7 +662,7 @@ class BakeScript extends CakeScript {
$controllerPath = low(Inflector::underscore($controllerName));
- $doItInteractive = $this->in("Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite {$controllerClassName} views if it exist.", array('y','n'), 'y');
+ $doItInteractive = $this->in("Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite {$controllerName} views if it exist.", array('y','n'), 'y');
if (low($doItInteractive) == 'y' || low($doItInteractive) == 'yes') {
$this->interactive = true;
@@ -676,7 +676,6 @@ class BakeScript extends CakeScript {
}
if ((low($wannaDoAdmin) == 'y' || low($wannaDoAdmin) == 'yes')) {
- require(CONFIGS.'core.php');
if(defined('CAKE_ADMIN')) {
$admin = CAKE_ADMIN . '_';
$admin_url = '/'.CAKE_ADMIN;
@@ -1017,6 +1016,7 @@ class BakeScript extends CakeScript {
* @param array $fields
*/
function inputs($fields = array()) {
+ $displayFields = null;
foreach($fields as $name => $options) {
if(isset($options['tagName'])){
@@ -1113,7 +1113,7 @@ class BakeScript extends CakeScript {
$controllerPath = low(Inflector::underscore($controllerName));
- $doItInteractive = $this->in("Would you like bake to build your controller interactively?\nWarning: Choosing no will overwrite {$controllerClassName} controller if it exist.", array('y','n'), 'y');
+ $doItInteractive = $this->in("Would you like bake to build your controller interactively?\nWarning: Choosing no will overwrite {$controllerName} controller if it exist.", array('y','n'), 'y');
if (low($doItInteractive) == 'y' || low($doItInteractive) == 'yes') {
$this->interactive = true;
@@ -1165,7 +1165,6 @@ class BakeScript extends CakeScript {
$admin = null;
$admin_url = null;
if ((low($wannaDoAdmin) == 'y' || low($wannaDoAdmin) == 'yes')) {
- require(CONFIGS.'core.php');
if(defined('CAKE_ADMIN')) {
$admin = CAKE_ADMIN.'_';
$admin_url = '/'.CAKE_ADMIN;
@@ -1994,7 +1993,7 @@ class BakeScript extends CakeScript {
*/
function __defaultHome($dir, $app) {
$path = $dir.DS.'views'.DS.'pages'.DS;
- include(CAKE_CORE_INCLUDE_PATH.DS.'cake'.DS.'scripts'.DS.'templates'.DS.'views'.DS.'home.ctp');
+ include(CAKE_CORE_INCLUDE_PATH.DS.'cake'.DS.'console'.DS.'libs'.DS.'templates'.DS.'views'.DS.'home.ctp');
$this->createFile($path.'home.ctp', $output);
}
/**
diff --git a/cake/console/libs/templates/skel/config/acl.ini.php b/cake/console/libs/templates/skel/config/acl.ini.php
index 87a1e60ac..cb8f325df 100644
--- a/cake/console/libs/templates/skel/config/acl.ini.php
+++ b/cake/console/libs/templates/skel/config/acl.ini.php
@@ -8,22 +8,22 @@
; *
; * CakePHP(tm) : Rapid Development Framework
; * Copyright 2005-2007, Cake Software Foundation, Inc.
-; * 1785 E. Sahara Avenue, Suite 490-204
-; * Las Vegas, Nevada 89104
+; * 1785 E. Sahara Avenue, Suite 490-204
+; * Las Vegas, Nevada 89104
; *
; * Licensed under The MIT License
; * Redistributions of files must retain the above copyright notice.
; *
; * @filesource
; * @copyright Copyright 2005-2007, Cake Software Foundation, Inc.
-; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
-; * @package cake
-; * @subpackage cake.app.config
+; * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+; * @package cake
+; * @subpackage cake.app.config
; * @since CakePHP(tm) v 0.10.0.1076
-; * @version $Revision$
-; * @modifiedby $LastChangedBy$
+; * @version $Revision$
+; * @modifiedby $LastChangedBy$
; * @lastmodified $Date$
-; * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+; * @license http://www.opensource.org/licenses/mit-license.php The MIT License
; */
; acl.ini.php - Cake ACL Configuration
diff --git a/cake/console/libs/templates/skel/config/core.php b/cake/console/libs/templates/skel/config/core.php
index 2cc8b3fd5..1b7fd7fe2 100644
--- a/cake/console/libs/templates/skel/config/core.php
+++ b/cake/console/libs/templates/skel/config/core.php
@@ -27,117 +27,177 @@
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
- * If you do not have mod rewrite on your system
- * or if you prefer to use CakePHP pretty urls.
- * uncomment the line below.
- * Note: If you do have mod rewrite but prefer the
- * CakePHP pretty urls, you also have to remove the
- * .htaccess files
- * release/.htaccess
- * release/app/.htaccess
- * release/app/webroot/.htaccess
+ * To configure CakePHP *not* to use mod_rewrite and to
+ * use CakePHP pretty URLs, remove these .htaccess
+ * files:
+ *
+ * /.htaccess
+ * /app/.htaccess
+ * /app/webroot/.htaccess
+ *
+ * And uncomment the define below:
*/
+
// define ('BASE_URL', env('SCRIPT_NAME'));
+
/**
- * Set debug level here:
- * - 0: production
- * - 1: development
- * - 2: full debug with sql
- * - 3: full debug with sql and dump of the current object
+ * CakePHP Debug Level:
*
- * In production, the "flash messages" redirect after a time interval.
- * With the other debug levels you get to click the "flash message" to continue.
+ * Production Mode:
+ * 0: No error messages, errors, or warnings shown. Flash messages redirect.
*
+ * Development Mode:
+ * 1: Errors and warnings shown, model caches refreshed, flash messages halted.
+ * 2: As in 1, but also with full debug messages and SQL output.
+ * 3: As in 2, but also with full controller dump.
+ *
+ * In production mode, flash messages redirect after a time interval.
+ * In development mode, you need to click the flash message to continue.
*/
define('DEBUG', 2);
/**
- * Turn of caching checking wide.
- * You must still use the controller var cacheAction inside you controller class.
- * You can either set it controller wide, or in each controller method.
- * use var $cacheAction = true; or in the controller method $this->cacheAction = true;
+ * Turn off or enable cache checking application-wide.
+ *
+ * If set to true, 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, or in each action
+ * using $this->cacheAction = true.
*/
define('CACHE_CHECK', false);
/**
- * Error constant. Used for differentiating error logging and debugging.
- * Currently PHP supports LOG_DEBUG
+ * Defines the default error type when using the log() function. Used for
+ * differentiating error logging and debugging. Currently PHP supports LOG_DEBUG.
*/
define('LOG_ERROR', 2);
/**
- * CakePHP includes 3 types of session saves
- * database or file. Set this to your preferred method.
- * If you want to use your own save handler place it in
- * app/config/name.php DO NOT USE file or database as the name.
- * and use just the name portion below.
+ * The preferred session handling method. Valid values:
*
- * Setting this to cake will save files to /cakedistro/tmp directory
- * Setting it to php will use the php default save path
- * Setting it to database will use the database
+ * '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/.php.
+ * Set the value of CAKE_SESSION_SAVE to to utilize it in CakePHP.
+ *
+ * To use database sessions, execute the SQL file found at /app/config/sql/sessions.sql.
*
*/
define('CAKE_SESSION_SAVE', 'php');
/**
- * If using you own table name for storing sessions
- * set the table name here.
- * DO NOT INCLUDE PREFIX IF YOU HAVE SET ONE IN database.php
+ * The name of the table used to store CakePHP database sessions.
*
+ * CAKE_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.
*/
define('CAKE_SESSION_TABLE', 'cake_sessions');
/**
- * Set a random string of used in session.
- *
+ * A random string used in session management.
*/
define('CAKE_SESSION_STRING', 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');
/**
- * Set the name of session cookie
- *
+ * The name of CakePHP's session cookie.
*/
define('CAKE_SESSION_COOKIE', 'CAKEPHP');
/**
- * Set level of Cake security.
+ * The level of CakePHP session security. The session timeout time defined
+ * in CAKE_SESSION_TIMEOUT is multiplied according to the settings here.
+ * Valid values:
*
+ * 'high' Session timeout in CAKE_SESSION_TIMEOUT x 10
+ * 'medium' Session timeout in CAKE_SESSION_TIMEOUT x 100
+ * 'low' Session timeout in CAKE_SESSION_TIMEOUT x 300
+ *
+ * CakePHP session IDs are also regenerated between requests if
+ * CAKE_SECURITY is set to 'high'.
*/
define('CAKE_SECURITY', 'high');
/**
- * Set Cake Session time out.
- * If CAKE_SECURITY define is set
- * high: multiplied by 10
- * medium: is multiplied by 100
- * low is: multiplied by 300
- *
- * Number below is seconds.
+ * Session time out time (in seconds).
+ * Actual value depends on CAKE_SECURITY setting.
*/
define('CAKE_SESSION_TIMEOUT', '120');
/**
- * Uncomment the define below to use cake built in admin routes.
- * You can set this value to anything you want.
- * All methods related to the admin route should be prefixed with the
- * name you set CAKE_ADMIN to.
- * For example: admin_index, admin_edit
+ * Uncomment the define below to use CakePHP admin routes.
+ *
+ * The value of the define determines the name of the route
+ * and its associated controller actions:
+ *
+ * 'admin' -> admin_index() and /admin/controller/index
+ * 'superuser' -> superuser_index() and /superuser/controller/index
*/
// define('CAKE_ADMIN', 'admin');
/**
- * The define below is used to turn cake built webservices
- * on or off. Default setting is off.
+ * Enable or disable CakePHP webservices routing. Set to 'off' or 'on'.
*/
define('WEBSERVICES', 'off');
/**
- * Compress output CSS (removing comments, whitespace, repeating tags etc.)
- * This requires a/var/cache directory to be writable by the web server (caching).
+ * Compress CSS output by removing comments, whitespace, repeating tags, etc.
+ * This requires a/var/cache directory to be writable by the web server for caching.
+ *
* To use, prefix the CSS link URL with '/ccss/' instead of '/css/' or use Controller::cssTag().
*/
define('COMPRESS_CSS', false);
/**
- * If set to false, session would not automatically be started.
+ * If set to false, sessions are not automatically started.
*/
define('AUTO_SESSION', true);
/**
- * Set the max size of file to use md5() .
+ * The max size of file allowed for MD5 hashes (in bytes).
*/
define('MAX_MD5SIZE', (5 * 1024) * 1024);
/**
- * To use Access Control Lists with Cake...
+ * The classname, filename, (and database) used in CakePHP's
+ * access control lists.
*/
define('ACL_CLASSNAME', 'DB_ACL');
- define('ACL_FILENAME', 'dbacl' . DS . 'db_acl');
+ define('ACL_FILENAME', 'db_acl');
define('ACL_DATABASE', 'default');
+/**
+ * How long to cache data if not defined
+ * 3600 = 1 hour
+ */
+ define('CACHE_DEFAULT_DURATION', 3600);
+/**
+ * How often to do garbage collection
+ * about once in every hundred page loads
+ */
+ define('CACHE_GC_PROBABILITY', 100);
+/**
+ * Use the file storage engine with default parameters.
+ * Cached data is kept in app/tmp/cache/
+ *
+ * File storage
+ * $cakeCache = array('File', [optional]array(
+ * 'dir' => '/tmp/', // use system tmp directory - remember to use absolute path
+ * 'prefix' => 'cakecache_', // prefix every cache file with this string
+ * 'lock' => true, // use file locking
+ * ));
+ * $cakeCache = array('File');
+ *
+ * APC (Alternative PHP Cache)
+ * $cakeCache = array('APC');
+ *
+ * Xcache (PHP opcode cacher)
+ * $cakeCache = array('Xcache', array(
+ * 'user' => 'admin', // user from xcache.admin.user settings
+ * 'password' => 'your_password', // plaintext password (xcache.admin.pass)
+ * ));
+ *
+ * Memcache
+ * $cakeCache = array('Memcache', [optional]array(
+ * 'servers' => array(
+ * '127.0.0.1', // localhost, default port
+ * '10.0.0.1:12345', // port 12345
+ * ),
+ * 'compress' => true, // compress data in Memcache (slower, but uses less memory)
+ * ));
+ *
+ * Cake Model
+ * $cakeCache = array('Model', [optional]array(
+ * 'modelName' => 'DbModel',
+ * 'dataField' => 'value',
+ * 'expiryField' => 'expires'));
+ */
+ $cakeCache = array('File');
?>
\ No newline at end of file
diff --git a/cake/console/libs/templates/skel/config/database.php.default b/cake/console/libs/templates/skel/config/database.php.default
index 1ac589be6..6fa22eb1a 100644
--- a/cake/console/libs/templates/skel/config/database.php.default
+++ b/cake/console/libs/templates/skel/config/database.php.default
@@ -36,39 +36,60 @@
* Database configuration class.
* You can specify multiple configurations for production, development and testing.
*
- * driver =>
- * mysql, postgres, sqlite, adodb-drivername, pear-drivername
+ * driver => The name of a supported driver; valid options are as follows:
+ * mysql - MySQL 4 & 5,
+ * mysqli - MySQL 4 & 5 Improved Interface (PHP5 only),
+ * sqlite - SQLite (PHP5 only),
+ * postgres - PostgreSQL 7 and higher,
+ * mssql - Microsoft SQL Server 2000 and higher,
+ * db2 - IBM DB2, Cloudscape, and Apache Derby (http://php.net/ibm-db2)
+ * oracle - Oracle 8 and higher
+ * adodb-[drivername] - ADOdb interface wrapper (see below),
+ * pear-[drivername] - PEAR::DB wrapper
+ *
+ * You can add custom database drivers (or override existing drivers) by adding the
+ * appropriate file to app/models/datasources/dbo. Drivers should be named 'dbo_x.php',
+ * where 'x' is the name of the database.
+ *
+ * persistent => true / false
+ * Determines whether or not the database should use a persistent connection
*
* connect =>
- * MySQL set the connect to either mysql_pconnect of mysql_connect
- * PostgreSQL set the connect to either pg_pconnect of pg_connect
- * SQLite set the connect to sqlite_popen or sqlite_open
- * MSSQL set the connect to mssql_connect or mssql_pconnect
* ADOdb set the connect to one of these
* (http://phplens.com/adodb/supported.databases.html) and
* append it '|p' for persistent connection. (mssql|p for example, or just mssql for not persistent)
+ * For all other databases, this setting is deprecated.
*
* host =>
* the host you connect to the database
* To add a port number use 'port' => #
*
+ * prefix =>
+ * Uses the given prefix for all the tables in this database. This setting can be overridden
+ * on a per-table basis with the Model::$tablePrefix property.
+ *
*/
-class DATABASE_CONFIG
-{
- var $default = array('driver' => 'mysql',
- 'connect' => 'mysql_connect',
- 'host' => 'localhost',
- 'login' => 'user',
- 'password' => 'password',
- 'database' => 'project_name',
- 'prefix' => '');
+class DATABASE_CONFIG {
- var $test = array('driver' => 'mysql',
- 'connect' => 'mysql_connect',
- 'host' => 'localhost',
- 'login' => 'user',
- 'password' => 'password',
- 'database' => 'project_name-test',
- 'prefix' => '');
+ var $default = array(
+ 'driver' => 'mysql',
+ 'persistent' => false,
+ 'host' => 'localhost',
+ 'login' => 'user',
+ 'password' => 'password',
+ 'database' => 'project_name',
+ 'prefix' => ''
+ );
+
+ var $test = array(
+ 'driver' => 'mysql',
+ 'persistent' => false,
+ 'host' => 'localhost',
+ 'login' => 'user',
+ 'password' => 'password',
+ 'database' => 'project_name-test',
+ 'prefix' => ''
+ );
}
+
?>
\ No newline at end of file
diff --git a/cake/console/libs/templates/skel/config/sql/sessions.sql b/cake/console/libs/templates/skel/config/sql/sessions.sql
index 6deb7206f..d21e8cede 100644
--- a/cake/console/libs/templates/skel/config/sql/sessions.sql
+++ b/cake/console/libs/templates/skel/config/sql/sessions.sql
@@ -1,7 +1,12 @@
--- @copyright Copyright 2005-2007, Cake Software Foundation, Inc.
--- @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
--- @since CakePHP v 0.10.8.1997
--- @version $Revision$
+# $Id$
+#
+# Copyright 2005-2007, Cake Software Foundation, Inc.
+# 1785 E. Sahara Avenue, Suite 490-204
+# Las Vegas, Nevada 89104
+#
+# Licensed under The MIT License
+# Redistributions of files must retain the above copyright notice.
+# http://www.opensource.org/licenses/mit-license.php The MIT License
CREATE TABLE cake_sessions (
id varchar(255) NOT NULL default '',
diff --git a/cake/console/libs/templates/skel/views/layouts/ajax.ctp b/cake/console/libs/templates/skel/views/layouts/ajax.ctp
index 35cce8eb5..b69838d65 100644
--- a/cake/console/libs/templates/skel/views/layouts/ajax.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/ajax.ctp
@@ -1,21 +1,18 @@
- * Copyright 2005-2007, Cake Software Foundation, Inc.
+ * Copyright 2005-2007, Cake Software Foundation, Inc.
* 1785 E. Sahara Avenue, Suite 490-204
* Las Vegas, Nevada 89104
*
* Licensed under The MIT License
* Redistributions of files must retain the above copyright notice.
*
- * @filesource
+ * @filesource
* @copyright Copyright 2005-2007, Cake Software Foundation, Inc.
* @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
* @package cake
diff --git a/cake/console/libs/templates/skel/views/layouts/default.ctp b/cake/console/libs/templates/skel/views/layouts/default.ctp
index c831d7290..d82939f44 100644
--- a/cake/console/libs/templates/skel/views/layouts/default.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/default.ctp
@@ -1,11 +1,37 @@
+
+ * Copyright 2005-2007, Cake Software Foundation, Inc.
+ * 1785 E. Sahara Avenue, Suite 490-204
+ * Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright Copyright 2005-2007, Cake Software Foundation, Inc.
+ * @link http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package cake
+ * @subpackage cake.cake.libs.view.templates.pages
+ * @since CakePHP(tm) v 0.10.0.1076
+ * @version $Revision$
+ * @modifiedby $LastChangedBy$
+ * @lastmodified $Date$
+ * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+?>
- CakePHP: the PHP Rapid Development Framework:
+ CakePHP: the PHP Rapid Development Framework:
<?php echo $title_for_layout;?>
-
+
charset();?>
diff --git a/cake/console/libs/templates/skel/views/layouts/flash.ctp b/cake/console/libs/templates/skel/views/layouts/flash.ctp
index 0479cd528..fc8293d10 100644
--- a/cake/console/libs/templates/skel/views/layouts/flash.ctp
+++ b/cake/console/libs/templates/skel/views/layouts/flash.ctp
@@ -1,9 +1,6 @@
<?php echo $page_title?>
-charset();?>
+charset(); ?>
@@ -42,10 +39,7 @@ A { color:#444; text-decoration:none }
A:HOVER { text-decoration: underline; color:#44E }
-->
-
-