Schlaefer / Saito

app/Controller/SearchesController.php

Doc Comments +3 added lines

@@ -180,6 +180,9 @@
 			return Sanitize::escape($string, $this->Entry->useDbConfig);
 		}
 
+		/**
+		 * @param string[] $params
+		 */
 		protected function _filterQuery($params) {
 			$this->request->query = array_intersect_key($this->request->query,
 					array_fill_keys($params, 1));

Indentation +186 added lines, -186 removed lines

@@ -1,188 +1,188 @@
 <?php
 
-	use Saito\SimpleSearchString;
-
-	App::uses('AppController', 'Controller');
-
-	class SearchesController extends AppController {
-
-		public $components = [
-				'Paginator',
-				'Search.Prg' => [
-					'commonProcess' => [
-						'allowedParams' => ['nstrict'],
-						'keepPassed' => true,
-						'filterEmpty' => true,
-						'paramType' => 'querystring'
-					]
-				]
-		];
-
-		public $helpers = ['Form', 'Html', 'EntryH'];
-
-		public $uses = [
-				'Entry'
-		];
-
-		protected $_paginateConfig = [
-				'limit' => 25
-		];
-
-		public function beforeFilter() {
-			parent::beforeFilter();
-			$this->Auth->allow('simple');
-		}
-
-		public function simple() {
-			$defaults = [
-					'order' => 'time'
-			];
-			$this->set('order', $defaults['order']);
-
-			// @todo pgsql
-			$db = $this->Entry->getDataSource();
-			// @codingStandardsIgnoreStart
-			// on 5.5 phpcs assumes this is the deprecated PHP MySQL extension
-			if (!($db instanceof Mysql)) {
-				// @codingStandardsIgnoreEnd
-				$this->redirect(['action' => 'advanced']);
-				return;
-			}
-
-			$minWordLength = $this->Entry->query("SHOW VARIABLES LIKE 'ft_min_word_len'")[0];
-			$minWordLength = array_shift($minWordLength)['Value'];
-			$this->set(compact('minWordLength'));
-
-			if (!isset($this->request->query['q'])) {
-				// request for empty search form
-				return;
-			}
-
-			$this->_filterQuery(['q', 'page', 'order']);
-			$qRaw = $this->request->query['q'];
-			$query = $this->request->query += $defaults;
-			$this->set(['q' => $qRaw, 'order' => $query['order']]);
-
-			// test query is valid
-			$SearchString = new SimpleSearchString($qRaw, $minWordLength);
-			$this->set('minChars', $minWordLength);
-
-			$query['q'] = $SearchString->replaceOperators();
-			$omitted = $SearchString->getOmittedWords();
-			$this->set('omittedWords', $omitted);
-
-			// sanitize search-term for manual SQL-query
-			$query['q'] = $this->_sanitize($query['q']);
-
-			// build query
-			$q = $query['q'];
-			$order = '`Entry`.`time` DESC';
-			$fields = '*';
-			if ($query['order'] === 'rank') {
-				$order = 'rating DESC, ' . $order;
-				$fields = $fields . ", (MATCH (Entry.subject) AGAINST ('$q' IN BOOLEAN MODE)*2) + (MATCH (Entry.text) AGAINST ('$q' IN BOOLEAN MODE)) + (MATCH (Entry.name) AGAINST ('$q' IN BOOLEAN MODE)*4) AS rating";
-			}
-
-			// query
-			$this->Paginator->settings = [
-					'fields' => $fields,
-					'conditions' => [
-							"MATCH (Entry.subject, Entry.text, Entry.name) AGAINST ('$q' IN BOOLEAN MODE)",
-							'Entry.category_id' => $this->CurrentUser->Categories->getAllowed()
-					],
-					'order' => $order,
-					'paramType' => 'querystring'
-			];
-			$this->Paginator->settings += $this->_paginateConfig;
-			$results = $this->Paginator->paginate('Entry');
-			$this->set('results', $results);
-		}
-
-		/**
-		 * @throws NotFoundException
-		 * @throws BadRequestException
-		 */
-		public function advanced() {
-			// year for date drop-down
-			$first = $this->Entry->find('first',
-					['contain' => false, 'order' => 'Entry.id ASC']);
-			if ($first !== false) {
-				$startDate = strtotime($first['Entry']['time']);
-			} else {
-				$startDate = time();
-			}
-			$this->set('start_year', date('Y', $startDate));
-
-			// category drop-down
-			$categories = $this->CurrentUser->Categories->getAllowed('list');
-			$this->set('categories', $categories);
-
-			// calculate current month and year
-			if (isset($this->request->query['month'])) {
-				$month = $this->request->query['month'];
-				$year = $this->request->query['year'];
-			} else {
-				$month = date('n', $startDate);
-				$year = date('Y', $startDate);
-			}
-
-			$this->Prg->commonProcess();
-			$query = $this->Prg->parsedParams();
-
-			if (!empty($query['subject']) || !empty($query['text']) ||
-					!empty($query['name'])
-			) {
-				// strict username search: set before parseCriteria
-				if (!empty($this->request->query['nstrict'])) {
-					// presetVars controller var isn't working in Search v2.3
-					$this->Entry->filterArgs['name']['type'] = 'value';
-				}
-
-				$settings = [
-								'conditions' => $this->Entry->parseCriteria($query),
-								'order' => ['Entry.time' => 'DESC'],
-								'paramType' => 'querystring'
-						] + $this->_paginateConfig;
-
-				$time = mktime(0, 0, 0, $month, 1, $year);
-				if (!$time) {
-					throw new BadRequestException;
-				}
-				$settings['conditions']['time >'] = date(
-						'Y-m-d H:i:s',
-						mktime(0, 0, 0, $month, 1, $year));
-
-				if (isset($query['category_id']) && (int)$query['category_id'] !== 0) {
-					if (!isset($categories[(int)$query['category_id']])) {
-						throw new NotFoundException;
-					}
-				} else {
-					$settings['conditions']['Entry.category_id'] = $this->CurrentUser
-						->Categories->getAllowed();
-				}
-				$this->Paginator->settings = $settings;
-				unset(
-					$this->request->query['direction'],
-					$this->request->query['sort']
-				);
-				$this->set('results',
-					$this->Paginator->paginate(null, null, ['Entry.time']));
-			}
-
-			if (!isset($query['category_id'])) {
-				$this->request->data['Entry']['category_id'] = 0;
-			}
-
-			$this->set(compact('month', 'year'));
-		}
-
-		protected function _sanitize($string) {
-			return Sanitize::escape($string, $this->Entry->useDbConfig);
-		}
-
-		protected function _filterQuery($params) {
-			$this->request->query = array_intersect_key($this->request->query,
-					array_fill_keys($params, 1));
-		}
-
-	}
+    use Saito\SimpleSearchString;
+
+    App::uses('AppController', 'Controller');
+
+    class SearchesController extends AppController {
+
+        public $components = [
+                'Paginator',
+                'Search.Prg' => [
+                    'commonProcess' => [
+                        'allowedParams' => ['nstrict'],
+                        'keepPassed' => true,
+                        'filterEmpty' => true,
+                        'paramType' => 'querystring'
+                    ]
+                ]
+        ];
+
+        public $helpers = ['Form', 'Html', 'EntryH'];
+
+        public $uses = [
+                'Entry'
+        ];
+
+        protected $_paginateConfig = [
+                'limit' => 25
+        ];
+
+        public function beforeFilter() {
+            parent::beforeFilter();
+            $this->Auth->allow('simple');
+        }
+
+        public function simple() {
+            $defaults = [
+                    'order' => 'time'
+            ];
+            $this->set('order', $defaults['order']);
+
+            // @todo pgsql
+            $db = $this->Entry->getDataSource();
+            // @codingStandardsIgnoreStart
+            // on 5.5 phpcs assumes this is the deprecated PHP MySQL extension
+            if (!($db instanceof Mysql)) {
+                // @codingStandardsIgnoreEnd
+                $this->redirect(['action' => 'advanced']);
+                return;
+            }
+
+            $minWordLength = $this->Entry->query("SHOW VARIABLES LIKE 'ft_min_word_len'")[0];
+            $minWordLength = array_shift($minWordLength)['Value'];
+            $this->set(compact('minWordLength'));
+
+            if (!isset($this->request->query['q'])) {
+                // request for empty search form
+                return;
+            }
+
+            $this->_filterQuery(['q', 'page', 'order']);
+            $qRaw = $this->request->query['q'];
+            $query = $this->request->query += $defaults;
+            $this->set(['q' => $qRaw, 'order' => $query['order']]);
+
+            // test query is valid
+            $SearchString = new SimpleSearchString($qRaw, $minWordLength);
+            $this->set('minChars', $minWordLength);
+
+            $query['q'] = $SearchString->replaceOperators();
+            $omitted = $SearchString->getOmittedWords();
+            $this->set('omittedWords', $omitted);
+
+            // sanitize search-term for manual SQL-query
+            $query['q'] = $this->_sanitize($query['q']);
+
+            // build query
+            $q = $query['q'];
+            $order = '`Entry`.`time` DESC';
+            $fields = '*';
+            if ($query['order'] === 'rank') {
+                $order = 'rating DESC, ' . $order;
+                $fields = $fields . ", (MATCH (Entry.subject) AGAINST ('$q' IN BOOLEAN MODE)*2) + (MATCH (Entry.text) AGAINST ('$q' IN BOOLEAN MODE)) + (MATCH (Entry.name) AGAINST ('$q' IN BOOLEAN MODE)*4) AS rating";
+            }
+
+            // query
+            $this->Paginator->settings = [
+                    'fields' => $fields,
+                    'conditions' => [
+                            "MATCH (Entry.subject, Entry.text, Entry.name) AGAINST ('$q' IN BOOLEAN MODE)",
+                            'Entry.category_id' => $this->CurrentUser->Categories->getAllowed()
+                    ],
+                    'order' => $order,
+                    'paramType' => 'querystring'
+            ];
+            $this->Paginator->settings += $this->_paginateConfig;
+            $results = $this->Paginator->paginate('Entry');
+            $this->set('results', $results);
+        }
+
+        /**
+         * @throws NotFoundException
+         * @throws BadRequestException
+         */
+        public function advanced() {
+            // year for date drop-down
+            $first = $this->Entry->find('first',
+                    ['contain' => false, 'order' => 'Entry.id ASC']);
+            if ($first !== false) {
+                $startDate = strtotime($first['Entry']['time']);
+            } else {
+                $startDate = time();
+            }
+            $this->set('start_year', date('Y', $startDate));
+
+            // category drop-down
+            $categories = $this->CurrentUser->Categories->getAllowed('list');
+            $this->set('categories', $categories);
+
+            // calculate current month and year
+            if (isset($this->request->query['month'])) {
+                $month = $this->request->query['month'];
+                $year = $this->request->query['year'];
+            } else {
+                $month = date('n', $startDate);
+                $year = date('Y', $startDate);
+            }
+
+            $this->Prg->commonProcess();
+            $query = $this->Prg->parsedParams();
+
+            if (!empty($query['subject']) || !empty($query['text']) ||
+                    !empty($query['name'])
+            ) {
+                // strict username search: set before parseCriteria
+                if (!empty($this->request->query['nstrict'])) {
+                    // presetVars controller var isn't working in Search v2.3
+                    $this->Entry->filterArgs['name']['type'] = 'value';
+                }
+
+                $settings = [
+                                'conditions' => $this->Entry->parseCriteria($query),
+                                'order' => ['Entry.time' => 'DESC'],
+                                'paramType' => 'querystring'
+                        ] + $this->_paginateConfig;
+
+                $time = mktime(0, 0, 0, $month, 1, $year);
+                if (!$time) {
+                    throw new BadRequestException;
+                }
+                $settings['conditions']['time >'] = date(
+                        'Y-m-d H:i:s',
+                        mktime(0, 0, 0, $month, 1, $year));
+
+                if (isset($query['category_id']) && (int)$query['category_id'] !== 0) {
+                    if (!isset($categories[(int)$query['category_id']])) {
+                        throw new NotFoundException;
+                    }
+                } else {
+                    $settings['conditions']['Entry.category_id'] = $this->CurrentUser
+                        ->Categories->getAllowed();
+                }
+                $this->Paginator->settings = $settings;
+                unset(
+                    $this->request->query['direction'],
+                    $this->request->query['sort']
+                );
+                $this->set('results',
+                    $this->Paginator->paginate(null, null, ['Entry.time']));
+            }
+
+            if (!isset($query['category_id'])) {
+                $this->request->data['Entry']['category_id'] = 0;
+            }
+
+            $this->set(compact('month', 'year'));
+        }
+
+        protected function _sanitize($string) {
+            return Sanitize::escape($string, $this->Entry->useDbConfig);
+        }
+
+        protected function _filterQuery($params) {
+            $this->request->query = array_intersect_key($this->request->query,
+                    array_fill_keys($params, 1));
+        }
+
+    }

app/Lib/Saito/Test/AssertTrait.php

Doc Comments +3 added lines

@@ -18,6 +18,9 @@
 			return $this->assertEquals($count, $length, "Failed XPath. Expected '$path' to be found $count times instead of $length.");
 		}
 
