Schlaefer / Saito

app/Model/Upload.php

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/AppModel.php

Indentation +261 added lines, -261 removed lines

@@ -1,291 +1,291 @@
 <?php
 
-	App::uses('Model', 'Model');
-	App::uses('Sanitize', 'Utility');
-	App::uses('CakeEvent', 'Event');
-	App::uses('SaitoEventManager', 'Lib/Saito/Event');
+    App::uses('Model', 'Model');
+    App::uses('Sanitize', 'Utility');
+    App::uses('CakeEvent', 'Event');
+    App::uses('SaitoEventManager', 'Lib/Saito/Event');
 
-	// import here so that `cake schema ...` cli works
-	App::import('Lib', 'Stopwatch.Stopwatch');
+    // import here so that `cake schema ...` cli works
+    App::import('Lib', 'Stopwatch.Stopwatch');
 
-	class AppModel extends Model {
+    class AppModel extends Model {
 
-		/**
-		 * @var array model settings; can be overwritten by DB or config Settings
-		 */
-		protected $_settings = [];
+        /**
+         * @var array model settings; can be overwritten by DB or config Settings
+         */
+        protected $_settings = [];
 
-		/**
-		 * @var array predefined fields for filterFields()
-		 */
-		public $allowedInputFields = [];
+        /**
+         * @var array predefined fields for filterFields()
+         */
+        public $allowedInputFields = [];
 
-		# Entry->User->UserOnline
-		public $recursive = 1;
+        # Entry->User->UserOnline
+        public $recursive = 1;
 
-		public $SharedObjects;
+        public $SharedObjects;
 
-		/** * @var SaitoEventManager */
-		protected $_SEM;
+        /** * @var SaitoEventManager */
+        protected $_SEM;
 
-		public function __construct($id = false, $table = null, $ds = null) {
-			parent::__construct($id, $table, $ds);
-			$this->_dispatchEvent('Event.Saito.Model.initialize');
-		}
+        public function __construct($id = false, $table = null, $ds = null) {
+            parent::__construct($id, $table, $ds);
+            $this->_dispatchEvent('Event.Saito.Model.initialize');
+        }
 
-		public function __get($name) {
-			switch ($name) {
-				case 'dic':
-					return ClassRegistry::getObject('dic');
-				default:
-					if (isset($this->SharedObjects[$name])) {
-						return $this->SharedObjects[$name];
-					}
-			}
-			return parent::__get($name);
-		}
+        public function __get($name) {
+            switch ($name) {
+                case 'dic':
+                    return ClassRegistry::getObject('dic');
+                default:
+                    if (isset($this->SharedObjects[$name])) {
+                        return $this->SharedObjects[$name];
+                    }
+            }
+            return parent::__get($name);
+        }
 
-		public function toggle($key) {
-			$this->contain();
-			$value = $this->read($key);
-			$value = ($value[$this->alias][$key] == 0) ? 1 : 0;
-			$this->set($key, $value);
-			$this->save();
-			return $value;
-		}
+        public function toggle($key) {
+            $this->contain();
+            $value = $this->read($key);
+            $value = ($value[$this->alias][$key] == 0) ? 1 : 0;
+            $this->set($key, $value);
+            $this->save();
+            return $value;
+        }
 
-		/**
-		 * filters out all fields $fields in $data
-		 *
-		 * works only on current model, not associations
-		 *
-		 * @param $data
-		 * @param $fields
-		 */
-		public function filterFields(&$data, $fields) {
-			if (is_string($fields) && isset($this->allowedInputFields[$fields])) {
-				$fields = $this->allowedInputFields[$fields];
-			}
-			$fields = array_flip($fields);
-			$data = [
-				$this->alias => array_intersect_key($data[$this->alias], $fields)
-			];
-		}
+        /**
+         * filters out all fields $fields in $data
+         *
+         * works only on current model, not associations
+         *
+         * @param $data
+         * @param $fields
+         */
+        public function filterFields(&$data, $fields) {
+            if (is_string($fields) && isset($this->allowedInputFields[$fields])) {
+                $fields = $this->allowedInputFields[$fields];
+            }
+            $fields = array_flip($fields);
+            $data = [
+                $this->alias => array_intersect_key($data[$this->alias], $fields)
+            ];
+        }
 
-		public function requireFields(&$data, array $required) {
-			return $this->_mapFields($data, $required,
-				function (&$data, $model, $field) {
-					if (!isset($data[$model][$field])) {
-						return false;
-					}
-					return true;
-				});
-		}
+        public function requireFields(&$data, array $required) {
+            return $this->_mapFields($data, $required,
+                function (&$data, $model, $field) {
+                    if (!isset($data[$model][$field])) {
+                        return false;
+                    }
+                    return true;
+                });
+        }
 
-		public function unsetFields(&$data, array $unset = ['id']) {
-			return $this->_mapFields($data, $unset,
-				function (&$data, $model, $field) {
-					if (isset($data[$model][$field])) {
-						unset($data[$model][$field]);
-					}
-					return true;
-				});
-		}
+        public function unsetFields(&$data, array $unset = ['id']) {
+            return $this->_mapFields($data, $unset,
+                function (&$data, $model, $field) {
+                    if (isset($data[$model][$field])) {
+                        unset($data[$model][$field]);
+                    }
+                    return true;
+                });
+        }
 
-		protected function _mapFields(&$data, $fields, callable $func) {
-			if (isset(reset($data)[$this->alias])) {
-				foreach ($data as &$d) {
-					if (!$this->_mapFields($d, $fields, $func)) {
-						return false;
-					}
-				}
-				return true;
-			}
+        protected function _mapFields(&$data, $fields, callable $func) {
+            if (isset(reset($data)[$this->alias])) {
+                foreach ($data as &$d) {
+                    if (!$this->_mapFields($d, $fields, $func)) {
+                        return false;
+                    }
+                }
+                return true;
+            }
 
-			if (!isset($data[$this->alias])) {
-				$data = [$this->alias => $data];
-			}
-			foreach ($fields as $field) {
-				if (strpos($field, '.') !== false) {
-					list($model, $field) = explode('.', $field, 2);
-				} else {
-					$model = $this->alias;
-				}
-				if ($model !== $this->alias) {
-					continue;
-				}
-				if (!$func($data, $model, $field)) {
-					return false;
-				}
-			}
-			return true;
-		}
+            if (!isset($data[$this->alias])) {
+                $data = [$this->alias => $data];
+            }
+            foreach ($fields as $field) {
+                if (strpos($field, '.') !== false) {
+                    list($model, $field) = explode('.', $field, 2);
+                } else {
+                    $model = $this->alias;
+                }
+                if ($model !== $this->alias) {
+                    continue;
+                }
+                if (!$func($data, $model, $field)) {
+                    return false;
+                }
+            }
+            return true;
+        }
 
-		/**
-		 * Increments value of a field
-		 *
-		 * @param $id
-		 * @param $field
-		 * @param int $amount
-		 * @throws InvalidArgumentException
-		 */
-		public function increment($id, $field, $amount = 1) {
-			if (!is_int($amount)) {
-				throw new InvalidArgumentException;
-			}
-			$operator = '+';
-			if ($amount < 0) {
-				$operator = '-';
-				$amount *= -1;
-			}
-			$field = $this->alias . '.' . $field;
-			$this->updateAll([$field => "$field $operator $amount"],
-				[$this->alias . '.id' => $id]);
-		}
+        /**
+         * Increments value of a field
+         *
+         * @param $id
+         * @param $field
+         * @param int $amount
+         * @throws InvalidArgumentException
+         */
+        public function increment($id, $field, $amount = 1) {
+            if (!is_int($amount)) {
+                throw new InvalidArgumentException;
+            }
+            $operator = '+';
+            if ($amount < 0) {
+                $operator = '-';
+                $amount *= -1;
+            }
+            $field = $this->alias . '.' . $field;
+            $this->updateAll([$field => "$field $operator $amount"],
+                [$this->alias . '.id' => $id]);
+        }
 
-		public function pipeMerger(array $data) {
-			$out = [];
-			foreach ($data as $key => $value) {
-				$out[] = "$key=$value";
-			}
-			return implode(' | ', $out);
-		}
+        public function pipeMerger(array $data) {
+            $out = [];
+            foreach ($data as $key => $value) {
+                $out[] = "$key=$value";
+            }
+            return implode(' | ', $out);
+        }
 
-		/**
-		 * Splits String 'a=b|c=d|e=f' into an array('a'=>'b', 'c'=>'d', 'e'=>'f')
-		 *
-		 * @param string $pipeString
-		 * @return array
-		 */
-		protected function _pipeSplitter($pipeString) {
-			$unpipedArray = array();
-			$ranks = explode('|', $pipeString);
-			foreach ($ranks as $rank) :
-				$matches = array();
-				$matched = preg_match('/(\w+)\s*=\s*(.*)/', trim($rank), $matches);
-				if ($matched) {
-					$unpipedArray[$matches[1]] = $matches[2];
-				}
-			endforeach;
-			return $unpipedArray;
-		}
+        /**
+         * Splits String 'a=b|c=d|e=f' into an array('a'=>'b', 'c'=>'d', 'e'=>'f')
+         *
+         * @param string $pipeString
+         * @return array
+         */
+        protected function _pipeSplitter($pipeString) {
+            $unpipedArray = array();
+            $ranks = explode('|', $pipeString);
+            foreach ($ranks as $rank) :
+                $matches = array();
+                $matched = preg_match('/(\w+)\s*=\s*(.*)/', trim($rank), $matches);
+                if ($matched) {
+                    $unpipedArray[$matches[1]] = $matches[2];
+                }
+            endforeach;
+            return $unpipedArray;
+        }
 
-		protected static function _getIp() {
-			$ip = null;
-			if (Configure::read('Saito.Settings.store_ip')):
-				$ip = env('REMOTE_ADDR');
-				if (Configure::read('Saito.Settings.store_ip_anonymized')):
-					$ip = self::_anonymizeIp($ip);
-				endif;
-			endif;
-			return $ip;
-		}
+        protected static function _getIp() {
+            $ip = null;
+            if (Configure::read('Saito.Settings.store_ip')):
+                $ip = env('REMOTE_ADDR');
+                if (Configure::read('Saito.Settings.store_ip_anonymized')):
+                    $ip = self::_anonymizeIp($ip);
+                endif;
+            endif;
+            return $ip;
+        }
 
-		/**
-		 * Dispatches an event
-		 *
-		 * - Always passes the issuing model class as subject
-		 * - Wrapper for CakeEvent boilerplate code
-		 * - Easier to test
-		 *
-		 * @param string $event event identifier `Model.<modelname>.<event>`
-		 * @param array $data additional event data
-		 */
-		protected function _dispatchEvent($event, $data = []) {
-			$this->getEventManager()->dispatch(new CakeEvent($event, $this, $data));
-			// propagate event on Saito's event bus
-			$this->dispatchSaitoEvent($event, $data);
-		}
+        /**
+         * Dispatches an event
+         *
+         * - Always passes the issuing model class as subject
+         * - Wrapper for CakeEvent boilerplate code
+         * - Easier to test
+         *
+         * @param string $event event identifier `Model.<modelname>.<event>`
+         * @param array $data additional event data
+         */
+        protected function _dispatchEvent($event, $data = []) {
+            $this->getEventManager()->dispatch(new CakeEvent($event, $this, $data));
+            // propagate event on Saito's event bus
+            $this->dispatchSaitoEvent($event, $data);
+        }
 
-		public function dispatchSaitoEvent($event, $data) {
-			if (!$this->_SEM) {
-				$this->_SEM = SaitoEventManager::getInstance();
-			}
-			$this->_SEM->dispatch($event, $data + ['Model' => $this]);
-		}
+        public function dispatchSaitoEvent($event, $data) {
+            if (!$this->_SEM) {
+                $this->_SEM = SaitoEventManager::getInstance();
+            }
+            $this->_SEM->dispatch($event, $data + ['Model' => $this]);
+        }
 
-		/**
-		 * Rough and tough ip anonymizer
-		 *
-		 * @param string $ip
-		 * @return string
-		 */
-		protected static function _anonymizeIp($ip) {
-			$strlen = strlen($ip);
-			if ($strlen > 6) :
-				$divider = (int)floor($strlen / 4) + 1;
-				$ip = substr_replace($ip, '…', $divider, $strlen - (2 * $divider));
-			endif;
+        /**
+         * Rough and tough ip anonymizer
+         *
+         * @param string $ip
+         * @return string
+         */
+        protected static function _anonymizeIp($ip) {
+            $strlen = strlen($ip);
+            if ($strlen > 6) :
+                $divider = (int)floor($strlen / 4) + 1;
+                $ip = substr_replace($ip, '…', $divider, $strlen - (2 * $divider));
+            endif;
 
-			return $ip;
-		}
+            return $ip;
+        }
 
-		/**
-		 * gets app setting
-		 *
-		 * falls back to local definition if available
-		 *
-		 * @param $name
-		 * @return mixed
-		 * @throws UnexpectedValueException
-		 */
-		protected function _setting($name) {
-			$setting = Configure::read('Saito.Settings.' . $name);
-			if ($setting !== null) {
-				return $setting;
-			}
-			if (isset($this->_settings[$name])) {
-				return $this->_settings[$name];
-			}
-			throw new UnexpectedValueException;
-		}
+        /**
+         * gets app setting
+         *
+         * falls back to local definition if available
+         *
+         * @param $name
+         * @return mixed
+         * @throws UnexpectedValueException
+         */
+        protected function _setting($name) {
+            $setting = Configure::read('Saito.Settings.' . $name);
+            if ($setting !== null) {
+                return $setting;
+            }
+            if (isset($this->_settings[$name])) {
+                return $this->_settings[$name];
+            }
+            throw new UnexpectedValueException;
+        }
 
-		public function isUniqueCiString($fields) {
-			// lazy: only one field
-			if (!is_array($fields) || count($fields) > 1) {
-				throw InvalidArgumentException();
-			}
-			$key = key($fields);
-			$fields = [
-				"LOWER({$this->alias}.{$key})" => mb_strtolower(current($fields))
-			];
-			return $this->isUnique($fields);
-		}
+        public function isUniqueCiString($fields) {
+            // lazy: only one field
+            if (!is_array($fields) || count($fields) > 1) {
+                throw InvalidArgumentException();
+            }
+            $key = key($fields);
+            $fields = [
+                "LOWER({$this->alias}.{$key})" => mb_strtolower(current($fields))
+            ];
+            return $this->isUnique($fields);
+        }
 
-		/**
-		 * Inclusive Validation::range()
-		 *
-		 * @param array $check
-		 * @param float $lower
-		 * @param float $upper
-		 * @return bool
-		 * @see https://github.com/cakephp/cakephp/issues/3304
-		 */
-		public function inRange($check, $lower = null, $upper = null) {
-			$check = reset($check);
-			if (!is_numeric($check)) {
-				return false;
-			}
-			if (isset($lower) && isset($upper)) {
-				return ($check >= $lower && $check <= $upper);
-			}
-			// fallback to 'parent'
-			return Validation::range($check, $lower, $upper);
-		}
+        /**
+         * Inclusive Validation::range()
+         *
+         * @param array $check
+         * @param float $lower
+         * @param float $upper
+         * @return bool
+         * @see https://github.com/cakephp/cakephp/issues/3304
+         */
+        public function inRange($check, $lower = null, $upper = null) {
+            $check = reset($check);
+            if (!is_numeric($check)) {
+                return false;
+            }
+            if (isset($lower) && isset($upper)) {
+                return ($check >= $lower && $check <= $upper);
+            }
+            // fallback to 'parent'
+            return Validation::range($check, $lower, $upper);
+        }
 
-		/**
-		 * Logs current SQL log
-		 *
-		 * Set debug to 2 to enable SQL logging!
-		 */
-		public function logSql() {
-			if (Configure::read('debug') < 2) {
-				trigger_error('You must set debug level to at least 2 to enable SQL-logging',
-					E_USER_NOTICE);
-			}
-			$dbo = $this->getDatasource();
-			$logs = $dbo->getLog();
-			$this->log($logs['log']);
-		}
+        /**
+         * Logs current SQL log
+         *
+         * Set debug to 2 to enable SQL logging!
+         */
+        public function logSql() {
+            if (Configure::read('debug') < 2) {
+                trigger_error('You must set debug level to at least 2 to enable SQL-logging',
+                    E_USER_NOTICE);
+            }
+            $dbo = $this->getDatasource();
+            $logs = $dbo->getLog();
+            $this->log($logs['log']);
+        }
 
-	}
+    }

