adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

App & skel folder sync + some improvements

Browse source 
Mostly CS, doc blocks and some CSS
This commit is contained in:
Marc Würth 2015-09-25 17:25:35 +02:00
parent c14d1ffe93
commit dbfd2c44e9
28 changed files with 93 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Config/Schema/db_acl.php
View file

@ -21,7 +21,6 @@
/** /**
* Using the Schema command line utility * Using the Schema command line utility
* cake schema run create DbAcl * cake schema run create DbAcl
*
*/ */
class DbAclSchema extends CakeSchema { class DbAclSchema extends CakeSchema {

10
app/Config/Schema/i18n.php
View file

@ -27,6 +27,11 @@
*/ */
class I18nSchema extends CakeSchema { class I18nSchema extends CakeSchema {
/**
* The name property
*
* @var string
*/
public $name = 'i18n'; public $name = 'i18n';
/** /**
@ -48,6 +53,11 @@ class I18nSchema extends CakeSchema {
public function after($event = array()) { public function after($event = array()) {
} }
/**
* The i18n table definition
*
* @var array
*/
public $i18n = array( public $i18n = array(
'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'), 'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
'locale' => array('type' => 'string', 'null' => false, 'length' => 6, 'key' => 'index'), 'locale' => array('type' => 'string', 'null' => false, 'length' => 6, 'key' => 'index'),

14
app/Config/Schema/sessions.php
View file

@ -18,14 +18,17 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License * @license http://www.opensource.org/licenses/mit-license.php MIT License
*/ */
/* /**
*
* Using the Schema command line utility * Using the Schema command line utility
* cake schema run create Sessions * cake schema run create Sessions
*
*/ */
class SessionsSchema extends CakeSchema { class SessionsSchema extends CakeSchema {
/**
* Name property
*
* @var string
*/
public $name = 'Sessions'; public $name = 'Sessions';
/** /**
@ -47,6 +50,11 @@ class SessionsSchema extends CakeSchema {
public function after($event = array()) { public function after($event = array()) {
} }
/**
* The cake_sessions table definition
*
* @var array
*/
public $cake_sessions = array( public $cake_sessions = array(
'id' => array('type' => 'string', 'null' => false, 'key' => 'primary'), 'id' => array('type' => 'string', 'null' => false, 'key' => 'primary'),
'data' => array('type' => 'text', 'null' => true, 'default' => null), 'data' => array('type' => 'text', 'null' => true, 'default' => null),

2
app/Config/acl.ini.php
View file

@ -15,7 +15,7 @@
; * @license http://www.opensource.org/licenses/mit-license.php MIT License ; * @license http://www.opensource.org/licenses/mit-license.php MIT License
; */ ; */
; acl.ini.php - Cake ACL Configuration ; acl.ini.php - CakePHP ACL Configuration
; --------------------------------------------------------------------- ; ---------------------------------------------------------------------
; Use this file to specify user permissions. ; Use this file to specify user permissions.
; aco = access control object (something in your application) ; aco = access control object (something in your application)

3
app/Config/bootstrap.php
View file

@ -48,7 +48,6 @@ Cache::config('default', array('engine' => 'File'));
* 'Vendor' => array('/path/to/vendors/', '/next/path/to/vendors/'), * 'Vendor' => array('/path/to/vendors/', '/next/path/to/vendors/'),
* 'Plugin' => array('/path/to/plugins/', '/next/path/to/plugins/'), * 'Plugin' => array('/path/to/plugins/', '/next/path/to/plugins/'),
* )); * ));
*
*/ */
/** /**
@ -57,7 +56,6 @@ Cache::config('default', array('engine' => 'File'));
* *
* Inflector::rules('singular', array('rules' => array(), 'irregular' => array(), 'uninflected' => array())); * Inflector::rules('singular', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
* Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array())); * Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
*
*/ */
/** /**
@ -67,7 +65,6 @@ Cache::config('default', array('engine' => 'File'));
* *
* CakePlugin::loadAll(); // Loads all plugins at once * CakePlugin::loadAll(); // Loads all plugins at once
* CakePlugin::load('DebugKit'); //Loads a single plugin named DebugKit * CakePlugin::load('DebugKit'); //Loads a single plugin named DebugKit
*
*/ */
/** /**

7
app/Config/core.php
View file

@ -18,6 +18,9 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License * @license http://www.opensource.org/licenses/mit-license.php MIT License
*/ */
//setLocale(LC_ALL, 'deu');
//Configure::write('Config.language', 'deu');
/** /**
* CakePHP Debug Level: * CakePHP Debug Level:
* *
@ -147,13 +150,11 @@
* Enables: * Enables:
* `admin_index()` and `/admin/controller/index` * `admin_index()` and `/admin/controller/index`
* `manager_index()` and `/manager/controller/index` * `manager_index()` and `/manager/controller/index`
*
*/ */
//Configure::write('Routing.prefixes', array('admin')); //Configure::write('Routing.prefixes', array('admin'));
/** /**
* Turn off all caching application-wide. * Turn off all caching application-wide.
*
*/ */
//Configure::write('Cache.disable', true); //Configure::write('Cache.disable', true);
@ -164,7 +165,6 @@
* public $cacheAction inside your controllers to define caching settings. * public $cacheAction inside your controllers to define caching settings.
* You can either set it controller-wide by setting public $cacheAction = true, * You can either set it controller-wide by setting public $cacheAction = true,
* or in each action using $this->cacheAction = true. * or in each action using $this->cacheAction = true.
*
*/ */
//Configure::write('Cache.check', true); //Configure::write('Cache.check', true);
@ -213,7 +213,6 @@
* *
* To use database sessions, run the app/Config/Schema/sessions.php schema using * To use database sessions, run the app/Config/Schema/sessions.php schema using
* the cake shell command: cake schema create Sessions * the cake shell command: cake schema create Sessions
*
*/ */
Configure::write('Session', array( Configure::write('Session', array(
'defaults' => 'php' 'defaults' => 'php'

2
app/Config/database.php.default
View file

@ -1,7 +1,5 @@
<?php <?php
/** /**
*
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org) * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* *

3
app/Config/email.php.default
View file

@ -1,7 +1,5 @@
<?php <?php
/** /**
*
*
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org) * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* *
@ -35,7 +33,6 @@
* *
* from => * from =>
* The origin email. See CakeEmail::from() about the valid values * The origin email. See CakeEmail::from() about the valid values
*
*/ */
class EmailConfig { class EmailConfig {

1
app/Config/routes.php
View file

@ -19,6 +19,7 @@
* @since CakePHP(tm) v 0.2.9 * @since CakePHP(tm) v 0.2.9
* @license http://www.opensource.org/licenses/mit-license.php MIT License * @license http://www.opensource.org/licenses/mit-license.php MIT License
*/ */
/** /**
* Here, we are connecting '/' (base path) to controller called 'Pages', * Here, we are connecting '/' (base path) to controller called 'Pages',
* its action called 'display', and we pass a param to select the view file * its action called 'display', and we pass a param to select the view file

0
app/View/Elements/empty
View file

1
app/View/Layouts/rss/default.ctp
View file

@ -11,4 +11,3 @@ echo $this->Rss->document(
array(), $channel, $this->fetch('content') array(), $channel, $this->fetch('content')
) )
); );
?>

33
app/webroot/css/cake.generic.css
View file

@ -1,6 +1,5 @@
@charset "utf-8"; @charset "utf-8";
/** /**
*
* Generic CSS for CakePHP * Generic CSS for CakePHP
* *
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org) * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
@ -84,7 +83,7 @@ p {
line-height:20px; line-height:20px;
background: #003d4c url('../img/cake.icon.png') no-repeat left; background: #003d4c url('../img/cake.icon.png') no-repeat left;
color: #fff; color: #fff;
padding: 0px 30px; padding: 0 30px;
} }
#header h1 a { #header h1 a {
color: #fff; color: #fff;
@ -174,7 +173,7 @@ td.actions {
white-space: nowrap; white-space: nowrap;
} }
table td.actions a { table td.actions a {
margin: 0px 6px; margin: 0 6px;
padding:2px 5px; padding:2px 5px;
} }
@ -336,7 +335,7 @@ option {
input[type=checkbox] { input[type=checkbox] {
clear: left; clear: left;
float: left; float: left;
margin: 0px 6px 7px 2px; margin: 0 6px 7px 2px;
width: auto; width: auto;
} }
div.checkbox label { div.checkbox label {
@ -365,7 +364,7 @@ form .submit input[type=submit] {
background-image: -moz-linear-gradient(top, #76BF6B, #3B8230); background-image: -moz-linear-gradient(top, #76BF6B, #3B8230);
border-color: #2d6324; border-color: #2d6324;
color: #fff; color: #fff;
text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px; text-shadow: rgba(0, 0, 0, 0.5) 0 -1px 0;
padding: 8px 10px; padding: 8px 10px;
} }
form .submit input[type=submit]:hover { form .submit input[type=submit]:hover {
@ -527,11 +526,11 @@ input[type=submit],
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
text-decoration: none; text-decoration: none;
text-shadow: #fff 0px 1px 0px; text-shadow: #fff 0 1px 0;
min-width: 0; min-width: 0;
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-user-select: none; -webkit-user-select: none;
user-select: none; user-select: none;
} }
@ -551,7 +550,7 @@ input[type=submit]:active,
background-image: -ms-linear-gradient(top, #dfdfdf, #eee); background-image: -ms-linear-gradient(top, #dfdfdf, #eee);
background-image: -o-linear-gradient(top, #dfdfdf, #eee); background-image: -o-linear-gradient(top, #dfdfdf, #eee);
background-image: linear-gradient(top, #dfdfdf, #eee); background-image: linear-gradient(top, #dfdfdf, #eee);
text-shadow: #eee 0px 1px 0px; text-shadow: #eee 0 1px 0;
-moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
@ -627,15 +626,15 @@ pre {
-moz-border-radius: 10px; -moz-border-radius: 10px;
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
border-radius: 10px; border-radius: 10px;
margin: 0px 4px 10px 2px; margin: 0 4px 10px 2px;
font-family: sans-serif; font-family: sans-serif;
font-size: 14px; font-size: 14px;
line-height: 14px; line-height: 14px;
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
-moz-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
-webkit-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
} }
.cake-code-dump pre { .cake-code-dump pre {
position: relative; position: relative;
@ -647,13 +646,13 @@ pre {
.cake-stack-trace pre { .cake-stack-trace pre {
color: #000; color: #000;
background-color: #F0F0F0; background-color: #F0F0F0;
margin: 0px 0 10px 0; margin: 0 0 10px 0;
padding: 1em; padding: 1em;
overflow: auto; overflow: auto;
text-shadow: none; text-shadow: none;
} }
.cake-stack-trace li { .cake-stack-trace li {
padding: 10px 5px 0px; padding: 10px 5px 0;
margin: 0 0 4px 0; margin: 0 0 4px 0;
font-family: monospace; font-family: monospace;
border: 1px solid #bbb; border: 1px solid #bbb;
@ -709,7 +708,7 @@ pre {
} }
.code-coverage-results div.start { .code-coverage-results div.start {
border:1px solid #aaa; border:1px solid #aaa;
border-width:1px 1px 0px 1px; border-width:1px 1px 0 1px;
margin-top:30px; margin-top:30px;
padding-top:5px; padding-top:5px;
} }

5
app/webroot/index.php
View file

@ -33,7 +33,6 @@ if (!defined('DS')) {
/** /**
* The full path to the directory which holds "app", WITHOUT a trailing DS. * The full path to the directory which holds "app", WITHOUT a trailing DS.
*
*/ */
if (!defined('ROOT')) { if (!defined('ROOT')) {
define('ROOT', dirname(dirname(dirname(__FILE__)))); define('ROOT', dirname(dirname(dirname(__FILE__))));
@ -41,7 +40,6 @@ if (!defined('ROOT')) {
/** /**
* The actual directory name for the "app". * The actual directory name for the "app".
*
*/ */
if (!defined('APP_DIR')) { if (!defined('APP_DIR')) {
define('APP_DIR', basename(dirname(dirname(__FILE__)))); define('APP_DIR', basename(dirname(dirname(__FILE__))));
@ -76,7 +74,6 @@ if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispat
/** /**
* Editing below this line should NOT be necessary. * Editing below this line should NOT be necessary.
* Change at your own risk. * Change at your own risk.
*
*/ */
if (!defined('WEBROOT_DIR')) { if (!defined('WEBROOT_DIR')) {
define('WEBROOT_DIR', basename(dirname(__FILE__))); define('WEBROOT_DIR', basename(dirname(__FILE__)));
@ -86,7 +83,7 @@ if (!defined('WWW_ROOT')) {
} }
// for built-in server // for built-in server
if (php_sapi_name() === 'cli-server') { if (PHP_SAPI === 'cli-server') {
if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) { if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
return false; return false;
} }

5
app/webroot/test.php
View file

@ -34,7 +34,6 @@ if (!defined('DS')) {
/** /**
* The full path to the directory which holds "app", WITHOUT a trailing DS. * The full path to the directory which holds "app", WITHOUT a trailing DS.
*
*/ */
if (!defined('ROOT')) { if (!defined('ROOT')) {
define('ROOT', dirname(dirname(dirname(__FILE__)))); define('ROOT', dirname(dirname(dirname(__FILE__))));
@ -42,7 +41,6 @@ if (!defined('ROOT')) {
/** /**
* The actual directory name for the "app". * The actual directory name for the "app".
*
*/ */
if (!defined('APP_DIR')) { if (!defined('APP_DIR')) {
define('APP_DIR', basename(dirname(dirname(__FILE__)))); define('APP_DIR', basename(dirname(dirname(__FILE__))));
@ -74,7 +72,6 @@ if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispat
/** /**
* Editing below this line should not be necessary. * Editing below this line should not be necessary.
* Change at your own risk. * Change at your own risk.
*
*/ */
if (!defined('WEBROOT_DIR')) { if (!defined('WEBROOT_DIR')) {
define('WEBROOT_DIR', basename(dirname(__FILE__))); define('WEBROOT_DIR', basename(dirname(__FILE__)));
@ -100,7 +97,7 @@ if (!empty($failed)) {
} }
if (Configure::read('debug') < 1) { if (Configure::read('debug') < 1) {
throw new NotFoundException(__d('cake_dev', 'Debug setting does not allow access to this url.')); throw new NotFoundException(__d('cake_dev', 'Debug setting does not allow access to this URL.'));
} }
require_once CAKE . 'TestSuite' . DS . 'CakeTestSuiteDispatcher.php'; require_once CAKE . 'TestSuite' . DS . 'CakeTestSuiteDispatcher.php';

4
lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
View file

@ -9,11 +9,9 @@
* @since CakePHP(tm) v 0.2.9 * @since CakePHP(tm) v 0.2.9
*/ */
/* /**
*
* Using the Schema command line utility * Using the Schema command line utility
* cake schema run create DbAcl * cake schema run create DbAcl
*
*/ */
class DbAclSchema extends CakeSchema { class DbAclSchema extends CakeSchema {

21
lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
View file

@ -4,9 +4,18 @@
* *
* Use it to configure database for i18n * Use it to configure database for i18n
* *
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* For full copyright and license information, please see the LICENSE.txt
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project * @link http://cakephp.org CakePHP(tm) Project
* @package app.Config.Schema * @package app.Config.Schema
* @since CakePHP(tm) v 0.2.9 * @since CakePHP(tm) v 0.2.9
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/ */
/** /**
@ -26,26 +35,26 @@ class I18nSchema extends CakeSchema {
public $name = 'i18n'; public $name = 'i18n';
/** /**
* Before event. * Before callback.
* *
* @param array $event The event data. * @param array $event Schema object properties
* @return bool success * @return bool Should process continue
*/ */
public function before($event = array()) { public function before($event = array()) {
return true; return true;
} }
/** /**
* After event. * After callback.
* *
* @param array $event The event data. * @param array $event Schema object properties
* @return void * @return void
*/ */
public function after($event = array()) { public function after($event = array()) {
} }
/** /**
* The i18n table property * The i18n table definition
* *
* @var array * @var array
*/ */

22
lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
View file

@ -4,15 +4,23 @@
* *
* Use it to configure database for Sessions * Use it to configure database for Sessions
* *
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
* Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The MIT License
* For full copyright and license information, please see the LICENSE.txt
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link http://cakephp.org CakePHP(tm) Project * @link http://cakephp.org CakePHP(tm) Project
* @package app.Config.Schema * @package app.Config.Schema
* @since CakePHP(tm) v 0.2.9 * @since CakePHP(tm) v 0.2.9
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/ */
/** /**
* Using the Schema command line utility * Using the Schema command line utility
* cake schema run create Sessions * cake schema run create Sessions
*
*/ */
class SessionsSchema extends CakeSchema { class SessionsSchema extends CakeSchema {
@ -24,26 +32,26 @@ class SessionsSchema extends CakeSchema {
public $name = 'Sessions'; public $name = 'Sessions';
/** /**
* Before event. * Before callback.
* *
* @param array $event The event data. * @param array $event Schema object properties
* @return bool Success * @return bool Should process continue
*/ */
public function before($event = array()) { public function before($event = array()) {
return true; return true;
} }
/** /**
* After event. * After callback.
* *
* @param array $event The event data. * @param array $event Schema object properties
* @return void * @return void
*/ */
public function after($event = array()) { public function after($event = array()) {
} }
/** /**
* cake_sessions table definition * The cake_sessions table definition
* *
* @var array * @var array
*/ */

3
lib/Cake/Console/Templates/skel/Config/bootstrap.php
View file

@ -39,7 +39,6 @@ Cache::config('default', array('engine' => 'File'));
* 'Vendor' => array('/path/to/vendors/', '/next/path/to/vendors/'), * 'Vendor' => array('/path/to/vendors/', '/next/path/to/vendors/'),
* 'Plugin' => array('/path/to/plugins/', '/next/path/to/plugins/'), * 'Plugin' => array('/path/to/plugins/', '/next/path/to/plugins/'),
* )); * ));
*
*/ */
/** /**
@ -48,7 +47,6 @@ Cache::config('default', array('engine' => 'File'));
* *
* Inflector::rules('singular', array('rules' => array(), 'irregular' => array(), 'uninflected' => array())); * Inflector::rules('singular', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
* Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array())); * Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
*
*/ */
/** /**
@ -58,7 +56,6 @@ Cache::config('default', array('engine' => 'File'));
* *
* CakePlugin::loadAll(); // Loads all plugins at once * CakePlugin::loadAll(); // Loads all plugins at once
* CakePlugin::load('DebugKit'); //Loads a single plugin named DebugKit * CakePlugin::load('DebugKit'); //Loads a single plugin named DebugKit
*
*/ */
/** /**

4
lib/Cake/Console/Templates/skel/Config/core.php
View file

@ -138,13 +138,11 @@
* Enables: * Enables:
* `admin_index()` and `/admin/controller/index` * `admin_index()` and `/admin/controller/index`
* `manager_index()` and `/manager/controller/index` * `manager_index()` and `/manager/controller/index`
*
*/ */
//Configure::write('Routing.prefixes', array('admin')); //Configure::write('Routing.prefixes', array('admin'));
/** /**
* Turn off all caching application-wide. * Turn off all caching application-wide.
*
*/ */
//Configure::write('Cache.disable', true); //Configure::write('Cache.disable', true);
@ -155,7 +153,6 @@
* public $cacheAction inside your controllers to define caching settings. * public $cacheAction inside your controllers to define caching settings.
* You can either set it controller-wide by setting public $cacheAction = true, * You can either set it controller-wide by setting public $cacheAction = true,
* or in each action using $this->cacheAction = true. * or in each action using $this->cacheAction = true.
*
*/ */
//Configure::write('Cache.check', true); //Configure::write('Cache.check', true);
@ -204,7 +201,6 @@
* *
* To use database sessions, run the app/Config/Schema/sessions.php schema using * To use database sessions, run the app/Config/Schema/sessions.php schema using
* the cake shell command: cake schema create Sessions * the cake shell command: cake schema create Sessions
*
*/ */
Configure::write('Session', array( Configure::write('Session', array(
'defaults' => 'php' 'defaults' => 'php'

2
lib/Cake/Console/Templates/skel/Config/database.php.default
View file

@ -1,7 +1,5 @@
<?php <?php
/** /**
*
*
* @link http://cakephp.org CakePHP(tm) Project * @link http://cakephp.org CakePHP(tm) Project
* @package app.Config * @package app.Config
* @since CakePHP(tm) v 0.2.9 * @since CakePHP(tm) v 0.2.9

1
lib/Cake/Console/Templates/skel/Config/email.php.default
View file

@ -24,7 +24,6 @@
* *
* from => * from =>
* The origin email. See CakeEmail::from() about the valid values * The origin email. See CakeEmail::from() about the valid values
*
*/ */
class EmailConfig { class EmailConfig {

3
lib/Cake/Console/Templates/skel/View/Emails/html/default.ctp
View file

@ -19,5 +19,4 @@ $content = explode("\n", $content);
foreach ($content as $line): foreach ($content as $line):
echo '<p> ' . $line . "</p>\n"; echo '<p> ' . $line . "</p>\n";
endforeach; endforeach;
?>

1
lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
View file

@ -17,4 +17,3 @@
if (Configure::read('debug') > 0): if (Configure::read('debug') > 0):
echo $this->element('exception_stack_trace'); echo $this->element('exception_stack_trace');
endif; endif;
?>

1
lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
View file

@ -14,4 +14,3 @@
if (Configure::read('debug') > 0): if (Configure::read('debug') > 0):
echo $this->element('exception_stack_trace'); echo $this->element('exception_stack_trace');
endif; endif;
?>

2
lib/Cake/Console/Templates/skel/View/Pages/home.ctp
View file

@ -62,7 +62,7 @@ endif;
$settings = Cache::settings(); $settings = Cache::settings();
if (!empty($settings)): if (!empty($settings)):
echo '<span class="notice success">'; echo '<span class="notice success">';
echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit %s', '<em>'. $settings['engine'] . 'Engine</em>', 'APP/Config/core.php'); echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit %s', '<em>' . $settings['engine'] . 'Engine</em>', 'APP/Config/core.php');
echo '</span>'; echo '</span>';
else: else:
echo '<span class="notice">'; echo '<span class="notice">';

33
lib/Cake/Console/Templates/skel/webroot/css/cake.generic.css
View file

@ -1,6 +1,5 @@
@charset "utf-8"; @charset "utf-8";
/** /**
*
* Generic CSS for CakePHP * Generic CSS for CakePHP
* *
* CakePHP(tm) : Rapid Development Framework (http://cakephp.org) * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
@ -84,7 +83,7 @@ p {
line-height:20px; line-height:20px;
background: #003d4c url('../img/cake.icon.png') no-repeat left; background: #003d4c url('../img/cake.icon.png') no-repeat left;
color: #fff; color: #fff;
padding: 0px 30px; padding: 0 30px;
} }
#header h1 a { #header h1 a {
color: #fff; color: #fff;
@ -172,7 +171,7 @@ td.actions {
white-space: nowrap; white-space: nowrap;
} }
table td.actions a { table td.actions a {
margin: 0px 6px; margin: 0 6px;
padding:2px 5px; padding:2px 5px;
} }
@ -334,7 +333,7 @@ option {
input[type=checkbox] { input[type=checkbox] {
clear: left; clear: left;
float: left; float: left;
margin: 0px 6px 7px 2px; margin: 0 6px 7px 2px;
width: auto; width: auto;
} }
div.checkbox label { div.checkbox label {
@ -363,7 +362,7 @@ form .submit input[type=submit] {
background-image: -moz-linear-gradient(top, #76BF6B, #3B8230); background-image: -moz-linear-gradient(top, #76BF6B, #3B8230);
border-color: #2d6324; border-color: #2d6324;
color: #fff; color: #fff;
text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px; text-shadow: rgba(0, 0, 0, 0.5) 0 -1px 0;
padding: 8px 10px; padding: 8px 10px;
} }
form .submit input[type=submit]:hover { form .submit input[type=submit]:hover {
@ -525,11 +524,11 @@ input[type=submit],
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
text-decoration: none; text-decoration: none;
text-shadow: #fff 0px 1px 0px; text-shadow: #fff 0 1px 0;
min-width: 0; min-width: 0;
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
-webkit-user-select: none; -webkit-user-select: none;
user-select: none; user-select: none;
} }
@ -549,7 +548,7 @@ input[type=submit]:active,
background-image: -ms-linear-gradient(top, #dfdfdf, #eee); background-image: -ms-linear-gradient(top, #dfdfdf, #eee);
background-image: -o-linear-gradient(top, #dfdfdf, #eee); background-image: -o-linear-gradient(top, #dfdfdf, #eee);
background-image: linear-gradient(top, #dfdfdf, #eee); background-image: linear-gradient(top, #dfdfdf, #eee);
text-shadow: #eee 0px 1px 0px; text-shadow: #eee 0 1px 0;
-moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); -moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
-webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3); box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
@ -625,15 +624,15 @@ pre {
-moz-border-radius: 10px; -moz-border-radius: 10px;
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
border-radius: 10px; border-radius: 10px;
margin: 0px 4px 10px 2px; margin: 0 4px 10px 2px;
font-family: sans-serif; font-family: sans-serif;
font-size: 14px; font-size: 14px;
line-height: 14px; line-height: 14px;
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
-moz-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3); -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
-webkit-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3); box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
} }
.cake-code-dump pre { .cake-code-dump pre {
position: relative; position: relative;
@ -645,13 +644,13 @@ pre {
.cake-stack-trace pre { .cake-stack-trace pre {
color: #000; color: #000;
background-color: #F0F0F0; background-color: #F0F0F0;
margin: 0px 0 10px 0; margin: 0 0 10px 0;
padding: 1em; padding: 1em;
overflow: auto; overflow: auto;
text-shadow: none; text-shadow: none;
} }
.cake-stack-trace li { .cake-stack-trace li {
padding: 10px 5px 0px; padding: 10px 5px 0;
margin: 0 0 4px 0; margin: 0 0 4px 0;
font-family: monospace; font-family: monospace;
border: 1px solid #bbb; border: 1px solid #bbb;
@ -707,7 +706,7 @@ pre {
} }
.code-coverage-results div.start { .code-coverage-results div.start {
border:1px solid #aaa; border:1px solid #aaa;
border-width:1px 1px 0px 1px; border-width:1px 1px 0 1px;
margin-top:30px; margin-top:30px;
padding-top:5px; padding-top:5px;
} }

3
lib/Cake/Console/Templates/skel/webroot/index.php
View file

@ -24,7 +24,6 @@ if (!defined('DS')) {
/** /**
* The full path to the directory which holds "app", WITHOUT a trailing DS. * The full path to the directory which holds "app", WITHOUT a trailing DS.
*
*/ */
if (!defined('ROOT')) { if (!defined('ROOT')) {
define('ROOT', dirname(dirname(dirname(__FILE__)))); define('ROOT', dirname(dirname(dirname(__FILE__))));
@ -32,7 +31,6 @@ if (!defined('ROOT')) {
/** /**
* The actual directory name for the "app". * The actual directory name for the "app".
*
*/ */
if (!defined('APP_DIR')) { if (!defined('APP_DIR')) {
define('APP_DIR', basename(dirname(dirname(__FILE__)))); define('APP_DIR', basename(dirname(dirname(__FILE__))));
@ -67,7 +65,6 @@ if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispat
/** /**
* Editing below this line should NOT be necessary. * Editing below this line should NOT be necessary.
* Change at your own risk. * Change at your own risk.
*
*/ */
if (!defined('WEBROOT_DIR')) { if (!defined('WEBROOT_DIR')) {
define('WEBROOT_DIR', basename(dirname(__FILE__))); define('WEBROOT_DIR', basename(dirname(__FILE__)));

3
lib/Cake/Console/Templates/skel/webroot/test.php
View file

@ -25,7 +25,6 @@ if (!defined('DS')) {
/** /**
* The full path to the directory which holds "app", WITHOUT a trailing DS. * The full path to the directory which holds "app", WITHOUT a trailing DS.
*
*/ */
if (!defined('ROOT')) { if (!defined('ROOT')) {
define('ROOT', dirname(dirname(dirname(__FILE__)))); define('ROOT', dirname(dirname(dirname(__FILE__))));
@ -33,7 +32,6 @@ if (!defined('ROOT')) {
/** /**
* The actual directory name for the "app". * The actual directory name for the "app".
*
*/ */
if (!defined('APP_DIR')) { if (!defined('APP_DIR')) {
define('APP_DIR', basename(dirname(dirname(__FILE__)))); define('APP_DIR', basename(dirname(dirname(__FILE__))));
@ -65,7 +63,6 @@ if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispat
/** /**
* Editing below this line should not be necessary. * Editing below this line should not be necessary.
* Change at your own risk. * Change at your own risk.
*
*/ */
if (!defined('WEBROOT_DIR')) { if (!defined('WEBROOT_DIR')) {
define('WEBROOT_DIR', basename(dirname(__FILE__))); define('WEBROOT_DIR', basename(dirname(__FILE__)));