Schlaefer / Saito

app/webroot/index.php

Spacing +11 added lines, -11 removed lines

@@ -47,7 +47,7 @@ 
  * Config Directory
  */
 if (!defined('CONFIG')) {
-	define('CONFIG', ROOT . DS . APP_DIR . DS . 'Config' . DS);
+	define('CONFIG', ROOT.DS.APP_DIR.DS.'Config'.DS);
 }
 
 /**
@@ -70,9 +70,9 @@ 
  * This auto-detects CakePHP as a composer installed library.
  * You may remove this if you are not planning to use composer (not recommended, though).
  */
-$vendorPath = ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
-$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
-if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispatcher)) {
+$vendorPath = ROOT.DS.APP_DIR.DS.'Vendor'.DS.'cakephp'.DS.'cakephp'.DS.'lib';
+$dispatcher = 'Cake'.DS.'Console'.DS.'ShellDispatcher.php';
+if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath.DS.$dispatcher)) {
 	define('CAKE_CORE_INCLUDE_PATH', $vendorPath);
 }
 
@@ -84,29 +84,29 @@ 
 	define('WEBROOT_DIR', basename(dirname(__FILE__)));
 }
 if (!defined('WWW_ROOT')) {
-	define('WWW_ROOT', dirname(__FILE__) . DS);
+	define('WWW_ROOT', dirname(__FILE__).DS);
 }
 
 // For the built-in server
 if (PHP_SAPI === 'cli-server') {
-	if ($_SERVER['PHP_SELF'] !== '/' . basename(__FILE__) && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
+	if ($_SERVER['PHP_SELF'] !== '/'.basename(__FILE__) && file_exists(WWW_ROOT.$_SERVER['PHP_SELF'])) {
 		return false;
 	}
-	$_SERVER['PHP_SELF'] = '/' . basename(__FILE__);
+	$_SERVER['PHP_SELF'] = '/'.basename(__FILE__);
 }
 
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
-		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
+		ini_set('include_path', ROOT.DS.'lib'.PATH_SEPARATOR.ini_get('include_path'));
 	}
-	if (!include 'Cake' . DS . 'bootstrap.php') {
+	if (!include 'Cake'.DS.'bootstrap.php') {
 		$failed = true;
 	}
-} elseif (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') {
+} elseif (!include CAKE_CORE_INCLUDE_PATH.DS.'Cake'.DS.'bootstrap.php') {
 	$failed = true;
 }
 if (!empty($failed)) {
-	trigger_error("CakePHP core could not be found. 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("CakePHP core could not be found. 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);
 }
 
 App::uses('Dispatcher', 'Routing');

app/webroot/test.php

Spacing +10 added lines, -10 removed lines

@@ -50,7 +50,7 @@ 
  * Config Directory
  */
 if (!defined('CONFIG')) {
-	define('CONFIG', ROOT . DS . APP_DIR . DS . 'Config' . DS);
+	define('CONFIG', ROOT.DS.APP_DIR.DS.'Config'.DS);
 }
 
 /**
@@ -70,9 +70,9 @@ 
  * This auto-detects CakePHP as a composer installed library.
  * You may remove this if you are not planning to use composer (not recommended, though).
  */
-$vendorPath = ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
-$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
-if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispatcher)) {
+$vendorPath = ROOT.DS.APP_DIR.DS.'Vendor'.DS.'cakephp'.DS.'cakephp'.DS.'lib';
+$dispatcher = 'Cake'.DS.'Console'.DS.'ShellDispatcher.php';
+if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath.DS.$dispatcher)) {
 	define('CAKE_CORE_INCLUDE_PATH', $vendorPath);
 }
 
@@ -84,29 +84,29 @@ 
 	define('WEBROOT_DIR', basename(dirname(__FILE__)));
 }
 if (!defined('WWW_ROOT')) {
-	define('WWW_ROOT', dirname(__FILE__) . DS);
+	define('WWW_ROOT', dirname(__FILE__).DS);
 }
 
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (function_exists('ini_set')) {
-		ini_set('include_path', ROOT . DS . 'lib' . PATH_SEPARATOR . ini_get('include_path'));
+		ini_set('include_path', ROOT.DS.'lib'.PATH_SEPARATOR.ini_get('include_path'));
 	}
