Schlaefer / Saito

app/View/Helper/RequireJsHelper.php

Spacing +4 added lines, -4 removed lines

@@ -44,11 +44,11 @@ 
 					|| ($isTimestampShown === true && Configure::read('debug') > 0)
 			) {
 				$out .= $this->Html->scriptBlock(
-					"var require = {urlArgs:" .
+					"var require = {urlArgs:".
 					$this->Js->value(
-						$this->Html->getAssetTimestamp($options['jsUrl'] . $dataMain . '.js'
+						$this->Html->getAssetTimestamp($options['jsUrl'].$dataMain.'.js'
 						)
-					) . " }"
+					)." }"
 				);
 			}
 			// require.js borks out when used with Cakes timestamp.
@@ -78,7 +78,7 @@ 
 			if ($debug) {
 				return JS_URL;
 			} else {
-				return JS_URL . '/../dist/';
+				return JS_URL.'/../dist/';
 			}
 		}
 

Indentation +68 added lines, -68 removed lines

@@ -1,23 +1,23 @@ 
 <?php
 
-	App::uses('AppHelper', 'View/Helper');
+    App::uses('AppHelper', 'View/Helper');
 
-	class RequireJsHelper extends AppHelper {
+    class RequireJsHelper extends AppHelper {
 
-		public $helpers = array(
-			'Html',
-			'Js'
-		);
+        public $helpers = array(
+            'Html',
+            'Js'
+        );
 
 /**
  * url to require.js relative app/webroot/js
  *
  * @var array
  */
-		protected $_requireUrl = [
-			'debug' => 'dist/require',
-			'prod' => 'dist/require.min'
-		];
+        protected $_requireUrl = [
+            'debug' => 'dist/require',
+            'prod' => 'dist/require.min'
+        ];
 
 /**
  * Inserts <script> tag for including require.js
@@ -31,64 +31,64 @@ 
  * @param array $options additional options
  * @return string
  */
-		public function scriptTag($dataMain, $options = array()) {
-			// require.js should already be included in production js
-			$options += array(
-				'jsUrl' => $this->_jsRoot(),
-				'requireUrl' => $this->_requireUrl()
-			);
-			$out = '';
-			// add version as timestamp to require requests
-			$isTimestampShown = Configure::read('Asset.timestamp');
-			if ($isTimestampShown === 'force'
-					|| ($isTimestampShown === true && Configure::read('debug') > 0)
-			) {
-				$out .= $this->Html->scriptBlock(
-					"var require = {urlArgs:" .
-					$this->Js->value(
-						$this->Html->getAssetTimestamp($options['jsUrl'] . $dataMain . '.js'
-						)
-					) . " }"
-				);
-			}
-			// require.js borks out when used with Cakes timestamp.
-			// also we need the relative path for the main-script
-			$_tmpAssetTimestampCache = Configure::read('Asset.timestamp');
-			Configure::write('Asset.timestamp', false);
-			$out .= $this->Html->script(
-				$this->Html->assetUrl(
-					$options['requireUrl'],
-					['ext' => '.js', 'fullBase' => true]
-				),
-				[
-					'data-main' => $this->Html->assetUrl($dataMain,
-								[
-									'pathPrefix' => $options['jsUrl'],
-									'ext' => '.js'
-								]
-							)
-				]
-			);
-			Configure::write('Asset.timestamp', $_tmpAssetTimestampCache);
-			return $out;
-		}
+        public function scriptTag($dataMain, $options = array()) {
+            // require.js should already be included in production js
+            $options += array(
+                'jsUrl' => $this->_jsRoot(),
+                'requireUrl' => $this->_requireUrl()
+            );
+            $out = '';
+            // add version as timestamp to require requests
+            $isTimestampShown = Configure::read('Asset.timestamp');
+            if ($isTimestampShown === 'force'
+                    || ($isTimestampShown === true && Configure::read('debug') > 0)
+            ) {
+                $out .= $this->Html->scriptBlock(
+                    "var require = {urlArgs:" .
+                    $this->Js->value(
+                        $this->Html->getAssetTimestamp($options['jsUrl'] . $dataMain . '.js'
+                        )
+                    ) . " }"
+                );
+            }
+            // require.js borks out when used with Cakes timestamp.
+            // also we need the relative path for the main-script
+            $_tmpAssetTimestampCache = Configure::read('Asset.timestamp');
+            Configure::write('Asset.timestamp', false);
+            $out .= $this->Html->script(
+                $this->Html->assetUrl(
+                    $options['requireUrl'],
+                    ['ext' => '.js', 'fullBase' => true]
+                ),
+                [
+                    'data-main' => $this->Html->assetUrl($dataMain,
+                                [
+                                    'pathPrefix' => $options['jsUrl'],
+                                    'ext' => '.js'
+                                ]
+                            )
+                ]
+            );
+            Configure::write('Asset.timestamp', $_tmpAssetTimestampCache);
+            return $out;
+        }
 
-		protected function _jsRoot() {
-			$debug = Configure::read('debug') > 0;
-			if ($debug) {
-				return JS_URL;
-			} else {
-				return JS_URL . '/../dist/';
-			}
-		}
+        protected function _jsRoot() {
+            $debug = Configure::read('debug') > 0;
+            if ($debug) {
+                return JS_URL;
+            } else {
+                return JS_URL . '/../dist/';
+            }
+        }
 
-		protected function _requireUrl() {
-			$debug = Configure::read('debug') > 0;
-			if ($debug) {
-				return $this->_requireUrl['debug'];
-			} else {
-				return $this->_requireUrl['prod'];
-			}
-		}
+        protected function _requireUrl() {
+            $debug = Configure::read('debug') > 0;
+            if ($debug) {
+                return $this->_requireUrl['debug'];
+            } else {
+                return $this->_requireUrl['prod'];
+            }
+        }
 
-	}
+    }

app/View/Helper/AppHelper.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
 		}
 
 		public static function tagId() {
-			return 'id' . static::$_tagId++;
+			return 'id'.static::$_tagId++;
 		}
 
 		/**
@@ -59,7 +59,7 @@ 
 			// extracts integer unixtimestamp from `path/asset.ext?<unixtimestamp>
 			if ($pathWithTimestamp) {
 				if (preg_match('/(?<=\?)[\d]+(?=$|\?|\&)/', $pathWithTimestamp, $matches)) {
-					return (int)$matches[0];
+					return (int) $matches[0];
 				}
 			}
 			throw new InvalidArgumentException("File $path not found.");

Indentation +52 added lines, -52 removed lines

@@ -1,26 +1,26 @@ 
 <?php
-	/**
-	 * Application level View Helper
-	 *
-	 * This file is application-wide helper file. You can put all
-	 * application-wide helper-related methods here.
-	 *
-	 * PHP 5
-	 *
-	 * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
-	 * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
-	 *
-	 * Licensed under The MIT License
-	 * Redistributions of files must retain the above copyright notice.
-	 *
-	 * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
-	 * @link          http://cakephp.org CakePHP(tm) Project
-	 * @package       app.View.Helper
-	 * @since         CakePHP(tm) v 0.2.9
-	 * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
-	 */
+    /**
+     * Application level View Helper
+     *
+     * This file is application-wide helper file. You can put all
+     * application-wide helper-related methods here.
+     *
+     * PHP 5
+     *
+     * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+     * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
+     *
+     * Licensed under The MIT License
+     * Redistributions of files must retain the above copyright notice.
+     *
+     * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org)
+     * @link          http://cakephp.org CakePHP(tm) Project
+     * @package       app.View.Helper
+     * @since         CakePHP(tm) v 0.2.9
+     * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+     */
 
-	App::uses('Helper', 'View');
+    App::uses('Helper', 'View');
 
 /**
  * Application helper
@@ -30,39 +30,39 @@ 
  *
  * @package       app.View.Helper
  */
