Schlaefer / Saito

app/Lib/Saito/Posting/Decorator/UserPostingTrait.php

Doc Comments +7 added lines, -2 removed lines

@@ -8,10 +8,16 @@ 
 
 		protected $_CU;
 
+		/**
+		 * @return \Saito\User\ForumsUserInterface
+		 */
 		public function getCurrentUser() {
 			return $this->_CU;
 		}
 
+		/**
+		 * @param \Saito\User\ForumsUserInterface $CU
+		 */
 		public function setCurrentUser($CU) {
 			$this->_CU = $CU;
 		}
@@ -19,8 +25,7 @@ 
 		/**
 		 * Checks if answering an entry is allowed
 		 *
-		 * @param array $entry
-		 * @return boolean
+		 * @return string|false
 		 */
 		public function isAnsweringForbidden() {
 			if ($this->isLocked()) {

Spacing +2 added lines, -2 removed lines

@@ -62,7 +62,7 @@ 
 			$timeLimit = (\Configure::read('Saito.Settings.edit_period') * 60) + strtotime($posting->get('time'));
 			$isOverTimeLimit = time() > $timeLimit;
 
-			$isUsersPosting = (int)$User->getId() === (int)$posting->get('user_id');
+			$isUsersPosting = (int) $User->getId() === (int) $posting->get('user_id');
 
 			if ($User->isMod()) {
 				// Mods
@@ -123,7 +123,7 @@ 
 		 */
 		public function hasNewAnswers() {
 			if (!$this->isRoot()) {
-				throw new \RuntimeException('Posting with id ' . $this->get('id') . ' is no root posting.');
+				throw new \RuntimeException('Posting with id '.$this->get('id').' is no root posting.');
 			}
 			if (!isset($this->_CU['last_refresh'])) {
 				return false;

Indentation +127 added lines, -127 removed lines

@@ -1,134 +1,134 @@
 <?php
 
-	namespace Saito\Posting\Decorator;
-
-	trait UserPostingTrait {
-
-		protected $_cache = [];
-
-		protected $_CU;
-
-		public function getCurrentUser() {
-			return $this->_CU;
-		}
-
-		public function setCurrentUser($CU) {
-			$this->_CU = $CU;
-		}
-
-		/**
-		 * Checks if answering an entry is allowed
-		 *
-		 * @param array $entry
-		 * @return boolean
-		 */
-		public function isAnsweringForbidden() {
-			if ($this->isLocked()) {
-				$isAnsweringForbidden = 'locked';
-			} else {
-				$isAnsweringForbidden = false;
-			}
-			return $isAnsweringForbidden;
-		}
-
-		/**
-		 * checks if entry is bookmarked by current user
-		 */
-		public function isBookmarked() {
-			return $this->_CU->hasBookmarked($this->get('id'));
-		}
-
-		public function isEditingAsCurrentUserForbidden() {
-			return $this->_isEditingForbidden($this, $this->_CU);
-		}
-
-		public function isEditingWithRoleUserForbidden() {
-			return $this->_isEditingForbidden($this, $this->_CU->mockUserType('user'));
-		}
-
-		protected function _isEditingForbidden(\Saito\Posting\Posting $posting, $User) {
-			// Anon
-			if ($User->isLoggedIn() !== true) {
-				return true;
-			}
-
-			// Admins
-			if ($User->isAdmin()) {
-				return false;
-			}
-
-			$verboten = true;
-
-			$timeLimit = (\Configure::read('Saito.Settings.edit_period') * 60) + strtotime($posting->get('time'));
-			$isOverTimeLimit = time() > $timeLimit;
-
-			$isUsersPosting = (int)$User->getId() === (int)$posting->get('user_id');
-
-			if ($User->isMod()) {
-				// Mods
-				// @todo mods don't edit admin posts
-				if ($isUsersPosting && $isOverTimeLimit &&
-					/* Mods should be able to edit their own posts if they are pinned
+    namespace Saito\Posting\Decorator;
+
+    trait UserPostingTrait {
+
+        protected $_cache = [];
+
+        protected $_CU;
+
+        public function getCurrentUser() {
+            return $this->_CU;
+        }
+
+        public function setCurrentUser($CU) {
+            $this->_CU = $CU;
+        }
+
+        /**
+         * Checks if answering an entry is allowed
+         *
+         * @param array $entry
+         * @return boolean
+         */
+        public function isAnsweringForbidden() {
+            if ($this->isLocked()) {
+                $isAnsweringForbidden = 'locked';
+            } else {
+                $isAnsweringForbidden = false;
+            }
+            return $isAnsweringForbidden;
+        }
+
+        /**
+         * checks if entry is bookmarked by current user
+         */
+        public function isBookmarked() {
+            return $this->_CU->hasBookmarked($this->get('id'));
+        }
+
+        public function isEditingAsCurrentUserForbidden() {
+            return $this->_isEditingForbidden($this, $this->_CU);
+        }
+
+        public function isEditingWithRoleUserForbidden() {
+            return $this->_isEditingForbidden($this, $this->_CU->mockUserType('user'));
+        }
+
+        protected function _isEditingForbidden(\Saito\Posting\Posting $posting, $User) {
+            // Anon
+            if ($User->isLoggedIn() !== true) {
+                return true;
+            }
+
+            // Admins
+            if ($User->isAdmin()) {
+                return false;
+            }
+
+            $verboten = true;
+
+            $timeLimit = (\Configure::read('Saito.Settings.edit_period') * 60) + strtotime($posting->get('time'));
+            $isOverTimeLimit = time() > $timeLimit;
+
+            $isUsersPosting = (int)$User->getId() === (int)$posting->get('user_id');
+
+            if ($User->isMod()) {
+                // Mods
+                // @todo mods don't edit admin posts
+                if ($isUsersPosting && $isOverTimeLimit &&
+                    /* Mods should be able to edit their own posts if they are pinned
 					 *
 					 * @todo this opens a 'mod can pin and then edit root entries'-loophole,
 					 * as long as no one checks pinning for Configure::read('Saito.Settings.edit_period') * 60
 					 * for mods pinning root-posts.
 					 */
-					(!$posting->isPinned())
-				) {
-					// mods don't mod themselves
-					$verboten = 'time';
-				} else {
-					$verboten = false;
-				};
-
-			} else {
-				// Users
-				if ($isUsersPosting === false) {
-					$verboten = 'user';
-				} elseif ($isOverTimeLimit) {
-					$verboten = 'time';
-				} elseif ($this->isLocked()) {
-					$verboten = 'locked';
-				} else {
-					$verboten = false;
-				}
-			}
-
-			return $verboten;
-		}
-
-		public function isIgnored() {
-			return $this->_CU->ignores($this->get('user_id'));
-		}
-
-		public function isNew() {
-			if (isset($this->_cache['isNew'])) {
-				$this->_cache['isNew'] = $this->_cache['isNew'];
-			} else {
-				$id = $this->get('id');
-				$time = $this->get('time');
-				$this->_cache['isNew'] = !$this->_CU->ReadEntries->isRead($id, $time);
-			}
-			return $this->_cache['isNew'];
-		}
-
-		/**
-		 * Checks if posting has newer answers
-		 *
-		 * currently only supported for root postings
-		 *
-		 * @return bool
-		 * @throws \RuntimeException
-		 */
-		public function hasNewAnswers() {
-			if (!$this->isRoot()) {
-				throw new \RuntimeException('Posting with id ' . $this->get('id') . ' is no root posting.');
-			}
-			if (!isset($this->_CU['last_refresh'])) {
-				return false;
-			}
-			return $this->_CU['last_refresh_unix'] < strtotime($this->get('last_answer'));
-		}
-
-	}
+                    (!$posting->isPinned())
+                ) {
+                    // mods don't mod themselves
+                    $verboten = 'time';
+                } else {
+                    $verboten = false;
+                };
+
+            } else {
+                // Users
+                if ($isUsersPosting === false) {
+                    $verboten = 'user';
+                } elseif ($isOverTimeLimit) {
+                    $verboten = 'time';
+                } elseif ($this->isLocked()) {
+                    $verboten = 'locked';
+                } else {
+                    $verboten = false;
+                }
+            }
+
+            return $verboten;
+        }
+
+        public function isIgnored() {
+            return $this->_CU->ignores($this->get('user_id'));
+        }
+
+        public function isNew() {
+            if (isset($this->_cache['isNew'])) {
+                $this->_cache['isNew'] = $this->_cache['isNew'];
+            } else {
+                $id = $this->get('id');
+                $time = $this->get('time');
+                $this->_cache['isNew'] = !$this->_CU->ReadEntries->isRead($id, $time);
+            }
+            return $this->_cache['isNew'];
+        }
+
+        /**
+         * Checks if posting has newer answers
+         *
+         * currently only supported for root postings
+         *
+         * @return bool
+         * @throws \RuntimeException
+         */
+        public function hasNewAnswers() {
+            if (!$this->isRoot()) {
+                throw new \RuntimeException('Posting with id ' . $this->get('id') . ' is no root posting.');
+            }
+            if (!isset($this->_CU['last_refresh'])) {
+                return false;
+            }
+            return $this->_CU['last_refresh_unix'] < strtotime($this->get('last_answer'));
+        }
+
+    }

app/Lib/Saito/Thread/Renderer/ThreadHtmlRenderer.php

Doc Comments +3 added lines

@@ -76,6 +76,9 @@
 			return $out;
 		}
 
+		/**
+		 * @param \Saito\Posting\PostingInterface $node
+		 */
 		protected function _renderThreadLine($node, array $posting, $level) {
 			$id = $posting['Entry']['id'];
 			$useLineCache = $level > 0 && $this->_LineCache;

Spacing +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
 				$categoryId = $posting['Category']['id'];
 				if (!isset(self::$_catL10n[$categoryId])) {
 					$accession = $posting['Category']['accession'];
-					$catAcs = h(__d('nondynamic', 'category_acs_' . $accession . '_exp'));
+					$catAcs = h(__d('nondynamic', 'category_acs_'.$accession.'_exp'));
 					$catDesc = h($posting['Category']['description']);
 					$catTitle = h($posting['Category']['category']);
 					$category = <<<EOF

Indentation +95 added lines, -95 removed lines

@@ -1,66 +1,66 @@ 
 <?php
 
-	namespace Saito\Thread\Renderer;
-
-	/**
-	 * Class ThreadHtmlRenderer renders postings into a tree
-	 */
-	class ThreadHtmlRenderer extends HtmlRendererAbstract {
-
-		/**
-		 * @var array performance-cheat for category l10n
-		 */
-		protected static $_catL10n = [];
-
-		/**
-		 * @var ItemCache
-		 */
-		protected $_LineCache;
-
-		protected $_webroot;
-
-		public function setOptions($options) {
-			parent::setOptions($options);
-			$this->_webroot = $this->_EntryHelper->webroot;
-			if (isset($options['lineCache'])) {
-				$this->_LineCache = $options['lineCache'];
-			}
-		}
-
-		protected function _renderCore(\Saito\Posting\PostingInterface $node) {
-			$posting = $node->getRaw();
-			$level = $node->getLevel();
-			$id = $posting['Entry']['id'];
-
-			$threadLine = $this->_renderThreadLine($node, $posting, $level);
-			$css = $this->_css($node);
-			$badges = $this->getBadges($node);
-
-			$requestedParams = $this->_SEM->dispatch(
-				'Request.Saito.View.ThreadLine.beforeRender',
-				['node' => $node, 'View' => $this->_EntryHelper->_View]
-			);
-
-			$params = ['css' => '', 'style' => ''];
-
-			if (!empty($requestedParams) && !empty($requestedParams[0])) {
-				foreach ($requestedParams as $param) {
-					foreach ($param as $key => $value) {
-						$params[$key] .= $value;
-					}
-				}
-			}
-
-			//= manual json_encode() for performance
-			$tid = $posting['Entry']['tid'];
-			$isNew = $node->isNew() ? 'true' : 'false';
-			$jsData = <<<EOF
+    namespace Saito\Thread\Renderer;
+
+    /**
+     * Class ThreadHtmlRenderer renders postings into a tree
+     */
+    class ThreadHtmlRenderer extends HtmlRendererAbstract {
+
+        /**
+         * @var array performance-cheat for category l10n
+         */
+        protected static $_catL10n = [];
+
+        /**
+         * @var ItemCache
+         */
+        protected $_LineCache;
+
+        protected $_webroot;
+
+        public function setOptions($options) {
+            parent::setOptions($options);
+            $this->_webroot = $this->_EntryHelper->webroot;
+            if (isset($options['lineCache'])) {
+                $this->_LineCache = $options['lineCache'];
+            }
+        }
+
+        protected function _renderCore(\Saito\Posting\PostingInterface $node) {
+            $posting = $node->getRaw();
+            $level = $node->getLevel();
+            $id = $posting['Entry']['id'];
+
+            $threadLine = $this->_renderThreadLine($node, $posting, $level);
+            $css = $this->_css($node);
+            $badges = $this->getBadges($node);
+
+            $requestedParams = $this->_SEM->dispatch(
+                'Request.Saito.View.ThreadLine.beforeRender',
+                ['node' => $node, 'View' => $this->_EntryHelper->_View]
+            );
+
+            $params = ['css' => '', 'style' => ''];
+
+            if (!empty($requestedParams) && !empty($requestedParams[0])) {
+                foreach ($requestedParams as $param) {
+                    foreach ($param as $key => $value) {
+                        $params[$key] .= $value;
+                    }
+                }
+            }
+
+            //= manual json_encode() for performance
+            $tid = $posting['Entry']['tid'];
+            $isNew = $node->isNew() ? 'true' : 'false';
+            $jsData = <<<EOF
 {"id":{$id},"new":{$isNew},"tid":{$tid}}
 EOF;
 
-			// data-id still used to identify parent when inserting	an inline-answered entry
-			// last </span> comes from _renderThreadLine and allows appending to threadLine-post
-			$out = <<<EOF
+            // data-id still used to identify parent when inserting	an inline-answered entry
+            // last </span> comes from _renderThreadLine and allows appending to threadLine-post
+            $out = <<<EOF
 <li class="threadLeaf {$css}" data-id="{$id}" data-leaf='{$jsData}'>
 	<div class="threadLine {$params['css']}" style="{$params['style']}">
 		<button class="btnLink btn_show_thread threadLine-pre et">
@@ -73,52 +73,52 @@ 
 	</div>
 </li>
 EOF;
-			return $out;
-		}
-
-		protected function _renderThreadLine($node, array $posting, $level) {
-			$id = $posting['Entry']['id'];
-			$useLineCache = $level > 0 && $this->_LineCache;
-
-			if ($useLineCache && $threadLine = $this->_LineCache->get($id)) {
-				return $threadLine;
-			}
-
-			$subject = $this->getSubject($node);
-			$username = h($posting['User']['username']);
-			$time = $this->_EntryHelper->TimeH->formatTime($posting['Entry']['time']);
-
-			//= category HTML
-			$category = '';
-			if ($level === 0) {
-				$categoryId = $posting['Category']['id'];
-				if (!isset(self::$_catL10n[$categoryId])) {
-					$accession = $posting['Category']['accession'];
-					$catAcs = h(__d('nondynamic', 'category_acs_' . $accession . '_exp'));
-					$catDesc = h($posting['Category']['description']);
-					$catTitle = h($posting['Category']['category']);
-					$category = <<<EOF
+            return $out;
+        }
+
+        protected function _renderThreadLine($node, array $posting, $level) {
+            $id = $posting['Entry']['id'];
+            $useLineCache = $level > 0 && $this->_LineCache;
+
+            if ($useLineCache && $threadLine = $this->_LineCache->get($id)) {
+                return $threadLine;
+            }
+
+            $subject = $this->getSubject($node);
+            $username = h($posting['User']['username']);
+            $time = $this->_EntryHelper->TimeH->formatTime($posting['Entry']['time']);
+
+            //= category HTML
+            $category = '';
+            if ($level === 0) {
+                $categoryId = $posting['Category']['id'];
+                if (!isset(self::$_catL10n[$categoryId])) {
+                    $accession = $posting['Category']['accession'];
+                    $catAcs = h(__d('nondynamic', 'category_acs_' . $accession . '_exp'));
+                    $catDesc = h($posting['Category']['description']);
+                    $catTitle = h($posting['Category']['category']);
+                    $category = <<<EOF
 <span class="c-category acs-$accession" title="$catDesc ($catAcs)">
 	($catTitle)
 </span>
 EOF;
-					self::$_catL10n[$categoryId] = $category;
-				}
-				$category = self::$_catL10n[$categoryId];
-			}
+                    self::$_catL10n[$categoryId] = $category;
+                }
+                $category = self::$_catL10n[$categoryId];
+            }
 
-			// last </span> closes in parent
-			$threadLine = <<<EOF
+            // last </span> closes in parent
+            $threadLine = <<<EOF
 {$subject}
 <span class="c-username"> – {$username}</span>
 {$category}
 <span class="threadLine-post"> {$time}
 EOF;
 
-			if ($useLineCache) {
-				$this->_LineCache->set($id, $threadLine, $this->_lastAnswer);
-			}
-			return $threadLine;
-		}
+            if ($useLineCache) {
+                $this->_LineCache->set($id, $threadLine, $this->_lastAnswer);
+            }
+            return $threadLine;
+        }
 
-	}
+    }

app/Lib/Saito/User/Cookie/CurrentUserCookie.php

Doc Comments +3 added lines

@@ -9,6 +9,9 @@
 
 		protected $_Cookie;
 
+		/**
+		 * @param \CurrentUserComponent $CurrentUser
+		 */
 		public function write($CurrentUser) {
 			$cookie = [
 				'id' => $CurrentUser->getId(),

Indentation +31 added lines, -31 removed lines

@@ -1,38 +1,38 @@
 <?php
 
-	namespace Saito\User\Cookie;
+    namespace Saito\User\Cookie;
 
-	/**
-	 * Handles the persistent cookie for cookie relogin
-	 */
-	class CurrentUserCookie extends Storage {
+    /**
+     * Handles the persistent cookie for cookie relogin
+     */
+    class CurrentUserCookie extends Storage {
 
-		protected $_Cookie;
+        protected $_Cookie;
 
-		public function write($CurrentUser) {
-			$cookie = [
-				'id' => $CurrentUser->getId(),
-				'username' => $CurrentUser['username'],
-				'password' => $CurrentUser['password']
-			];
-			parent::write($cookie);
-		}
+        public function write($CurrentUser) {
+            $cookie = [
+                'id' => $CurrentUser->getId(),
+                'username' => $CurrentUser['username'],
+                'password' => $CurrentUser['password']
+            ];
+            parent::write($cookie);
+        }
 
-		/**
-		 * Gets cookie values
-		 *
-		 * @return bool|array cookie values if found, `false` otherwise
-		 */
-		public function read() {
-			$cookie = parent::read();
-			if (is_null($cookie) ||
-				// cookie couldn't be deciphered correctly and is a meaningless string
-				!is_array($cookie)
-			) {
-				parent::delete();
-				return false;
-			}
-			return $cookie;
-		}
+        /**
+         * Gets cookie values
+         *
+         * @return bool|array cookie values if found, `false` otherwise
+         */
+        public function read() {
+            $cookie = parent::read();
+            if (is_null($cookie) ||
+                // cookie couldn't be deciphered correctly and is a meaningless string
+                !is_array($cookie)
+            ) {
+                parent::delete();
+                return false;
+            }
+            return $cookie;
+        }
 
-	}
+    }

app/Lib/Saito/User/LastRefresh/LastRefreshAbstract.php

Doc Comments +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		 * is last refresh newer than $timestamp
 		 *
 		 * @param mixed $timestamp int unix-timestamp or date as string
-		 * @return mixed bool or null if not determinable
+		 * @return null|boolean bool or null if not determinable
 		 */
 		public function isNewerThan($timestamp) {
 			if (is_string($timestamp)) {

Indentation +59 added lines, -59 removed lines

@@ -1,72 +1,72 @@
 <?php
 
-	namespace Saito\User\LastRefresh;
+    namespace Saito\User\LastRefresh;
 
-	/**
-	 * handles last refresh time for the current user
-	 */
-	abstract class LastRefreshAbstract {
+    /**
+     * handles last refresh time for the current user
+     */
+    abstract class LastRefreshAbstract {
 
-		/**
-		 * @var CurrentUserComponent
-		 */
-		protected $_CurrentUser;
+        /**
+         * @var CurrentUserComponent
+         */
+        protected $_CurrentUser;
 
-		/**
-		 * @var int unix timestamp
-		 */
-		protected $_timestamp = null;
+        /**
+         * @var int unix timestamp
+         */
+        protected $_timestamp = null;
 
-		public function __construct(\CurrentuserComponent $CurrentUser) {
-			$this->_CurrentUser = $CurrentUser;
-		}
+        public function __construct(\CurrentuserComponent $CurrentUser) {
+            $this->_CurrentUser = $CurrentUser;
+        }
 
-		/**
-		 * is last refresh newer than $timestamp
-		 *
-		 * @param mixed $timestamp int unix-timestamp or date as string
-		 * @return mixed bool or null if not determinable
-		 */
-		public function isNewerThan($timestamp) {
-			if (is_string($timestamp)) {
-				$timestamp = strtotime($timestamp);
-			}
-			$lastRefresh = $this->_get();
-			// timestamp is not set (or readable): everything is considered new
-			if ($lastRefresh === false) {
-				return null;
-			}
-			return $lastRefresh > $timestamp;
-		}
+        /**
+         * is last refresh newer than $timestamp
+         *
+         * @param mixed $timestamp int unix-timestamp or date as string
+         * @return mixed bool or null if not determinable
+         */
+        public function isNewerThan($timestamp) {
+            if (is_string($timestamp)) {
+                $timestamp = strtotime($timestamp);
+            }
+            $lastRefresh = $this->_get();
+            // timestamp is not set (or readable): everything is considered new
+            if ($lastRefresh === false) {
+                return null;
+            }
+            return $lastRefresh > $timestamp;
+        }
 
-		/**
-		 * returns last refresh timestamp
-		 *
-		 * @return mixed int if unix timestamp or bool false if uninitialized
-		 */
-		abstract protected function _get();
+        /**
+         * returns last refresh timestamp
+         *
+         * @return mixed int if unix timestamp or bool false if uninitialized
+         */
+        abstract protected function _get();
 
-		/**
-		 * @param mixed $timestamp
-		 *
-		 * null|'now'|<`Y-m-d H:i:s` timestamp>
-		 */
-		public function set($timestamp = null) {
-			// all postings individually marked as read should be removed because they
-			// are older than the new last-refresh timestamp
-			$this->_CurrentUser->ReadEntries->delete();
+        /**
+         * @param mixed $timestamp
+         *
+         * null|'now'|<`Y-m-d H:i:s` timestamp>
+         */
+        public function set($timestamp = null) {
+            // all postings individually marked as read should be removed because they
+            // are older than the new last-refresh timestamp
+            $this->_CurrentUser->ReadEntries->delete();
 
-			$this->_timestamp = $this->_parseTimestamp($timestamp);
-			$this->_set();
-		}
+            $this->_timestamp = $this->_parseTimestamp($timestamp);
+            $this->_set();
+        }
 
-		protected abstract function _set();
+        protected abstract function _set();
 
-		protected function _parseTimestamp($timestamp) {
-			if ($timestamp === 'now' || $timestamp === null) {
-				$timestamp = date('Y-m-d H:i:s');
-			}
-			return $timestamp;
-		}
+        protected function _parseTimestamp($timestamp) {
+            if ($timestamp === 'now' || $timestamp === null) {
+                $timestamp = date('Y-m-d H:i:s');
+            }
+            return $timestamp;
+        }
 
-	}
+    }

app/Model/AppModel.php

Doc Comments +5 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 		 * Increments value of a field
 		 *
 		 * @param $id
-		 * @param $field
+		 * @param string $field
 		 * @param int $amount
 		 * @throws InvalidArgumentException
 		 */
@@ -197,6 +197,9 @@ 
 			$this->dispatchSaitoEvent($event, $data);
 		}
 
+		/**
+		 * @param string $event
+		 */
 		public function dispatchSaitoEvent($event, $data) {
 			if (!$this->_SEM) {
 				$this->_SEM = SaitoEventManager::getInstance();
@@ -225,7 +228,7 @@ 
 		 *
 		 * falls back to local definition if available
 		 *
-		 * @param $name
+		 * @param string $name
 		 * @return mixed
 		 * @throws UnexpectedValueException
 		 */

Spacing +6 added lines, -6 removed lines

@@ -74,7 +74,7 @@ 
 
 		public function requireFields(&$data, array $required) {
 			return $this->_mapFields($data, $required,
-				function (&$data, $model, $field) {
+				function(&$data, $model, $field) {
 					if (!isset($data[$model][$field])) {
 						return false;
 					}
@@ -84,7 +84,7 @@ 
 
 		public function unsetFields(&$data, array $unset = ['id']) {
 			return $this->_mapFields($data, $unset,
-				function (&$data, $model, $field) {
+				function(&$data, $model, $field) {
 					if (isset($data[$model][$field])) {
 						unset($data[$model][$field]);
 					}
@@ -138,9 +138,9 @@ 
 				$operator = '-';
 				$amount *= -1;
 			}
-			$field = $this->alias . '.' . $field;
+			$field = $this->alias.'.'.$field;
 			$this->updateAll([$field => "$field $operator $amount"],
-				[$this->alias . '.id' => $id]);
+				[$this->alias.'.id' => $id]);
 		}
 
 		public function pipeMerger(array $data) {
@@ -213,7 +213,7 @@ 
 		protected static function _anonymizeIp($ip) {
 			$strlen = strlen($ip);
 			if ($strlen > 6) :
-				$divider = (int)floor($strlen / 4) + 1;
+				$divider = (int) floor($strlen / 4) + 1;
 				$ip = substr_replace($ip, '…', $divider, $strlen - (2 * $divider));
 			endif;
 
@@ -230,7 +230,7 @@ 
 		 * @throws UnexpectedValueException
 		 */
 		protected function _setting($name) {
-			$setting = Configure::read('Saito.Settings.' . $name);
+			$setting = Configure::read('Saito.Settings.'.$name);
 			if ($setting !== null) {
 				return $setting;
 			}

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

Doc Comments +2 added lines, -2 removed lines

@@ -78,8 +78,8 @@
 
 /**
  *
- * @param int $entry_id
- * @param int $user_id
+ * @param int $entryId
+ * @param int $userId
  * @return bool
  */
 		public function isBookmarked($entryId, $userId) {

Spacing +4 added lines, -4 removed lines

@@ -70,8 +70,8 @@ 
 
 		public function validateUniqueBookmark() {
 			$fields = array(
-				$this->alias . '.user_id' => $this->data['Bookmark']['user_id'],
-				$this->alias . '.entry_id' => $this->data['Bookmark']['entry_id'],
+				$this->alias.'.user_id' => $this->data['Bookmark']['user_id'],
+				$this->alias.'.entry_id' => $this->data['Bookmark']['entry_id'],
 			);
 			return $this->isUnique($fields, false);
 		}
@@ -88,8 +88,8 @@ 
 				array(
 					'contain' => false,
 					'conditions' => array(
-						$this->alias . '.entry_id' => $entryId,
-						$this->alias . '.user_id' => $userId,
+						$this->alias.'.entry_id' => $entryId,
+						$this->alias.'.user_id' => $userId,
 					)
 				)
 			);

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

app/Model/Entry.php

Doc Comments +1 added lines, -1 removed lines

@@ -518,7 +518,7 @@
 		/**
 		 * trees for multiple tids
 		 *
-		 * @param $ids
+		 * @param integer[] $ids
 		 * @param null $order
 		 * @param null $fieldlist
 		 * @return array|bool false if no threads or array with Posting

Spacing +13 added lines, -13 removed lines

@@ -211,7 +211,7 @@ 
 				'category_id' => $User->Categories->getAllowed()
 			];
 
-			$_cacheKey = 'Entry.recentEntries-' . md5(serialize($options));
+			$_cacheKey = 'Entry.recentEntries-'.md5(serialize($options));
 			$_cachedEntry = Cache::read($_cacheKey, 'entries');
 			if ($_cachedEntry) {
 				Stopwatch::stop('Model->User->getRecentEntries()');
@@ -261,7 +261,7 @@ 
 				]
 			);
 			if ($entry == false) {
-				throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
+				throw new UnexpectedValueException('Posting not found. Posting-Id: '.$id);
 			}
 			return $entry['Entry']['tid'];
 		}
@@ -271,7 +271,7 @@ 
  */
 		public function get($id) {
 			return $this->find('entry',
-					['conditions' => [$this->alias . '.id' => $id]]);
+					['conditions' => [$this->alias.'.id' => $id]]);
 		}
 
 /**
@@ -290,7 +290,7 @@ 
 				]
 			);
 			if ($entry == false) {
-				throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
+				throw new UnexpectedValueException('Posting not found. Posting-Id: '.$id);
 			}
 			return $entry['Entry']['pid'];
 		}
@@ -508,7 +508,7 @@ 
 
 			$tree = $this->treesForThreads([$tid], null, $fields);
 
-			if ((int)$tid !== (int)$id) {
+			if ((int) $tid !== (int) $id) {
 				$tree = $this->treeGetSubtree($tree, $id);
 			}
 
@@ -551,7 +551,7 @@ 
 				$threads = [];
 				$entries = $this->treeBuild($entries);
 				foreach ($entries as $thread) {
-					$id = (int)$thread['Entry']['tid'];
+					$id = (int) $thread['Entry']['tid'];
 					$threads[$id] = $thread;
 				}
 			}
@@ -607,7 +607,7 @@ 
 			}
 
 			$root = $this->get($entry['Entry']['tid']);
-			if ((int)$root['User']['id'] !== $this->CurrentUser->getId()) {
+			if ((int) $root['User']['id'] !== $this->CurrentUser->getId()) {
 				throw new ForbiddenException;
 			}
 
@@ -691,7 +691,7 @@ 
 
 			$_idsToDelete = $this->getIdsForNode($id);
 			$success = $this->deleteAll(
-				[$this->alias . '.id' => $_idsToDelete],
+				[$this->alias.'.id' => $_idsToDelete],
 				true,
 				true
 			);
@@ -723,8 +723,8 @@ 
  */
 		public function getIdsForNode($id) {
 			$subthread = $this->treeForNode($id);
-			$func = function (&$tree, &$entry) {
-				$tree['ids'][] = (int)$entry['Entry']['id'];
+			$func = function(&$tree, &$entry) {
+				$tree['ids'][] = (int) $entry['Entry']['id'];
 			};
 			Entry::mapTreeElements($subthread, $func);
 			sort($subthread['ids']);
@@ -841,7 +841,7 @@ 
 				}
 
 				// propagate pinned property from target to source
-				$isTargetPinned = (bool)$targetEntry[$this->alias]['locked'];
+				$isTargetPinned = (bool) $targetEntry[$this->alias]['locked'];
 				if ($sourceEntry[$this->alias]['locked'] !== $isTargetPinned) {
 					$this->id = $targetEntry[$this->alias]['tid'];
 					$this->_threadLock($isTargetPinned);
@@ -1036,8 +1036,8 @@ 
 				$oldEntry = $this->find('first',
 					['contain' => false, 'conditions' => ['Entry.id' => $this->id]]);
 
-				if ($oldEntry && (int)$oldEntry[$this->alias]['pid'] === 0) {
-					$categoryChanged = (int)$this->data[$this->alias]['category_id'] !== (int)$oldEntry[$this->alias]['category_id'];
+				if ($oldEntry && (int) $oldEntry[$this->alias]['pid'] === 0) {
+					$categoryChanged = (int) $this->data[$this->alias]['category_id'] !== (int) $oldEntry[$this->alias]['category_id'];
 					if ($categoryChanged) {
 						$success = $success && $this->_threadChangeCategory(
 								$oldEntry[$this->alias]['tid'],

Indentation +935 added lines, -935 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
-	use Saito\User\ForumsUserInterface;
+    use Saito\User\ForumsUserInterface;
 
-	App::uses('AppModel', 'Model');
+    App::uses('AppModel', 'Model');
 
 /**
  *
@@ -23,225 +23,225 @@ 
  * @td After mlf is gone `edited_by` should conatin a User.id, not the username string.
  *
  */
-	class Entry extends AppModel {
-
-		public $name = 'Entry';
-
-		public $primaryKey = 'id';
-
-		public $actsAs = [
-			'Markup',
-			'Containable',
-			'Search.Searchable',
-			'Tree'
-		];
-
-		public $findMethods = array(
-			'feed' => true,
-			'entry' => true
-		);
-
-		/**
-		 * Fields for search plugin
-		 *
-		 * @var array
-		 */
-		public $filterArgs = [
-				'subject' => ['type' => 'like'],
-				'text' => ['type' => 'like'],
-				'name' => ['type' => 'like'],
-				'category_id' => ['type' => 'value'],
-		];
-
-		public $belongsTo = array(
-			'Category' => array(
-				'className' => 'Category',
-				'foreignKey' => 'category_id',
-			),
-			'User' => array(
-				'className' => 'User',
-				'foreignKey' => 'user_id',
-				'counterCache' => true,
-			),
-		);
-
-		public $hasMany = array(
-			'Bookmark' => array(
-				'foreignKey' => 'entry_id',
-				'dependent' => true,
-			),
-			'Esevent' => array(
-				'foreignKey' => 'subject',
-				'conditions' => array('Esevent.subject' => 'Entry.id'),
-			),
-			'UserRead' => [
-				'foreignKey' => 'entry_id',
-				'dependent' => true
-			]
-		);
-
-		public $validate = [
-				'subject' => [
-						'notEmpty' => ['rule' => 'notBlank'],
-						'maxLength' => ['rule' => 'validateSubjectMaxLength']
-				],
-				'category_id' => [
-						'notEmpty' => ['rule' => 'notBlank'],
-						'numeric' => ['rule' => 'numeric'],
-						'isAllowed' => ['rule' => 'validateCategoryIsAllowed']
-				],
-				'user_id' => ['rule' => 'numeric'],
-				'views' => ['rule' => ['comparison', '>=', 0]],
-			// used in full text search
-				'name' => array()
-		];
-
-		/**
-		 * Fields allowed in public output
-		 *
-		 * @var array
-		 */
-		protected $_allowedPublicOutputFields = [
-			'Entry.id',
-			'Entry.pid',
-			'Entry.tid',
-			'Entry.time',
-			'Entry.last_answer',
-			'Entry.edited',
-			'Entry.edited_by',
-			'Entry.user_id',
-			'Entry.name',
-			'Entry.subject',
-			'Entry.category_id',
-			'Entry.text',
-			'Entry.locked',
-			'Entry.fixed',
-			'Entry.views',
-			'User.username'
-		];
-
-		/**
-		 * field list necessary for displaying a thread_line
-		 *
-		 * Entry.text determine if Entry is n/t
-		 *
-		 * @var string
-		 */
-		public $threadLineFieldList = [
-			'Entry.id',
-			'Entry.pid',
-			'Entry.tid',
-			'Entry.subject',
-			'Entry.text',
-			'Entry.time',
-			'Entry.fixed',
-			'Entry.last_answer',
-			'Entry.views',
-			'Entry.user_id',
-			'Entry.locked',
-			'Entry.name',
-			'Entry.solves',
-
-			'User.username',
-
-			'Category.accession',
-			'Category.category',
-			'Category.description'
-		];
-
-		/**
-		 * fields additional to $threadLineFieldList to show complete entry
-		 *
-		 * @var string
-		 */
-		public $showEntryFieldListAdditional = [
-			'Entry.edited',
-			'Entry.edited_by',
-			'Entry.ip',
-			'Entry.category_id',
-
-			'User.id',
-			'User.signature',
-			'User.user_place'
-		];
-
-		/**
-		 * Allowed external user input
-		 *
-		 * @var array
-		 */
-		public $allowedInputFields = [
-			'create' => [
-				'category_id',
-				'pid',
-				'subject',
-				'text'
-			],
-			'update' => [
-				'id',
-				'category_id',
-				'subject',
-				'text'
-			]
-		];
-
-		protected $_settings = [
-			'edit_period' => 20,
-			'subject_maxlength' => 100
-		];
+    class Entry extends AppModel {
+
+        public $name = 'Entry';
+
+        public $primaryKey = 'id';
+
+        public $actsAs = [
+            'Markup',
+            'Containable',
+            'Search.Searchable',
+            'Tree'
+        ];
+
+        public $findMethods = array(
+            'feed' => true,
+            'entry' => true
+        );
+
+        /**
+         * Fields for search plugin
+         *
+         * @var array
+         */
+        public $filterArgs = [
+                'subject' => ['type' => 'like'],
+                'text' => ['type' => 'like'],
+                'name' => ['type' => 'like'],
+                'category_id' => ['type' => 'value'],
+        ];
+
+        public $belongsTo = array(
+            'Category' => array(
+                'className' => 'Category',
+                'foreignKey' => 'category_id',
+            ),
+            'User' => array(
+                'className' => 'User',
+                'foreignKey' => 'user_id',
+                'counterCache' => true,
+            ),
+        );
+
+        public $hasMany = array(
+            'Bookmark' => array(
+                'foreignKey' => 'entry_id',
+                'dependent' => true,
+            ),
+            'Esevent' => array(
+                'foreignKey' => 'subject',
+                'conditions' => array('Esevent.subject' => 'Entry.id'),
+            ),
+            'UserRead' => [
+                'foreignKey' => 'entry_id',
+                'dependent' => true
+            ]
+        );
+
+        public $validate = [
+                'subject' => [
+                        'notEmpty' => ['rule' => 'notBlank'],
+                        'maxLength' => ['rule' => 'validateSubjectMaxLength']
+                ],
+                'category_id' => [
+                        'notEmpty' => ['rule' => 'notBlank'],
+                        'numeric' => ['rule' => 'numeric'],
+                        'isAllowed' => ['rule' => 'validateCategoryIsAllowed']
+                ],
+                'user_id' => ['rule' => 'numeric'],
+                'views' => ['rule' => ['comparison', '>=', 0]],
+            // used in full text search
+                'name' => array()
+        ];
+
+        /**
+         * Fields allowed in public output
+         *
+         * @var array
+         */
+        protected $_allowedPublicOutputFields = [
+            'Entry.id',
+            'Entry.pid',
+            'Entry.tid',
+            'Entry.time',
+            'Entry.last_answer',
+            'Entry.edited',
+            'Entry.edited_by',
+            'Entry.user_id',
+            'Entry.name',
+            'Entry.subject',
+            'Entry.category_id',
+            'Entry.text',
+            'Entry.locked',
+            'Entry.fixed',
+            'Entry.views',
+            'User.username'
+        ];
+
+        /**
+         * field list necessary for displaying a thread_line
+         *
+         * Entry.text determine if Entry is n/t
+         *
+         * @var string
+         */
+        public $threadLineFieldList = [
+            'Entry.id',
+            'Entry.pid',
+            'Entry.tid',
+            'Entry.subject',
+            'Entry.text',
+            'Entry.time',
+            'Entry.fixed',
+            'Entry.last_answer',
+            'Entry.views',
+            'Entry.user_id',
+            'Entry.locked',
+            'Entry.name',
+            'Entry.solves',
+
+            'User.username',
+
+            'Category.accession',
+            'Category.category',
+            'Category.description'
+        ];
+
+        /**
+         * fields additional to $threadLineFieldList to show complete entry
+         *
+         * @var string
+         */
+        public $showEntryFieldListAdditional = [
+            'Entry.edited',
+            'Entry.edited_by',
+            'Entry.ip',
+            'Entry.category_id',
+
+            'User.id',
+            'User.signature',
+            'User.user_place'
+        ];
+
+        /**
+         * Allowed external user input
+         *
+         * @var array
+         */
+        public $allowedInputFields = [
+            'create' => [
+                'category_id',
+                'pid',
+                'subject',
+                'text'
+            ],
+            'update' => [
+                'id',
+                'category_id',
+                'subject',
+                'text'
+            ]
+        ];
+
+        protected $_settings = [
+            'edit_period' => 20,
+            'subject_maxlength' => 100
+        ];
 
 /**
  * Caching for isRoot()
  *
  * @var array
  */
-		protected $_isRoot = [];
-
-		/**
-		 * @param ForumsUserInterface $User
-		 * @param array $options
-		 * @return array|mixed
-		 */
-		public function getRecentEntries(CurrentUserComponent $User, array $options = []) {
-			Stopwatch::start('Model->User->getRecentEntries()');
-
-			$options += [
-				'user_id' => null,
-				'limit' => 10,
-				'category_id' => $User->Categories->getAllowed()
-			];
-
-			$_cacheKey = 'Entry.recentEntries-' . md5(serialize($options));
-			$_cachedEntry = Cache::read($_cacheKey, 'entries');
-			if ($_cachedEntry) {
-				Stopwatch::stop('Model->User->getRecentEntries()');
-				return $_cachedEntry;
-			}
-
-			$conditions = array();
-			if ($options['user_id'] !== null) {
-				$conditions[]['Entry.user_id'] = $options['user_id'];
-			}
-			if ($options['category_id'] !== null):
-				$conditions[]['Entry.category_id'] = $options['category_id'];
-			endif;
-
-			$result = $this->find(
-				'all',
-				[
-					'contain' => array('User', 'Category'),
-					'fields' => $this->threadLineFieldList,
-					'conditions' => $conditions,
-					'limit' => $options['limit'],
-					'order' => 'time DESC'
-				]
-			);
-
-			Cache::write($_cacheKey, $result, 'entries');
-
-			Stopwatch::stop('Model->User->getRecentEntries()');
-			return $result;
-		}
+        protected $_isRoot = [];
+
+        /**
+         * @param ForumsUserInterface $User
+         * @param array $options
+         * @return array|mixed
+         */
+        public function getRecentEntries(CurrentUserComponent $User, array $options = []) {
+            Stopwatch::start('Model->User->getRecentEntries()');
+
+            $options += [
+                'user_id' => null,
+                'limit' => 10,
+                'category_id' => $User->Categories->getAllowed()
+            ];
+
+            $_cacheKey = 'Entry.recentEntries-' . md5(serialize($options));
+            $_cachedEntry = Cache::read($_cacheKey, 'entries');
+            if ($_cachedEntry) {
+                Stopwatch::stop('Model->User->getRecentEntries()');
+                return $_cachedEntry;
+            }
+
+            $conditions = array();
+            if ($options['user_id'] !== null) {
+                $conditions[]['Entry.user_id'] = $options['user_id'];
+            }
+            if ($options['category_id'] !== null):
+                $conditions[]['Entry.category_id'] = $options['category_id'];
+            endif;
+
+            $result = $this->find(
+                'all',
+                [
+                    'contain' => array('User', 'Category'),
+                    'fields' => $this->threadLineFieldList,
+                    'conditions' => $conditions,
+                    'limit' => $options['limit'],
+                    'order' => 'time DESC'
+                ]
+            );
+
+            Cache::write($_cacheKey, $result, 'entries');
+
+            Stopwatch::stop('Model->User->getRecentEntries()');
+            return $result;
+        }
 
 /**
  * Finds the thread-id for a posting
@@ -250,233 +250,233 @@ 
  * @return int Thread-Id
  * @throws UnexpectedValueException
  */
-		public function getThreadId($id) {
-			$entry = $this->find(
-				'first',
-				[
-					'contain' => false,
-					'conditions' => ['Entry.id' => $id],
-					'fields' => 'Entry.tid'
-
-				]
-			);
-			if ($entry == false) {
-				throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
-			}
-			return $entry['Entry']['tid'];
-		}
+        public function getThreadId($id) {
+            $entry = $this->find(
+                'first',
+                [
+                    'contain' => false,
+                    'conditions' => ['Entry.id' => $id],
+                    'fields' => 'Entry.tid'
+
+                ]
+            );
+            if ($entry == false) {
+                throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
+            }
+            return $entry['Entry']['tid'];
+        }
 
 /**
  * Shorthand for reading an entry with full data
  */
-		public function get($id) {
-			return $this->find('entry',
-					['conditions' => [$this->alias . '.id' => $id]]);
-		}
+        public function get($id) {
+            return $this->find('entry',
+                    ['conditions' => [$this->alias . '.id' => $id]]);
+        }
 
 /**
  * @param $id
  * @return mixed
  * @throws UnexpectedValueException
  */
-		public function getParentId($id) {
-			$entry = $this->find(
-				'first',
-				[
-					'contain' => false,
-					'conditions' => ['Entry.id' => $id],
-					'fields' => 'Entry.pid'
-
-				]
-			);
-			if ($entry == false) {
-				throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
-			}
-			return $entry['Entry']['pid'];
-		}
-
-		/**
-		 * creates a new root or child entry for a node
-		 *
-		 * fields in $data are filtered
-		 *
-		 * @param $data
-		 * @return array|bool|mixed
-		 */
-		public function createPosting($data) {
-			if (!isset($data[$this->alias]['pid'])) {
-				$data[$this->alias]['pid'] = 0;
-			}
-
-			if (isset($data[$this->alias]['subject']) === false) {
-				return false;
-			}
-
-			try {
-				$this->prepare($data, ['preFilterFields' => 'create']);
-			} catch (Exception $e) {
-				return false;
-			}
-
-			$data[$this->alias]['user_id'] = $this->CurrentUser->getId();
-			$data[$this->alias]['name'] = $this->CurrentUser['username'];
-
-			$data[$this->alias]['time'] = bDate();
-			$data[$this->alias]['last_answer'] = bDate();
-			$data[$this->alias]['ip'] = self::_getIp();
-
-			$this->create();
-			$_newPosting = $this->save($data);
-
-			if ($_newPosting === false) {
-				return false;
-			}
-
-			$_newPostingId = $this->id;
-
-			// make sure we pass the complete ['Entry'] dataset to events
-			$this->contain();
-			$_newPosting = $this->read();
-
-			if ($this->isRoot($data)) {
-				// thread-id of new thread is its own id
-				if ($this->save(['tid' => $_newPostingId], false, ['tid']) === false) {
-					// @td raise error and/or roll back new entry
-					return false;
-				} else {
-					$_newPosting[$this->alias]['tid'] = $_newPostingId;
-					$this->Category->id = $data[$this->alias]['category_id'];
-					$this->Category->updateThreadCounter();
-				}
-				$this->_dispatchEvent(
-					'Model.Thread.create',
-					[
-						'subject' => $_newPosting[$this->alias]['id'],
-						'data' => $_newPosting
-					]
-				);
-			} else {
-				// update last answer time of root entry
-				$this->clear();
-				$this->id = $_newPosting[$this->alias]['tid'];
-				$this->set('last_answer', $_newPosting[$this->alias]['last_answer']);
-				if ($this->save() === false) {
-					// @td raise error and/or roll back new entry
-					return false;
-				}
-
-				$this->_dispatchEvent(
-					'Model.Entry.replyToEntry',
-					[
-						'subject' => $_newPosting[$this->alias]['pid'],
-						'data' => $_newPosting
-					]
-				);
-				$this->_dispatchEvent(
-					'Model.Entry.replyToThread',
-					[
-						'subject' => $_newPosting[$this->alias]['tid'],
-						'data' => $_newPosting
-					]
-				);
-			}
-
-			$this->id = $_newPostingId;
-			$_newPosting[$this->alias]['subject'] = Sanitize::html($_newPosting[$this->alias]['subject']);
-			$_newPosting[$this->alias]['text'] = Sanitize::html($_newPosting[$this->alias]['text']);
-			return $_newPosting;
-		}
-
-		/**
-		 * Updates a posting
-		 *
-		 * fields in $data are filtered except for $id!
-		 *
-		 * @param $data
-		 * @param null $CurrentUser
-		 * @return array|mixed
-		 * @throws NotFoundException
-		 * @throws InvalidArgumentException
-		 */
-		public function update($data, $CurrentUser = null) {
-			if ($CurrentUser !== null) {
-				$this->CurrentUser = $CurrentUser;
-			}
-
-			if (empty($data[$this->alias]['id'])) {
-				throw new InvalidArgumentException('Missing entry id in arguments.');
-			}
-
-			$id = $data[$this->alias]['id'];
-			if (!$this->exists($id)) {
-				throw new NotFoundException(sprintf('Entry with id `%s` not found.', $id));
-			}
-
-			$this->prepare($data, ['preFilterFields' => 'update']);
-
-			// prevents normal user of changing category of complete thread when answering
-			// @todo this should be refactored together with the change category handling in beforeSave()
-			if ($this->isRoot($data) === false) {
-				unset($data[$this->alias]['category_id']);
-			}
-
-			$data[$this->alias]['edited'] = bDate();
-			$data[$this->alias]['edited_by'] = $this->CurrentUser['username'];
-
-			$this->validator()->add(
-				'edited_by',
-				'isEditingAllowed',
-				[
-					'rule' => 'validateEditingAllowed'
-				]
-			);
-
-			$result = $this->save($data);
-
-			if ($result) {
-				$this->contain();
-				$result = $this->read() + $data;
-				$this->_dispatchEvent(
-					'Model.Entry.update',
-					[
-						'subject' => $result[$this->alias]['id'],
-						'data' => $result
-					]
-				);
-			}
-
-			return $result;
-		}
-
-		/**
-		 * Update view counter on all entries in a thread
-		 *
-		 * Note that this function unbinds the model associations for performance.
-		 * Otherwise updateAll() left joins all associated models.
-		 *
-		 * @param $tid thread-ID
-		 * @param $uid entries with this user-id are not updated
-		 */
-		public function threadIncrementViews($tid, $uid = null) {
-			Stopwatch::start('Entry::threadIncrementViews');
-			$_where = ['Entry.tid' => $tid];
-			if ($uid && is_int($uid)) {
-				$_where['Entry.user_id !='] = $uid;
-			}
-			// $_belongsTo = $this->belongsTo;
-			$this->unbindModel(['belongsTo' => array_keys($this->belongsTo)]);
-			$this->updateAll(['Entry.views' => 'Entry.views + 1'], $_where);
-			// $this->bindModel(['belongsTo' => $_belongsTo]);
-			Stopwatch::stop('Entry::threadIncrementViews');
-		}
+        public function getParentId($id) {
+            $entry = $this->find(
+                'first',
+                [
+                    'contain' => false,
+                    'conditions' => ['Entry.id' => $id],
+                    'fields' => 'Entry.pid'
+
+                ]
+            );
+            if ($entry == false) {
+                throw new UnexpectedValueException('Posting not found. Posting-Id: ' . $id);
+            }
+            return $entry['Entry']['pid'];
+        }
+
+        /**
+         * creates a new root or child entry for a node
+         *
+         * fields in $data are filtered
+         *
+         * @param $data
+         * @return array|bool|mixed
+         */
+        public function createPosting($data) {
+            if (!isset($data[$this->alias]['pid'])) {
+                $data[$this->alias]['pid'] = 0;
+            }
+
+            if (isset($data[$this->alias]['subject']) === false) {
+                return false;
+            }
+
+            try {
+                $this->prepare($data, ['preFilterFields' => 'create']);
+            } catch (Exception $e) {
+                return false;
+            }
+
+            $data[$this->alias]['user_id'] = $this->CurrentUser->getId();
+            $data[$this->alias]['name'] = $this->CurrentUser['username'];
+
+            $data[$this->alias]['time'] = bDate();
+            $data[$this->alias]['last_answer'] = bDate();
+            $data[$this->alias]['ip'] = self::_getIp();
+
+            $this->create();
+            $_newPosting = $this->save($data);
+
+            if ($_newPosting === false) {
+                return false;
+            }
+
+            $_newPostingId = $this->id;
+
+            // make sure we pass the complete ['Entry'] dataset to events
+            $this->contain();
+            $_newPosting = $this->read();
+
+            if ($this->isRoot($data)) {
+                // thread-id of new thread is its own id
+                if ($this->save(['tid' => $_newPostingId], false, ['tid']) === false) {
+                    // @td raise error and/or roll back new entry
+                    return false;
+                } else {
+                    $_newPosting[$this->alias]['tid'] = $_newPostingId;
+                    $this->Category->id = $data[$this->alias]['category_id'];
+                    $this->Category->updateThreadCounter();
+                }
+                $this->_dispatchEvent(
+                    'Model.Thread.create',
+                    [
+                        'subject' => $_newPosting[$this->alias]['id'],
+                        'data' => $_newPosting
+                    ]
+                );
+            } else {
+                // update last answer time of root entry
+                $this->clear();
+                $this->id = $_newPosting[$this->alias]['tid'];
+                $this->set('last_answer', $_newPosting[$this->alias]['last_answer']);
+                if ($this->save() === false) {
+                    // @td raise error and/or roll back new entry
+                    return false;
+                }
+
+                $this->_dispatchEvent(
+                    'Model.Entry.replyToEntry',
+                    [
+                        'subject' => $_newPosting[$this->alias]['pid'],
+                        'data' => $_newPosting
+                    ]
+                );
+                $this->_dispatchEvent(
+                    'Model.Entry.replyToThread',
+                    [
+                        'subject' => $_newPosting[$this->alias]['tid'],
+                        'data' => $_newPosting
+                    ]
+                );
+            }
+
+            $this->id = $_newPostingId;
+            $_newPosting[$this->alias]['subject'] = Sanitize::html($_newPosting[$this->alias]['subject']);
+            $_newPosting[$this->alias]['text'] = Sanitize::html($_newPosting[$this->alias]['text']);
+            return $_newPosting;
+        }
+
+        /**
+         * Updates a posting
+         *
+         * fields in $data are filtered except for $id!
+         *
+         * @param $data
+         * @param null $CurrentUser
+         * @return array|mixed
+         * @throws NotFoundException
+         * @throws InvalidArgumentException
+         */
+        public function update($data, $CurrentUser = null) {
+            if ($CurrentUser !== null) {
+                $this->CurrentUser = $CurrentUser;
+            }
+
+            if (empty($data[$this->alias]['id'])) {
+                throw new InvalidArgumentException('Missing entry id in arguments.');
+            }
+
+            $id = $data[$this->alias]['id'];
+            if (!$this->exists($id)) {
+                throw new NotFoundException(sprintf('Entry with id `%s` not found.', $id));
+            }
+
+            $this->prepare($data, ['preFilterFields' => 'update']);
+
+            // prevents normal user of changing category of complete thread when answering
+            // @todo this should be refactored together with the change category handling in beforeSave()
+            if ($this->isRoot($data) === false) {
+                unset($data[$this->alias]['category_id']);
+            }
+
+            $data[$this->alias]['edited'] = bDate();
+            $data[$this->alias]['edited_by'] = $this->CurrentUser['username'];
+
+            $this->validator()->add(
+                'edited_by',
+                'isEditingAllowed',
+                [
+                    'rule' => 'validateEditingAllowed'
+                ]
+            );
+
+            $result = $this->save($data);
+
+            if ($result) {
+                $this->contain();
+                $result = $this->read() + $data;
+                $this->_dispatchEvent(
+                    'Model.Entry.update',
+                    [
+                        'subject' => $result[$this->alias]['id'],
+                        'data' => $result
+                    ]
+                );
+            }
+
+            return $result;
+        }
+
+        /**
+         * Update view counter on all entries in a thread
+         *
+         * Note that this function unbinds the model associations for performance.
+         * Otherwise updateAll() left joins all associated models.
+         *
+         * @param $tid thread-ID
+         * @param $uid entries with this user-id are not updated
+         */
+        public function threadIncrementViews($tid, $uid = null) {
+            Stopwatch::start('Entry::threadIncrementViews');
+            $_where = ['Entry.tid' => $tid];
+            if ($uid && is_int($uid)) {
+                $_where['Entry.user_id !='] = $uid;
+            }
+            // $_belongsTo = $this->belongsTo;
+            $this->unbindModel(['belongsTo' => array_keys($this->belongsTo)]);
+            $this->updateAll(['Entry.views' => 'Entry.views + 1'], $_where);
+            // $this->bindModel(['belongsTo' => $_belongsTo]);
+            Stopwatch::stop('Entry::threadIncrementViews');
+        }
 
 /**
  *
  * @mb `views` into extra related table if performance becomes a problem
  */
-		public function incrementViews($id, $amount = 1) {
-			$this->increment($id, 'views', $amount);
-		}
+        public function incrementViews($id, $amount = 1) {
+            $this->increment($id, 'views', $amount);
+        }
 
 /**
  * tree of a single node and its subentries
@@ -489,77 +489,77 @@ 
  * @param array $options
  * @return array tree
  */
-		public function treeForNode($id, $options = array()) {
-			$options += [
-				'root' => false,
-				'complete' => false
-			];
-
-			if ($options['root']) {
-				$tid = $id;
-			} else {
-				$tid = $this->getThreadId($id);
-			}
-
-			$fields = null;
-			if ($options['complete']) {
-				$fields = array_merge($this->threadLineFieldList, $this->showEntryFieldListAdditional);
-			}
-
-			$tree = $this->treesForThreads([$tid], null, $fields);
-
-			if ((int)$tid !== (int)$id) {
-				$tree = $this->treeGetSubtree($tree, $id);
-			}
-
-			return $tree;
-		}
-
-		/**
-		 * trees for multiple tids
-		 *
-		 * @param $ids
-		 * @param null $order
-		 * @param null $fieldlist
-		 * @return array|bool false if no threads or array with Posting
-		 */
-		public function treesForThreads($ids, $order = null, $fieldlist = null) {
-			if (empty($ids)) {
-				return [];
-			}
-
-			Stopwatch::start('Model->Entries->treeForThreads() DB');
-
-			if (empty($order)) {
-				$order = 'last_answer ASC';
-			}
-
-			if ($fieldlist === null) {
-				$fieldlist = $this->threadLineFieldList;
-			}
-
-			$entries = $this->_getThreadEntries(
-				$ids,
-				['order' => $order, 'fields' => $fieldlist]
-			);
-
-			Stopwatch::stop('Model->Entries->treeForThreads() DB');
-			Stopwatch::start('Model->Entries->treeForThreads() CPU');
-
-			$threads = false;
-			if ($entries) {
-				$threads = [];
-				$entries = $this->treeBuild($entries);
-				foreach ($entries as $thread) {
-					$id = (int)$thread['Entry']['tid'];
-					$threads[$id] = $thread;
-				}
-			}
-
-			Stopwatch::stop('Model->Entries->treeForThreads() CPU');
-
-			return $threads;
-		}
+        public function treeForNode($id, $options = array()) {
+            $options += [
+                'root' => false,
+                'complete' => false
+            ];
+
+            if ($options['root']) {
+                $tid = $id;
+            } else {
+                $tid = $this->getThreadId($id);
+            }
+
+            $fields = null;
+            if ($options['complete']) {
+                $fields = array_merge($this->threadLineFieldList, $this->showEntryFieldListAdditional);
+            }
+
+            $tree = $this->treesForThreads([$tid], null, $fields);
+
+            if ((int)$tid !== (int)$id) {
+                $tree = $this->treeGetSubtree($tree, $id);
+            }
+
+            return $tree;
+        }
+
+        /**
+         * trees for multiple tids
+         *
+         * @param $ids
+         * @param null $order
+         * @param null $fieldlist
+         * @return array|bool false if no threads or array with Posting
+         */
+        public function treesForThreads($ids, $order = null, $fieldlist = null) {
+            if (empty($ids)) {
+                return [];
+            }
+
+            Stopwatch::start('Model->Entries->treeForThreads() DB');
+
+            if (empty($order)) {
+                $order = 'last_answer ASC';
+            }
+
+            if ($fieldlist === null) {
+                $fieldlist = $this->threadLineFieldList;
+            }
+
+            $entries = $this->_getThreadEntries(
+                $ids,
+                ['order' => $order, 'fields' => $fieldlist]
+            );
+
+            Stopwatch::stop('Model->Entries->treeForThreads() DB');
+            Stopwatch::start('Model->Entries->treeForThreads() CPU');
+
+            $threads = false;
+            if ($entries) {
+                $threads = [];
+                $entries = $this->treeBuild($entries);
+                foreach ($entries as $thread) {
+                    $id = (int)$thread['Entry']['tid'];
+                    $threads[$id] = $thread;
+                }
+            }
+
+            Stopwatch::stop('Model->Entries->treeForThreads() CPU');
+
+            return $threads;
+        }
 
 /**
  * @param       $tid
@@ -574,82 +574,82 @@ 
  *  )
  * </pre>
  */
-		protected function _getThreadEntries($tid, array $params = []) {
-			$params += [
-				'fields' => $this->threadLineFieldList,
-				'order' => 'last_answer ASC'
-			];
-			$threads = $this->find(
-				'all',
-				[
-					'conditions' => ['tid' => $tid],
-					'contain' => ['User', 'Category'],
-					'fields' => $params['fields'],
-					'order' => $params['order']
-				]
-			);
-
-			return $threads;
-		}
-
-		/**
-		 * Marks a sub-entry as solution to a root entry
-		 *
-		 * @param $id
-		 * @return bool
-		 * @throws InvalidArgumentException
-		 * @throws ForbiddenException
-		 */
-		public function toggleSolve($id) {
-			$entry = $this->get($id);
-			if (empty($entry) || $this->isRoot($entry)) {
-				throw new InvalidArgumentException;
-			}
-
-			$root = $this->get($entry['Entry']['tid']);
-			if ((int)$root['User']['id'] !== $this->CurrentUser->getId()) {
-				throw new ForbiddenException;
-			}
-
-			if ($entry[$this->alias]['solves']) {
-				$value = 0;
-			} else {
-				$value = $entry[$this->alias]['tid'];
-			}
-			$this->id = $id;
-			$success = $this->saveField('solves', $value);
-			if (!$success) {
-				return $success;
-			}
-			$this->_dispatchEvent('Model.Entry.update',
-					['subject' => $id, 'data' => $entry]);
-			$entry[$this->alias]['solves'] = $value;
-			return $success;
-		}
-
-		public function toggle($key) {
-			$result = parent::toggle($key);
-			if ($key === 'locked') {
-				$this->_threadLock($result);
-			}
-
-			$this->contain();
-			$entry = $this->read();
-
-			$this->_dispatchEvent(
-				'Model.Entry.update',
-				[
-					'subject' => $entry[$this->alias]['id'],
-					'data' => $entry
-				]
-			);
-
-			return $result;
-		}
-
-		public function beforeFind($queryData) {
-			parent::beforeFind($queryData);
-			/*
+        protected function _getThreadEntries($tid, array $params = []) {
+            $params += [
+                'fields' => $this->threadLineFieldList,
+                'order' => 'last_answer ASC'
+            ];
+            $threads = $this->find(
+                'all',
+                [
+                    'conditions' => ['tid' => $tid],
+                    'contain' => ['User', 'Category'],
+                    'fields' => $params['fields'],
+                    'order' => $params['order']
+                ]
+            );
+
+            return $threads;
+        }
+
+        /**
+         * Marks a sub-entry as solution to a root entry
+         *
+         * @param $id
+         * @return bool
+         * @throws InvalidArgumentException
+         * @throws ForbiddenException
+         */
+        public function toggleSolve($id) {
+            $entry = $this->get($id);
+            if (empty($entry) || $this->isRoot($entry)) {
+                throw new InvalidArgumentException;
+            }
+
+            $root = $this->get($entry['Entry']['tid']);
+            if ((int)$root['User']['id'] !== $this->CurrentUser->getId()) {
+                throw new ForbiddenException;
+            }
+
+            if ($entry[$this->alias]['solves']) {
+                $value = 0;
+            } else {
+                $value = $entry[$this->alias]['tid'];
+            }
+            $this->id = $id;
+            $success = $this->saveField('solves', $value);
+            if (!$success) {
+                return $success;
+            }
+            $this->_dispatchEvent('Model.Entry.update',
+                    ['subject' => $id, 'data' => $entry]);
+            $entry[$this->alias]['solves'] = $value;
+            return $success;
+        }
+
+        public function toggle($key) {
+            $result = parent::toggle($key);
+            if ($key === 'locked') {
+                $this->_threadLock($result);
+            }
+
+            $this->contain();
+            $entry = $this->read();
+
+            $this->_dispatchEvent(
+                'Model.Entry.update',
+                [
+                    'subject' => $entry[$this->alias]['id'],
+                    'data' => $entry
+                ]
+            );
+
+            return $result;
+        }
+
+        public function beforeFind($queryData) {
+            parent::beforeFind($queryData);
+            /*
 				* workarround for possible cakephp join error for associated tables
 				* and virtual fields
 				*
@@ -659,17 +659,17 @@ 
 				*
 				* checkout in cakephp mailing list/bug tracker
 				*/
-			$this->User->virtualFields = null;
-		}
+            $this->User->virtualFields = null;
+        }
 
-		public function beforeValidate($options = array()) {
-			parent::beforeValidate($options);
+        public function beforeValidate($options = array()) {
+            parent::beforeValidate($options);
 
-			//* in n/t posting delete unnecessary body text
-			if (isset($this->data['Entry']['text'])) {
-				$this->data['Entry']['text'] = rtrim($this->data['Entry']['text']);
-			}
-		}
+            //* in n/t posting delete unnecessary body text
+            if (isset($this->data['Entry']['text'])) {
+                $this->data['Entry']['text'] = rtrim($this->data['Entry']['text']);
+            }
+        }
 
 /**
  * Deletes entry and all it's subentries and associated data
@@ -677,43 +677,43 @@ 
  * @return bool
  * @throws Exception
  */
-		public function deleteNode($id = null) {
-			if (empty($id)) {
-				$id = $this->id;
-			}
-
-			$this->contain();
-			$entry = $this->findById($id);
-
-			if (empty($entry)) {
-				throw new Exception;
-			}
-
-			$_idsToDelete = $this->getIdsForNode($id);
-			$success = $this->deleteAll(
-				[$this->alias . '.id' => $_idsToDelete],
-				true,
-				true
-			);
-
-			if ($success):
-				if ($this->isRoot($entry)) {
-					$this->Category->id = $entry['Entry']['category_id'];
-					$this->Category->updateThreadCounter();
-					$this->Esevent->deleteSubject($id, 'thread');
-				}
-				foreach ($_idsToDelete as $_entryId) {
-					$this->Esevent->deleteSubject($_entryId, 'entry');
-				}
-
-				$this->_dispatchEvent(
-					'Model.Thread.change',
-					['subject' => $entry[$this->alias]['tid']]
-				);
-			endif;
-
-			return $success;
-		}
+        public function deleteNode($id = null) {
+            if (empty($id)) {
+                $id = $this->id;
+            }
+
+            $this->contain();
+            $entry = $this->findById($id);
+
+            if (empty($entry)) {
+                throw new Exception;
+            }
+
+            $_idsToDelete = $this->getIdsForNode($id);
+            $success = $this->deleteAll(
+                [$this->alias . '.id' => $_idsToDelete],
+                true,
+                true
+            );
+
+            if ($success):
+                if ($this->isRoot($entry)) {
+                    $this->Category->id = $entry['Entry']['category_id'];
+                    $this->Category->updateThreadCounter();
+                    $this->Esevent->deleteSubject($id, 'thread');
+                }
+                foreach ($_idsToDelete as $_entryId) {
+                    $this->Esevent->deleteSubject($_entryId, 'entry');
+                }
+
+                $this->_dispatchEvent(
+                    'Model.Thread.change',
+                    ['subject' => $entry[$this->alias]['tid']]
+                );
+            endif;
+
+            return $success;
+        }
 
 /**
  * Get the ID of all subentries of and including entry $id
@@ -721,16 +721,16 @@ 
  * @param int $id
  * @return array Ids
  */
-		public function getIdsForNode($id) {
-			$subthread = $this->treeForNode($id);
-			$func = function (&$tree, &$entry) {
-				$tree['ids'][] = (int)$entry['Entry']['id'];
-			};
-			Entry::mapTreeElements($subthread, $func);
-			sort($subthread['ids']);
+        public function getIdsForNode($id) {
+            $subthread = $this->treeForNode($id);
+            $func = function (&$tree, &$entry) {
+                $tree['ids'][] = (int)$entry['Entry']['id'];
+            };
+            Entry::mapTreeElements($subthread, $func);
+            sort($subthread['ids']);
 
-			return $subthread['ids'];
-		}
+            return $subthread['ids'];
+        }
 
 /**
  * Anonymizes the entries for a user
@@ -739,24 +739,24 @@ 
  *
  * @return bool success
  */
-		public function anonymizeEntriesFromUser($userId) {
-			// remove username from all entries and reassign to anonyme user
-			$success = $this->updateAll(
-				[
-					'Entry.name' => "NULL",
-					'Entry.edited_by' => "NULL",
-					'Entry.ip' => "NULL",
-					'Entry.user_id' => 0,
-				],
-				['Entry.user_id' => $userId]
-			);
-
-			if ($success) {
-				$this->_dispatchEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
-			}
-
-			return $success;
-		}
+        public function anonymizeEntriesFromUser($userId) {
+            // remove username from all entries and reassign to anonyme user
+            $success = $this->updateAll(
+                [
+                    'Entry.name' => "NULL",
+                    'Entry.edited_by' => "NULL",
+                    'Entry.ip' => "NULL",
+                    'Entry.user_id' => 0,
+                ],
+                ['Entry.user_id' => $userId]
+            );
+
+            if ($success) {
+                $this->_dispatchEvent('Cmd.Cache.clear', ['cache' => 'Thread']);
+            }
+
+            return $success;
+        }
 
 /**
  * Maps all elements in $tree to function $func
@@ -768,23 +768,23 @@ 
  *
  * @return string
  */
-		public static function mapTreeElements(&$leafs, callable $func, $context = null, &$tree = null) {
-			if ($tree === null) {
-				$tree = & $leafs;
-			}
-			foreach ($leafs as $leaf):
-				$result = $func($tree, $leaf, $context);
-				if ($result === 'break') {
-					return 'break';
-				}
-				if (isset($leaf['_children'])) {
-					$result = self::mapTreeElements($leaf['_children'], $func, $context, $tree);
-					if ($result === 'break') {
-						return 'break';
-					}
-				}
-			endforeach;
-		}
+        public static function mapTreeElements(&$leafs, callable $func, $context = null, &$tree = null) {
+            if ($tree === null) {
+                $tree = & $leafs;
+            }
+            foreach ($leafs as $leaf):
+                $result = $func($tree, $leaf, $context);
+                if ($result === 'break') {
+                    return 'break';
+                }
+                if (isset($leaf['_children'])) {
+                    $result = self::mapTreeElements($leaf['_children'], $func, $context, $tree);
+                    if ($result === 'break') {
+                        return 'break';
+                    }
+                }
+            endforeach;
+        }
 
 /**
  * Merge thread on to entry $targetId
@@ -792,74 +792,74 @@ 
  * @param int $targetId id of the entry the thread should be appended to
  * @return bool true if merge was successfull false otherwise
  */
-		public function threadMerge($targetId) {
-			$threadIdSource = $this->id;
-
-			$this->contain();
-			$sourceEntry = $this->findById($threadIdSource);
-
-			// check that source is thread and not an entry
-			if ($sourceEntry[$this->alias]['pid'] != 0) {
-				return false;
-			}
-
-			$this->contain();
-			$targetEntry = $this->findById($targetId);
-
-			// check that target exists
-			if (!$targetEntry) {
-				return false;
-			}
-
-			// check that a thread is not merged onto itself
-			if ($targetEntry[$this->alias]['tid'] === $sourceEntry[$this->alias]['tid']) {
-				return false;
-			}
-
-			// set target entry as new parent entry
-			$this->data = [];
-			$this->set('pid', $targetEntry[$this->alias]['id']);
-			if ($this->save()) {
-				// associate all entries in source thread to target thread
-				$this->updateAll(
-					['tid' => $targetEntry[$this->alias]['tid']],
-					['tid' => $this->id]
-				);
-
-				// appended source entries get category of target thread
-				$this->_threadChangeCategory(
-					$targetEntry[$this->alias]['tid'],
-					$targetEntry[$this->alias]['category_id']
-				);
-
-				// update target thread last answer if source is newer
-				$sourceLastAnswer = $this->field('last_answer');
-				if (strtotime($sourceLastAnswer) > strtotime($targetEntry[$this->alias]['last_answer'])) {
-					$this->id = $targetEntry[$this->alias]['tid'];
-					$this->set('last_answer', $sourceLastAnswer);
-					$this->save();
-				}
-
-				// propagate pinned property from target to source
-				$isTargetPinned = (bool)$targetEntry[$this->alias]['locked'];
-				if ($sourceEntry[$this->alias]['locked'] !== $isTargetPinned) {
-					$this->id = $targetEntry[$this->alias]['tid'];
-					$this->_threadLock($isTargetPinned);
-				}
-
-				$this->Esevent->transferSubjectForEventType(
-					$threadIdSource,
-					$targetEntry[$this->alias]['tid'],
-					'thread'
-				);
-				$this->_dispatchEvent(
-					'Model.Thread.change',
-					['subject' => $targetEntry[$this->alias]['tid']]
-				);
-				return true;
-			}
-			return false;
-		}
+        public function threadMerge($targetId) {
+            $threadIdSource = $this->id;
+
+            $this->contain();
+            $sourceEntry = $this->findById($threadIdSource);
+
+            // check that source is thread and not an entry
+            if ($sourceEntry[$this->alias]['pid'] != 0) {
+                return false;
+            }
+
+            $this->contain();
+            $targetEntry = $this->findById($targetId);
+
+            // check that target exists
+            if (!$targetEntry) {
+                return false;
+            }
+
+            // check that a thread is not merged onto itself
+            if ($targetEntry[$this->alias]['tid'] === $sourceEntry[$this->alias]['tid']) {
+                return false;
+            }
+
+            // set target entry as new parent entry
+            $this->data = [];
+            $this->set('pid', $targetEntry[$this->alias]['id']);
+            if ($this->save()) {
+                // associate all entries in source thread to target thread
+                $this->updateAll(
+                    ['tid' => $targetEntry[$this->alias]['tid']],
+                    ['tid' => $this->id]
+                );
+
+                // appended source entries get category of target thread
+                $this->_threadChangeCategory(
+                    $targetEntry[$this->alias]['tid'],
+                    $targetEntry[$this->alias]['category_id']
+                );
+
+                // update target thread last answer if source is newer
+                $sourceLastAnswer = $this->field('last_answer');
+                if (strtotime($sourceLastAnswer) > strtotime($targetEntry[$this->alias]['last_answer'])) {
+                    $this->id = $targetEntry[$this->alias]['tid'];
+                    $this->set('last_answer', $sourceLastAnswer);
+                    $this->save();
+                }
+
+                // propagate pinned property from target to source
+                $isTargetPinned = (bool)$targetEntry[$this->alias]['locked'];
+                if ($sourceEntry[$this->alias]['locked'] !== $isTargetPinned) {
+                    $this->id = $targetEntry[$this->alias]['tid'];
+                    $this->_threadLock($isTargetPinned);
+                }
+
+                $this->Esevent->transferSubjectForEventType(
+                    $threadIdSource,
+                    $targetEntry[$this->alias]['tid'],
+                    'thread'
+                );
+                $this->_dispatchEvent(
+                    'Model.Thread.change',
+                    ['subject' => $targetEntry[$this->alias]['tid']]
+                );
+                return true;
+            }
+            return false;
+        }
 
 /**
  * Test if entry is thread-root
@@ -871,36 +871,36 @@ 
  * @return mixed
  * @throws InvalidArgumentException
  */
-		public function isRoot($id = null) {
-			if ($id === null) {
-				$id = $this->id;
-			}
-
-			$md5 = md5(serialize($id));
-			if (isset($this->_isRoot[$md5]) === false) {
-				// $id was $entry array
-				if (is_array($id) && isset($id[$this->alias]['pid'])) {
-					$entry = $id;
-				} else {
-					if (is_array($id) && isset($id[$this->alias]['id'])) {
-						$id = $id[$this->alias]['id'];
-					} elseif (empty($id)) {
-						throw new InvalidArgumentException();
-					}
-					$entry = $this->find(
-						'first',
-						array(
-							'contain' => false,
-							'conditions' => array(
-								'id' => $id,
-							)
-						)
-					);
-				}
-				$this->_isRoot[$md5] = empty($entry[$this->alias]['pid']);
-			}
-			return $this->_isRoot[$md5];
-		}
+        public function isRoot($id = null) {
+            if ($id === null) {
+                $id = $this->id;
+            }
+
+            $md5 = md5(serialize($id));
+            if (isset($this->_isRoot[$md5]) === false) {
+                // $id was $entry array
+                if (is_array($id) && isset($id[$this->alias]['pid'])) {
+                    $entry = $id;
+                } else {
+                    if (is_array($id) && isset($id[$this->alias]['id'])) {
+                        $id = $id[$this->alias]['id'];
+                    } elseif (empty($id)) {
+                        throw new InvalidArgumentException();
+                    }
+                    $entry = $this->find(
+                        'first',
+                        array(
+                            'contain' => false,
+                            'conditions' => array(
+                                'id' => $id,
+                            )
+                        )
+                    );
+                }
+                $this->_isRoot[$md5] = empty($entry[$this->alias]['pid']);
+            }
+            return $this->_isRoot[$md5];
+        }
 
 /**
  * Preprocesses entry data before saving it
@@ -911,85 +911,85 @@ 
  * @throws InvalidArgumentException
  * @throws ForbiddenException
  */
-		public function prepare(&$data, array $options = []) {
-			$options += [
-				'isRoot' => null
-			];
-
-			if (isset($options['preFilterFields'])) {
-				$org = $data;
-				$this->filterFields($data, $options['preFilterFields']);
-				if (isset($org['Event'])) {
-					$data['Event'] = $org['Event'];
-				}
-			}
-			unset($options['preFilterFields']);
-
-			$isRoot = $options['isRoot'];
-			unset($options['isRoot']);
-
-			if ($isRoot === null) {
-				$isRoot = $this->isRoot($data);
-			}
-			// adds info from parent entry to an answer
-			if ($isRoot === false) {
-				if (!isset($data[$this->alias]['pid'])) {
-					$pid = $this->getParentId($data[$this->alias]['id']);
-				} else {
-					$pid = $data[$this->alias]['pid'];
-				}
-				$parent = $this->get($pid, true);
-				if ($parent === false) {
-					throw new InvalidArgumentException;
-				}
-
-				// @todo highly @bogus should be a validator?
-				$parentPosting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $parent]);
-				if ($parentPosting->isAnsweringForbidden()) {
-					throw new ForbiddenException;
-				}
-
-				// if new subject is empty use the parent's subject
-				if (empty($data[$this->alias]['subject'])) {
-					$data[$this->alias]['subject'] = $parent[$this->alias]['subject'];
-				}
-
-				$data[$this->alias]['tid'] = $parent[$this->alias]['tid'];
-				$data[$this->alias]['category_id'] = $parent[$this->alias]['category_id'];
-			}
-
-			//= markup preprocessing
-			if (empty($data[$this->alias]['text']) === false) {
-				$data[$this->alias]['text'] = $this->prepareMarkup($data[$this->alias]['text']);
-			}
-		}
-
-		protected function _findEntry($state, $query, $results = []) {
-			if ($state === 'before') {
-				$query['contain'] = ['User', 'Category'];
-				$query['fields'] = array_merge($this->threadLineFieldList, $this->showEntryFieldListAdditional);
-				return $query;
-			}
-			if ($results) {
-				return $results[0];
-			}
-			return $results;
-		}
+        public function prepare(&$data, array $options = []) {
+            $options += [
+                'isRoot' => null
+            ];
+
+            if (isset($options['preFilterFields'])) {
+                $org = $data;
+                $this->filterFields($data, $options['preFilterFields']);
+                if (isset($org['Event'])) {
+                    $data['Event'] = $org['Event'];
+                }
+            }
+            unset($options['preFilterFields']);
+
+            $isRoot = $options['isRoot'];
+            unset($options['isRoot']);
+
+            if ($isRoot === null) {
+                $isRoot = $this->isRoot($data);
+            }
+            // adds info from parent entry to an answer
+            if ($isRoot === false) {
+                if (!isset($data[$this->alias]['pid'])) {
+                    $pid = $this->getParentId($data[$this->alias]['id']);
+                } else {
+                    $pid = $data[$this->alias]['pid'];
+                }
+                $parent = $this->get($pid, true);
+                if ($parent === false) {
+                    throw new InvalidArgumentException;
+                }
+
+                // @todo highly @bogus should be a validator?
+                $parentPosting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $parent]);
+                if ($parentPosting->isAnsweringForbidden()) {
+                    throw new ForbiddenException;
+                }
+
+                // if new subject is empty use the parent's subject
+                if (empty($data[$this->alias]['subject'])) {
+                    $data[$this->alias]['subject'] = $parent[$this->alias]['subject'];
+                }
+
+                $data[$this->alias]['tid'] = $parent[$this->alias]['tid'];
+                $data[$this->alias]['category_id'] = $parent[$this->alias]['category_id'];
+            }
+
+            //= markup preprocessing
+            if (empty($data[$this->alias]['text']) === false) {
+                $data[$this->alias]['text'] = $this->prepareMarkup($data[$this->alias]['text']);
+            }
+        }
+
+        protected function _findEntry($state, $query, $results = []) {
+            if ($state === 'before') {
+                $query['contain'] = ['User', 'Category'];
+                $query['fields'] = array_merge($this->threadLineFieldList, $this->showEntryFieldListAdditional);
+                return $query;
+            }
+            if ($results) {
+                return $results[0];
+            }
+            return $results;
+        }
 
 /**
  * Implements the custom find type 'feed'
  *
  * Add parameters for generating a rss/json-feed with find('feed', …)
  */
-		protected function _findFeed($state, $query, $results = array()) {
-			if ($state == 'before') {
-				$query['contain'] = array('User');
-				$query['fields'] = $this->_allowedPublicOutputFields;
-				$query['limit'] = 10;
-				return $query;
-			}
-			return $results;
-		}
+        protected function _findFeed($state, $query, $results = array()) {
+            if ($state == 'before') {
+                $query['contain'] = array('User');
+                $query['fields'] = $this->_allowedPublicOutputFields;
+                $query['limit'] = 10;
+                return $query;
+            }
+            return $results;
+        }
 
 /**
  * Locks or unlocks a whole thread
@@ -998,57 +998,57 @@ 
  *
  * @param bool $value
  */
-		protected function _threadLock($value) {
-			$tid = $this->field('tid');
-			$this->contain();
-			// @bogus throws error on $value = false
-			$value = $value ? 1 : 0;
-			$this->updateAll(['locked' => $value], ['tid' => $tid]);
-		}
-
-		public function paginateCount($conditions, $recursive, $extra) {
-			if (isset($extra['getInitialThreads'])) {
-				$this->Category->contain();
-				$categories = $this->Category->find(
-					'all',
-					[
-						'conditions' => array('id' => $conditions['Entry.category_id']),
-						'fields' => array('thread_count')
-					]
-				);
-				$count = array_sum(Set::extract('/Category/thread_count', $categories));
-			} else {
-				$parameters = array('conditions' => $conditions);
-				if ($recursive != $this->recursive) {
-					$parameters['recursive'] = $recursive;
-				}
-				$count = $this->find('count', array_merge($parameters, $extra));
-			}
-			return $count;
-		}
-
-		public function beforeSave($options = array()) {
-			$success = true;
-
-			//# change category of thread if category of root entry changed
-			$modified = !empty($this->id);
-			if (isset($this->data[$this->alias]['category_id']) && $modified) {
-				$oldEntry = $this->find('first',
-					['contain' => false, 'conditions' => ['Entry.id' => $this->id]]);
-
-				if ($oldEntry && (int)$oldEntry[$this->alias]['pid'] === 0) {
-					$categoryChanged = (int)$this->data[$this->alias]['category_id'] !== (int)$oldEntry[$this->alias]['category_id'];
-					if ($categoryChanged) {
-						$success = $success && $this->_threadChangeCategory(
-								$oldEntry[$this->alias]['tid'],
-								$this->data[$this->alias]['category_id']
-							);
-					}
-				}
-			}
-
-			return $success && parent::beforeSave($options);
-		}
+        protected function _threadLock($value) {
+            $tid = $this->field('tid');
+            $this->contain();
+            // @bogus throws error on $value = false
+            $value = $value ? 1 : 0;
+            $this->updateAll(['locked' => $value], ['tid' => $tid]);
+        }
+
+        public function paginateCount($conditions, $recursive, $extra) {
+            if (isset($extra['getInitialThreads'])) {
+                $this->Category->contain();
+                $categories = $this->Category->find(
+                    'all',
+                    [
+                        'conditions' => array('id' => $conditions['Entry.category_id']),
+                        'fields' => array('thread_count')
+                    ]
+                );
+                $count = array_sum(Set::extract('/Category/thread_count', $categories));
+            } else {
+                $parameters = array('conditions' => $conditions);
+                if ($recursive != $this->recursive) {
+                    $parameters['recursive'] = $recursive;
+                }
+                $count = $this->find('count', array_merge($parameters, $extra));
+            }
+            return $count;
+        }
+
+        public function beforeSave($options = array()) {
+            $success = true;
+
+            //# change category of thread if category of root entry changed
+            $modified = !empty($this->id);
+            if (isset($this->data[$this->alias]['category_id']) && $modified) {
+                $oldEntry = $this->find('first',
+                    ['contain' => false, 'conditions' => ['Entry.id' => $this->id]]);
+
+                if ($oldEntry && (int)$oldEntry[$this->alias]['pid'] === 0) {
+                    $categoryChanged = (int)$this->data[$this->alias]['category_id'] !== (int)$oldEntry[$this->alias]['category_id'];
+                    if ($categoryChanged) {
+                        $success = $success && $this->_threadChangeCategory(
+                                $oldEntry[$this->alias]['tid'],
+                                $this->data[$this->alias]['category_id']
+                            );
+                    }
+                }
+            }
+
+            return $success && parent::beforeSave($options);
+        }
 
 /**
  * check that entries are only in existing and allowed categories
@@ -1056,35 +1056,35 @@ 
  * @param $check
  * @return bool
  */
-		public function validateCategoryIsAllowed($check) {
-			$availableCategories = $this->CurrentUser->Categories->getAllowed();
-			if (!isset($availableCategories[$check['category_id']])) {
-				return false;
-			}
-			return true;
-		}
-
-		/**
-		 * @param $check
-		 * @return bool
-		 * @throws Exception
-		 */
-		public function validateEditingAllowed($check) {
-			$id = $this->data[$this->alias]['id'];
-			$entry = $this->get($id);
-			if (empty($entry)) {
-				throw new Exception(sprintf('Entry %s not found.', $entry));
-			}
-
-			$posting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $entry]);
-			$forbidden = $posting->isEditingAsCurrentUserForbidden();
-
-			if (is_bool($forbidden)) {
-				return !$forbidden;
-			} else {
-				return $forbidden;
-			}
-		}
+        public function validateCategoryIsAllowed($check) {
+            $availableCategories = $this->CurrentUser->Categories->getAllowed();
+            if (!isset($availableCategories[$check['category_id']])) {
+                return false;
+            }
+            return true;
+        }
+
+        /**
+         * @param $check
+         * @return bool
+         * @throws Exception
+         */
+        public function validateEditingAllowed($check) {
+            $id = $this->data[$this->alias]['id'];
+            $entry = $this->get($id);
+            if (empty($entry)) {
+                throw new Exception(sprintf('Entry %s not found.', $entry));
+            }
+
+            $posting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $entry]);
+            $forbidden = $posting->isEditingAsCurrentUserForbidden();
+
+            if (is_bool($forbidden)) {
+                return !$forbidden;
+            } else {
+                return $forbidden;
+            }
+        }
 
 /**
  *
@@ -1097,9 +1097,9 @@ 
  * @param $check
  * @return bool
  */
-		public function validateSubjectMaxLength($check) {
-			return mb_strlen($check['subject']) <= $this->_setting('subject_maxlength');
-		}
+        public function validateSubjectMaxLength($check) {
+            return mb_strlen($check['subject']) <= $this->_setting('subject_maxlength');
+        }
 
 /**
  * Changes the category of a thread.
@@ -1113,20 +1113,20 @@ 
  * @throws NotFoundException
  * @throws InvalidArgumentException
  */
-		protected function _threadChangeCategory($tid = null, $newCategoryId = null) {
-			if (empty($tid)) {
-				throw new InvalidArgumentException;
-			}
-			$this->Category->contain();
-			$categoryExists = $this->Category->findById($newCategoryId);
-			if (!$categoryExists) {
-				throw new NotFoundException;
-			}
-			$out = $this->updateAll(
-				['Entry.category_id' => $newCategoryId],
-				['Entry.tid' => $tid]
-			);
-			return $out;
-		}
-
-	}
\ No newline at end of file
+        protected function _threadChangeCategory($tid = null, $newCategoryId = null) {
+            if (empty($tid)) {
+                throw new InvalidArgumentException;
+            }
+            $this->Category->contain();
+            $categoryExists = $this->Category->findById($newCategoryId);
+            if (!$categoryExists) {
+                throw new NotFoundException;
+            }
+            $out = $this->updateAll(
+                ['Entry.category_id' => $newCategoryId],
+                ['Entry.tid' => $tid]
+            );
+            return $out;
+        }
+
+    }
\ No newline at end of file

app/Model/Esevent.php

Doc Comments +2 added lines, -2 removed lines

@@ -157,7 +157,7 @@ 
  * 		'receiver'			=> '1',
  *  );
  *
- * @return type
+ * @return boolean
  */
 		public function setNotification($params) {
 			$isSet = $this->_getEventSet($params);
@@ -355,7 +355,7 @@ 
 
 /**
  *
- * @param type $user
+ * @param integer $user
  * @param array $subjects with subjet IDs
  * @return array
  *

Spacing +1 added lines, -1 removed lines

@@ -295,7 +295,7 @@
 				)
 			);
 			if ($results) {
-				$recipients = Hash::map($results, '{n}.Esnotification.{n}', function ($values) {
+				$recipients = Hash::map($results, '{n}.Esnotification.{n}', function($values) {
 					$out = $values['User'];
 					unset($values['User']);
 					$out['Esnotification'] = $values;

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

Doc Comments +3 added lines

@@ -92,6 +92,9 @@
 			return $settings;
 		}
 
+		/**
+		 * @param string $field
+		 */
 		protected function _normToSeconds(&$settings, $field) {
 			$settings[$field] = (int)$settings[$field] * 60;
 		}

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 		}
 
 		protected function _normToSeconds(&$settings, $field) {
-			$settings[$field] = (int)$settings[$field] * 60;
+			$settings[$field] = (int) $settings[$field] * 60;
 		}
 
 		/**

Indentation +110 added lines, -110 removed lines

@@ -1,112 +1,112 @@
 <?php
 
-	App::uses('AppSettingModel', 'Lib/Model');
-
-	class Setting extends AppSettingModel {
-
-		public $name = 'Setting';
-
-		public $primaryKey = 'name';
-
-		public $validate = [
-			'name' => [
-				'rule' => ['between', 1, 255],
-				'allowEmpty' => false
-			],
-			'value' => [
-				'rule' => ['between', 0, 255],
-				'allowEmpty' => true
-			]
-		];
-
-		protected $_optionalEmailFields = [
-			'email_contact', 'email_register', 'email_system'
-		];
-
-		/* @td getSettings vs Load why to functions? */
-
-		/**
-		 * Reads settings from DB and returns them in a compact array
-		 *
-		 * Note that this is the stored config in the DB. It may differ from the
-		 * current config used by the app in Config::read('Saito.Settings'), e.g.
-		 * when modified with a load-preset.
-		 *
-		 * @throws UnexpectedValueException
-		 * @return array Settings
-		 */
-		public function getSettings() {
-			$settings = $this->find('all');
-			if (empty($settings)) {
-				throw new UnexpectedValueException('No settings found in settings table.');
-			}
-			$settings = $this->_compactKeyValue($settings);
-
-			// edit_delay is normed to seconds
-			$this->_normToSeconds($settings, 'edit_delay');
-			$this->_fillOptionalEmailAddresses($settings);
-
-			return $settings;
-		}
-
-		/**
-		 * Loads settings from storage into Configuration `Saito.Settings`
-		 *
-		 * @param array $preset allows to overwrite loaded values
-		 * @return array Settings
-		 */
-		public function load($preset = []) {
-			Stopwatch::start('Settings->getSettings()');
-
-			$settings = Cache::read('Saito.appSettings');
-			if (empty($settings)) {
-				$settings = $this->getSettings();
-				Cache::write('Saito.appSettings', $settings);
-			}
-			if ($preset) {
-				$settings = $preset + $settings;
-			}
-			Configure::write('Saito.Settings', $settings);
-
-			Stopwatch::end('Settings->getSettings()');
-		}
-
-		public function clearCache() {
-			parent::clearCache();
-			Cache::delete('Saito.appSettings');
-		}
-
-		/**
-		 * Returns a key-value array
-		 *
-		 * Fast version of Set::combine($results, '{n}.Setting.name', '{n}.Setting.value');
-		 *
-		 * @param array $results
-		 * @return array
-		 */
-		protected function _compactKeyValue($results) {
-			$settings = array();
-			foreach ($results as $result) {
-				$settings[$result[$this->alias]['name']] = $result[$this->alias]['value'];
-			}
-			return $settings;
-		}
-
-		protected function _normToSeconds(&$settings, $field) {
-			$settings[$field] = (int)$settings[$field] * 60;
-		}
-
-		/**
-		 * Defaults optional email addresses to main address
-		 *
-		 * @param $settings
-		 */
-		protected function _fillOptionalEmailAddresses(&$settings) {
-			foreach ($this->_optionalEmailFields as $field) {
-				if (empty($settings[$field])) {
-					$settings[$field] = $settings['forum_email'];
-				}
-			}
-		}
-
-	}
\ No newline at end of file
+    App::uses('AppSettingModel', 'Lib/Model');
+
+    class Setting extends AppSettingModel {
+
+        public $name = 'Setting';
+
+        public $primaryKey = 'name';
+
+        public $validate = [
+            'name' => [
+                'rule' => ['between', 1, 255],
+                'allowEmpty' => false
+            ],
+            'value' => [
+                'rule' => ['between', 0, 255],
+                'allowEmpty' => true
+            ]
+        ];
+
+        protected $_optionalEmailFields = [
+            'email_contact', 'email_register', 'email_system'
+        ];
+
+        /* @td getSettings vs Load why to functions? */
+
+        /**
+         * Reads settings from DB and returns them in a compact array
+         *
+         * Note that this is the stored config in the DB. It may differ from the
+         * current config used by the app in Config::read('Saito.Settings'), e.g.
+         * when modified with a load-preset.
+         *
+         * @throws UnexpectedValueException
+         * @return array Settings
+         */
+        public function getSettings() {
+            $settings = $this->find('all');
+            if (empty($settings)) {
+                throw new UnexpectedValueException('No settings found in settings table.');
+            }
+            $settings = $this->_compactKeyValue($settings);
+
+            // edit_delay is normed to seconds
+            $this->_normToSeconds($settings, 'edit_delay');
+            $this->_fillOptionalEmailAddresses($settings);
+
+            return $settings;
+        }
+
+        /**
+         * Loads settings from storage into Configuration `Saito.Settings`
+         *
+         * @param array $preset allows to overwrite loaded values
+         * @return array Settings
+         */
+        public function load($preset = []) {
+            Stopwatch::start('Settings->getSettings()');
+
+            $settings = Cache::read('Saito.appSettings');
+            if (empty($settings)) {
+                $settings = $this->getSettings();
+                Cache::write('Saito.appSettings', $settings);
+            }
+            if ($preset) {
+                $settings = $preset + $settings;
+            }
+            Configure::write('Saito.Settings', $settings);
+
+            Stopwatch::end('Settings->getSettings()');
+        }
+
+        public function clearCache() {
+            parent::clearCache();
+            Cache::delete('Saito.appSettings');
+        }
+
+        /**
+         * Returns a key-value array
+         *
+         * Fast version of Set::combine($results, '{n}.Setting.name', '{n}.Setting.value');
+         *
+         * @param array $results
+         * @return array
+         */
+        protected function _compactKeyValue($results) {
+            $settings = array();
+            foreach ($results as $result) {
+                $settings[$result[$this->alias]['name']] = $result[$this->alias]['value'];
+            }
+            return $settings;
+        }
+
+        protected function _normToSeconds(&$settings, $field) {
+            $settings[$field] = (int)$settings[$field] * 60;
+        }
+
+        /**
+         * Defaults optional email addresses to main address
+         *
+         * @param $settings
+         */
+        protected function _fillOptionalEmailAddresses(&$settings) {
+            foreach ($this->_optionalEmailFields as $field) {
+                if (empty($settings[$field])) {
+                    $settings[$field] = $settings['forum_email'];
+                }
+            }
+        }
+
+    }
\ No newline at end of file