Schlaefer / Saito

app/Lib/Saito/User/SaitoUserTrait.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 
 	trait SaitoUserTrait {
 
-		static private $__accessions = array (
+		static private $__accessions = array(
 			'anon'	=> 0,
 			'user'	=> 1,
 			'mod'		=> 2,
@@ -46,7 +46,7 @@ 
 			}
 
 			if (empty($user['id']) === false) {
-				$this->_id = (int)$user['id'];
+				$this->_id = (int) $user['id'];
 				$this->_isLoggedIn = true;
 			}
 
@@ -75,12 +75,12 @@ 
 			if (is_int($user)) {
 				$id = $user;
 			} elseif (is_string($user)) {
-				$id = (int)$user;
+				$id = (int) $user;
 			} elseif (is_array($user)) {
 				if (isset($user['User']['id'])) {
-					$id = (int)$user['User']['id'];
+					$id = (int) $user['User']['id'];
 				} elseif (isset($user['id'])) {
-					$id = (int)$user['id'];
+					$id = (int) $user['id'];
 				}
 			} elseif ($user instanceof ForumsUserInterface) {
 				$id = $user->getId();

Indentation +196 added lines, -196 removed lines

@@ -1,198 +1,198 @@
 <?php
 
-	namespace Saito\User;
-
-	trait SaitoUserTrait {
-
-		static private $__accessions = array (
-			'anon'	=> 0,
-			'user'	=> 1,
-			'mod'		=> 2,
-			'admin'	=> 3,
-		);
-
-		/**
-		 * User ID
-		 *
-		 * @var int
-		 */
-		protected $_id = null;
-
-		/**
-		 * Stores if a user is logged in
-		 *
-		 * @var bool
-		 */
-		protected $_isLoggedIn = false;
-
-
-		/**
-		 * User settings
-		 *
-		 * @var array
-		 */
-		protected $_settings = null;
-
-		public function setSettings($user) {
-			if (empty($user)) {
-				$this->_id = null;
-				$this->_settings = null;
-				$this->_isLoggedIn = false;
-				return false;
-			}
-
-			if (empty($user) || !is_array($user)) {
-				trigger_error("Can't find user.");
-			}
-
-			if (empty($user['id']) === false) {
-				$this->_id = (int)$user['id'];
-				$this->_isLoggedIn = true;
-			}
-
-			$this->_settings = $user;
-
-			// perf-cheat
-			if (array_key_exists('last_refresh', $this->_settings)) {
-				$this->_settings['last_refresh_unix'] = strtotime($this->_settings['last_refresh']);
-			}
-		}
-
-		public function getSettings() {
-			return $this->_settings;
-		}
-
-		public function getId() {
-			return $this->_id;
-		}
-
-		public function isLoggedIn() {
-			return $this->_isLoggedIn;
-		}
-
-		public function isSame($user) {
-			$id = null;
-			if (is_int($user)) {
-				$id = $user;
-			} elseif (is_string($user)) {
-				$id = (int)$user;
-			} elseif (is_array($user)) {
-				if (isset($user['User']['id'])) {
-					$id = (int)$user['User']['id'];
-				} elseif (isset($user['id'])) {
-					$id = (int)$user['id'];
-				}
-			} elseif ($user instanceof ForumsUserInterface) {
-				$id = $user->getId();
-			}
-			return $id === $this->getId();
-		}
-
-		public function isUser() {
-			return self::_isUserForRole($this->_settings['user_type']);
-		}
-
-		public function isMod() {
-			return self::_isModForRole($this->_settings['user_type']);
-		}
-
-		public function isModOnly() {
-			return self::$__accessions[$this->_getRole()] === 2;
-		}
-
-		/**
-		 * checks if current user ignores user with ID $userId
-		 *
-		 * @param int $userId
-		 * @return bool
-		 */
-		public function ignores($userId) {
-			if (!$this->isLoggedIn()) {
-				return false;
-			}
-			return isset($this->_settings['ignores'][$userId]);
-		}
-
-		public function isAdmin() {
-			return self::_isAdminForRole($this->_settings['user_type']);
-		}
-
-		public function isForbidden() {
-			if (!empty($this->_settings['user_lock'])) {
-				return 'locked';
-			}
-			if (!empty($this->_settings['activate_code'])) {
-				return 'unactivated';
-			}
-			return false;
-		}
-
-		public function mockUserType($type) {
-			$MockedUser = clone $this;
-			$MockedUser['user_type'] = $type;
-			return $MockedUser;
-		}
-
-		protected function _getRole() {
-			if ($this->_id === null) {
-				return 'anon';
-			} else {
-				return $this->_settings['user_type'];
-			}
-		}
-
-		protected static function _isUserForRole($userType) {
-			$accession = self::_maxAccessionForUserType($userType);
-			return ($accession >= 1) ? true : false;
-		}
-
-		protected static function _isModForRole($userType) {
-			$accession = self::_maxAccessionForUserType($userType);
-			return ($accession >= 2) ? true : false;
-		}
-
-		protected static function _isAdminForRole($userType) {
-			$accession = self::_maxAccessionForUserType($userType);
-			return ($accession === 3) ? true : false;
-		}
-
-		/**
-		 * Get maximum value of the allowed accession
-		 *
-		 * Very handy for DB requests
-		 *
-		 * @mlf some day we will have user->type->accession->categories tables and relations,
-		 * that will be an happy day
-		 *
-		 * @return int
-		 */
-		public function getMaxAccession() {
-			$userType = $this->_getRole();
-			return self::_maxAccessionForUserType($userType);
-		}
-
-		protected static function _maxAccessionForUserType($userType) {
-			if (isset(self::$__accessions[$userType])) :
-				return self::$__accessions[$userType];
-			else :
-				return 0;
-			endif;
-		}
-
-		public function offsetExists($offset) {
-			return isset($this->_settings[$offset]);
-		}
-
-		public function offsetGet($offset) {
-			return $this->_settings[$offset];
-		}
-
-		public function offsetSet($offset, $value) {
-			$this->_settings[$offset] = $value;
-		}
-
-		public function offsetUnset($offset) {
-			unset($this->_settings[$offset]);
-		}
-
-	}
\ No newline at end of file
+    namespace Saito\User;
+
+    trait SaitoUserTrait {
+
+        static private $__accessions = array (
+            'anon'	=> 0,
+            'user'	=> 1,
+            'mod'		=> 2,
+            'admin'	=> 3,
+        );
+
+        /**
+         * User ID
+         *
+         * @var int
+         */
+        protected $_id = null;
+
+        /**
+         * Stores if a user is logged in
+         *
+         * @var bool
+         */
+        protected $_isLoggedIn = false;
+
+
+        /**
+         * User settings
+         *
+         * @var array
+         */
+        protected $_settings = null;
+
+        public function setSettings($user) {
+            if (empty($user)) {
+                $this->_id = null;
+                $this->_settings = null;
+                $this->_isLoggedIn = false;
+                return false;
+            }
+
+            if (empty($user) || !is_array($user)) {
+                trigger_error("Can't find user.");
+            }
+
+            if (empty($user['id']) === false) {
+                $this->_id = (int)$user['id'];
+                $this->_isLoggedIn = true;
+            }
+
+            $this->_settings = $user;
+
+            // perf-cheat
+            if (array_key_exists('last_refresh', $this->_settings)) {
+                $this->_settings['last_refresh_unix'] = strtotime($this->_settings['last_refresh']);
+            }
+        }
+
+        public function getSettings() {
+            return $this->_settings;
+        }
+
+        public function getId() {
+            return $this->_id;
+        }
+
+        public function isLoggedIn() {
+            return $this->_isLoggedIn;
+        }
+
+        public function isSame($user) {
+            $id = null;
+            if (is_int($user)) {
+                $id = $user;
+            } elseif (is_string($user)) {
+                $id = (int)$user;
+            } elseif (is_array($user)) {
+                if (isset($user['User']['id'])) {
+                    $id = (int)$user['User']['id'];
+                } elseif (isset($user['id'])) {
+                    $id = (int)$user['id'];
+                }
+            } elseif ($user instanceof ForumsUserInterface) {
+                $id = $user->getId();
+            }
+            return $id === $this->getId();
+        }
+
+        public function isUser() {
+            return self::_isUserForRole($this->_settings['user_type']);
+        }
+
+        public function isMod() {
+            return self::_isModForRole($this->_settings['user_type']);
+        }
+
+        public function isModOnly() {
+            return self::$__accessions[$this->_getRole()] === 2;
+        }
+
+        /**
+         * checks if current user ignores user with ID $userId
+         *
+         * @param int $userId
+         * @return bool
+         */
+        public function ignores($userId) {
+            if (!$this->isLoggedIn()) {
+                return false;
+            }
+            return isset($this->_settings['ignores'][$userId]);
+        }
+
+        public function isAdmin() {
+            return self::_isAdminForRole($this->_settings['user_type']);
+        }
+
+        public function isForbidden() {
+            if (!empty($this->_settings['user_lock'])) {
+                return 'locked';
+            }
+            if (!empty($this->_settings['activate_code'])) {
+                return 'unactivated';
+            }
+            return false;
+        }
+
+        public function mockUserType($type) {
+            $MockedUser = clone $this;
+            $MockedUser['user_type'] = $type;
+            return $MockedUser;
+        }
+
+        protected function _getRole() {
+            if ($this->_id === null) {
+                return 'anon';
+            } else {
+                return $this->_settings['user_type'];
+            }
+        }
+
+        protected static function _isUserForRole($userType) {
+            $accession = self::_maxAccessionForUserType($userType);
+            return ($accession >= 1) ? true : false;
+        }
+
+        protected static function _isModForRole($userType) {
+            $accession = self::_maxAccessionForUserType($userType);
+            return ($accession >= 2) ? true : false;
+        }
+
+        protected static function _isAdminForRole($userType) {
+            $accession = self::_maxAccessionForUserType($userType);
+            return ($accession === 3) ? true : false;
+        }
+
+        /**
+         * Get maximum value of the allowed accession
+         *
+         * Very handy for DB requests
+         *
+         * @mlf some day we will have user->type->accession->categories tables and relations,
+         * that will be an happy day
+         *
+         * @return int
+         */
+        public function getMaxAccession() {
+            $userType = $this->_getRole();
+            return self::_maxAccessionForUserType($userType);
+        }
+
+        protected static function _maxAccessionForUserType($userType) {
+            if (isset(self::$__accessions[$userType])) :
+                return self::$__accessions[$userType];
+            else :
+                return 0;
+            endif;
+        }
+
+        public function offsetExists($offset) {
+            return isset($this->_settings[$offset]);
+        }
+
+        public function offsetGet($offset) {
+            return $this->_settings[$offset];
+        }
+
+        public function offsetSet($offset, $value) {
+            $this->_settings[$offset] = $value;
+        }
+
+        public function offsetUnset($offset) {
+            unset($this->_settings[$offset]);
+        }
+
+    }
\ No newline at end of file

Braces +3 added lines, -1 removed lines

@@ -174,8 +174,10 @@
 		protected static function _maxAccessionForUserType($userType) {
 			if (isset(self::$__accessions[$userType])) :
 				return self::$__accessions[$userType];
-			else :
+			else {
+			    :
 				return 0;
+			}
 			endif;
 		}
 

app/Lib/Saito/User/Categories.php

Spacing +3 added lines, -3 removed lines

@@ -18,15 +18,15 @@
 		}
 
 		protected function _isAll() {
-			return (int)$this->_user['user_category_active'] === -1;
+			return (int) $this->_user['user_category_active'] === -1;
 		}
 
 		protected function _isSingle() {
-			return (int)$this->_user['user_category_active'] > 0;
+			return (int) $this->_user['user_category_active'] > 0;
 		}
 
 		protected function _isCustom() {
-			return (int)$this->_user['user_category_active'] == 0 &&
+			return (int) $this->_user['user_category_active'] == 0 &&
 			empty($this->_user['user_category_custom']) === false;
 		}
 

Indentation +56 added lines, -56 removed lines

@@ -1,60 +1,60 @@ 
 <?php
 
-	namespace Saito\User;
+    namespace Saito\User;
 
-	class Categories {
+    class Categories {
 
-		protected $_user;
+        protected $_user;
 
-		protected $_categories;
+        protected $_categories;
 
 /**
  * @param array $user
  * @param array $categories
  */
-		public function __construct(array $user, array $categories) {
-			$this->_user = $user;
-			$this->_categories = $categories;
-		}
+        public function __construct(array $user, array $categories) {
+            $this->_user = $user;
+            $this->_categories = $categories;
+        }
 
-		protected function _isAll() {
-			return (int)$this->_user['user_category_active'] === -1;
-		}
+        protected function _isAll() {
+            return (int)$this->_user['user_category_active'] === -1;
+        }
 
-		protected function _isSingle() {
-			return (int)$this->_user['user_category_active'] > 0;
-		}
+        protected function _isSingle() {
+            return (int)$this->_user['user_category_active'] > 0;
+        }
 
-		protected function _isCustom() {
-			return (int)$this->_user['user_category_active'] == 0 &&
-			empty($this->_user['user_category_custom']) === false;
-		}
+        protected function _isCustom() {
+            return (int)$this->_user['user_category_active'] == 0 &&
+            empty($this->_user['user_category_custom']) === false;
+        }
 
-		protected function _filterOutNonExisting($categories) {
-			return array_intersect_key($categories, $this->_categories);
-		}
+        protected function _filterOutNonExisting($categories) {
+            return array_intersect_key($categories, $this->_categories);
+        }
 
-		protected function _getCustom() {
-			// add new categories to custom set
-			//
-			// [4 => true, 7 => '0'] + [4 => '4', 7 => '7', 13 => '13']
-			// becomes
-			// [4 => true, 7 => '0', 13 => '13']
-			// with 13 => '13' trueish
-			if (empty($this->_user['user_category_custom'])) {
-				$this->_user['user_category_custom'] = [];
-			}
-			$custom = $this->_user['user_category_custom'] + $this->_categories;
+        protected function _getCustom() {
+            // add new categories to custom set
+            //
+            // [4 => true, 7 => '0'] + [4 => '4', 7 => '7', 13 => '13']
+            // becomes
+            // [4 => true, 7 => '0', 13 => '13']
+            // with 13 => '13' trueish
+            if (empty($this->_user['user_category_custom'])) {
+                $this->_user['user_category_custom'] = [];
+            }
+            $custom = $this->_user['user_category_custom'] + $this->_categories;
 
-			// then filter for zeros to get only the user categories
-			//  [4 => true, 13 => '13']
-			$custom = array_filter($custom);
+            // then filter for zeros to get only the user categories
+            //  [4 => true, 13 => '13']
+            $custom = array_filter($custom);
 
-			$custom = $this->_filterOutNonExisting($custom);
+            $custom = $this->_filterOutNonExisting($custom);
 
-			$keys = array_keys($custom);
-			return array_combine($keys, $keys);
-		}
+            $keys = array_keys($custom);
+            return array_combine($keys, $keys);
+        }
 
 /**
  * @return array
@@ -63,21 +63,21 @@ 
  * $type: active type: 'all', 'single' or 'custom'
  * $custom: categories for 'custom' [cat_id1, cat_id2, …]
  */
-		public function get() {
-			$custom = $this->_getCustom();
-			if ($this->_isSingle()) {
-				$type = 'single';
-				$categories = $this->_filterOutNonExisting(
-					[$this->_user['user_category_active'] => $this->_user['user_category_active']]
-				);
-			} elseif ($this->_isCustom()) {
-				$type = 'custom';
-				$categories = $custom;
-			} else {
-				$type = 'all';
-				$categories = $this->_categories;
-			}
-			return [$categories, $type, $custom];
-		}
+        public function get() {
+            $custom = $this->_getCustom();
+            if ($this->_isSingle()) {
+                $type = 'single';
+                $categories = $this->_filterOutNonExisting(
+                    [$this->_user['user_category_active'] => $this->_user['user_category_active']]
+                );
+            } elseif ($this->_isCustom()) {
+                $type = 'custom';
+                $categories = $custom;
+            } else {
+                $type = 'all';
+                $categories = $this->_categories;
+            }
+            return [$categories, $type, $custom];
+        }
 
-	}
+    }

app/Lib/Saito/User/Bookmarks.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 				);
 				if (!empty($bookmarks)) {
 					foreach ($bookmarks as $bookmark) {
-						$this->_bookmarks[(int)$bookmark['Bookmark']['entry_id']] = (int)$bookmark['Bookmark']['id'];
+						$this->_bookmarks[(int) $bookmark['Bookmark']['entry_id']] = (int) $bookmark['Bookmark']['id'];
 					}
 				}
 			}