-	class AppHelper extends Helper {
+    class AppHelper extends Helper {
 
-		protected static $_tagId = 0;
+        protected static $_tagId = 0;
 
-		public function __get($name) {
-			switch ($name) {
-				case 'dic':
-					return ClassRegistry::getObject('dic');
-				default:
-					return parent::__get($name);
-			}
-		}
+        public function __get($name) {
+            switch ($name) {
+                case 'dic':
+                    return ClassRegistry::getObject('dic');
+                default:
+                    return parent::__get($name);
+            }
+        }
 
-		public static function tagId() {
-			return 'id' . static::$_tagId++;
-		}
+        public static function tagId() {
+            return 'id' . static::$_tagId++;
+        }
 
-		/**
-		 * Returns the unix timestamp for a file
-		 *
-		 * @param $path as url `m/dist/theme.css
-		 * @return int
-		 * @throws InvalidArgumentException
-		 */
-		public function getAssetTimestamp($path) {
-			$pathWithTimestamp = $this->assetTimestamp($path);
-			// extracts integer unixtimestamp from `path/asset.ext?<unixtimestamp>
-			if ($pathWithTimestamp) {
-				if (preg_match('/(?<=\?)[\d]+(?=$|\?|\&)/', $pathWithTimestamp, $matches)) {
-					return (int)$matches[0];
-				}
-			}
-			throw new InvalidArgumentException("File $path not found.");
-		}
+        /**
+         * Returns the unix timestamp for a file
+         *
+         * @param $path as url `m/dist/theme.css
+         * @return int
+         * @throws InvalidArgumentException
+         */
+        public function getAssetTimestamp($path) {
+            $pathWithTimestamp = $this->assetTimestamp($path);
+            // extracts integer unixtimestamp from `path/asset.ext?<unixtimestamp>
+            if ($pathWithTimestamp) {
+                if (preg_match('/(?<=\?)[\d]+(?=$|\?|\&)/', $pathWithTimestamp, $matches)) {
+                    return (int)$matches[0];
+                }
+            }
+            throw new InvalidArgumentException("File $path not found.");
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file

app/Console/cake.php

Spacing +5 added lines, -5 removed lines

@@ -21,21 +21,21 @@
 	define('DS', DIRECTORY_SEPARATOR);
 }
 
-$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
+$dispatcher = 'Cake'.DS.'Console'.DS.'ShellDispatcher.php';
 
 if (function_exists('ini_set')) {
 	$root = dirname(dirname(dirname(__FILE__)));
 	$appDir = basename(dirname(dirname(__FILE__)));
-	$install = $root . DS . 'lib';
-	$composerInstall = $root . DS . $appDir . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
+	$install = $root.DS.'lib';
+	$composerInstall = $root.DS.$appDir.DS.'Vendor'.DS.'cakephp'.DS.'cakephp'.DS.'lib';
 
 	// the following lines differ from its sibling
 	// /lib/Cake/Console/Templates/skel/Console/cake.php
-	if (file_exists($composerInstall . DS . $dispatcher)) {
+	if (file_exists($composerInstall.DS.$dispatcher)) {
 		$install = $composerInstall;
 	}
 
-	ini_set('include_path', $install . PATH_SEPARATOR . ini_get('include_path'));
+	ini_set('include_path', $install.PATH_SEPARATOR.ini_get('include_path'));
 	unset($root, $appDir, $install, $composerInstall);
 }
 

Indentation +13 added lines, -13 removed lines

@@ -18,29 +18,29 @@
  */
 
 if (!defined('DS')) {
-	define('DS', DIRECTORY_SEPARATOR);
+    define('DS', DIRECTORY_SEPARATOR);
 }
 
 $dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
 
 if (function_exists('ini_set')) {
-	$root = dirname(dirname(dirname(__FILE__)));
-	$appDir = basename(dirname(dirname(__FILE__)));
-	$install = $root . DS . 'lib';
-	$composerInstall = $root . DS . $appDir . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
+    $root = dirname(dirname(dirname(__FILE__)));
+    $appDir = basename(dirname(dirname(__FILE__)));
+    $install = $root . DS . 'lib';
+    $composerInstall = $root . DS . $appDir . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
 
-	// the following lines differ from its sibling
-	// /lib/Cake/Console/Templates/skel/Console/cake.php
-	if (file_exists($composerInstall . DS . $dispatcher)) {
-		$install = $composerInstall;
-	}
+    // the following lines differ from its sibling
+    // /lib/Cake/Console/Templates/skel/Console/cake.php
+    if (file_exists($composerInstall . DS . $dispatcher)) {
+        $install = $composerInstall;
+    }
 
-	ini_set('include_path', $install . PATH_SEPARATOR . ini_get('include_path'));
-	unset($root, $appDir, $install, $composerInstall);
+    ini_set('include_path', $install . PATH_SEPARATOR . ini_get('include_path'));
+    unset($root, $appDir, $install, $composerInstall);
 }
 
 if (!include $dispatcher) {
-	trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
+    trigger_error('Could not locate CakePHP core files.', E_USER_ERROR);
 }
 unset($dispatcher);
 

app/Model/Behavior/TreeBehavior.php

Spacing +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 	class TreeBehavior extends ModelBehavior {
 
 		public function treeGetSubtree(Model $Model, $tree, $_nodeId) {
-			$func = function (&$tree, &$entry, $_nodeId) {
-				if ((int)$entry['Entry']['id'] === (int)$_nodeId) {
+			$func = function(&$tree, &$entry, $_nodeId) {
+				if ((int) $entry['Entry']['id'] === (int) $_nodeId) {
 					$tree = array($entry);
 					return 'break';
 				}

Indentation +52 added lines, -52 removed lines

@@ -1,35 +1,35 @@ 
 <?php
 
-	class TreeBehavior extends ModelBehavior {
-
-		public function treeGetSubtree(Model $Model, $tree, $_nodeId) {
-			$func = function (&$tree, &$entry, $_nodeId) {
-				if ((int)$entry['Entry']['id'] === (int)$_nodeId) {
-					$tree = array($entry);
-					return 'break';
-				}
-			};
-			Entry::mapTreeElements($tree, $func, $_nodeId);
-			return $tree;
-		}
-
-		public function treeBuild(Model $Model, $threads) {
-			$tree = array();
-			foreach ($threads as $thread) {
-				$id = $thread[$Model->alias]['id'];
-				$pid = $thread[$Model->alias]['pid'];
-				$tree[$id] = isset($tree[$id]) ? $tree[$id] + $thread : $thread;
-				$tree[$pid]['_children'][] = &$tree[$id];
-			}
-
-			// It's possible to do uasort before tree build and  get the same results,
-			// without _sortTreesAfterTime
-			// but then *all* entries have to be sorted whereas now only subthreads with childs
-			// are sorted. So using _sortTreesAfterTime is actually faster in praxis.
-			$_sortedTrees = $this->_sortTreesAfterTime($tree[0]['_children']);
-
-			return $_sortedTrees;
-		}
+    class TreeBehavior extends ModelBehavior {
+
+        public function treeGetSubtree(Model $Model, $tree, $_nodeId) {
+            $func = function (&$tree, &$entry, $_nodeId) {
+                if ((int)$entry['Entry']['id'] === (int)$_nodeId) {
+                    $tree = array($entry);
+                    return 'break';
+                }
+            };
+            Entry::mapTreeElements($tree, $func, $_nodeId);
+            return $tree;
+        }
+
+        public function treeBuild(Model $Model, $threads) {
+            $tree = array();
+            foreach ($threads as $thread) {
+                $id = $thread[$Model->alias]['id'];
+                $pid = $thread[$Model->alias]['pid'];
+                $tree[$id] = isset($tree[$id]) ? $tree[$id] + $thread : $thread;
+                $tree[$pid]['_children'][] = &$tree[$id];
+            }
+
+            // It's possible to do uasort before tree build and  get the same results,
+            // without _sortTreesAfterTime
+            // but then *all* entries have to be sorted whereas now only subthreads with childs
+            // are sorted. So using _sortTreesAfterTime is actually faster in praxis.
+            $_sortedTrees = $this->_sortTreesAfterTime($tree[0]['_children']);
+
+            return $_sortedTrees;
+        }
 
 /**
  * Sort all entries in trees after time
@@ -38,25 +38,25 @@ 
  * @param int $level
  * @return array
  */
-		protected function _sortTreesAfterTime($in, $level = 0) {
-			if ($level > 0) {
-				uasort($in, [$this, '_sort']);
-			}
-
-			foreach ($in as $k => $v) {
-				if (isset($v['_children'])) {
-					$in[$k]['_children'] = $this->_sortTreesAfterTime($v['_children'], $level + 1);
-				}
-			}
-			return $in;
-		}
-
-		protected function _sort($a, $b) {
-			if ($a['Entry']['time'] === $b['Entry']['time']) {
-				return ($a['Entry']['id'] > $b['Entry']['id']) ? 1 : -1;
-			} else {
-				return ($a['Entry']['time'] > $b['Entry']['time']) ? 1 : -1;
-			}
-		}
-
-	}
+        protected function _sortTreesAfterTime($in, $level = 0) {
+            if ($level > 0) {
+                uasort($in, [$this, '_sort']);
+            }
+
+            foreach ($in as $k => $v) {
+                if (isset($v['_children'])) {
+                    $in[$k]['_children'] = $this->_sortTreesAfterTime($v['_children'], $level + 1);
+                }
+            }
+            return $in;
+        }
+
+        protected function _sort($a, $b) {
+            if ($a['Entry']['time'] === $b['Entry']['time']) {
+                return ($a['Entry']['id'] > $b['Entry']['id']) ? 1 : -1;
+            } else {
+                return ($a['Entry']['time'] > $b['Entry']['time']) ? 1 : -1;
+            }
+        }
+
+    }

app/Model/Shout.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 				)
 			);
 			if ($lastShout) {
-				$out = (int)current($lastShout);
+				$out = (int) current($lastShout);
 			}
 			return $out;
 		}

Indentation +82 added lines, -82 removed lines

@@ -1,123 +1,123 @@
 <?php
 
-	App::uses('AppModel', 'Model');
+    App::uses('AppModel', 'Model');
 
 /**
  * Shout Model
  *
  * @property User $User
  */
-	class Shout extends AppModel {
+    class Shout extends AppModel {
 
 /**
  * Display field
  *
  * @var string
  */
-		public $displayField = 'text';
+        public $displayField = 'text';
 
-		public $actsAs = [
-			'Markup',
-			'Containable'
-		];
+        public $actsAs = [
+            'Markup',
+            'Containable'
+        ];
 
-		public $virtualFields = [
-			'username' => 'User.username'
-		];
+        public $virtualFields = [
+            'username' => 'User.username'
+        ];
 
 /**
  * Validation rules
  *
  * @var array
  */
-		public $validate = array(
-			'text' => array(
-				'maxlength' => array(
-					'rule' => array('maxlength', 255),
-				),
-			),
-		);
+        public $validate = array(
+            'text' => array(
+                'maxlength' => array(
+                    'rule' => array('maxlength', 255),
+                ),
+            ),
+        );
 
 /**
  * belongsTo associations
  *
  * @var array
  */
-		public $belongsTo = array(
-			'User' => array(
-				'className' => 'User',
-				'foreignKey' => 'user_id',
-				'conditions' => '',
-				'fields' => '',
-				'order' => ''
-			)
-		);
+        public $belongsTo = array(
+            'User' => array(
+                'className' => 'User',
+                'foreignKey' => 'user_id',
+                'conditions' => '',
+                'fields' => '',
+                'order' => ''
+            )
+        );
 
-		public $maxNumberOfShouts = 10;
+        public $maxNumberOfShouts = 10;
 
-		public function findLastId() {
-			$out = 0;
-			$lastShout = $this->find(
-				'list',
-				array(
-					'contain' => false,
-					'fields' => 'id',
-					'order' => 'id desc',
-					'limit' => 1
-				)
-			);
-			if ($lastShout) {
-				$out = (int)current($lastShout);
-			}
-			return $out;
-		}
+        public function findLastId() {
+            $out = 0;
+            $lastShout = $this->find(
+                'list',
+                array(
+                    'contain' => false,
+                    'fields' => 'id',
+                    'order' => 'id desc',
+                    'limit' => 1
+                )
+            );
+            if ($lastShout) {
+                $out = (int)current($lastShout);
+            }
+            return $out;
+        }
 
 /**
  * Get all shouts
  *
  * @return array
  */
-		public function get() {
-			$shouts = $this->find(
-				'all',
-				[
-					'contain' => 'User.username',
-					'order' => 'Shout.id DESC'
-				]
-			);
-			return $shouts;
-		}
+        public function get() {
+            $shouts = $this->find(
+                'all',
+                [
+                    'contain' => 'User.username',
+                    'order' => 'Shout.id DESC'
+                ]
+            );
+            return $shouts;
+        }
 
-		public function push($data) {
-			$data[$this->alias]['time'] = gmdate("Y-m-d H:i:s", time());
-			$this->create($data);
-			$success = $this->save();
+        public function push($data) {
+            $data[$this->alias]['time'] = gmdate("Y-m-d H:i:s", time());
+            $this->create($data);
+            $success = $this->save();
 
-			$count = $this->find('count');
-			while ($success && $count > $this->maxNumberOfShouts) {
-				$success = $this->shift();
-				$count -= 1;
-			}
-			return $success;
-		}
+            $count = $this->find('count');
+            while ($success && $count > $this->maxNumberOfShouts) {
+                $success = $this->shift();
+                $count -= 1;
+            }
+            return $success;
+        }
 
-		public function shift() {
-			$currentIds = $this->find(
-				'list',
-				[
-					'fields' => 'Shout.id',
-					'order' => 'Shout.id ASC'
-				]
-			);
-			$oldestId = current($currentIds);
-			return $this->delete($oldestId);
-		}
+        public function shift() {
+            $currentIds = $this->find(
+                'list',
+                [
+                    'fields' => 'Shout.id',
+                    'order' => 'Shout.id ASC'
+                ]
+            );
+            $oldestId = current($currentIds);
+            return $this->delete($oldestId);
+        }
 
-		public function beforeSave($options = []) {
-			if (empty($this->data[$this->alias]['text']) === false) {
-				$this->data[$this->alias]['text'] = $this->prepareMarkup($this->data[$this->alias]['text']);
-			}
-			return true;
-		}
+        public function beforeSave($options = []) {
+            if (empty($this->data[$this->alias]['text']) === false) {
+                $this->data[$this->alias]['text'] = $this->prepareMarkup($this->data[$this->alias]['text']);
+            }
+            return true;
+        }
 
-	}
+    }

app/Model/Upload.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 				'conditions' => array('user_id' => $userId)
 			)
 		);
-		return (int)$number;
+		return (int) $number;
 	}
 
 }
\ No newline at end of file

Indentation +23 added lines, -23 removed lines

@@ -7,24 +7,24 @@ 
  */
 class Upload extends AppModel {
 
-	public $name = 'Upload';
+    public $name = 'Upload';
 
-	public $recursive = -1;
+    public $recursive = -1;
 
-	public $actsAs = array('FileUpload.FileUpload');
+    public $actsAs = array('FileUpload.FileUpload');
 
-	public $belongsTo = array('User');
+    public $belongsTo = array('User');
 
-	public function deleteAllFromUser($userId) {
-		return $this->deleteAll(
-			array(
-				'Upload.user_id' => $userId
-			),
-			false,
-			// call beforeDelete FileUploader plugin callback to remove files from disk
-			true
-		);
-	}
+    public function deleteAllFromUser($userId) {
+        return $this->deleteAll(
+            array(
+                'Upload.user_id' => $userId
+            ),
+            false,
+            // call beforeDelete FileUploader plugin callback to remove files from disk
+            true
+        );
+    }
 
 /**
  * Returns the number of uploads a user `user_id` has made
@@ -33,14 +33,14 @@ 
  *
  * @return int
  */
-	public function countUser($userId) {
-		$number = $this->find(
-			'count',
-			array(
-				'conditions' => array('user_id' => $userId)
-			)
-		);
-		return (int)$number;
-	}
+    public function countUser($userId) {
+        $number = $this->find(
+            'count',
+            array(
+                'conditions' => array('user_id' => $userId)
+            )
+        );
+        return (int)$number;
+    }
 
 }
\ No newline at end of file

app/Model/Category.php

Spacing +3 added lines, -3 removed lines

@@ -37,8 +37,8 @@ 
 				return $this->_cache[$accession];
 			}
 			$this->_cache[$accession] = Cache::remember(
-				'Saito.Cache.CategoriesForAccession.' . $accession,
-				function () use ($accession) {
+				'Saito.Cache.CategoriesForAccession.'.$accession,
+				function() use ($accession) {
 					return $this->find('list', [
 						'conditions' => ['accession <=' => $accession],
 						'fields' => ['Category.id', 'Category.category'],
@@ -52,7 +52,7 @@ 
 			if (!isset($this->id)) {
 				return false;
 			}
-			if ((int)$targetCategory === (int)$this->id) {
+			if ((int) $targetCategory === (int) $this->id) {
 				return true;
 			}
 

Indentation +101 added lines, -101 removed lines

@@ -1,109 +1,109 @@
 <?php
 
-	App::uses('AppSettingModel', 'Lib/Model');
-
-	class Category extends AppSettingModel {
-
-		public $name = 'Category';
-
-		public $actsAs = array('Containable');
-
-		public $cacheQueries = true;
-
-		public $hasMany = [
-			'Entry' => [
-				'className' => 'Entry',
-				'foreignKey' => 'category_id'
-			]
-		];
-
-		public $validate = [
-			'category_order' => [
-				'numeric' => [
-					'rule' => ['numeric']
-				]
-			],
-			'accession' => [
-				'numeric' => [
-					'rule' => ['numeric']
-				]
-			]
-		];
-
-		protected $_cache = [];
-
-		public function getCategoriesForAccession($accession) {
-			if (!empty($this->_cache[$accession])) {
-				return $this->_cache[$accession];
-			}
-			$this->_cache[$accession] = Cache::remember(
-				'Saito.Cache.CategoriesForAccession.' . $accession,
-				function () use ($accession) {
-					return $this->find('list', [
-						'conditions' => ['accession <=' => $accession],
-						'fields' => ['Category.id', 'Category.category'],
-						'order' => 'category_order ASC'
-					]);
-				});
-			return $this->_cache[$accession];
-		}
-
-		public function mergeIntoCategory($targetCategory) {
-			if (!isset($this->id)) {
-				return false;
-			}
-			if ((int)$targetCategory === (int)$this->id) {
-				return true;
-			}
-
-			$this->Entry->contain();
-			return $this->Entry->updateAll(
-				array('Entry.category' => $targetCategory),
-				array('Entry.category' => $this->id)
-			);
-		}
-
-		public function deleteWithAllEntries() {
-			if (!isset($this->id)) {
-				return false;
-			}
-
-			$this->Entry->contain();
-			$entriesDeleted = $this->Entry->deleteAll(
-				array('Entry.category' => $this->id),
-				false
-			);
-
-			return parent::delete($this->field('id'), false) && $entriesDeleted;
-		}
+    App::uses('AppSettingModel', 'Lib/Model');
+
+    class Category extends AppSettingModel {
+
+        public $name = 'Category';
+
+        public $actsAs = array('Containable');
+
+        public $cacheQueries = true;
+
+        public $hasMany = [
+            'Entry' => [
+                'className' => 'Entry',
+                'foreignKey' => 'category_id'
+            ]
+        ];
+
+        public $validate = [
+            'category_order' => [
+                'numeric' => [
+                    'rule' => ['numeric']
+                ]
+            ],
+            'accession' => [
+                'numeric' => [
+                    'rule' => ['numeric']
+                ]
+            ]
+        ];
+
+        protected $_cache = [];
+
+        public function getCategoriesForAccession($accession) {
+            if (!empty($this->_cache[$accession])) {
+                return $this->_cache[$accession];
+            }
+            $this->_cache[$accession] = Cache::remember(
+                'Saito.Cache.CategoriesForAccession.' . $accession,
+                function () use ($accession) {
+                    return $this->find('list', [
+                        'conditions' => ['accession <=' => $accession],
+                        'fields' => ['Category.id', 'Category.category'],
+                        'order' => 'category_order ASC'
+                    ]);
+                });
+            return $this->_cache[$accession];
+        }
+
+        public function mergeIntoCategory($targetCategory) {
+            if (!isset($this->id)) {
+                return false;
+            }
+            if ((int)$targetCategory === (int)$this->id) {
+                return true;
+            }
+
+            $this->Entry->contain();
+            return $this->Entry->updateAll(
+                array('Entry.category' => $targetCategory),
+                array('Entry.category' => $this->id)
+            );
+        }
+
+        public function deleteWithAllEntries() {
+            if (!isset($this->id)) {
+                return false;
+            }
+
+            $this->Entry->contain();
+            $entriesDeleted = $this->Entry->deleteAll(
+                array('Entry.category' => $this->id),
+                false
+            );
+
+            return parent::delete($this->field('id'), false) && $entriesDeleted;
+        }
 
 /**
  * Updates thread counter from entry table
  *
  * @return integer current thread count
  */
-		public function updateThreadCounter() {
-			// @performance
-			$count = $this->Entry->find(
-				'count',
-				[
-					'contain' => false,
-					'conditions' => [
-						'pid' => 0,
-						'Entry.category_id' => $this->id
-					]
-				]
-			);
-			$this->saveField('thread_count', $count);
-			return $count;
-		}
-
-		public function afterSave($created, $options = array()) {
-			// don't empty cache if it's only a thread count update
-			if (!$created && !isset($this->data[$this->alias]['category'])) {
-				$options['clearCache'] = false;
-			}
-			parent::afterSave($created, $options);
-		}
-
-	}
\ No newline at end of file
+        public function updateThreadCounter() {
+            // @performance
+            $count = $this->Entry->find(
+                'count',
+                [
+                    'contain' => false,
+                    'conditions' => [
+                        'pid' => 0,
+                        'Entry.category_id' => $this->id
+                    ]
+                ]
+            );
+            $this->saveField('thread_count', $count);
+            return $count;
+        }
+
+        public function afterSave($created, $options = array()) {
+            // don't empty cache if it's only a thread count update
+            if (!$created && !isset($this->data[$this->alias]['category'])) {
+                $options['clearCache'] = false;
+            }
+            parent::afterSave($created, $options);
+        }
+
+    }
\ No newline at end of file

app/Model/User.php

Spacing +5 added lines, -5 removed lines

@@ -363,7 +363,7 @@ 
 		}
 
 		public function paginate($conditions, $fields, $order, $limit, $page = 1, $recursive = null, $extra = array()) {
-			$username = $this->alias . '.' . 'username';
+			$username = $this->alias.'.'.'username';
 			if (isset($order[$username])) {
 				$direction = $order[$username];
 				unset($order[$username]);
@@ -553,8 +553,8 @@ 
 				$this->set('user_category_custom', $newCats);
 				$this->save();
 			} else {
-				$category = (int)$category;
-				if ($category > 0 && $this->Entry->Category->exists((int)$category)) {
+				$category = (int) $category;
+				if ($category > 0 && $this->Entry->Category->exists((int) $category)) {
 					$this->set('user_category_active', $category);
 					$this->save();
 				} else {
@@ -601,8 +601,8 @@ 
 			if ($state === 'before') {
 				$query['contain'] = false;
 				$query['limit'] = 1;
-				$query['conditions'][$this->alias . '.activate_code'] = 0;
-				$query['order'] = $this->alias . '.id DESC';
+				$query['conditions'][$this->alias.'.activate_code'] = 0;
+				$query['order'] = $this->alias.'.id DESC';
 				return $query;
 			}
 			if (empty($results[0])) {

Indentation +541 added lines, -541 removed lines

@@ -1,230 +1,230 @@ 
 <?php
 
-	App::uses('AppModel', 'Model');
-	App::uses('CakeEvent', 'Event');
+    App::uses('AppModel', 'Model');
+    App::uses('CakeEvent', 'Event');
 
-	/*
+    /*
 	 * Authentication methods
 	 */
-	App::uses('BlowfishPasswordHasher', 'Controller/Component/Auth');
-	App::uses('MlfPasswordHasher', 'Controller/Component/Auth');
-	App::uses('Mlf2PasswordHasher', 'Controller/Component/Auth');
+    App::uses('BlowfishPasswordHasher', 'Controller/Component/Auth');
+    App::uses('MlfPasswordHasher', 'Controller/Component/Auth');
+    App::uses('Mlf2PasswordHasher', 'Controller/Component/Auth');
 
 /**
  * @td verify that old pw is needed for changing pw(?) [See user.test.php both validatePw tests]
  */
-	class User extends AppModel {
-
-		public $name = 'User';
-
-		public $actsAs = [
-			'Containable',
-			'Cron.Cron' => [
-				'registerGc' => [
-					'id' => 'User.registerGc',
-					'due' => 'daily',
-				],
-				'userBlockGc' => [
-					'id' => 'User.userBlockGc',
-					'due' => '+15 minutes',
-				]
-			]
-		];
-
-		public $hasOne = array(
-			'UserOnline' => [
-				'className' => 'UserOnline',
-				'foreignKey' => 'user_id',
-			]
-		);
-
-		public $hasMany = array(
-			'UserBlock' => [
-				'foreignKey' => 'user_id',
-				'dependent' => true,
-				'order' => ['UserBlock.ended IS NULL DESC', 'UserBlock.ended DESC', 'UserBlock.id DESC']
-			],
-			'Bookmark' => array(
-				'foreignKey' => 'user_id',
-				'dependent' => true
-			),
-			'Esnotification' => array(
-				'foreignKey' => 'user_id'
-			),
-			'Entry' => array(
-				'className' => 'Entry',
-				'foreignKey' => 'user_id'
-			),
-			'UserRead' => [
-					'className' => 'UserRead',
-					'foreignKey' => 'user_id',
-					'dependent' => true
-			],
-			'Upload' => array(
-				'className' => 'Upload',
-				'foreignKey' => 'user_id'
-			),
-			'Ignore' => [
-				'className' => 'UserIgnore',
-				'foreignKey' => 'user_id'
-			]
-		);
-
-		public $validate = [
-				'username' => [
-						'isUnique' => ['rule' => 'isUniqueCiString'],
-						'notEmpty' => ['rule' => 'notBlank'],
-						'hasAllowedChars' => ['rule' => ['validateHasAllowedChars']],
-						'isUsernameEqual' => [
-							'on' => 'create',
-							'rule' => 'validateUsernameEqual'
-						]
-				],
-				'user_type' => [
-						'allowedChoice' => ['rule' => ['inList', ['user', 'admin', 'mod']]]
-				],
-				'password' => [
-						'notEmpty' => ['rule' => 'notBlank'],
-						'pwConfirm' => [
-								'rule' => ['validateConfirmPassword'],
-								'message' => 'validation_error_pwConfirm'
-						]
-				],
-				'password_old' => [
-						'notEmpty' => [
-								'rule' => 'notBlank',
-								'last' => 'true',
-						],
-						'pwCheckOld' => [
-								'rule' => ['validateCheckOldPassword'],
-								'last' => 'true',
-								'message' => 'validation_error_pwCheckOld'
-						]
-				],
-				'user_email' => [
-						'isUnique' => ['rule' => 'isUnique', 'last' => 'true'],
-						'isEmail' => ['rule' => ['email', true], 'last' => 'true']
-				],
-				'registered' => ['rule' => ['notBlank']],
-				'logins' => ['rule' => 'numeric'],
-				'personal_messages' => ['rule' => ['boolean']],
-				'user_lock' => ['rule' => ['boolean']],
-				'activate_code' => [
-						'numeric' => ['rule' => 'numeric', 'allowEmpty' => false],
-						'between' => ['rule' => ['between', 0, 9999999]]
-				],
-				'user_signatures_hide' => ['rule' => ['boolean']],
-				'user_signature_images_hide' => ['rule' => ['boolean']],
-				'user_forum_refresh_time' => [
-						'numeric' => ['rule' => 'numeric'],
-						'greaterNull' => ['rule' => ['comparison', '>=', 0]],
-						'maxLength' => ['rule' => ['maxLength', 3]],
-				],
-				'user_automaticaly_mark_as_read' => ['rule' => ['boolean']],
-				'user_sort_last_answer' => ['rule' => ['boolean']],
-				'user_color_new_postings' => [
-					'allowEmpty' => true,
-					'rule' => '/^#?[a-f0-9]{0,6}$/i'
-				],
-				'user_color_old_postings' => [
-						'allowEmpty' => true,
-						'rule' => '/^#?[a-f0-9]{0,6}$/i',
-						'message' => '*'
-				],
-				'user_color_actual_posting' => [
-					'allowEmpty' => true,
-					'rule' => '/^#?[a-f0-9]{0,6}$/i'
-				],
-				'user_place_lat' => [
-					'validLatitude' => ['rule' => ['inRange', -90, 90],
-						'allowEmpty' => true],
-				],
-				'user_place_lng' => [
-					'validLongitude' => ['rule' => ['inRange', -180, 180],
-						'allowEmpty' => true],
-				],
-				'user_place_zoom' => [
-					'numeric' => ['rule' => ['naturalNumber', 0], 'allowEmpty' => true],
-					'between' => ['rule' => ['inRange', 0, 25]]
-				]
-		];
-
-		public $findMethods = [
-				'latest' => true
-		];
-
-		protected $_passwordHasher = [
-			'BlowfishPasswordHasher',
-			'Mlf2PasswordHasher',
-			'MlfPasswordHasher'
-		];
-
-		protected $_settings = [
-			'user_name_disallowed_chars' => ['\'', ';', '&', '<', '>']
-		];
+    class User extends AppModel {
+
+        public $name = 'User';
+
+        public $actsAs = [
+            'Containable',
+            'Cron.Cron' => [
+                'registerGc' => [
+                    'id' => 'User.registerGc',
+                    'due' => 'daily',
+                ],
+                'userBlockGc' => [
+                    'id' => 'User.userBlockGc',
+                    'due' => '+15 minutes',
+                ]
+            ]
+        ];
+
+        public $hasOne = array(
+            'UserOnline' => [
+                'className' => 'UserOnline',
+                'foreignKey' => 'user_id',
+            ]
+        );
+
+        public $hasMany = array(
+            'UserBlock' => [
+                'foreignKey' => 'user_id',
+                'dependent' => true,
+                'order' => ['UserBlock.ended IS NULL DESC', 'UserBlock.ended DESC', 'UserBlock.id DESC']
+            ],
+            'Bookmark' => array(
+                'foreignKey' => 'user_id',
+                'dependent' => true
+            ),
+            'Esnotification' => array(
+                'foreignKey' => 'user_id'
+            ),
+            'Entry' => array(
+                'className' => 'Entry',
+                'foreignKey' => 'user_id'
+            ),
+            'UserRead' => [
+                    'className' => 'UserRead',
+                    'foreignKey' => 'user_id',
+                    'dependent' => true
+            ],
+            'Upload' => array(
+                'className' => 'Upload',
+                'foreignKey' => 'user_id'
+            ),
+            'Ignore' => [
+                'className' => 'UserIgnore',
+                'foreignKey' => 'user_id'
+            ]
+        );
+
+        public $validate = [
+                'username' => [
+                        'isUnique' => ['rule' => 'isUniqueCiString'],
+                        'notEmpty' => ['rule' => 'notBlank'],
+                        'hasAllowedChars' => ['rule' => ['validateHasAllowedChars']],
+                        'isUsernameEqual' => [
+                            'on' => 'create',
+                            'rule' => 'validateUsernameEqual'
+                        ]
+                ],
+                'user_type' => [
+                        'allowedChoice' => ['rule' => ['inList', ['user', 'admin', 'mod']]]
+                ],
+                'password' => [
+                        'notEmpty' => ['rule' => 'notBlank'],
+                        'pwConfirm' => [
+                                'rule' => ['validateConfirmPassword'],
+                                'message' => 'validation_error_pwConfirm'
+                        ]
+                ],
+                'password_old' => [
+                        'notEmpty' => [
+                                'rule' => 'notBlank',
+                                'last' => 'true',
+                        ],
+                        'pwCheckOld' => [
+                                'rule' => ['validateCheckOldPassword'],
+                                'last' => 'true',
+                                'message' => 'validation_error_pwCheckOld'
+                        ]
+                ],
+                'user_email' => [
+                        'isUnique' => ['rule' => 'isUnique', 'last' => 'true'],
+                        'isEmail' => ['rule' => ['email', true], 'last' => 'true']
+                ],
+                'registered' => ['rule' => ['notBlank']],
+                'logins' => ['rule' => 'numeric'],
+                'personal_messages' => ['rule' => ['boolean']],
+                'user_lock' => ['rule' => ['boolean']],
+                'activate_code' => [
+                        'numeric' => ['rule' => 'numeric', 'allowEmpty' => false],
+                        'between' => ['rule' => ['between', 0, 9999999]]
+                ],
+                'user_signatures_hide' => ['rule' => ['boolean']],
+                'user_signature_images_hide' => ['rule' => ['boolean']],
+                'user_forum_refresh_time' => [
+                        'numeric' => ['rule' => 'numeric'],
+                        'greaterNull' => ['rule' => ['comparison', '>=', 0]],
+                        'maxLength' => ['rule' => ['maxLength', 3]],
+                ],
+                'user_automaticaly_mark_as_read' => ['rule' => ['boolean']],
+                'user_sort_last_answer' => ['rule' => ['boolean']],
+                'user_color_new_postings' => [
+                    'allowEmpty' => true,
+                    'rule' => '/^#?[a-f0-9]{0,6}$/i'
+                ],
+                'user_color_old_postings' => [
+                        'allowEmpty' => true,
+                        'rule' => '/^#?[a-f0-9]{0,6}$/i',
+                        'message' => '*'
+                ],
+                'user_color_actual_posting' => [
+                    'allowEmpty' => true,
+                    'rule' => '/^#?[a-f0-9]{0,6}$/i'
+                ],
+                'user_place_lat' => [
+                    'validLatitude' => ['rule' => ['inRange', -90, 90],
+                        'allowEmpty' => true],
+                ],
+                'user_place_lng' => [
+                    'validLongitude' => ['rule' => ['inRange', -180, 180],
+                        'allowEmpty' => true],
+                ],
+                'user_place_zoom' => [
+                    'numeric' => ['rule' => ['naturalNumber', 0], 'allowEmpty' => true],
+                    'between' => ['rule' => ['inRange', 0, 25]]
+                ]
+        ];
+
+        public $findMethods = [
+                'latest' => true
+        ];
+
+        protected $_passwordHasher = [
+            'BlowfishPasswordHasher',
+            'Mlf2PasswordHasher',
+            'MlfPasswordHasher'
+        ];
+
+        protected $_settings = [
+            'user_name_disallowed_chars' => ['\'', ';', '&', '<', '>']
+        ];
 
 /**
  * @param null $lastRefresh
  *
  * @throws Exception
  */
-		public function setLastRefresh($lastRefresh = null) {
-			Stopwatch::start('Users->setLastRefresh()');
-			$data[$this->alias]['last_refresh_tmp'] = bDate();
-
-			if ($lastRefresh) {
-				$data[$this->alias]['last_refresh'] = $lastRefresh;
-			}
-
-			$this->contain();
-			$success = $this->save($data,
-					[
-							'callbacks' => false,
-							'counterCache' => false,
-							'validate' => false,
-							'fieldList' => ['last_refresh_tmp', 'last_refresh']
-					]);
-			if ($success == false) {
-				throw new Exception("Updating last user refresh failed.");
-			}
-			Stopwatch::end('Users->setLastRefresh()');
-		}
-
-		public function numberOfEntries() {
-			/*
+        public function setLastRefresh($lastRefresh = null) {
+            Stopwatch::start('Users->setLastRefresh()');
+            $data[$this->alias]['last_refresh_tmp'] = bDate();
+
+            if ($lastRefresh) {
+                $data[$this->alias]['last_refresh'] = $lastRefresh;
+            }
+
+            $this->contain();
+            $success = $this->save($data,
+                    [
+                            'callbacks' => false,
+                            'counterCache' => false,
+                            'validate' => false,
+                            'fieldList' => ['last_refresh_tmp', 'last_refresh']
+                    ]);
+            if ($success == false) {
+                throw new Exception("Updating last user refresh failed.");
+            }
+            Stopwatch::end('Users->setLastRefresh()');
+        }
+
+        public function numberOfEntries() {
+            /*
 			  # @mlf change after mlf is gone, we only use `entry_count` then
 			  $count = $this->data['User']['entry_count'];
 			  if ( $count == 0 )
 			 */ {
-				$count = $this->Entry->find('count',
-					array(
-						'contain' => false,
-						'conditions' => array('Entry.user_id' => $this->id),
-					)
-				);
-			}
-			return $count;
-		}
-
-		public function incrementLogins($id, $amount = 1) {
-			$data = [
-				$this->alias => [
-					'id' => $id,
-					'logins' => $this->field('logins') + $amount,
-					'last_login' => bDate()
-				]
-			];
-			if ($this->save($data, true, ['logins', 'last_login']) == false) {
-				throw new Exception('Increment logins failed.');
-			}
-		}
-
-		public function userlist() {
-			return $this->find('list', [
-				'contain' => false,
-				'fields' => 'username'
-			]);
-		}
+                $count = $this->Entry->find('count',
+                    array(
+                        'contain' => false,
+                        'conditions' => array('Entry.user_id' => $this->id),
+                    )
+                );
+            }
+            return $count;
+        }
+
+        public function incrementLogins($id, $amount = 1) {
+            $data = [
+                $this->alias => [
+                    'id' => $id,
+                    'logins' => $this->field('logins') + $amount,
+                    'last_login' => bDate()
+                ]
+            ];
+            if ($this->save($data, true, ['logins', 'last_login']) == false) {
+                throw new Exception('Increment logins failed.');
+            }
+        }
+
+        public function userlist() {
+            return $this->find('list', [
+                'contain' => false,
+                'fields' => 'username'
+            ]);
+        }
 
 /**
  * Removes a user and all his data execpt for his entries
@@ -232,152 +232,152 @@ 
  * @param int $id user-ID
  * @return boolean
  */
-		public function deleteAllExceptEntries($id) {
-			if ($id == 1) {
-				return false;
-			}
-
-			$success = true;
-			$success = $success && $this->Upload->deleteAllFromUser($id);
-			$success = $success && $this->Esnotification->deleteAllFromUser($id);
-			$success = $success && $this->Entry->anonymizeEntriesFromUser($id);
-			$success = $success && $this->Ignore->deleteUser($id);
-			$success = $success && $this->UserOnline->deleteAll(
-						['user_id' => $id],
-						false
-					);
-			$success = $success && $this->delete($id, true);
-			return $success;
-		}
-
-		public function autoUpdatePassword($id, $password) {
-			$this->contain();
-			$data = $this->read(null, $id);
-			$oldPassword = $data[$this->alias]['password'];
-			$blowfishHashIdentifier = '$2a$';
-			if (strpos($oldPassword, $blowfishHashIdentifier) !== 0):
-				$this->saveField('password', $password);
-			endif;
-		}
-
-		public function afterFind($results, $primary = false) {
-			$results = parent::afterFind($results, $primary);
-
-			if (isset($results[0][$this->alias])) {
-				if (array_key_exists('user_color_new_postings',
-						$results[0][$this->alias])
-				) {
-					//* @td refactor this shit
-					if (empty($results[0][$this->alias]['user_color_new_postings'])) {
-						$results[0][$this->alias]['user_color_new_postings'] = '#';
-						$results[0][$this->alias]['user_color_old_postings'] = '#';
-						$results[0][$this->alias]['user_color_actual_posting'] = '#';
-					}
-				}
-
-				if (isset($results[0][$this->alias]['user_category_custom'])) {
-					if (empty($results[0][$this->alias]['user_category_custom'])) {
-						$results[0][$this->alias]['user_category_custom'] = [];
-					} else {
-						$results[0][$this->alias]['user_category_custom'] =
-								unserialize($results[0][$this->alias]['user_category_custom']);
-					}
-				}
-			}
-
-			return $results;
-		}
-
-		public function afterSave($created, $options = []) {
-			if ($created === false && isset($this->data[$this->alias]['username'])) {
-				$this->_dispatchEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
-			}
-		}
-
-		public function beforeSave($options = array()) {
-			parent::beforeSave($options);
-			if (isset($this->data[$this->alias]['password'])) {
-				if (!empty($this->data[$this->alias]['password'])) {
-					$this->data[$this->alias]['password'] = $this->_hashPassword($this->data[$this->alias]['password']);
-				}
-			}
-
-			if (isset($this->data[$this->alias]['user_category_custom'])) {
-				$this->data[$this->alias]['user_category_custom'] =
-						serialize($this->data[$this->alias]['user_category_custom']);
-			}
-
-			return true;
-		}
-
-		public function beforeValidate($options = array()) {
-			parent::beforeValidate($options);
-
-			if (isset($this->data[$this->alias]['user_forum_refresh_time'])
-					&& empty($this->data[$this->alias]['user_forum_refresh_time'])) {
-				$this->data[$this->alias]['user_forum_refresh_time'] = 0;
-			}
-		}
-
-		public function validateCheckOldPassword($data) {
-			$this->contain('UserOnline');
-			$oldPw = $this->field('password');
-			return $this->_checkPassword($data['password_old'], $oldPw);
-		}
-
-		public function validateConfirmPassword($data) {
-			$valid = false;
-			if (isset($this->data[$this->alias]['password_confirm'])
-					&& $data['password'] == $this->data[$this->alias]['password_confirm']) {
-				$valid = true;
-			}
-			return $valid;
-		}
-
-		public function validateHasAllowedChars($data) {
-			foreach ($this->_setting('user_name_disallowed_chars') as $char) {
-				if (mb_strpos($data['username'], $char) !== false) {
-					return false;
-				}
-			}
-			return true;
-		}
-
-		/**
-		 * checks if equal username exists
-		 */
-		public function validateUsernameEqual($data) {
-			Stopwatch::start('validateUsernameEqual');
-			$users = $this->userlist();
-			foreach ($users as $name) {
-				if ($name === $data['username']) {
-					continue;
-				}
-				$distance = levenshtein($data['username'], $name);
-				if ($distance < 2) {
-					return __('error.name.equalExists', $name);
-				}
-			}
-			Stopwatch::stop('validateUsernameEqual');
-			return true;
-		}
-
-		public function paginate($conditions, $fields, $order, $limit, $page = 1, $recursive = null, $extra = array()) {
-			$username = $this->alias . '.' . 'username';
-			if (isset($order[$username])) {
-				$direction = $order[$username];
-				unset($order[$username]);
-			} else {
-				$direction = 'asc';
-			}
-			$order['LOWER(User.username)'] = $direction;
-
-			// merge $extras for 'contain' parameter
-			$params = array_merge(compact('conditions', 'fields', 'order', 'limit',
-				'page', 'recursive', 'group'), $extra);
-
-			return $this->find('all', $params);
-		}
+        public function deleteAllExceptEntries($id) {
+            if ($id == 1) {
+                return false;
+            }
+
+            $success = true;
+            $success = $success && $this->Upload->deleteAllFromUser($id);
+            $success = $success && $this->Esnotification->deleteAllFromUser($id);
+            $success = $success && $this->Entry->anonymizeEntriesFromUser($id);
+            $success = $success && $this->Ignore->deleteUser($id);
+            $success = $success && $this->UserOnline->deleteAll(
+                        ['user_id' => $id],
+                        false
+                    );
+            $success = $success && $this->delete($id, true);
+            return $success;
+        }
+
+        public function autoUpdatePassword($id, $password) {
+            $this->contain();
+            $data = $this->read(null, $id);
+            $oldPassword = $data[$this->alias]['password'];
+            $blowfishHashIdentifier = '$2a$';
+            if (strpos($oldPassword, $blowfishHashIdentifier) !== 0):
+                $this->saveField('password', $password);
+            endif;
+        }
+
+        public function afterFind($results, $primary = false) {
+            $results = parent::afterFind($results, $primary);
+
+            if (isset($results[0][$this->alias])) {
+                if (array_key_exists('user_color_new_postings',
+                        $results[0][$this->alias])
+                ) {
+                    //* @td refactor this shit
+                    if (empty($results[0][$this->alias]['user_color_new_postings'])) {
+                        $results[0][$this->alias]['user_color_new_postings'] = '#';
+                        $results[0][$this->alias]['user_color_old_postings'] = '#';
+                        $results[0][$this->alias]['user_color_actual_posting'] = '#';
+                    }
+                }
+
+                if (isset($results[0][$this->alias]['user_category_custom'])) {
+                    if (empty($results[0][$this->alias]['user_category_custom'])) {
+                        $results[0][$this->alias]['user_category_custom'] = [];
+                    } else {
+                        $results[0][$this->alias]['user_category_custom'] =
+                                unserialize($results[0][$this->alias]['user_category_custom']);
+                    }
+                }
+            }
+
+            return $results;
+        }
+
+        public function afterSave($created, $options = []) {
+            if ($created === false && isset($this->data[$this->alias]['username'])) {
+                $this->_dispatchEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
+            }
+        }
+
+        public function beforeSave($options = array()) {
+            parent::beforeSave($options);
+            if (isset($this->data[$this->alias]['password'])) {
+                if (!empty($this->data[$this->alias]['password'])) {
+                    $this->data[$this->alias]['password'] = $this->_hashPassword($this->data[$this->alias]['password']);
+                }
+            }
+
+            if (isset($this->data[$this->alias]['user_category_custom'])) {
+                $this->data[$this->alias]['user_category_custom'] =
+                        serialize($this->data[$this->alias]['user_category_custom']);
+            }
+
+            return true;
+        }
+
+        public function beforeValidate($options = array()) {
+            parent::beforeValidate($options);
+
+            if (isset($this->data[$this->alias]['user_forum_refresh_time'])
+                    && empty($this->data[$this->alias]['user_forum_refresh_time'])) {
+                $this->data[$this->alias]['user_forum_refresh_time'] = 0;
+            }
+        }
+
+        public function validateCheckOldPassword($data) {
+            $this->contain('UserOnline');
+            $oldPw = $this->field('password');
+            return $this->_checkPassword($data['password_old'], $oldPw);
+        }
+
+        public function validateConfirmPassword($data) {
+            $valid = false;
+            if (isset($this->data[$this->alias]['password_confirm'])
+                    && $data['password'] == $this->data[$this->alias]['password_confirm']) {
+                $valid = true;
+            }
+            return $valid;
+        }
+
+        public function validateHasAllowedChars($data) {
+            foreach ($this->_setting('user_name_disallowed_chars') as $char) {
+                if (mb_strpos($data['username'], $char) !== false) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /**
+         * checks if equal username exists
+         */
+        public function validateUsernameEqual($data) {
+            Stopwatch::start('validateUsernameEqual');
+            $users = $this->userlist();
+            foreach ($users as $name) {
+                if ($name === $data['username']) {
+                    continue;
+                }
+                $distance = levenshtein($data['username'], $name);
+                if ($distance < 2) {
+                    return __('error.name.equalExists', $name);
+                }
+            }
+            Stopwatch::stop('validateUsernameEqual');
+            return true;
+        }
+
+        public function paginate($conditions, $fields, $order, $limit, $page = 1, $recursive = null, $extra = array()) {
+            $username = $this->alias . '.' . 'username';
+            if (isset($order[$username])) {
+                $direction = $order[$username];
+                unset($order[$username]);
+            } else {
+                $direction = 'asc';
+            }
+            $order['LOWER(User.username)'] = $direction;
+
+            // merge $extras for 'contain' parameter
+            $params = array_merge(compact('conditions', 'fields', 'order', 'limit',
+                'page', 'recursive', 'group'), $extra);
+
+            return $this->find('all', $params);
+        }
 
 /**
  * Registers new user
@@ -385,141 +385,141 @@ 
  * @param array $data
  * @return bool true if user got registred false otherwise
  */
-		public function register($data, $activate = false) {
-			$defaults = [
-				'registered' => bDate(),
-				'user_type' => 'user'
-			];
-			$fields = ['registered', 'username',
-				'user_email', 'password', 'user_type'];
-
-			if ($activate !== true) {
-				$defaults['activate_code'] = mt_rand(1000000, 9999999);
-				$fields[] = 'activate_code';
-			}
-
-			$data = array_merge($data[$this->alias], $defaults);
-
-			if (!$this->requireFields($data, $fields) || !$this->unsetFields($data)) {
-				return false;
-			}
-
-			$this->create();
-			$user = $this->save($data, true, $fields);
-			if (empty($user)) {
-				return false;
-			}
-			$user['User']['id'] = $this->id;
-			return $user;
-		}
+        public function register($data, $activate = false) {
+            $defaults = [
+                'registered' => bDate(),
+                'user_type' => 'user'
+            ];
+            $fields = ['registered', 'username',
+                'user_email', 'password', 'user_type'];
+
+            if ($activate !== true) {
+                $defaults['activate_code'] = mt_rand(1000000, 9999999);
+                $fields[] = 'activate_code';
+            }
+
+            $data = array_merge($data[$this->alias], $defaults);
+
+            if (!$this->requireFields($data, $fields) || !$this->unsetFields($data)) {
+                return false;
+            }
+
+            $this->create();
+            $user = $this->save($data, true, $fields);
+            if (empty($user)) {
+                return false;
+            }
+            $user['User']['id'] = $this->id;
+            return $user;
+        }
 
 /**
  * Garbage collection for registration
  *
  * Deletes all timed out and unactivated registrations
  */
-		public function registerGc() {
-			$this->deleteAll([
-							'activate_code >' => 0,
-							'registered <' => bDate(time() - 86400)
-					],
-					false);
-		}
-
-		/**
-		 * calls garbage collection for UserBlock
-		 *
-		 * UserBlock is lazy-loaded rarely and gc may not trigger often enough (at
-		 * least with manual blocking and ignore blocking only)
-		 */
-		public function userBlockGc() {
-			$this->UserBlock->gc();
-		}
-
-		/**
-		 * activates user
-		 *
-		 * @param $id user-ID
-		 * @param $code activation code
-		 * @return array|bool false if activation failed; array with status and user data on success
-		 * @throws InvalidArgumentException
-		 */
-		public function activate($id, $code) {
-			if (!is_int($id) || !is_string($code)) {
-				throw new InvalidArgumentException();
-			}
-
-			$user = $this->find('first', [
-				'contain' => false,
-				'conditions' => ['id' => $id]
-			]);
-			if (empty($user)) {
-				throw new InvalidArgumentException();
-			}
-
-			$user = $user[$this->alias];
-			$activateCode = strval($user['activate_code']);
-
-			if (empty($activateCode)) {
-				return ['status' => 'already', 'User' => $user];
-			} elseif ($activateCode !== $code) {
-				return false;
-			}
-
-			$success = $this->save(['id' => $id, 'activate_code' => 0]);
-			if (empty($success)) {
-				return false;
-			}
-			$user['activate_code'] = 0;
-
-			$this->_dispatchEvent('Model.User.afterActivate', ['User' => $user]);
-
-			return ['status' => 'activated', 'User' => $user];
-		}
+        public function registerGc() {
+            $this->deleteAll([
+                            'activate_code >' => 0,
+                            'registered <' => bDate(time() - 86400)
+                    ],
+                    false);
+        }
+
+        /**
+         * calls garbage collection for UserBlock
+         *
+         * UserBlock is lazy-loaded rarely and gc may not trigger often enough (at
+         * least with manual blocking and ignore blocking only)
+         */
+        public function userBlockGc() {
+            $this->UserBlock->gc();
+        }
+
+        /**
+         * activates user
+         *
+         * @param $id user-ID
+         * @param $code activation code
+         * @return array|bool false if activation failed; array with status and user data on success
+         * @throws InvalidArgumentException
+         */
+        public function activate($id, $code) {
+            if (!is_int($id) || !is_string($code)) {
+                throw new InvalidArgumentException();
+            }
+
+            $user = $this->find('first', [
+                'contain' => false,
+                'conditions' => ['id' => $id]
+            ]);
+            if (empty($user)) {
+                throw new InvalidArgumentException();
+            }
+
+            $user = $user[$this->alias];
+            $activateCode = strval($user['activate_code']);
+
+            if (empty($activateCode)) {
+                return ['status' => 'already', 'User' => $user];
+            } elseif ($activateCode !== $code) {
+                return false;
+            }
+
+            $success = $this->save(['id' => $id, 'activate_code' => 0]);
+            if (empty($success)) {
+                return false;
+            }
+            $user['activate_code'] = 0;
+
+            $this->_dispatchEvent('Model.User.afterActivate', ['User' => $user]);
+
+            return ['status' => 'activated', 'User' => $user];
+        }
 
 /**
  *
  * @param int $id user-id
  * @return bool|array false if not found, array otherwise
  */
-		public function getProfile($id) {
-			// @perf Ignore is currently retrieved via second query, consider moving
-			// it as cache into user-table
-			$user = $this->find(
-				'first',
-				['contain' => ['Ignore'], 'conditions' => ['id' => $id]]
-			);
-			if ($user) {
-				$user = $user[$this->alias] + [
-						'ignores' => array_fill_keys(Hash::extract($user, 'Ignore.{n}.blocked_user_id'), 1)
-					];
-			}
-			return $user;
-		}
-
-		public function countSolved($id) {
-			$count = $this->Entry->find('count',
-					[
-							'contain' => false,
-							'conditions' => [
-									'Entry.user_id' => $id,
-									'Entry.solves >' => '0'
-							],
-						// only count if user is not thread starter/don't count self-answers
-							'joins' => [
-									[
-											'table' => $this->Entry->table,
-											'alias' => 'Root',
-											'type' => 'INNER',
-											'conditions' => [
-													'Root.id = Entry.solves',
-													'Root.user_id != Entry.user_id'
-											]
-									]
-							]
-					]);
-			return $count;
-		}
+        public function getProfile($id) {
+            // @perf Ignore is currently retrieved via second query, consider moving
+            // it as cache into user-table
+            $user = $this->find(
+                'first',
+                ['contain' => ['Ignore'], 'conditions' => ['id' => $id]]
+            );
+            if ($user) {
+                $user = $user[$this->alias] + [
+                        'ignores' => array_fill_keys(Hash::extract($user, 'Ignore.{n}.blocked_user_id'), 1)
+                    ];
+            }
+            return $user;
+        }
+
+        public function countSolved($id) {
+            $count = $this->Entry->find('count',
+                    [
+                            'contain' => false,
+                            'conditions' => [
+                                    'Entry.user_id' => $id,
+                                    'Entry.solves >' => '0'
+                            ],
+                        // only count if user is not thread starter/don't count self-answers
+                            'joins' => [
+                                    [
+                                            'table' => $this->Entry->table,
+                                            'alias' => 'Root',
+                                            'type' => 'INNER',
+                                            'conditions' => [
+                                                    'Root.id = Entry.solves',
+                                                    'Root.user_id != Entry.user_id'
+                                            ]
+                                    ]
+                            ]
+                    ]);
+            return $count;
+        }
 
 /**
  * Set view categories preferences
@@ -533,35 +533,35 @@ 
  * @param string|int|array $category
  * @throws InvalidArgumentException
  */
-		public function setCategory($category) {
-			if ($category === 'all') {
-				// set meta category 'all'
-				$this->set('user_category_active', -1);
-				$this->save();
-			} elseif (is_array($category)) {
-				// set custom set
-				$availableCats = $this->Entry->Category->find('list');
-				$categories = array_intersect_key($category, $availableCats);
-				if (count($categories) === 0) {
-					throw new InvalidArgumentException();
-				}
-				$newCats = [];
-				foreach ($categories as $cat => $v) {
-					$newCats[$cat] = ($v === true || $v === 1 || $v === '1');
-				}
-				$this->set('user_category_active', 0);
-				$this->set('user_category_custom', $newCats);
-				$this->save();
-			} else {
-				$category = (int)$category;
-				if ($category > 0 && $this->Entry->Category->exists((int)$category)) {
-					$this->set('user_category_active', $category);
-					$this->save();
-				} else {
-					throw new InvalidArgumentException();
-				}
-			}
-		}
+        public function setCategory($category) {
+            if ($category === 'all') {
+                // set meta category 'all'
+                $this->set('user_category_active', -1);
+                $this->save();
+            } elseif (is_array($category)) {
+                // set custom set
+                $availableCats = $this->Entry->Category->find('list');
+                $categories = array_intersect_key($category, $availableCats);
+                if (count($categories) === 0) {
+                    throw new InvalidArgumentException();
+                }
+                $newCats = [];
+                foreach ($categories as $cat => $v) {
+                    $newCats[$cat] = ($v === true || $v === 1 || $v === '1');
+                }
+                $this->set('user_category_active', 0);
+                $this->set('user_category_custom', $newCats);
+                $this->save();
+            } else {
+                $category = (int)$category;
+                if ($category > 0 && $this->Entry->Category->exists((int)$category)) {
+                    $this->set('user_category_active', $category);
+                    $this->save();
+                } else {
+                    throw new InvalidArgumentException();
+                }
+            }
+        }
 
 /**
  * Checks if password is valid against all supported auth methods
@@ -570,18 +570,18 @@ 
  * @param string $hash
  * @return boolean TRUE if password match FALSE otherwise
  */
-		protected function _checkPassword($password, $hash) {
-			$valid = false;
-			foreach ($this->_passwordHasher as $passwordHasher) {
-				$PasswordHasherInstance = new $passwordHasher();
-				// @: if hash is not valid hash blowfish Security::_crypt() triggers warnings
-				if (@$PasswordHasherInstance->check($password, $hash)) {
-					$valid = true;
-					break;
-				}
-			}
-			return $valid;
-		}
+        protected function _checkPassword($password, $hash) {
+            $valid = false;
+            foreach ($this->_passwordHasher as $passwordHasher) {
+                $PasswordHasherInstance = new $passwordHasher();
+                // @: if hash is not valid hash blowfish Security::_crypt() triggers warnings
+                if (@$PasswordHasherInstance->check($password, $hash)) {
+                    $valid = true;
+                    break;
+                }
+            }
+            return $valid;
+        }
 
 /**
  * Custom hash function used for authentication with Auth component
@@ -589,26 +589,26 @@ 
  * @param string $password
  * @return string hashed password
  */
-		protected function _hashPassword($password) {
-			$auth = new BlowfishPasswordHasher();
-			return $auth->hash($password);
-		}
-
-		/**
-		 * Find the latest, successfully registered user
-		 */
-		protected function _findLatest($state, $query, $results = []) {
-			if ($state === 'before') {
-				$query['contain'] = false;
-				$query['limit'] = 1;
-				$query['conditions'][$this->alias . '.activate_code'] = 0;
-				$query['order'] = $this->alias . '.id DESC';
-				return $query;
-			}
-			if (empty($results[0])) {
-				return [];
-			}
-			return $results[0];
-		}
-
-	}
+        protected function _hashPassword($password) {
+            $auth = new BlowfishPasswordHasher();
+            return $auth->hash($password);
+        }
+
+        /**
+         * Find the latest, successfully registered user
+         */
+        protected function _findLatest($state, $query, $results = []) {
+            if ($state === 'before') {
+                $query['contain'] = false;
+                $query['limit'] = 1;
+                $query['conditions'][$this->alias . '.activate_code'] = 0;
+                $query['order'] = $this->alias . '.id DESC';
+                return $query;
+            }
+            if (empty($results[0])) {
+                return [];
+            }
+            return $results[0];
+        }
+
+    }

app/Model/UserBlock.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
 					1420485052
 				);
 			}
-			$success = (bool)$this->save([
+			$success = (bool) $this->save([
 				'id' => $id,
 				'ended' => bDate(),
 				'ends' => null

Indentation +131 added lines, -131 removed lines

@@ -1,147 +1,147 @@
 <?php
 
-	App::uses('AppModel', 'Model');
-	App::import('Lib', 'UserBlocker');
+    App::uses('AppModel', 'Model');
+    App::import('Lib', 'UserBlocker');
 
-	/**
-	 * UserBlock Model
-	 *
-	 * states
-	 */
-	class UserBlock extends AppModel {
+    /**
+     * UserBlock Model
+     *
+     * states
+     */
+    class UserBlock extends AppModel {
 
-		public $actsAs = [
-			'Containable'
-		];
+        public $actsAs = [
+            'Containable'
+        ];
 
-		public $belongsTo = [
-			'User' => [
-				'className' => 'User',
-				'fields' => ['id', 'username'],
-				'foreignKey' => 'user_id'
-			],
-			'By' => [
-				'className' => 'User',
-				'fields' => ['id', 'username'],
-				'foreignKey' => 'blocked_by_user_id'
-			]
-		];
+        public $belongsTo = [
+            'User' => [
+                'className' => 'User',
+                'fields' => ['id', 'username'],
+                'foreignKey' => 'user_id'
+            ],
+            'By' => [
+                'className' => 'User',
+                'fields' => ['id', 'username'],
+                'foreignKey' => 'blocked_by_user_id'
+            ]
+        ];
 
-		public $findMethods = [
-			'toGc' => true
-		];
+        public $findMethods = [
+            'toGc' => true
+        ];
 
-		public $validate = [
-			'ends' => [
-				'rule' => ['datetime'],
-				'allowEmpty' => true
-			]
-		];
+        public $validate = [
+            'ends' => [
+                'rule' => ['datetime'],
+                'allowEmpty' => true
+            ]
+        ];
 
-		public function block($Blocker, $userId, $options) {
-			$Blocker->setUserBlockModel($this);
-			$success = $Blocker->block($userId, $options);
-			if ($success) {
-				$this->_updateIsBlocked($userId);
-			}
-			return $success;
-		}
+        public function block($Blocker, $userId, $options) {
+            $Blocker->setUserBlockModel($this);
+            $success = $Blocker->block($userId, $options);
+            if ($success) {
+                $this->_updateIsBlocked($userId);
+            }
+            return $success;
+        }
 
-		public function getBlockEndsForUser($userId) {
-			$block = $this->find('first', [
-				'contain' => false,
-				'conditions' => ['user_id' => $userId, 'ended' => null],
-				'order' => ['ends' => 'asc']
-			]);
-			return $block['UserBlock']['ends'];
-		}
+        public function getBlockEndsForUser($userId) {
+            $block = $this->find('first', [
+                'contain' => false,
+                'conditions' => ['user_id' => $userId, 'ended' => null],
+                'order' => ['ends' => 'asc']
+            ]);
+            return $block['UserBlock']['ends'];
+        }
 
-		/**
-		 * @param $id
-		 * @return bool true if unblocking was successful, false otherwise
-		 * @throws RuntimeException
-		 * @throws InvalidArgumentException
-		 */
-		public function unblock($id) {
-			$block = $this->find('first', [
-				'contain' => false,
-				'conditions' => ['id' => $id, 'ended' => null]
-			]);
-			if (empty($block)) {
-				throw new InvalidArgumentException(
-					"No active block with id $id found.",
-					1420485052
-				);
-			}
-			$success = (bool)$this->save([
-				'id' => $id,
-				'ended' => bDate(),
-				'ends' => null
-			]);
-			if (!$success) {
-				throw new RuntimeException;
-			}
-			$this->_updateIsBlocked($block[$this->alias]['user_id']);
-			return $success;
-		}
+        /**
+         * @param $id
+         * @return bool true if unblocking was successful, false otherwise
+         * @throws RuntimeException
+         * @throws InvalidArgumentException
+         */
+        public function unblock($id) {
+            $block = $this->find('first', [
+                'contain' => false,
+                'conditions' => ['id' => $id, 'ended' => null]
+            ]);
+            if (empty($block)) {
+                throw new InvalidArgumentException(
+                    "No active block with id $id found.",
+                    1420485052
+                );
+            }
+            $success = (bool)$this->save([
+                'id' => $id,
+                'ended' => bDate(),
+                'ends' => null
+            ]);
+            if (!$success) {
+                throw new RuntimeException;
+            }
+            $this->_updateIsBlocked($block[$this->alias]['user_id']);
+            return $success;
+        }
 
-		/**
-		 * Garbage collection
-		 *
-		 * called hourly from User model
-		 */
-		public function gc() {
-			$expired = $this->find('toGc');
-			foreach ($expired as $block) {
-				$this->unblock($block[$this->alias]['id']);
-			}
-		}
+        /**
+         * Garbage collection
+         *
+         * called hourly from User model
+         */
+        public function gc() {
+            $expired = $this->find('toGc');
+            foreach ($expired as $block) {
+                $this->unblock($block[$this->alias]['id']);
+            }
+        }
 
-		public function getAll() {
-			$blocklist = $this->find('all', [
-				'contain' => ['By', 'User'],
-				'order' => ['UserBlock.id' => 'DESC']
-			]);
-			$o = [];
-			foreach ($blocklist as $k => $b) {
-				$o[$k] = $b['UserBlock'];
-				$o[$k]['By'] = $b['By'];
-				$o[$k]['User'] = $b['User'];
-			}
-			return $o;
-		}
+        public function getAll() {
+            $blocklist = $this->find('all', [
+                'contain' => ['By', 'User'],
+                'order' => ['UserBlock.id' => 'DESC']
+            ]);
+            $o = [];
+            foreach ($blocklist as $k => $b) {
+                $o[$k] = $b['UserBlock'];
+                $o[$k]['By'] = $b['By'];
+                $o[$k]['User'] = $b['User'];
+            }
+            return $o;
+        }
 
-		public function getAllActive() {
-			$blocklist = $this->find('all', [
-				'contain' => false,
-				'conditions' => ['ended' => null],
-				'order' => ['UserBlock.id' => 'DESC']
-			]);
-			return $blocklist;
-		}
+        public function getAllActive() {
+            $blocklist = $this->find('all', [
+                'contain' => false,
+                'conditions' => ['ended' => null],
+                'order' => ['UserBlock.id' => 'DESC']
+            ]);
+            return $blocklist;
+        }
 
-		protected function _findToGc($state, $query, $results = array()) {
-			if ($state === 'before') {
-				$query['contain'] = false;
-				$query['conditions'] = [
-					'ends !=' => null,
-					'ends <' => bDate(),
-					'ended' => null
-				];
-				return $query;
-			}
-			return $results;
-		}
+        protected function _findToGc($state, $query, $results = array()) {
+            if ($state === 'before') {
+                $query['contain'] = false;
+                $query['conditions'] = [
+                    'ends !=' => null,
+                    'ends <' => bDate(),
+                    'ended' => null
+                ];
+                return $query;
+            }
+            return $results;
+        }
 
-		protected function _updateIsBlocked($userId) {
-			$blocks = $this->find('first', [
-				'contain' => false,
-				'conditions' => [
-					'ended' => null,
-					'user_id' => $userId
-				]
-			]);
-			$this->User->save(['id' => $userId, 'user_lock' => !empty($blocks)]);
-		}
+        protected function _updateIsBlocked($userId) {
+            $blocks = $this->find('first', [
+                'contain' => false,
+                'conditions' => [
+                    'ended' => null,
+                    'user_id' => $userId
+                ]
+            ]);
+            $this->User->save(['id' => $userId, 'user_lock' => !empty($blocks)]);
+        }
 
-	}
+    }