CakeEmail fixes for Japanese encoding

app/webroot/css/cake.generic.css

@@ -611,7 +611,7 @@ pre {
 	overflow: auto;
 	position: relative;
 	-moz-border-radius: 4px;
-	-wekbkit-border-radius: 4px;
+	-webkit-border-radius: 4px;
 	border-radius: 4px;
 }
 .cake-stack-trace a {

app/webroot/index.php

@@ -49,7 +49,7 @@
  * The absolute path to the "cake" directory, WITHOUT a trailing DS.
  *
  * Un-comment this line to specify a fixed path to CakePHP.
- * This should point at the directory containg `Cake`.
+ * This should point at the directory containing `Cake`.
  *
  * For ease of development CakePHP uses PHP's include_path.  If you
  * cannot modify your include_path set this value.

index.php

@@ -3,7 +3,7 @@
  * Requests collector.
  *
  *  This file collects requests if:
- *	- no mod_rewrite is avilable or .htaccess files are not supported
+ *	- no mod_rewrite is available or .htaccess files are not supported
  *  - requires App.baseUrl to be uncommented in app/Config/core.php
  *	- app/webroot is not set as a document root.
  *

lib/Cake/Cache/Cache.php

@@ -96,7 +96,7 @@ class Cache {
  *
  * - `duration` Specify how long items in this cache configuration last.
  * - `prefix` Prefix appended to all entries. Good for when you need to share a keyspace
- *    with either another cache config or annother application.
+ *    with either another cache config or another application.
  * - `probability` Probability of hitting a cache gc cleanup.  Setting to 0 will disable
  *    cache::gc from ever being called automatically.
  * - `servers' Used by memcache. Give the address of the memcached servers to use.

lib/Cake/Console/Command/CommandListShell.php

@@ -144,7 +144,8 @@ protected function _asText($shellList) {
 			$this->out(" " . $row);
 		}
 		$this->out();
-		$this->out(__d('cake_console', "To run a command, type <info>cake shell_name [args]</info>"));
+		$this->out(__d('cake_console', "To run an app or core command, type <info>cake shell_name [args]</info>"));
+		$this->out(__d('cake_console', "To run a plugin command, type <info>cake Plugin.shell_name [args]</info>"));
 		$this->out(__d('cake_console', "To get help on a specific command, type <info>cake shell_name --help</info>"), 2);
 	}
 

lib/Cake/Console/Command/UpgradeShell.php

@@ -141,12 +141,15 @@ public function locations() {
 			$this->_files = array();
 			chdir($cwd);
 		}
-
-		$this->_moveViewFiles();
-
 		$moves = array(
+			'config' => 'Config',
+			'Config' . DS . 'schema' => 'Config' . DS . 'Schema',
 			'libs' => 'Lib',
 			'tests' => 'Test',
+			'views' => 'View',
+			'models' => 'Model',
+			'Model' . DS . 'behaviors' => 'Model' . DS . 'Behavior',
+			'Model' . DS . 'datasources' => 'Model' . DS . 'Datasource',
 			'Test' . DS . 'cases' => 'Test' . DS . 'Case',
 			'Test' . DS . 'fixtures' => 'Test' . DS . 'Fixture',
 			'vendors' . DS . 'shells' . DS . 'templates' => 'Console' . DS . 'Templates',
@@ -156,26 +159,28 @@ public function locations() {
 				$this->out(__d('cake_console', 'Moving %s to %s', $old, $new));
 				if (!$this->params['dry-run']) {
 					if ($this->params['git']) {
-						exec('git mv -f ' . escapeshellarg($old) . ' ' . escapeshellarg($new));
+						exec('git mv -f ' . escapeshellarg($old) . ' ' . escapeshellarg($old . '__'));
+						exec('git mv -f ' . escapeshellarg($old . '__') . ' ' . escapeshellarg($new));
 					} else {
 						$Folder = new Folder($old);
 						$Folder->move($new);
 					}
 				}
 			}
 		}
+		$this->_moveViewFiles();
 		$sourceDirs = array(
 			'.' => array('recursive' => false),
 			'Console',
-			'Controller',
 			'controllers',
+			'Controller',
 			'Lib' => array('checkFolder' => false),
-			'Model',
 			'models',
-			'Test' => array('regex' => '@class (\S*Test) extends CakeTestCase@'),
+			'Model',
 			'tests',
-			'View',
+			'Test' => array('regex' => '@class (\S*Test) extends CakeTestCase@'),
 			'views',
+			'View',
 			'vendors/shells',
 		);
 
@@ -515,23 +520,27 @@ public function components() {
  * @return void
  */
 	protected function _moveViewFiles() {
-		if (!is_dir('views')) {
+		if (!is_dir('View')) {
 			return;
 		}
 
-		$dirs = scandir('views');
+		$dirs = scandir('View');
 		foreach ($dirs as $old) {
-			if (!is_dir('views' . DS . $old) || $old === '.' || $old === '..') {
+			if (!is_dir('View' . DS . $old) || $old === '.' || $old === '..') {
 				continue;
 			}
 
 			$new = 'View' . DS . Inflector::camelize($old);
-			$old = 'views' . DS . $old;
+			$old = 'View' . DS . $old;
+			if ($new == $old) {
+				continue;
+			}
 
 			$this->out(__d('cake_console', 'Moving %s to %s', $old, $new));
 			if (!$this->params['dry-run']) {
 				if ($this->params['git']) {
-					exec('git mv -f ' . escapeshellarg($old) . ' ' . escapeshellarg($new));
+					exec('git mv -f ' . escapeshellarg($old) . ' ' . escapeshellarg($old . '__'));
+					exec('git mv -f ' . escapeshellarg($old . '__') . ' ' . escapeshellarg($new));
 				} else {
 					$Folder = new Folder($old);
 					$Folder->move($new);
@@ -620,7 +629,8 @@ protected function _movePhpFiles($path, $options) {
 			$this->out(__d('cake_console', 'Moving %s to %s', $file, $new), 1, Shell::VERBOSE);
 			if (!$this->params['dry-run']) {
 				if ($this->params['git']) {
-					exec('git mv -f ' . escapeshellarg($file) . ' ' . escapeshellarg($new));
+					exec('git mv -f ' . escapeshellarg($file) . ' ' . escapeshellarg($file . '__'));
+					exec('git mv -f ' . escapeshellarg($file. '__') . ' ' . escapeshellarg($new));
 				} else {
 					rename($file, $new);
 				}

lib/Cake/Console/ShellDispatcher.php

@@ -206,6 +206,7 @@ public function dispatch() {
 	protected function _getShell($shell) {
 		list($plugin, $shell) = pluginSplit($shell, true);
 
+		$plugin = Inflector::camelize($plugin);
 		$class = Inflector::camelize($shell) . 'Shell';
 
 		App::uses('Shell', 'Console');
@@ -287,8 +288,7 @@ protected function _parsePaths($args) {
 		$parsed = array();
 		$keys = array('-working', '--working', '-app', '--app', '-root', '--root');
 		foreach ($keys as $key) {
-			$index = array_search($key, $args);
-			if ($index !== false) {
+			while (($index = array_search($key, $args)) !== false) {
 				$keyname = str_replace('-', '', $key);
 				$valueIndex = $index + 1;
 				$parsed[$keyname] = $args[$valueIndex];

lib/Cake/Console/Templates/skel/webroot/index.php

@@ -49,7 +49,7 @@
  * The absolute path to the "cake" directory, WITHOUT a trailing DS.
  *
  * Un-comment this line to specify a fixed path to CakePHP.
- * This should point at the directory containg `Cake`.
+ * This should point at the directory containing `Cake`.
  *
  * For ease of development CakePHP uses PHP's include_path.  If you
  * cannot modify your include_path set this value.

lib/Cake/Controller/Component.php

@@ -18,7 +18,7 @@
 App::uses('ComponentCollection', 'Controller');
 
 /**
- * Base class for an individual Component.  Components provide resuable bits of
+ * Base class for an individual Component.  Components provide reusable bits of
  * controller logic that can be composed into a controller.  Components also
  * provide request life-cycle callbacks for injecting logic at specific points.
  *

lib/Cake/Controller/Component/AuthComponent.php

@@ -536,7 +536,7 @@ public function logout() {
 /**
  * Get the current user from the session.
  *
- * @param string $key field to retrive.  Leave null to get entire User record
+ * @param string $key field to retrieve.  Leave null to get entire User record
  * @return mixed User record. or null if no user is logged in.
  * @link http://book.cakephp.org/2.0/en/core-libraries/components/authentication.html#accessing-the-logged-in-user
  */

lib/Cake/Controller/Component/RequestHandlerComponent.php

@@ -140,7 +140,7 @@ protected function _setExtension() {
 		$preferredTypes = $this->mapType($preferred);
 		$similarTypes = array_intersect($extensions, $preferredTypes);
 		if (count($similarTypes) === 1 && !in_array('html', $preferredTypes)) {
-			$this->ext = $similarTypes[0];
+			$this->ext = array_shift($similarTypes);
 		}
 	}
 

lib/Cake/Controller/Scaffold.php

@@ -212,7 +212,7 @@ protected function _scaffoldForm($action = 'edit') {
  * Saves or updates the scaffolded model.
  *
  * @param CakeRequest $request Request Object for scaffolding
- * @param string $action add or edt
+ * @param string $action add or edit
  * @return mixed Success on save/update, add/edit form if data is empty or error if save or update fails
  * @throws NotFoundException
  */

lib/Cake/Core/App.php

@@ -703,7 +703,7 @@ protected function _loadFile($name, $plugin, $search, $file, $return) {
  * @param string $ext file extension if known
  * @return boolean true if the file was loaded successfully, false otherwise
  */
-	protected function _loadVendor($name, $plugin, $file, $ext) {
+	protected static function _loadVendor($name, $plugin, $file, $ext) {
 		if ($mapped = self::_mapped($name, $plugin)) {
 			return (bool) include_once($mapped);
 		}

lib/Cake/Core/CakePlugin.php

@@ -194,7 +194,7 @@ public static function routes($plugin = null) {
 	}
 
 /**
- * Retruns true if the plugin $plugin is already loaded
+ * Returns true if the plugin $plugin is already loaded
  * If plugin is null, it will return a list of all loaded plugins
  *
  * @param string $plugin

lib/Cake/Model/BehaviorCollection.php

@@ -2,7 +2,7 @@
 /**
  * BehaviorCollection
  *
- * Provides managment and interface for interacting with collections of behaviors.
+ * Provides management and interface for interacting with collections of behaviors.
  *
  * PHP 5
  *

lib/Cake/Model/CakeSchema.php

@@ -590,7 +590,7 @@ protected function _columns(&$Obj) {
 				$value['key'] = 'primary';
 			}
 			if (!isset($db->columns[$value['type']])) {
-				trigger_error(__d('cake_dev', 'Schema generation error: invalid column type %s does not exist in DBO', $value['type']), E_USER_NOTICE);
+				trigger_error(__d('cake_dev', 'Schema generation error: invalid column type %s for %s.%s does not exist in DBO', $value['type'], $Obj->name, $name), E_USER_NOTICE);
 				continue;
 			} else {
 				$defaultCol = $db->columns[$value['type']];

lib/Cake/Model/Datasource/Database/Postgres.php

@@ -394,6 +394,7 @@ public function fields($model, $alias = null, $fields = array(), $quote = true)
 
 /**
  * Auxiliary function to quote matched `(Model.fields)` from a preg_replace_callback call
+ * Quotes the fields in a function call.
  *
  * @param string $match matched string
  * @return string quoted strig
@@ -404,9 +405,11 @@ protected function _quoteFunctionField($match) {
 			$prepend = 'DISTINCT ';
 			$match[1] = trim(str_replace('DISTINCT', '', $match[1]));
 		}
-		if (strpos($match[1], '.') === false) {
+		$constant = preg_match('/^\d+|NULL|FALSE|TRUE$/i', $match[1]);
+
+		if (!$constant && strpos($match[1], '.') === false) {
 			$match[1] = $this->name($match[1]);
-		} else {
+		} elseif (!$constant){
 			$parts = explode('.', $match[1]);
 			if (!Set::numeric($parts)) {
 				$match[1] = $this->name($match[1]);

lib/Cake/Model/Model.php

@@ -722,7 +722,7 @@ public function __call($method, $params) {
 	}
 
 /**
- * Handles the lazy loading of model associations by lookin in the association arrays for the requested variable
+ * Handles the lazy loading of model associations by looking in the association arrays for the requested variable
  *
  * @param string $name variable tested for existance in class
  * @return boolean true if the variable exists (if is a not loaded model association it will be created), false otherwise
@@ -3032,7 +3032,7 @@ public function invalidFields($options = array()) {
  * Runs validation for hasAndBelongsToMany associations that have 'with' keys
  * set. And data in the set() data set.
  *
- * @param array $options Array of options to use on Valdation of with models
+ * @param array $options Array of options to use on Validation of with models
  * @return boolean Failure of validation on with models.
  * @see Model::validates()
  */

lib/Cake/Model/ModelBehavior.php

@@ -23,7 +23,7 @@
  * Model behavior base class.
  *
  * Defines the Behavior interface, and contains common model interaction functionality.  Behaviors
- * allow you to simulate mixins, and create resuable blocks of application logic, that can be reused across
+ * allow you to simulate mixins, and create reusable blocks of application logic, that can be reused across
  * several models.  Behaviors also provide a way to hook into model callbacks and augment their behavior.
  *
  * ### Mixin methods

lib/Cake/Network/Email/CakeEmail.php

@@ -670,7 +670,7 @@ public function getHeaders($include = array()) {
 		} elseif ($this->_emailFormat === 'both') {
 			$headers['Content-Type'] = 'multipart/alternative; boundary="alt-' . $this->_boundary . '"';
 		}
-		$headers['Content-Transfer-Encoding'] = $this->getContentTransferEncoding();
+		$headers['Content-Transfer-Encoding'] = $this->_getContentTransferEncoding();
 
 		return $headers;
 	}
@@ -1278,7 +1278,7 @@ protected function _formatMessage($message) {
 			} elseif ($this->_emailFormat === 'both') {
 				$prefix[] = 'Content-Type: multipart/alternative; boundary="alt-' . $this->_boundary . '"';
 			}
-			$prefix[] = 'Content-Transfer-Encoding: ' . $this->getContentTransferEncoding();
+			$prefix[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
 			$prefix[] = '';
 			$message = array_merge($prefix, $message);
 		}
@@ -1331,7 +1331,7 @@ protected function _render($content) {
 			}
 			$msg[] = '--alt-' . $this->_boundary;
 			$msg[] = 'Content-Type: text/plain; charset=' . $this->charset;
-			$msg[] = 'Content-Transfer-Encoding: ' . $this->getContentTransferEncoding();
+			$msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
 			$msg[] = '';
 
 			$View->viewPath = $View->layoutPath = 'Emails' . DS . 'text';
@@ -1343,7 +1343,7 @@ protected function _render($content) {
 			$msg[] = '';
 			$msg[] = '--alt-' . $this->_boundary;
 			$msg[] = 'Content-Type: text/html; charset=' . $this->charset;
-			$msg[] = 'Content-Transfer-Encoding: ' . $this->getContentTransferEncoding();
+			$msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
 			$msg[] = '';
 
 			$View->viewPath = $View->layoutPath = 'Emails' . DS . 'html';
@@ -1365,12 +1365,12 @@ protected function _render($content) {
 				$msg[] = '';
 				$msg[] = '--' . $this->_boundary;
 				$msg[] = 'Content-Type: text/html; charset=' . $this->charset;
-				$msg[] = 'Content-Transfer-Encoding: ' . $this->getContentTransferEncoding();
+				$msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
 				$msg[] = '';
 			} else {
 				$msg[] = '--' . $this->_boundary;
 				$msg[] = 'Content-Type: text/plain; charset=' . $this->charset;
-				$msg[] = 'Content-Transfer-Encoding: ' . $this->getContentTransferEncoding();
+				$msg[] = 'Content-Transfer-Encoding: ' . $this->_getContentTransferEncoding();
 				$msg[] = '';
 			}
 		}
@@ -1394,7 +1394,7 @@ protected function _render($content) {
  *
  * @return void
  */
-	private function getContentTransferEncoding() {
+	protected function _getContentTransferEncoding() {
 		$charset = strtoupper($this->charset);
 		if (in_array($charset, $this->_charset8bit)) {
 			return '8bit';

lib/Cake/Routing/Dispatcher.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * Dispatcher takes the URL information, parses it for paramters and
+ * Dispatcher takes the URL information, parses it for parameters and
  * tells the involved controllers what to do.
  *
  * This is the heart of Cake's operation.

lib/Cake/Routing/Router.php

@@ -144,7 +144,7 @@ class Router {
 	protected static $_requests = array();
 
 /**
- * Initial state is popualated the first time reload() is called which is at the bottom
+ * Initial state is populated the first time reload() is called which is at the bottom
  * of this file.  This is a cheat as get_class_vars() returns the value of static vars even if they
  * have changed.
  *