app/Model/UserOnline.php

Indentation +96 added lines, -96 removed lines

@@ -3,35 +3,35 @@ 
 /**
  *  Class UserOnline
  */
-	class UserOnline extends AppModel {
+    class UserOnline extends AppModel {
 
-		public $name = 'UserOnline';
+        public $name = 'UserOnline';
 
-		public $useTable = 'useronline';
+        public $useTable = 'useronline';
 
-		public $actsAs = ['Containable'];
+        public $actsAs = ['Containable'];
 
-		public $belongsTo = [
-			'User' => [
-				'className' => 'User',
-				'foreignKey' => 'user_id'
-			]
-		];
+        public $belongsTo = [
+            'User' => [
+                'className' => 'User',
+                'foreignKey' => 'user_id'
+            ]
+        ];
 
-		public $validate = [
-			'uuid' => [
-				'rule' => 'isUnique',
-				'required' => true,
-				'allowEmpty' => false
-			]
-		];
+        public $validate = [
+            'uuid' => [
+                'rule' => 'isUnique',
+                'required' => true,
+                'allowEmpty' => false
+            ]
+        ];
 
 /**
  * Time in seconds until a user is considered offline
  *
  * @var int
  */
-		public $timeUntilOffline = 1200;
+        public $timeUntilOffline = 1200;
 
 /**
  * Sets user with `$id` online
@@ -40,72 +40,72 @@ 
  * @param boolean $loggedIn user is logged-in
  * @throws InvalidArgumentException
  */
-		public function setOnline($id, $loggedIn) {
-			if (empty($id)) {
-				throw new InvalidArgumentException('Invalid Argument $id in setOnline()');
-			}
-			if (!is_bool($loggedIn)) {
-				throw new InvalidArgumentException('Invalid Argument $logged_in in setOnline()');
-			}
-			$now = time();
-
-			$id = $this->_getShortendedId($id);
-			$data = [
-				'UserOnline' => [
-					'uuid' => $id,
-					'logged_in' => $loggedIn,
-					'time' => $now
-				]
-			];
-
-			if ($loggedIn) {
-				$data['UserOnline']['user_id'] = $id;
-			}
-
-			$user = $this->find('first', ['conditions' => ['uuid' => $id],
-				'recursive' => -1, 'callbacks' => false]);
-
-			if ($user) {
-				// only hit database if timestamp is outdated
-				if ($user['UserOnline']['time'] < ($now - $this->timeUntilOffline)) {
-					$this->id = $user['UserOnline']['id'];
-					$this->save($data);
-				}
-			} else {
-				$this->id = null;
-				$this->create();
-				$this->save($data);
-			}
-
-			$this->_deleteOutdated();
-		}
-
-		/**
-		 * Removes user with uuid `$id` from UserOnline
-		 *
-		 * @param $id
-		 *
-		 * @return bool
-		 */
-		public function setOffline($id) {
-			$id = $this->_getShortendedId($id);
-			return $this->deleteAll(['UserOnline.uuid' => $id], false);
-		}
-
-		public function getLoggedIn() {
-			Stopwatch::start('UserOnline->getLoggedIn()');
-			$loggedInUsers = $this->find(
-				'all',
-				[
-					'contain' => 'User',
-					'conditions' => ['UserOnline.logged_in' => true],
-					'fields' => ['User.id', 'User.username', 'User.user_type'],
-					'order' => ['LOWER(User.username)' => 'ASC']
-				]
-			);
-			Stopwatch::stop('UserOnline->getLoggedIn()');
-			return $loggedInUsers;
-		}
+        public function setOnline($id, $loggedIn) {
+            if (empty($id)) {
+                throw new InvalidArgumentException('Invalid Argument $id in setOnline()');
+            }
+            if (!is_bool($loggedIn)) {
+                throw new InvalidArgumentException('Invalid Argument $logged_in in setOnline()');
+            }
+            $now = time();
+
+            $id = $this->_getShortendedId($id);
+            $data = [
+                'UserOnline' => [
+                    'uuid' => $id,
+                    'logged_in' => $loggedIn,
+                    'time' => $now
+                ]
+            ];
+
+            if ($loggedIn) {
+                $data['UserOnline']['user_id'] = $id;
+            }
+
+            $user = $this->find('first', ['conditions' => ['uuid' => $id],
+                'recursive' => -1, 'callbacks' => false]);
+
+            if ($user) {
+                // only hit database if timestamp is outdated
+                if ($user['UserOnline']['time'] < ($now - $this->timeUntilOffline)) {
+                    $this->id = $user['UserOnline']['id'];
+                    $this->save($data);
+                }
+            } else {
+                $this->id = null;
+                $this->create();
+                $this->save($data);
+            }
+
+            $this->_deleteOutdated();
+        }
+
+        /**
+         * Removes user with uuid `$id` from UserOnline
+         *
+         * @param $id
+         *
+         * @return bool
+         */
+        public function setOffline($id) {
+            $id = $this->_getShortendedId($id);
+            return $this->deleteAll(['UserOnline.uuid' => $id], false);
+        }
+
+        public function getLoggedIn() {
+            Stopwatch::start('UserOnline->getLoggedIn()');
+            $loggedInUsers = $this->find(
+                'all',
+                [
+                    'contain' => 'User',
+                    'conditions' => ['UserOnline.logged_in' => true],
+                    'fields' => ['User.id', 'User.username', 'User.user_type'],
+                    'order' => ['LOWER(User.username)' => 'ASC']
+                ]
+            );
+            Stopwatch::stop('UserOnline->getLoggedIn()');
+            return $loggedInUsers;
+        }
 
 /**
  * deletes gone user
@@ -114,15 +114,15 @@ 
  *
  * @param string $timeDiff in minutes
  */
-		protected function _deleteOutdated($timeDiff = null) {
-			if ($timeDiff === null) {
-				$timeDiff = $this->timeUntilOffline;
-			}
-			$this->deleteAll(['time <' => time() - ($timeDiff)], false);
-		}
-
-		protected function _getShortendedId($id) {
-			return substr($id, 0, 32);
-		}
-
-	}
\ No newline at end of file
+        protected function _deleteOutdated($timeDiff = null) {
+            if ($timeDiff === null) {
+                $timeDiff = $this->timeUntilOffline;
+            }
+            $this->deleteAll(['time <' => time() - ($timeDiff)], false);
+        }
+
+        protected function _getShortendedId($id) {
+            return substr($id, 0, 32);
+        }
+
+    }
\ No newline at end of file