Indentation +48 added lines, -48 removed lines

@@ -1,50 +1,50 @@
 <?php
 
-	namespace Saito\User;
-
-	/**
-	 * Class Bookmarks handles bookmarks for a CurrentUser
-	 */
-	class Bookmarks {
-
-		/**
-		 * @var bookmarks format: [entry_id => id, …]
-		 */
-		protected $_bookmarks;
-
-		protected $_CurrentUser;
-
-		public function __construct(\CurrentUserComponent $CurrentUser) {
-			$this->_CurrentUser = $CurrentUser;
-		}
-
-		public function isBookmarked($entryId) {
-			if (!$this->_CurrentUser->isLoggedIn()) {
-				return false;
-			}
-			if ($this->_bookmarks === null) {
-				$this->_get();
-			}
-			return isset($this->_bookmarks[$entryId]);
-		}
-
-		protected function _get() {
-			if ($this->_bookmarks !== null) {
-				return $this->_bookmarks;
-			}
-			$this->_bookmarks = [];
-			if (!$this->_CurrentUser->isLoggedIn() === false) {
-				$bookmarks = $this->_CurrentUser->_User->Bookmark->findAllByUserId(
-					$this->_CurrentUser->getId(),
-					['contain' => false]
-				);
-				if (!empty($bookmarks)) {
-					foreach ($bookmarks as $bookmark) {
-						$this->_bookmarks[(int)$bookmark['Bookmark']['entry_id']] = (int)$bookmark['Bookmark']['id'];
-					}
-				}
-			}
-			return $this->_bookmarks;
-		}
-
-	}
+    namespace Saito\User;
+
+    /**
+     * Class Bookmarks handles bookmarks for a CurrentUser
+     */
+    class Bookmarks {
+
+        /**
+         * @var bookmarks format: [entry_id => id, …]
+         */
+        protected $_bookmarks;
+
+        protected $_CurrentUser;
+
+        public function __construct(\CurrentUserComponent $CurrentUser) {
+            $this->_CurrentUser = $CurrentUser;
+        }
+
+        public function isBookmarked($entryId) {
+            if (!$this->_CurrentUser->isLoggedIn()) {
+                return false;
+            }
+            if ($this->_bookmarks === null) {
+                $this->_get();
+            }
+            return isset($this->_bookmarks[$entryId]);
+        }
+
+        protected function _get() {
+            if ($this->_bookmarks !== null) {
+                return $this->_bookmarks;
+            }
+            $this->_bookmarks = [];
+            if (!$this->_CurrentUser->isLoggedIn() === false) {
+                $bookmarks = $this->_CurrentUser->_User->Bookmark->findAllByUserId(
+                    $this->_CurrentUser->getId(),
+                    ['contain' => false]
+                );
+                if (!empty($bookmarks)) {
+                    foreach ($bookmarks as $bookmark) {
+                        $this->_bookmarks[(int)$bookmark['Bookmark']['entry_id']] = (int)$bookmark['Bookmark']['id'];
+                    }
+                }
+            }
+            return $this->_bookmarks;
+        }
+
+    }

