adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-18 18:46:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing unused directories from app/pages.

Browse source 
Merging changes from app/ to skel/

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6314 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2008-01-02 21:33:51 +00:00
parent 93f034b9bd
commit 53ff7d9904
13 changed files with 42 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/config/sql/db_acl.sql
View file

@ -1,6 +1,6 @@
# $Id$ # $Id$
# #
# Copyright 2005-2007, Cake Software Foundation, Inc. # Copyright 2005-2008, Cake Software Foundation, Inc.
# 1785 E. Sahara Avenue, Suite 490-204 # 1785 E. Sahara Avenue, Suite 490-204
# Las Vegas, Nevada 89104 # Las Vegas, Nevada 89104
# #

2
app/config/sql/i18n.sql
View file

@ -1,6 +1,6 @@
# $Id$ # $Id$
# #
# Copyright 2005-2007, Cake Software Foundation, Inc. # Copyright 2005-2008, Cake Software Foundation, Inc.
# 1785 E. Sahara Avenue, Suite 490-204 # 1785 E. Sahara Avenue, Suite 490-204
# Las Vegas, Nevada 89104 # Las Vegas, Nevada 89104
# #

2
app/config/sql/sessions.sql
View file

@ -1,6 +1,6 @@
# $Id$ # $Id$
# #
# Copyright 2005-2007, Cake Software Foundation, Inc. # Copyright 2005-2008, Cake Software Foundation, Inc.
# 1785 E. Sahara Avenue, Suite 490-204 # 1785 E. Sahara Avenue, Suite 490-204
# Las Vegas, Nevada 89104 # Las Vegas, Nevada 89104
# #

0
app/views/pages/js/empty
View file

0
app/views/pages/rss/empty
View file

0
app/views/pages/xml/empty
View file

4
cake/console/libs/templates/skel/config/core.php
View file