+		/**
+		 * @param string $path
+		 */
 		public function assertNotXPath($html, $path) {
 			return !$this->assertXPath($html, $path, 0);
 		}

Indentation +27 added lines, -27 removed lines

@@ -1,34 +1,34 @@
 <?php
 
-	namespace Saito\Test;
+    namespace Saito\Test;
 
-	trait AssertTrait {
+    trait AssertTrait {
 
-		/**
-		 * tests if XPath exists in HTML Source
-		 *
-		 * @param $html HTML
-		 * @param $path XPath
-		 * @param int $count how many times should XPath exist in HTML
-		 * @return mixed
-		 */
-		public function assertXPath($html, $path, $count = 1) {
-			$xpath = $this->_getDOMXPath($html);
-			$length = $xpath->query($path)->length;
-			return $this->assertEquals($count, $length, "Failed XPath. Expected '$path' to be found $count times instead of $length.");
-		}
+        /**
+         * tests if XPath exists in HTML Source
+         *
+         * @param $html HTML
+         * @param $path XPath
+         * @param int $count how many times should XPath exist in HTML
+         * @return mixed
+         */
+        public function assertXPath($html, $path, $count = 1) {
+            $xpath = $this->_getDOMXPath($html);
+            $length = $xpath->query($path)->length;
+            return $this->assertEquals($count, $length, "Failed XPath. Expected '$path' to be found $count times instead of $length.");
+        }
 
-		public function assertNotXPath($html, $path) {
-			return !$this->assertXPath($html, $path, 0);
-		}
+        public function assertNotXPath($html, $path) {
+            return !$this->assertXPath($html, $path, 0);
+        }
 
-		protected function _getDOMXPath($html) {
-			$document = new \DOMDocument;
-			libxml_use_internal_errors(true);
-			$document->loadHTML('<!DOCTYPE html>' . $html);
-			$xpath = new \DOMXPath($document);
-			libxml_clear_errors();
-			return $xpath;
-		}
+        protected function _getDOMXPath($html) {
+            $document = new \DOMDocument;
+            libxml_use_internal_errors(true);
+            $document->loadHTML('<!DOCTYPE html>' . $html);
+            $xpath = new \DOMXPath($document);
+            libxml_clear_errors();
+            return $xpath;
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

app/Lib/Saito/Test/ControllerTestCase.php

Doc Comments +9 added lines

@@ -48,6 +48,9 @@ 
 			unset($_ENV['HTTP_X_REQUESTED_WITH']);
 		}
 
+		/**
+		 * @param string $agent
+		 */
 		protected function _setUserAgent($agent) {
 			if (isset($this->_env['HTTP_USER_AGENT'])) {
 				$this->_env['HTTP_USER_AGENT'] = $_ENV['HTTP_USER_AGENT'];
@@ -63,6 +66,9 @@ 
 			}
 		}
 
+		/**
+		 * @param integer $id
+		 */
 		protected function _loginUser($id) {
 			// see: http://stackoverflow.com/a/10411128/1372085
 			$this->_logoutUser();
@@ -100,6 +106,9 @@ 
 			endif;
 		}
 
+		/**
+		 * @param string $name
+		 */
 		protected function _notImplementedOnDatasource($name) {
 			$mc = $this->controller->modelClass;
 			$Ds = $this->controller->{$mc}->getDataSource();

Indentation +125 added lines, -125 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-	namespace Saito\Test;
+    namespace Saito\Test;
 
-	/*
+    /*
 	fixes early output in PHPUnit 3.7:
 
 		$this->printer->write(
@@ -11,128 +11,128 @@ 
 
 	that prevents session setting in HTML test-run
 	*/
-	ob_start();
-
-	// load fixture
-	\App::uses('UserFixture', 'Fixture');
-
-	// sets the FULL_BASE_URL for CLI tests
-	if (!defined('FULL_BASE_URL')) {
-		define('FULL_BASE_URL', 'http://cakephp.org/');
-	}
-	\Configure::write('App.fullBaseURL', FULL_BASE_URL);
-
-
-	class ControllerTestCase extends \ControllerTestCase {
-
-		use AssertTrait;
-
-		/**
-		 * @var array cache environment variables
-		 */
-		protected $_env = [];
-
-		protected function _setJson() {
-			$_SERVER['HTTP_ACCEPT'] = 'application/json, text/javascript';
-		}
-
-		protected function _unsetJson() {
-			$_SERVER['HTTP_ACCEPT'] = "text/html,application/xhtml+xml,application/xml";
-		}
-
-		protected function _setAjax() {
-			$_ENV['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
-		}
-
-		protected function _unsetAjax() {
-			unset($_ENV['HTTP_X_REQUESTED_WITH']);
-		}
-
-		protected function _setUserAgent($agent) {
-			if (isset($this->_env['HTTP_USER_AGENT'])) {
-				$this->_env['HTTP_USER_AGENT'] = $_ENV['HTTP_USER_AGENT'];
-			}
-			$_ENV['HTTP_USER_AGENT'] = $agent;
-		}
-
-		protected function _unsetUserAgent() {
-			if (isset($this->_env['HTTP_USER_AGENT'])) {
-				$_ENV['HTTP_USER_AGENT'] = $this->_env('HTTP_USER_AGENT');
-			} else {
-				unset($_ENV['HTTP_USER_AGENT']);
-			}
-		}
-
-		protected function _loginUser($id) {
-			// see: http://stackoverflow.com/a/10411128/1372085
-			$this->_logoutUser();
-			$userFixture = new \UserFixture();
-			$users = $userFixture->records;
-
-			$this->controller->Session->write('Auth.User', $users[$id - 1]);
-		}
-
-		protected function _debugEmail() {
-			\Configure::write('Saito.Debug.email', true);
-		}
-
-		protected function _resetEmail() {
-			\Configure::write('Saito.Debug.email', false);
-		}
-
-		public function assertRedirectedTo($url = '') {
-			$this->assertEquals(
-				$this->headers['Location'],
-				\Router::fullBaseUrl() . $this->controller->request->webroot . $url
-			);
-		}
-
-		protected function _logoutUser() {
-			// if user is logged-in it should interfere with test runs
-			if (isset($_COOKIE['SaitoPersistent'])) :
-				unset($_COOKIE['SaitoPersistent']);
-			endif;
-			if (isset($_COOKIE['Saito'])) :
-				unset($_COOKIE['Saito']);
-			endif;
-			if (isset($this->controller->Session) && !empty($this->controller->Session)) :
-				$this->controller->Session->delete('Auth.User');
-			endif;
-		}
-
-		protected function _notImplementedOnDatasource($name) {
-			$mc = $this->controller->modelClass;
-			$Ds = $this->controller->{$mc}->getDataSource();
-			$this->_DsName = get_class($Ds);
-			if ($this->_DsName === $name) {
-				$this->markTestIncomplete("Datasource is $name.");
-			}
-		}
-
-		public function endTest($method) {
-			parent::endTest($method);
-			$this->_logoutUser();
-			$this->_unsetAjax();
-		}
-
-		public function setUp() {
-			parent::setUp();
-			$this->_logoutUser();
-			$this->_unsetAjax();
-			$this->_unsetJson();
-			$this->_debugEmail();
-			\Configure::write('Cache.disable', true);
-			\Configure::write('Config.language', 'eng');
-		}
-
-		public function tearDown() {
-			\Configure::write('Cache.disable', false);
-			$this->_unsetUserAgent();
-			$this->_resetEmail();
-			$this->_logoutUser();
-			parent::tearDown();
-		}
-
-	}
+    ob_start();
+
+    // load fixture
+    \App::uses('UserFixture', 'Fixture');
+
+    // sets the FULL_BASE_URL for CLI tests
+    if (!defined('FULL_BASE_URL')) {
+        define('FULL_BASE_URL', 'http://cakephp.org/');
+    }
+    \Configure::write('App.fullBaseURL', FULL_BASE_URL);
+
+
+    class ControllerTestCase extends \ControllerTestCase {
+
+        use AssertTrait;
+
+        /**
+         * @var array cache environment variables
+         */
+        protected $_env = [];
+
+        protected function _setJson() {
+            $_SERVER['HTTP_ACCEPT'] = 'application/json, text/javascript';
+        }
+
+        protected function _unsetJson() {
+            $_SERVER['HTTP_ACCEPT'] = "text/html,application/xhtml+xml,application/xml";
+        }
+
+        protected function _setAjax() {
+            $_ENV['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+        }
+
+        protected function _unsetAjax() {
+            unset($_ENV['HTTP_X_REQUESTED_WITH']);
+        }
+
+        protected function _setUserAgent($agent) {
+            if (isset($this->_env['HTTP_USER_AGENT'])) {
+                $this->_env['HTTP_USER_AGENT'] = $_ENV['HTTP_USER_AGENT'];
+            }
+            $_ENV['HTTP_USER_AGENT'] = $agent;
+        }
+
+        protected function _unsetUserAgent() {
+            if (isset($this->_env['HTTP_USER_AGENT'])) {
+                $_ENV['HTTP_USER_AGENT'] = $this->_env('HTTP_USER_AGENT');
+            } else {
+                unset($_ENV['HTTP_USER_AGENT']);
+            }
+        }
+
+        protected function _loginUser($id) {
+            // see: http://stackoverflow.com/a/10411128/1372085
+            $this->_logoutUser();
+            $userFixture = new \UserFixture();
+            $users = $userFixture->records;
+
+            $this->controller->Session->write('Auth.User', $users[$id - 1]);
+        }
+
+        protected function _debugEmail() {
+            \Configure::write('Saito.Debug.email', true);
+        }
+
+        protected function _resetEmail() {
+            \Configure::write('Saito.Debug.email', false);
+        }
+
+        public function assertRedirectedTo($url = '') {
+            $this->assertEquals(
+                $this->headers['Location'],
+                \Router::fullBaseUrl() . $this->controller->request->webroot . $url
+            );
+        }
+
+        protected function _logoutUser() {
+            // if user is logged-in it should interfere with test runs
+            if (isset($_COOKIE['SaitoPersistent'])) :
+                unset($_COOKIE['SaitoPersistent']);
+            endif;
+            if (isset($_COOKIE['Saito'])) :
+                unset($_COOKIE['Saito']);
+            endif;
+            if (isset($this->controller->Session) && !empty($this->controller->Session)) :
+                $this->controller->Session->delete('Auth.User');
+            endif;
+        }
+
+        protected function _notImplementedOnDatasource($name) {
+            $mc = $this->controller->modelClass;
+            $Ds = $this->controller->{$mc}->getDataSource();
+            $this->_DsName = get_class($Ds);
+            if ($this->_DsName === $name) {
+                $this->markTestIncomplete("Datasource is $name.");
+            }
+        }
+
+        public function endTest($method) {
+            parent::endTest($method);
+            $this->_logoutUser();
+            $this->_unsetAjax();
+        }
+
+        public function setUp() {
+            parent::setUp();
+            $this->_logoutUser();
+            $this->_unsetAjax();
+            $this->_unsetJson();
+            $this->_debugEmail();
+            \Configure::write('Cache.disable', true);
+            \Configure::write('Config.language', 'eng');
+        }
+
+        public function tearDown() {
+            \Configure::write('Cache.disable', false);
+            $this->_unsetUserAgent();
+            $this->_resetEmail();
+            $this->_logoutUser();
+            parent::tearDown();
+        }
+
+    }
 
 

app/Lib/Saito/Test/SecurityMockTrait.php

Doc Comments +3 added lines

@@ -4,6 +4,9 @@
 
 	trait SecurityMockTrait {
 
+		/**
+		 * @param string $controller
+		 */
 		public function generate($controller, $mocks = []) {
 			$byPassSecurity = false;
 			if (!isset($mocks['components']['Security'])) {

Indentation +28 added lines, -28 removed lines

@@ -1,34 +1,34 @@
 <?php
 
-	namespace Saito\Test;
+    namespace Saito\Test;
 
-	trait SecurityMockTrait {
+    trait SecurityMockTrait {
 
-		public function generate($controller, $mocks = []) {
-			$byPassSecurity = false;
-			if (!isset($mocks['components']['Security'])) {
-				$byPassSecurity = true;
-				$mocks['components']['Security'] = ['_validateCsrf', '_validatePost'];
-			}
-			$Mock = parent::generate($controller, $mocks);
-			if ($byPassSecurity) {
-				$this->assertSecurityByPass($Mock);
-			}
-			return $Mock;
-		}
+        public function generate($controller, $mocks = []) {
+            $byPassSecurity = false;
+            if (!isset($mocks['components']['Security'])) {
+                $byPassSecurity = true;
+                $mocks['components']['Security'] = ['_validateCsrf', '_validatePost'];
+            }
+            $Mock = parent::generate($controller, $mocks);
+            if ($byPassSecurity) {
+                $this->assertSecurityByPass($Mock);
+            }
+            return $Mock;
+        }
 
-		/**
-		 * Assume that SecurityComponent was called
-		 *
-		 * @param $Controller
-		 */
-		public function assertSecurityBypass($Controller) {
-			$Controller->Security->expects($this->any())
-				->method('_validatePost')
-				->will($this->returnValue(true));
-			$Controller->Security->expects($this->any())
-				->method('_validateCsrf')
-				->will($this->returnValue(true));
-		}
+        /**
+         * Assume that SecurityComponent was called
+         *
+         * @param $Controller
+         */
+        public function assertSecurityBypass($Controller) {
+            $Controller->Security->expects($this->any())
+                ->method('_validatePost')
+                ->will($this->returnValue(true));
+            $Controller->Security->expects($this->any())
+                ->method('_validateCsrf')
+                ->will($this->returnValue(true));
+        }
 
-	}
+    }

app/Model/UserIgnore.php

Doc Comments +12 added lines, -2 removed lines

@@ -29,6 +29,10 @@ 
 		 */
 		public $duration = 8035200;
 
+		/**
+		 * @param integer $userId
+		 * @param integer $blockedUserId
+		 */
 		public function ignore($userId, $blockedUserId) {
 			$exists = $this->_get($userId, $blockedUserId);
 			if ($exists) {
@@ -62,6 +66,9 @@ 
 			]);
 		}
 
+		/**
+		 * @param integer $id
+		 */
 		public function ignoredBy($id) {
 			return $this->find(
 				'all',
@@ -72,6 +79,9 @@ 
 			);
 		}
 
+		/**
+		 * @param integer $userId
+		 */
 		public function deleteUser($userId) {
 			$success = $this->deleteAll(['user_id' => $userId], false);
 			$success = $success && $this->deleteAll(['blocked_user_id' => $userId], false);
@@ -81,8 +91,8 @@ 
 		/**
 		 * counts how many users ignore the user with ID $id
 		 *
-		 * @param $id
-		 * @return array
+		 * @param integer $id
+		 * @return integer
 		 */
 		public function countIgnored($id) {
 			return count($this->getIgnored($id));

Indentation +92 added lines, -92 removed lines

@@ -1,108 +1,108 @@
 <?php
 
-	App::uses('AppModel', 'Model');
+    App::uses('AppModel', 'Model');
 
-	class UserIgnore extends AppModel {
+    class UserIgnore extends AppModel {
 
-		public $actsAs = [
-			'Containable',
-			'Cron.Cron' => [
-					'removeOld' => [
-							'id' => 'UserIgnore.removeOld',
-							'due' => 'daily',
-					]
-			]
-		];
+        public $actsAs = [
+            'Containable',
+            'Cron.Cron' => [
+                    'removeOld' => [
+                            'id' => 'UserIgnore.removeOld',
+                            'due' => 'daily',
+                    ]
+            ]
+        ];
 
-		public $belongsTo = [
-			'User' => [
-				'className' => 'User',
-				'counterCache' => true,
-				'fields' => ['id', 'username'],
-				'foreignKey' => 'blocked_user_id',
-				'order' => ['User.username' => 'asc']
-			]
-		];
+        public $belongsTo = [
+            'User' => [
+                'className' => 'User',
+                'counterCache' => true,
+                'fields' => ['id', 'username'],
+                'foreignKey' => 'blocked_user_id',
+                'order' => ['User.username' => 'asc']
+            ]
+        ];
 
-		/**
-		 * @var int 3 months
-		 */
-		public $duration = 8035200;
+        /**
+         * @var int 3 months
+         */
+        public $duration = 8035200;
 
-		public function ignore($userId, $blockedUserId) {
-			$exists = $this->_get($userId, $blockedUserId);
-			if ($exists) {
-				return;
-			}
-			$this->create();
-			$this->save([
-				'user_id' => $userId,
-				'blocked_user_id' => $blockedUserId,
-				'timestamp' => bDate()
-			]);
+        public function ignore($userId, $blockedUserId) {
+            $exists = $this->_get($userId, $blockedUserId);
+            if ($exists) {
+                return;
+            }
+            $this->create();
+            $this->save([
+                'user_id' => $userId,
+                'blocked_user_id' => $blockedUserId,
+                'timestamp' => bDate()
+            ]);
 
-			$this->_dispatchEvent('Event.Saito.User.afterIgnore', [
-				'blockedUserId' => $blockedUserId,
-				'userId' => $userId
-			]);
-		}
+            $this->_dispatchEvent('Event.Saito.User.afterIgnore', [
+                'blockedUserId' => $blockedUserId,
+                'userId' => $userId
+            ]);
+        }
 
-		public function unignore($userId, $blockedId) {
-			$entry = $this->_get($userId, $blockedId);
-			if (empty($entry)) {
-				return;
-			}
-			$this->delete($entry['Ignore']['id']);
-		}
+        public function unignore($userId, $blockedId) {
+            $entry = $this->_get($userId, $blockedId);
+            if (empty($entry)) {
+                return;
+            }
+            $this->delete($entry['Ignore']['id']);
+        }
 
-		protected function _get($userId, $blockedId) {
-			return $this->find('first', [
-				'contain' => false,
-				'conditions' => ['user_id' => $userId, 'blocked_user_id' => $blockedId]
-			]);
-		}
+        protected function _get($userId, $blockedId) {
+            return $this->find('first', [
+                'contain' => false,
+                'conditions' => ['user_id' => $userId, 'blocked_user_id' => $blockedId]
+            ]);
+        }
 
-		public function ignoredBy($id) {
-			return $this->find(
-				'all',
-				[
-					'contain' => ['User'],
-					'conditions' => ['user_id' => $id]
-				]
-			);
-		}
+        public function ignoredBy($id) {
+            return $this->find(
+                'all',
+                [
+                    'contain' => ['User'],
+                    'conditions' => ['user_id' => $id]
+                ]
+            );
+        }
 
-		public function deleteUser($userId) {
-			$success = $this->deleteAll(['user_id' => $userId], false);
-			$success = $success && $this->deleteAll(['blocked_user_id' => $userId], false);
-			return $success;
-		}
+        public function deleteUser($userId) {
+            $success = $this->deleteAll(['user_id' => $userId], false);
+            $success = $success && $this->deleteAll(['blocked_user_id' => $userId], false);
+            return $success;
+        }
 
-		/**
-		 * counts how many users ignore the user with ID $id
-		 *
-		 * @param $id
-		 * @return array
-		 */
-		public function countIgnored($id) {
-			return count($this->getIgnored($id));
-		}
+        /**
+         * counts how many users ignore the user with ID $id
+         *
+         * @param $id
+         * @return array
+         */
+        public function countIgnored($id) {
+            return count($this->getIgnored($id));
+        }
 
-		public function getIgnored($id) {
-			return $this->find(
-				'all',
-				[
-					'contain' => false,
-					'conditions' => ['blocked_user_id' => $id]
-				]
-			);
-		}
+        public function getIgnored($id) {
+            return $this->find(
+                'all',
+                [
+                    'contain' => false,
+                    'conditions' => ['blocked_user_id' => $id]
+                ]
+            );
+        }
 
-		public function removeOld() {
-			$this->deleteAll([
-					'timestamp <' => bDate(time() - $this->duration)
-				],
-				false);
-		}
+        public function removeOld() {
+            $this->deleteAll([
+                    'timestamp <' => bDate(time() - $this->duration)
+                ],
+                false);
+        }
 
-	}
+    }

app/Plugin/Embedly/Vendor/Embedly.php

Doc Comments +3 added lines, -3 removed lines

@@ -169,7 +169,7 @@ 
     /**
      *
      * @param string $version
-     * @param array $action
+     * @param string $action
      * @param array $params
      * @return object
      */
@@ -291,7 +291,7 @@ 
     /**
      *
      * @param resource $ch
-     * @param array $headers
+     * @param string[] $headers
      * @return void
      */
     protected function setCurlOptions(&$ch, $headers = array())
@@ -333,7 +333,7 @@ 
 
     /**
      *
-     * @param stdClass $o
+     * @param \stdClass $o
      * @return string
      */
     public static function reg_imploder(\stdClass $o)

Indentation +4 added lines, -4 removed lines

@@ -274,10 +274,10 @@
      * @return string
      */
     public function services_regex() {
-    	$services = $this->services();
-    	$regexes = array_map(array(__CLASS__, 'reg_imploder'), $services);
-    	return '#'.implode('|', $regexes).'#i';
-	}
+        $services = $this->services();
+        $regexes = array_map(array(__CLASS__, 'reg_imploder'), $services);
+        return '#'.implode('|', $regexes).'#i';
+    }
 
     /**
      *

Spacing +3 added lines, -3 removed lines

@@ -202,7 +202,7 @@ 
                 if (!$match) {
                     //print("rejecting $url");
                     unset($params['urls'][$i]);
-                    $rejects[$i] = (object)array(
+                    $rejects[$i] = (object) array(
                         'error_code' => '401',
                         'error_message' => 'This service requires an Embedly key',
                         'type' => 'error'
@@ -243,7 +243,7 @@ 
             array_push($merged_result, $obj);
         }
 
-        if($justone) {
+        if ($justone) {
             return array_shift($merged_result);
         }
 
@@ -365,7 +365,7 @@ 
      */
     public static function paramify($input)
     {
-        if(is_string($input)) {
+        if (is_string($input)) {
             return array('urls' => $input);
         }
 

app/Plugin/FileUpload/Vendor/uploader.php

Doc Comments +3 added lines, -2 removed lines

@@ -94,6 +94,7 @@ 
     * Preform requested target patch checks depending on the unique setting
     *
     * @var string chosen filename target_path
+    * @param string $target_path
     * @return string of resulting target_path
     * @access private
     */
@@ -217,7 +218,7 @@ 
   /**
     * Checks if there is a file uploaded
     *
-    * @return void
+    * @return boolean
     * @access public
     * @param file array of uploaded file (optional)
     */
@@ -293,7 +294,7 @@ 
   }
 
   /**
-    * @return boolean true if errors were detected.
+    * @return integer true if errors were detected.
     */
   function hasErrors(){
     return count($this->errors);

Indentation +218 added lines, -218 removed lines

@@ -1,40 +1,40 @@ 
 <?php
 /**
-  * Uploader class handles a single file to be uploaded to the file system
-  *
-  * @author: Nick Baker
-  * @version: since 6.0.0
-  * @link: http://www.webtechnick.com
-  */
+ * Uploader class handles a single file to be uploaded to the file system
+ *
+ * @author: Nick Baker
+ * @version: since 6.0.0
+ * @link: http://www.webtechnick.com
+ */
 class Uploader {
 
-  /**
-    * File to upload.
-    */
-  var $file = array();
+    /**
+     * File to upload.
+     */
+    var $file = array();
 
-  /**
-    * Global options
-    * fileTypes to allow to upload
-    */
-  var $options = array();
+    /**
+     * Global options
+     * fileTypes to allow to upload
+     */
+    var $options = array();
 
-  /**
-    * errors holds any errors that occur as string values.
-    * this can be access to debug the FileUploadComponent
-    *
-    * @var array
-    * @access public
-    */
-  var $errors = array();
+    /**
+     * errors holds any errors that occur as string values.
+     * this can be access to debug the FileUploadComponent
+     *
+     * @var array
+     * @access public
+     */
+    var $errors = array();
 
-  /**
-    * Definitions of errors that could occur during upload
-    *
-    * @author Jon Langevin
-    * @var array
-    */
-  var $uploadErrors = array(
+    /**
+     * Definitions of errors that could occur during upload
+     *
+     * @author Jon Langevin
+     * @var array
+     */
+    var $uploadErrors = array(
     UPLOAD_ERR_OK => 'There is no error, the file uploaded with success.',
     UPLOAD_ERR_INI_SIZE => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     UPLOAD_ERR_FORM_SIZE => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -43,87 +43,87 @@ 
     UPLOAD_ERR_NO_TMP_DIR => 'Missing a temporary folder.', //Introduced in PHP 4.3.10 and PHP 5.0.3.
     UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk.', //Introduced in PHP 5.1.0.
     UPLOAD_ERR_EXTENSION => 'File upload stopped by extension.' //Introduced in PHP 5.2.0.
-  );
+    );
 
-  /**
-    * Final file is set on move_uploaded_file success.
-    * This is the file name of the final file that was uploaded
-    * to the uploadDir directory
-    *
-    * @var string of final file name uploaded
-    * @access public
-    */
-  var $finalFile = null;
+    /**
+     * Final file is set on move_uploaded_file success.
+     * This is the file name of the final file that was uploaded
+     * to the uploadDir directory
+     *
+     * @var string of final file name uploaded
+     * @access public
+     */
+    var $finalFile = null;
 
-  function __construct($options = array()){
+    function __construct($options = array()){
     $this->options = array_merge($this->options, $options);
-  }
+    }
 
-  /**
-    * Preform requested callbacks on the filename.
-    *
-    * @var string chosen filename
-    * @return string of resulting filename
-    * @access private
-    */
-  function __handleFileNameCallback($fileName){
+    /**
+     * Preform requested callbacks on the filename.
+     *
+     * @var string chosen filename
+     * @return string of resulting filename
+     * @access private
+     */
+    function __handleFileNameCallback($fileName){
     if($this->options['fileNameFunction']){
-      if($this->options['fileModel']){
+        if($this->options['fileModel']){
         $Model = ClassRegistry::init($this->options['fileModel']);
         if(method_exists($Model, $this->options['fileNameFunction'])){
-          $fileName = $Model->{$this->options['fileNameFunction']}($fileName);
+            $fileName = $Model->{$this->options['fileNameFunction']}($fileName);
         }
         elseif(function_exists($this->options['fileNameFunction'])){
-          $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
+            $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
+        }
         }
-      }
-      else {
+        else {
         if(function_exists($this->options['fileNameFunction'])){
-          $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
+            $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
+        }
         }
-      }
 
-      if(!$fileName){
+        if(!$fileName){
         $this->_error('No filename resulting after parsing. Function: ' . $this->options['fileNameFunction']);
-      }
+        }
     }
     return $fileName;
-  }
+    }
 
-  /**
-    * Preform requested target patch checks depending on the unique setting
-    *
-    * @var string chosen filename target_path
-    * @return string of resulting target_path
-    * @access private
-    */
-  function __handleUnique($target_path){
+    /**
+     * Preform requested target patch checks depending on the unique setting
+     *
+     * @var string chosen filename target_path
+     * @return string of resulting target_path
+     * @access private
+     */
+    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)){
+        $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++;
-      }
-		}
+        }
+        }
     return $target_path;
-  }
+    }
 
-  /**
-    * processFile will take a file, or use the current file given to it
-    * and attempt to save the file to the file system.
-    * processFile will check to make sure the file is there, and its type is allowed to be saved.
-    *
-    * @param file array of uploaded file (optional)
-    * @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){
+    /**
+     * processFile will take a file, or use the current file given to it
+     * and attempt to save the file to the file system.
+     * processFile will check to make sure the file is there, and its type is allowed to be saved.
+     *
+     * @param file array of uploaded file (optional)
+     * @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){
     $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()){
-      return false;
+        return false;
     }
 
     //make sure the file doesn't already exist, if it does, add an itteration to it
@@ -131,143 +131,143 @@ 
     $fileName = $this->__handleFileNameCallback($this->file['name']);
     //if callback returns false hault the upload
     if(!$fileName){
-      return false;
+        return false;
     }
     $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)){
-      $this->finalFile = basename($target_path);
-      return $this->finalFile;
+        $this->finalFile = basename($target_path);
+        return $this->finalFile;
     }
     else{
-      $this->_error('Unable to save temp file to file system.');
-      return false;
+        $this->_error('Unable to save temp file to file system.');
+        return false;
+    }
     }
-  }
 
-  /**
-    * setFile will set a this->file if given one.
-    *
-    * @param file array of uploaded file. (optional)
-    * @return void
-    */
-  function setFile($file = null){
+    /**
+     * setFile will set a this->file if given one.
+     *
+     * @param file array of uploaded file. (optional)
+     * @return void
+     */
+    function setFile($file = null){
     if($file) $this->file = $file;
-  }
+    }
 
-  /**
-    * Returns the extension of the uploaded filename.
-    *
-    * @return string $extension A filename extension
-    * @param file array of uploaded file (optional)
-    * @access protected
-    */
-  function _ext($file = null){
+    /**
+     * Returns the extension of the uploaded filename.
+     *
+     * @return string $extension A filename extension
+     * @param file array of uploaded file (optional)
+     * @access protected
+     */
+    function _ext($file = null){
     $this->setFile($file);
     return strrchr($this->file['name'],".");
-  }
+    }
 
-  /**
-  * Adds error messages to the component
-  *
-  * @param string $text String of error message to save
-  * @return void
-  * @access protected
-  */
-  function _error($text){
+    /**
+     * Adds error messages to the component
+     *
+     * @param string $text String of error message to save
+     * @return void
+     * @access protected
+     */
+    function _error($text){
     $this->errors[] = __($text);
-  }
+    }
 
-  /**
-  * Checks if the uploaded type is allowed defined in the allowedTypes
-  *
-  * @return boolean if type is accepted
-  * @param file array of uploaded file (optional)
-  * @access public
-  */
-  function checkType($file = null){
+    /**
+     * Checks if the uploaded type is allowed defined in the allowedTypes
+     *
+     * @return boolean if type is accepted
+     * @param file array of uploaded file (optional)
+     * @access public
+     */
+    function checkType($file = null){
     $this->setFile($file);
     foreach($this->options['allowedTypes'] as $ext => $types){
-      if(!is_string($ext)){
+        if(!is_string($ext)){
         $ext = $types;
-      }
-      if($ext == '*'){
+        }
+        if($ext == '*'){
         return true;
-      }
+        }
 
-      $ext = strtolower('.' . str_replace('.','', $ext));
-      $file_ext = strtolower($this->_ext());
-      if($file_ext == $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)){
-          $this->_error("{$this->file['type']} is not an allowed type.");
-          return false;
+            $this->_error("{$this->file['type']} is not an allowed type.");
+            return false;
         }
         else {
-          return true;
+            return true;
+        }
         }
-      }
     }
 
     $this->_error("Extension is not allowed.");
     return false;
-  }
+    }
 
-  /**
-    * Checks if there is a file uploaded
-    *
-    * @return void
-    * @access public
-    * @param file array of uploaded file (optional)
-    */
-  function checkFile($file = null){
+    /**
+     * Checks if there is a file uploaded
+     *
+     * @return void
+     * @access public
+     * @param file array of uploaded file (optional)
+     */
+    function checkFile($file = null){
     $this->setFile($file);
     if($this->hasUpload() && $this->file){
-      if(isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK ) {
+        if(isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK ) {
         return true;
-      }
-      else {
+        }
+        else {
         $this->_error($this->uploadErrors[$this->file['error']]);
-      }
+        }
     }
     return false;
-  }
+    }
 
-  /**
-    * Checks if the file uploaded exceeds the maxFileSize setting (if there is onw)
-    *
-    * @return boolean
-    * @access public
-    * @param file array of uploaded file (optional)
-    */
-  function checkSize($file = null){
+    /**
+     * Checks if the file uploaded exceeds the maxFileSize setting (if there is onw)
+     *
+     * @return boolean
+     * @access public
+     * @param file array of uploaded file (optional)
+     */
+    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->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 {
+        }
+        else {
         // $this->_error("File exceeds {$this->options['maxFileSize']} byte limit.");
-				$this->_error("File exceeds size limit.");
-      }
+                $this->_error("File exceeds size limit.");
+        }
     }
     return false;
-  }
+    }
 