app/Model/Smiley.php

Indentation +64 added lines, -64 removed lines

@@ -1,79 +1,79 @@
 <?php
 
-	App::uses('AppSettingModel', 'Lib/Model');
+    App::uses('AppSettingModel', 'Lib/Model');
 
-	class Smiley extends AppSettingModel {
+    class Smiley extends AppSettingModel {
 
-		public $name = 'Smiley';
+        public $name = 'Smiley';
 
-		public $validate = [
-			'sort' => [
-				'numeric' => [
-					'rule' => ['numeric']
-				]
-			]
-		];
+        public $validate = [
+            'sort' => [
+                'numeric' => [
+                    'rule' => ['numeric']
+                ]
+            ]
+        ];
 
-		public $hasMany = [
-			'SmileyCode' => [
-				'className' => 'SmileyCode',
-				'foreignKey' => 'smiley_id'
-			]
-		];
+        public $hasMany = [
+            'SmileyCode' => [
+                'className' => 'SmileyCode',
+                'foreignKey' => 'smiley_id'
+            ]
+        ];
 
-		protected $_smilies;
+        protected $_smilies;
 
-		public function load($force = false) {
-			if ($force) {
-				$this->_smilies = null;
-				$this->clearCache();
-			}
+        public function load($force = false) {
+            if ($force) {
+                $this->_smilies = null;
+                $this->clearCache();
+            }
 
-			if ($this->_smilies !== null) {
-				return $this->_smilies;
-			}
+            if ($this->_smilies !== null) {
+                return $this->_smilies;
+            }
 
-			$this->_smilies = [];
-			$smiliesRaw = $this->find('all', ['order' => 'Smiley.sort ASC']);
+            $this->_smilies = [];
+            $smiliesRaw = $this->find('all', ['order' => 'Smiley.sort ASC']);
 
-			foreach ($smiliesRaw as $smileyRaw) {
-				// 'image' defaults to 'icon'
-				if (empty($smileyRaw['Smiley']['image'])) {
-					$smileyRaw['Smiley']['image'] = $smileyRaw['Smiley']['icon'];
-				}
-				// @bogus: if title is unknown it should be a problem
-				if ($smileyRaw['Smiley']['title'] === null) {
-					$smileyRaw['Smiley']['title'] = '';
-				}
-				// set type
-				$smileyRaw['Smiley']['type'] = $this->_getType($smileyRaw['Smiley']);
+            foreach ($smiliesRaw as $smileyRaw) {
+                // 'image' defaults to 'icon'
+                if (empty($smileyRaw['Smiley']['image'])) {
+                    $smileyRaw['Smiley']['image'] = $smileyRaw['Smiley']['icon'];
+                }
+                // @bogus: if title is unknown it should be a problem
+                if ($smileyRaw['Smiley']['title'] === null) {
+                    $smileyRaw['Smiley']['title'] = '';
+                }
+                // set type
+                $smileyRaw['Smiley']['type'] = $this->_getType($smileyRaw['Smiley']);
 
-				//= adds smiley-data to every smiley-code
-				if (isset($smileyRaw['SmileyCode'])) {
-					foreach ($smileyRaw['SmileyCode'] as $smileyRawCode) {
-						unset($smileyRaw['Smiley']['id']);
-						$smileyRaw['Smiley']['code'] = $smileyRawCode['code'];
-						$this->_smilies[] = $smileyRaw['Smiley'];
-					}
-				}
-			}
+                //= adds smiley-data to every smiley-code
+                if (isset($smileyRaw['SmileyCode'])) {
+                    foreach ($smileyRaw['SmileyCode'] as $smileyRawCode) {
+                        unset($smileyRaw['Smiley']['id']);
+                        $smileyRaw['Smiley']['code'] = $smileyRawCode['code'];
+                        $this->_smilies[] = $smileyRaw['Smiley'];
+                    }
+                }
+            }
 
-			Stopwatch::stop('Smiley::load');
-			return $this->_smilies;
-		}
+            Stopwatch::stop('Smiley::load');
+            return $this->_smilies;
+        }
 
-		/**
-		 * detects smiley type
-		 *
-		 * @param array $smiley
-		 * @return string image|font
-		 */
-		protected function _getType($smiley) {
-			if (preg_match('/^.*\.[\w]{3,4}$/i', $smiley['image'])) {
-				return 'image';
-			} else {
-				return 'font';
-			}
-		}
+        /**
+         * detects smiley type
+         *
+         * @param array $smiley
+         * @return string image|font
+         */
+        protected function _getType($smiley) {
+            if (preg_match('/^.*\.[\w]{3,4}$/i', $smiley['image'])) {
+                return 'image';
+            } else {
+                return 'font';
+            }
+        }
 
-	}
+    }

