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

Removed trailing whitespaces from core.

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7847 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
renan.saddam 2008-11-08 02:54:07 +00:00
parent edfbe5be33
commit 6319f8ea69
57 changed files with 127 additions and 274 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/bootstrap.php
View file

@ -25,7 +25,7 @@
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
if (!defined('PHP5')) {
define ('PHP5', (PHP_VERSION >= 5));
define('PHP5', (PHP_VERSION >= 5));
}
/**
* Configuration, directory layout and standard libraries

66
cake/config/paths.php
View file

@ -31,81 +31,81 @@
* here.
*/
if (!defined('ROOT')) {
define ('ROOT', '../');
define('ROOT', '../');
}
if (!defined('WEBROOT_DIR')) {
define ('WEBROOT_DIR', 'webroot');
define('WEBROOT_DIR', 'webroot');
}
/**
* Path to the cake directory.
*/
define ('CAKE', CORE_PATH.'cake'.DS);
define('CAKE', CORE_PATH.'cake'.DS);
/**
* Path to the application's directory.
*/
if (!defined('APP')) {
define ('APP', ROOT.DS.APP_DIR.DS);
define('APP', ROOT.DS.APP_DIR.DS);
}
/**
* Path to the application's models directory.
*/
define ('MODELS', APP.'models'.DS);
define('MODELS', APP.'models'.DS);
/**
* Path to model behaviors directory.
*/
define ('BEHAVIORS', MODELS.'behaviors'.DS);
define('BEHAVIORS', MODELS.'behaviors'.DS);
/**
* Path to the application's controllers directory.
*/
define ('CONTROLLERS', APP.'controllers'.DS);
define('CONTROLLERS', APP.'controllers'.DS);
/**
* Path to the application's components directory.
*/
define ('COMPONENTS', CONTROLLERS.'components'.DS);
define('COMPONENTS', CONTROLLERS.'components'.DS);
/**
* Path to the application's views directory.
*/
define ('VIEWS', APP.'views'.DS);
define('VIEWS', APP.'views'.DS);
/**
* Path to the application's helpers directory.
*/
define ('HELPERS', VIEWS.'helpers'.DS);
define('HELPERS', VIEWS.'helpers'.DS);
/**
* Path to the application's view's layouts directory.
*/
define ('LAYOUTS', VIEWS.'layouts'.DS);
define('LAYOUTS', VIEWS.'layouts'.DS);
/**
* Path to the application's view's elements directory.
* It's supposed to hold pieces of PHP/HTML that are used on multiple pages
* and are not linked to a particular layout (like polls, footers and so on).
*/
define ('ELEMENTS', VIEWS.'elements'.DS);
define('ELEMENTS', VIEWS.'elements'.DS);
/**
* Path to the configuration files directory.
*/
if (!defined('CONFIGS')) {
define ('CONFIGS', APP.'config'.DS);
define('CONFIGS', APP.'config'.DS);
}
/**
* Path to the libs directory.
*/
define ('INFLECTIONS', CAKE.'config'.DS.'inflections'.DS);
define('INFLECTIONS', CAKE.'config'.DS.'inflections'.DS);
/**
* Path to the libs directory.
*/
define ('LIBS', CAKE.'libs'.DS);
define('LIBS', CAKE.'libs'.DS);
/**
* Path to the public CSS directory.
*/
define ('CSS', WWW_ROOT.'css'.DS);
define('CSS', WWW_ROOT.'css'.DS);
/**
* Path to the public JavaScript directory.
*/
define ('JS', WWW_ROOT.'js'.DS);
define('JS', WWW_ROOT.'js'.DS);
/**
* Path to the public images directory.
*/
define ('IMAGES', WWW_ROOT.'img'.DS);
define('IMAGES', WWW_ROOT.'img'.DS);
/**
* Path to the console libs direcotry.
*/
@ -114,49 +114,49 @@ if (!defined('CONFIGS')) {
* Path to the tests directory.
*/
if (!defined('TESTS')) {
define ('TESTS', APP.'tests'.DS);
define('TESTS', APP.'tests'.DS);
}
/**
* Path to the core tests directory.
*/
if (!defined('CAKE_TESTS')) {
define ('CAKE_TESTS', CAKE.'tests'.DS);
define('CAKE_TESTS', CAKE.'tests'.DS);
}
/**
* Path to the test suite.
*/
define ('CAKE_TESTS_LIB', CAKE_TESTS.'lib'.DS);
define('CAKE_TESTS_LIB', CAKE_TESTS.'lib'.DS);
/**
* Path to the controller test directory.
*/
define ('CONTROLLER_TESTS', TESTS.'cases'.DS.'controllers'.DS);
define('CONTROLLER_TESTS', TESTS.'cases'.DS.'controllers'.DS);
/**
* Path to the components test directory.
*/
define ('COMPONENT_TESTS', TESTS.'cases'.DS.'components'.DS);
define('COMPONENT_TESTS', TESTS.'cases'.DS.'components'.DS);
/**
* Path to the helpers test directory.
*/
define ('HELPER_TESTS', TESTS.'cases'.DS.'views'.DS.'helpers'.DS);
define('HELPER_TESTS', TESTS.'cases'.DS.'views'.DS.'helpers'.DS);
/**
* Path to the models' test directory.
*/
define ('MODEL_TESTS', TESTS.'cases'.DS.'models'.DS);
define('MODEL_TESTS', TESTS.'cases'.DS.'models'.DS);
/**
* Path to the lib test directory.
*/
define ('LIB_TESTS', CAKE_TESTS.'cases'.DS.'lib'.DS);
define('LIB_TESTS', CAKE_TESTS.'cases'.DS.'lib'.DS);
/**
* Path to the temporary files directory.
*/
if (!defined('TMP')) {
define ('TMP', APP.'tmp'.DS);
define('TMP', APP.'tmp'.DS);
}
/**
* Path to the logs directory.
*/
define ('LOGS', TMP.'logs'.DS);
define('LOGS', TMP.'logs'.DS);
/**
* Path to the cache files directory. It can be shared between hosts in a multi-server setup.
*/
@ -165,14 +165,14 @@ if (!defined('TMP')) {
* Path to the vendors directory.
*/
if (!defined('VENDORS')) {
define ('VENDORS', CAKE_CORE_INCLUDE_PATH.DS.'vendors'.DS);
define('VENDORS', CAKE_CORE_INCLUDE_PATH.DS.'vendors'.DS);
}
/**
* Path to the Pear directory
* The purporse is to make it easy porting Pear libs into Cake
* without setting the include_path PHP variable.
*/
define ('PEAR', VENDORS.'Pear'.DS);
define('PEAR', VENDORS.'Pear'.DS);
/**
* Full url prefix
*/
@ -193,18 +193,18 @@ if (!defined('FULL_BASE_URL')) {
* Web path to the public images directory.
*/
if (!defined('IMAGES_URL')) {
define ('IMAGES_URL', 'img/');
define('IMAGES_URL', 'img/');
}
/**
* Web path to the CSS files directory.
*/
if (!defined('CSS_URL')) {
define ('CSS_URL', 'css/');
define('CSS_URL', 'css/');
}
/**
* Web path to the js files directory.
*/
if (!defined('JS_URL')) {
define ('JS_URL', 'js/');
define('JS_URL', 'js/');
}
?>

2
cake/console/libs/i18n.php
View file

@ -45,7 +45,6 @@ class I18nShell extends Shell {
* @access public
*/
var $tasks = array('DbConfig', 'Extract');
/**
* Override startup of the Shell
*
@ -127,5 +126,4 @@ class I18nShell extends Shell {
$this->Extract->help();
}
}
?>

1
cake/console/libs/tasks/model.php
View file

@ -46,7 +46,6 @@ class ModelTask extends Shell {
* @access public
*/
var $path = MODELS;
/**
* tasks
*

2
cake/console/libs/templates/skel/app_model.php
View file

@ -36,6 +36,6 @@
* @package cake
* @subpackage cake.app
*/
class AppModel extends Model{
class AppModel extends Model {
}
?>

3
cake/libs/cache.php
View file

@ -23,9 +23,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Included libraries.
*/
/**
* Caching for CakePHP.
*

2
cake/libs/debugger.php
View file

@ -44,7 +44,6 @@
* @link http://book.cakephp.org/view/460/Using-the-Debugger-Class
*/
class Debugger extends Object {
/**
* A list of errors generated by the application.
*
@ -565,5 +564,4 @@ class Debugger extends Object {
if (!defined('DISABLE_DEFAULT_ERROR_HANDLING')) {
Debugger::invoke(Debugger::getInstance());
}
?>

3
cake/libs/file.php
View file

@ -27,9 +27,8 @@
*
*/
if (!class_exists('Object')) {
uses ('object');
uses('object');
}
if (!class_exists('Folder')) {
require LIBS . 'folder.php';
}

6
cake/libs/flay.php
View file

@ -28,9 +28,9 @@
* Included libraries.
*
*/
if (!class_exists('Object')) {
uses ('object');
}
if (!class_exists('Object')) {
uses('object');
}
/**
* Text-to-HTML parser.
*

6
cake/libs/folder.php
View file

@ -26,9 +26,9 @@
* Included libraries.
*
*/
if (!class_exists('Object')) {
uses('object');
}
if (!class_exists('Object')) {
uses('object');
}
/**
* Folder structure browser, lists folders and files.
*

17
cake/libs/http_socket.php
View file

@ -23,7 +23,6 @@
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
App::import('Core', array('Socket', 'Set', 'Router'));
/**
* Cake network socket connection class.
*
@ -40,7 +39,6 @@ class HttpSocket extends CakeSocket {
* @access public
*/
var $description = 'HTTP-based DataSource Interface';
/**
* When one activates the $quirksMode by setting it to true, all checks meant to enforce RFC 2616 (HTTP/1.1 specs)
* will be disabled and additional measures to deal with non-standard responses will be enabled.
@ -49,7 +47,6 @@ class HttpSocket extends CakeSocket {
* @access public
*/
var $quirksMode = false;
/**
* The default values to use for a request
*
@ -103,9 +100,8 @@ class HttpSocket extends CakeSocket {
),
'header' => array(),
'body' => '',
'cookies' => array(),
'cookies' => array()
);
/**
* Default configuration settings for the HttpSocket
*
@ -129,10 +125,9 @@ class HttpSocket extends CakeSocket {
'user' => null,
'pass' => null
),
'cookies' => array(),
'cookies' => array()
)
);
/**
* String that represents a line break.
*
@ -158,7 +153,6 @@ class HttpSocket extends CakeSocket {
}
parent::__construct($this->config);
}
/**
* Issue the specified request.
*
@ -265,7 +259,6 @@ class HttpSocket extends CakeSocket {
return $this->response['body'];
}
/**
* Issues a GET request to the specified URI, query, and request.
*
@ -303,7 +296,6 @@ class HttpSocket extends CakeSocket {
$request = Set::merge(array('method' => 'POST', 'uri' => $uri, 'body' => $data), $request);
return $this->request($request);
}
/**
* Issues a PUT request to the specified URI, query, and request.
*
@ -317,7 +309,6 @@ class HttpSocket extends CakeSocket {
$request = Set::merge(array('method' => 'PUT', 'uri' => $uri, 'body' => $data), $request);
return $this->request($request);
}
/**
* Issues a DELETE request to the specified URI, query, and request.
*
@ -366,7 +357,6 @@ class HttpSocket extends CakeSocket {
}
return $this->buildUri($url);
}
/**
* Parses the given message and breaks it down in parts.
*
@ -746,7 +736,6 @@ class HttpSocket extends CakeSocket {
}
return $request['method'].' '.$request['uri'].' '.$versionToken.$this->lineBreak;
}
/**
* Serializes an array for transport.
*
@ -935,7 +924,6 @@ class HttpSocket extends CakeSocket {
$token = preg_replace($regex, '"\\1"', $token);
return $token;
}
/**
* Gets escape chars according to RFC 2616 (HTTP 1.1 specs).
*
@ -987,5 +975,4 @@ class HttpSocket extends CakeSocket {
return true;
}
}
?>

2
cake/libs/magic_db.php
View file

@ -23,7 +23,7 @@
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
if (!class_exists('File')) {
uses ('object', 'file');
uses('object', 'file');
}
/**
* A class to parse and use the MagicDb for file type analysis

1
cake/libs/model/behavior.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* Model behaviors base class.
*

1
cake/libs/model/behaviors/acl.php
View file

@ -33,7 +33,6 @@
* @subpackage cake.cake.libs.model.behaviors
*/
class AclBehavior extends ModelBehavior {
/**
* Maps ACL type options to ACL models
*

7
cake/libs/model/connection_manager.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* Short description for file.
*
@ -25,6 +24,8 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
uses ('model' . DS . 'datasources' . DS . 'datasource');
config('database');
/**
* Manages loaded instances of DataSource objects
@ -34,10 +35,6 @@
* @package cake
* @subpackage cake.cake.libs.model
*/
uses ('model' . DS . 'datasources' . DS . 'datasource');
config('database');
class ConnectionManager extends Object {
/**
* Holds a loaded instance of the Connections object

10
cake/libs/model/datasources/dbo/dbo_adodb.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* AdoDB layer for DBO.
*
@ -25,12 +24,10 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Include AdoDB files.
*/
App::import('Vendor', 'NewADOConnection', array('file' => 'adodb' . DS . 'adodb.inc.php'));
/**
* AdoDB DBO implementation.
*
@ -136,18 +133,12 @@ class DboAdodb extends DboSource {
$ADODB_FETCH_MODE = ADODB_FETCH_ASSOC;
return $this->_adodb->execute($sql);
}
/**
* Returns a row from given resultset as an array .
*
* @return array The fetched row as an array
*/
/**
* Returns a row from current resultset as an array .
*
* @return array The fetched row as an array
*/
function fetchRow($sql = null) {
if (!empty($sql) && is_string($sql) && strlen($sql) > 5) {
if (!$this->execute($sql)) {
return null;
@ -443,7 +434,6 @@ class DboAdodb extends DboSource {
}
return $resultRow;
}
/**
* Generate a database-native column schema string
*

1
cake/libs/model/datasources/dbo/dbo_db2.php
View file

@ -248,7 +248,6 @@ class DboDb2 extends DboSource {
* @return string Quoted and escaped
* @todo Add logic that formats/escapes data based on column type
*/
function value($data, $column = null, $safe = false) {
$parent = parent::value($data, $column, $safe);

1
cake/libs/model/datasources/dbo/dbo_firebird.php
View file

@ -117,7 +117,6 @@ class DboFirebird extends DboSource {
'commit' => 'COMMIT',
'rollback' => 'ROLLBACK'
);
/**
* Connects to the database using options in the given configuration array.
*

3
cake/libs/model/datasources/dbo/dbo_mssql.php
View file

@ -24,7 +24,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Short description for class.
*
@ -356,7 +355,6 @@ class DboMssql extends DboSource {
}
return $result;
}
/**
* Generates and executes an SQL UPDATE statement for given model, fields, and values.
* Removes Identity (primary key) column from update data before returning to parent.
@ -683,5 +681,4 @@ class DboMssql extends DboSource {
return $join;
}
}
?>

1
cake/libs/model/datasources/dbo/dbo_mysql.php
View file

@ -24,7 +24,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Short description for class.
*

2
cake/libs/model/datasources/dbo/dbo_mysqli.php
View file

@ -24,7 +24,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Short description for class.
*
@ -58,7 +57,6 @@ class DboMysqli extends DboSource {
* @var array
*/
var $index = array('PRI' => 'primary', 'MUL' => 'index', 'UNI' => 'unique');
/**
* Base configuration settings for Mysqli driver
*

67
cake/libs/model/datasources/dbo/dbo_odbc.php
View file

@ -35,40 +35,36 @@
* @subpackage cake.cake.libs.model.datasources.dbo
*/
class DboOdbc extends DboSource {
/**
* Driver description
*
* @var string
*/
var $description = "ODBC DBO Driver";
/**
* Table/column starting quote
*
* @var string
*/
var $startQuote = "`";
/**
* Table/column end quote
*
* @var string
*/
var $endQuote = "`";
/**
* Driver base configuration
*
* @var array
*/
var $_baseConfig = array('persistent' => true,
'login' => 'root',
'password' => '',
'database' => 'cake',
'connect' => 'odbc_pconnect'
var $_baseConfig = array(
'persistent' => true,
'login' => 'root',
'password' => '',
'database' => 'cake',
'connect' => 'odbc_pconnect'
);
/**
* Enter description here...
*
@ -87,7 +83,6 @@ class DboOdbc extends DboSource {
// 'date' => array('name' => 'date', 'format' => 'Y-m-d', 'formatter' => 'date'),
// 'binary' => array('name' => 'blob'),
// 'boolean' => array('name' => 'tinyint', 'limit' => '1'));
/**
* Connects to the database using options in the given configuration array.
*
@ -106,7 +101,6 @@ class DboOdbc extends DboSource {
return $this->connected;
}
/**
* Disconnects from database.
*
@ -131,19 +125,11 @@ class DboOdbc extends DboSource {
* @return array Array of tablenames in the database
*/
function listSources() {
$cache = parent::listSources();
if ($cache != null) {
return $cache;
}
/*$result = odbc_tables($this->connection);
if (function_exists('odbc_fetch_row')) {
echo 'GOOD';
} else {
echo 'BAD';
}*/
$result = odbc_tables($this->connection);
$tables = array();
@ -185,7 +171,6 @@ class DboOdbc extends DboSource {
$this->__cacheDescription($model->tablePrefix . $model->table, $fields);
return $fields;
}
/**
* Name
*
@ -195,19 +180,16 @@ class DboOdbc extends DboSource {
*/
function name($data) {
if ($data == '*') {
return '*';
return '*';
}
$pos = strpos($data, '`');
if ($pos === false) {
$data = '' . str_replace('.', '.', $data) . '';
//$data = '`'. str_replace('.', '`.`', $data) .'`';
if (strpos($data, '`') === false) {
$data = '' . str_replace('.', '.', $data) . '';
//$data = '`'. str_replace('.', '`.`', $data) .'`';
}
return $data;
}
/**
* Returns a quoted and escaped string of $data for use in an SQL statement.
*
@ -235,7 +217,6 @@ class DboOdbc extends DboSource {
return $return;
}
/**
* Not sure about this one, MySQL needs it but does ODBC? Safer just to leave it
* Translates between PHP boolean values and MySQL (faked) boolean values
@ -256,7 +237,6 @@ class DboOdbc extends DboSource {
return false;
}
}
/**
* Begin a transaction
*
@ -273,7 +253,6 @@ class DboOdbc extends DboSource {
}
return false;
}
/**
* Commit a transaction
*
@ -291,7 +270,6 @@ class DboOdbc extends DboSource {
}
return false;
}
/**
* Rollback a transaction
*
@ -307,7 +285,6 @@ class DboOdbc extends DboSource {
}
return false;
}
/**
* Returns a formatted error message from previous database operation.
*
@ -319,7 +296,6 @@ class DboOdbc extends DboSource {
}
return null;
}
/**
* Returns number of affected rows in previous database operation. If no previous operation exists,
* this returns false.
@ -332,7 +308,6 @@ class DboOdbc extends DboSource {
}
return false;
}
/**
* Returns number of rows in previous resultset. If no previous resultset exists,
* this returns false.
@ -340,9 +315,9 @@ class DboOdbc extends DboSource {
* @return int Number of rows in resultset
*/
function lastNumRows() {
if($this->hasResult()) {
if ($this->hasResult()) {
$counter = 0;
if(@odbc_fetch_into($this->_result, $results)) {
if (@odbc_fetch_into($this->_result, $results)) {
return count($results);
} else {
return null;
@ -350,8 +325,6 @@ class DboOdbc extends DboSource {
}
return null;
}
/**
* Returns the ID generated from the previous INSERT operation.
*
@ -359,10 +332,9 @@ class DboOdbc extends DboSource {
* @return int
*/
function lastInsertId($source = null) {
$result=$this->fetchRow('SELECT @@IDENTITY');
$result = $this->fetchRow('SELECT @@IDENTITY');
return $result[0];
}
/**
* Enter description here...
*
@ -378,7 +350,6 @@ class DboOdbc extends DboSource {
}
return $real;
}
/**
* Enter description here...
*
@ -393,7 +364,7 @@ class DboOdbc extends DboSource {
while($j < $num_fields) {
$columnName = odbc_field_name($results, $j+1);
if(strpos($columnName, '_dot_') !== false) {
if (strpos($columnName, '_dot_') !== false) {
$parts = explode('_dot_', $columnName);
$this->map[$index++] = array($parts[0], $parts[1]);
} else {
@ -402,9 +373,6 @@ class DboOdbc extends DboSource {
$j++;
}
}
/**
* Generates the fields list of an SQL query.
*
@ -445,7 +413,7 @@ class DboOdbc extends DboSource {
$fields[$i] = trim(r('DISTINCT', '', $fields[$i]));
}
if(strrpos($fields[$i], '.') === false) {
if (strrpos($fields[$i], '.') === false) {
$fields[$i] = $prepend . $this->name($alias) . '.' . $this->name($fields[$i]) . ' AS ' . $this->name($alias . '_dot_' . $fields[$i]);
} else {
$build = explode('.', $fields[$i]);
@ -456,15 +424,13 @@ class DboOdbc extends DboSource {
}
return $fields;
}
/**
* Fetches the next row from the current result set
*
* @return unknown
*/
function fetchResult() {
if($row = odbc_fetch_row($this->results)) {
if ($row = odbc_fetch_row($this->results)) {
$resultRow = array();
$numFields = odbc_num_fields($this->results);
$i = 0;
@ -477,6 +443,5 @@ class DboOdbc extends DboSource {
return false;
}
}
}
?>

31
cake/libs/model/datasources/dbo/dbo_oracle.php
View file

@ -56,7 +56,6 @@ class DboOracle extends DboSource {
* @var boolean
*/
var $__transactionStarted = false;
/**
* Enter description here...
*
@ -126,14 +125,12 @@ class DboOracle extends DboSource {
* @access protected
*/
var $_results;
/**
* Last error issued by oci extension
*
* @var unknown_type
*/
var $_error;
/**
* Base configuration settings for MySQL driver
*
@ -148,7 +145,6 @@ class DboOracle extends DboSource {
'nls_sort' => '',
'nls_sort' => ''
);
/**
* Table-sequence map
*
@ -190,7 +186,6 @@ class DboOracle extends DboSource {
}
return $this->connected;
}
/**
* Keeps track of the most recent Oracle error
*
@ -393,7 +388,11 @@ class DboOracle extends DboSource {
$this->_currentRow++;
return $resultRow;
}
/**
* Fetches the next row from the current result set
*
* @return unknown
*/
function fetchResult() {
return $this->fetchRow();
}
@ -618,7 +617,6 @@ class DboOracle extends DboSource {
}
return true;
}
/**
* Returns an array of the indexes in given table name.
*
@ -628,7 +626,7 @@ class DboOracle extends DboSource {
function index($model) {
$index = array();
$table = $this->fullTableName($model, false);
if($table) {
if ($table) {
$indexes = $this->query('SELECT
cc.table_name,
cc.column_name,
@ -646,11 +644,11 @@ class DboOracle extends DboSource {
} else {
continue;
}
if(!isset($index[$key])) {
if (!isset($index[$key])) {
$index[$key]['column'] = strtolower($idx['cc']['column_name']);
$index[$key]['unique'] = intval($idx['i']['uniqueness'] == 'UNIQUE');
} else {
if(!is_array($index[$key]['column'])) {
if (!is_array($index[$key]['column'])) {
$col[] = $index[$key]['column'];
}
$col[] = strtolower($idx['cc']['column_name']);
@ -660,7 +658,6 @@ class DboOracle extends DboSource {
}
return $index;
}
/**
* Generate a Oracle Alter Table syntax for the given Schema comparison
*
@ -668,7 +665,7 @@ class DboOracle extends DboSource {
* @return unknown
*/
function alterSchema($compare, $table = null) {
if(!is_array($compare)) {
if (!is_array($compare)) {
return false;
}
$out = '';
@ -682,7 +679,7 @@ class DboOracle extends DboSource {
foreach($column as $field => $col) {
$col['name'] = $field;
$alter = 'ADD '.$this->buildColumn($col);
if(isset($col['after'])) {
if (isset($col['after'])) {
$alter .= ' AFTER '. $this->name($col['after']);
}
$colList[] = $alter;
@ -696,7 +693,7 @@ class DboOracle extends DboSource {
break;
case 'change':
foreach($column as $field => $col) {
if(!isset($col['name'])) {
if (!isset($col['name'])) {
$col['name'] = $field;
}
$colList[] = 'CHANGE '. $this->name($field).' '.$this->buildColumn($col);
@ -709,7 +706,6 @@ class DboOracle extends DboSource {
}
return $out;
}
/**
* This method should quote Oracle identifiers. Well it doesn't.
* It would break all scaffolding and all of Cake's default assumptions.
@ -922,7 +918,6 @@ class DboOracle extends DboSource {
break;
}
}
/**
* Enter description here...
*
@ -938,9 +933,7 @@ class DboOracle extends DboSource {
* @param array $stack
*/
function queryAssociation(&$model, &$linkModel, $type, $association, $assocData, &$queryData, $external = false, &$resultSet, $recursive, $stack) {
if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
if (!isset($resultSet) || !is_array($resultSet)) {
if (Configure::read() > 0) {
e('<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ');
@ -1083,7 +1076,5 @@ class DboOracle extends DboSource {
}
}
}
}
?>

5
cake/libs/model/datasources/dbo/dbo_postgres.php
View file

@ -25,7 +25,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* PostgreSQL layer for DBO.
*
@ -35,7 +34,6 @@
* @subpackage cake.cake.libs.model.datasources.dbo
*/
class DboPostgres extends DboSource {
/**
* Driver description
*
@ -178,7 +176,6 @@ class DboPostgres extends DboSource {
return $tables;
}
}
/**
* Returns an array of the fields in given table name.
*
@ -307,7 +304,6 @@ class DboPostgres extends DboSource {
$error = pg_last_error($this->connection);
return ($error) ? $error : null;
}
/**
* Returns number of affected rows in previous database operation. If no previous operation exists, this returns false.
*
@ -711,5 +707,4 @@ class DboPostgres extends DboSource {
}
}
}
?>

3
cake/libs/model/datasources/dbo/dbo_sqlite.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* SQLite layer for DBO
*
@ -34,7 +33,6 @@
* @subpackage cake.cake.libs.model.datasources.dbo
*/
class DboSqlite extends DboSource {
/**
* Enter description here...
*
@ -556,5 +554,4 @@ class DboSqlite extends DboSource {
}
}
}
?>

1
cake/libs/model/datasources/dbo/dbo_sybase.php
View file

@ -381,5 +381,4 @@ class DboSybase extends DboSource {
}
}
}
?>

3
cake/libs/model/db_acl.php
View file

@ -24,9 +24,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Set database config if not defined.
*/
/**
* Load Model and AppModel
*/

22
cake/libs/overloadable_php4.php
View file

@ -25,16 +25,12 @@
/**
* Overloadable class selector
*
* Load the interface class based on the version of PHP.
*
* @package cake
* @subpackage cake.cake.libs
*/
/**
* Load the interface class based on the version of PHP.
*
*/
class Overloadable extends Object {
/**
* Constructor.
*
@ -44,7 +40,6 @@ class Overloadable extends Object {
$this->overload();
parent::__construct();
}
/**
* Overload implementation.
*
@ -85,8 +80,15 @@ class Overloadable extends Object {
}
Overloadable::overload('Overloadable');
/**
* Overloadable2 class selector
*
* Load the interface class based on the version of PHP.
*
* @package cake
* @subpackage cake.cake.libs
*/
class Overloadable2 extends Object {
/**
* Constructor
*
@ -96,7 +98,6 @@ class Overloadable2 extends Object {
$this->overload();
parent::__construct();
}
/**
* Overload implementation.
*
@ -117,7 +118,6 @@ class Overloadable2 extends Object {
}
}
}
/**
* Magic method handler.
*
@ -134,7 +134,6 @@ class Overloadable2 extends Object {
$return = $this->call__($method, $params);
return true;
}
/**
* Getter.
*
@ -147,7 +146,6 @@ class Overloadable2 extends Object {
$value = $this->get__($name);
return true;
}
/**
* Setter.
*

21
cake/libs/overloadable_php5.php
View file

@ -25,23 +25,18 @@
/**
* Overloadable class selector
*
* Load the interface class based on the version of PHP.
*
* @package cake
* @subpackage cake.cake.libs
*/
/**
* Load the interface class based on the version of PHP.
*
*/
class Overloadable extends Object {
/**
* Overload implementation. No need for implementation in PHP5.
*
* @access public
*/
function overload() { }
/**
* Magic method handler.
*
@ -58,15 +53,20 @@ class Overloadable extends Object {
}
}
/**
* Overloadable2 class selector
*
* Load the interface class based on the version of PHP.
*
* @package cake
*/
class Overloadable2 extends Object {
/**
* Overload implementation. No need for implementation in PHP5.
*
* @access public
*/
function overload() { }
/**
* Magic method handler.
*
@ -81,7 +81,6 @@ class Overloadable2 extends Object {
}
return $this->call__($method, $params);
}
/**
* Getter.
*
@ -93,7 +92,6 @@ class Overloadable2 extends Object {
function __get($name) {
return $this->get__($name);
}
/**
* Setter.
*
@ -106,5 +104,4 @@ class Overloadable2 extends Object {
return $this->set__($name, $value);
}
}
?>

1
cake/libs/security.php
View file

@ -33,7 +33,6 @@
* @subpackage cake.cake.libs
*/
class Security extends Object {
/**
* Default hash method
*

2
cake/libs/socket.php
View file

@ -23,7 +23,6 @@
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
App::import('Core', 'Validation');
/**
* Cake network socket connection class.
*
@ -279,5 +278,4 @@ class CakeSocket extends Object {
return true;
}
}
?>

6
cake/libs/view/elements/dump.ctp
View file

@ -24,7 +24,7 @@
?>
<div id="cakeControllerDump">
<h2><?php __('Controller dump:'); ?></h2>
<pre>
<?php echo h(print_r($controller, true)); ?>
</pre>
<pre>
<?php echo h(print_r($controller, true)); ?>
</pre>
</div>

3
cake/libs/view/helper.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* Backend for helpers.
*
@ -25,7 +24,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Included libs
*/
@ -40,7 +38,6 @@ App::import('Core', 'Overloadable');
* @subpackage cake.cake.libs.view
*/
class Helper extends Overloadable {
/**
* List of helpers used by this helper
*

2
cake/libs/view/helpers/ajax.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* Helper for AJAX operations.
*
@ -25,7 +24,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* AjaxHelper helper library.
*

3
cake/libs/view/helpers/javascript.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* Javascript Helper class file.
*
@ -23,7 +22,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Javascript Helper class for easy use of JavaScript.
*
@ -32,7 +30,6 @@
* @package cake
* @subpackage cake.cake.libs.view.helpers
*/
class JavascriptHelper extends AppHelper {
/**
* Determines whether native JSON extension is used for encoding. Set by object constructor.

6
cake/libs/view/helpers/js.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* Javascript Generator class file.
*
@ -23,7 +22,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Javascript Generator helper class for easy use of JavaScript.
*
@ -33,9 +31,7 @@
* @package cake
* @subpackage cake.cake.libs.view.helpers
*/
class JsHelper extends Overloadable2 {
var $base = null;
var $webroot = null;
var $here = null;
@ -276,7 +272,6 @@ class JsHelper extends Overloadable2 {
}
class JsHelperObject {
var $__parent = null;
var $id = null;
@ -453,5 +448,4 @@ class JsHelperObject {
return join(', ', $options);
}
}
?>

4
cake/libs/view/helpers/number.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* Number Helper.
*
@ -25,7 +24,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Number helper library.
*
@ -46,7 +44,6 @@ class NumberHelper extends AppHelper {
function precision($number, $precision = 3) {
return sprintf("%01.{$precision}f", $number);
}
/**
* Returns a formatted-for-humans file size.
*
@ -192,5 +189,4 @@ class NumberHelper extends AppHelper {
return $result;
}
}
?>

1
cake/libs/view/helpers/paginator.php
View file

@ -31,7 +31,6 @@
* @subpackage cake.cake.libs.view.helpers
*/
class PaginatorHelper extends AppHelper {
/**
* Helper dependencies
*

4
cake/libs/view/helpers/rss.php
View file

@ -22,6 +22,8 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
App::import('Helper', 'Xml');
/**
* XML Helper class for easy output of XML structures.
*
@ -30,8 +32,6 @@
* @package cake
* @subpackage cake.cake.libs.view.helpers
*/
App::import('Helper', 'Xml');
class RssHelper extends XmlHelper {
/**
* Helpers used by RSS Helper

8
cake/libs/view/helpers/session.php
View file

@ -24,6 +24,10 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
if (!class_exists('cakesession')) {
uses('session');
}
/**
* Session Helper.
*
@ -33,10 +37,6 @@
* @subpackage cake.cake.libs.view.helpers
*
*/
if (!class_exists('cakesession')) {
uses('session');
}
class SessionHelper extends CakeSession {
/**
* List of helpers used by this helper

6
cake/libs/view/helpers/text.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* Text Helper
*
@ -25,20 +24,16 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Included libraries.
*
*/
if (!class_exists('HtmlHelper')) {
App::import('Helper', 'Html');
}
if (!class_exists('Multibyte')) {
App::import('Core', 'Multibyte');
}
/**
* Text helper library.
*
@ -48,7 +43,6 @@ if (!class_exists('Multibyte')) {
* @subpackage cake.cake.libs.view.helpers
*/
class TextHelper extends AppHelper {
/**
* Highlights a given phrase in a text. You can specify any expression in highlighter that
* may include the \1 expression to include the $phrase found.

3
cake/libs/view/helpers/time.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* Time Helper class file.
*
@ -23,7 +22,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Time Helper class for easy use of time data.
*
@ -536,5 +534,4 @@ class TimeHelper extends AppHelper {
return date($format, $date);
}
}
?>

2
cake/libs/view/helpers/xml.php
View file

@ -33,7 +33,6 @@ App::import('Core', array('Xml', 'Set'));
* @subpackage cake.cake.libs.view.helpers
*/
class XmlHelper extends AppHelper {
/**
* Default document encoding
*
@ -157,5 +156,4 @@ class XmlHelper extends AppHelper {
return $data->toString(array_merge(array('header' => false), $options));
}
}
?>

2
cake/libs/view/layouts/email/html/default.ctp
View file

@ -23,12 +23,10 @@
*/
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
<head>
<title><?php echo $title_for_layout;?></title>
</head>
<body>
<?php echo $content_for_layout;?>

1
cake/libs/view/layouts/rss/default.ctp
View file

@ -13,5 +13,4 @@ echo $rss->document(
array(), $channel, $content_for_layout
)
);
?>

2
cake/libs/view/scaffolds/index.ctp
View file

@ -26,7 +26,7 @@
<h2><?php echo $pluralHumanName;?></h2>
<p><?php
echo $paginator->counter(array(
'format' => 'Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%'
'format' => 'Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%'
));
?></p>
<table cellpadding="0" cellspacing="0">

2
cake/libs/view/theme.php
View file

@ -22,7 +22,6 @@
* @lastmodified $Date$
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
/**
* Theme view class
*
@ -48,7 +47,6 @@ class ThemeView extends View {
* @var string
*/
var $themePath = null;
/**
* Enter description here...
*

1
cake/libs/view/view.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* Methods for displaying presentation data in the view.
*

2
cake/libs/xml.php
View file

@ -1,6 +1,5 @@
<?php
/* SVN FILE: $Id$ */
/**
* XML handling for Cake.
*
@ -26,7 +25,6 @@
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
*/
App::import('Core', 'Set');
/**
* XML node.
*