-  /**
-    * removeFile removes a specific file from the uploaded directory
-    *
-    * @param string $name A reference to the filename to delete from the uploadDirectory
-    * @return boolean
-    * @access public
-    */
-  function removeFile($name = null){
+    /**
+     * removeFile removes a specific file from the uploaded directory
+     *
+     * @param string $name A reference to the filename to delete from the uploadDirectory
+     * @return boolean
+     * @access public
+     */
+    function removeFile($name = null){
     if(!$name || strpos($name, '://')){
-      return false;
+        return false;
     }
 
     $up_dir = $this->options['uploadDir'];
@@ -275,70 +275,70 @@ 
 
     //delete main image -- $name
     if(@unlink($target_path)){
-      return true;
+        return true;
     } else {
-      return false;
+        return false;
+    }
     }
-  }
 
-  /**
-    * hasUpload
-    *
-    * @return boolean true | false depending if a file was actually uploaded.
-    * @param file array of uploaded file (optional)
-    */
-  function hasUpload($file = null){
+    /**
+     * hasUpload
+     *
+     * @return boolean true | false depending if a file was actually uploaded.
+     * @param file array of uploaded file (optional)
+     */
+    function hasUpload($file = null){
     $this->setFile($file);
     return ($this->_multiArrayKeyExists("tmp_name", $this->file));
-  }
+    }
 
