whitespace normalization

cake/libs/cake_session.php

@@ -746,7 +746,7 @@ function __read($id) {
 			return false;
 		}
 
-        return $row[$model->alias]['data'];
+		return $row[$model->alias]['data'];
 	}
 
 /**

cake/libs/controller/components/request_handler.php

@@ -581,7 +581,7 @@ function prefers($type = null) {
 		} elseif (count($types) === 1) {
 			return ($types[0] === $accepts[0]);
 		} elseif (count($accepts) === 1) {
-            return $accepts[0];
+			return $accepts[0];
 		}
 
 		$acceptedTypes = array();

cake/libs/debugger.php

@@ -165,7 +165,6 @@ function __construct() {
 		$this->_templates['js']['code'] = '<div id="{:id}-code" class="cake-code-dump" ';
 		$this->_templates['js']['code'] .= 'style="display: none;"><pre>{:code}</pre></div>';
 
-
 		$e = '<pre class="cake-debug"><b>{:error}</b> ({:code}) : {:description} ';
 		$e .= '[<b>{:path}</b>, line <b>{:line}]</b></pre>';
 		$this->_templates['html']['error'] = $e;

cake/libs/model/cake_schema.php

@@ -366,7 +366,6 @@ function write($object, $options = array()) {
 		}
 		$out .="}\n";
 
-
 		$File =& new File($path . DS . $file, true);
 		$header = '$Id';
 		$content = "<?php \n/* SVN FILE: {$header}$ */\n/* {$name} schema generated on: " . date('Y-m-d H:m:s') . " : ". time() . "*/\n{$out}?>";

cake/libs/model/datasources/dbo/dbo_oracle.php

@@ -204,10 +204,11 @@ function connect() {
 		}
 		return $this->connected;
 	}
-	/**
-	 * Keeps track of the most recent Oracle error
-	 *
-	 */
+
+/**
+ * Keeps track of the most recent Oracle error
+ *
+ */
 	function _setError($source = null, $clear = false) {
 		if ($source) {
 			$e = ocierror($source);
@@ -1069,7 +1070,6 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
 						$q = str_replace('= (', 'IN (', $q);
 						$q = str_replace('  WHERE 1 = 1', '', $q);
 
-
 						$q = $this->insertQueryData($q, null, $association, $assocData, $model, $linkModel, $stack);
 						if ($q != false) {
 							$res = $this->fetchAll($q, $model->cacheQueries, $model->alias);
@@ -1139,14 +1139,15 @@ function queryAssociation(&$model, &$linkModel, $type, $association, $assocData,
 			}
 		}
 	}
-	/**
-	 * Generate a "drop table" statement for the given Schema object
-	 *
-	 * @param object $schema An instance of a subclass of CakeSchema
-	 * @param string $table Optional.  If specified only the table name given will be generated.
-	 *						Otherwise, all tables defined in the schema are generated.
-	 * @return string
-	 */
+
+/**
+ * Generate a "drop table" statement for the given Schema object
+ *
+ * @param object $schema An instance of a subclass of CakeSchema
+ * @param string $table Optional.  If specified only the table name given will be generated.
+ *						Otherwise, all tables defined in the schema are generated.
+ * @return string
+ */
 		function dropSchema($schema, $table = null) {
 			if (!is_a($schema, 'CakeSchema')) {
 				trigger_error(__('Invalid schema object', true), E_USER_WARNING);

cake/libs/multibyte.php

@@ -1063,7 +1063,7 @@ function mimeEncode($string, $charset = null, $newline = "\r\n") {
  * @return string
  * @access private
  */
-	function __codepoint ($decimal) {
+	function __codepoint($decimal) {
 		if ($decimal > 128 && $decimal < 256)  {
 			$return = '0080_00ff'; // Latin-1 Supplement
 		} elseif ($decimal < 384) {

cake/libs/security.php

@@ -45,12 +45,12 @@ class Security extends Object {
 	var $hashType = null;
 
 /**
-  * Singleton implementation to get object instance.
-  *
-  * @return object
-  * @access public
-  * @static
-  */
+ * Singleton implementation to get object instance.
+ *
+ * @return object
+ * @access public
+ * @static
+ */
 	function &getInstance() {
 		static $instance = array();
 		if (!$instance) {
@@ -60,12 +60,12 @@ function &getInstance() {
 	}
 
 /**
-  * Get allowed minutes of inactivity based on security level.
-  *
-  * @return integer Allowed inactivity in minutes
-  * @access public
-  * @static
-  */
+ * Get allowed minutes of inactivity based on security level.
+ *
+ * @return integer Allowed inactivity in minutes
+ * @access public
+ * @static
+ */
 	function inactiveMins() {
 		$_this =& Security::getInstance();
 		switch (Configure::read('Security.level')) {
@@ -83,12 +83,12 @@ function inactiveMins() {
 	}
 
 /**
-  * Generate authorization hash.
-  *
-  * @return string Hash
-  * @access public
-  * @static
-  */
+ * Generate authorization hash.
+ *
+ * @return string Hash
+ * @access public
+ * @static
+ */
 	function generateAuthKey() {
 		if (!class_exists('String')) {
 			App::import('Core', 'String');

cake/libs/set.php

@@ -422,7 +422,7 @@ function extract($path, $data = null, $options = array()) {
 					$context['key'] = array_pop($context['trace']);
 					if (isset($context['trace'][1]) && $context['trace'][1] > 0) {
 						$context['item'] = $context['item'][0];
-					} else if(!empty($context['item'][$key])){
+					} elseif (!empty($context['item'][$key])) {
 						$context['item'] = $context['item'][$key];
 					} else {
 						$context['item'] = array_shift($context['item']);

cake/libs/validation.php

@@ -778,7 +778,7 @@ function postal($check, $regex = null, $country = null) {
  * @return boolean Success
  * @access public
  */
-	function range($check, $lower = null, $upper = null ) {
+	function range($check, $lower = null, $upper = null) {
 		if (!is_numeric($check)) {
 			return false;
 		}

cake/libs/view/helpers/ajax.php

@@ -508,7 +508,6 @@ function autoComplete($field, $url = "", $options = array()) {
 		$options = $this->_optionsToString($options, array('paramName', 'indicator'));
 		$options = $this->_buildOptions($options, $this->autoCompleteOptions);
 
-
 		$text = $this->Form->text($field, $htmlOptions);
 		$div = $this->Html->div(null, '', $divOptions);
 		$script = "{$var}new Ajax.Autocompleter('{$htmlOptions['id']}', '{$divOptions['id']}', '";
@@ -903,7 +902,7 @@ function _buildObserver($klass, $name, $options = null) {
 
 		$callback = $this->remoteFunction($options);
 		$hasFrequency = !(!isset($options['frequency']) || intval($options['frequency']) == 0);
-    	$frequency = $hasFrequency ? $options['frequency'] . ', ' : '';
+		$frequency = $hasFrequency ? $options['frequency'] . ', ' : '';
 
 		return "new $klass('$name', {$frequency}function(element, value) {{$callback}})";
 	}
@@ -1018,5 +1017,4 @@ function afterRender() {
 		}
 	}
 }
-
 ?>

cake/libs/view/helpers/xml.php

@@ -168,5 +168,4 @@ function serialize($data, $options = array()) {
 		return $data->toString($options + array('header' => false));
 	}
 }
-
 ?>

cake/libs/view/theme.php

@@ -58,7 +58,7 @@ class ThemeView extends View {
  *
  * @param unknown_type $controller
  */
-	function __construct (&$controller) {
+	function __construct(&$controller) {
 		parent::__construct($controller);
 		$this->theme =& $controller->theme;