app/Lib/Saito/Markup/Parser.php

Spacing +2 added lines, -2 removed lines

@@ -67,13 +67,13 @@
 					}
 					// add newline to wrapped lines
 					if (mb_strlen($line) > 60) {
-						$out .= $line . "\n";
+						$out .= $line."\n";
 						$line = '';
 					}
 				}
 				$out .= $line;
 			endforeach;
-			$out = preg_replace("/^/m", $this->_cSettings['quote_symbol'] . " ",
+			$out = preg_replace("/^/m", $this->_cSettings['quote_symbol']." ",
 				$out);
 			return $out;
 		}

Indentation +72 added lines, -72 removed lines

@@ -1,82 +1,82 @@
 <?php
 
-	namespace Saito\Markup;
+    namespace Saito\Markup;
 
-	abstract class Parser {
+    abstract class Parser {
 
-		/**
-		 * @var array cache for app settings
-		 */
-		protected $_cSettings;
+        /**
+         * @var array cache for app settings
+         */
+        protected $_cSettings;
 
-		/**
-		 * @var Helper Helper usually the ParseHelper
-		 */
-		protected $_Helper;
+        /**
+         * @var Helper Helper usually the ParseHelper
+         */
+        protected $_Helper;
 
-		public function __construct(\Helper $Helper, array $settings = []) {
-			$this->_Helper = $Helper;
-			$this->_cSettings = $settings;
-		}
+        public function __construct(\Helper $Helper, array $settings = []) {
+            $this->_Helper = $Helper;
+            $this->_cSettings = $settings;
+        }
 
-		/**
-		 * should render the markup to HTML
-		 *
-		 * @param string $string unescaped markup
-		 * @param array $options
-		 * @return string !!Make sure to escape HTML special chars, or you'll have a bad day!!
-		 */
-		abstract public function parse($string, array $options = []);
+        /**
+         * should render the markup to HTML
+         *
+         * @param string $string unescaped markup
+         * @param array $options
+         * @return string !!Make sure to escape HTML special chars, or you'll have a bad day!!
+         */
+        abstract public function parse($string, array $options = []);
 
-		public function citeText($string) {
-			if (empty($string)) {
-				return '';
-			}
-			$out = '';
-			// split already quoted lines
-			$citeLines = preg_split("/(^{$this->_cSettings['quote_symbol']}.*?$\n)/m",
-				$string,
-				null,
-				PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
-			foreach ($citeLines as $citeLine):
-				if (mb_strpos($citeLine, $this->_cSettings['quote_symbol']) === 0) {
-					// already quoted lines need no further processing
-					$out .= $citeLine;
-					continue;
-				}
-				// split [bbcode]
-				$matches = preg_split('`(\[(.+?)=?.*?\].+?\[/\2\])`',
-					$citeLine,
-					null,
-					PREG_SPLIT_DELIM_CAPTURE);
-				$i = 0;
-				$line = '';
-				foreach ($matches as $match) {
-					// the [bbcode] preg_split uses a backreference \2 which is in the $matches
-					// but is not needed in the results
-					// @todo elegant solution
-					$i++;
-					if ($i % 3 == 0) {
-						continue;
-					}
-					// wrap long lines
-					if (mb_strpos($match, '[') !== 0) {
-						$line .= wordwrap($match);
-					} else {
-						$line .= $match;
-					}
-					// add newline to wrapped lines
-					if (mb_strlen($line) > 60) {
-						$out .= $line . "\n";
-						$line = '';
-					}
-				}
-				$out .= $line;
-			endforeach;
-			$out = preg_replace("/^/m", $this->_cSettings['quote_symbol'] . " ",
-				$out);
-			return $out;
-		}
+        public function citeText($string) {
+            if (empty($string)) {
+                return '';
+            }
+            $out = '';
+            // split already quoted lines
+            $citeLines = preg_split("/(^{$this->_cSettings['quote_symbol']}.*?$\n)/m",
+                $string,
+                null,
+                PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+            foreach ($citeLines as $citeLine):
+                if (mb_strpos($citeLine, $this->_cSettings['quote_symbol']) === 0) {
+                    // already quoted lines need no further processing
+                    $out .= $citeLine;
+                    continue;
+                }
+                // split [bbcode]
+                $matches = preg_split('`(\[(.+?)=?.*?\].+?\[/\2\])`',
+                    $citeLine,
+                    null,
+                    PREG_SPLIT_DELIM_CAPTURE);
+                $i = 0;
+                $line = '';
+                foreach ($matches as $match) {
+                    // the [bbcode] preg_split uses a backreference \2 which is in the $matches
+                    // but is not needed in the results
+                    // @todo elegant solution
+                    $i++;
+                    if ($i % 3 == 0) {
+                        continue;
+                    }
+                    // wrap long lines
+                    if (mb_strpos($match, '[') !== 0) {
+                        $line .= wordwrap($match);
+                    } else {
+                        $line .= $match;
+                    }
+                    // add newline to wrapped lines
+                    if (mb_strlen($line) > 60) {
+                        $out .= $line . "\n";
+                        $line = '';
+                    }
+                }
+                $out .= $line;
+            endforeach;
+            $out = preg_replace("/^/m", $this->_cSettings['quote_symbol'] . " ",
+                $out);
+            return $out;
+        }
 
-	}
+    }
 

app/Lib/Saito/Smiley/Renderer.php

Spacing +5 added lines, -5 removed lines

@@ -93,11 +93,11 @@ 
 		protected function _pregQuote(array &$codes) {
 			$delimiter = '/';
 			foreach ($codes as $key => $code) {
-				$codes[$key] = $delimiter .
+				$codes[$key] = $delimiter.
 					// a smiley can't be concatenated to a string and requires a
 					// whitespace in front
-					'(^|(?<=(\s)))' .
-					preg_quote($code, $delimiter) .
+					'(^|(?<=(\s)))'.
+					preg_quote($code, $delimiter).
 					$delimiter;
 			}
 		}
@@ -121,7 +121,7 @@ 
 					//= pixel image smileys
 				} else {
 					$replacements['html'][$k] = $this->_Helper->Html->image(
-						'smilies/' . $smiley['image'],
+						'smilies/'.$smiley['image'],
 						[
 							'alt' => $smiley['code'],
 							'class' => 'saito-smiley-image',
@@ -152,7 +152,7 @@ 
 				// $s['html'][] = $this->_Helper->Html->image('smilies/gacker_large.png');
 				if ($additionalButton['type'] === 'image') {
 					$additionalButton['replacement'] = $this->_Helper->Html->image(
-						'markitup' . DS . $additionalButton['replacement'],
+						'markitup'.DS.$additionalButton['replacement'],
 						['class' => 'saito-smiley-image']
 					);
 				}

Indentation +161 added lines, -161 removed lines

@@ -1,163 +1,163 @@
 <?php
 
-	namespace Saito\Smiley;
-
-	class Renderer {
-
-		const DEBUG_SMILIES_KEY = ':smilies-debug:';
-
-		protected $_replacements;
-
-		/**
-		 * @var \Saito\Smiley\Cache
-		 */
-		protected $_smileyData;
-
-		protected $_useCache;
-
-		public function __construct($smileyData) {
-			$this->_smileyData = $smileyData;
-		}
-
-		/**
-		 * Replaces all smiley-codes in a string with appropriate HTML-tags
-		 *
-		 * @param $string
-		 * @return string
-		 * @throws \RuntimeException
-		 */
-		public function replace($string) {
-			$replacements = $this->_getReplacements();
-			$string = preg_replace(
-				$replacements['codes'],
-				$replacements['html'],
-				$string
-			);
-			if ($string === null) {
-				throw new \RuntimeException("Can't replace smilies. 1420630983");
-			}
-			$string = $this->_debug($string, $replacements);
-			return $string;
-		}
-
-		public function setHelper(\Helper $Helper) {
-			$this->_Helper = $Helper;
-		}
-
-		/**
-		 * outputs all available smilies :allSmilies:
-		 *
-		 * useful for debugging
-		 */
-		protected function _debug($string, $replacements) {
-			if (strpos($string, self::DEBUG_SMILIES_KEY) === false) {
-				return $string;
-			}
-			$smilies = $this->_smileyData->get();
-			$out[] = '<table class="table table-simple">';
-			$out[] = '<tr><th>Icon</th><th>Code</th><th>Image</th><th>Title</th></tr>';
-			foreach ($replacements['html'] as $k => $smiley) {
-				$title = $this->_l10n($smilies[$k]['title']);
-				$out[] = '<tr>';
-				$out[] = "<td>{$smiley}</td><td>{$smilies[$k]['code']}</td><td>{$smilies[$k]['image']}</td><td>{$title}</td>";
-				$out[] = '</tr>';
-			}
-			$out[] = '</table>';
-			return str_replace(self::DEBUG_SMILIES_KEY, implode('', $out), $string);
-		}
-
-		protected function _getReplacements() {
-			if (!$this->_replacements && $this->_useCache) {
-				$this->_replacements = Cache::read('Saito.Smilies.html');
-			}
-
-			if (!$this->_replacements) {
-				$this->_replacements = ['codes' => [], 'html' => []];
-				$this->_addSmilies($this->_replacements);
-				$this->_addAdditionalButtons($this->_replacements);
-				$this->_pregQuote($this->_replacements['codes']);
-
-				if ($this->_useCache) {
-					Cache::write('Saito.Smilies.html', $this->_replacements);
-				}
-			}
-
-			return $this->_replacements;
-		}
-
-		/**
-		 * prepares an array with smiliey-codes to be used in a preg_replace
-		 *
-		 * @param array $codes
-		 */
-		protected function _pregQuote(array &$codes) {
-			$delimiter = '/';
-			foreach ($codes as $key => $code) {
-				$codes[$key] = $delimiter .
-					// a smiley can't be concatenated to a string and requires a
-					// whitespace in front
-					'(^|(?<=(\s)))' .
-					preg_quote($code, $delimiter) .
-					$delimiter;
-			}
-		}
-
-		protected function _addSmilies(&$replacements) {
-			$smilies = $this->_smileyData->get();
-			foreach ($smilies as $k => $smiley) {
-				$replacements['codes'][] = $smiley['code'];
-				$title = $this->_l10n($smiley['title']);
-
-				//= vector font smileys
-				if ($smiley['type'] === 'font') {
-					$replacements['html'][$k] = $this->_Helper->Html->tag(
-						'i',
-						'',
-						[
-							'class' => "saito-smiley-font saito-smiley-{$smiley['image']}",
-							'title' => $title
-						]
-					);
-					//= pixel image smileys
-				} else {
-					$replacements['html'][$k] = $this->_Helper->Html->image(
-						'smilies/' . $smiley['image'],
-						[
-							'alt' => $smiley['code'],
-							'class' => 'saito-smiley-image',
-							'title' => $title
-						]
-					);
-				}
-			}
-		}
-
-		protected function _l10n($string) {
-			return __d('nondynamic', $string);
-		}
-
-		/**
-		 * Adds additional buttons from global config
-		 *
-		 * @param $replacements
-		 */
-		protected function _addAdditionalButtons(&$replacements) {
-			$additionalButtons = $this->_smileyData->getAdditionalSmilies();
-			if (empty($additionalButtons)) {
-				return;
-			}
-			foreach ($additionalButtons as $additionalButton) {
-				// $s['codes'][] = ':gacker:';
-				$replacements['codes'][] = $additionalButton['code'];
-				// $s['html'][] = $this->_Helper->Html->image('smilies/gacker_large.png');
-				if ($additionalButton['type'] === 'image') {
-					$additionalButton['replacement'] = $this->_Helper->Html->image(
-						'markitup' . DS . $additionalButton['replacement'],
-						['class' => 'saito-smiley-image']
-					);
-				}
-				$replacements['html'][] = $additionalButton['replacement'];
-			}
-		}
-
-	}
\ No newline at end of file
+    namespace Saito\Smiley;
+
+    class Renderer {
+
+        const DEBUG_SMILIES_KEY = ':smilies-debug:';
+
+        protected $_replacements;
+
+        /**
+         * @var \Saito\Smiley\Cache
+         */
+        protected $_smileyData;
+
+        protected $_useCache;
+
+        public function __construct($smileyData) {
+            $this->_smileyData = $smileyData;
+        }
+
+        /**
+         * Replaces all smiley-codes in a string with appropriate HTML-tags
+         *
+         * @param $string
+         * @return string
+         * @throws \RuntimeException
+         */
+        public function replace($string) {
+            $replacements = $this->_getReplacements();
+            $string = preg_replace(
+                $replacements['codes'],
+                $replacements['html'],
+                $string
+            );
+            if ($string === null) {
+                throw new \RuntimeException("Can't replace smilies. 1420630983");
+            }
+            $string = $this->_debug($string, $replacements);
+            return $string;
+        }
+
+        public function setHelper(\Helper $Helper) {
+            $this->_Helper = $Helper;
+        }
+
+        /**
+         * outputs all available smilies :allSmilies:
+         *
+         * useful for debugging
+         */
+        protected function _debug($string, $replacements) {
+            if (strpos($string, self::DEBUG_SMILIES_KEY) === false) {
+                return $string;
+            }
+            $smilies = $this->_smileyData->get();
+            $out[] = '<table class="table table-simple">';
+            $out[] = '<tr><th>Icon</th><th>Code</th><th>Image</th><th>Title</th></tr>';
+            foreach ($replacements['html'] as $k => $smiley) {
+                $title = $this->_l10n($smilies[$k]['title']);
+                $out[] = '<tr>';
+                $out[] = "<td>{$smiley}</td><td>{$smilies[$k]['code']}</td><td>{$smilies[$k]['image']}</td><td>{$title}</td>";
+                $out[] = '</tr>';
+            }
+            $out[] = '</table>';
+            return str_replace(self::DEBUG_SMILIES_KEY, implode('', $out), $string);
+        }
+
+        protected function _getReplacements() {
+            if (!$this->_replacements && $this->_useCache) {
+                $this->_replacements = Cache::read('Saito.Smilies.html');
+            }
+
+            if (!$this->_replacements) {
+                $this->_replacements = ['codes' => [], 'html' => []];
+                $this->_addSmilies($this->_replacements);
+                $this->_addAdditionalButtons($this->_replacements);
+                $this->_pregQuote($this->_replacements['codes']);
+
+                if ($this->_useCache) {
+                    Cache::write('Saito.Smilies.html', $this->_replacements);
+                }
+            }
+
+            return $this->_replacements;
+        }
+
+        /**
+         * prepares an array with smiliey-codes to be used in a preg_replace
+         *
+         * @param array $codes
+         */
+        protected function _pregQuote(array &$codes) {
+            $delimiter = '/';
+            foreach ($codes as $key => $code) {
+                $codes[$key] = $delimiter .
+                    // a smiley can't be concatenated to a string and requires a
+                    // whitespace in front
+                    '(^|(?<=(\s)))' .
+                    preg_quote($code, $delimiter) .
+                    $delimiter;
+            }
+        }
+
+        protected function _addSmilies(&$replacements) {
+            $smilies = $this->_smileyData->get();
+            foreach ($smilies as $k => $smiley) {
+                $replacements['codes'][] = $smiley['code'];
+                $title = $this->_l10n($smiley['title']);
+
+                //= vector font smileys
+                if ($smiley['type'] === 'font') {
+                    $replacements['html'][$k] = $this->_Helper->Html->tag(
+                        'i',
+                        '',
+                        [
+                            'class' => "saito-smiley-font saito-smiley-{$smiley['image']}",
+                            'title' => $title
+                        ]
+                    );
+                    //= pixel image smileys
+                } else {
+                    $replacements['html'][$k] = $this->_Helper->Html->image(
+                        'smilies/' . $smiley['image'],
+                        [
+                            'alt' => $smiley['code'],
+                            'class' => 'saito-smiley-image',
+                            'title' => $title
+                        ]
+                    );
+                }
+            }
+        }
+
+        protected function _l10n($string) {
+            return __d('nondynamic', $string);
+        }
+
+        /**
+         * Adds additional buttons from global config
+         *
+         * @param $replacements
+         */
+        protected function _addAdditionalButtons(&$replacements) {
+            $additionalButtons = $this->_smileyData->getAdditionalSmilies();
+            if (empty($additionalButtons)) {
+                return;
+            }
+            foreach ($additionalButtons as $additionalButton) {
+                // $s['codes'][] = ':gacker:';
+                $replacements['codes'][] = $additionalButton['code'];
+                // $s['html'][] = $this->_Helper->Html->image('smilies/gacker_large.png');
+                if ($additionalButton['type'] === 'image') {
+                    $additionalButton['replacement'] = $this->_Helper->Html->image(
+                        'markitup' . DS . $additionalButton['replacement'],
+                        ['class' => 'saito-smiley-image']
+                    );
+                }
+                $replacements['html'][] = $additionalButton['replacement'];
+            }
+        }
+
+    }
\ No newline at end of file

app/Lib/Saito/Exception/SaitoBlackholeException.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 	class SaitoBlackholeException extends \BadRequestException {
 
 		public function __construct($type = null, $data = []) {
-			$message = 'Request was blackholed. Type: ' . $type;
+			$message = 'Request was blackholed. Type: '.$type;
 			$this->__Logger = new ExceptionLogger;
 			$this->__Logger->write($message, $data);
 			parent::__construct($message, 400);

Indentation +10 added lines, -10 removed lines

@@ -1,17 +1,17 @@
 <?php
 
-	namespace Saito\Exception;
+    namespace Saito\Exception;
 
-	use Saito\Exception\Logger\ExceptionLogger;
+    use Saito\Exception\Logger\ExceptionLogger;
 
-	class SaitoBlackholeException extends \BadRequestException {
+    class SaitoBlackholeException extends \BadRequestException {
 
-		public function __construct($type = null, $data = []) {
-			$message = 'Request was blackholed. Type: ' . $type;
-			$this->__Logger = new ExceptionLogger;
-			$this->__Logger->write($message, $data);
-			parent::__construct($message, 400);
-		}
+        public function __construct($type = null, $data = []) {
+            $message = 'Request was blackholed. Type: ' . $type;
+            $this->__Logger = new ExceptionLogger;
+            $this->__Logger->write($message, $data);
+            parent::__construct($message, 400);
+        }
 
-	}
+    }
 

app/Lib/Saito/Exception/Logger/ExceptionLogger.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 
 			$requestMethod = $request ? $request->method() : false;
 			if ($url && $requestMethod) {
-				$url .= ' ' . $requestMethod;
+				$url .= ' '.$requestMethod;
 			}
 			if ($url) {
 				$this->_add($url, 'Request URL');
@@ -125,7 +125,7 @@ 
 				$message[] = sprintf("  #%d %s", $i, $line);
 				$i++;
 			}
-			return "\n" . implode("\n", $message);
+			return "\n".implode("\n", $message);
 		}
 
 		protected function _add($val, $key = null, $prepend = false) {

Indentation +144 added lines, -144 removed lines

@@ -1,147 +1,147 @@
 <?php
 
-	namespace Saito\Exception\Logger;
-
-	\App::uses('CakeLog', 'Log');
-
-	class ExceptionLogger {
-
-		private $__lines = [];
-
-		/**
-		 * @param null $message
-		 * @param null $data
-		 * - `msgs` array with additional message-lines
-		 * @throws \InvalidArgumentException
-		 */
-		public function write($message, $data = null) {
-			//# process message(s)
-			$msgs = [$message];
-			if (isset($data['msgs'])) {
-				$msgs = array_merge($msgs, $data['msgs']);
-			}
-			// prepend main message in front of metadata added by subclasses
-			foreach (array_reverse($msgs) as $key => $msg) {
-				$this->_add($msg, $key, true);
-			}
-
-			//# add exception data
-			if (isset($data['e'])) {
-				/** @var $Exception \Exception */
-				$Exception = $data['e'];
-				unset($data['e']);
-				$message = $Exception->getMessage();
-				if (!empty($message)) {
-					$this->_add($message);
-				}
-			}
-
-			//# add request data
-			$request = (php_sapi_name() !== 'cli') ? \Router::getRequest() : false;
-
-			$url = false;
-			if (isset($data['URL'])) {
-				$url = $data['URL'];
-			} elseif ($request) {
-				$url = $request->here();
-			}
-
-			$requestMethod = $request ? $request->method() : false;
-			if ($url && $requestMethod) {
-				$url .= ' ' . $requestMethod;
-			}
-			if ($url) {
-				$this->_add($url, 'Request URL');
-			}
-
-			if (isset($_SERVER['HTTP_USER_AGENT'])) {
-				$this->_add($_SERVER['HTTP_USER_AGENT'], 'User-Agent');
-			}
-
-			$this->_addUser($data);
-
-			if (!empty($request->data)) {
-				$this->_add($this->_filterData($request->data), 'Data');
-			}
-
-			$this->_write();
-		}
-
-		/**
-		 * adds data about current user to log entry
-		 *
-		 * @param $data
-		 * @throws \InvalidArgumentException
-		 */
-		protected function _addUser($data) {
-			if (!isset($data['CurrentUser'])) {
-				return;
-			}
-			$CurrentUser = $data['CurrentUser'];
-			if (!is_a($data['CurrentUser'], 'CurrentUserComponent')) {
-				throw new \InvalidArgumentException;
-			}
-			if ($CurrentUser->isLoggedIn()) {
-				$username = "{$CurrentUser['username']} (id: {$CurrentUser['id']})";
-			} else {
-				$username = 'anonymous';
-			}
-			$this->_add($username, 'Current user');
-		}
-
-		/**
-		 * Filters request-data which should not be in server logs
-		 *
-		 * esp. cleartext passwords in $_POST data
-		 *
-		 * @param $data
-		 * @return array
-		 */
-		protected function _filterData($data) {
-			if (!is_array($data)) {
-				return $data;
-			}
-			foreach ($data as $key => $datum) {
-				if (is_array($datum)) {
-					$data[$key] = $this->_filterData($datum);
-					continue;
-				}
-
-				if (stripos($key, 'password') !== false) {
-					$data[$key] = '***********';
-				}
-			}
-			return $data;
-		}
-
-		protected function _write() {
-			\CakeLog::write('saito.error', $this->_message());
-		}
-
-		protected function _message() {
-			$message = [];
-			$i = 1;
-			foreach ($this->__lines as $line) {
-				$message[] = sprintf("  #%d %s", $i, $line);
-				$i++;
-			}
-			return "\n" . implode("\n", $message);
-		}
-
-		protected function _add($val, $key = null, $prepend = false) {
-			if (is_array($val)) {
-				$val = print_r($this->_filterData($val), true);
-			}
-			if (is_string($key)) {
-				$val = "$key: $val";
-			}
-
-			if ($prepend) {
-				array_unshift($this->__lines, $val);
-			} else {
-				$this->__lines[] = $val;
-			}
-		}
-
-	}
+    namespace Saito\Exception\Logger;
+
+    \App::uses('CakeLog', 'Log');
+
+    class ExceptionLogger {
+
+        private $__lines = [];
+
+        /**
+         * @param null $message
+         * @param null $data
+         * - `msgs` array with additional message-lines
+         * @throws \InvalidArgumentException
+         */
+        public function write($message, $data = null) {
+            //# process message(s)
+            $msgs = [$message];
+            if (isset($data['msgs'])) {
+                $msgs = array_merge($msgs, $data['msgs']);
+            }
+            // prepend main message in front of metadata added by subclasses
+            foreach (array_reverse($msgs) as $key => $msg) {
+                $this->_add($msg, $key, true);
+            }
+
+            //# add exception data
+            if (isset($data['e'])) {
+                /** @var $Exception \Exception */
+                $Exception = $data['e'];
+                unset($data['e']);
+                $message = $Exception->getMessage();
+                if (!empty($message)) {
+                    $this->_add($message);
+                }
+            }
+
+            //# add request data
+            $request = (php_sapi_name() !== 'cli') ? \Router::getRequest() : false;
+
+            $url = false;
+            if (isset($data['URL'])) {
+                $url = $data['URL'];
+            } elseif ($request) {
+                $url = $request->here();
+            }
+
+            $requestMethod = $request ? $request->method() : false;
+            if ($url && $requestMethod) {
+                $url .= ' ' . $requestMethod;
+            }
+            if ($url) {
+                $this->_add($url, 'Request URL');
+            }
+
+            if (isset($_SERVER['HTTP_USER_AGENT'])) {
+                $this->_add($_SERVER['HTTP_USER_AGENT'], 'User-Agent');
+            }
+
+            $this->_addUser($data);
+
+            if (!empty($request->data)) {
+                $this->_add($this->_filterData($request->data), 'Data');
+            }
+
+            $this->_write();
+        }
+
+        /**
+         * adds data about current user to log entry
+         *
+         * @param $data
+         * @throws \InvalidArgumentException
+         */
+        protected function _addUser($data) {
+            if (!isset($data['CurrentUser'])) {
+                return;
+            }
+            $CurrentUser = $data['CurrentUser'];
+            if (!is_a($data['CurrentUser'], 'CurrentUserComponent')) {
+                throw new \InvalidArgumentException;
+            }
+            if ($CurrentUser->isLoggedIn()) {
+                $username = "{$CurrentUser['username']} (id: {$CurrentUser['id']})";
+            } else {
+                $username = 'anonymous';
+            }
+            $this->_add($username, 'Current user');
+        }
+
+        /**
+         * Filters request-data which should not be in server logs
+         *
+         * esp. cleartext passwords in $_POST data
+         *
+         * @param $data
+         * @return array
+         */
+        protected function _filterData($data) {
+            if (!is_array($data)) {
+                return $data;
+            }
+            foreach ($data as $key => $datum) {
+                if (is_array($datum)) {
+                    $data[$key] = $this->_filterData($datum);
+                    continue;
+                }
+
+                if (stripos($key, 'password') !== false) {
+                    $data[$key] = '***********';
+                }
+            }
+            return $data;
+        }
+
+        protected function _write() {
+            \CakeLog::write('saito.error', $this->_message());
+        }
+
+        protected function _message() {
+            $message = [];
+            $i = 1;
+            foreach ($this->__lines as $line) {
+                $message[] = sprintf("  #%d %s", $i, $line);
+                $i++;
+            }
+            return "\n" . implode("\n", $message);
+        }
+
+        protected function _add($val, $key = null, $prepend = false) {
+            if (is_array($val)) {
+                $val = print_r($this->_filterData($val), true);
+            }
+            if (is_string($key)) {
+                $val = "$key: $val";
+            }
+
+            if ($prepend) {
+                array_unshift($this->__lines, $val);
+            } else {
+                $this->__lines[] = $val;
+            }
+        }
+
+    }
 

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

Spacing +3 added lines, -3 removed lines

@@ -58,7 +58,7 @@ 
 				$childrenHtml .= $this->_renderNode($child);
 			}
 			$level = $node->getLevel();
-			$html .= '<li>' . $this->_wrapUl($childrenHtml, $level + 1) . '</li>';
+			$html .= '<li>'.$this->_wrapUl($childrenHtml, $level + 1).'</li>';
 			return $html;
 		}
 
@@ -81,7 +81,7 @@ 
 			$data = '';
 			if ($level === 0) {
 				$class .= ' root';
-				$data = 'data-id="' . $id . '"';
+				$data = 'data-id="'.$id.'"';
 			}
 			return "<ul {$data} class=\"{$class}\">{$string}</ul>";
 		}
@@ -95,7 +95,7 @@ 
 		protected function _css($node) {
 			$entryType = ($node->isRoot()) ? 'et-root' : 'et-reply';
 			$entryType .= ($node->isNew()) ? ' et-new' : ' et-old';
-			if ($node->get('id') === (int)$this->_settings['currentEntry']) {
+			if ($node->get('id') === (int) $this->_settings['currentEntry']) {
 				$entryType .= ' et-current';
 			}
 			$css = $entryType;

Indentation +106 added lines, -106 removed lines

@@ -1,108 +1,108 @@
 <?php
 
-	namespace Saito\Thread\Renderer;
-
-	/**
-	 * renders posting into an ul-li HTML-list tree
-	 *
-	 * Check and benchmark on front-page if you perform changes here!
-	 */
-	abstract class HtmlRendererAbstract {
-
-		/** * @var SaitoEventManager */
-		use \Saito\Posting\Renderer\HelperTrait;
-
-		protected $_EntryHelper;
-
-		protected $_defaults = [
-			'currentEntry' => null,
-			'ignore' => true,
-			'rootWrap' => false
-		];
-
-		protected $_settings;
-
-		protected $_lastAnswer;
-
-		protected $_SEM;
-
-		public function __construct(\EntryHHelper $EntryHelper, $options = []) {
-			$this->_EntryHelper = $EntryHelper;
-			$this->_SEM = \SaitoEventManager::getInstance();
-			$this->setOptions($options);
-		}
-
-		public function render(\Saito\Posting\PostingInterface $node) {
-			$this->_lastAnswer = $node->getThread()->getLastAnswer();
-			$html = $this->_renderNode($node);
-			if ($node->isRoot() || $this->_settings['rootWrap']) {
-				$html = $this->_wrapUl($html, 0, $node->get('id'));
-			}
-			return $html;
-		}
-
-		public function setOptions($options) {
-			$this->_settings = $options + $this->_defaults;
-		}
-
-		protected function _renderNode(\Saito\Posting\PostingInterface $node) {
-			$html = $this->_renderCore($node);
-
-			$children = $node->getChildren();
-			if (empty($children)) {
-				return $html;
-			}
-
-			$childrenHtml = '';
-			foreach ($node->getChildren() as $child) {
-				$childrenHtml .= $this->_renderNode($child);
-			}
-			$level = $node->getLevel();
-			$html .= '<li>' . $this->_wrapUl($childrenHtml, $level + 1) . '</li>';
-			return $html;
-		}
-
-		protected abstract function _renderCore(\Saito\Posting\PostingInterface $node);
-
-		/**
-		 * Wraps li tags with ul tag
-		 *
-		 * @param string $string li html list
-		 * @param $level
-		 * @param $id
-		 * @return string
-		 */
-		protected function _wrapUl($string, $level = null, $id = null) {
-			if ($level >= $this->_settings['maxThreadDepthIndent']) {
-				return $string;
-			}
-
-			$class = 'threadTree-node';
-			$data = '';
-			if ($level === 0) {
-				$class .= ' root';
-				$data = 'data-id="' . $id . '"';
-			}
-			return "<ul {$data} class=\"{$class}\">{$string}</ul>";
-		}
-
-		/**
-		 * generates CSS classes
-		 *
-		 * @param $node
-		 * @return string
-		 */
-		protected function _css($node) {
-			$entryType = ($node->isRoot()) ? 'et-root' : 'et-reply';
-			$entryType .= ($node->isNew()) ? ' et-new' : ' et-old';
-			if ($node->get('id') === (int)$this->_settings['currentEntry']) {
-				$entryType .= ' et-current';
-			}
-			$css = $entryType;
-			if ($this->_settings['ignore'] && $node->isIgnored()) {
-				$css .= ' ignored';
-			}
-			return $css;
-		}
-
-	}
+    namespace Saito\Thread\Renderer;
+
+    /**
+     * renders posting into an ul-li HTML-list tree
+     *
+     * Check and benchmark on front-page if you perform changes here!
+     */
+    abstract class HtmlRendererAbstract {
+
+        /** * @var SaitoEventManager */
+        use \Saito\Posting\Renderer\HelperTrait;
+
+        protected $_EntryHelper;
+
+        protected $_defaults = [
+            'currentEntry' => null,
+            'ignore' => true,
+            'rootWrap' => false
+        ];
+
+        protected $_settings;
+
+        protected $_lastAnswer;
+
+        protected $_SEM;
+
+        public function __construct(\EntryHHelper $EntryHelper, $options = []) {
+            $this->_EntryHelper = $EntryHelper;
+            $this->_SEM = \SaitoEventManager::getInstance();
+            $this->setOptions($options);
+        }
+
+        public function render(\Saito\Posting\PostingInterface $node) {
+            $this->_lastAnswer = $node->getThread()->getLastAnswer();
+            $html = $this->_renderNode($node);
+            if ($node->isRoot() || $this->_settings['rootWrap']) {
+                $html = $this->_wrapUl($html, 0, $node->get('id'));
+            }
+            return $html;
+        }
+
+        public function setOptions($options) {
+            $this->_settings = $options + $this->_defaults;
+        }
+
+        protected function _renderNode(\Saito\Posting\PostingInterface $node) {
+            $html = $this->_renderCore($node);
+
+            $children = $node->getChildren();
+            if (empty($children)) {
+                return $html;
+            }
+
+            $childrenHtml = '';
+            foreach ($node->getChildren() as $child) {
+                $childrenHtml .= $this->_renderNode($child);
+            }
+            $level = $node->getLevel();
+            $html .= '<li>' . $this->_wrapUl($childrenHtml, $level + 1) . '</li>';
+            return $html;
+        }
+
+        protected abstract function _renderCore(\Saito\Posting\PostingInterface $node);
+
+        /**
+         * Wraps li tags with ul tag
+         *
+         * @param string $string li html list
+         * @param $level
+         * @param $id
+         * @return string
+         */
+        protected function _wrapUl($string, $level = null, $id = null) {
+            if ($level >= $this->_settings['maxThreadDepthIndent']) {
+                return $string;
+            }
+
+            $class = 'threadTree-node';
+            $data = '';
+            if ($level === 0) {
+                $class .= ' root';
+                $data = 'data-id="' . $id . '"';
+            }
+            return "<ul {$data} class=\"{$class}\">{$string}</ul>";
+        }
+
+        /**
+         * generates CSS classes
+         *
+         * @param $node
+         * @return string
+         */
+        protected function _css($node) {
+            $entryType = ($node->isRoot()) ? 'et-root' : 'et-reply';
+            $entryType .= ($node->isNew()) ? ' et-new' : ' et-old';
+            if ($node->get('id') === (int)$this->_settings['currentEntry']) {
+                $entryType .= ' et-current';
+            }
+            $css = $entryType;
+            if ($this->_settings['ignore'] && $node->isIgnored()) {
+                $css .= ' ignored';
+            }
+            return $css;
+        }
+
+    }

index.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 define('DS', DIRECTORY_SEPARATOR);
 define('ROOT', dirname(__FILE__));
 define('WEBROOT_DIR', 'webroot');
-define('WWW_ROOT', ROOT . DS . APP_DIR . DS . WEBROOT_DIR . DS);
+define('WWW_ROOT', ROOT.DS.APP_DIR.DS.WEBROOT_DIR.DS);
 
 /**
  * This only needs to be changed if the "cake" directory is located
@@ -39,12 +39,12 @@ 
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	define(
 	'CAKE_CORE_INCLUDE_PATH',
-		ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'pear-pear.cakephp.org' . DS . 'CakePHP'
+		ROOT.DS.APP_DIR.DS.'Vendor'.DS.'pear-pear.cakephp.org'.DS.'CakePHP'
 	);
 }
 
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-	define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
+	define('CAKE_CORE_INCLUDE_PATH', ROOT.DS.'lib');
 }
 
-require APP_DIR . DS . WEBROOT_DIR . DS . 'index.php';
+require APP_DIR.DS.WEBROOT_DIR.DS.'index.php';

Indentation +5 added lines, -5 removed lines

@@ -37,14 +37,14 @@
 
 // Core path for CakePHP 2 via composer
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-	define(
-	'CAKE_CORE_INCLUDE_PATH',
-		ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'pear-pear.cakephp.org' . DS . 'CakePHP'
-	);
+    define(
+    'CAKE_CORE_INCLUDE_PATH',
+        ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'pear-pear.cakephp.org' . DS . 'CakePHP'
+    );
 }
 
 if (!defined('CAKE_CORE_INCLUDE_PATH')) {
-	define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
+    define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
 }
 
 require APP_DIR . DS . WEBROOT_DIR . DS . 'index.php';