-  /**
-    * @return boolean true if errors were detected.
-    */
-  function hasErrors(){
+    /**
+     * @return boolean true if errors were detected.
+     */
+    function hasErrors(){
     return count($this->errors);
-  }
+    }
 
-  /**
-    * showErrors itterates through the errors array
-    * and returns a concatinated string of errors sepearated by
-    * the $sep
-    *
-    * @param string $sep A seperated defaults to <br />
-    * @return string
-    * @access public
-    */
-  function showErrors($sep = " "){
+    /**
+     * showErrors itterates through the errors array
+     * and returns a concatinated string of errors sepearated by
+     * the $sep
+     *
+     * @param string $sep A seperated defaults to <br />
+     * @return string
+     * @access public
+     */
+    function showErrors($sep = " "){
     $retval = "";
     foreach($this->errors as $error){
-      $retval .= "$error $sep";
+        $retval .= "$error $sep";
     }
     return $retval;
-  }
+    }
 
-  /**
-    * Searches through the $haystack for a $key.
-    *
-    * @param string $needle String of key to search for in $haystack
-    * @param array $haystack Array of which to search for $needle
-    * @return boolean true if given key is in an array
-    * @access protected
-    */
-  function _multiArrayKeyExists($needle, $haystack) {
+    /**
+     * Searches through the $haystack for a $key.
+     *
+     * @param string $needle String of key to search for in $haystack
+     * @param array $haystack Array of which to search for $needle
+     * @return boolean true if given key is in an array
+     * @access protected
+     */
+    function _multiArrayKeyExists($needle, $haystack) {
     if(is_array($haystack)){
-      foreach ($haystack as $key=>$value) {
+        foreach ($haystack as $key=>$value) {
         if ($needle===$key && $value) {
-          return true;
+            return true;
         }
         if (is_array($value)) {
-          if($this->_multiArrayKeyExists($needle, $value)){
+            if($this->_multiArrayKeyExists($needle, $value)){
             return true;
-          }
+            }
+        }
         }
-      }
     }
     return false;
-  }
+    }
 
 }
 ?>
\ No newline at end of file

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;
           }
         }

Braces +10 added lines, -15 removed lines

@@ -72,12 +72,10 @@ 
         $Model = ClassRegistry::init($this->options['fileModel']);
         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 {
+      } else {
         if(function_exists($this->options['fileNameFunction'])){
           $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
         }
@@ -140,8 +138,7 @@ 
     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;
     }