@ -41,6 +41,10 @@
* In development mode, you need to click the flash message to continue. * In development mode, you need to click the flash message to continue.
*/ */
Configure::write('debug', 2); Configure::write('debug', 2);
/**
* Application wide charset encoding
*/
Configure::write('App.encoding', 'UTF-8');
/** /**
* To configure CakePHP *not* to use mod_rewrite and to * To configure CakePHP *not* to use mod_rewrite and to
* use CakePHP pretty URLs, remove these .htaccess * use CakePHP pretty URLs, remove these .htaccess

2
cake/console/libs/templates/skel/config/sql/db_acl.sql
View file

@ -1,6 +1,6 @@
# $Id$ # $Id$
# #
# Copyright 2005-2007, Cake Software Foundation, Inc. # Copyright 2005-2008, Cake Software Foundation, Inc.
# 1785 E. Sahara Avenue, Suite 490-204 # 1785 E. Sahara Avenue, Suite 490-204
# Las Vegas, Nevada 89104 # Las Vegas, Nevada 89104
# #

2
cake/console/libs/templates/skel/config/sql/i18n.sql
View file

@ -1,6 +1,6 @@
# $Id$ # $Id$
# #
# Copyright 2005-2007, Cake Software Foundation, Inc. # Copyright 2005-2008, Cake Software Foundation, Inc.
# 1785 E. Sahara Avenue, Suite 490-204 # 1785 E. Sahara Avenue, Suite 490-204
# Las Vegas, Nevada 89104 # Las Vegas, Nevada 89104
# #

2
cake/console/libs/templates/skel/config/sql/sessions.sql
View file

@ -1,6 +1,6 @@
# $Id$ # $Id$
# #
# Copyright 2005-2007, Cake Software Foundation, Inc. # Copyright 2005-2008, Cake Software Foundation, Inc.
# 1785 E. Sahara Avenue, Suite 490-204 # 1785 E. Sahara Avenue, Suite 490-204
# Las Vegas, Nevada 89104 # Las Vegas, Nevada 89104
# #

6
cake/console/libs/templates/skel/webroot/css/cake.generic.css
View file

@ -33,7 +33,7 @@ body {
background-color: #003d4c; background-color: #003d4c;
color: #fff; color: #fff;
font-family:'lucida grande',verdana,helvetica,arial,sans-serif; font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
font-size:13px; font-size:90%;
margin: 0; margin: 0;
} }
a { a {
@ -56,7 +56,7 @@ h1, h2, h3, h4 {
} }
h1 { h1 {
color: #003d4c; color: #003d4c;
font-size: 130%; font-size: 100%;
margin: 0.1em 0; margin: 0.1em 0;
} }
h2 { h2 {
@ -92,7 +92,6 @@ ul, li {
#header h1 { #header h1 {
background: url('../img/cake.icon.gif') no-repeat left; background: url('../img/cake.icon.gif') no-repeat left;
color: #ffffff; color: #ffffff;
font-size: 110%;
padding: 0px 30px; padding: 0px 30px;
} }
#header h1 a { #header h1 a {
@ -325,6 +324,7 @@ p.error {
p.error em { p.error em {
color: #000; color: #000;
font-weight: normal; font-weight: normal;
line-height: 140%;
} }
.notice { .notice {
background-color: #ffcc00; background-color: #ffcc00;

44
cake/console/libs/templates/skel/webroot/index.php
View file

@ -30,7 +30,7 @@
* Do not change * Do not change
*/ */
if (!defined('DS')) { if (!defined('DS')) {
define('DS', DIRECTORY_SEPARATOR); define('DS', DIRECTORY_SEPARATOR);
} }
/** /**
* These defines should only be edited if you have cake installed in * These defines should only be edited if you have cake installed in
@ -38,41 +38,41 @@
* Each define has a commented line of code that explains what you would change. * Each define has a commented line of code that explains what you would change.
*/ */
if (!defined('ROOT')) { if (!defined('ROOT')) {
//define('ROOT', 'FULL PATH TO DIRECTORY WHERE APP DIRECTORY IS LOCATED. DO NOT ADD A TRAILING DIRECTORY SEPARATOR'); //define('ROOT', 'FULL PATH TO DIRECTORY WHERE APP DIRECTORY IS LOCATED. DO NOT ADD A TRAILING DIRECTORY SEPARATOR');
//You should also use the DS define to separate your directories //You should also use the DS define to separate your directories
define('ROOT', dirname(dirname(dirname(__FILE__)))); define('ROOT', dirname(dirname(dirname(__FILE__))));
} }
if (!defined('APP_DIR')) { if (!defined('APP_DIR')) {
//define('APP_DIR', 'DIRECTORY NAME OF APPLICATION'); //define('APP_DIR', 'DIRECTORY NAME OF APPLICATION');
define('APP_DIR', basename(dirname(dirname(__FILE__)))); define('APP_DIR', basename(dirname(dirname(__FILE__))));
} }
/** /**
* This only needs to be changed if the cake installed libs are located * This only needs to be changed if the cake installed libs are located
* outside of the distributed directory structure. * outside of the distributed directory structure.
*/ */
if (!defined('CAKE_CORE_INCLUDE_PATH')) { if (!defined('CAKE_CORE_INCLUDE_PATH')) {
//define ('CAKE_CORE_INCLUDE_PATH', 'FULL PATH TO DIRECTORY WHERE CAKE CORE IS INSTALLED. DO NOT ADD A TRAILING DIRECTORY SEPARATOR'); //define ('CAKE_CORE_INCLUDE_PATH', 'FULL PATH TO DIRECTORY WHERE CAKE CORE IS INSTALLED. DO NOT ADD A TRAILING DIRECTORY SEPARATOR');
//You should also use the DS define to separate your directories //You should also use the DS define to separate your directories
define('CAKE_CORE_INCLUDE_PATH', ROOT); define('CAKE_CORE_INCLUDE_PATH', ROOT);
} }
/////////////////////////////// ///////////////////////////////
//DO NOT EDIT BELOW THIS LINE// //DO NOT EDIT BELOW THIS LINE//
/////////////////////////////// ///////////////////////////////
if (!defined('WEBROOT_DIR')) { if (!defined('WEBROOT_DIR')) {
define('WEBROOT_DIR', basename(dirname(__FILE__))); define('WEBROOT_DIR', basename(dirname(__FILE__)));
} }
if (!defined('WWW_ROOT')) { if (!defined('WWW_ROOT')) {
define('WWW_ROOT', dirname(__FILE__) . DS); define('WWW_ROOT', dirname(__FILE__) . DS);
} }
if (!defined('CORE_PATH')) { if (!defined('CORE_PATH')) {
if (function_exists('ini_set')) { 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')); 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('APP_PATH', null);
define('CORE_PATH', null); define('CORE_PATH', null);
} else { } else {
define('APP_PATH', ROOT . DS . APP_DIR . DS); define('APP_PATH', ROOT . DS . APP_DIR . DS);
define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS); define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
} }
} }
if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) { if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
trigger_error("Can't find CakePHP core. 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); trigger_error("Can't find CakePHP core. 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);
@ -80,10 +80,10 @@
if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') { if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') {
return; return;
} else { } else {
$Dispatcher = new Dispatcher(); $Dispatcher = new Dispatcher();
$Dispatcher->dispatch($url); $Dispatcher->dispatch($url);
} }
if (Configure::read() > 0) { if (Configure::read() > 0) {
echo "<!-- " . round(getMicrotime() - $TIME_START, 4) . "s -->"; echo "<!-- " . round(getMicrotime() - $TIME_START, 4) . "s -->";
} }
?> ?>

7
cake/console/libs/templates/skel/webroot/test.php
View file

@ -62,6 +62,13 @@ ini_set('display_errors', 1);
if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) { if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
trigger_error("Can't find CakePHP core. Check the value of CAKE_CORE_INCLUDE_PATH in app/webroot/test.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR); trigger_error("Can't find CakePHP core. Check the value of CAKE_CORE_INCLUDE_PATH in app/webroot/test.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
} }
$corePath = Configure::corePaths('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);
}
require_once CAKE . 'tests' . DS . 'lib' . DS . 'test_manager.php'; require_once CAKE . 'tests' . DS . 'lib' . DS . 'test_manager.php';
if (Configure::read('debug') < 1) { if (Configure::read('debug') < 1) {