app/Model/UserBlock.php

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

app/Model/User.php

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/Shout.php

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/Esevent.php

Indentation +263 added lines, -263 removed lines

@@ -1,58 +1,58 @@ 
 <?php
 
-	App::uses('AppModel', 'Model');
+    App::uses('AppModel', 'Model');
 
-	/**
-	 * Esevent Model
-	 *
-	 * @property Essubject $Essubject
-	 * @property Esnotification $Esnotification
-	 */
-	class Esevent extends AppModel {
+    /**
+     * Esevent Model
+     *
+     * @property Essubject $Essubject
+     * @property Esnotification $Esnotification
+     */
+    class Esevent extends AppModel {
 
-		public $actsAs = array('Containable');
+        public $actsAs = array('Containable');
 
-		//The Associations below have been created with all possible keys, those that are not needed can be removed
+        //The Associations below have been created with all possible keys, those that are not needed can be removed
 
 /**
  * hasMany associations
  *
  * @var array
  */
-		public $hasMany = array(
-			'Esnotification' => array(
-				'className' => 'Esnotification',
-				'foreignKey' => 'esevent_id',
-				'dependent' => true,
-				'conditions' => '',
-				'fields' => '',
-				'order' => '',
-				'limit' => '',
-				'offset' => '',
-				'exclusive' => '',
-				'finderQuery' => '',
-				'counterQuery' => ''
-			)
-		);
+        public $hasMany = array(
+            'Esnotification' => array(
+                'className' => 'Esnotification',
+                'foreignKey' => 'esevent_id',
+                'dependent' => true,
+                'conditions' => '',
+                'fields' => '',
+                'order' => '',
+                'limit' => '',
+                'offset' => '',
+                'exclusive' => '',
+                'finderQuery' => '',
+                'counterQuery' => ''
+            )
+        );
 
-		protected $_eventTypes = array(
-			'Model.Entry.replyToEntry' => 1,
-			'Model.Entry.replyToThread' => 2
-		);
+        protected $_eventTypes = array(
+            'Model.Entry.replyToEntry' => 1,
+            'Model.Entry.replyToThread' => 2
+        );
 
 /**
  * Subject types for $eventsTypes
  *
  * @var array
  */
-		protected $_subjectTypes = array(
-			'entry' => array(1),
-			'thread' => array(2),
-		);
+        protected $_subjectTypes = array(
+            'entry' => array(1),
+            'thread' => array(2),
+        );
 
-		protected $_receivers = array(
-				'EmailNotification' => 1,
-		);
+        protected $_receivers = array(
+                'EmailNotification' => 1,
+        );
 
 /**
  *
@@ -60,57 +60,57 @@ 
  * @param int $newSubject
  * @param string $subjectType one of the strings in $_subjectTypes
  */
-		public function transferSubjectForEventType($oldSubject, $newSubject, $subjectType) {
-			$old = $this->find(
-				'all',
-				array(
-					'contain' => array('Esnotification'),
-					'conditions' => array(
-						'subject' => $oldSubject,
-						'event' => $this->_subjectTypes[$subjectType],
-					)
-				)
-			);
+        public function transferSubjectForEventType($oldSubject, $newSubject, $subjectType) {
+            $old = $this->find(
+                'all',
+                array(
+                    'contain' => array('Esnotification'),
+                    'conditions' => array(
+                        'subject' => $oldSubject,
+                        'event' => $this->_subjectTypes[$subjectType],
+                    )
+                )
+            );
 
-			// there are no affected subjects
-			if (!$old) {
-				return;
-			}
+            // there are no affected subjects
+            if (!$old) {
+                return;
+            }
 
-			$current = $this->find(
-				'all',
-				array(
-					'contain' => array('Esnotification'),
-					'conditions' => array(
-						'subject' => $newSubject,
-						'event' => $this->_subjectTypes[$subjectType],
-					)
-				)
-			);
+            $current = $this->find(
+                'all',
+                array(
+                    'contain' => array('Esnotification'),
+                    'conditions' => array(
+                        'subject' => $newSubject,
+                        'event' => $this->_subjectTypes[$subjectType],
+                    )
+                )
+            );
 
-			$oldEvents = Hash::combine($old, '{n}.Esevent.event', '{n}');
-			$currentEvents = Hash::combine($current, '{n}.Esevent.event', '{n}');
+            $oldEvents = Hash::combine($old, '{n}.Esevent.event', '{n}');
+            $currentEvents = Hash::combine($current, '{n}.Esevent.event', '{n}');
 
-			foreach ($oldEvents as $eventType => $oldEvent) {
-				$newData = array();
-				$newData['Esnotification'] = $oldEvent['Esnotification'];
-				if (isset($currentEvents[$eventType])) {
-					$newData['Esevent']['id'] = $currentEvents[$eventType]['Esevent']['id'];
-				} else {
-					$newData['Esevent']['subject'] = $newSubject;
-					$newData['Esevent']['event'] = $eventType;
-					$this->create();
-				}
-				$this->saveAssociated($newData);
-			}
-			$this->deleteAll(
-				array(
-					'subject' => $oldSubject,
-					'event' => $this->_subjectTypes[$subjectType],
-				),
-				false
-			);
-		}
+            foreach ($oldEvents as $eventType => $oldEvent) {
+                $newData = array();
+                $newData['Esnotification'] = $oldEvent['Esnotification'];
+                if (isset($currentEvents[$eventType])) {
+                    $newData['Esevent']['id'] = $currentEvents[$eventType]['Esevent']['id'];
+                } else {
+                    $newData['Esevent']['subject'] = $newSubject;
+                    $newData['Esevent']['event'] = $eventType;
+                    $this->create();
+                }
+                $this->saveAssociated($newData);
+            }
+            $this->deleteAll(
+                array(
+                    'subject' => $oldSubject,
+                    'event' => $this->_subjectTypes[$subjectType],
+                ),
+                false
+            );
+        }
 
 /**
  *
@@ -129,21 +129,21 @@ 
  * 	)
  * </pre>
  */
-		public function notifyUserOnEvents($user, $events) {
-			foreach ($events as $event) {
-				$params = array(
-					'user_id' => $user,
-					'event' => $this->_eventTypes[$event['event']],
-					'subject' => $event['subject'],
-					'receiver' => $this->_receivers[$event['receiver']],
-				);
-				if ($event['set']) {
-					$this->setNotification($params);
-				} else {
-					$this->deleteNotification($params);
-				}
-			}
-		}
+        public function notifyUserOnEvents($user, $events) {
+            foreach ($events as $event) {
+                $params = array(
+                    'user_id' => $user,
+                    'event' => $this->_eventTypes[$event['event']],
+                    'subject' => $event['subject'],
+                    'receiver' => $this->_receivers[$event['receiver']],
+                );
+                if ($event['set']) {
+                    $this->setNotification($params);
+                } else {
+                    $this->deleteNotification($params);
+                }
+            }
+        }
 
 /**
  *
@@ -159,54 +159,54 @@ 
  *
  * @return type
  */
-		public function setNotification($params) {
-			$isSet = $this->_getEventSet($params);
-			$success = true;
-			$eventData = [];
-			if ($isSet['Esevent']) {
-				$eventData = array(
-					'id' => $isSet['Esevent']['id'],
-				);
-			} else {
-				$eventData = array(
-					'subject' => $params['subject'],
-					'event' => $params['event'],
-				);
-			}
-			if (!$isSet['Esnotification']) {
-				$data = array(
-					'Esevent' => $eventData,
-					'Esnotification' => array(
-						array(
-							'user_id' => $params['user_id'],
-							'esreceiver_id' => $params['receiver'],
-						),
-					),
-				);
-				$success = $success && $this->saveAssociated($data);
-			}
-			return $success;
-		}
+        public function setNotification($params) {
+            $isSet = $this->_getEventSet($params);
+            $success = true;
+            $eventData = [];
+            if ($isSet['Esevent']) {
+                $eventData = array(
+                    'id' => $isSet['Esevent']['id'],
+                );
+            } else {
+                $eventData = array(
+                    'subject' => $params['subject'],
+                    'event' => $params['event'],
+                );
+            }
+            if (!$isSet['Esnotification']) {
+                $data = array(
+                    'Esevent' => $eventData,
+                    'Esnotification' => array(
+                        array(
+                            'user_id' => $params['user_id'],
+                            'esreceiver_id' => $params['receiver'],
+                        ),
+                    ),
+                );
+                $success = $success && $this->saveAssociated($data);
+            }
+            return $success;
+        }
 
 /**
  * Deletes Subject and all its Notifications
  */
-		public function deleteSubject($subjectId, $subjectType) {
-			// remove all events
-			$this->deleteAll(array(
-					'subject' => $subjectId,
-					'event' => $this->_subjectTypes[$subjectType],
-			), true);
-		}
+        public function deleteSubject($subjectId, $subjectType) {
+            // remove all events
+            $this->deleteAll(array(
+                    'subject' => $subjectId,
+                    'event' => $this->_subjectTypes[$subjectType],
+            ), true);
+        }
 
-		public function deleteNotification($params) {
-			extract($params);
+        public function deleteNotification($params) {
+            extract($params);
 
-			$isSet = $this->_getEventSet($params);
-			if ($isSet['Esnotification']) {
-				return $this->Esnotification->deleteNotificationWithId($isSet['Esnotification'][0]['id']);
-			}
-		}
+            $isSet = $this->_getEventSet($params);
+            if ($isSet['Esnotification']) {
+                return $this->Esnotification->deleteNotificationWithId($isSet['Esnotification'][0]['id']);
+            }
+        }
 
 /**
  * Checks if specific notification is set
@@ -224,26 +224,26 @@ 
  *
  * @return mixed array with found set or false otherwise
  */
-		protected function _getEventSet($params) {
-			$results = $this->find(
-				'first',
-				array(
-					'contain' => array(
-						'Esnotification' => array(
-							'conditions' => array(
-								'user_id' => $params['user_id'],
-								'esreceiver_id' => $params['receiver'],
-							),
-						),
-					),
-					'conditions' => array(
-						'Esevent.subject' => $params['subject'],
-						'Esevent.event' => $params['event'],
-					)
-				)
-			);
-			return empty($results) ? false : $results;
-		}
+        protected function _getEventSet($params) {
+            $results = $this->find(
+                'first',
+                array(
+                    'contain' => array(
+                        'Esnotification' => array(
+                            'conditions' => array(
+                                'user_id' => $params['user_id'],
+                                'esreceiver_id' => $params['receiver'],
+                            ),
+                        ),
+                    ),
+                    'conditions' => array(
+                        'Esevent.subject' => $params['subject'],
+                        'Esevent.event' => $params['event'],
+                    )
+                )
+            );
+            return empty($results) ? false : $results;
+        }
 
 /**
  *
@@ -269,41 +269,41 @@ 
  *	)
  * </pre>
  */
-		public function getUsersForEventOnSubjectWithReceiver($eventName, $subject, $receiver) {
-			$recipients = array();
-			$results = $this->find(
-				'all',
-				array(
-					'conditions' => array(
-						'Esevent.event' => $this->_eventTypes[$eventName],
-						'Esevent.subject' => $subject,
-					),
-					'contain' => array(
-						'Esnotification' => array(
-							'fields' => array(
-								'Esnotification.id',
-								'Esnotification.deactivate'
-							),
-							'conditions' => array(
-								'esreceiver_id' => $this->_receivers[$receiver],
-							),
-							'User' => array(
-								'fields' => array('id', 'username', 'user_email'),
-							)
-						),
-					),
-				)
-			);
-			if ($results) {
-				$recipients = Hash::map($results, '{n}.Esnotification.{n}', function ($values) {
-					$out = $values['User'];
-					unset($values['User']);
-					$out['Esnotification'] = $values;
-					return $out;
-				});
-			}
-			return $recipients;
-		}
+        public function getUsersForEventOnSubjectWithReceiver($eventName, $subject, $receiver) {
+            $recipients = array();
+            $results = $this->find(
+                'all',
+                array(
+                    'conditions' => array(
+                        'Esevent.event' => $this->_eventTypes[$eventName],
+                        'Esevent.subject' => $subject,
+                    ),
+                    'contain' => array(
+                        'Esnotification' => array(
+                            'fields' => array(
+                                'Esnotification.id',
+                                'Esnotification.deactivate'
+                            ),
+                            'conditions' => array(
+                                'esreceiver_id' => $this->_receivers[$receiver],
+                            ),
+                            'User' => array(
+                                'fields' => array('id', 'username', 'user_email'),
+                            )
+                        ),
+                    ),
+                )
+            );
+            if ($results) {
+                $recipients = Hash::map($results, '{n}.Esnotification.{n}', function ($values) {
+                    $out = $values['User'];
+                    unset($values['User']);
+                    $out['Esnotification'] = $values;
+                    return $out;
+                });
+            }
+            return $recipients;
+        }
 
 /**
  *
@@ -326,32 +326,32 @@ 
  * 		1 => [true|false],
  * )
  */
-		public function checkEventsForUser($user, $events) {
-			// Stopwatch::enable(); Stopwatch::start('Event->checkEventsForUser()');
+        public function checkEventsForUser($user, $events) {
+            // Stopwatch::enable(); Stopwatch::start('Event->checkEventsForUser()');
 
-			$subjects = array();
-			foreach ($events as $event) {
-				$subjects[] = $event['subject'];
-			}
+            $subjects = array();
+            foreach ($events as $event) {
+                $subjects[] = $event['subject'];
+            }
 
-			$notis = $this->_getEventsForUserOnSubjects($user, $subjects);
-			$out = array();
+            $notis = $this->_getEventsForUserOnSubjects($user, $subjects);
+            $out = array();
 
-			foreach ($events as $k => $event) {
-				foreach ($notis as $noti) {
-					if ($noti['subject'] == $event['subject']
-							&& $noti['event'] == $this->_eventTypes[$event['event']]
-							&& $noti['receiver'] == $this->_receivers[$event['receiver']]) {
-						$out[$k] = true;
-						break;
-					} else {
-						$out[$k] = false;
-					}
-				}
-			}
-			// Stopwatch::end('Event->checkEventsForUser()'); debug(Stopwatch::getString());
-			return $out;
-		}
+            foreach ($events as $k => $event) {
+                foreach ($notis as $noti) {
+                    if ($noti['subject'] == $event['subject']
+                            && $noti['event'] == $this->_eventTypes[$event['event']]
+                            && $noti['receiver'] == $this->_receivers[$event['receiver']]) {
+                        $out[$k] = true;
+                        break;
+                    } else {
+                        $out[$k] = false;
+                    }
+                }
+            }
+            // Stopwatch::end('Event->checkEventsForUser()'); debug(Stopwatch::getString());
+            return $out;
+        }
 
 /**
  *
@@ -369,49 +369,49 @@ 
  *
  * )
  */
-		protected function _getEventsForUserOnSubjects($user, $subjects) {
-			$notis = $this->Esnotification->find(
-				'all',
-				array(
-					'joins' => array(
-						array(
-							'table' => 'esevents',
-							'alias' => 'Eseventa',
-							'type' => 'LEFT',
-							'conditions' => array(
-								'Eseventa.id = Esnotification.esevent_id'
-							)
-						)
-					),
-					'conditions' => array(
-						'Esnotification.user_id' => $user,
-						'Esevent.subject' => $subjects
-					),
-					'fields' => array(
-						'Esnotification.id',
-						'Esnotification.user_id',
-						'Esnotification.esevent_id',
-						'Esnotification.esreceiver_id',
-						'Esevent.event',
-						'Esevent.subject'
-					)
-				)
-			);
-			$out = $notis;
-			if ($notis) {
-				$out = array();
-				foreach ($notis as $noti) {
-					$out[] = array(
-						'user_id' => $noti['Esnotification']['user_id'],
-						'esevent_id' => $noti['Esnotification']['esevent_id'],
-						'esnotification_id' => $noti['Esnotification']['id'],
-						'event' => $noti['Esevent']['event'],
-						'subject' => $noti['Esevent']['subject'],
-						'receiver' => $noti['Esnotification']['esreceiver_id'],
-					);
-				}
-			}
-			return $out;
-		}
+        protected function _getEventsForUserOnSubjects($user, $subjects) {
+            $notis = $this->Esnotification->find(
+                'all',
+                array(
+                    'joins' => array(
+                        array(
+                            'table' => 'esevents',
+                            'alias' => 'Eseventa',
+                            'type' => 'LEFT',
+                            'conditions' => array(
+                                'Eseventa.id = Esnotification.esevent_id'
+                            )
+                        )
+                    ),
+                    'conditions' => array(
+                        'Esnotification.user_id' => $user,
+                        'Esevent.subject' => $subjects
+                    ),
+                    'fields' => array(
+                        'Esnotification.id',
+                        'Esnotification.user_id',
+                        'Esnotification.esevent_id',
+                        'Esnotification.esreceiver_id',
+                        'Esevent.event',
+                        'Esevent.subject'
+                    )
+                )
+            );
+            $out = $notis;
+            if ($notis) {
+                $out = array();
+                foreach ($notis as $noti) {
+                    $out[] = array(
+                        'user_id' => $noti['Esnotification']['user_id'],
+                        'esevent_id' => $noti['Esnotification']['esevent_id'],
+                        'esnotification_id' => $noti['Esnotification']['id'],
+                        'event' => $noti['Esevent']['event'],
+                        'subject' => $noti['Esevent']['subject'],
+                        'receiver' => $noti['Esnotification']['esreceiver_id'],
+                    );
+                }
+            }
+            return $out;
+        }
 
-	}
+    }