@@ -154,7 +151,9 @@ 
     * @return void
     */
   function setFile($file = null){
-    if($file) $this->file = $file;
+    if($file) {
+        $this->file = $file;
+    }
   }
 
   /**
@@ -203,8 +202,7 @@ 
         if(is_array($types) && !in_array($this->file['type'], $types)){
           $this->_error("{$this->file['type']} is not an allowed type.");
           return false;
-        }
-        else {
+        } else {
           return true;
         }
       }
@@ -226,8 +224,7 @@ 
     if($this->hasUpload() && $this->file){
       if(isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK ) {
         return true;
-      }
-      else {
+      } else {
         $this->_error($this->uploadErrors[$this->file['error']]);
       }
     }
@@ -246,11 +243,9 @@ 
     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 {
+      } else {
         // $this->_error("File exceeds {$this->options['maxFileSize']} byte limit.");
 				$this->_error("File exceeds size limit.");
       }

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

Doc Comments +13 added lines, -13 removed lines

@@ -99,7 +99,7 @@ 
     * @param Array|Int $options takes an array of options passed to the image helper, or an integer representing the width of the image to display
     *         options: width = 100 (default), if width is set along with autoResize the uploaded image will be resized.
     * @access public
-    * @return mixed html tag, url string, or false if unable to find image.
+    * @return string|false html tag, url string, or false if unable to find image.
     */
   function image($name, $options = array()){
     $this->fileName = $name;
@@ -329,7 +329,7 @@ 
 		 * Constructor
 		 *
 		 * @param [String $imgFile] Image File Name
-		 * @return RESIZEIMAGE (Class Object)
+		 * @return false|null (Class Object)
 		 */
 		function __construct($imgFile=""){
 			if (!function_exists("imagecreate")){
@@ -356,7 +356,7 @@ 
 		 * Set image file name
 		 *
 		 * @param String $imgFile
-		 * @return void
+		 * @return boolean
 		 */
 		function setImage($imgFile){
 			$this->imgFile=$imgFile;
@@ -374,7 +374,7 @@ 
 		 * Resize a image to given width and height and keep it's current width and height ratio
 		 *
 		 * @param Number $imgwidth
-		 * @param Numnber $imgheight
+		 * @param integer $imgheight
 		 * @param String $newfile
 		 */
 		function resize_limitwh($imgwidth,$imgheight,$newfile=NULL){
@@ -394,9 +394,9 @@ 
     /**
 		 * Resize an image to given percentage.
 		 *
-		 * @param Number $percent
+		 * @param integer $percent
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function resize_percentage($percent=100,$newfile=NULL)	{
 			$newWidth=($this->imgWidth*$percent)/100;
@@ -407,10 +407,10 @@ 
     /**
 		 * Resize an image to given X and Y percentage.
 		 *
-		 * @param Number $xpercent
-		 * @param Number $ypercent
+		 * @param integer $xpercent
+		 * @param integer $ypercent
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function resize_xypercentage($xpercent=100,$ypercent=100,$newfile=NULL)		{
 			$newWidth=($this->imgWidth*$xpercent)/100;
@@ -421,10 +421,10 @@ 
 		/**
 		 * Resize an image to given width and height
 		 *
-		 * @param Number $width
-		 * @param Number $height
+		 * @param integer $width
+		 * @param integer $height
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function resize($width,$height,$newfile=NULL){
 			if(empty($this->imgFile)){
@@ -483,7 +483,7 @@ 
 		 * @param Number $width
 		 * @param Number $height
 		 * @param String $newfile
-		 * @return Boolean
+		 * @return false|null
 		 */
 		function _resize($width,$height,$newfile=NULL){
 			if (!function_exists("imagecreate")){

Indentation +426 added lines, -426 removed lines

@@ -1,160 +1,160 @@ 
 <?php
 /**
-  * FileUPloadHelper is the helper to the component FileUploadComponent.
-  * This helper REQUIRES the FileUploadComponent.
-  *
-  * @author: Nick Baker
-  * @version: 6.1.1
-  * @email: nick@webtechnick.com
-  * @link: http://www.webtechnick.com/blogs/view/221/CakePHP_File_Upload_Plugin
-  *
-  * @example
-  *      Show an already uploaded image
-  *      $fileUpload->image('filename.jpg', array('width' => 250)); //resizes a thumbnail of 'filename.jpg' to 250
-  *      $fileUpload->image('filename.jpg', array('width' => 250, 'uploadDir' => 'custom/dir')); //resizes a thumbnail of 'webroot/custom/dir/filename.jpg' to 250
-  *
-  *      Show the upload field form
-  *      $fileUpload->input(); //builds the input form based on your FileUploadComponent defaults
-  *           -or-
-  *      $fileUpload->input(array('var' => 'fileVar', 'model' => 'Picture')); //customized input form.
-  *
-  */
+ * FileUPloadHelper is the helper to the component FileUploadComponent.
+ * This helper REQUIRES the FileUploadComponent.
+ *
+ * @author: Nick Baker
+ * @version: 6.1.1
+ * @email: nick@webtechnick.com
+ * @link: http://www.webtechnick.com/blogs/view/221/CakePHP_File_Upload_Plugin
+ *
+ * @example
+ *      Show an already uploaded image
+ *      $fileUpload->image('filename.jpg', array('width' => 250)); //resizes a thumbnail of 'filename.jpg' to 250
+ *      $fileUpload->image('filename.jpg', array('width' => 250, 'uploadDir' => 'custom/dir')); //resizes a thumbnail of 'webroot/custom/dir/filename.jpg' to 250
+ *
+ *      Show the upload field form
+ *      $fileUpload->input(); //builds the input form based on your FileUploadComponent defaults
+ *           -or-
+ *      $fileUpload->input(array('var' => 'fileVar', 'model' => 'Picture')); //customized input form.
+ *
+ */
 App::import('Config', 'FileUpload.file_upload_settings');
 class FileUploadHelper extends AppHelper{
-  var $helpers = array('Html', 'Form');
-
-  /**
-    * the name of the file passed in.
-    */
-  var $fileName = NULL;
-
-  /**
-    * Holds the FileUpload component
-    */
-  var $FileUpload = NULL;
-
-  /**
-    * Counts the number of inputs, for multiple fileUpload inputing.
-    */
-  var $inputCount = 0;
-
-  /**
-    * Default options for showImage
-    *
-    * - width: the width of the image to display (0 means no resizing (default))
-    * - resizedDir: is the directory in which to save the resized files into (resized by default)
-    * - imagePathOnly: will only return the requested image_path (false by default)
-    * - autoResize: will resize the file automatically if given a valid width. (true by default)
-    * - resizeThumbOnly: will only resize the image down -- not up past the original's size (true by default)
-    */
-  var $options = array(
+    var $helpers = array('Html', 'Form');
+
+    /**
+     * the name of the file passed in.
+     */
+    var $fileName = NULL;
+
+    /**
+     * Holds the FileUpload component
+     */
+    var $FileUpload = NULL;
+
+    /**
+     * Counts the number of inputs, for multiple fileUpload inputing.
+     */
+    var $inputCount = 0;
+
+    /**
+     * Default options for showImage
+     *
+     * - width: the width of the image to display (0 means no resizing (default))
+     * - resizedDir: is the directory in which to save the resized files into (resized by default)
+     * - imagePathOnly: will only return the requested image_path (false by default)
+     * - autoResize: will resize the file automatically if given a valid width. (true by default)
+     * - resizeThumbOnly: will only resize the image down -- not up past the original's size (true by default)
+     */
+    var $options = array(
     'width' => 0, //0 means no resizing
     'resizedDir' => 'resized', // make sure webroot/files/resized is chmod 777
     'imagePathOnly' => false, //if true, will only return the requested image_path
     'autoResize' => true, //if true, will resize the file automatically if given a valid width.
     'resizeThumbOnly' => true //if true, will only resize the image down -- not up past the original's size
-  );
-
-  /**
-    * FileUpload Settings set in config/file_upload_settings.php
-    */
-  var $settings = array();
-
-  /**
-    * Constructor, initiallizes the FileUpload Component
-    * and sets the default options.
-    */
-  function __construct(View $View, $settings = array()){
-		parent::__construct($View, $settings);
+    );
+
+    /**
+     * FileUpload Settings set in config/file_upload_settings.php
+     */
+    var $settings = array();
+
+    /**
+     * Constructor, initiallizes the FileUpload Component
+     * and sets the default options.
+     */
+    function __construct(View $View, $settings = array()){
+        parent::__construct($View, $settings);
     $this->FileUploadSettings = new FileUploadSettings;
 
     //setup settings
     $this->settings = array_merge($this->FileUploadSettings->defaults, $this->options);
-  }
-
-  /**
-    * Reset the helper to its initial state
-    * @access public
-    * @return void
-    */
-  function reset(){
+    }
+
+    /**
+     * Reset the helper to its initial state
+     * @access public
+     * @return void
+     */
+    function reset(){
     $this->fileName = null;
     $this->options = array(
-      'width' => 0,
-      'resizedDir' => 'resized',
-      'imagePathOnly' => false,
-      'autoResize' => true,
-      'resizeThumbOnly' => true
+        'width' => 0,
+        'resizedDir' => 'resized',
+        'imagePathOnly' => false,
+        'autoResize' => true,
+        'resizeThumbOnly' => true
     );
 
     //setup settings
     $this->settings = array_merge($this->FileUploadSettings->defaults, $this->options);
     unset($this->newImage);
-  }
-
-  /**
-    * image takes a file_name or Upload.id and returns the HTML image
-    *
-    * @param String|Int $name takes a file_name or ID of uploaded file.
-    * @param Array|Int $options takes an array of options passed to the image helper, or an integer representing the width of the image to display
-    *         options: width = 100 (default), if width is set along with autoResize the uploaded image will be resized.
-    * @access public
-    * @return mixed html tag, url string, or false if unable to find image.
-    */
-  function image($name, $options = array()){
+    }
+
+    /**
+     * image takes a file_name or Upload.id and returns the HTML image
+     *
+     * @param String|Int $name takes a file_name or ID of uploaded file.
+     * @param Array|Int $options takes an array of options passed to the image helper, or an integer representing the width of the image to display
+     *         options: width = 100 (default), if width is set along with autoResize the uploaded image will be resized.
+     * @access public
+     * @return mixed html tag, url string, or false if unable to find image.
+     */
+    function image($name, $options = array()){
     $this->fileName = $name;
     //options takes in a width as well
     if(is_int($options)){
-      $width = $options;
-      $options = array();
-      $options['width'] = $width;
+        $width = $options;
+        $options = array();
+        $options['width'] = $width;
     }
     $this->options = array_merge($this->options, $options);
     $this->settings = array_merge($this->settings, $options);
 
     $img = false;
     if(is_string($name)){
-      $img = $this->_getImageByName();
+        $img = $this->_getImageByName();
     }
     elseif(is_int($name)){
-      $img = $this->_getImageById();
+        $img = $this->_getImageById();
     }
 
     if($img){
-      return $img;
+        return $img;
     }
 
     // $this->log("Unable to find $img");
     return false;
-  }
-
-  /**
-    * input takes an array of options and display the file browser html input
-    * options.
-    * @param Array $options of model and file options.  Defaults to default FileUpload component configuration
-    * @return String HTML form input element configured for the FileUploadComponent
-    * @access public
-    */
-  function input($options = array()){
+    }
+
+    /**
+     * input takes an array of options and display the file browser html input
+     * options.
+     * @param Array $options of model and file options.  Defaults to default FileUpload component configuration
+     * @return String HTML form input element configured for the FileUploadComponent
+     * @access public
+     */
+    function input($options = array()){
     $options = array_merge(
-      array('var' => $this->settings['fileVar'],'model' => $this->settings['fileModel']),
-      $options
+        array('var' => $this->settings['fileVar'],'model' => $this->settings['fileModel']),
+        $options
     );
     $configs = $options;
     if($configs['model']){
-      unset($options['model'], $options['var']);
+        unset($options['model'], $options['var']);
 
-      return $this->Form->input("{$configs['model']}.".$this->inputCount++.".{$configs['var']}", array_merge(array('type'=>'file'), $options));
+        return $this->Form->input("{$configs['model']}.".$this->inputCount++.".{$configs['var']}", array_merge(array('type'=>'file'), $options));
     }
     else {
-      return "<input type='file' name='data[{$configs['var']}][".$this->inputCount++."]' />";
+        return "<input type='file' name='data[{$configs['var']}][".$this->inputCount++."]' />";
+    }
     }
-  }
 
-  /**
-    * @access protected
-    */
-  function _getImageById(){
+    /**
+     * @access protected
+     */
+    function _getImageById(){
     App::import('Component', 'FileUpload.FileUpload');
     $this->FileUpload = new FileUploadComponent;
 
@@ -164,121 +164,121 @@ 
     $Model->recursive = -1;
     $upload = $Model->findById($id);
     if(!empty($upload)){
-      $this->fileName = $upload[$this->settings['fileModel']][$this->settings['fields']['name']];
-      return $this->_getImageByName();
+        $this->fileName = $upload[$this->settings['fileModel']][$this->settings['fields']['name']];
+        return $this->_getImageByName();
     }
     else{
-      return false;
+        return false;
+    }
     }
-  }
 
-  /**
-    * _getFullPath returns the full path of the file name
-    * @access protected
-    * @return String full path of the file name
-    */
-  function _getFullPath(){
+    /**
+     * _getFullPath returns the full path of the file name
+     * @access protected
+     * @return String full path of the file name
+     */
+    function _getFullPath(){
     if($this->_isOutsideSource()){
-      return $this->fileName;
+        return $this->fileName;
     }
     else {
-      return WWW_ROOT . $this->_getUploadPath();
+        return WWW_ROOT . $this->_getUploadPath();
+    }
     }
-  }
 
-  /**
-    * _getImagePath returns the image path of the file name
-    * @access protected
-    * @return String full path of the file name
-    */
-  function _getImagePath(){
+    /**
+     * _getImagePath returns the image path of the file name
+     * @access protected
+     * @return String full path of the file name
+     */
+    function _getImagePath(){
     if($this->_isOutsideSource()){
-      return $this->fileName;
+        return $this->fileName;
     }
     else {
-      return '/' . $this->_getUploadPath();
+        return '/' . $this->_getUploadPath();
+    }
     }
-  }
 
-  /**
-    * _getUploadPath returns the upload path of all files
-    * @access protected
-    * @return String upload path of all files
-    */
-  function _getUploadPath(){
+    /**
+     * _getUploadPath returns the upload path of all files
+     * @access protected
+     * @return String upload path of all files
+     */
+    function _getUploadPath(){
     return $this->settings['uploadDir'] . '/' . $this->fileName;
-  }
-
-  /**
-    * _getExt returns the extension of the filename.
-    * @access protected
-    * @return String extension of filename
-    */
-  function _getExt(){
+    }
+
+    /**
+     * _getExt returns the extension of the filename.
+     * @access protected
+     * @return String extension of filename
+     */
+    function _getExt(){
     return strrchr($this->fileName,".");
-  }
-
-  /**
-    * Get the image by name and width.
-    * if width is not specified return full image
-    * if width is specified, see if width of image exists
-    * if not, make it, save it, and return it.
-    * @return String HTML of resized or full image.
-    */
-  function _getImageByName(){
+    }
+
+    /**
+     * Get the image by name and width.
+     * if width is not specified return full image
+     * if width is specified, see if width of image exists
+     * if not, make it, save it, and return it.
+     * @return String HTML of resized or full image.
+     */
+    function _getImageByName(){
     //only proceed if we actually have the file in question
     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()))){
-      $this->_resizeImage();
+        $this->_resizeImage();
     }
     return $this->_htmlImage();
-  }
+    }
 
-  /**
-    * @return String of the resizedpath of a filename or path.
-    * @access protected
-    */
-  function _getResizeNameOrPath($file_name_or_path){
+    /**
+     * @return String of the resizedpath of a filename or path.
+     * @access protected
+     */
+    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;
     return $full_path;
-  }
-
-  /**
-    * _resizeImage actually resizes the passed in image.
-    * @access protected
-    * @return null
-    */
-  function _resizeImage(){
+    }
+
+    /**
+     * _resizeImage actually resizes the passed in image.
+     * @access protected
+     * @return null
+     */
+    function _resizeImage(){
     $this->newImage = new RResizeImage($this->_getFullPath());
     if($this->newImage->imgWidth > $this->options['width']){
-      $this->newImage->resize_limitwh($this->options['width'], 0, $this->_getResizeNameOrPath($this->_getFullPath()));
+        $this->newImage->resize_limitwh($this->options['width'], 0, $this->_getResizeNameOrPath($this->_getFullPath()));
     }
     else {
-      //$this->autoResize = false;
+        //$this->autoResize = false;
+    }
     }
-  }
 
-  /**
-    * _htmlImage returns the atual HTML of the resized/full image asked for
-    * @access protected
-    * @return String HTML image asked for
-    */
-  function _htmlImage(){
+    /**
+     * _htmlImage returns the atual HTML of the resized/full image asked for
+     * @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']){
+        if(isset($this->newImage) && $this->newImage->imgWidth && $this->newImage->imgWidth <= $this->options['width']){
         $image = $this->_getImagePath();
-      }
-      else {
+        }
+        else {
         $image = $this->_getResizeNameOrPath($this->_getImagePath());
-      }
+        }
     }
     else {
-      $image = $this->_getImagePath();
+        $image = $this->_getImagePath();
     }
 
     $options = $this->options; //copy
@@ -289,265 +289,265 @@ 
 
     //return the impage path or image html
     if($this->options['imagePathOnly']){
-      return $image;
+        return $image;
     }
     else {
-      return $this->Html->image($image, $options);
+        return $this->Html->image($image, $options);
+    }
     }
-  }
 
-  /**
-    * _isOutsideSource searches the fileName string for :// to determine if the image source is inside or outside our server
-    */
-  function _isOutsideSource(){
+    /**
+     * _isOutsideSource searches the fileName string for :// to determine if the image source is inside or outside our server
+     */
+    function _isOutsideSource(){
     return !!strpos($this->fileName, '://');
-  }
+    }
 }
 
 
 
 
-	/**
-	 * Image Resizer.
-	 * @author : Harish Chauhan
-	 * @copyright : Freeware
-	 * About :This PHP script will resize the given image and can show on the fly or save as image file.
-	 *
-	 */
-	//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="";
-
-		/**
-		 * Constructor
-		 *
-		 * @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.";
-				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->setImage($imgFile);
-      }
-		}
-
-		/**
-		 * Error occured while resizing the image.
-		 *
-		 * @return String
-		 */
-		function error(){
-			return $this->_error;
-		}
-
-		/**
-		 * Set image file name
-		 *
-		 * @param String $imgFile
-		 * @return void
-		 */
-		function setImage($imgFile){
-			$this->imgFile=$imgFile;
-			return $this->_createImage();
-		}
+    /**
+     * Image Resizer.
+     * @author : Harish Chauhan
+     * @copyright : Freeware
+     * About :This PHP script will resize the given image and can show on the fly or save as image file.
+     *
+     */
+    //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="";
+
+        /**
+         * Constructor
+         *
+         * @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.";
+                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->setImage($imgFile);
+        }
+        }
+
+        /**
+         * Error occured while resizing the image.
+         *
+         * @return String
+         */
+        function error(){
+            return $this->_error;
+        }
+
+        /**
+         * Set image file name
+         *
+         * @param String $imgFile
+         * @return void
+         */
+        function setImage($imgFile){
+            $this->imgFile=$imgFile;
+            return $this->_createImage();
+        }
 
     /**
-		 * @return void
-		 */
-		function close(){
-			return @imagedestroy($this->_img);
-		}
-
-		/**
-		 * Resize a image to given width and height and keep it's current width and height ratio
-		 *
-		 * @param Number $imgwidth
-		 * @param Numnber $imgheight
-		 * @param String $newfile
-		 */
-		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(floor(($height * $image_per)/100)>$imgheight && $imgheight > 0){
-				$image_per = (double)(($imgheight * 100) / $height);
-      }
-
-			$this->resize_percentage($image_per,$newfile);
-		}
+     * @return void
+     */
+        function close(){
+            return @imagedestroy($this->_img);
+        }
+
+        /**
+         * Resize a image to given width and height and keep it's current width and height ratio
+         *
+         * @param Number $imgwidth
+         * @param Numnber $imgheight
+         * @param String $newfile
+         */
+        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(floor(($height * $image_per)/100)>$imgheight && $imgheight > 0){
+                $image_per = (double)(($imgheight * 100) / $height);
+        }
+
+            $this->resize_percentage($image_per,$newfile);
+        }
 
     /**
-		 * Resize an image to given percentage.
-		 *
-		 * @param Number $percent
-		 * @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);
-		}
+     * Resize an image to given percentage.
+     *
+     * @param Number $percent
+     * @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);
+        }
 
     /**
-		 * Resize an image to given X and Y percentage.
-		 *
-		 * @param Number $xpercent
-		 * @param Number $ypercent
-		 * @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);
-		}
-
-		/**
-		 * Resize an image to given width and height
-		 *
-		 * @param Number $width
-		 * @param Number $height
-		 * @param String $newfile
-		 * @return Boolean
-		 */
-		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";
-				return false;
-			}
-			if($width<=0)	$width=$this->imgWidth;
-			if($height<=0) $height=$this->imgHeight;
-
-			return $this->_resize($width,$height,$newfile);
-		}
-
-		/**
-		 * Get the image attributes
-		 * @access Private
-		 *
-		 */
-		function _getImageInfo()
-		{
-			@list($this->imgWidth,$this->imgHeight,$type,$this->imgAttr)=@getimagesize($this->imgFile);
-			$this->imgType=$this->type[$type];
-		}
-
-		/**
-		 * Create the image resource
-		 * @access Private
-		 * @return Boolean
-		 */
-		function _createImage(){
-			$this->_getImageInfo();
-			if($this->imgType=='GIF'){
-				$this->_img=@imagecreatefromgif($this->imgFile);
-			}
-			elseif($this->imgType=='JPG'){
-				$this->_img=@imagecreatefromjpeg($this->imgFile);
-			}
-			elseif($this->imgType=='PNG'){
-				$this->_img=@imagecreatefrompng($this->imgFile);
-			}
-
-			if(!$this->_img || !@is_resource($this->_img)){
-				$this->_error="Error loading ".$this->imgFile;
-				return false;
-			}
-			return true;
-		}
-
-		/**
-		 * Function is used to resize the image
-		 *
-		 * @access Private
-		 * @param Number $width
-		 * @param Number $height
-		 * @param String $newfile
-		 * @return Boolean
-		 */
-		function _resize($width,$height,$newfile=NULL){
-			if (!function_exists("imagecreate")){
-				$this->_error="Error: GD Library is not available.";
-				return false;
-			}
-
-			$newimg=@imagecreatetruecolor($width,$height);
-			//imagecolortransparent( $newimg, imagecolorat( $newimg, 0, 0 ) );
-
-			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);
-				$transparentcolor = imagecolortransparent($this->_img);
-				imagefill($newimg,0,0,$transparentcolor);
-				imagecolortransparent($newimg,$transparentcolor);
-			}
-
-			@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);
+     * Resize an image to given X and Y percentage.
+     *
+     * @param Number $xpercent
+     * @param Number $ypercent
+     * @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);
+        }
+
+        /**
+         * Resize an image to given width and height
+         *
+         * @param Number $width
+         * @param Number $height
+         * @param String $newfile
+         * @return Boolean
+         */
+        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";
+                return false;
+            }
+            if($width<=0)	$width=$this->imgWidth;
+            if($height<=0) $height=$this->imgHeight;
+
+            return $this->_resize($width,$height,$newfile);
         }