-	if (!include 'Cake' . DS . 'bootstrap.php') {
+	if (!include 'Cake'.DS.'bootstrap.php') {
 		$failed = true;
 	}
 } else {
-	if (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') {
+	if (!include CAKE_CORE_INCLUDE_PATH.DS.'Cake'.DS.'bootstrap.php') {
 		$failed = true;
 	}
 }
 if (!empty($failed)) {
-	trigger_error("CakePHP core could not be found. 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("CakePHP core could not be found. 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);
 }
 
 if (Configure::read('debug') < 1) {
 	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';
 
 CakeTestSuiteDispatcher::run();

app/Plugin/FileUpload/Model/Behavior/FileUploadBehavior.php

Spacing +10 added lines, -10 removed lines

@@ -37,9 +37,9 @@ 
   /**
     * Setup the behavior
     */
-  function setUp(Model $Model, $options = array()){
+  function setUp(Model $Model, $options = array()) {
     $FileUploadSettings = new FileUploadSettings;
-    if(!is_array($options)){
+    if (!is_array($options)) {
       $options = array();
     }
     $this->options = array_merge($FileUploadSettings->defaults, $options);
@@ -55,13 +55,13 @@ 
     *
     */
 	public function beforeSave(Model $Model, $options = array()) {
-    if(isset($Model->data[$Model->alias][$this->options['fileVar']])){
+    if (isset($Model->data[$Model->alias][$this->options['fileVar']])) {
       $file = $Model->data[$Model->alias][$this->options['fileVar']];
       $this->Uploader->file = $file;
 
-      if($this->Uploader->hasUpload()){
+      if ($this->Uploader->hasUpload()) {
         $fileName = $this->Uploader->processFile();
-        if($fileName){
+        if ($fileName) {
           $Model->data[$Model->alias][$this->options['fields']['name']] = $fileName;
           $Model->data[$Model->alias][$this->options['fields']['size']] = $file['size'];
           $Model->data[$Model->alias][$this->options['fields']['type']] = $file['type'];
@@ -82,11 +82,11 @@ 
     * presents the user the errors.
     */
 	public function beforeValidate(Model $Model, $options = array()) {
-    if(isset($Model->data[$Model->alias][$this->options['fileVar']])){
+    if (isset($Model->data[$Model->alias][$this->options['fileVar']])) {
       $file = $Model->data[$Model->alias][$this->options['fileVar']];
       $this->Uploader->file = $file;
-      if($this->Uploader->hasUpload()){
-        if($this->Uploader->checkFile() && $this->Uploader->checkType() && $this->Uploader->checkSize()){
+      if ($this->Uploader->hasUpload()) {
+        if ($this->Uploader->checkFile() && $this->Uploader->checkType() && $this->Uploader->checkSize()) {
           $Model->beforeValidate();
         }
         else {
@@ -94,7 +94,7 @@ 
         }
       }
     }
-    elseif(isset($this->options['required']) && $this->options['required']){
+    elseif (isset($this->options['required']) && $this->options['required']) {
       $Model->validationErrors[$this->options['fileVar']] = 'No File';
     }
     return $Model->beforeValidate();
@@ -103,7 +103,7 @@ 
   /**
     * Automatically remove the uploaded file.
     */
-  function beforeDelete(Model $Model, $cascade = true){
+  function beforeDelete(Model $Model, $cascade = true) {
     $Model->recursive = -1;
     $data = $Model->read();
 

app/Plugin/FileUpload/Vendor/uploader.php

Spacing +50 added lines, -50 removed lines

@@ -55,7 +55,7 @@ 
     */
   var $finalFile = null;
 
-  function __construct($options = array()){
+  function __construct($options = array()) {
     $this->options = array_merge($this->options, $options);
   }
 
@@ -66,25 +66,25 @@ 
     * @return string of resulting filename
     * @access private
     */
-  function __handleFileNameCallback($fileName){
-    if($this->options['fileNameFunction']){
-      if($this->options['fileModel']){
+  function __handleFileNameCallback($fileName) {
+    if ($this->options['fileNameFunction']) {
+      if ($this->options['fileModel']) {
         $Model = ClassRegistry::init($this->options['fileModel']);
-        if(method_exists($Model, $this->options['fileNameFunction'])){
+        if (method_exists($Model, $this->options['fileNameFunction'])) {
           $fileName = $Model->{$this->options['fileNameFunction']}($fileName);
         }
-        elseif(function_exists($this->options['fileNameFunction'])){
+        elseif (function_exists($this->options['fileNameFunction'])) {
           $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
         }
       }
       else {
-        if(function_exists($this->options['fileNameFunction'])){
+        if (function_exists($this->options['fileNameFunction'])) {
           $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
         }
       }
 
-      if(!$fileName){
-        $this->_error('No filename resulting after parsing. Function: ' . $this->options['fileNameFunction']);
+      if (!$fileName) {
+        $this->_error('No filename resulting after parsing. Function: '.$this->options['fileNameFunction']);
       }
     }
     return $fileName;
@@ -97,12 +97,12 @@ 
     * @return string of resulting target_path
     * @access private
     */
-  function __handleUnique($target_path){
-    if($this->options['unique']){
+  function __handleUnique($target_path) {
+    if ($this->options['unique']) {
       $temp_path = substr($target_path, 0, strlen($target_path) - strlen($this->_ext())); //temp path without the ext
-      $i=1;
-      while(file_exists($target_path)){
-        $target_path = $temp_path . "-" . $i . $this->_ext();
+      $i = 1;
+      while (file_exists($target_path)) {
+        $target_path = $temp_path."-".$i.$this->_ext();
         $i++;
       }
 		}
@@ -118,11 +118,11 @@ 
     * @return String | false String of finalFile name saved to the file system or false if unable to save to file system.
     * @access public
     */
-  function processFile($file = null){
+  function processFile($file = null) {
     $this->setFile($file);
 
     //check if we have a file and if we allow the type, return false otherwise.
-    if(!$this->checkFile() || !$this->checkType() || !$this->checkSize()){
+    if (!$this->checkFile() || !$this->checkType() || !$this->checkSize()) {
       return false;
     }
 
@@ -130,18 +130,18 @@ 
     $up_dir = $this->options['uploadDir'];
     $fileName = $this->__handleFileNameCallback($this->file['name']);
     //if callback returns false hault the upload
-    if(!$fileName){
+    if (!$fileName) {
       return false;
     }
-    $target_path = $up_dir . DS . $fileName;
+    $target_path = $up_dir.DS.$fileName;
     $target_path = $this->__handleUnique($target_path);
 
     //now move the file.
-    if(move_uploaded_file($this->file['tmp_name'], $target_path)){
+    if (move_uploaded_file($this->file['tmp_name'], $target_path)) {
       $this->finalFile = basename($target_path);
       return $this->finalFile;
     }
-    else{
+    else {
       $this->_error('Unable to save temp file to file system.');
       return false;
     }
@@ -153,8 +153,8 @@ 
     * @param file array of uploaded file. (optional)
     * @return void
     */
-  function setFile($file = null){
-    if($file) $this->file = $file;
+  function setFile($file = null) {
+    if ($file) $this->file = $file;
   }
 
   /**
@@ -164,9 +164,9 @@ 
     * @param file array of uploaded file (optional)
     * @access protected
     */
-  function _ext($file = null){
+  function _ext($file = null) {
     $this->setFile($file);
-    return strrchr($this->file['name'],".");
+    return strrchr($this->file['name'], ".");
   }
 
   /**
@@ -176,7 +176,7 @@ 
   * @return void
   * @access protected
   */
-  function _error($text){
+  function _error($text) {
     $this->errors[] = __($text);
   }
 
@@ -187,20 +187,20 @@ 
   * @param file array of uploaded file (optional)
   * @access public
   */
-  function checkType($file = null){
+  function checkType($file = null) {
     $this->setFile($file);
-    foreach($this->options['allowedTypes'] as $ext => $types){
-      if(!is_string($ext)){
+    foreach ($this->options['allowedTypes'] as $ext => $types) {
+      if (!is_string($ext)) {
         $ext = $types;
       }
-      if($ext == '*'){
+      if ($ext == '*') {
         return true;
       }
 
-      $ext = strtolower('.' . str_replace('.','', $ext));
+      $ext = strtolower('.'.str_replace('.', '', $ext));
       $file_ext = strtolower($this->_ext());
-      if($file_ext == $ext){
-        if(is_array($types) && !in_array($this->file['type'], $types)){
+      if ($file_ext == $ext) {
+        if (is_array($types) && !in_array($this->file['type'], $types)) {
           $this->_error("{$this->file['type']} is not an allowed type.");
           return false;
         }
@@ -221,10 +221,10 @@ 
     * @access public
     * @param file array of uploaded file (optional)
     */
-  function checkFile($file = null){
+  function checkFile($file = null) {
     $this->setFile($file);
-    if($this->hasUpload() && $this->file){
-      if(isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK ) {
+    if ($this->hasUpload() && $this->file) {
+      if (isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK) {
         return true;
       }
       else {
@@ -241,13 +241,13 @@ 
     * @access public
     * @param file array of uploaded file (optional)
     */
-  function checkSize($file = null){
+  function checkSize($file = null) {
     $this->setFile($file);
-    if($this->hasUpload() && $this->file){
-      if(!$this->options['maxFileSize']){ //We don't want to test maxFileSize
+    if ($this->hasUpload() && $this->file) {
+      if (!$this->options['maxFileSize']) { //We don't want to test maxFileSize
         return true;
       }
-      elseif($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']){
+      elseif ($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']) {
         return true;
       }
       else {
@@ -265,16 +265,16 @@ 
     * @return boolean
     * @access public
     */
-  function removeFile($name = null){
-    if(!$name || strpos($name, '://')){
+  function removeFile($name = null) {
+    if (!$name || strpos($name, '://')) {
       return false;
     }
 
     $up_dir = $this->options['uploadDir'];
-    $target_path = $up_dir . DS . $name;
+    $target_path = $up_dir.DS.$name;
 
     //delete main image -- $name
-    if(@unlink($target_path)){
+    if (@unlink($target_path)) {
       return true;
     } else {
       return false;
@@ -287,7 +287,7 @@ 
     * @return boolean true | false depending if a file was actually uploaded.
     * @param file array of uploaded file (optional)
     */
-  function hasUpload($file = null){
+  function hasUpload($file = null) {
     $this->setFile($file);
     return ($this->_multiArrayKeyExists("tmp_name", $this->file));
   }
@@ -295,7 +295,7 @@ 
   /**
     * @return boolean true if errors were detected.
     */
-  function hasErrors(){
+  function hasErrors() {
     return count($this->errors);
   }
 
@@ -308,9 +308,9 @@ 
     * @return string
     * @access public
     */
-  function showErrors($sep = " "){
+  function showErrors($sep = " ") {
     $retval = "";
-    foreach($this->errors as $error){
+    foreach ($this->errors as $error) {
       $retval .= "$error $sep";
     }
     return $retval;
@@ -325,13 +325,13 @@ 
     * @access protected
     */
   function _multiArrayKeyExists($needle, $haystack) {
-    if(is_array($haystack)){
+    if (is_array($haystack)) {
       foreach ($haystack as $key=>$value) {
-        if ($needle===$key && $value) {
+        if ($needle === $key && $value) {
           return true;
         }
         if (is_array($value)) {
-          if($this->_multiArrayKeyExists($needle, $value)){
+          if ($this->_multiArrayKeyExists($needle, $value)) {
             return true;
           }
         }

app/Plugin/FileUpload/View/Helper/FileUploadHelper.php

Spacing +118 added lines, -118 removed lines

@@ -20,7 +20,7 @@ 
   *
   */
 App::import('Config', 'FileUpload.file_upload_settings');
-class FileUploadHelper extends AppHelper{
+class FileUploadHelper extends AppHelper {
   var $helpers = array('Html', 'Form');
 
   /**
@@ -64,7 +64,7 @@ 
     * Constructor, initiallizes the FileUpload Component
     * and sets the default options.
     */
-  function __construct(View $View, $settings = array()){
+  function __construct(View $View, $settings = array()) {
 		parent::__construct($View, $settings);
     $this->FileUploadSettings = new FileUploadSettings;
 
@@ -77,7 +77,7 @@ 
     * @access public
     * @return void
     */
-  function reset(){
+  function reset() {
     $this->fileName = null;
     $this->options = array(
       'width' => 0,
@@ -101,10 +101,10 @@ 
     * @access public
     * @return mixed html tag, url string, or false if unable to find image.
     */
-  function image($name, $options = array()){
+  function image($name, $options = array()) {
     $this->fileName = $name;
     //options takes in a width as well
-    if(is_int($options)){
+    if (is_int($options)) {
       $width = $options;
       $options = array();
       $options['width'] = $width;
@@ -113,14 +113,14 @@ 
     $this->settings = array_merge($this->settings, $options);
 
     $img = false;
-    if(is_string($name)){
+    if (is_string($name)) {
       $img = $this->_getImageByName();
     }
-    elseif(is_int($name)){
+    elseif (is_int($name)) {
       $img = $this->_getImageById();
     }
 
-    if($img){
+    if ($img) {
       return $img;
     }
 
@@ -135,13 +135,13 @@ 
     * @return String HTML form input element configured for the FileUploadComponent
     * @access public
     */
-  function input($options = array()){
+  function input($options = array()) {
     $options = array_merge(
-      array('var' => $this->settings['fileVar'],'model' => $this->settings['fileModel']),
+      array('var' => $this->settings['fileVar'], 'model' => $this->settings['fileModel']),
       $options
     );
     $configs = $options;
-    if($configs['model']){
+    if ($configs['model']) {
       unset($options['model'], $options['var']);
 
       return $this->Form->input("{$configs['model']}.".$this->inputCount++.".{$configs['var']}", array_merge(array('type'=>'file'), $options));
@@ -154,20 +154,20 @@ 
   /**
     * @access protected
     */
-  function _getImageById(){
+  function _getImageById() {
     App::import('Component', 'FileUpload.FileUpload');
     $this->FileUpload = new FileUploadComponent;
 
     $id = $this->fileName;
     $this->FileUpload->options['fileModel'] = $this->settings['fileModel'];
-    $Model =& $this->FileUpload->getModel();
+    $Model = & $this->FileUpload->getModel();
     $Model->recursive = -1;
     $upload = $Model->findById($id);
-    if(!empty($upload)){
+    if (!empty($upload)) {
       $this->fileName = $upload[$this->settings['fileModel']][$this->settings['fields']['name']];
       return $this->_getImageByName();
     }
-    else{
+    else {
       return false;
     }
   }
@@ -177,12 +177,12 @@ 
     * @access protected
     * @return String full path of the file name
     */
-  function _getFullPath(){
-    if($this->_isOutsideSource()){
+  function _getFullPath() {
+    if ($this->_isOutsideSource()) {
       return $this->fileName;
     }
     else {
-      return WWW_ROOT . $this->_getUploadPath();
+      return WWW_ROOT.$this->_getUploadPath();
     }
   }
 
@@ -191,12 +191,12 @@ 
     * @access protected
     * @return String full path of the file name
     */
-  function _getImagePath(){
-    if($this->_isOutsideSource()){
+  function _getImagePath() {
+    if ($this->_isOutsideSource()) {
       return $this->fileName;
     }
     else {
-      return '/' . $this->_getUploadPath();
+      return '/'.$this->_getUploadPath();
     }
   }
 
@@ -205,8 +205,8 @@ 
     * @access protected
     * @return String upload path of all files
     */
-  function _getUploadPath(){
-    return $this->settings['uploadDir'] . '/' . $this->fileName;
+  function _getUploadPath() {
+    return $this->settings['uploadDir'].'/'.$this->fileName;
   }
 
   /**
@@ -214,8 +214,8 @@ 
     * @access protected
     * @return String extension of filename
     */
-  function _getExt(){
-    return strrchr($this->fileName,".");
+  function _getExt() {
+    return strrchr($this->fileName, ".");
   }
 
   /**
@@ -225,12 +225,12 @@ 
     * if not, make it, save it, and return it.
     * @return String HTML of resized or full image.
     */
-  function _getImageByName(){
+  function _getImageByName() {
     //only proceed if we actually have the file in question
-    if(!$this->_isOutsideSource() && !file_exists($this->_getFullPath())) return false;
+    if (!$this->_isOutsideSource() && !file_exists($this->_getFullPath())) return false;
 
     //resize if we have resize on, a width, and if it doesn't already exist.
-    if($this->options['autoResize'] && $this->options['width'] > 0 && !file_exists($this->_getResizeNameOrPath($this->_getFullPath()))){
+    if ($this->options['autoResize'] && $this->options['width'] > 0 && !file_exists($this->_getResizeNameOrPath($this->_getFullPath()))) {
       $this->_resizeImage();
     }
     return $this->_htmlImage();
@@ -240,11 +240,11 @@ 
     * @return String of the resizedpath of a filename or path.
     * @access protected
     */
-  function _getResizeNameOrPath($file_name_or_path){
+  function _getResizeNameOrPath($file_name_or_path) {
     $file_name = basename($file_name_or_path);
     $path = substr($file_name_or_path, 0, strlen($file_name_or_path) - strlen($file_name));
-    $temp_path = substr($file_name,0,strlen($file_name) - strlen($this->_getExt())) . "x" . $this->options['width'] . $this->_getExt();
-    $full_path = (strlen($this->options['resizedDir']) > 0) ? $path . $this->options['resizedDir'] . '/' . $temp_path : $path . $temp_path;
+    $temp_path = substr($file_name, 0, strlen($file_name) - strlen($this->_getExt()))."x".$this->options['width'].$this->_getExt();
+    $full_path = (strlen($this->options['resizedDir']) > 0) ? $path.$this->options['resizedDir'].'/'.$temp_path : $path.$temp_path;
     return $full_path;
   }
 
@@ -253,9 +253,9 @@ 
     * @access protected
     * @return null
     */
-  function _resizeImage(){
+  function _resizeImage() {
     $this->newImage = new RResizeImage($this->_getFullPath());
-    if($this->newImage->imgWidth > $this->options['width']){
+    if ($this->newImage->imgWidth > $this->options['width']) {
       $this->newImage->resize_limitwh($this->options['width'], 0, $this->_getResizeNameOrPath($this->_getFullPath()));
     }
     else {
@@ -268,9 +268,9 @@ 
     * @access protected
     * @return String HTML image asked for
     */
-  function _htmlImage(){
-    if(!$this->_isOutsideSource() && $this->options['autoResize'] && $this->options['width'] > 0){
-      if(isset($this->newImage) && $this->newImage->imgWidth && $this->newImage->imgWidth <= $this->options['width']){
+  function _htmlImage() {
+    if (!$this->_isOutsideSource() && $this->options['autoResize'] && $this->options['width'] > 0) {
+      if (isset($this->newImage) && $this->newImage->imgWidth && $this->newImage->imgWidth <= $this->options['width']) {
         $image = $this->_getImagePath();
       }
       else {
@@ -285,10 +285,10 @@ 
     //unset the default options
     unset($options['resizedDir'], $options['uploadDir'], $options['imagePathOnly'], $options['autoResize'], $options['resizeThumbOnly']);
     //unset width only if we're not an outsourced image, we have resize turned on, or we don't have a width to begin with.
-    if(!$this->_isOutsideSource() && ($this->options['resizeThumbOnly'] || !$options['width'])) unset($options['width']);
+    if (!$this->_isOutsideSource() && ($this->options['resizeThumbOnly'] || !$options['width'])) unset($options['width']);
 
     //return the impage path or image html
-    if($this->options['imagePathOnly']){
+    if ($this->options['imagePathOnly']) {
       return $image;
     }
     else {
@@ -299,7 +299,7 @@ 
   /**
     * _isOutsideSource searches the fileName string for :// to determine if the image source is inside or outside our server
     */
-  function _isOutsideSource(){
+  function _isOutsideSource() {
     return !!strpos($this->fileName, '://');
   }
 }
@@ -315,15 +315,15 @@ 
 	 *
 	 */
 	//define("HAR_AUTO_NAME",1);
-	Class RResizeImage	{
-		var $imgFile="";
-		var $imgWidth=0;
-		var $imgHeight=0;
-		var $imgType="";
-		var $imgAttr="";
-		var $type=NULL;
-		var $_img=NULL;
-		var $_error="";
+	Class RResizeImage {
+		var $imgFile = "";
+		var $imgWidth = 0;
+		var $imgHeight = 0;
+		var $imgType = "";
+		var $imgAttr = "";
+		var $type = NULL;
+		var $_img = NULL;
+		var $_error = "";
 
 		/**
 		 * Constructor
@@ -331,14 +331,14 @@ 
 		 * @param [String $imgFile] Image File Name
 		 * @return RESIZEIMAGE (Class Object)
 		 */
-		function __construct($imgFile=""){
-			if (!function_exists("imagecreate")){
-				$this->_error="Error: GD Library is not available.";
+		function __construct($imgFile = "") {
+			if (!function_exists("imagecreate")) {
+				$this->_error = "Error: GD Library is not available.";
 				return false;
 			}
 
-			$this->type=Array(1 => 'GIF', 2 => 'JPG', 3 => 'PNG', 4 => 'SWF', 5 => 'PSD', 6 => 'BMP', 7 => 'TIFF', 8 => 'TIFF', 9 => 'JPC', 10 => 'JP2', 11 => 'JPX', 12 => 'JB2', 13 => 'SWC', 14 => 'IFF', 15 => 'WBMP', 16 => 'XBM');
-			if(!empty($imgFile)){
+			$this->type = Array(1 => 'GIF', 2 => 'JPG', 3 => 'PNG', 4 => 'SWF', 5 => 'PSD', 6 => 'BMP', 7 => 'TIFF', 8 => 'TIFF', 9 => 'JPC', 10 => 'JP2', 11 => 'JPX', 12 => 'JB2', 13 => 'SWC', 14 => 'IFF', 15 => 'WBMP', 16 => 'XBM');
+			if (!empty($imgFile)) {
 				$this->setImage($imgFile);
       }
 		}
@@ -348,7 +348,7 @@ 
 		 *
 		 * @return String
 		 */
-		function error(){
+		function error() {
 			return $this->_error;
 		}
 
@@ -358,15 +358,15 @@ 
 		 * @param String $imgFile
 		 * @return void
 		 */
-		function setImage($imgFile){
-			$this->imgFile=$imgFile;
+		function setImage($imgFile) {
+			$this->imgFile = $imgFile;
 			return $this->_createImage();
 		}
 
     /**
 		 * @return void
 		 */
-		function close(){
+		function close() {
 			return @imagedestroy($this->_img);
 		}
 
@@ -377,18 +377,18 @@ 
 		 * @param Numnber $imgheight
 		 * @param String $newfile
 		 */
-		function resize_limitwh($imgwidth,$imgheight,$newfile=NULL){
+		function resize_limitwh($imgwidth, $imgheight, $newfile = NULL) {
 			$image_per = 100;
 			list($width, $height, $type, $attr) = @getimagesize($this->imgFile);
-			if($width > $imgwidth && $imgwidth > 0){
-				$image_per = (double)(($imgwidth * 100) / $width);
+			if ($width > $imgwidth && $imgwidth > 0) {
+				$image_per = (double) (($imgwidth * 100) / $width);
       }
 
-			if(floor(($height * $image_per)/100)>$imgheight && $imgheight > 0){
-				$image_per = (double)(($imgheight * 100) / $height);
+			if (floor(($height * $image_per) / 100) > $imgheight && $imgheight > 0) {
+				$image_per = (double) (($imgheight * 100) / $height);
       }
 
-			$this->resize_percentage($image_per,$newfile);
+			$this->resize_percentage($image_per, $newfile);
 		}
 
     /**
@@ -398,10 +398,10 @@ 
 		 * @param String $newfile
 		 * @return Boolean
 		 */
-		function resize_percentage($percent=100,$newfile=NULL)	{
-			$newWidth=($this->imgWidth*$percent)/100;
-			$newHeight=($this->imgHeight*$percent)/100;
-			return $this->resize($newWidth,$newHeight,$newfile);
+		function resize_percentage($percent = 100, $newfile = NULL) {
+			$newWidth = ($this->imgWidth * $percent) / 100;
+			$newHeight = ($this->imgHeight * $percent) / 100;
+			return $this->resize($newWidth, $newHeight, $newfile);
 		}
 
     /**
@@ -412,10 +412,10 @@ 
 		 * @param String $newfile
 		 * @return Boolean
 		 */
-		function resize_xypercentage($xpercent=100,$ypercent=100,$newfile=NULL)		{
-			$newWidth=($this->imgWidth*$xpercent)/100;
-			$newHeight=($this->imgHeight*$ypercent)/100;
-			return $this->resize($newWidth,$newHeight,$newfile);
+		function resize_xypercentage($xpercent = 100, $ypercent = 100, $newfile = NULL) {
+			$newWidth = ($this->imgWidth * $xpercent) / 100;
+			$newHeight = ($this->imgHeight * $ypercent) / 100;
+			return $this->resize($newWidth, $newHeight, $newfile);
 		}
 
 		/**
@@ -426,19 +426,19 @@ 
 		 * @param String $newfile
 		 * @return Boolean
 		 */
-		function resize($width,$height,$newfile=NULL){
-			if(empty($this->imgFile)){
-				$this->_error="File name is not initialised.";
+		function resize($width, $height, $newfile = NULL) {
+			if (empty($this->imgFile)) {
+				$this->_error = "File name is not initialised.";
 				return false;
 			}
-			if($this->imgWidth<=0 || $this->imgHeight<=0){
-				$this->_error="Could not resize given image";
+			if ($this->imgWidth <= 0 || $this->imgHeight <= 0) {
+				$this->_error = "Could not resize given image";
 				return false;
 			}
-			if($width<=0)	$width=$this->imgWidth;
-			if($height<=0) $height=$this->imgHeight;
+			if ($width <= 0)	$width = $this->imgWidth;
+			if ($height <= 0) $height = $this->imgHeight;
 
-			return $this->_resize($width,$height,$newfile);
+			return $this->_resize($width, $height, $newfile);
 		}
 
 		/**
@@ -448,8 +448,8 @@ 
 		 */
 		function _getImageInfo()
 		{
-			@list($this->imgWidth,$this->imgHeight,$type,$this->imgAttr)=@getimagesize($this->imgFile);
-			$this->imgType=$this->type[$type];
+			@list($this->imgWidth, $this->imgHeight, $type, $this->imgAttr) = @getimagesize($this->imgFile);
+			$this->imgType = $this->type[$type];
 		}
 
 		/**
@@ -457,20 +457,20 @@ 
 		 * @access Private
 		 * @return Boolean
 		 */
-		function _createImage(){
+		function _createImage() {
 			$this->_getImageInfo();
-			if($this->imgType=='GIF'){
-				$this->_img=@imagecreatefromgif($this->imgFile);
+			if ($this->imgType == 'GIF') {
+				$this->_img = @imagecreatefromgif($this->imgFile);
 			}
-			elseif($this->imgType=='JPG'){
-				$this->_img=@imagecreatefromjpeg($this->imgFile);
+			elseif ($this->imgType == 'JPG') {
+				$this->_img = @imagecreatefromjpeg($this->imgFile);
 			}
-			elseif($this->imgType=='PNG'){
-				$this->_img=@imagecreatefrompng($this->imgFile);
+			elseif ($this->imgType == 'PNG') {
+				$this->_img = @imagecreatefrompng($this->imgFile);
 			}
 
-			if(!$this->_img || !@is_resource($this->_img)){
-				$this->_error="Error loading ".$this->imgFile;
+			if (!$this->_img || !@is_resource($this->_img)) {
+				$this->_error = "Error loading ".$this->imgFile;
 				return false;
 			}
 			return true;
@@ -485,64 +485,64 @@ 
 		 * @param String $newfile
 		 * @return Boolean
 		 */
-		function _resize($width,$height,$newfile=NULL){
-			if (!function_exists("imagecreate")){
-				$this->_error="Error: GD Library is not available.";
+		function _resize($width, $height, $newfile = NULL) {
+			if (!function_exists("imagecreate")) {
+				$this->_error = "Error: GD Library is not available.";
 				return false;
 			}
 
-			$newimg=@imagecreatetruecolor($width,$height);
+			$newimg = @imagecreatetruecolor($width, $height);
 			//imagecolortransparent( $newimg, imagecolorat( $newimg, 0, 0 ) );
 
-			if($this->imgType=='GIF' || $this->imgType=='PNG')	{
+			if ($this->imgType == 'GIF' || $this->imgType == 'PNG') {
 				/** Code to keep transparency of image **/
 				$colorcount = imagecolorstotal($this->_img);
 				if ($colorcount == 0) $colorcount = 256;
-				imagetruecolortopalette($newimg,true,$colorcount);
-				imagepalettecopy($newimg,$this->_img);
+				imagetruecolortopalette($newimg, true, $colorcount);
+				imagepalettecopy($newimg, $this->_img);
 				$transparentcolor = imagecolortransparent($this->_img);
-				imagefill($newimg,0,0,$transparentcolor);
-				imagecolortransparent($newimg,$transparentcolor);
+				imagefill($newimg, 0, 0, $transparentcolor);
+				imagecolortransparent($newimg, $transparentcolor);
 			}
 
-			@imagecopyresampled ( $newimg, $this->_img, 0,0,0,0, $width, $height, $this->imgWidth,$this->imgHeight);
+			@imagecopyresampled($newimg, $this->_img, 0, 0, 0, 0, $width, $height, $this->imgWidth, $this->imgHeight);
 
-			if($newfile===1)	{
-				if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
-			   		$newfile=@substr_replace($this->imgFile,"_har",-@strlen($matches[0]),0);
+			if ($newfile === 1) {
+				if (@preg_match("/\..*+$/", @basename($this->imgFile), $matches)) {
+			   		$newfile = @substr_replace($this->imgFile, "_har", -@strlen($matches[0]), 0);
         }
 			}
-			elseif(!empty($newfile)){
-				if(!@preg_match("/\..*+$/",@basename($newfile))){
-					if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
-					   $newfile=$newfile.$matches[0];
+			elseif (!empty($newfile)) {
+				if (!@preg_match("/\..*+$/", @basename($newfile))) {
+					if (@preg_match("/\..*+$/", @basename($this->imgFile), $matches)) {
+					   $newfile = $newfile.$matches[0];
           }
 				}
 			}
 
-			if($this->imgType=='GIF'){
-				if(!empty($newfile)){
-          @imagegif($newimg,$newfile);
+			if ($this->imgType == 'GIF') {
+				if (!empty($newfile)) {
+          @imagegif($newimg, $newfile);
         }
 				else {
 					@header("Content-type: image/gif");
 					@imagegif($newimg);
 				}
 			}
-			elseif($this->imgType=='JPG'){
-				if(!empty($newfile)){
-					@imagejpeg($newimg,$newfile);
+			elseif ($this->imgType == 'JPG') {
+				if (!empty($newfile)) {
+					@imagejpeg($newimg, $newfile);
         }
-				else	{
+				else {
 					@header("Content-type: image/jpeg");
 					@imagejpeg($newimg);
 				}
 			}
-			elseif($this->imgType=='PNG'){
-				if(!empty($newfile)){
-					@imagepng($newimg,$newfile);
+			elseif ($this->imgType == 'PNG') {
+				if (!empty($newfile)) {
+					@imagepng($newimg, $newfile);
         }
-				else{
+				else {
 					@header("Content-type: image/png");
 					@imagepng($newimg);
 				}

app/Plugin/FileUpload/Lib/Config/FileUploadSettings.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
       'jpg' => array('image/jpeg', 'image/pjpeg'),
       'jpeg' => array('image/jpeg', 'image/pjpeg'), 
       'gif' => array('image/gif'),
-      'png' => array('image/png','image/x-png'),
+      'png' => array('image/png', 'image/x-png'),
     ),
     
     /**
@@ -112,7 +112,7 @@ 
       * fields are the fields relating to the database columns
       * @var array of fields related to database columns.
       */
-    'fields' => array('name'=>'name','type'=>'type','size'=>'size'),
+    'fields' => array('name'=>'name', 'type'=>'type', 'size'=>'size'),
     
     /**
       * Component Setting Only.

app/Plugin/Search/Model/Behavior/SearchableBehavior.php

Spacing +14 added lines, -14 removed lines

@@ -42,7 +42,7 @@ 
  * @return void
  */
 	public function setup(Model $Model, $config = array()) {
-		$this->_defaults = array_merge($this->_defaults, (array)Configure::read('Search.Searchable'));
+		$this->_defaults = array_merge($this->_defaults, (array) Configure::read('Search.Searchable'));
 		$this->settings[$Model->alias] = array_merge($this->_defaults, $config);
 		if (empty($Model->filterArgs)) {
 			return;
@@ -246,12 +246,12 @@ 
 		if (empty($data[$field['name']])) {
 			return $conditions;
 		}
-		$fieldNames = (array)$field['field'];
+		$fieldNames = (array) $field['field'];
 
 		$cond = array();
 		foreach ($fieldNames as $fieldName) {
 			if (strpos($fieldName, '.') === false) {
-				$fieldName = $Model->alias . '.' . $fieldName;
+				$fieldName = $Model->alias.'.'.$fieldName;
 			}
 
 			if ($field['before'] === true) {
@@ -290,7 +290,7 @@ 
 			if (!empty($field['connectorAnd']) || !empty($field['connectorOr'])) {
 				$cond[] = $this->_connectedLike($value, $field, $fieldName);
 			} else {
-				$cond[$fieldName . " LIKE"] = $field['before'] . $value . $field['after'];
+				$cond[$fieldName." LIKE"] = $field['before'].$value.$field['after'];
 			}
 		}
 		if (count($cond) > 1) {
@@ -321,7 +321,7 @@ 
 			$andValues = String::tokenize($orValue, $field['connectorAnd']);
 			$and = array();
 			foreach ($andValues as $andValue) {
-				$and[] = array($fieldName . " LIKE" => $field['before'] . $andValue . $field['after']);
+				$and[] = array($fieldName." LIKE" => $field['before'].$andValue.$field['after']);
 			}
 
 			$or[] = array('AND' => $and);
@@ -340,13 +340,13 @@ 
  * @return array of conditions
  */
 	protected function _addCondValue(Model $Model, &$conditions, $data, $field) {
-		$fieldNames = (array)$field['field'];
+		$fieldNames = (array) $field['field'];
 		$fieldValue = isset($data[$field['name']]) ? $data[$field['name']] : null;
 
 		$cond = array();
 		foreach ($fieldNames as $fieldName) {
 			if (strpos($fieldName, '.') === false) {
-				$fieldName = $Model->alias . '.' . $fieldName;
+				$fieldName = $Model->alias.'.'.$fieldName;
 			}
 			if (is_array($fieldValue) && empty($fieldValue)) {
 				continue;
@@ -355,7 +355,7 @@ 
 				continue;
 			}
 
-			if (is_array($fieldValue) || !is_array($fieldValue) && (string)$fieldValue !== '') {
+			if (is_array($fieldValue) || !is_array($fieldValue) && (string) $fieldValue !== '') {
 				$cond[$fieldName] = $fieldValue;
 			} elseif (isset($data[$field['name']]) && !empty($field['allowEmpty'])) {
 				$schema = $Model->schema($field['name']);
@@ -392,7 +392,7 @@ 
 	protected function _addCondExpression(Model $Model, &$conditions, $data, $field) {
 		$fieldName = $field['field'];
 
-		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
+		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string) $data[$field['name']] !== ''))) {
 			$fieldValues = $Model->{$field['method']}($data, $field);
 			if (!empty($conditions[$fieldName]) && is_array($conditions[$fieldName])) {
 				$conditions[$fieldName] = array_unique(array_merge(array($conditions[$fieldName]), array($fieldValues)));
@@ -413,11 +413,11 @@ 
  * @return array of conditions modified by this method
  */
 	protected function _addCondQuery(Model $Model, &$conditions, $data, $field) {
-		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
+		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string) $data[$field['name']] !== ''))) {
 			$conditionsAdd = $Model->{$field['method']}($data, $field);
 			// if our conditions function returns something empty, nothing to merge in
 			if (!empty($conditionsAdd)) {
-				$conditions = Set::merge($conditions, (array)$conditionsAdd);
+				$conditions = Set::merge($conditions, (array) $conditionsAdd);
 			}
 		}
 		return $conditions;
@@ -434,7 +434,7 @@ 
  */
 	protected function _addCondSubquery(Model $Model, &$conditions, $data, $field) {
 		$fieldName = $field['field'];
-		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string)$data[$field['name']] !== ''))) {
+		if ((method_exists($Model, $field['method']) || $this->_checkBehaviorMethods($Model, $field['method'])) && (!empty($field['allowEmpty']) || !empty($data[$field['name']]) || (isset($data[$field['name']]) && (string) $data[$field['name']] !== ''))) {
 			$subquery = $Model->{$field['method']}($data, $field);
 			// if our subquery function returns something empty, nothing to merge in
 			if (!empty($subquery)) {
@@ -496,7 +496,7 @@ 
 						$assocData['fields'] = false;
 					}
 					if ($db->generateAssociationQuery($Model, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null) === true) {
-						$linkedModels[$type . '/' . $assoc] = true;
+						$linkedModels[$type.'/'.$assoc] = true;
 					}
 				}
 			}
@@ -516,7 +516,7 @@ 
 		if ($base === null) {
 			$base = array_fill_keys(array('conditions', 'fields', 'joins', 'order', 'limit', 'offset', 'group'), array());
 		}
-		return (array)$data + $base;
+		return (array) $data + $base;
 	}
 
 /**

app/Plugin/Search/Controller/Component/PrgComponent.php

Spacing +3 added lines, -3 removed lines

@@ -82,8 +82,8 @@ 
  */
 	public function __construct(ComponentCollection $collection, $settings) {
 		$this->_defaults = Set::merge($this->_defaults, array(
-			'commonProcess' => (array)Configure::read('Search.Prg.commonProcess'),
-			'presetForm' => (array)Configure::read('Search.Prg.presetForm'),
+			'commonProcess' => (array) Configure::read('Search.Prg.commonProcess'),
+			'presetForm' => (array) Configure::read('Search.Prg.presetForm'),
 		), $settings);
 	}
 
@@ -238,7 +238,7 @@ 
 		foreach ($this->controller->presetVars as $field) {
 			if ($field['type'] === 'checkbox') {
 				if (array_key_exists($field['field'], $data)) {
-					$values = join('|', (array)$data[$field['field']]);
+					$values = join('|', (array) $data[$field['field']]);
 				} else {
 					$values = '';
 				}

app/Plugin/Search/Test/Case/AllSearchPluginTest.php

Spacing +2 added lines, -2 removed lines

@@ -12,8 +12,8 @@
 	public static function suite() {
 		$Suite = new CakeTestSuite('All Plugin tests');
 		$path = dirname(__FILE__);
-		$Suite->addTestDirectory($path . DS . 'Controller' . DS . 'Component');
-		$Suite->addTestDirectory($path . DS . 'Model' . DS . 'Behavior');
+		$Suite->addTestDirectory($path.DS.'Controller'.DS.'Component');
+		$Suite->addTestDirectory($path.DS.'Model'.DS.'Behavior');
 		return $Suite;
 	}