app/Model/Bookmark.php

Indentation +67 added lines, -67 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-	App::uses('AppModel', 'Model');
+    App::uses('AppModel', 'Model');
 
 /**
  * Bookmark Model
@@ -8,73 +8,73 @@ 
  * @property User  $User
  * @property Entry $Entry
  */
-	class Bookmark extends AppModel {
+    class Bookmark extends AppModel {
 
-		public $actsAs = array(
-			'Containable',
-		);
+        public $actsAs = array(
+            'Containable',
+        );
 
 /**
  * Validation rules
  *
  * @var array
  */
-		public $validate = array(
-			'user_id' => array(
-				'numeric' => array(
-					'rule' => array('validateUniqueBookmark'),
-					//'message' => 'Your custom message here',
-					//'allowEmpty' => false,
-					'required' => false,
-					//'last' => false, // Stop validation after this rule
-					'on' => 'create',
-					// Limit validation to 'create' or 'update' operations
-				),
-			),
-			'entry_id' => array(
-				'numeric' => array(
-					'rule' => array('validateUniqueBookmark'),
-					//'message' => 'Your custom message here',
-					//'allowEmpty' => false,
-					'required' => false,
-					//'last' => false, // Stop validation after this rule
-					'on' => 'create',
-					// Limit validation to 'create' or 'update' operations
-				),
-			),
-		);
+        public $validate = array(
+            'user_id' => array(
+                'numeric' => array(
+                    'rule' => array('validateUniqueBookmark'),
+                    //'message' => 'Your custom message here',
+                    //'allowEmpty' => false,
+                    'required' => false,
+                    //'last' => false, // Stop validation after this rule
+                    'on' => 'create',
+                    // Limit validation to 'create' or 'update' operations
+                ),
+            ),
+            'entry_id' => array(
+                'numeric' => array(
+                    'rule' => array('validateUniqueBookmark'),
+                    //'message' => 'Your custom message here',
+                    //'allowEmpty' => false,
+                    'required' => false,
+                    //'last' => false, // Stop validation after this rule
+                    'on' => 'create',
+                    // Limit validation to 'create' or 'update' operations
+                ),
+            ),
+        );
 
-		//The Associations below have been created with all possible keys, those that are not needed can be removed
+        //The Associations below have been created with all possible keys, those that are not needed can be removed
 
 /**
  * belongsTo associations
  *
  * @var array
  */
-		public $belongsTo = array(
-			'User' => array(
-				'className' => 'User',
-				'foreignKey' => 'user_id',
-				'conditions' => '',
-				'fields' => '',
-				'order' => ''
-			),
-			'Entry' => array(
-				'className' => 'Entry',
-				'foreignKey' => 'entry_id',
-				'conditions' => '',
-				'fields' => '',
-				'order' => ''
-			)
-		);
+        public $belongsTo = array(
+            'User' => array(
+                'className' => 'User',
+                'foreignKey' => 'user_id',
+                'conditions' => '',
+                'fields' => '',
+                'order' => ''
+            ),
+            'Entry' => array(
+                'className' => 'Entry',
+                'foreignKey' => 'entry_id',
+                'conditions' => '',
+                'fields' => '',
+                'order' => ''
+            )
+        );
 
-		public function validateUniqueBookmark() {
-			$fields = array(
-				$this->alias . '.user_id' => $this->data['Bookmark']['user_id'],
-				$this->alias . '.entry_id' => $this->data['Bookmark']['entry_id'],
-			);
-			return $this->isUnique($fields, false);
-		}
+        public function validateUniqueBookmark() {
+            $fields = array(
+                $this->alias . '.user_id' => $this->data['Bookmark']['user_id'],
+                $this->alias . '.entry_id' => $this->data['Bookmark']['entry_id'],
+            );
+            return $this->isUnique($fields, false);
+        }
 
 /**
  *
@@ -82,18 +82,18 @@ 
  * @param int $user_id
  * @return bool
  */
-		public function isBookmarked($entryId, $userId) {
-			$result = $this->find(
-				'first',
-				array(
-					'contain' => false,
-					'conditions' => array(
-						$this->alias . '.entry_id' => $entryId,
-						$this->alias . '.user_id' => $userId,
-					)
-				)
-			);
-			return $result == true;
-		}
+        public function isBookmarked($entryId, $userId) {
+            $result = $this->find(
+                'first',
+                array(
+                    'contain' => false,
+                    'conditions' => array(
+                        $this->alias . '.entry_id' => $entryId,
+                        $this->alias . '.user_id' => $userId,
+                    )
+                )
+            );
+            return $result == true;
+        }
 
-	}
+    }