-			}
-			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);
+
+        /**
+         * Get the image attributes
+         * @access Private
+         *
+         */
+        function _getImageInfo()
+        {
+            @list($this->imgWidth,$this->imgHeight,$type,$this->imgAttr)=@getimagesize($this->imgFile);
+            $this->imgType=$this->type[$type];
         }
-				else {
-					@header("Content-type: image/gif");
-					@imagegif($newimg);
-				}
-			}
-			elseif($this->imgType=='JPG'){
-				if(!empty($newfile)){
-					@imagejpeg($newimg,$newfile);
+
+        /**
+         * Create the image resource
+         * @access Private
+         * @return Boolean
+         */
+        function _createImage(){
+            $this->_getImageInfo();
+            if($this->imgType=='GIF'){
+                $this->_img=@imagecreatefromgif($this->imgFile);
+            }
+            elseif($this->imgType=='JPG'){
+                $this->_img=@imagecreatefromjpeg($this->imgFile);
+            }
+            elseif($this->imgType=='PNG'){
+                $this->_img=@imagecreatefrompng($this->imgFile);
+            }
+
+            if(!$this->_img || !@is_resource($this->_img)){
+                $this->_error="Error loading ".$this->imgFile;
+                return false;
+            }
+            return true;
+        }
+
+        /**
+         * Function is used to resize the image
+         *
+         * @access Private
+         * @param Number $width
+         * @param Number $height
+         * @param String $newfile
+         * @return Boolean
+         */
+        function _resize($width,$height,$newfile=NULL){
+            if (!function_exists("imagecreate")){
+                $this->_error="Error: GD Library is not available.";
+                return false;
+            }
+
+            $newimg=@imagecreatetruecolor($width,$height);
+            //imagecolortransparent( $newimg, imagecolorat( $newimg, 0, 0 ) );
+
+            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);
+                $transparentcolor = imagecolortransparent($this->_img);
+                imagefill($newimg,0,0,$transparentcolor);
+                imagecolortransparent($newimg,$transparentcolor);
+            }
+
+            @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);
         }
-				else	{
-					@header("Content-type: image/jpeg");
-					@imagejpeg($newimg);
-				}
-			}
-			elseif($this->imgType=='PNG'){
-				if(!empty($newfile)){
-					@imagepng($newimg,$newfile);
+            }
+            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);
         }
-				else{
-					@header("Content-type: image/png");
-					@imagepng($newimg);
-				}
-			}
-			@imagedestroy($newimg);
-		}
-	}
+                else {
+                    @header("Content-type: image/gif");
+                    @imagegif($newimg);
+                }
+            }
+            elseif($this->imgType=='JPG'){
+                if(!empty($newfile)){
+                    @imagejpeg($newimg,$newfile);
+        }
+                else	{
+                    @header("Content-type: image/jpeg");
+                    @imagejpeg($newimg);
+                }
+            }
+            elseif($this->imgType=='PNG'){
+                if(!empty($newfile)){
+                    @imagepng($newimg,$newfile);
+        }
+                else{
+                    @header("Content-type: image/png");
+                    @imagepng($newimg);
+                }
+            }
+            @imagedestroy($newimg);
+        }
+    }
 ?>
\ No newline at end of file

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);
 				}

Braces +32 added lines, -39 removed lines

@@ -115,8 +115,7 @@ 
     $img = false;
     if(is_string($name)){
       $img = $this->_getImageByName();
-    }
-    elseif(is_int($name)){
+    } elseif(is_int($name)){
       $img = $this->_getImageById();
     }
 
@@ -145,8 +144,7 @@ 
       unset($options['model'], $options['var']);
 
       return $this->Form->input("{$configs['model']}.".$this->inputCount++.".{$configs['var']}", array_merge(array('type'=>'file'), $options));
-    }
-    else {
+    } else {
       return "<input type='file' name='data[{$configs['var']}][".$this->inputCount++."]' />";
     }
   }
@@ -166,8 +164,7 @@ 
     if(!empty($upload)){
       $this->fileName = $upload[$this->settings['fileModel']][$this->settings['fields']['name']];
       return $this->_getImageByName();
-    }
-    else{
+    } else{
       return false;
     }
   }
@@ -180,8 +177,7 @@ 
   function _getFullPath(){
     if($this->_isOutsideSource()){
       return $this->fileName;
-    }
-    else {
+    } else {
       return WWW_ROOT . $this->_getUploadPath();
     }
   }
@@ -194,8 +190,7 @@ 
   function _getImagePath(){
     if($this->_isOutsideSource()){
       return $this->fileName;
-    }
-    else {
+    } else {
       return '/' . $this->_getUploadPath();
     }
   }
@@ -227,7 +222,9 @@ 
     */
   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()))){
@@ -257,8 +254,7 @@ 
     $this->newImage = new RResizeImage($this->_getFullPath());
     if($this->newImage->imgWidth > $this->options['width']){
       $this->newImage->resize_limitwh($this->options['width'], 0, $this->_getResizeNameOrPath($this->_getFullPath()));
-    }
-    else {
+    } else {
       //$this->autoResize = false;
     }
   }
@@ -272,12 +268,10 @@ 
     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 {
+      } else {
         $image = $this->_getResizeNameOrPath($this->_getImagePath());
       }
-    }
-    else {
+    } else {
       $image = $this->_getImagePath();
     }
 
@@ -285,13 +279,14 @@ 
     //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']){
       return $image;
-    }
-    else {
+    } else {
       return $this->Html->image($image, $options);
     }
   }
@@ -435,8 +430,12 @@ 
 				$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);
 		}
@@ -461,11 +460,9 @@ 
 			$this->_getImageInfo();
 			if($this->imgType=='GIF'){
 				$this->_img=@imagecreatefromgif($this->imgFile);
-			}
-			elseif($this->imgType=='JPG'){
+			} elseif($this->imgType=='JPG'){
 				$this->_img=@imagecreatefromjpeg($this->imgFile);
-			}
-			elseif($this->imgType=='PNG'){
+			} elseif($this->imgType=='PNG'){
 				$this->_img=@imagecreatefrompng($this->imgFile);
 			}
 
@@ -497,7 +494,9 @@ 
 			if($this->imgType=='GIF' || $this->imgType=='PNG')	{
 				/** Code to keep transparency of image **/
 				$colorcount = imagecolorstotal($this->_img);
-				if ($colorcount == 0) $colorcount = 256;
+				if ($colorcount == 0) {
+				    $colorcount = 256;
+				}
 				imagetruecolortopalette($newimg,true,$colorcount);
 				imagepalettecopy($newimg,$this->_img);
 				$transparentcolor = imagecolortransparent($this->_img);
@@ -511,8 +510,7 @@ 
 				if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
 			   		$newfile=@substr_replace($this->imgFile,"_har",-@strlen($matches[0]),0);
         }
-			}
-			elseif(!empty($newfile)){
+			} elseif(!empty($newfile)){
 				if(!@preg_match("/\..*+$/",@basename($newfile))){
 					if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
 					   $newfile=$newfile.$matches[0];
@@ -523,26 +521,21 @@ 
 			if($this->imgType=='GIF'){
 				if(!empty($newfile)){
           @imagegif($newimg,$newfile);
-        }
-				else {
+        } else {
 					@header("Content-type: image/gif");
 					@imagegif($newimg);
 				}
-			}
-			elseif($this->imgType=='JPG'){
+			} elseif($this->imgType=='JPG'){
 				if(!empty($newfile)){
 					@imagejpeg($newimg,$newfile);
-        }
-				else	{
+        } else	{
 					@header("Content-type: image/jpeg");
 					@imagejpeg($newimg);
 				}
-			}
-			elseif($this->imgType=='PNG'){
+			} elseif($this->imgType=='PNG'){
 				if(!empty($newfile)){
 					@imagepng($newimg,$newfile);
-        }
-				else{
+        } else{
 					@header("Content-type: image/png");
 					@imagepng($newimg);
 				}

app/Plugin/Install/Controller/InstallController.php

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
  * credentials or create the missing database
  * Create the database file and insert the submitted details
  *
- * @return void
+ * @return null|CakeResponse
  * @access public
  */
 	public function database() {

Indentation +176 added lines, -176 removed lines

@@ -21,7 +21,7 @@ 
  * @var string
  * @access public
  */
-	public $name = 'Install';
+    public $name = 'Install';
 
 /**
  * No models required
@@ -29,7 +29,7 @@ 
  * @var array
  * @access public
  */
-	public $uses = null;
+    public $uses = null;
 
 /**
  * No components required
@@ -37,7 +37,7 @@ 
  * @var array
  * @access public
  */
-	public $components = null;
+    public $components = null;
 
 /**
  * Default configuration
@@ -45,19 +45,19 @@ 
  * @var array
  * @access public
  */
-	public $defaultConfig = array(
-		'name' => 'default',
-		'datasource'=> 'Database/Mysql',
-		'persistent'=> false,
-		'host'=> 'localhost',
-		'login'=> 'root',
-		'password'=> '',
-		'database'=> 'croogo',
-		'schema'=> null,
-		'prefix'=> null,
-		'encoding' => 'utf8',
-		'port' => null,
-	);
+    public $defaultConfig = array(
+        'name' => 'default',
+        'datasource'=> 'Database/Mysql',
+        'persistent'=> false,
+        'host'=> 'localhost',
+        'login'=> 'root',
+        'password'=> '',
+        'database'=> 'croogo',
+        'schema'=> null,
+        'prefix'=> null,
+        'encoding' => 'utf8',
+        'port' => null,
+    );
 
 /**
  * beforeFilter
@@ -65,30 +65,30 @@ 
  * @return void
  * @access public
  */
-	public function beforeFilter() {
-		parent::beforeFilter();
-		$this->_check();
+    public function beforeFilter() {
+        parent::beforeFilter();
+        $this->_check();
 
-		$this->layout = 'install';
-		App::import('Component', 'Session');
-		$this->Session = new SessionComponent($this->Components);
+        $this->layout = 'install';
+        App::import('Component', 'Session');
+        $this->Session = new SessionComponent($this->Components);
 
-		Cache::clear(false, '_cake_core_');
-		Cache::clear(false, '_cake_model_');
-	}
+        Cache::clear(false, '_cake_core_');
+        Cache::clear(false, '_cake_model_');
+    }
 
 /**
  * If settings.yml exists, app is already installed
  *
  * @return void
  */
-	protected function _check() {
-		if (file_exists(APP . 'Config' . DS . 'installed.txt')) {
+    protected function _check() {
+        if (file_exists(APP . 'Config' . DS . 'installed.txt')) {
 //		if (Configure::read('Install.installed') && Configure::read('Install.secured')) {
-			$this->Session->setFlash('Already Installed');
-			$this->redirect('/');
-		}
-	}
+            $this->Session->setFlash('Already Installed');
+            $this->redirect('/');
+        }
+    }
 
 /**
  * Step 0: welcome
@@ -98,10 +98,10 @@ 
  * @return void
  * @access public
  */
-	public function index() {
-		$this->_check();
-		$this->set('title_for_layout', __('Installation: Welcome'));
-	}
+    public function index() {
+        $this->_check();
+        $this->set('title_for_layout', __('Installation: Welcome'));
+    }
 
 /**
  * Step 1: database
@@ -113,63 +113,63 @@ 
  * @return void
  * @access public
  */
-	public function database() {
-		$this->_check();
-		$this->set('title_for_layout', __('Step 1: Database'));
+    public function database() {
+        $this->_check();
+        $this->set('title_for_layout', __('Step 1: Database'));
 
 
-		if (empty($this->request->data)) {
-			return;
-		}
+        if (empty($this->request->data)) {
+            return;
+        }
 
-		@App::import('Model', 'ConnectionManager');
-		$config = $this->defaultConfig;
-		foreach ($this->request->data['Install'] AS $key => $value) {
-			if (isset($this->request->data['Install'][$key])) {
-				$config[$key] = $value;
-			}
-		}
-		try {
-			@ConnectionManager::create('default', $config);
-			$db = ConnectionManager::getDataSource('default');
-		}
-		catch (MissingConnectionException $e) {
-			$this->Session->setFlash(__('Could not connect to database: %s', $e->getMessage()), 'default', array('class' => 'error'));
-			$this->redirect(array('action' => 'database'));
-		}
-		if (!$db->isConnected()) {
-			$this->Session->setFlash(__('Could not connect to database.'), 'default', array('class' => 'error'));
-			return;
-		}
+        @App::import('Model', 'ConnectionManager');
+        $config = $this->defaultConfig;
+        foreach ($this->request->data['Install'] AS $key => $value) {
+            if (isset($this->request->data['Install'][$key])) {
+                $config[$key] = $value;
+            }
+        }
+        try {
+            @ConnectionManager::create('default', $config);
+            $db = ConnectionManager::getDataSource('default');
+        }
+        catch (MissingConnectionException $e) {
+            $this->Session->setFlash(__('Could not connect to database: %s', $e->getMessage()), 'default', array('class' => 'error'));
+            $this->redirect(array('action' => 'database'));
+        }
+        if (!$db->isConnected()) {
+            $this->Session->setFlash(__('Could not connect to database.'), 'default', array('class' => 'error'));
+            return;
+        }
 
-		copy(APP . 'Config' . DS.'database.php.install', APP . 'Config' . DS.'database.php');
-		App::uses('File', 'Utility');
-		$file = new File(APP . 'Config' . DS.'database.php', true);
-		$content = $file->read();
+        copy(APP . 'Config' . DS.'database.php.install', APP . 'Config' . DS.'database.php');
+        App::uses('File', 'Utility');
+        $file = new File(APP . 'Config' . DS.'database.php', true);
+        $content = $file->read();
 
-		foreach ($config AS $configKey => $configValue) {
-			$content = str_replace('{default_' . $configKey . '}', $configValue, $content);
-		}
+        foreach ($config AS $configKey => $configValue) {
+            $content = str_replace('{default_' . $configKey . '}', $configValue, $content);
+        }
 
-		if($file->write($content) ) {
-			return $this->redirect(array('action' => 'data'));
-		} else {
-			$this->Session->setFlash(__('Could not write database.php file.'), 'default', array('class' => 'error'));
-		}
-	}
+        if($file->write($content) ) {
+            return $this->redirect(array('action' => 'data'));
+        } else {
+            $this->Session->setFlash(__('Could not write database.php file.'), 'default', array('class' => 'error'));
+        }
+    }
 
-	/**
-	 * Fixes Postgres sequence
-	 */
-	protected function _fixSequence($model) {
-		$db = $model->getDataSource();
-		$nextValue = $model->find('first', array(
-			'fields' => sprintf('MAX(%s.%s) as max', $model->alias, $model->primaryKey),
-			));
-		$nextValue = empty($nextValue[0]['max']) ? 1 :  $nextValue[0]['max'] + 1;
-		$sql = sprintf('alter sequence %s restart with %d', $db->getSequence($model), $nextValue);
-		$db->execute($sql);
-	}
+    /**
+     * Fixes Postgres sequence
+     */
+    protected function _fixSequence($model) {
+        $db = $model->getDataSource();
+        $nextValue = $model->find('first', array(
+            'fields' => sprintf('MAX(%s.%s) as max', $model->alias, $model->primaryKey),
+            ));
+        $nextValue = empty($nextValue[0]['max']) ? 1 :  $nextValue[0]['max'] + 1;
+        $sql = sprintf('alter sequence %s restart with %d', $db->getSequence($model), $nextValue);
+        $db->execute($sql);
+    }
 
 /**
  * Step 2: Run the initial sql scripts to create the db and seed it with data
@@ -177,83 +177,83 @@ 
  * @return void
  * @access public
  */
-	public function data() {
-		$this->_check();
-		$this->set('title_for_layout', __('Step 2: Build database'));
-		if (isset($this->params['named']['run'])) {
-			App::uses('File', 'Utility');
-			App::import('Model', 'CakeSchema', false);
-			App::import('Model', 'ConnectionManager');
+    public function data() {
+        $this->_check();
+        $this->set('title_for_layout', __('Step 2: Build database'));
+        if (isset($this->params['named']['run'])) {
+            App::uses('File', 'Utility');
+            App::import('Model', 'CakeSchema', false);
+            App::import('Model', 'ConnectionManager');
 
-			$db = ConnectionManager::getDataSource('default');
-			$brokenSequence = $db instanceof Postgres;
-			if(!$db->isConnected()) {
-				$this->Session->setFlash(__('Could not connect to database.'), 'default', array('class' => 'error'));
-			} else {
-				$schema = new CakeSchema(array('name'=>'app'));
-				$schema = $schema->load();
-				foreach($schema->tables as $table => $fields) {
-					$create = $db->createSchema($schema, $table);
-					try {
-						$db->execute($create);
-					}
-					catch (PDOException $e) {
-						$this->Session->setFlash(__('Could not create table: %s', $e->getMessage()), 'default', array('class' => 'error'));
-						$this->redirect(array('action' => 'database'));
-					}
-				}
+            $db = ConnectionManager::getDataSource('default');
+            $brokenSequence = $db instanceof Postgres;
+            if(!$db->isConnected()) {
+                $this->Session->setFlash(__('Could not connect to database.'), 'default', array('class' => 'error'));
+            } else {
+                $schema = new CakeSchema(array('name'=>'app'));
+                $schema = $schema->load();
+                foreach($schema->tables as $table => $fields) {
+                    $create = $db->createSchema($schema, $table);
+                    try {
+                        $db->execute($create);
+                    }
+                    catch (PDOException $e) {
+                        $this->Session->setFlash(__('Could not create table: %s', $e->getMessage()), 'default', array('class' => 'error'));
+                        $this->redirect(array('action' => 'database'));
+                    }
+                }
 
-				$path = CakePlugin::path('Install') .DS. 'Config' .DS. 'Data' .DS;
-				$dataObjects = App::objects('class', $path);
-				foreach ($dataObjects as $data) {
-					include($path . $data . '.php');
-					$classVars = get_class_vars($data);
-					$modelAlias = substr($data, 0, -4);
-					$table = $classVars['table'];
-					$records = $classVars['records'];
-					App::import('Model', 'Model', false);
-					$modelObject = new Model(array(
-						'name' => $modelAlias,
-						'table' => $table,
-						'ds' => 'default',
-					));
-					if (is_array($records) && count($records) > 0) {
-						$i = 1;
-						foreach($records as $record) {
-							if (!isset($record['id'])) {
-								$record['id'] = $i++;
-							}
-							$modelObject->create($record);
-							$modelObject->save();
-						}
-					}
-					if ($brokenSequence) {
-						// $this->_fixSequence($modelObject);
-					}
-				}
+                $path = CakePlugin::path('Install') .DS. 'Config' .DS. 'Data' .DS;
+                $dataObjects = App::objects('class', $path);
+                foreach ($dataObjects as $data) {
+                    include($path . $data . '.php');
+                    $classVars = get_class_vars($data);
+                    $modelAlias = substr($data, 0, -4);
+                    $table = $classVars['table'];
+                    $records = $classVars['records'];
+                    App::import('Model', 'Model', false);
+                    $modelObject = new Model(array(
+                        'name' => $modelAlias,
+                        'table' => $table,
+                        'ds' => 'default',
+                    ));
+                    if (is_array($records) && count($records) > 0) {
+                        $i = 1;
+                        foreach($records as $record) {
+                            if (!isset($record['id'])) {
+                                $record['id'] = $i++;
+                            }
+                            $modelObject->create($record);
+                            $modelObject->save();
+                        }
+                    }
+                    if ($brokenSequence) {
+                        // $this->_fixSequence($modelObject);
+                    }
+                }
 
-				$this->redirect(array('action' => 'adminuser'));
-			}
-		}
-	}
+                $this->redirect(array('action' => 'adminuser'));
+            }
+        }
+    }
 
 /**
  * Step 3: get username and passwords for administrative user
  */
-	public function adminuser() {
+    public function adminuser() {
 //		if ($this->request->is('post')) {
-			$this->loadModel('User');
+            $this->loadModel('User');
 //			$this->User->set($this->request->data);
 //			if ($this->User->validates()) {
-				$token = uniqid();
-				$this->Session->write('Install', array(
-					'token' => $token,
+                $token = uniqid();
+                $this->Session->write('Install', array(
+                    'token' => $token,
 //					'User' => $this->request->data['User'],
-					));
-				$this->redirect(array('action' => 'finish', $token));
+                    ));
+                $this->redirect(array('action' => 'finish', $token));
 //			}
 //		}
-	}
+    }
 
 /**
  * Step 4: finish
@@ -263,33 +263,33 @@ 
  * @return void
  * @access public
  */
-	public function finish($token = null) {
-		$this->set('title_for_layout', __('Installation completed successfully'));
-		$this->_check();
-		$this->loadModel('Install.Install');
-		$install = $this->Session->read('Install');
-		if ($install['token'] == $token) {
-			unset($install['token']);
-			if ($this->Install->finalize($install)) {
-				$urlBlogAdd = Router::url(array(
-					'plugin' => false, 'admin' => true,
-					'controller' => 'nodes', 'action' => 'add', 'blog',
-					));
-				$urlSettings = Router::url(array(
-					'plugin' => false, 'admin' => true,
-					'controller' => 'settings', 'action' => 'prefix', 'Site',
-					));
-				$this->set('user', $install);
-				$this->set(compact('urlBlogAdd', 'urlSettings'));
-			} else {
-				$this->Session->setFlash('Something went wrong during installation. Please check your server logs.');
-				$this->redirect(array('action' => 'adminuser'));
-			}
-			$this->Session->delete('Install');
-		} else {
-			$this->redirect('/');
-		}
-	}
+    public function finish($token = null) {
+        $this->set('title_for_layout', __('Installation completed successfully'));
+        $this->_check();
+        $this->loadModel('Install.Install');
+        $install = $this->Session->read('Install');
+        if ($install['token'] == $token) {
+            unset($install['token']);
+            if ($this->Install->finalize($install)) {
+                $urlBlogAdd = Router::url(array(
+                    'plugin' => false, 'admin' => true,
+                    'controller' => 'nodes', 'action' => 'add', 'blog',
+                    ));
+                $urlSettings = Router::url(array(
+                    'plugin' => false, 'admin' => true,
+                    'controller' => 'settings', 'action' => 'prefix', 'Site',
+                    ));
+                $this->set('user', $install);
+                $this->set(compact('urlBlogAdd', 'urlSettings'));
+            } else {
+                $this->Session->setFlash('Something went wrong during installation. Please check your server logs.');
+                $this->redirect(array('action' => 'adminuser'));
+            }
+            $this->Session->delete('Install');
+        } else {
+            $this->redirect('/');
+        }
+    }
 
 }
 ?>

Spacing +11 added lines, -11 removed lines

@@ -83,7 +83,7 @@ 
  * @return void
  */
 	protected function _check() {
-		if (file_exists(APP . 'Config' . DS . 'installed.txt')) {
+		if (file_exists(APP.'Config'.DS.'installed.txt')) {
 //		if (Configure::read('Install.installed') && Configure::read('Install.secured')) {
 			$this->Session->setFlash('Already Installed');
 			$this->redirect('/');
@@ -142,16 +142,16 @@ 
 			return;
 		}
 
-		copy(APP . 'Config' . DS.'database.php.install', APP . 'Config' . DS.'database.php');
+		copy(APP.'Config'.DS.'database.php.install', APP.'Config'.DS.'database.php');
 		App::uses('File', 'Utility');
-		$file = new File(APP . 'Config' . DS.'database.php', true);
+		$file = new File(APP.'Config'.DS.'database.php', true);
 		$content = $file->read();
 
 		foreach ($config AS $configKey => $configValue) {
-			$content = str_replace('{default_' . $configKey . '}', $configValue, $content);
+			$content = str_replace('{default_'.$configKey.'}', $configValue, $content);
 		}
 
-		if($file->write($content) ) {
+		if ($file->write($content)) {
 			return $this->redirect(array('action' => 'data'));
 		} else {
 			$this->Session->setFlash(__('Could not write database.php file.'), 'default', array('class' => 'error'));
@@ -166,7 +166,7 @@ 
 		$nextValue = $model->find('first', array(
 			'fields' => sprintf('MAX(%s.%s) as max', $model->alias, $model->primaryKey),
 			));
-		$nextValue = empty($nextValue[0]['max']) ? 1 :  $nextValue[0]['max'] + 1;
+		$nextValue = empty($nextValue[0]['max']) ? 1 : $nextValue[0]['max'] + 1;
 		$sql = sprintf('alter sequence %s restart with %d', $db->getSequence($model), $nextValue);
 		$db->execute($sql);
 	}
@@ -187,12 +187,12 @@ 
 
 			$db = ConnectionManager::getDataSource('default');
 			$brokenSequence = $db instanceof Postgres;
-			if(!$db->isConnected()) {
+			if (!$db->isConnected()) {
 				$this->Session->setFlash(__('Could not connect to database.'), 'default', array('class' => 'error'));
 			} else {
 				$schema = new CakeSchema(array('name'=>'app'));
 				$schema = $schema->load();
-				foreach($schema->tables as $table => $fields) {
+				foreach ($schema->tables as $table => $fields) {
 					$create = $db->createSchema($schema, $table);
 					try {
 						$db->execute($create);
@@ -203,10 +203,10 @@ 
 					}
 				}
 
-				$path = CakePlugin::path('Install') .DS. 'Config' .DS. 'Data' .DS;
+				$path = CakePlugin::path('Install').DS.'Config'.DS.'Data'.DS;
 				$dataObjects = App::objects('class', $path);
 				foreach ($dataObjects as $data) {
-					include($path . $data . '.php');
+					include($path.$data.'.php');
 					$classVars = get_class_vars($data);
 					$modelAlias = substr($data, 0, -4);
 					$table = $classVars['table'];
@@ -219,7 +219,7 @@ 
 					));
 					if (is_array($records) && count($records) > 0) {
 						$i = 1;
-						foreach($records as $record) {
+						foreach ($records as $record) {
 							if (!isset($record['id'])) {
 								$record['id'] = $i++;
 							}

Braces +2 added lines, -4 removed lines

@@ -132,8 +132,7 @@ 
 		try {
 			@ConnectionManager::create('default', $config);
 			$db = ConnectionManager::getDataSource('default');
-		}
-		catch (MissingConnectionException $e) {
+		} catch (MissingConnectionException $e) {
 			$this->Session->setFlash(__('Could not connect to database: %s', $e->getMessage()), 'default', array('class' => 'error'));
 			$this->redirect(array('action' => 'database'));
 		}
@@ -196,8 +195,7 @@ 
 					$create = $db->createSchema($schema, $table);
 					try {
 						$db->execute($create);
-					}
-					catch (PDOException $e) {
+					} catch (PDOException $e) {
 						$this->Session->setFlash(__('Could not create table: %s', $e->getMessage()), 'default', array('class' => 'error'));
 						$this->redirect(array('action' => 'database'));
 					}