Schlaefer / Saito

app/Console/Command/DummyDataShell.php

Doc Comments +4 added lines

@@ -106,6 +106,10 @@
 			$this->out("Generated $i users.");
 		}
 
+		/**
+		 * @param integer $i
+		 * @param integer $off
+		 */
 		protected function _progress($i, $off) {
 			if ($i < 1) {
 				return;

Spacing +5 added lines, -5 removed lines

@@ -31,11 +31,11 @@ 
 		}
 
 		public function generate() {
-			$nPostings = (int)$this->in('Number of postings to generate?', null, 100);
+			$nPostings = (int) $this->in('Number of postings to generate?', null, 100);
 			if ($nPostings === 0) {
 				return;
 			}
-			$ratio = (int)$this->in('Average answers per thread?', null, 10);
+			$ratio = (int) $this->in('Average answers per thread?', null, 10);
 			$seed = $nPostings / $ratio;
 
 			new Saito\Markup\Settings([
@@ -64,7 +64,7 @@ 
 				}
 				$entry = $this->Entry->createPosting(['Entry' => $entry]);
 				if (empty($entry)) {
-					throw new RuntimeException('Could not create entry: ' . $entry);
+					throw new RuntimeException('Could not create entry: '.$entry);
 				}
 
 				$this->_progress($i, $nPostings);
@@ -79,7 +79,7 @@ 
 
 		public function user() {
 			$max = count($this->_users);
-			$n = (int)$this->in("Number of users to generate (max: $max)?", null, 0);
+			$n = (int) $this->in("Number of users to generate (max: $max)?", null, 0);
 			if ($n === 0) {
 				return;
 			}
@@ -112,7 +112,7 @@ 
 			}
 			$this->out('.', 0);
 			if ($i > 1 && !($i % 50)) {
-				$percent = (int)floor($i / $off * 100);
+				$percent = (int) floor($i / $off * 100);
 				$this->out(sprintf(' %3s%%', $percent), 1);
 			}
 		}

Indentation +168 added lines, -168 removed lines

@@ -1,171 +1,171 @@
 <?php
 
-	use Saito\User\Auth;
-	use Saito\User\SaitoUser;
-
-	class DummyDataShell extends AppShell {
-
-		public $uses = ['Entry', 'User'];
-
-		protected $_Categories = null;
-
-		protected $_Users = null;
-
-		protected $_text = null;
-
-		protected $_Threads = [];
-
-		protected $_users = ['aaron', 'Alex', 'Amy', 'Ana-Lucia', 'Anthony', 'Ben',
-			'Bernard', 'Boone', 'Carmen', 'Carole', 'Charles', 'Charlie', 'Charlotte',
-			'Christian', 'Claire', 'Daniel', 'Danielle', 'Desmond', 'Dogen', 'Eko',
-			'Eloise', 'Ethan', 'Frank', 'Frogurt', 'George', 'Gina', 'Horace', 'Hugo',
-			'Ilana', 'Jack', 'Jacob', 'James', 'Jin', 'John', 'Juliet', 'Kate',
-			'Kelvin', 'Liam', 'Libby', 'Martin', 'Maninbla', 'Michael', 'Michelle',
-			'Miles', 'Nadia', 'Naomi', 'Nikki', 'Omar', 'Paulo', 'Penny', 'Pierre',
-			'Richard', 'Sarah', 'Sayid', 'Shannon', 'Stuart', 'Sun', 'Teresa', 'Tom',
-			'walt'];
-
-		public function main() {
-			$this->user();
-			$this->generate();
-		}
-
-		public function generate() {
-			$nPostings = (int)$this->in('Number of postings to generate?', null, 100);
-			if ($nPostings === 0) {
-				return;
-			}
-			$ratio = (int)$this->in('Average answers per thread?', null, 10);
-			$seed = $nPostings / $ratio;
-
-			new Saito\Markup\Settings([
-				'hashBaseUrl' => 'entries/view/',
-				'atBaseUrl' => 'users/name/',
-				'server' => Router::fullBaseUrl(),
-				'webroot' => Router::fullBaseUrl()
-			]);
-			$this->Entry->SharedObjects['CurrentUser'] = new SaitoUserDummy();
-
-			for ($i = 0; $i < $nPostings; $i++) {
-				$newThread = $i < $seed;
-
-				$user = $this->_randomUser();
-				$this->Entry->CurrentUser->setSettings($user);
-
-				$entry = [
-					'subject' => $i,
-					'text' => rand(0, 1) ? $this->_randomText() : '',
-					'user_id' => $user['id']
-				];
-				if ($newThread) {
-					$entry['category'] = $this->_randomCategory();
-				} else {
-					$entry['pid'] = array_rand($this->_Threads);
-				}
-				$entry = $this->Entry->createPosting(['Entry' => $entry]);
-				if (empty($entry)) {
-					throw new RuntimeException('Could not create entry: ' . $entry);
-				}
-
-				$this->_progress($i, $nPostings);
-
-				$id = $entry['Entry']['id'];
-				$this->_Threads[$id] = $id;
-			}
-
-			$this->out();
-			$this->out("Generated $i postings.");
-		}
-
-		public function user() {
-			$max = count($this->_users);
-			$n = (int)$this->in("Number of users to generate (max: $max)?", null, 0);
-			if ($n === 0) {
-				return;
-			}
-			if ($n > $max) {
-				$n = $max;
-			}
-			$users = array_rand($this->_users, $n);
-			$i = 0;
-			foreach ($users as $user) {
-				$name = $this->_users[$user];
-				$data = [
-					'User' => [
-						'username' => $name,
-						'password' => 'test',
-						'password_confirm' => 'test',
-						'user_email' => "$name@example.com"
-					]
-				];
-				$this->User->register($data, true);
-				$this->_progress($i++, $n);
-			}
-
-			$this->out();
-			$this->out("Generated $i users.");
-		}
-
-		protected function _progress($i, $off) {
-			if ($i < 1) {
-				return;
-			}
-			$this->out('.', 0);
-			if ($i > 1 && !($i % 50)) {
-				$percent = (int)floor($i / $off * 100);
-				$this->out(sprintf(' %3s%%', $percent), 1);
-			}
-		}
-
-		protected function _randomCategory() {
-			if ($this->_Categories === null) {
-				$this->_Categories = $this->Entry->Category->find('all',
-					['recursive' => 0, 'fields' => ['id']]);
-			}
-			$id = array_rand($this->_Categories);
-			return $this->_Categories[$id]['Category']['id'];
-		}
-
-		protected function _randomUser() {
-			if ($this->_Users === null) {
-				$this->_Users = $this->User->find('all',
-					['recursive' => -1, 'conditions' => ['activate_code' => 0]]);
-			}
-			$id = array_rand($this->_Users);
-			return $this->_Users[$id]['User'];
-		}
-
-		protected function _randomText() {
-			if (empty($this->_text)) {
-				$this->_text = file_get_contents('http://loripsum.net/api/short/plaintext');
-			}
-			return $this->_text;
-		}
-
-	}
-
-	class SaitoUserDummy extends SaitoUser {
-
-		public function __construct($settings = null) {
-			parent::__construct($settings);
-			$this->Categories = new Auth\CategoryAuthorization($this);
-		}
-
-		public function getMaxAccession() {
-			return 2;
-		}
-
-		public function isLoggedIn() {
-			return true;
-		}
-
-		public function isAdmin() {
-			return true;
-		}
-
-		public function hasBookmarked() {
-			return false;
-		}
-
-	}
+    use Saito\User\Auth;
+    use Saito\User\SaitoUser;
+
+    class DummyDataShell extends AppShell {
+
+        public $uses = ['Entry', 'User'];
+
+        protected $_Categories = null;
+
+        protected $_Users = null;
+
+        protected $_text = null;
+
+        protected $_Threads = [];
+
+        protected $_users = ['aaron', 'Alex', 'Amy', 'Ana-Lucia', 'Anthony', 'Ben',
+            'Bernard', 'Boone', 'Carmen', 'Carole', 'Charles', 'Charlie', 'Charlotte',
+            'Christian', 'Claire', 'Daniel', 'Danielle', 'Desmond', 'Dogen', 'Eko',
+            'Eloise', 'Ethan', 'Frank', 'Frogurt', 'George', 'Gina', 'Horace', 'Hugo',
+            'Ilana', 'Jack', 'Jacob', 'James', 'Jin', 'John', 'Juliet', 'Kate',
+            'Kelvin', 'Liam', 'Libby', 'Martin', 'Maninbla', 'Michael', 'Michelle',
+            'Miles', 'Nadia', 'Naomi', 'Nikki', 'Omar', 'Paulo', 'Penny', 'Pierre',
+            'Richard', 'Sarah', 'Sayid', 'Shannon', 'Stuart', 'Sun', 'Teresa', 'Tom',
+            'walt'];
+
+        public function main() {
+            $this->user();
+            $this->generate();
+        }
+
+        public function generate() {
+            $nPostings = (int)$this->in('Number of postings to generate?', null, 100);
+            if ($nPostings === 0) {
+                return;
+            }
+            $ratio = (int)$this->in('Average answers per thread?', null, 10);
+            $seed = $nPostings / $ratio;
+
+            new Saito\Markup\Settings([
+                'hashBaseUrl' => 'entries/view/',
+                'atBaseUrl' => 'users/name/',
+                'server' => Router::fullBaseUrl(),
+                'webroot' => Router::fullBaseUrl()
+            ]);
+            $this->Entry->SharedObjects['CurrentUser'] = new SaitoUserDummy();
+
+            for ($i = 0; $i < $nPostings; $i++) {
+                $newThread = $i < $seed;
+
+                $user = $this->_randomUser();
+                $this->Entry->CurrentUser->setSettings($user);
+
+                $entry = [
+                    'subject' => $i,
+                    'text' => rand(0, 1) ? $this->_randomText() : '',
+                    'user_id' => $user['id']
+                ];
+                if ($newThread) {
+                    $entry['category'] = $this->_randomCategory();
+                } else {
+                    $entry['pid'] = array_rand($this->_Threads);
+                }
+                $entry = $this->Entry->createPosting(['Entry' => $entry]);
+                if (empty($entry)) {
+                    throw new RuntimeException('Could not create entry: ' . $entry);
+                }
+
+                $this->_progress($i, $nPostings);
+
+                $id = $entry['Entry']['id'];
+                $this->_Threads[$id] = $id;
+            }
+
+            $this->out();
+            $this->out("Generated $i postings.");
+        }
+
+        public function user() {
+            $max = count($this->_users);
+            $n = (int)$this->in("Number of users to generate (max: $max)?", null, 0);
+            if ($n === 0) {
+                return;
+            }
+            if ($n > $max) {
+                $n = $max;
+            }
+            $users = array_rand($this->_users, $n);
+            $i = 0;
+            foreach ($users as $user) {
+                $name = $this->_users[$user];
+                $data = [
+                    'User' => [
+                        'username' => $name,
+                        'password' => 'test',
+                        'password_confirm' => 'test',
+                        'user_email' => "$name@example.com"
+                    ]
+                ];
+                $this->User->register($data, true);
+                $this->_progress($i++, $n);
+            }
+
+            $this->out();
+            $this->out("Generated $i users.");
+        }
+
+        protected function _progress($i, $off) {
+            if ($i < 1) {
+                return;
+            }
+            $this->out('.', 0);
+            if ($i > 1 && !($i % 50)) {
+                $percent = (int)floor($i / $off * 100);
+                $this->out(sprintf(' %3s%%', $percent), 1);
+            }
+        }
+
+        protected function _randomCategory() {
+            if ($this->_Categories === null) {
+                $this->_Categories = $this->Entry->Category->find('all',
+                    ['recursive' => 0, 'fields' => ['id']]);
+            }
+            $id = array_rand($this->_Categories);
+            return $this->_Categories[$id]['Category']['id'];
+        }
+
+        protected function _randomUser() {
+            if ($this->_Users === null) {
+                $this->_Users = $this->User->find('all',
+                    ['recursive' => -1, 'conditions' => ['activate_code' => 0]]);
+            }
+            $id = array_rand($this->_Users);
+            return $this->_Users[$id]['User'];
+        }
+
+        protected function _randomText() {
+            if (empty($this->_text)) {
+                $this->_text = file_get_contents('http://loripsum.net/api/short/plaintext');
+            }
+            return $this->_text;
+        }
+
+    }
+
+    class SaitoUserDummy extends SaitoUser {
+
+        public function __construct($settings = null) {
+            parent::__construct($settings);
+            $this->Categories = new Auth\CategoryAuthorization($this);
+        }
+
+        public function getMaxAccession() {
+            return 2;
+        }
+
+        public function isLoggedIn() {
+            return true;
+        }
+
+        public function isAdmin() {
+            return true;
+        }
+
+        public function hasBookmarked() {
+            return false;
+        }
+
+    }
 

app/Console/Command/SiegeShell.php

Doc Comments +6 added lines

@@ -42,12 +42,18 @@
 			exec($command);
 		}
 
+		/**
+		 * @param string $urlFilePath
+		 */
 		protected function _cleanup($urlFilePath) {
 			if (file_exists($urlFilePath)) {
 				unlink($urlFilePath);
 			}
 		}
 
+		/**
+		 * @param string[] $out
+		 */
 		protected function _generateEntriesIndex(&$out) {
 			for ($i = 0; $i < 400; $i++) {
 				$out[] = $this->_prefix . 'entries/index/page:' . rand(1, 2);

Spacing +9 added lines, -9 removed lines

@@ -11,12 +11,12 @@ 
 		public function main() {
 			$out = [];
 			$base = rtrim($this->args[0], '/');
-			$in = $this->in('Base URL is: ' . $base, ['y', 'n'], 'y');
+			$in = $this->in('Base URL is: '.$base, ['y', 'n'], 'y');
 			if ($in !== 'y') {
 				$this->out('Aborting.');
 				return;
 			}
-			$out[] = 'HOST=' . $base;
+			$out[] = 'HOST='.$base;
 			$this->_generateEntriesIndex($out);
 			$this->_generateEntriesMix($out);
 			$this->_generateEntriesView($out);
@@ -34,11 +34,11 @@ 
 		}
 
 		protected function _siege(&$out) {
-			$urlFilePath = TMP . 'url.txt';
+			$urlFilePath = TMP.'url.txt';
 			$this->_cleanup($urlFilePath);
 			$this->createFile($urlFilePath, implode("\n", $out));
-			$command = 'siege -R ' . APP . '..' . DS . ".siegerc -f $urlFilePath";
-			$this->out('<info>Running: ' . $command . '</info>', 1, 'info');
+			$command = 'siege -R '.APP.'..'.DS.".siegerc -f $urlFilePath";
+			$this->out('<info>Running: '.$command.'</info>', 1, 'info');
 			exec($command);
 		}
 
@@ -50,10 +50,10 @@ 
 
 		protected function _generateEntriesIndex(&$out) {
 			for ($i = 0; $i < 400; $i++) {
-				$out[] = $this->_prefix . 'entries/index/page:' . rand(1, 2);
+				$out[] = $this->_prefix.'entries/index/page:'.rand(1, 2);
 			}
 			for ($i = 0; $i < 400; $i++) {
-				$out[] = $this->_prefix . 'entries/index/page:' . rand(5, 10);
+				$out[] = $this->_prefix.'entries/index/page:'.rand(5, 10);
 			}
 		}
 
@@ -66,7 +66,7 @@ 
 					]);
 
 			foreach ($entries as $entry) {
-				$out[] = $this->_prefix . 'entries/mix/' . $entry['Entry']['id'];
+				$out[] = $this->_prefix.'entries/mix/'.$entry['Entry']['id'];
 			}
 		}
 
@@ -79,7 +79,7 @@ 
 					]);
 
 			foreach ($entries as $entry) {
-				$out[] = $this->_prefix . 'entries/view/' . $entry['Entry']['id'];
+				$out[] = $this->_prefix.'entries/view/'.$entry['Entry']['id'];
 			}
 		}
 

Indentation +72 added lines, -72 removed lines

@@ -1,87 +1,87 @@
 <?php
 
-	class SiegeShell extends AppShell {
+    class SiegeShell extends AppShell {
 
-		public $uses = [
-				'Entry'
-		];
+        public $uses = [
+                'Entry'
+        ];
 
-		protected $_prefix = '$(HOST)/';
+        protected $_prefix = '$(HOST)/';
 
-		public function main() {
-			$out = [];
-			$base = rtrim($this->args[0], '/');
-			$in = $this->in('Base URL is: ' . $base, ['y', 'n'], 'y');
-			if ($in !== 'y') {
-				$this->out('Aborting.');
-				return;
-			}
-			$out[] = 'HOST=' . $base;
-			$this->_generateEntriesIndex($out);
-			$this->_generateEntriesMix($out);
-			$this->_generateEntriesView($out);
-			$this->_siege($out);
-		}
+        public function main() {
+            $out = [];
+            $base = rtrim($this->args[0], '/');
+            $in = $this->in('Base URL is: ' . $base, ['y', 'n'], 'y');
+            if ($in !== 'y') {
+                $this->out('Aborting.');
+                return;
+            }
+            $out[] = 'HOST=' . $base;
+            $this->_generateEntriesIndex($out);
+            $this->_generateEntriesMix($out);
+            $this->_generateEntriesView($out);
+            $this->_siege($out);
+        }
 
-		public function getOptionParser() {
-			$parser = parent::getOptionParser();
-			$parser->addArgument('url',
-					[
-							'help' => 'Saito base URL',
-							'required' => true
-					]);
-			return $parser;
-		}
+        public function getOptionParser() {
+            $parser = parent::getOptionParser();
+            $parser->addArgument('url',
+                    [
+                            'help' => 'Saito base URL',
+                            'required' => true
+                    ]);
+            return $parser;
+        }
 
-		protected function _siege(&$out) {
-			$urlFilePath = TMP . 'url.txt';
-			$this->_cleanup($urlFilePath);
-			$this->createFile($urlFilePath, implode("\n", $out));
-			$command = 'siege -R ' . APP . '..' . DS . ".siegerc -f $urlFilePath";
-			$this->out('<info>Running: ' . $command . '</info>', 1, 'info');
-			exec($command);
-		}
+        protected function _siege(&$out) {
+            $urlFilePath = TMP . 'url.txt';
+            $this->_cleanup($urlFilePath);
+            $this->createFile($urlFilePath, implode("\n", $out));
+            $command = 'siege -R ' . APP . '..' . DS . ".siegerc -f $urlFilePath";
+            $this->out('<info>Running: ' . $command . '</info>', 1, 'info');
+            exec($command);
+        }
 
-		protected function _cleanup($urlFilePath) {
-			if (file_exists($urlFilePath)) {
-				unlink($urlFilePath);
-			}
-		}
+        protected function _cleanup($urlFilePath) {
+            if (file_exists($urlFilePath)) {
+                unlink($urlFilePath);
+            }
+        }
 
-		protected function _generateEntriesIndex(&$out) {
-			for ($i = 0; $i < 400; $i++) {
-				$out[] = $this->_prefix . 'entries/index/page:' . rand(1, 2);
-			}
-			for ($i = 0; $i < 400; $i++) {
-				$out[] = $this->_prefix . 'entries/index/page:' . rand(5, 10);
-			}
-		}
+        protected function _generateEntriesIndex(&$out) {
+            for ($i = 0; $i < 400; $i++) {
+                $out[] = $this->_prefix . 'entries/index/page:' . rand(1, 2);
+            }
+            for ($i = 0; $i < 400; $i++) {
+                $out[] = $this->_prefix . 'entries/index/page:' . rand(5, 10);
+            }
+        }
 
-		protected function _generateEntriesMix(&$out) {
-			$entries = $this->Entry->find('all',
-					[
-							'fields' => ['Entry.id'],
-							'conditions' => ['Entry.pid' => 0, 'Category.accession' => 1],
-							'limit' => '500'
-					]);
+        protected function _generateEntriesMix(&$out) {
+            $entries = $this->Entry->find('all',
+                    [
+                            'fields' => ['Entry.id'],
+                            'conditions' => ['Entry.pid' => 0, 'Category.accession' => 1],
+                            'limit' => '500'
+                    ]);
 
-			foreach ($entries as $entry) {
-				$out[] = $this->_prefix . 'entries/mix/' . $entry['Entry']['id'];
-			}
-		}
+            foreach ($entries as $entry) {
+                $out[] = $this->_prefix . 'entries/mix/' . $entry['Entry']['id'];
+            }
+        }
 
-		protected function _generateEntriesView(&$out) {
-			$entries = $this->Entry->find('all',
-					[
-							'fields' => ['Entry.id'],
-							'conditions' => ['Category.accession' => 1],
-							'limit' => '1000'
-					]);
+        protected function _generateEntriesView(&$out) {
+            $entries = $this->Entry->find('all',
+                    [
+                            'fields' => ['Entry.id'],
+                            'conditions' => ['Category.accession' => 1],
+                            'limit' => '1000'
+                    ]);
 
-			foreach ($entries as $entry) {
-				$out[] = $this->_prefix . 'entries/view/' . $entry['Entry']['id'];
-			}
-		}
+            foreach ($entries as $entry) {
+                $out[] = $this->_prefix . 'entries/view/' . $entry['Entry']['id'];
+            }
+        }
 
-	}
+    }
 

app/Controller/AdminsController.php

Doc Comments +8 added lines

@@ -104,6 +104,10 @@ 
 			return $this->_countYearStats(['fields' => ['COUNT(DISTINCT `user_id`) AS `count`']]);
 		}
 
+		/**
+		 * @param string $model
+		 * @param string $field
+		 */
 		protected function _getYearStats($model, $field) {
 			return $this->_countYearStats(['fields' => ['COUNT(*) AS `count`']],
 					[], $model, $field);
@@ -147,6 +151,10 @@ 
 			return $this->_wrapData($data);
 		}
 
+		/**
+		 * @param string $model
+		 * @param string $field
+		 */
 		protected function _getMonthStats($model, $field) {
 			$results = $this->_countYearStats(
 					['fields' => ['COUNT(*) AS `count`']],

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
 			// order here is output order in frontend
 			$_logsToRead = ['error', 'debug'];
 
-			$_logsToRead = glob(LOGS . '*.log');
+			$_logsToRead = glob(LOGS.'*.log');
 			if (!$_logsToRead) {
 				return;
 			}
@@ -142,7 +142,7 @@ 
 			$results = Hash::extract($results, '{n}.{n}');
 			$data = [];
 			foreach ($results as $d) {
-				$data[] = [(string)$d['date'], $d['count']];
+				$data[] = [(string) $d['date'], $d['count']];
 			}
 			return $this->_wrapData($data);
 		}
@@ -162,9 +162,9 @@ 
 			$diff = [];
 			$sum = 0;
 			foreach ($results as $reg) {
-				$sum += (int)$reg[0]['count'];
+				$sum += (int) $reg[0]['count'];
 				$cumulated[] = array($reg[0]['date'] * 1000, $sum);
-				$diff[] = array($reg[0]['date'] * 1000, (int)$reg[0]['count']);
+				$diff[] = array($reg[0]['date'] * 1000, (int) $reg[0]['count']);
 			}
 			return [
 					$this->_wrapData($diff, ['label' => __('New')]),

Indentation +174 added lines, -174 removed lines

@@ -1,176 +1,176 @@
 <?php
 
-	App::uses('AppController', 'Controller');
-
-	class AdminsController extends AppController {
-
-		public $name = 'Admins';
-
-		public $helpers = ['Admin', 'Flot', 'Sitemap.Sitemap'];
-
-		public function admin_index() {
-		}
-
-		/**
-		 * Show PHP-info
-		 *
-		 * @return void
-		 */
-		public function admin_phpinfo() {
-		}
-
-		public function admin_logs() {
-			// order here is output order in frontend
-			$_logsToRead = ['error', 'debug'];
-
-			$_logsToRead = glob(LOGS . '*.log');
-			if (!$_logsToRead) {
-				return;
-			}
-
-			// will contain ['error' => '<string>', 'debug' => '<string>']
-			$_logs = [];
-			foreach ($_logsToRead as $_path) {
-				$_content = '';
-				$_size = filesize($_path);
-				$_content = file_get_contents($_path, false, null, $_size - 65536);
-				$name = basename($_path);
-				$_logs[$name] = $_content;
-			}
-			$this->set('logs', $_logs);
-		}
-
-		public function admin_plugins() {
-		}
-
-		public function admin_stats() {
-			$postingsPA = $this->_getYearStats('Entry', 'time');
-			$registrationsPA = $this->_getYearStats('User', 'registered');
-			$activeUserPA = $this->_getUserWithPostingsPerYear();
-			$averagePostingsPerUserPA = $this->_getAveragePPU($postingsPA,
-					$activeUserPA);
-			$this->set(compact('averagePostingsPerUserPA',
-					'postingsPA', 'activeUserPA', 'registrationsPA'));
-			$this->set('categoryPostingsPA', $this->_getCategoriesPerYear());
-		}
-
-		public function admin_stats_details() {
-			$this->set('registrations',
-					$this->_getMonthStats('User', 'registered'));
-			$this->set('entries', $this->_getMonthStats('Entry', 'time'));
-		}
-
-		protected function _getAveragePPU($postingsPerYear, $activeUserPerYear) {
-			if (empty($postingsPerYear) || empty($activeUserPerYear)) {
-				return false;
-			}
-			$avgPostingsPerUser = [];
-			foreach ($postingsPerYear['data'] as $key => $data) {
-				list($year, $postings) = $data;
-				$activeUsers = $activeUserPerYear['data'][$key][1];
-				$avgPostingsPerUser[] = [$year, $postings / $activeUsers];
-			}
-			return $this->_wrapData($avgPostingsPerUser);
-		}
-
-		protected function _getCategoriesPerYear() {
-			$results = $this->_countYearStats([
-							'contain' => ['Category'],
-							'fields' => ['COUNT(*) AS `count`', 'Category.category'],
-							'group' => ['Category.category']
-					],
-					['raw' => true]
-			);
-			if (empty($results)) {
-				return false;
-			}
-			$data = [];
-			foreach ($results as $dataset) {
-				$category = $dataset['Category']['category'];
-				$data[$category][] = [$dataset[0]['date'], $dataset[0]['count']];
-			}
-			$out = [];
-			foreach ($data as $category => $dataset) {
-				$out[] = $this->_wrapData($dataset, ['label' => $category]);
-			}
-			return $out;
-		}
-
-		protected function _wrapData(&$data, array $options = []) {
-			return ['data' => $data] + $options;
-		}
-
-		protected function _getUserWithPostingsPerYear() {
-			return $this->_countYearStats(['fields' => ['COUNT(DISTINCT `user_id`) AS `count`']]);
-		}
-
-		protected function _getYearStats($model, $field) {
-			return $this->_countYearStats(['fields' => ['COUNT(*) AS `count`']],
-					[], $model, $field);
-		}
-
-		protected function _countYearStats($query, $params = [], $model = 'Entry', $field = 'time') {
-			$params += [
-					'raw' => false,
-					'resolution' => 'year'
-			];
-
-			$defaults = [
-					'contain' => false,
-					'fields' => ["YEAR({$field}) as `date`"],
-					'group' => ["YEAR({$field}) ASC"]
-			];
-			if ($params['resolution'] === 'month') {
-				$defaults['fields'] = "UNIX_TIMESTAMP(CONCAT(YEAR({$field}), '-', MONTH({$field}), '-01')) as `date`";
-				$defaults['group'][] = "MONTH({$field}) ASC";
-			}
-			$query = array_merge_recursive($query, $defaults);
-			if (empty($this->$model)) {
-				$this->loadModel($model);
-			}
-			$results = $this->$model->find('all', $query);
-
-			$periods = count($results);
-			if (empty($results) || $periods < 2) {
-				return false;
-			}
-
-			if ($params['raw']) {
-				return $results;
-			}
-
-			$results = Hash::extract($results, '{n}.{n}');
-			$data = [];
-			foreach ($results as $d) {
-				$data[] = [(string)$d['date'], $d['count']];
-			}
-			return $this->_wrapData($data);
-		}
-
-		protected function _getMonthStats($model, $field) {
-			$results = $this->_countYearStats(
-					['fields' => ['COUNT(*) AS `count`']],
-					['raw' => true, 'resolution' => 'month'],
-					$model,
-					$field);
-
-			if (empty($results)) {
-				return false;
-			}
-
-			$cumulated = [];
-			$diff = [];
-			$sum = 0;
-			foreach ($results as $reg) {
-				$sum += (int)$reg[0]['count'];
-				$cumulated[] = array($reg[0]['date'] * 1000, $sum);
-				$diff[] = array($reg[0]['date'] * 1000, (int)$reg[0]['count']);
-			}
-			return [
-					$this->_wrapData($diff, ['label' => __('New')]),
-					$this->_wrapData($cumulated,
-							['yaxis' => 2, 'label' => __('Cumulated')])
-			];
-		}
-
-	}
+    App::uses('AppController', 'Controller');
+
+    class AdminsController extends AppController {
+
+        public $name = 'Admins';
+
+        public $helpers = ['Admin', 'Flot', 'Sitemap.Sitemap'];
+
+        public function admin_index() {
+        }
+
+        /**
+         * Show PHP-info
+         *
+         * @return void
+         */
+        public function admin_phpinfo() {
+        }
+
+        public function admin_logs() {
+            // order here is output order in frontend
+            $_logsToRead = ['error', 'debug'];
+
+            $_logsToRead = glob(LOGS . '*.log');
+            if (!$_logsToRead) {
+                return;
+            }
+
+            // will contain ['error' => '<string>', 'debug' => '<string>']
+            $_logs = [];
+            foreach ($_logsToRead as $_path) {
+                $_content = '';
+                $_size = filesize($_path);
+                $_content = file_get_contents($_path, false, null, $_size - 65536);
+                $name = basename($_path);
+                $_logs[$name] = $_content;
+            }
+            $this->set('logs', $_logs);
+        }
+
+        public function admin_plugins() {
+        }
+
+        public function admin_stats() {
+            $postingsPA = $this->_getYearStats('Entry', 'time');
+            $registrationsPA = $this->_getYearStats('User', 'registered');
+            $activeUserPA = $this->_getUserWithPostingsPerYear();
+            $averagePostingsPerUserPA = $this->_getAveragePPU($postingsPA,
+                    $activeUserPA);
+            $this->set(compact('averagePostingsPerUserPA',
+                    'postingsPA', 'activeUserPA', 'registrationsPA'));
+            $this->set('categoryPostingsPA', $this->_getCategoriesPerYear());
+        }
+
+        public function admin_stats_details() {
+            $this->set('registrations',
+                    $this->_getMonthStats('User', 'registered'));
+            $this->set('entries', $this->_getMonthStats('Entry', 'time'));
+        }
+
+        protected function _getAveragePPU($postingsPerYear, $activeUserPerYear) {
+            if (empty($postingsPerYear) || empty($activeUserPerYear)) {
+                return false;
+            }
+            $avgPostingsPerUser = [];
+            foreach ($postingsPerYear['data'] as $key => $data) {
+                list($year, $postings) = $data;
+                $activeUsers = $activeUserPerYear['data'][$key][1];
+                $avgPostingsPerUser[] = [$year, $postings / $activeUsers];
+            }
+            return $this->_wrapData($avgPostingsPerUser);
+        }
+
+        protected function _getCategoriesPerYear() {
+            $results = $this->_countYearStats([
+                            'contain' => ['Category'],
+                            'fields' => ['COUNT(*) AS `count`', 'Category.category'],
+                            'group' => ['Category.category']
+                    ],
+                    ['raw' => true]
+            );
+            if (empty($results)) {
+                return false;
+            }
+            $data = [];
+            foreach ($results as $dataset) {
+                $category = $dataset['Category']['category'];
+                $data[$category][] = [$dataset[0]['date'], $dataset[0]['count']];
+            }
+            $out = [];
+            foreach ($data as $category => $dataset) {
+                $out[] = $this->_wrapData($dataset, ['label' => $category]);
+            }
+            return $out;
+        }
+
+        protected function _wrapData(&$data, array $options = []) {
+            return ['data' => $data] + $options;
+        }
+
+        protected function _getUserWithPostingsPerYear() {
+            return $this->_countYearStats(['fields' => ['COUNT(DISTINCT `user_id`) AS `count`']]);
+        }
+
+        protected function _getYearStats($model, $field) {
+            return $this->_countYearStats(['fields' => ['COUNT(*) AS `count`']],
+                    [], $model, $field);
+        }
+
+        protected function _countYearStats($query, $params = [], $model = 'Entry', $field = 'time') {
+            $params += [
+                    'raw' => false,
+                    'resolution' => 'year'
+            ];
+
+            $defaults = [
+                    'contain' => false,
+                    'fields' => ["YEAR({$field}) as `date`"],
+                    'group' => ["YEAR({$field}) ASC"]
+            ];
+            if ($params['resolution'] === 'month') {
+                $defaults['fields'] = "UNIX_TIMESTAMP(CONCAT(YEAR({$field}), '-', MONTH({$field}), '-01')) as `date`";
+                $defaults['group'][] = "MONTH({$field}) ASC";
+            }
+            $query = array_merge_recursive($query, $defaults);
+            if (empty($this->$model)) {
+                $this->loadModel($model);
+            }
+            $results = $this->$model->find('all', $query);
+
+            $periods = count($results);
+            if (empty($results) || $periods < 2) {
+                return false;
+            }
+
+            if ($params['raw']) {
+                return $results;
+            }
+
+            $results = Hash::extract($results, '{n}.{n}');
+            $data = [];
+            foreach ($results as $d) {
+                $data[] = [(string)$d['date'], $d['count']];
+            }
+            return $this->_wrapData($data);
+        }
+
+        protected function _getMonthStats($model, $field) {
+            $results = $this->_countYearStats(
+                    ['fields' => ['COUNT(*) AS `count`']],
+                    ['raw' => true, 'resolution' => 'month'],
+                    $model,
+                    $field);
+
+            if (empty($results)) {
+                return false;
+            }
+
+            $cumulated = [];
+            $diff = [];
+            $sum = 0;
+            foreach ($results as $reg) {
+                $sum += (int)$reg[0]['count'];
+                $cumulated[] = array($reg[0]['date'] * 1000, $sum);
+                $diff[] = array($reg[0]['date'] * 1000, (int)$reg[0]['count']);
+            }
+            return [
+                    $this->_wrapData($diff, ['label' => __('New')]),
+                    $this->_wrapData($cumulated,
+                            ['yaxis' => 2, 'label' => __('Cumulated')])
+            ];
+        }
+
+    }

app/Controller/Component/Auth/Mlf2PasswordHasher.php

Doc Comments +3 added lines

@@ -15,6 +15,9 @@
 			return $hashWithSalt;
 		}
 
+		/**
+		 * @param integer $maxLength
+		 */
 		protected static function _generateRandomString($maxLength = null) {
 			$string = Security::generateAuthKey();
 			if ($maxLength) {

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,8 @@ 
 		public function hash($password) {
 			// compare to includes/functions.inc.php generate_pw_hash() mlf 2.3
 			$salt = self::_generateRandomString(10);
-			$saltedHash = sha1($password . $salt);
-			$hashWithSalt = $saltedHash . $salt;
+			$saltedHash = sha1($password.$salt);
+			$hashWithSalt = $saltedHash.$salt;
 			return $hashWithSalt;
 		}
 
@@ -28,7 +28,7 @@ 
 			// compare to includes/functions.inc.php is_pw_correct() mlf 2.3
 			$saltedHash = substr($hash, 0, 40);
 			$salt = substr($hash, 40, 10);
-			if (sha1($password . $salt) == $saltedHash) :
+			if (sha1($password.$salt) == $saltedHash) :
 				$out = true;
 			endif;
 			return $out;

Indentation +27 added lines, -27 removed lines

@@ -1,37 +1,37 @@
 <?php
 
-	App::uses('AbstractPasswordHasher', 'Controller/Component/Auth');
+    App::uses('AbstractPasswordHasher', 'Controller/Component/Auth');
 
 /**
  * mylittleforum 2.x salted sha1 passwords
  */
-	class Mlf2PasswordHasher extends AbstractPasswordHasher {
+    class Mlf2PasswordHasher extends AbstractPasswordHasher {
 
-		public function hash($password) {
-			// compare to includes/functions.inc.php generate_pw_hash() mlf 2.3
-			$salt = self::_generateRandomString(10);
-			$saltedHash = sha1($password . $salt);
-			$hashWithSalt = $saltedHash . $salt;
-			return $hashWithSalt;
-		}
+        public function hash($password) {
+            // compare to includes/functions.inc.php generate_pw_hash() mlf 2.3
+            $salt = self::_generateRandomString(10);
+            $saltedHash = sha1($password . $salt);
+            $hashWithSalt = $saltedHash . $salt;
+            return $hashWithSalt;
+        }
 
-		protected static function _generateRandomString($maxLength = null) {
-			$string = Security::generateAuthKey();
-			if ($maxLength) {
-				$string = substr($string, 0, $maxLength);
-			}
-			return $string;
-		}
+        protected static function _generateRandomString($maxLength = null) {
+            $string = Security::generateAuthKey();
+            if ($maxLength) {
+                $string = substr($string, 0, $maxLength);
+            }
+            return $string;
+        }
 
-		public function check($password, $hash) {
-			$out = false;
-			// compare to includes/functions.inc.php is_pw_correct() mlf 2.3
-			$saltedHash = substr($hash, 0, 40);
-			$salt = substr($hash, 40, 10);
-			if (sha1($password . $salt) == $saltedHash) :
-				$out = true;
-			endif;
-			return $out;
-		}
+        public function check($password, $hash) {
+            $out = false;
+            // compare to includes/functions.inc.php is_pw_correct() mlf 2.3
+            $saltedHash = substr($hash, 0, 40);
+            $salt = substr($hash, 40, 10);
+            if (sha1($password . $salt) == $saltedHash) :
+                $out = true;
+            endif;
+            return $out;
+        }
 
-	}
+    }

app/Controller/Component/CurrentUserComponent.php

Doc Comments +1 added lines

@@ -268,6 +268,7 @@
 
 /**
  * write the settings to the session, so that they are available on next request
+ * @param Controller $controller
  */
 		protected function _writeSession(&$controller) {
 			if ($controller->action !== 'logout' && $controller->Auth->user()):

Indentation +254 added lines, -254 removed lines

@@ -1,318 +1,318 @@
 <?php
 
-	use Saito\User\Auth\CategoryAuthorization;
-	use Saito\User\Bookmarks;
-	use Saito\User\ForumsUserInterface;
-	use Saito\User\LastRefresh;
-	use Saito\User\ReadPostings;
-	use Saito\User\SaitoUserTrait;
+    use Saito\User\Auth\CategoryAuthorization;
+    use Saito\User\Bookmarks;
+    use Saito\User\ForumsUserInterface;
+    use Saito\User\LastRefresh;
+    use Saito\User\ReadPostings;
+    use Saito\User\SaitoUserTrait;
 
-	App::uses('Component', 'Controller');
+    App::uses('Component', 'Controller');
 
-	class CurrentUserComponent extends Component implements
-		ArrayAccess,
-		ForumsUserInterface {
+    class CurrentUserComponent extends Component implements
+        ArrayAccess,
+        ForumsUserInterface {
 
-		use SaitoUserTrait;
+        use SaitoUserTrait;
 
-		/**
-		 * @var Saito\User\Auth\CategoryAuthorization
-		 */
-		public $Categories;
+        /**
+         * @var Saito\User\Auth\CategoryAuthorization
+         */
+        public $Categories;
 
 /**
  * Component name
  *
  * @var string
  */
-		public $name = 'CurrentUser';
+        public $name = 'CurrentUser';
 
 /**
  * Component's components
  *
  * @var array
  */
-		public $components = ['Cookie', 'Cron.Cron'];
+        public $components = ['Cookie', 'Cron.Cron'];
 
 /**
  * Manages the persistent login cookie
  *
  * @var \Saito\User\Cookie\CurrentUserCookie
  */
-		public $PersistentCookie = null;
+        public $PersistentCookie = null;
 
 /**
  * Manages the last refresh/mark entries as read for the current user
  *
  * @var \Saito\User\LastRefresh\LastRefreshAbstract
  */
-		public $LastRefresh = null;
+        public $LastRefresh = null;
 
-	/**
-	 * @var ReadPostings
-	 */
-		public $ReadEntries;
+    /**
+     * @var ReadPostings
+     */
+        public $ReadEntries;
 
-		/**
-		 * @var Bookmarks bookmarks of the current user
-		 */
-		protected $_Bookmarks;
+        /**
+         * @var Bookmarks bookmarks of the current user
+         */
+        protected $_Bookmarks;
 
 /**
  * Model User instance exclusive to the CurrentUserComponent
  *
  * @var User
  */
-		protected $_User = null;
+        protected $_User = null;
 
 /**
  * Reference to the controller
  *
  * @var Controller
  */
-		protected $_Controller = null;
+        protected $_Controller = null;
 
-		public function initialize(Controller $Controller) {
-			if ($Controller->name === 'CakeError') {
-				return;
-			}
+        public function initialize(Controller $Controller) {
+            if ($Controller->name === 'CakeError') {
+                return;
+            }
 
-			$this->_Controller = $Controller;
-			if ($this->_Controller->modelClass) {
-				$this->_Controller->{$this->_Controller->modelClass}->SharedObjects['CurrentUser'] = $this;
-			}
-			$this->Categories = new CategoryAuthorization($this);
+            $this->_Controller = $Controller;
+            if ($this->_Controller->modelClass) {
+                $this->_Controller->{$this->_Controller->modelClass}->SharedObjects['CurrentUser'] = $this;
+            }
+            $this->Categories = new CategoryAuthorization($this);
 
-			$this->_Controller->dic->set('CU', $this);
+            $this->_Controller->dic->set('CU', $this);
 
-			/*
+            /*
 			 * We create a new User Model instance. Otherwise we would overwrite $this->request->data
 			 * when reading in refresh(), causing error e.g. saving the user prefs.
 			 */
-			$this->_User = ClassRegistry::init(
-					['class' => 'User', 'alias' => 'currentUser']
-			);
-
-			$this->PersistentCookie = new \Saito\User\Cookie\CurrentUserCookie($this->Cookie, 'AU');
-
-			$this->_configureAuth();
-
-			// prevents session auto re-login from form's request->data: login is
-			// called explicitly by controller on /users/login
-			if ($this->_Controller->action !== 'login') {
-				if (!$this->_reLoginSession()) {
-					// don't auto-login on login related pages
-					if ($this->_Controller->params['action'] !== 'login' &&
-							$this->_Controller->params['action'] !== 'register' &&
-							$this->_Controller->referer() !== '/users/login'
-					) {
-						$this->_reLoginCookie();
-					}
-				}
-			}
-
-			if ($this->isLoggedIn()) {
-				$this->ReadEntries = new ReadPostings\ReadPostingsDatabase($this);
-			} elseif ($this->isBot()) {
-				$this->ReadEntries = new ReadPostings\ReadPostingsDummy($this);
-			} else {
-				$this->ReadEntries = new ReadPostings\ReadPostingsCookie($this);
-			}
-
-			$this->_Bookmarks = new Bookmarks($this);
-
-			$this->_markOnline();
-		}
-
-		public function startup(Controller $controller) {
-			parent::startup($controller);
-
-			if ($controller->action !== 'logout' && $this->isLoggedIn()) :
-				if ($this->isForbidden()) :
-					$this->_Controller->redirect(
-						['controller' => 'users', 'action' => 'logout']
-					);
-				endif;
-			endif;
-		}
+            $this->_User = ClassRegistry::init(
+                    ['class' => 'User', 'alias' => 'currentUser']
+            );
+
+            $this->PersistentCookie = new \Saito\User\Cookie\CurrentUserCookie($this->Cookie, 'AU');
+
+            $this->_configureAuth();
+
+            // prevents session auto re-login from form's request->data: login is
+            // called explicitly by controller on /users/login
+            if ($this->_Controller->action !== 'login') {
+                if (!$this->_reLoginSession()) {
+                    // don't auto-login on login related pages
+                    if ($this->_Controller->params['action'] !== 'login' &&
+                            $this->_Controller->params['action'] !== 'register' &&
+                            $this->_Controller->referer() !== '/users/login'
+                    ) {
+                        $this->_reLoginCookie();
+                    }
+                }
+            }
+
+            if ($this->isLoggedIn()) {
+                $this->ReadEntries = new ReadPostings\ReadPostingsDatabase($this);
+            } elseif ($this->isBot()) {
+                $this->ReadEntries = new ReadPostings\ReadPostingsDummy($this);
+            } else {
+                $this->ReadEntries = new ReadPostings\ReadPostingsCookie($this);
+            }
+
+            $this->_Bookmarks = new Bookmarks($this);
+
+            $this->_markOnline();
+        }
+
+        public function startup(Controller $controller) {
+            parent::startup($controller);
+
+            if ($controller->action !== 'logout' && $this->isLoggedIn()) :
+                if ($this->isForbidden()) :
+                    $this->_Controller->redirect(
+                        ['controller' => 'users', 'action' => 'logout']
+                    );
+                endif;
+            endif;
+        }
 
 /**
  * Marks users as online
  */
-		protected function _markOnline() {
-			Stopwatch::start('CurrentUser->_markOnline()');
-			$_isLoggedIn = $this->isLoggedIn();
-			if ($_isLoggedIn) {
-				$_id = $this->getId();
-			} else {
-				// don't count search bots as guests
-				if ($this->isBot()) {
-					return;
-				}
-				$_id = $this->_Controller->Session->id();
-			}
-			$this->_User->UserOnline->setOnline($_id, $_isLoggedIn);
-			Stopwatch::stop('CurrentUser->_markOnline()');
-		}
-
-		/**
-		 * Detects if the current user is a bot
-		 *
-		 * @return boolean
-		 */
-		public function isBot() {
-			return $this->_Controller->request->is('bot');
-		}
-
-		/**
-		 * Logs-in registered users
-		 *
-		 * @param null|array $user user-data, if null request-data is used
-		 * @return bool true if user is logged in false otherwise
-		 */
-		protected function _login($user = null) {
-			$this->_Controller->Auth->login($user);
-			$this->refresh();
-			return $this->isLoggedIn();
-		}
-
-		protected function _reLoginSession() {
-			return $this->_login();
-		}
-
-		protected function _reLoginCookie() {
-			$cookie = $this->PersistentCookie->read();
-			if ($cookie) {
-				$this->_login($cookie);
-				return $this->isLoggedIn();
-			}
-			return false;
-		}
-
-		public function login() {
-			// non-logged in session-id is lost after successful login
-			$sessionId = session_id();
-
-			if (!$this->_login()) {
-				return false;
-			}
-
-			$this->_User->incrementLogins($this->getId());
-			$this->_User->UserOnline->setOffline($sessionId);
-			//password update
-			if (empty($this->_Controller->request->data['User']['password']) === false) {
-				$this->_User->autoUpdatePassword(
-					$this->getId(),
-					$this->_Controller->request->data['User']['password']
-				);
-			}
-
-			// set cookie
-			if (empty($this->_Controller->request->data['User']['remember_me']) === false) {
-				$this->PersistentCookie->write($this);
-			};
-
-			return true;
-		}
-
-		/**
-		 * Sets user-data
-		 */
-		public function refresh() {
-			// preliminary set user-data from Cake's Auth handler
-			$this->setSettings($this->_Controller->Auth->user());
-			// set user-data from current DB data: ensures that *all sessions*
-			// use the same set of data (user got locked, user-type was demoted …)
-			if ($this->isLoggedIn()) {
-				$this->_User->id = $this->getId();
-				$this->setSettings($this->_User->getProfile($this->getId()));
-				$this->LastRefresh = new LastRefresh\LastRefreshDatabase($this);
-			} elseif ($this->isBot()) {
-				$this->LastRefresh = new LastRefresh\LastRefreshDummy($this);
-			} else {
-				$this->LastRefresh = new LastRefresh\LastRefreshCookie($this);
-			}
-		}
-
-		public function logout() {
-			if (!$this->isLoggedIn()) {
-				return;
-			}
-			$this->PersistentCookie->delete();
-			$this->_User->id = $this->getId();
-			$this->_User->UserOnline->setOffline($this->getId());
-			$this->setSettings(null);
-			$this->_Controller->Auth->logout();
-		}
-
-		public function shutdown(Controller $Controller) {
-			$this->_writeSession($Controller);
-		}
-
-		public function beforeRedirect(Controller $Controller, $url, $status = null, $exit = true) {
-			$this->_writeSession($Controller);
-		}
-
-		public function beforeRender(Controller $Controller) {
-			// write out the current user for access in the views
-			$Controller->set('CurrentUser', $this);
-		}
-
-		public function getModel() {
-			return $this->_User;
-		}
-
-		public function hasBookmarked($entryId) {
-			return $this->_Bookmarks->isBookmarked($entryId);
-		}
+        protected function _markOnline() {
+            Stopwatch::start('CurrentUser->_markOnline()');
+            $_isLoggedIn = $this->isLoggedIn();
+            if ($_isLoggedIn) {
+                $_id = $this->getId();
+            } else {
+                // don't count search bots as guests
+                if ($this->isBot()) {
+                    return;
+                }
+                $_id = $this->_Controller->Session->id();
+            }
+            $this->_User->UserOnline->setOnline($_id, $_isLoggedIn);
+            Stopwatch::stop('CurrentUser->_markOnline()');
+        }
+
+        /**
+         * Detects if the current user is a bot
+         *
+         * @return boolean
+         */
+        public function isBot() {
+            return $this->_Controller->request->is('bot');
+        }
+
+        /**
+         * Logs-in registered users
+         *
+         * @param null|array $user user-data, if null request-data is used
+         * @return bool true if user is logged in false otherwise
+         */
+        protected function _login($user = null) {
+            $this->_Controller->Auth->login($user);
+            $this->refresh();
+            return $this->isLoggedIn();
+        }
+
+        protected function _reLoginSession() {
+            return $this->_login();
+        }
+
+        protected function _reLoginCookie() {
+            $cookie = $this->PersistentCookie->read();
+            if ($cookie) {
+                $this->_login($cookie);
+                return $this->isLoggedIn();
+            }
+            return false;
+        }
+
+        public function login() {
+            // non-logged in session-id is lost after successful login
+            $sessionId = session_id();
+
+            if (!$this->_login()) {
+                return false;
+            }
+
+            $this->_User->incrementLogins($this->getId());
+            $this->_User->UserOnline->setOffline($sessionId);
+            //password update
+            if (empty($this->_Controller->request->data['User']['password']) === false) {
+                $this->_User->autoUpdatePassword(
+                    $this->getId(),
+                    $this->_Controller->request->data['User']['password']
+                );
+            }
+
+            // set cookie
+            if (empty($this->_Controller->request->data['User']['remember_me']) === false) {
+                $this->PersistentCookie->write($this);
+            };
+
+            return true;
+        }
+
+        /**
+         * Sets user-data
+         */
+        public function refresh() {
+            // preliminary set user-data from Cake's Auth handler
+            $this->setSettings($this->_Controller->Auth->user());
+            // set user-data from current DB data: ensures that *all sessions*
+            // use the same set of data (user got locked, user-type was demoted …)
+            if ($this->isLoggedIn()) {
+                $this->_User->id = $this->getId();
+                $this->setSettings($this->_User->getProfile($this->getId()));
+                $this->LastRefresh = new LastRefresh\LastRefreshDatabase($this);
+            } elseif ($this->isBot()) {
+                $this->LastRefresh = new LastRefresh\LastRefreshDummy($this);
+            } else {
+                $this->LastRefresh = new LastRefresh\LastRefreshCookie($this);
+            }
+        }
+
+        public function logout() {
+            if (!$this->isLoggedIn()) {
+                return;
+            }
+            $this->PersistentCookie->delete();
+            $this->_User->id = $this->getId();
+            $this->_User->UserOnline->setOffline($this->getId());
+            $this->setSettings(null);
+            $this->_Controller->Auth->logout();
+        }
+
+        public function shutdown(Controller $Controller) {
+            $this->_writeSession($Controller);
+        }
+
+        public function beforeRedirect(Controller $Controller, $url, $status = null, $exit = true) {
+            $this->_writeSession($Controller);
+        }
+
+        public function beforeRender(Controller $Controller) {
+            // write out the current user for access in the views
+            $Controller->set('CurrentUser', $this);
+        }
+
+        public function getModel() {
+            return $this->_User;
+        }
+
+        public function hasBookmarked($entryId) {
+            return $this->_Bookmarks->isBookmarked($entryId);
+        }
 
 /**
  * write the settings to the session, so that they are available on next request
  */
-		protected function _writeSession(&$controller) {
-			if ($controller->action !== 'logout' && $controller->Auth->user()):
-				$controller->Session->write(
-					'Auth.User',
-					$this->getSettings()
-				);
-			endif;
-		}
+        protected function _writeSession(&$controller) {
+            if ($controller->action !== 'logout' && $controller->Auth->user()):
+                $controller->Session->write(
+                    'Auth.User',
+                    $this->getSettings()
+                );
+            endif;
+        }
 
 /**
  * Configures the auth component
  */
-		protected function _configureAuth() {
-			// delegate authenticate method
-			// $this->_Controller->Auth->authenticate = $this->_User;
-
-			$this->_Controller->Auth->authenticate = [
-				AuthComponent::ALL => [
-					'useModel' => 'User',
-					'contain' => false,
-					'scope' => [
-						// user has activated his account (e.g. email confirmation)
-						'User.activate_code' => 0,
-						// user is not banned by admin or mod
-						'User.user_lock' => 0
-					]
-				],
-				// 'Mlf' and 'Mlf2' could be 'Form' with different passwordHasher, but
-				// see: https://cakephp.lighthouseapp.com/projects/42648/tickets/3907-allow-multiple-passwordhasher-with-same-authenticate-class-in-auth-config#ticket-3907-1
-				'Mlf', // mylittleforum 1 auth
-				'Mlf2', // mylittleforum 2 auth
-				'Form' => ['passwordHasher' => 'Blowfish'] // blowfish saito standard
-			];
-
-			if ($this->isLoggedIn()):
-				$this->_Controller->Auth->allow();
-			else:
-				$this->_Controller->Auth->deny();
-			endif;
-
-			$this->_Controller->Auth->autoRedirect = false; // don't redirect after Auth->login()
-			$this->_Controller->Auth->allow('display'); // access to static pages in views/pages is allowed
-			$this->_Controller->Auth->authError = __('auth_autherror'); // l10n
-		}
-
-	}
+        protected function _configureAuth() {
+            // delegate authenticate method
+            // $this->_Controller->Auth->authenticate = $this->_User;
+
+            $this->_Controller->Auth->authenticate = [
+                AuthComponent::ALL => [
+                    'useModel' => 'User',
+                    'contain' => false,
+                    'scope' => [
+                        // user has activated his account (e.g. email confirmation)
+                        'User.activate_code' => 0,
+                        // user is not banned by admin or mod
+                        'User.user_lock' => 0
+                    ]
+                ],
+                // 'Mlf' and 'Mlf2' could be 'Form' with different passwordHasher, but
+                // see: https://cakephp.lighthouseapp.com/projects/42648/tickets/3907-allow-multiple-passwordhasher-with-same-authenticate-class-in-auth-config#ticket-3907-1
+                'Mlf', // mylittleforum 1 auth
+                'Mlf2', // mylittleforum 2 auth
+                'Form' => ['passwordHasher' => 'Blowfish'] // blowfish saito standard
+            ];
+
+            if ($this->isLoggedIn()):
+                $this->_Controller->Auth->allow();
+            else:
+                $this->_Controller->Auth->deny();
+            endif;
+
+            $this->_Controller->Auth->autoRedirect = false; // don't redirect after Auth->login()
+            $this->_Controller->Auth->allow('display'); // access to static pages in views/pages is allowed
+            $this->_Controller->Auth->authError = __('auth_autherror'); // l10n
+        }
+
+    }
 

Braces +3 added lines, -1 removed lines

@@ -305,8 +305,10 @@
 
 			if ($this->isLoggedIn()):
 				$this->_Controller->Auth->allow();
-			else:
+			else {
+			    :
 				$this->_Controller->Auth->deny();
+			}
 			endif;
 
 			$this->_Controller->Auth->autoRedirect = false; // don't redirect after Auth->login()

app/Controller/Component/SaitoEmailComponent.php

Doc Comments +3 added lines

@@ -203,6 +203,9 @@
 			$this->_CakeEmail->config('saito');
 		}
 
+		/**
+		 * @param string $type
+		 */
 		public function getPredefinedSender($type) {
 			$this->_init();
 			return ['User' => [

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 				}
 			}
 
-			$this->_emailConfigExists = file_exists(APP . 'Config' . DS . 'email' . '.php');
+			$this->_emailConfigExists = file_exists(APP.'Config'.DS.'email'.'.php');
 
 			$this->_forumName = Configure::read('Saito.Settings.forum_name');
 
@@ -112,7 +112,7 @@ 
 		protected function _config($params = []) {
 			$defaults = [
 				'viewVars' => [
-					'webroot' => Router::fullBaseUrl() . $this->_webroot,
+					'webroot' => Router::fullBaseUrl().$this->_webroot,
 				],
 			];
 			$params = array_merge_recursive($defaults, $params);

Indentation +255 added lines, -255 removed lines

@@ -1,79 +1,79 @@ 
 <?php
 
-	App::uses('Component', 'Controller');
-	App::uses('CakeEmail', 'Network/Email');
+    App::uses('Component', 'Controller');
+    App::uses('CakeEmail', 'Network/Email');
 
-	class SaitoEmailComponent extends Component {
+    class SaitoEmailComponent extends Component {
 
-		protected $_emailConfigExists = null;
+        protected $_emailConfigExists = null;
 
-		protected $_User = null;
+        protected $_User = null;
 
-		protected $_config = array();
+        protected $_config = array();
 
-		protected $_viewVars = array();
+        protected $_viewVars = array();
 
-		/**
-		 * @var array ['User' => ['username' => , 'user_email' =>]
-		 */
-		protected $_recipient = null;
+        /**
+         * @var array ['User' => ['username' => , 'user_email' =>]
+         */
+        protected $_recipient = null;
 
-		/**
-		 * @var array ['User' => ['username' => , 'user_email' =>]
-		 */
-		protected $_sender = null;
+        /**
+         * @var array ['User' => ['username' => , 'user_email' =>]
+         */
+        protected $_sender = null;
 
-		/**
-		 * @var CakeEmail
-		 */
-		protected $_CakeEmail;
+        /**
+         * @var CakeEmail
+         */
+        protected $_CakeEmail;
 
-		protected $_webroot;
+        protected $_webroot;
 
-		protected $_appAddress;
+        protected $_appAddress;
 
-		protected $_addresses;
+        protected $_addresses;
 
-		protected $_forumName;
+        protected $_forumName;
 
-		protected $_headerSent;
+        protected $_headerSent;
 
-		protected $_predefined = ['contact', 'main', 'register', 'system'];
+        protected $_predefined = ['contact', 'main', 'register', 'system'];
 
-		public function startup(Controller $Controller) {
-			$this->_webroot = $Controller->request->webroot;
-			$this->_User = $Controller->User;
-		}
+        public function startup(Controller $Controller) {
+            $this->_webroot = $Controller->request->webroot;
+            $this->_User = $Controller->User;
+        }
 
-		/**
-		 * init only if mail is actually send during request
-		 *
-		 * @throws InvalidArgumentException
-		 */
-		protected function _init() {
-			if ($this->_addresses !== null) {
-				return;
-			}
+        /**
+         * init only if mail is actually send during request
+         *
+         * @throws InvalidArgumentException
+         */
+        protected function _init() {
+            if ($this->_addresses !== null) {
+                return;
+            }
 
-			$this->_addresses = [
-				'main' => Configure::read('Saito.Settings.forum_email'),
-				'contact' => Configure::read('Saito.Settings.email_contact'),
-				'register' => Configure::read('Saito.Settings.email_register'),
-				'system' => Configure::read('Saito.Settings.email_system')
-			];
+            $this->_addresses = [
+                'main' => Configure::read('Saito.Settings.forum_email'),
+                'contact' => Configure::read('Saito.Settings.email_contact'),
+                'register' => Configure::read('Saito.Settings.email_register'),
+                'system' => Configure::read('Saito.Settings.email_system')
+            ];
 
-			foreach ($this->_addresses as $title => $address) {
-				if (empty($address)) {
-					throw new InvalidArgumentException("Email address not set: $title");
-				}
-			}
+            foreach ($this->_addresses as $title => $address) {
+                if (empty($address)) {
+                    throw new InvalidArgumentException("Email address not set: $title");
+                }
+            }
 
-			$this->_emailConfigExists = file_exists(APP . 'Config' . DS . 'email' . '.php');
+            $this->_emailConfigExists = file_exists(APP . 'Config' . DS . 'email' . '.php');
 
-			$this->_forumName = Configure::read('Saito.Settings.forum_name');
+            $this->_forumName = Configure::read('Saito.Settings.forum_name');
 
-			$this->_CakeEmail = new CakeEmail();
-		}
+            $this->_CakeEmail = new CakeEmail();
+        }
 
 /**
  *
@@ -89,172 +89,172 @@ 
  * @param array $options
  * @return array
  */
-		public function email($options = array()) {
-			$this->_init();
-			$this->_resetConfig();
-			$this->_config($options);
-			$result = $this->_send($this->_config, $this->_viewVars);
-
-			if (isset($options['ccsender']) && $options['ccsender'] === true) {
-				$result = $this->_sendCopyToOriginalSender($this->_config,
-					$this->_viewVars);
-			}
-
-			return $result;
-		}
-
-		protected function _resetConfig() {
-			$this->_config = [];
-			$this->_viewVars = [];
-			$this->_CakeEmail->reset();
-		}
-
-		protected function _config($params = []) {
-			$defaults = [
-				'viewVars' => [
-					'webroot' => Router::fullBaseUrl() . $this->_webroot,
-				],
-			];
-			$params = array_merge_recursive($defaults, $params);
-
-			$this->_initConfigFromFile();
-
-			$this->_sender = $this->_getSender($params['sender']);
-			$this->_recipient = $this->_getRecipient($params['recipient']);
-
-			$this->_config = [
-				'from' => $this->_pA($this->_sender,
-						$this->_sender['User']['username']),
-				'to' => $this->_recipient['User']['user_email'],
-				'subject' => $params['subject'],
-				'emailFormat' => 'text',
-			];
-
-			//# set 'sender' header
-			$headerSender = $this->_getHeaderSender();
-			if ($headerSender) {
-				$this->_config['sender'] = $headerSender;
-			}
-
-			if (isset($params['template'])) {
-				$this->_config['template'] = $params['template'];
-			}
-
-			if (isset($params['message'])) {
-				$this->_viewVars['message'] = $params['message'];
-			}
-			$this->_viewVars += $params['viewVars'];
-
-			$this->_configTransport();
-		}
-
-		protected function _configTransport() {
-			if (Configure::read('debug') > 2 || Configure::read('Saito.Debug.email')) {
-				$this->_config['transport'] = 'Debug';
-			};
-			if (Configure::read('debug') > 2) {
-				$this->_config['log'] = true;
-			};
-		}
-
-		protected function _getHeaderSender() {
-			if ($this->_emailConfigExists && $this->_CakeEmail->from()) {
-				// set the forum app address from email.php
-				$hs = $this->_CakeEmail->from();
-
-				// set app address name to forum's name if it's not set in email.php
-				if ((is_array($hs) && key($hs) === current($hs))) {
-					$hs = $this->_pA(key($hs));
-				}
-			} elseif ($this->_headerSent) {
-				$type = $this->_headerSent;
-				$hs = $this->_pA($this->_addresses[$type]);
-			} else {
-				$hs = false;
-			}
-			return $hs;
-		}
-
-		/**
-		 * returns participant array (Cake mail array)
-		 *
-		 * @param $address string with address or ['User']-sender/recipient
-		 * @param $name
-		 * @return array [<address> => <name>]
-		 */
-		protected function _pA($address, $name = null) {
-			if (is_array($address) && isset($address['User'])) {
-				$name = $address['User']['username'];
-				$address = $address['User']['user_email'];
-			}
-			if ($name === null) {
-				$name = $this->_forumName;
-			}
-			return [$address => $name];
-		}
-
-		/**
-		 * set base config from app/config/email.php
-		 */
-		protected function _initConfigFromFile() {
-			if (!$this->_emailConfigExists) {
-				return;
-			}
-			$this->_CakeEmail->config('saito');
-		}
-
-		public function getPredefinedSender($type) {
-			$this->_init();
-			return ['User' => [
-				'username' => $this->_forumName,
-				'user_email' => $this->_addresses[$type]
-			]];
-		}
-
-		protected function _getRecipient($recipient) {
-			return $this->_getParticipant($recipient);
-		}
-
-		protected function _getSender($sender) {
-			if (!is_string($sender) ||
-					!in_array($sender, $this->_predefined)
-			) {
-				// sender-address does not belong to system: is external address
-				// and should be send 'in behalf off'
-				$this->_headerSent = 'system';
-			}
-			return $this->_getParticipant($sender);
-		}
-
-		/**
-		 * @param $value
-		 * @return array
-		 * @throws Exception
-		 */
-		protected function _getParticipant($value) {
-			//# participant-address is valid address
-			if (is_array($value)) {
-				return $value;
-			}
-
-			//# participant-address belongs to system
-			if (is_string($value) &&
-				in_array($value, $this->_predefined)
-			) {
-				return $this->getPredefinedSender($value);
-			}
-
-			//# participant-address belongs to external user
-			$this->_User->id = $value;
-			$this->_User->contain();
-			$participant = $this->_User->read();
-
-			if (empty($participant)) {
-				throw new Exception("Can't find participant for email.");
-			}
-
-			return $participant;
-		}
+        public function email($options = array()) {
+            $this->_init();
+            $this->_resetConfig();
+            $this->_config($options);
+            $result = $this->_send($this->_config, $this->_viewVars);
+
+            if (isset($options['ccsender']) && $options['ccsender'] === true) {
+                $result = $this->_sendCopyToOriginalSender($this->_config,
+                    $this->_viewVars);
+            }
+
+            return $result;
+        }
+
+        protected function _resetConfig() {
+            $this->_config = [];
+            $this->_viewVars = [];
+            $this->_CakeEmail->reset();
+        }
+
+        protected function _config($params = []) {
+            $defaults = [
+                'viewVars' => [
+                    'webroot' => Router::fullBaseUrl() . $this->_webroot,
+                ],
+            ];
+            $params = array_merge_recursive($defaults, $params);
+
+            $this->_initConfigFromFile();
+
+            $this->_sender = $this->_getSender($params['sender']);
+            $this->_recipient = $this->_getRecipient($params['recipient']);
+
+            $this->_config = [
+                'from' => $this->_pA($this->_sender,
+                        $this->_sender['User']['username']),
+                'to' => $this->_recipient['User']['user_email'],
+                'subject' => $params['subject'],
+                'emailFormat' => 'text',
+            ];
+
+            //# set 'sender' header
+            $headerSender = $this->_getHeaderSender();
+            if ($headerSender) {
+                $this->_config['sender'] = $headerSender;
+            }
+
+            if (isset($params['template'])) {
+                $this->_config['template'] = $params['template'];
+            }
+
+            if (isset($params['message'])) {
+                $this->_viewVars['message'] = $params['message'];
+            }
+            $this->_viewVars += $params['viewVars'];
+
+            $this->_configTransport();
+        }
+
+        protected function _configTransport() {
+            if (Configure::read('debug') > 2 || Configure::read('Saito.Debug.email')) {
+                $this->_config['transport'] = 'Debug';
+            };
+            if (Configure::read('debug') > 2) {
+                $this->_config['log'] = true;
+            };
+        }
+
+        protected function _getHeaderSender() {
+            if ($this->_emailConfigExists && $this->_CakeEmail->from()) {
+                // set the forum app address from email.php
+                $hs = $this->_CakeEmail->from();
+
+                // set app address name to forum's name if it's not set in email.php
+                if ((is_array($hs) && key($hs) === current($hs))) {
+                    $hs = $this->_pA(key($hs));
+                }
+            } elseif ($this->_headerSent) {
+                $type = $this->_headerSent;
+                $hs = $this->_pA($this->_addresses[$type]);
+            } else {
+                $hs = false;
+            }
+            return $hs;
+        }
+
+        /**
+         * returns participant array (Cake mail array)
+         *
+         * @param $address string with address or ['User']-sender/recipient
+         * @param $name
+         * @return array [<address> => <name>]
+         */
+        protected function _pA($address, $name = null) {
+            if (is_array($address) && isset($address['User'])) {
+                $name = $address['User']['username'];
+                $address = $address['User']['user_email'];
+            }
+            if ($name === null) {
+                $name = $this->_forumName;
+            }
+            return [$address => $name];
+        }
+
+        /**
+         * set base config from app/config/email.php
+         */
+        protected function _initConfigFromFile() {
+            if (!$this->_emailConfigExists) {
+                return;
+            }
+            $this->_CakeEmail->config('saito');
+        }
+
+        public function getPredefinedSender($type) {
+            $this->_init();
+            return ['User' => [
+                'username' => $this->_forumName,
+                'user_email' => $this->_addresses[$type]
+            ]];
+        }
+
+        protected function _getRecipient($recipient) {
+            return $this->_getParticipant($recipient);
+        }
+
+        protected function _getSender($sender) {
+            if (!is_string($sender) ||
+                    !in_array($sender, $this->_predefined)
+            ) {
+                // sender-address does not belong to system: is external address
+                // and should be send 'in behalf off'
+                $this->_headerSent = 'system';
+            }
+            return $this->_getParticipant($sender);
+        }
+
+        /**
+         * @param $value
+         * @return array
+         * @throws Exception
+         */
+        protected function _getParticipant($value) {
+            //# participant-address is valid address
+            if (is_array($value)) {
+                return $value;
+            }
+
+            //# participant-address belongs to system
+            if (is_string($value) &&
+                in_array($value, $this->_predefined)
+            ) {
+                return $this->getPredefinedSender($value);
+            }
+
+            //# participant-address belongs to external user
+            $this->_User->id = $value;
+            $this->_User->contain();
+            $participant = $this->_User->read();
+
+            if (empty($participant)) {
+                throw new Exception("Can't find participant for email.");
+            }
+
+            return $participant;
+        }
 
 /**
  * Sends a copy of a completely configured email to the author
@@ -262,33 +262,33 @@ 
  * @param $config
  * @param $viewVars
  */
-		protected function _sendCopyToOriginalSender($config, $viewVars) {
-			// use name for recipient if available
-			if (!empty($this->_recipient['User']['username'])) {
-				$emailConfig['to'] = $this->_pA($this->_recipient['User']['user_email'],
-					$this->_recipient['User']['username']);
-			}
-
-			// set new subject
-			$data = array('subject' => $config['subject']);
-			if (is_array($config['to'])) {
-				$data['recipient-name'] = current($config['to']);
-				$str = __('Copy of your message: ":subject" to ":recipient-name"');
-			} else {
-				$str = __('Copy of your message: ":subject"');
-			}
-			$config['subject'] = CakeText::insert($str, $data);
-
-			// set new addresses
-			$config['to'] = $config['from'];
-			// @todo should be system message
-			$config['from'] = $this->_pA($this->getPredefinedSender('system'));
-
-			// CC is always send by system
-			unset($config['sender']);
-
-			return $this->_send($config, $viewVars);
-		}
+        protected function _sendCopyToOriginalSender($config, $viewVars) {
+            // use name for recipient if available
+            if (!empty($this->_recipient['User']['username'])) {
+                $emailConfig['to'] = $this->_pA($this->_recipient['User']['user_email'],
+                    $this->_recipient['User']['username']);
+            }
+
+            // set new subject
+            $data = array('subject' => $config['subject']);
+            if (is_array($config['to'])) {
+                $data['recipient-name'] = current($config['to']);
+                $str = __('Copy of your message: ":subject" to ":recipient-name"');
+            } else {
+                $str = __('Copy of your message: ":subject"');
+            }
+            $config['subject'] = CakeText::insert($str, $data);
+
+            // set new addresses
+            $config['to'] = $config['from'];
+            // @todo should be system message
+            $config['from'] = $this->_pA($this->getPredefinedSender('system'));
+
+            // CC is always send by system
+            unset($config['sender']);
+
+            return $this->_send($config, $viewVars);
+        }
 
 /**
  * Sends the completely configured email
@@ -296,12 +296,12 @@ 
  * @param $config
  * @param $viewVars
  */
-		protected function _send($config, $viewVars) {
-			$email = $this->_CakeEmail;
-			// workaround for http://cakephp.lighthouseapp.com/projects/42648/tickets/2855-cakeemail-transports-have-ambiguous-config-behaviors
-			$email->config(array_merge($this->_CakeEmail->config(), $config));
-			$email->viewVars($viewVars);
-			return $email->send();
-		}
-
-	}
\ No newline at end of file
+        protected function _send($config, $viewVars) {
+            $email = $this->_CakeEmail;
+            // workaround for http://cakephp.lighthouseapp.com/projects/42648/tickets/2855-cakeemail-transports-have-ambiguous-config-behaviors
+            $email->config(array_merge($this->_CakeEmail->config(), $config));
+            $email->viewVars($viewVars);
+            return $email->send();
+        }
+
+    }
\ No newline at end of file

app/Controller/EntriesController.php

Doc Comments +7 added lines, -1 removed lines

@@ -650,7 +650,7 @@ 
  * @param null $id
  * @param null $toggle
  *
- * @return translated
+ * @return null|string
  */
 		public function ajax_toggle($id = null, $toggle = null) {
 			$this->autoLayout = false;
@@ -781,6 +781,9 @@ 
 			}
 		}
 
+		/**
+		 * @param string $type
+		 */
 		protected function _incrementViews($entry, $type = null) {
 			if ($this->CurrentUser->isBot()) {
 				return;
@@ -947,6 +950,9 @@ 
 			$this->set('rootEntry', $_rootEntry);
 		}
 
+		/**
+		 * @param string $type
+		 */
 		protected function _setTitleFromEntry($entry, $type = null) {
 			if ($type === null) {
 				$template =	__(':subject | :category');

Spacing +23 added lines, -23 removed lines

@@ -43,8 +43,8 @@ 
 
 			$currentPage = 1;
 			if (isset($this->request->named['page']) && $this->request->named['page'] != 1) {
-				$currentPage = (int)$this->request->named['page'];
-				$this->set('title_for_layout', __('page') . ' ' . $currentPage);
+				$currentPage = (int) $this->request->named['page'];
+				$this->set('title_for_layout', __('page').' '.$currentPage);
 			}
 			if ($currentPage === 1 && $this->CurrentUser->isLoggedIn()
 				&& $this->CurrentUser['user_automaticaly_mark_as_read']
@@ -146,11 +146,11 @@ 
 		public function source($id = null) {
 			$this->autoRender = false;
 
-			$data = $this->requestAction('/entries/view/' . $id);
+			$data = $this->requestAction('/entries/view/'.$id);
 
 			$out = array();
 			$out[] = '<pre style="white-space: pre-wrap;">';
-			$out[] = $data['Entry']['subject'] . "\n";
+			$out[] = $data['Entry']['subject']."\n";
 			$out[] = $data['Entry']['text'];
 			$out[] = '</pre>';
 			return implode("\n", $out);
@@ -233,9 +233,9 @@ 
 
 							return json_encode(
 								[
-									'id' => (int)$newPosting['Entry']['id'],
-									'pid' => (int)$newPosting['Entry']['pid'],
-									'tid' => (int)$newPosting['Entry']['tid']
+									'id' => (int) $newPosting['Entry']['id'],
+									'pid' => (int) $newPosting['Entry']['pid'],
+									'tid' => (int) $newPosting['Entry']['tid']
 								]
 							);
 						} else {
@@ -336,8 +336,8 @@ 
 				}
 			}
 
-			$this->set('is_answer', (int)$this->request->data['Entry']['pid'] !== 0);
-			$this->set('is_inline', (int)$this->request->data['Entry']['pid'] !== 0);
+			$this->set('is_answer', (int) $this->request->data['Entry']['pid'] !== 0);
+			$this->set('is_inline', (int) $this->request->data['Entry']['pid'] !== 0);
 			$this->set('form_id', $this->request->data['Entry']['pid']);
 			$this->_setAddViewVars();
 		}
@@ -439,7 +439,7 @@ 
 			);
 			$this->set('notis', $notis);
 
-			$this->set('is_answer', (int)$this->request->data['Entry']['pid'] !== 0);
+			$this->set('is_answer', (int) $this->request->data['Entry']['pid'] !== 0);
 			$this->set('is_inline', false);
 			$this->set('form_id', $this->request->data['Entry']['pid']);
 
@@ -487,7 +487,7 @@ 
 				$this->redirect('/');
 			} else {
 				$this->Session->setFlash(__('delete_subtree_success'), 'flash/success');
-				$this->redirect('/entries/view/' . $entry['Entry']['pid']);
+				$this->redirect('/entries/view/'.$entry['Entry']['pid']);
 			}
 		} else {
 			$this->Session->setFlash(__('delete_tree_error'), 'flash/error');
@@ -587,16 +587,16 @@ 
 			else :
 				// validation errors
 				foreach ($errors as $field => $error) {
-					$message = __d('nondynamic', $field) . ": " . __d( 'nondynamic', $error[0]);
+					$message = __d('nondynamic', $field).": ".__d('nondynamic', $error[0]);
 					$this->JsData->addAppJsMessage(
 						$message,
 						[
 							'type' => 'error',
 							'channel' => 'form',
-							'element' => '#Entry' . array_reduce(
+							'element' => '#Entry'.array_reduce(
 									explode('_', $field),
-									function ($carry, $item) {
-										return $carry . ucfirst($item);
+									function($carry, $item) {
+										return $carry.ucfirst($item);
 									},
 									''
 								)
@@ -626,7 +626,7 @@ 
 			$this->Entry->contain();
 			$data = $this->Entry->findById($id);
 
-			if (!$data || (int)$data['Entry']['pid'] !== 0) {
+			if (!$data || (int) $data['Entry']['pid'] !== 0) {
 				throw new NotFoundException();
 			}
 
@@ -635,7 +635,7 @@ 
 				$targetId = $this->request->data['Entry']['targetId'];
 				$this->Entry->id = $id;
 				if ($this->Entry->threadMerge($targetId)) {
-					$this->redirect('/entries/view/' . $id);
+					$this->redirect('/entries/view/'.$id);
 					return;
 				} else {
 					$this->Session->setFlash(__("Error"), 'flash/error');
@@ -676,10 +676,10 @@ 
 				//* let's toggle
 				$this->Entry->id = $id;
 				$this->request->data = $this->Entry->toggle($toggle);
-				return ($this->request->data == 0) ? __d('nondynamic', $toggle . '_set_entry_link') : __d('nondynamic', $toggle . '_unset_entry_link');
+				return ($this->request->data == 0) ? __d('nondynamic', $toggle.'_set_entry_link') : __d('nondynamic', $toggle.'_unset_entry_link');
 			}
 
-			$this->set('json_data', (string)$this->request->data);
+			$this->set('json_data', (string) $this->request->data);
 			$this->render('/Elements/json/json_data');
 		}
 
@@ -925,7 +925,7 @@ 
 						// … directly in entries/mix
 						|| $this->request->action === 'mix'
 						// … inline viewing … on entries/index.
-						|| ( $this->localReferer('controller') === 'entries' && $this->localReferer('action') === 'index')
+						|| ($this->localReferer('controller') === 'entries' && $this->localReferer('action') === 'index')
 				):
 					$showAnsweringPanel = true;
 				endif;
@@ -934,7 +934,7 @@ 
 		}
 
 		protected function _setRootEntry($entry) {
-			if ((int)$entry['Entry']['pid'] !== 0) {
+			if ((int) $entry['Entry']['pid'] !== 0) {
 				$_rootEntry = $this->Entry->find('first',
 					[
 						'contain' => false,
@@ -949,9 +949,9 @@ 
 
 		protected function _setTitleFromEntry($entry, $type = null) {
 			if ($type === null) {
-				$template =	__(':subject | :category');
+				$template = __(':subject | :category');
 			} else {
-				$template =	__(':subject (:type) | :category');
+				$template = __(':subject (:type) | :category');
 			}
 			$this->set('title_for_layout',
 					CakeText::insert($template,

Indentation +883 added lines, -883 removed lines

@@ -1,140 +1,140 @@ 
 <?php
 
-	use Saito\User\Categories;
-
-	App::uses('AppController', 'Controller');
-
-	class EntriesController extends AppController {
-
-		public $name = 'Entries';
-
-		public $helpers = [
-			'EntryH',
-			'MarkitupEditor',
-			'Shouts',
-			'Text',
-		];
-
-		public $components = [
-			'Shouts'
-		];
-
-		public function index() {
-			Stopwatch::start('Entries->index()');
-
-			$this->_prepareSlidetabData();
-
-			//= determine user sort order
-			$sortKey = 'Entry.';
-			if (!$this->CurrentUser->isLoggedIn() || $this->CurrentUser['user_sort_last_answer']) {
-				$sortKey .= 'last_answer';
-			} else {
-				$sortKey .= 'time';
-			}
-			$order = ['Entry.fixed' => 'DESC', $sortKey => 'DESC'];
-
-			//= get threads
-			$initials = $this->_getInitialThreads($this->CurrentUser, $order);
-			$threads = $this->Entry->treesForThreads($initials, $order);
-			foreach ($threads as $tid => $thread) {
-				$threads[$tid] = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $thread]);
-			}
-			$this->set('entries', $threads);
-
-			$currentPage = 1;
-			if (isset($this->request->named['page']) && $this->request->named['page'] != 1) {
-				$currentPage = (int)$this->request->named['page'];
-				$this->set('title_for_layout', __('page') . ' ' . $currentPage);
-			}
-			if ($currentPage === 1 && $this->CurrentUser->isLoggedIn()
-				&& $this->CurrentUser['user_automaticaly_mark_as_read']
-			) {
-				$this->set('markAsRead', true);
-			}
-			// @bogus
-			$this->Session->write('paginator.lastPage', $currentPage);
-			$this->showDisclaimer = true;
-			$this->set('allowThreadCollapse', true);
-
-			Stopwatch::stop('Entries->index()');
-		}
-
-		public function feed() {
-			Configure::write('debug', 0);
-
-			if (isset($this->request->params['named']['depth']) &&
-					$this->request->params['named']['depth'] === 'start'
-			) {
-				$title = __('Last started threads');
-				$order = 'time DESC';
-				$conditions['pid'] = 0;
-			} else {
-				$title = __('Last entries');
-				$order = 'last_answer DESC';
-			}
-
-			$conditions['category_id'] = $this->CurrentUser->Categories->getAllowed();
-
-			$entries = $this->Entry->find(
-				'feed',
-				[
-					'conditions' => $conditions,
-					'order' => $order
-				]
-			);
-			$this->set('entries', $entries);
-
-			// serialize for JSON
-			$this->set('_serialize', 'entries');
-			$this->set('title', $title);
-		}
-
-		/**
-		 * Mix view
-		 *
-		 * @param $tid
-		 * @throws NotFoundException
-		 */
-		public function mix($tid) {
-			if (!$tid) {
-				$this->redirect('/');
-			}
-			$entries = $this->Entry->treeForNode($tid,
-					['root' => true, 'complete' => true]);
-
-			if (empty($entries)) {
-				throw new NotFoundException();
-			}
-
-			// check if anonymous tries to access internal categories
-			$root = reset($entries);
-			$accession = $root['Category']['accession'];
-			if (!$this->CurrentUser->Categories->isAccessionAuthorized($accession)) {
-				$this->_requireAuth();
-				return;
-			}
-
-			$this->_setRootEntry($root);
-			$this->_setTitleFromEntry($root, __('view.type.mix'));
-
-			$entries = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $root]);
-			$this->set('entries', $entries);
-
-			$this->_showAnsweringPanel();
-
-			$this->_incrementViews($root, 'thread');
-
-			$this->_marMixThread = $tid;
-		}
+    use Saito\User\Categories;
+
+    App::uses('AppController', 'Controller');
+
+    class EntriesController extends AppController {
+
+        public $name = 'Entries';
+
+        public $helpers = [
+            'EntryH',
+            'MarkitupEditor',
+            'Shouts',
+            'Text',
+        ];
+
+        public $components = [
+            'Shouts'
+        ];
+
+        public function index() {
+            Stopwatch::start('Entries->index()');
+
+            $this->_prepareSlidetabData();
+
+            //= determine user sort order
+            $sortKey = 'Entry.';
+            if (!$this->CurrentUser->isLoggedIn() || $this->CurrentUser['user_sort_last_answer']) {
+                $sortKey .= 'last_answer';
+            } else {
+                $sortKey .= 'time';
+            }
+            $order = ['Entry.fixed' => 'DESC', $sortKey => 'DESC'];
+
+            //= get threads
+            $initials = $this->_getInitialThreads($this->CurrentUser, $order);
+            $threads = $this->Entry->treesForThreads($initials, $order);
+            foreach ($threads as $tid => $thread) {
+                $threads[$tid] = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $thread]);
+            }
+            $this->set('entries', $threads);
+
+            $currentPage = 1;
+            if (isset($this->request->named['page']) && $this->request->named['page'] != 1) {
+                $currentPage = (int)$this->request->named['page'];
+                $this->set('title_for_layout', __('page') . ' ' . $currentPage);
+            }
+            if ($currentPage === 1 && $this->CurrentUser->isLoggedIn()
+                && $this->CurrentUser['user_automaticaly_mark_as_read']
+            ) {
+                $this->set('markAsRead', true);
+            }
+            // @bogus
+            $this->Session->write('paginator.lastPage', $currentPage);
+            $this->showDisclaimer = true;
+            $this->set('allowThreadCollapse', true);
+
+            Stopwatch::stop('Entries->index()');
+        }
+
+        public function feed() {
+            Configure::write('debug', 0);
+
+            if (isset($this->request->params['named']['depth']) &&
+                    $this->request->params['named']['depth'] === 'start'
+            ) {
+                $title = __('Last started threads');
+                $order = 'time DESC';
+                $conditions['pid'] = 0;
+            } else {
+                $title = __('Last entries');
+                $order = 'last_answer DESC';
+            }
+
+            $conditions['category_id'] = $this->CurrentUser->Categories->getAllowed();
+
+            $entries = $this->Entry->find(
+                'feed',
+                [
+                    'conditions' => $conditions,
+                    'order' => $order
+                ]
+            );
+            $this->set('entries', $entries);
+
+            // serialize for JSON
+            $this->set('_serialize', 'entries');
+            $this->set('title', $title);
+        }
+
+        /**
+         * Mix view
+         *
+         * @param $tid
+         * @throws NotFoundException
+         */
+        public function mix($tid) {
+            if (!$tid) {
+                $this->redirect('/');
+            }
+            $entries = $this->Entry->treeForNode($tid,
+                    ['root' => true, 'complete' => true]);
+
+            if (empty($entries)) {
+                throw new NotFoundException();
+            }
+
+            // check if anonymous tries to access internal categories
+            $root = reset($entries);
+            $accession = $root['Category']['accession'];
+            if (!$this->CurrentUser->Categories->isAccessionAuthorized($accession)) {
+                $this->_requireAuth();
+                return;
+            }
+
+            $this->_setRootEntry($root);
+            $this->_setTitleFromEntry($root, __('view.type.mix'));
+
+            $entries = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $root]);
+            $this->set('entries', $entries);
+
+            $this->_showAnsweringPanel();
+
+            $this->_incrementViews($root, 'thread');
+
+            $this->_marMixThread = $tid;
+        }
 
 /**
  * load front page force all entries mark-as-read
  */
-		public function update() {
-			$this->autoRender = false;
-			$this->CurrentUser->LastRefresh->set('now');
-			$this->redirect('/entries/index');
-		}
+        public function update() {
+            $this->autoRender = false;
+            $this->CurrentUser->LastRefresh->set('now');
+            $this->redirect('/entries/index');
+        }
 
 /**
  * Outputs raw markup of an posting $id
@@ -143,72 +143,72 @@ 
  *
  * @return string
  */
-		public function source($id = null) {
-			$this->autoRender = false;
+        public function source($id = null) {
+            $this->autoRender = false;
 
-			$data = $this->requestAction('/entries/view/' . $id);
+            $data = $this->requestAction('/entries/view/' . $id);
 
-			$out = array();
-			$out[] = '<pre style="white-space: pre-wrap;">';
-			$out[] = $data['Entry']['subject'] . "\n";
-			$out[] = $data['Entry']['text'];
-			$out[] = '</pre>';
-			return implode("\n", $out);
-		}
+            $out = array();
+            $out[] = '<pre style="white-space: pre-wrap;">';
+            $out[] = $data['Entry']['subject'] . "\n";
+            $out[] = $data['Entry']['text'];
+            $out[] = '</pre>';
+            return implode("\n", $out);
+        }
 
-		public function view($id = null) {
-			Stopwatch::start('Entries->view()');
+        public function view($id = null) {
+            Stopwatch::start('Entries->view()');
 
-			// redirect if no id is given
-			if (!$id) {
-				$this->Session->setFlash(__('Invalid post'));
-				return $this->redirect(['action' => 'index']);
-			}
+            // redirect if no id is given
+            if (!$id) {
+                $this->Session->setFlash(__('Invalid post'));
+                return $this->redirect(['action' => 'index']);
+            }
 
-			$this->Entry->id = $id;
-			$entry = $this->Entry->get($id);
+            $this->Entry->id = $id;
+            $entry = $this->Entry->get($id);
 
-			// redirect if posting doesn't exists
-			if ($entry == false) {
-				$this->Session->setFlash(__('Invalid post'));
-				$this->redirect('/');
-				return;
-			}
+            // redirect if posting doesn't exists
+            if ($entry == false) {
+                $this->Session->setFlash(__('Invalid post'));
+                $this->redirect('/');
+                return;
+            }
 
-			// check if anonymous tries to access internal categories
-			$accession = $entry['Category']['accession'];
-			if (!$this->CurrentUser->Categories->isAccessionAuthorized($accession)) {
-				$this->_requireAuth();
-				return;
-			}
+            // check if anonymous tries to access internal categories
+            $accession = $entry['Category']['accession'];
+            if (!$this->CurrentUser->Categories->isAccessionAuthorized($accession)) {
+                $this->_requireAuth();
+                return;
+            }
 
-			$this->_incrementViews($entry);
+            $this->_incrementViews($entry);
 
-			// for /source/<id> view
-			if (!empty($this->request->params['requested'])) {
-				return $entry;
-			}
+            // for /source/<id> view
+            if (!empty($this->request->params['requested'])) {
+                return $entry;
+            }
 
-			$this->set('entry', $entry);
+            $this->set('entry', $entry);
 
-			$this->_setRootEntry($entry);
-			$this->_showAnsweringPanel();
+            $this->_setRootEntry($entry);
+            $this->_showAnsweringPanel();
 
-			$this->CurrentUser->ReadEntries->set($entry);
+            $this->CurrentUser->ReadEntries->set($entry);
 
-			// inline open
-			if ($this->request->is('ajax')) {
-				$this->render('/Elements/entry/view_posting');
-				return;
-			}
+            // inline open
+            if ($this->request->is('ajax')) {
+                $this->render('/Elements/entry/view_posting');
+                return;
+            }
 
-			// full page request
-			$this->set('tree',
-					$this->Entry->treeForNode($entry['Entry']['tid'], ['root' => true]));
-			$this->_setTitleFromEntry($entry);
+            // full page request
+            $this->set('tree',
+                    $this->Entry->treeForNode($entry['Entry']['tid'], ['root' => true]));
+            $this->_setTitleFromEntry($entry);
 
-			Stopwatch::stop('Entries->view()');
-		}
+            Stopwatch::stop('Entries->view()');
+        }
 
 /**
  * @param null $id
@@ -216,143 +216,143 @@ 
  * @return string
  * @throws ForbiddenException
  */
-		public function add($id = null) {
-			$this->set('title_for_layout', __('Write a New Entry'));
-
-			//# insert new entry
-			if (!empty($this->request->data)) {
-				$newPosting = $this->Entry->createPosting($this->request->data);
-
-				// inserting new posting was successful
-				if ($newPosting !== false) :
-					$this->_setNotifications($newPosting + $this->request->data);
-					if ($this->request->is('ajax')) :
-						// Ajax request came from front answer on front page /entries/index
-						if ($this->localReferer('action') === 'index') {
-							$this->autoRender = false;
-
-							return json_encode(
-								[
-									'id' => (int)$newPosting['Entry']['id'],
-									'pid' => (int)$newPosting['Entry']['pid'],
-									'tid' => (int)$newPosting['Entry']['tid']
-								]
-							);
-						} else {
-							$this->_stop();
-						}
-					// answering through POST request
-					else :
-						if ($this->localReferer('action') === 'mix') {
-							// answer request came from mix ansicht
-							$this->redirect(
-								[
-									'controller' => 'entries',
-									'action' => 'mix',
-									$newPosting['Entry']['tid'],
-									'#' => $this->Entry->id
-								]
-							);
-
-						} else {
-							// normal posting from entries/add or entries/view
-							$this->redirect(
-								[
-									'controller' => 'entries',
-									'action' => 'view',
-									$this->Entry->id
-								]
-							);
-
-						}
-						return;
-					endif;
-				else :
-					// Error while trying to save a post
-					if (count($this->Entry->validationErrors) === 0) {
-						$this->Session->setFlash(
-							__(
-								'Something clogged the tubes. Could not save entry. Try again.'
-							),
-							'flash/error'
-						);
-					}
-				endif;
-
-			// show add form
-			} else {
-				$isAnswer = $id !== null;
-				$this->request->data = null;
-
-				if ($isAnswer) {
-					if ($this->request->is('ajax') === false) {
-						$this->redirect($this->referer());
-						return;
-					}
-
-					$this->request->data = $this->Entry->get($id);
-					$posting = $this->dic->newInstance('\Saito\Posting\Posting',
-						['rawData' => $this->request->data]);
-
-					if ($posting->isAnsweringForbidden()) {
-						throw new ForbiddenException;
-					}
-
-					// create new subentry
-					unset($this->request->data['Entry']['id']);
-					$this->request->data['Entry']['pid'] = $id;
-					$this->set('citeSubject', $this->request->data['Entry']['subject']);
-					// subject is empty in answer-form
-					unset($this->request->data['Entry']['subject']);
-					$this->set('citeText', $this->request->data['Entry']['text']);
-					// text field is empty in answer
-					unset($this->request->data['Entry']['text']);
-
-					// get notifications
-					$notis = $this->Entry->Esevent->checkEventsForUser(
-						$this->CurrentUser->getId(),
-						array(
-							1 => array(
-								'subject' => $this->request->data['Entry']['tid'],
-								'event' => 'Model.Entry.replyToThread',
-								'receiver' => 'EmailNotification',
-							),
-						)
-					);
-					$this->set('notis', $notis);
-
-					// set Subnav
-					$headerSubnavLeftTitle = __(
-						'back_to_posting_from_linkname',
-						$this->request->data['User']['username']
-					);
-					$this->set('headerSubnavLeftTitle', $headerSubnavLeftTitle);
-
-					$this->set('title_for_layout', __('Write a Reply'));
-				} else {
-					// new posting which creates new thread
-					$this->request->data['Entry']['pid'] = 0;
-					$this->request->data['Entry']['tid'] = 0;
-				}
-			}
-
-			$this->set('is_answer', (int)$this->request->data['Entry']['pid'] !== 0);
-			$this->set('is_inline', (int)$this->request->data['Entry']['pid'] !== 0);
-			$this->set('form_id', $this->request->data['Entry']['pid']);
-			$this->_setAddViewVars();
-		}
-
-		public function threadLine($id) {
-			$entry = $this->Entry->get($id);
-			$accession = $entry['Category']['accession'];
-			if (!$this->CurrentUser->Categories->isAccessionAuthorized($accession)) {
-				$this->_requireAuth();
-				return;
-			}
-			$this->set('entry_sub', $entry);
-			// ajax requests so far are always answers
-			$this->set('level', '1');
-		}
+        public function add($id = null) {
+            $this->set('title_for_layout', __('Write a New Entry'));
+
+            //# insert new entry
+            if (!empty($this->request->data)) {
+                $newPosting = $this->Entry->createPosting($this->request->data);
+
+                // inserting new posting was successful
+                if ($newPosting !== false) :
+                    $this->_setNotifications($newPosting + $this->request->data);
+                    if ($this->request->is('ajax')) :
+                        // Ajax request came from front answer on front page /entries/index
+                        if ($this->localReferer('action') === 'index') {
+                            $this->autoRender = false;
+
+                            return json_encode(
+                                [
+                                    'id' => (int)$newPosting['Entry']['id'],
+                                    'pid' => (int)$newPosting['Entry']['pid'],
+                                    'tid' => (int)$newPosting['Entry']['tid']
+                                ]
+                            );
+                        } else {
+                            $this->_stop();
+                        }
+                    // answering through POST request
+                    else :
+                        if ($this->localReferer('action') === 'mix') {
+                            // answer request came from mix ansicht
+                            $this->redirect(
+                                [
+                                    'controller' => 'entries',
+                                    'action' => 'mix',
+                                    $newPosting['Entry']['tid'],
+                                    '#' => $this->Entry->id
+                                ]
+                            );
+
+                        } else {
+                            // normal posting from entries/add or entries/view
+                            $this->redirect(
+                                [
+                                    'controller' => 'entries',
+                                    'action' => 'view',
+                                    $this->Entry->id
+                                ]
+                            );
+
+                        }
+                        return;
+                    endif;
+                else :
+                    // Error while trying to save a post
+                    if (count($this->Entry->validationErrors) === 0) {
+                        $this->Session->setFlash(
+                            __(
+                                'Something clogged the tubes. Could not save entry. Try again.'
+                            ),
+                            'flash/error'
+                        );
+                    }
+                endif;
+
+            // show add form
+            } else {
+                $isAnswer = $id !== null;
+                $this->request->data = null;
+
+                if ($isAnswer) {
+                    if ($this->request->is('ajax') === false) {
+                        $this->redirect($this->referer());
+                        return;
+                    }
+
+                    $this->request->data = $this->Entry->get($id);
+                    $posting = $this->dic->newInstance('\Saito\Posting\Posting',
+                        ['rawData' => $this->request->data]);
+
+                    if ($posting->isAnsweringForbidden()) {
+                        throw new ForbiddenException;
+                    }
+
+                    // create new subentry
+                    unset($this->request->data['Entry']['id']);
+                    $this->request->data['Entry']['pid'] = $id;
+                    $this->set('citeSubject', $this->request->data['Entry']['subject']);
+                    // subject is empty in answer-form
+                    unset($this->request->data['Entry']['subject']);
+                    $this->set('citeText', $this->request->data['Entry']['text']);
+                    // text field is empty in answer
+                    unset($this->request->data['Entry']['text']);
+
+                    // get notifications
+                    $notis = $this->Entry->Esevent->checkEventsForUser(
+                        $this->CurrentUser->getId(),
+                        array(
+                            1 => array(
+                                'subject' => $this->request->data['Entry']['tid'],
+                                'event' => 'Model.Entry.replyToThread',
+                                'receiver' => 'EmailNotification',
+                            ),
+                        )
+                    );
+                    $this->set('notis', $notis);
+
+                    // set Subnav
+                    $headerSubnavLeftTitle = __(
+                        'back_to_posting_from_linkname',
+                        $this->request->data['User']['username']
+                    );
+                    $this->set('headerSubnavLeftTitle', $headerSubnavLeftTitle);
+
+                    $this->set('title_for_layout', __('Write a Reply'));
+                } else {
+                    // new posting which creates new thread
+                    $this->request->data['Entry']['pid'] = 0;
+                    $this->request->data['Entry']['tid'] = 0;
+                }
+            }
+
+            $this->set('is_answer', (int)$this->request->data['Entry']['pid'] !== 0);
+            $this->set('is_inline', (int)$this->request->data['Entry']['pid'] !== 0);
+            $this->set('form_id', $this->request->data['Entry']['pid']);
+            $this->_setAddViewVars();
+        }
+
+        public function threadLine($id) {
+            $entry = $this->Entry->get($id);
+            $accession = $entry['Category']['accession'];
+            if (!$this->CurrentUser->Categories->isAccessionAuthorized($accession)) {
+                $this->_requireAuth();
+                return;
+            }
+            $this->set('entry_sub', $entry);
+            // ajax requests so far are always answers
+            $this->set('level', '1');
+        }
 
 /**
  * @param null $id
@@ -360,99 +360,99 @@ 
  * @throws NotFoundException
  * @throws BadRequestException
  */
-		public function edit($id = null) {
-			if (empty($id)) {
-				throw new BadRequestException();
-			}
-
-			$oldEntry = $this->Entry->get($id);
-			if (!$oldEntry) {
-				throw new NotFoundException();
-			}
-
-			/** * @var \Saito\Posting\Posting */
-			$posting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $oldEntry]);
-
-			switch ($posting->isEditingAsCurrentUserForbidden()) {
-				case 'time':
-					$this->Session->setFlash(
-						'Stand by your word bro\', it\'s too late. @lo',
-						'flash/error'
-					);
-					$this->redirect(['action' => 'view', $id]);
-					return;
-				case 'user':
-					$this->Session->setFlash('Not your horse, Hoss! @lo', 'flash/error');
-					$this->redirect(['action' => 'view', $id]);
-					return;
-				case true :
-					$this->Session->setFlash(
-						'Something went terribly wrong. Alert the authorities now! @lo',
-						'flash/error'
-					);
-					return;
-			}
-
-			// try to save edit
-			if (!empty($this->request->data)) {
-				$data = $this->request->data;
-				$data['Entry']['id'] = $id;
-				$newEntry = $this->Entry->update($data);
-				if ($newEntry) {
-					$this->_setNotifications(am($this->request['data'], $oldEntry));
-					$this->redirect(['action' => 'view', $id]);
-					return;
-				} else {
-					$this->Session->setFlash(__('Something clogged the tubes. Could not save entry. Try again.'));
-				}
-			}
-
-			// show editing form
-			if ($posting->isEditingWithRoleUserForbidden()) {
-				$this->Session->setFlash(__('notice_you_are_editing_as_mod'), 'flash/warning');
-			}
-
-			$this->request->data = Hash::merge($oldEntry, $this->request->data);
-
-			// get text of parent entry for citation
-			$parentEntryId = $oldEntry['Entry']['pid'];
-			if ($parentEntryId > 0) {
-				$parentEntry = $this->Entry->get($parentEntryId);
-				$this->set('citeText', $parentEntry['Entry']['text']);
-			}
-
-			// get notifications
-			$notis = $this->Entry->Esevent->checkEventsForUser(
-				$oldEntry['Entry']['user_id'],
-				array(
-					array(
-						'subject' => $oldEntry['Entry']['id'],
-						'event' => 'Model.Entry.replyToEntry',
-						'receiver' => 'EmailNotification',
-					),
-					array(
-						'subject' => $oldEntry['Entry']['tid'],
-						'event' => 'Model.Entry.replyToThread',
-						'receiver' => 'EmailNotification',
-					),
-				)
-			);
-			$this->set('notis', $notis);
-
-			$this->set('is_answer', (int)$this->request->data['Entry']['pid'] !== 0);
-			$this->set('is_inline', false);
-			$this->set('form_id', $this->request->data['Entry']['pid']);
-
-			// set headers
-			$this->set(
-				'headerSubnavLeftTitle',
-				__('back_to_posting_from_linkname', $this->request->data['User']['username'])
-			);
-			$this->set('headerSubnavLeftUrl', ['action' => 'view', $id]);
-			$this->set('form_title', __('edit_linkname'));
-			$this->_setAddViewVars();
-			$this->render('/Entries/add');
-		}
+        public function edit($id = null) {
+            if (empty($id)) {
+                throw new BadRequestException();
+            }
+
+            $oldEntry = $this->Entry->get($id);
+            if (!$oldEntry) {
+                throw new NotFoundException();
+            }
+
+            /** * @var \Saito\Posting\Posting */
+            $posting = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $oldEntry]);
+
+            switch ($posting->isEditingAsCurrentUserForbidden()) {
+                case 'time':
+                    $this->Session->setFlash(
+                        'Stand by your word bro\', it\'s too late. @lo',
+                        'flash/error'
+                    );
+                    $this->redirect(['action' => 'view', $id]);
+                    return;
+                case 'user':
+                    $this->Session->setFlash('Not your horse, Hoss! @lo', 'flash/error');
+                    $this->redirect(['action' => 'view', $id]);
+                    return;
+                case true :
+                    $this->Session->setFlash(
+                        'Something went terribly wrong. Alert the authorities now! @lo',
+                        'flash/error'
+                    );
+                    return;
+            }
+
+            // try to save edit
+            if (!empty($this->request->data)) {
+                $data = $this->request->data;
+                $data['Entry']['id'] = $id;
+                $newEntry = $this->Entry->update($data);
+                if ($newEntry) {
+                    $this->_setNotifications(am($this->request['data'], $oldEntry));
+                    $this->redirect(['action' => 'view', $id]);
+                    return;
+                } else {
+                    $this->Session->setFlash(__('Something clogged the tubes. Could not save entry. Try again.'));
+                }
+            }
+
+            // show editing form
+            if ($posting->isEditingWithRoleUserForbidden()) {
+                $this->Session->setFlash(__('notice_you_are_editing_as_mod'), 'flash/warning');
+            }
+
+            $this->request->data = Hash::merge($oldEntry, $this->request->data);
+
+            // get text of parent entry for citation
+            $parentEntryId = $oldEntry['Entry']['pid'];
+            if ($parentEntryId > 0) {
+                $parentEntry = $this->Entry->get($parentEntryId);
+                $this->set('citeText', $parentEntry['Entry']['text']);
+            }
+
+            // get notifications
+            $notis = $this->Entry->Esevent->checkEventsForUser(
+                $oldEntry['Entry']['user_id'],
+                array(
+                    array(
+                        'subject' => $oldEntry['Entry']['id'],
+                        'event' => 'Model.Entry.replyToEntry',
+                        'receiver' => 'EmailNotification',
+                    ),
+                    array(
+                        'subject' => $oldEntry['Entry']['tid'],
+                        'event' => 'Model.Entry.replyToThread',
+                        'receiver' => 'EmailNotification',
+                    ),
+                )
+            );
+            $this->set('notis', $notis);
+
+            $this->set('is_answer', (int)$this->request->data['Entry']['pid'] !== 0);
+            $this->set('is_inline', false);
+            $this->set('form_id', $this->request->data['Entry']['pid']);
+
+            // set headers
+            $this->set(
+                'headerSubnavLeftTitle',
+                __('back_to_posting_from_linkname', $this->request->data['User']['username'])
+            );
+            $this->set('headerSubnavLeftUrl', ['action' => 'view', $id]);
+            $this->set('form_title', __('edit_linkname'));
+            $this->_setAddViewVars();
+            $this->render('/Entries/add');
+        }
 
 /**
  * @param null $id
@@ -460,72 +460,72 @@ 
  * @throws NotFoundException
  * @throws MethodNotAllowedException
  */
-	public function delete($id = null) {
-		if (!$id) {
-			throw new NotFoundException;
-		}
-
-		if (!$this->CurrentUser->isMod()) {
-			throw new MethodNotAllowedException;
-		}
-
-		$this->Entry->id = $id;
-		$this->Entry->contain();
-		$entry = $this->Entry->findById($id);
-
-		if (!$entry) {
-			throw new NotFoundException;
-		}
-
-		// Delete Entry
-		$success = $this->Entry->deleteNode($id);
-
-		// Redirect
-		if ($success) {
-			if ($this->Entry->isRoot($entry)) {
-				$this->Session->setFlash(__('delete_tree_success'), 'flash/success');
-				$this->redirect('/');
-			} else {
-				$this->Session->setFlash(__('delete_subtree_success'), 'flash/success');
-				$this->redirect('/entries/view/' . $entry['Entry']['pid']);
-			}
-		} else {
-			$this->Session->setFlash(__('delete_tree_error'), 'flash/error');
-			$this->redirect($this->referer());
-		}
-		$this->redirect('/');
-	}
+    public function delete($id = null) {
+        if (!$id) {
+            throw new NotFoundException;
+        }
+
+        if (!$this->CurrentUser->isMod()) {
+            throw new MethodNotAllowedException;
+        }
+
+        $this->Entry->id = $id;
+        $this->Entry->contain();
+        $entry = $this->Entry->findById($id);
+
+        if (!$entry) {
+            throw new NotFoundException;
+        }
+
+        // Delete Entry
+        $success = $this->Entry->deleteNode($id);
+
+        // Redirect
+        if ($success) {
+            if ($this->Entry->isRoot($entry)) {
+                $this->Session->setFlash(__('delete_tree_success'), 'flash/success');
+                $this->redirect('/');
+            } else {
+                $this->Session->setFlash(__('delete_subtree_success'), 'flash/success');
+                $this->redirect('/entries/view/' . $entry['Entry']['pid']);
+            }
+        } else {
+            $this->Session->setFlash(__('delete_tree_error'), 'flash/error');
+            $this->redirect($this->referer());
+        }
+        $this->redirect('/');
+    }
 
 /**
  * Empty function for benchmarking
  */
-		public function e() {
-			Stopwatch::start('Entries->e()');
-			Stopwatch::stop('Entries->e()');
-		}
-
-		/**
-		 * Marks sub-entry $id as solution to its current root-entry
-		 *
-		 * @param $id
-		 * @throws BadRequestException
-		 * @throws ForbiddenException
-		 * @throws Exception
-		 */
-		public function solve($id) {
-			if (!$this->CurrentUser->isLoggedIn()) {
-				throw new ForbiddenException;
-			}
-			$this->autoRender = false;
-			try {
-				$success = $this->Entry->toggleSolve($id);
-				if (!$success) {
-					throw new Exception;
-				}
-			} catch (Exception $e) {
-				throw new BadRequestException;
-			}
-		}
+        public function e() {
+            Stopwatch::start('Entries->e()');
+            Stopwatch::stop('Entries->e()');
+        }
+
+        /**
+         * Marks sub-entry $id as solution to its current root-entry
+         *
+         * @param $id
+         * @throws BadRequestException
+         * @throws ForbiddenException
+         * @throws Exception
+         */
+        public function solve($id) {
+            if (!$this->CurrentUser->isLoggedIn()) {
+                throw new ForbiddenException;
+            }
+            $this->autoRender = false;
+            try {
+                $success = $this->Entry->toggleSolve($id);
+                if (!$success) {
+                    throw new Exception;
+                }
+            } catch (Exception $e) {
+                throw new BadRequestException;
+            }
+        }
 
 /**
  * @return string
@@ -533,80 +533,80 @@ 
  * @throws BadRequestException
  * @throws ForbiddenException
  */
-		public function preview() {
-			if ($this->CurrentUser->isLoggedIn() === false) {
-				throw new ForbiddenException();
-			}
-			if ($this->request->is('ajax') === false) {
-				throw new BadRequestException();
-			}
-			if ($this->request->is('get')) {
-				throw new MethodNotAllowedException();
-			}
-
-			$data = $this->request->data;
-			$data = $data['Entry'];
-			$newEntry = array(
-				'Entry' => array(
-					'id' => 'preview',
-					'pid' => $data['pid'],
-					'subject' => $data['subject'],
-					'text' => $data['text'],
-					'category_id' => $data['category_id'],
-					'edited_by' => null,
-					'fixed' => false,
-					'solves' => 0,
-					'views' => 0,
-					'ip' => '',
-					'time' => date("Y-m-d H:i:s")
-				)
-			);
-			$this->Entry->prepare($newEntry);
-			$this->Entry->set($newEntry);
-
-			$this->Entry->validates(['fieldList' => ['subject', 'text', 'category_id']]);
-			$errors = $this->Entry->validationErrors;
-
-			if (count($errors) === 0) :
-				// no validation errors
-				$newEntry['User'] = $this->CurrentUser->getSettings();
-				$newEntry = array_merge(
-					$newEntry,
-					$this->Entry->Category->find(
-						'first',
-						array(
-							'conditions' => array(
-								'id' => $newEntry['Entry']['category_id']
-							),
-							'contain' => false,
-						)
-					)
-				);
-				$entry = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $newEntry]);
-				$this->set('entry', $entry);
-			else :
-				// validation errors
-				foreach ($errors as $field => $error) {
-					$message = __d('nondynamic', $field) . ": " . __d( 'nondynamic', $error[0]);
-					$this->JsData->addAppJsMessage(
-						$message,
-						[
-							'type' => 'error',
-							'channel' => 'form',
-							'element' => '#Entry' . array_reduce(
-									explode('_', $field),
-									function ($carry, $item) {
-										return $carry . ucfirst($item);
-									},
-									''
-								)
-						]
-					);
-				}
-				$this->autoRender = false;
-				return json_encode($this->JsData->getAppJsMessages());
-			endif;
-		}
+        public function preview() {
+            if ($this->CurrentUser->isLoggedIn() === false) {
+                throw new ForbiddenException();
+            }
+            if ($this->request->is('ajax') === false) {
+                throw new BadRequestException();
+            }
+            if ($this->request->is('get')) {
+                throw new MethodNotAllowedException();
+            }
+
+            $data = $this->request->data;
+            $data = $data['Entry'];
+            $newEntry = array(
+                'Entry' => array(
+                    'id' => 'preview',
+                    'pid' => $data['pid'],
+                    'subject' => $data['subject'],
+                    'text' => $data['text'],
+                    'category_id' => $data['category_id'],
+                    'edited_by' => null,
+                    'fixed' => false,
+                    'solves' => 0,
+                    'views' => 0,
+                    'ip' => '',
+                    'time' => date("Y-m-d H:i:s")
+                )
+            );
+            $this->Entry->prepare($newEntry);
+            $this->Entry->set($newEntry);
+
+            $this->Entry->validates(['fieldList' => ['subject', 'text', 'category_id']]);
+            $errors = $this->Entry->validationErrors;
+
+            if (count($errors) === 0) :
+                // no validation errors
+                $newEntry['User'] = $this->CurrentUser->getSettings();
+                $newEntry = array_merge(
+                    $newEntry,
+                    $this->Entry->Category->find(
+                        'first',
+                        array(
+                            'conditions' => array(
+                                'id' => $newEntry['Entry']['category_id']
+                            ),
+                            'contain' => false,
+                        )
+                    )
+                );
+                $entry = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $newEntry]);
+                $this->set('entry', $entry);
+            else :
+                // validation errors
+                foreach ($errors as $field => $error) {
+                    $message = __d('nondynamic', $field) . ": " . __d( 'nondynamic', $error[0]);
+                    $this->JsData->addAppJsMessage(
+                        $message,
+                        [
+                            'type' => 'error',
+                            'channel' => 'form',
+                            'element' => '#Entry' . array_reduce(
+                                    explode('_', $field),
+                                    function ($carry, $item) {
+                                        return $carry . ucfirst($item);
+                                    },
+                                    ''
+                                )
+                        ]
+                    );
+                }
+                $this->autoRender = false;
+                return json_encode($this->JsData->getAppJsMessages());
+            endif;
+        }
 
 /**
  * @param null $id
@@ -614,37 +614,37 @@ 
  * @throws NotFoundException
  * @throws MethodNotAllowedException
  */
-		public function merge($id = null) {
-			if (!$id) {
-				throw new NotFoundException();
-			}
-
-			if (!$this->CurrentUser->isMod() && !$this->CurrentUser->isAdmin()) {
-				throw new MethodNotAllowedException;
-			}
-
-			$this->Entry->contain();
-			$data = $this->Entry->findById($id);
-
-			if (!$data || (int)$data['Entry']['pid'] !== 0) {
-				throw new NotFoundException();
-			}
-
-			// perform move operation
-			if (isset($this->request->data['Entry']['targetId'])) {
-				$targetId = $this->request->data['Entry']['targetId'];
-				$this->Entry->id = $id;
-				if ($this->Entry->threadMerge($targetId)) {
-					$this->redirect('/entries/view/' . $id);
-					return;
-				} else {
-					$this->Session->setFlash(__("Error"), 'flash/error');
-				}
-			}
-
-			$this->layout = 'admin';
-			$this->request->data = $data;
-		}
+        public function merge($id = null) {
+            if (!$id) {
+                throw new NotFoundException();
+            }
+
+            if (!$this->CurrentUser->isMod() && !$this->CurrentUser->isAdmin()) {
+                throw new MethodNotAllowedException;
+            }
+
+            $this->Entry->contain();
+            $data = $this->Entry->findById($id);
+
+            if (!$data || (int)$data['Entry']['pid'] !== 0) {
+                throw new NotFoundException();
+            }
+
+            // perform move operation
+            if (isset($this->request->data['Entry']['targetId'])) {
+                $targetId = $this->request->data['Entry']['targetId'];
+                $this->Entry->id = $id;
+                if ($this->Entry->threadMerge($targetId)) {
+                    $this->redirect('/entries/view/' . $id);
+                    return;
+                } else {
+                    $this->Session->setFlash(__("Error"), 'flash/error');
+                }
+            }
+
+            $this->layout = 'admin';
+            $this->request->data = $data;
+        }
 
 /**
  * @param null $id
@@ -652,316 +652,316 @@ 
  *
  * @return translated
  */
-		public function ajax_toggle($id = null, $toggle = null) {
-			$this->autoLayout = false;
-			$this->autoRender = false;
-
-			if (!$id || !$toggle || !$this->request->is('ajax')) {
-				return;
-			}
-
-			// check if the requested toggle is allowed to be changed via this function
-			$allowedToggles = array(
-					'fixed',
-					'locked',
-			);
-			if (!in_array($toggle, $allowedToggles)) {
-				$this->request->data = false;
-
-				// check is user is allowed to perform operation
-				// luckily we only mod options in the allowed toggles
-			} elseif ($this->CurrentUser->isMod() === false) {
-				$this->request->data = false;
-			} else {
-				//* let's toggle
-				$this->Entry->id = $id;
-				$this->request->data = $this->Entry->toggle($toggle);
-				return ($this->request->data == 0) ? __d('nondynamic', $toggle . '_set_entry_link') : __d('nondynamic', $toggle . '_unset_entry_link');
-			}
-
-			$this->set('json_data', (string)$this->request->data);
-			$this->render('/Elements/json/json_data');
-		}
-
-		public function beforeFilter() {
-			parent::beforeFilter();
-			Stopwatch::start('Entries->beforeFilter()');
-
-			$this->_automaticalyMarkAsRead();
-
-			$this->Security->unlockedActions = ['preview', 'solve', 'view'];
-			$this->Auth->allow('feed', 'index', 'view', 'mix', 'update');
-
-			switch ($this->request->action) {
-				case 'index':
-					$this->_setAutoRefreshTime();
-					break;
-				case 'add':
-				case 'edit':
-					if ($this->Components->enabled('Security')) {
-						$this->Components->disable('Security');
-					}
-			}
-
-			Stopwatch::stop('Entries->beforeFilter()');
-		}
-
-		public function afterFilter() {
-			if (isset($this->_marMixThread)) {
-				$entries = $this->Entry->find('all',
-						[
-								'contain' => false,
-								'conditions' => ['Entry.tid' => $this->_marMixThread],
-								'fields' => ['Entry.id', 'Entry.time']
-						]);
-				$this->CurrentUser->ReadEntries->set($entries);
-			}
-		}
-
-		protected function _automaticalyMarkAsRead() {
-			if (!$this->CurrentUser->isLoggedIn() ||
-					!$this->CurrentUser['user_automaticaly_mark_as_read']
-			) {
-				return;
-			}
-
-			if ($this->request->action === "index" &&
-					!$this->Session->read('User.last_refresh_tmp')
-			) {
-				// initiate sessions last_refresh_tmp for new sessions
-				$this->Session->write('User.last_refresh_tmp', time());
-			}
-
-			/* // old
+        public function ajax_toggle($id = null, $toggle = null) {
+            $this->autoLayout = false;
+            $this->autoRender = false;
+
+            if (!$id || !$toggle || !$this->request->is('ajax')) {
+                return;
+            }
+
+            // check if the requested toggle is allowed to be changed via this function
+            $allowedToggles = array(
+                    'fixed',
+                    'locked',
+            );
+            if (!in_array($toggle, $allowedToggles)) {
+                $this->request->data = false;
+
+                // check is user is allowed to perform operation
+                // luckily we only mod options in the allowed toggles
+            } elseif ($this->CurrentUser->isMod() === false) {
+                $this->request->data = false;
+            } else {
+                //* let's toggle
+                $this->Entry->id = $id;
+                $this->request->data = $this->Entry->toggle($toggle);
+                return ($this->request->data == 0) ? __d('nondynamic', $toggle . '_set_entry_link') : __d('nondynamic', $toggle . '_unset_entry_link');
+            }
+
+            $this->set('json_data', (string)$this->request->data);
+            $this->render('/Elements/json/json_data');
+        }
+
+        public function beforeFilter() {
+            parent::beforeFilter();
+            Stopwatch::start('Entries->beforeFilter()');
+
+            $this->_automaticalyMarkAsRead();
+
+            $this->Security->unlockedActions = ['preview', 'solve', 'view'];
+            $this->Auth->allow('feed', 'index', 'view', 'mix', 'update');
+
+            switch ($this->request->action) {
+                case 'index':
+                    $this->_setAutoRefreshTime();
+                    break;
+                case 'add':
+                case 'edit':
+                    if ($this->Components->enabled('Security')) {
+                        $this->Components->disable('Security');
+                    }
+            }
+
+            Stopwatch::stop('Entries->beforeFilter()');
+        }
+
+        public function afterFilter() {
+            if (isset($this->_marMixThread)) {
+                $entries = $this->Entry->find('all',
+                        [
+                                'contain' => false,
+                                'conditions' => ['Entry.tid' => $this->_marMixThread],
+                                'fields' => ['Entry.id', 'Entry.time']
+                        ]);
+                $this->CurrentUser->ReadEntries->set($entries);
+            }
+        }
+
+        protected function _automaticalyMarkAsRead() {
+            if (!$this->CurrentUser->isLoggedIn() ||
+                    !$this->CurrentUser['user_automaticaly_mark_as_read']
+            ) {
+                return;
+            }
+
+            if ($this->request->action === "index" &&
+                    !$this->Session->read('User.last_refresh_tmp')
+            ) {
+                // initiate sessions last_refresh_tmp for new sessions
+                $this->Session->write('User.last_refresh_tmp', time());
+            }
+
+            /* // old
 			$isMarkAsReadRequest = $this->localReferer('controller') === 'entries' &&
 					$this->localReferer('action') === 'index' &&
 					$this->request->action === "index";
 			*/
 
-			$isMarkAsReadRequest = isset($this->request->query['mar']) &&
-					$this->request->query['mar'] === '';
-
-			if ($isMarkAsReadRequest &&
-					$this->request->isPreview() === false
-			) {
-				// a second session A shall not accidentally mark something as read that isn't read on session B
-				if ($this->Session->read('User.last_refresh_tmp') > $this->CurrentUser['last_refresh_unix']) {
-					$this->CurrentUser->LastRefresh->set();
-				}
-				$this->Session->write('User.last_refresh_tmp', time());
-				$this->redirect('/');
-				return;
-			} elseif ($this->request->action === "index") {
-				$this->CurrentUser->LastRefresh->setMarker();
-			}
-		}
-
-		protected function _prepareSlidetabData() {
-			if ($this->CurrentUser->isLoggedIn()) {
-				// get current user's recent entries for slidetab
-				$this->set(
-					'recentPosts',
-					$this->Entry->getRecentEntries(
-						$this->CurrentUser,
-						[
-							'user_id' => $this->CurrentUser->getId(),
-							'limit' => 5
-						]
-					)
-				);
-				// get last 10 recent entries for slidetab
-				$this->set(
-					'recentEntries',
-					$this->Entry->getRecentEntries($this->CurrentUser)
-				);
-				// get shouts
-				if (in_array('slidetab_shoutbox', $this->viewVars['slidetabs'])) {
-					$this->Shouts->setShoutsForView();
-				}
-			}
-		}
-
-		protected function _incrementViews($entry, $type = null) {
-			if ($this->CurrentUser->isBot()) {
-				return;
-			}
-			$cUserId = $this->CurrentUser->getId();
-
-			if ($type === 'thread') {
-				$this->Entry->threadIncrementViews($entry['Entry']['tid'], $cUserId);
-			} elseif ($entry['Entry']['user_id'] != $cUserId) {
-				$this->Entry->incrementViews($entry['Entry']['id']);
-			}
-		}
-
-		protected function _setNotifications($newEntry) {
-			if (isset($newEntry['Event'])) {
-				$notis = [
-					[
-						'subject' => $newEntry['Entry']['id'],
-						'event' => 'Model.Entry.replyToEntry',
-						'receiver' => 'EmailNotification',
-						'set' => $newEntry['Event'][1]['event_type_id'],
-					],
-					[
-						'subject' => $newEntry['Entry']['tid'],
-						'event' => 'Model.Entry.replyToThread',
-						'receiver' => 'EmailNotification',
-						'set' => $newEntry['Event'][2]['event_type_id'],
-					]
-				];
-				$this->Entry->Esevent->notifyUserOnEvents(
-					$newEntry['Entry']['user_id'],
-					$notis
-				);
-			}
-		}
-
-		protected function _setAutoRefreshTime() {
-			if (!$this->CurrentUser->isLoggedIn()) {
-				return;
-			}
-			if ($this->CurrentUser['user_forum_refresh_time'] > 0) {
-				$this->set(
-					'autoPageReload',
-					$this->CurrentUser['user_forum_refresh_time'] * 60
-				);
-			}
-		}
-
-		/**
-		 * Gets thread ids for paginated entries/index.
-		 *
-		 * @param CurrentUserComponent $User
-		 * @param array $order sort order
-		 * @return array thread ids
-		 */
-		protected function _getInitialThreads(CurrentUserComponent $User, $order) {
-			Stopwatch::start('Entries->_getInitialThreads() Paginate');
-
-			$categories = $this->_setupCategoryChooser($User);
-
-			//! Check DB performance after changing conditions/sorting!
-			$this->paginate = [
-				'conditions' => [
-					'pid' => 0,
-					'Entry.category_id' => $categories
-				],
-				'contain' => false,
-				'fields' => 'id, pid, tid, time, last_answer, fixed',
-				'limit' => Configure::read('Saito.Settings.topics_per_page'),
-				'order' => $order,
-				'getInitialThreads' => 1,
-			];
-
-			// disallows overwriting pagination params from request
-			unset(
-				$this->request->params['named']['direction'],
-				$this->request->params['named']['sort']
-			);
-			$initialThreads = $this->paginate(null, null, array_keys($order));
-
-			$initialThreadsNew = [];
-			foreach ($initialThreads as $k => $v) {
-				$initialThreadsNew[$k] = $v['Entry']['id'];
-			}
-			Stopwatch::stop('Entries->_getInitialThreads() Paginate');
-
-			return $initialThreadsNew;
-		}
-
-		protected function _setupCategoryChooser(\Saito\User\ForumsUserInterface $User) {
-			$categories = $User->Categories->getAllowed();
-
-			$isUsed = $User->isLoggedIn() &&
-					(
-							Configure::read('Saito.Settings.category_chooser_global') ||
-							(
-									Configure::read(
-										'Saito.Settings.category_chooser_user_override'
-									) && $User['user_category_override']
-							)
-					);
-
-			if ($isUsed) {
-				// @todo find right place for this; also: User::getCategories();
-				$UserCategories = new Categories($User->getSettings(), $categories);
-				list($categories, $type, $custom) = $UserCategories->get();
-
-				$this->set('categoryChooserChecked', $custom);
-
-				switch ($type) {
-					case 'single':
-						$title = $User['user_category_active'];
-						break;
-					case 'custom':
-						$title = __('Custom');
-						break;
-					default:
-						$title = __('All Categories');
-				}
-				$this->set('categoryChooserTitleId', $title);
-				$this->set('categoryChooser', $User->Categories->getAllowed('list'));
-			}
-			return $categories;
-		}
-
-		protected function _setAddViewVars() {
-			//= categories for dropdown
-			$categories = $this->CurrentUser->Categories->getAllowed('list');
-			$this->set('categories', $categories);
-		}
+            $isMarkAsReadRequest = isset($this->request->query['mar']) &&
+                    $this->request->query['mar'] === '';
+
+            if ($isMarkAsReadRequest &&
+                    $this->request->isPreview() === false
+            ) {
+                // a second session A shall not accidentally mark something as read that isn't read on session B
+                if ($this->Session->read('User.last_refresh_tmp') > $this->CurrentUser['last_refresh_unix']) {
+                    $this->CurrentUser->LastRefresh->set();
+                }
+                $this->Session->write('User.last_refresh_tmp', time());
+                $this->redirect('/');
+                return;
+            } elseif ($this->request->action === "index") {
+                $this->CurrentUser->LastRefresh->setMarker();
+            }
+        }
+
+        protected function _prepareSlidetabData() {
+            if ($this->CurrentUser->isLoggedIn()) {
+                // get current user's recent entries for slidetab
+                $this->set(
+                    'recentPosts',
+                    $this->Entry->getRecentEntries(
+                        $this->CurrentUser,
+                        [
+                            'user_id' => $this->CurrentUser->getId(),
+                            'limit' => 5
+                        ]
+                    )
+                );
+                // get last 10 recent entries for slidetab
+                $this->set(
+                    'recentEntries',
+                    $this->Entry->getRecentEntries($this->CurrentUser)
+                );
+                // get shouts
+                if (in_array('slidetab_shoutbox', $this->viewVars['slidetabs'])) {
+                    $this->Shouts->setShoutsForView();
+                }
+            }
+        }
+
+        protected function _incrementViews($entry, $type = null) {
+            if ($this->CurrentUser->isBot()) {
+                return;
+            }
+            $cUserId = $this->CurrentUser->getId();
+
+            if ($type === 'thread') {
+                $this->Entry->threadIncrementViews($entry['Entry']['tid'], $cUserId);
+            } elseif ($entry['Entry']['user_id'] != $cUserId) {
+                $this->Entry->incrementViews($entry['Entry']['id']);
+            }
+        }
+
+        protected function _setNotifications($newEntry) {
+            if (isset($newEntry['Event'])) {
+                $notis = [
+                    [
+                        'subject' => $newEntry['Entry']['id'],
+                        'event' => 'Model.Entry.replyToEntry',
+                        'receiver' => 'EmailNotification',
+                        'set' => $newEntry['Event'][1]['event_type_id'],
+                    ],
+                    [
+                        'subject' => $newEntry['Entry']['tid'],
+                        'event' => 'Model.Entry.replyToThread',
+                        'receiver' => 'EmailNotification',
+                        'set' => $newEntry['Event'][2]['event_type_id'],
+                    ]
+                ];
+                $this->Entry->Esevent->notifyUserOnEvents(
+                    $newEntry['Entry']['user_id'],
+                    $notis
+                );
+            }
+        }
+
+        protected function _setAutoRefreshTime() {
+            if (!$this->CurrentUser->isLoggedIn()) {
+                return;
+            }
+            if ($this->CurrentUser['user_forum_refresh_time'] > 0) {
+                $this->set(
+                    'autoPageReload',
+                    $this->CurrentUser['user_forum_refresh_time'] * 60
+                );
+            }
+        }
+
+        /**
+         * Gets thread ids for paginated entries/index.
+         *
+         * @param CurrentUserComponent $User
+         * @param array $order sort order
+         * @return array thread ids
+         */
+        protected function _getInitialThreads(CurrentUserComponent $User, $order) {
+            Stopwatch::start('Entries->_getInitialThreads() Paginate');
+
+            $categories = $this->_setupCategoryChooser($User);
+
+            //! Check DB performance after changing conditions/sorting!
+            $this->paginate = [
+                'conditions' => [
+                    'pid' => 0,
+                    'Entry.category_id' => $categories
+                ],
+                'contain' => false,
+                'fields' => 'id, pid, tid, time, last_answer, fixed',
+                'limit' => Configure::read('Saito.Settings.topics_per_page'),
+                'order' => $order,
+                'getInitialThreads' => 1,
+            ];
+
+            // disallows overwriting pagination params from request
+            unset(
+                $this->request->params['named']['direction'],
+                $this->request->params['named']['sort']
+            );
+            $initialThreads = $this->paginate(null, null, array_keys($order));
+
+            $initialThreadsNew = [];
+            foreach ($initialThreads as $k => $v) {
+                $initialThreadsNew[$k] = $v['Entry']['id'];
+            }
+            Stopwatch::stop('Entries->_getInitialThreads() Paginate');
+
+            return $initialThreadsNew;
+        }
+
+        protected function _setupCategoryChooser(\Saito\User\ForumsUserInterface $User) {
+            $categories = $User->Categories->getAllowed();
+
+            $isUsed = $User->isLoggedIn() &&
+                    (
+                            Configure::read('Saito.Settings.category_chooser_global') ||
+                            (
+                                    Configure::read(
+                                        'Saito.Settings.category_chooser_user_override'
+                                    ) && $User['user_category_override']
+                            )
+                    );
+
+            if ($isUsed) {
+                // @todo find right place for this; also: User::getCategories();
+                $UserCategories = new Categories($User->getSettings(), $categories);
+                list($categories, $type, $custom) = $UserCategories->get();
+
+                $this->set('categoryChooserChecked', $custom);
+
+                switch ($type) {
+                    case 'single':
+                        $title = $User['user_category_active'];
+                        break;
+                    case 'custom':
+                        $title = __('Custom');
+                        break;
+                    default:
+                        $title = __('All Categories');
+                }
+                $this->set('categoryChooserTitleId', $title);
+                $this->set('categoryChooser', $User->Categories->getAllowed('list'));
+            }
+            return $categories;
+        }
+
+        protected function _setAddViewVars() {
+            //= categories for dropdown
+            $categories = $this->CurrentUser->Categories->getAllowed('list');
+            $this->set('categories', $categories);
+        }
 
 /**
  * Decide if an answering panel is show when rendering a posting
  */
-		protected function _showAnsweringPanel() {
-			$showAnsweringPanel = false;
-
-			if ($this->CurrentUser->isLoggedIn()) {
-				// Only logged in users see the answering buttons if they …
-				if (// … directly on entries/view but not inline
-						($this->request->action === 'view' && !$this->request->is('ajax'))
-						// … directly in entries/mix
-						|| $this->request->action === 'mix'
-						// … inline viewing … on entries/index.
-						|| ( $this->localReferer('controller') === 'entries' && $this->localReferer('action') === 'index')
-				):
-					$showAnsweringPanel = true;
-				endif;
-			}
-			$this->set('showAnsweringPanel', $showAnsweringPanel);
-		}
-
-		protected function _setRootEntry($entry) {
-			if ((int)$entry['Entry']['pid'] !== 0) {
-				$_rootEntry = $this->Entry->find('first',
-					[
-						'contain' => false,
-						'conditions' => ['Entry.id' => $entry['Entry']['tid']],
-						'fields' => ['Entry.user_id']
-					]);
-			} else {
-				$_rootEntry = $entry;
-			}
-			$this->set('rootEntry', $_rootEntry);
-		}
-
-		protected function _setTitleFromEntry($entry, $type = null) {
-			if ($type === null) {
-				$template =	__(':subject | :category');
-			} else {
-				$template =	__(':subject (:type) | :category');
-			}
-			$this->set('title_for_layout',
-					CakeText::insert($template,
-							[
-									'category' => $entry['Category']['category'],
-									'subject' => $entry['Entry']['subject'],
-									'type' => $type
-							]
-					)
-			);
-		}
-
-	}
+        protected function _showAnsweringPanel() {
+            $showAnsweringPanel = false;
+
+            if ($this->CurrentUser->isLoggedIn()) {
+                // Only logged in users see the answering buttons if they …
+                if (// … directly on entries/view but not inline
+                        ($this->request->action === 'view' && !$this->request->is('ajax'))
+                        // … directly in entries/mix
+                        || $this->request->action === 'mix'
+                        // … inline viewing … on entries/index.
+                        || ( $this->localReferer('controller') === 'entries' && $this->localReferer('action') === 'index')
+                ):
+                    $showAnsweringPanel = true;
+                endif;
+            }
+            $this->set('showAnsweringPanel', $showAnsweringPanel);
+        }
+
+        protected function _setRootEntry($entry) {
+            if ((int)$entry['Entry']['pid'] !== 0) {
+                $_rootEntry = $this->Entry->find('first',
+                    [
+                        'contain' => false,
+                        'conditions' => ['Entry.id' => $entry['Entry']['tid']],
+                        'fields' => ['Entry.user_id']
+                    ]);
+            } else {
+                $_rootEntry = $entry;
+            }
+            $this->set('rootEntry', $_rootEntry);
+        }
+
+        protected function _setTitleFromEntry($entry, $type = null) {
+            if ($type === null) {
+                $template =	__(':subject | :category');
+            } else {
+                $template =	__(':subject (:type) | :category');
+            }
+            $this->set('title_for_layout',
+                    CakeText::insert($template,
+                            [
+                                    'category' => $entry['Category']['category'],
+                                    'subject' => $entry['Entry']['subject'],
+                                    'type' => $type
+                            ]
+                    )
+            );
+        }
+
+    }

Braces +9 added lines, -3 removed lines

@@ -242,7 +242,8 @@ 
 							$this->_stop();
 						}
 					// answering through POST request
-					else :
+					else {
+					    :
 						if ($this->localReferer('action') === 'mix') {
 							// answer request came from mix ansicht
 							$this->redirect(
@@ -253,6 +254,7 @@ 
 									'#' => $this->Entry->id
 								]
 							);
+					}
 
 						} else {
 							// normal posting from entries/add or entries/view
@@ -267,7 +269,8 @@ 
 						}
 						return;
 					endif;
-				else :
+				else {
+				    :
 					// Error while trying to save a post
 					if (count($this->Entry->validationErrors) === 0) {
 						$this->Session->setFlash(
@@ -276,6 +279,7 @@ 
 							),
 							'flash/error'
 						);
+				}
 					}
 				endif;
 
@@ -584,10 +588,12 @@ 
 				);
 				$entry = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $newEntry]);
 				$this->set('entry', $entry);
-			else :
+			else {
+			    :
 				// validation errors
 				foreach ($errors as $field => $error) {
 					$message = __d('nondynamic', $field) . ": " . __d( 'nondynamic', $error[0]);
+			}
 					$this->JsData->addAppJsMessage(
 						$message,
 						[

app/Controller/StatusController.php

Doc Comments +6 added lines

@@ -28,6 +28,9 @@ 
 			}
 		}
 
+		/**
+		 * @param string $data
+		 */
 		protected function _statusAsEventStream($data) {
 			// time in ms to next request
 			$_retry = '10000';
@@ -40,6 +43,9 @@ 
 			return $_out;
 		}
 
+		/**
+		 * @param string $data
+		 */
 		protected function _statusAsJson($data) {
 			if ($this->request->is('ajax') === false) {
 				throw new BadRequestException();

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 			$this->response->disableCache();
 			$_out = '';
 			$_out .= "retry: $_retry\n";
-			$_out .= 'data: ' . $data . "\n\n";
+			$_out .= 'data: '.$data."\n\n";
 			return $_out;
 		}
 

Indentation +55 added lines, -55 removed lines

@@ -1,57 +1,57 @@
 <?php
 
-	App::uses('AppController', 'Controller');
-
-	class StatusController extends AppController {
-
-		public $uses = [
-			'Shout'
-		];
-
-		public $autoRender = false;
-
-		/**
-		 * Current app status ping
-		 *
-		 * @return string
-		 * @throws BadRequestException
-		 */
-		public function status() {
-			$data = [
-				'lastShoutId' => $this->Shout->findLastId()
-			];
-			$data = json_encode($data);
-			if ($this->request->accepts('text/event-streams')) {
-				return $this->_statusAsEventStream($data);
-			} else {
-				return $this->_statusAsJson($data);
-			}
-		}
-
-		protected function _statusAsEventStream($data) {
-			// time in ms to next request
-			$_retry = '10000';
-			$this->response->type(['eventstream' => 'text/event-stream']);
-			$this->response->type('eventstream');
-			$this->response->disableCache();
-			$_out = '';
-			$_out .= "retry: $_retry\n";
-			$_out .= 'data: ' . $data . "\n\n";
-			return $_out;
-		}
-
-		protected function _statusAsJson($data) {
-			if ($this->request->is('ajax') === false) {
-				throw new BadRequestException();
-			}
-			return $data;
-		}
-
-		public function beforeFilter() {
-			parent::beforeFilter();
-			if ($this->Components->enabled('Auth')) {
-				$this->Components->disable('Auth');
-			}
-		}
-
-	}
+    App::uses('AppController', 'Controller');
+
+    class StatusController extends AppController {
+
+        public $uses = [
+            'Shout'
+        ];
+
+        public $autoRender = false;
+
+        /**
+         * Current app status ping
+         *
+         * @return string
+         * @throws BadRequestException
+         */
+        public function status() {
+            $data = [
+                'lastShoutId' => $this->Shout->findLastId()
+            ];
+            $data = json_encode($data);
+            if ($this->request->accepts('text/event-streams')) {
+                return $this->_statusAsEventStream($data);
+            } else {
+                return $this->_statusAsJson($data);
+            }
+        }
+
+        protected function _statusAsEventStream($data) {
+            // time in ms to next request
+            $_retry = '10000';
+            $this->response->type(['eventstream' => 'text/event-stream']);
+            $this->response->type('eventstream');
+            $this->response->disableCache();
+            $_out = '';
+            $_out .= "retry: $_retry\n";
+            $_out .= 'data: ' . $data . "\n\n";
+            return $_out;
+        }
+
+        protected function _statusAsJson($data) {
+            if ($this->request->is('ajax') === false) {
+                throw new BadRequestException();
+            }
+            return $data;
+        }
+
+        public function beforeFilter() {
+            parent::beforeFilter();
+            if ($this->Components->enabled('Auth')) {
+                $this->Components->disable('Auth');
+            }
+        }
+
+    }

app/Controller/UsersController.php

Doc Comments +4 added lines, -1 removed lines

@@ -221,6 +221,9 @@ 
 			$this->_ignore($blockedId, false);
 		}
 
+		/**
+		 * @param boolean $set
+		 */
 		protected function _ignore($blockedId, $set) {
 			if (!$this->CurrentUser->isLoggedIn() || !is_numeric($blockedId)) {
 				throw new BadRequestException();
@@ -661,7 +664,7 @@ 
 		 *
 		 * @param SaitoUser $CurrentUser
 		 * @param int $userId
-		 * @return type
+		 * @return boolean
 		 */
 		protected function _isEditingAllowed(\Saito\User\ForumsUserInterface $CurrentUser, $userId) {
 			if ($CurrentUser->isAdmin()) {

Spacing +5 added lines, -5 removed lines

@@ -157,7 +157,7 @@ 
 			$code = $this->request->query('c');
 
 			try {
-				$activated = $this->User->activate((int)$id, $code);
+				$activated = $this->User->activate((int) $id, $code);
 			} catch (Exception $e) {
 				$activated = false;
 			}
@@ -421,7 +421,7 @@ 
 				return;
 			}
 
-			$id = (int)$this->request->data('User.lockUserId');
+			$id = (int) $this->request->data('User.lockUserId');
 			if (!$id) {
 				throw new BadRequestException;
 			}
@@ -445,7 +445,7 @@ 
 				);
 			} else {
 				try {
-					$duration = (int)$this->request->data('User.lockPeriod');
+					$duration = (int) $this->request->data('User.lockPeriod');
 					$status = $this->User->UserBlock->block(
 						new \Saito\User\Blocker\ManualBlocker,
 						$id,
@@ -608,7 +608,7 @@ 
 			}
 
 			$allowed = $this->viewVars['slidetabs'];
-			$order = array_filter( $order, function ($item) use ($allowed) {
+			$order = array_filter($order, function($item) use ($allowed) {
 				return in_array($item, $allowed);
 			});
 			$order = serialize($order);
@@ -667,7 +667,7 @@ 
 			if ($CurrentUser->isAdmin()) {
 				return true;
 			}
-			return $CurrentUser->getId() === (int)$userId;
+			return $CurrentUser->getId() === (int) $userId;
 		}
 
 		protected function _passwordAuthSwitch($data) {

Indentation +677 added lines, -677 removed lines

@@ -1,679 +1,679 @@
 <?php
 
-	use Saito\Exception\Logger\ExceptionLogger;
-	use Saito\Exception\Logger\ForbiddenLogger;
-	use Saito\Exception\SaitoForbiddenException;
-	use Saito\User\SaitoUser;
-
-	App::uses('AppController', 'Controller');
-
-	class UsersController extends AppController {
-
-		public $name = 'Users';
-
-		public $helpers = [
-			'Farbtastic',
-			'SimpleCaptcha.SimpleCaptcha',
-			'EntryH',
-			'Map',
-			'Text'
-		];
-
-		public function login() {
-			$this->CurrentUser->logOut();
-
-			//# just show form
-			if (empty($this->request->data['User']['username'])) {
-				return;
-			}
-
-			//# successful login with request data
-			if ($this->CurrentUser->login()) {
-				if ($this->localReferer('action') === 'login') {
-					$this->redirect($this->Auth->redirectUrl());
-				} else {
-					$this->redirect($this->referer());
-				}
-				return;
-			}
-
-			//# error on login
-			$this->User->contain();
-			$username = $this->request->data['User']['username'];
-			$readUser = $this->User->findByUsername($username);
-
-			$status = null;
-
-			if (!empty($readUser)) {
-				$User = new SaitoUser($readUser['User']);
-				$status = $User->isForbidden();
-			}
-
-			switch ($status) {
-				case 'locked':
-					$ends = $this->User->UserBlock
-						->getBlockEndsForUser($readUser['User']['id']);
-					if ($ends) {
-						$message = __('user.block.pubExpEnds', [$username,
-							CakeTime::timeAgoInWords($ends, ['accuracy' => 'hour'])]);
-					} else {
-						$message = __('user.block.pubExp', $username);
-					}
-					break;
-				case 'unactivated':
-					$message = __('User %s is not activated yet.', $readUser['User']['username']);
-					break;
-				default:
-					$message = __('auth_loginerror');
-			}
-
-			// don't autofill password
-			unset($this->request->data['User']['password']);
-
-			$Logger = new ForbiddenLogger;
-			$Logger->write("Unsuccessful login for user: $username",
-				['msgs' => [$message]]);
-
-			$this->Session->setFlash($message, 'default', [], 'auth');
-		}
-
-		public function logout() {
-			$this->CurrentUser->logout();
-		}
-
-		public function register() {
-			$this->set('status', 'view');
-
-			$this->CurrentUser->logout();
-
-			$tosRequired = Configure::read('Saito.Settings.tos_enabled');
-			$this->set(compact('tosRequired'));
-
-			// display empty form
-			if (empty($this->request->data)) {
-				return;
-			}
-
-			$data = $this->request->data;
-
-			if (!$tosRequired) {
-				$data['User']['tos_confirm'] = true;
-			}
-
-			$tosConfirmed = $data['User']['tos_confirm'];
-			if (!$tosConfirmed) {
-				return;
-			}
-
-			$data = $this->_passwordAuthSwitch($data);
-			$this->User->Behaviors->attach('SimpleCaptcha.SimpleCaptcha');
-			$user = $this->User->register($data);
-
-			// registering failed, show form again
-			if (!$user) {
-				// undo the passwordAuthSwitch() to display error message for the field
-				if (isset($this->User->validationErrors['password'])) {
-					$this->User->validationErrors['user_password'] = $this->User->validationErrors['password'];
-				}
-				$data['User']['tos_confirm'] = false;
-				$this->request->data = $data;
-				return;
-			}
-
-			// registered successfully
-			try {
-				$forumName = Configure::read('Saito.Settings.forum_name');
-				$subject = __('register_email_subject', $forumName);
-				$email = $this->SaitoEmail->email([
-					'recipient' => $data,
-					'subject' => $subject,
-					'sender' => 'register',
-					'template' => 'user_register',
-					'viewVars' => ['user' => $user]
-				]);
-				// only used in test cases
-				$this->set('email', $email);
-			} catch (Exception $e) {
-				$Logger = new ExceptionLogger();
-				$Logger->write('Registering email confirmation failed', ['e' => $e]);
-				$this->set('status', 'fail: email');
-				return;
-			}
-
-			$this->set('status', 'success');
-		}
-
-		/**
-		 * register success (user clicked link in confirm mail)
-		 *
-		 * @param $id
-		 * @throws BadRequestException
-		 */
-		public function rs($id = null) {
-			if (!$id) {
-				throw new BadRequestException();
-			}
-
-			$code = $this->request->query('c');
-
-			try {
-				$activated = $this->User->activate((int)$id, $code);
-			} catch (Exception $e) {
-				$activated = false;
-			}
-
-			if (!$activated) {
-				$activated = ['status' => 'fail'];
-			}
-			$this->set('status', $activated['status']);
-		}
-
-		public function admin_index() {
-			$data = $this->User->find(
-					'all',
-					[
-							'contain' => false,
-							'fields' => [
-									'id',
-									'username',
-									'user_type',
-									'user_email',
-									'registered',
-									'user_lock'
-							],
-							'order' => ['User.username' => 'asc']
-					]
-			);
-			$this->set('users', $data);
-		}
-
-		public function index() {
-			$menuItems = [
-				'username' => [__('username_marking'), []],
-				'user_type' => [__('user_type'), []],
-				'UserOnline.logged_in' => [__('userlist_online'), ['direction' => 'desc']],
-				'registered' => [__('registered'), ['direction' => 'desc']]
-			];
-			$showBlocked = Configure::read('Saito.Settings.block_user_ui');
-			if ($showBlocked) {
-				$menuItems['user_lock'] = [__('user.set.lock.t'), ['direction' => 'desc']];
-			}
-
-			$this->paginate = [
-				'contain' => 'UserOnline',
-				'limit' => 400,
-				'order' => ['UserOnline.logged_in' => 'desc', 'User.username' => 'asc']
-			];
-			$users = $this->paginate('User', null, array_keys($menuItems));
-
-			$this->set(compact('menuItems', 'users'));
-		}
-
-		public function ignore() {
-			$this->request->allowMethod('POST');
-			$blockedId = $this->request->data('id');
-			$this->_ignore($blockedId, true);
-		}
-
-		public function unignore() {
-			$this->request->allowMethod('POST');
-			$blockedId = $this->request->data('id');
-			$this->_ignore($blockedId, false);
-		}
-
-		protected function _ignore($blockedId, $set) {
-			if (!$this->CurrentUser->isLoggedIn() || !is_numeric($blockedId)) {
-				throw new BadRequestException();
-			}
-			$userId = $this->CurrentUser->getId();
-			$this->User->id = $userId;
-			if (!$this->User->exists($userId) || $userId == $blockedId) {
-				throw new BadRequestException();
-			}
-			if ($set) {
-				$this->User->Ignore->ignore($userId, $blockedId);
-			} else {
-				$this->User->Ignore->unignore($userId, $blockedId);
-			}
-			$this->redirect($this->referer());
-		}
-
-		public function admin_add() {
-			if (!empty($this->request->data)) :
-				$this->request->data = $this->_passwordAuthSwitch($this->request->data);
-				if ($this->User->register($this->request->data, true)) {
-					$this->Session->setFlash(__('user.admin.add.success'),
-							'flash/success');
-					$this->redirect(['action' => 'view', $this->User->id, 'admin' => false]);
-				}
-			endif;
-		}
-
-		public function map() {
-			if (!Configure::read('Saito.Settings.map_enabled')) {
-				$this->Session->setFlash(__('admin.setting.disabled', __('admin.feat.map')), 'flash/error');
-				$this->redirect('/');
-				return;
-			}
-			$users = $this->User->find('all',
-					[
-							'contain' => false,
-							'conditions' => ['user_place_lat !=' => null],
-							'fields' => [
-									'User.id',
-									'User.username',
-									'User.user_place_lat',
-									'User.user_place_lng'
-							]
-					]
-			);
-			$this->set(compact('users'));
-		}
-
-		public function name($id = null) {
-			if (!empty($id)) {
-				$this->User->contain();
-				$viewedUser = $this->User->findByUsername($id);
-				if (!empty($viewedUser)) {
-					$this->redirect(
-						[
-							'controller' => 'users',
-							'action' => 'view',
-							$viewedUser['User']['id']
-						]
-					);
-					return;
-				}
-			}
-			$this->Session->setFlash(__('Invalid user'), 'flash/error');
-			$this->redirect('/');
-		}
-
-		public function view($id = null) {
-			// redirect view/<username> to name/<username>
-			if (!empty($id) && !is_numeric($id)) {
-				$this->redirect(
-					[
-						'controller' => 'users',
-						'action' => 'name',
-						$id
-					]
-				);
-				return; // test case return
-			}
-
-			$this->User->id = $id;
-			$this->User->contain(['UserBlock' => ['By'], 'UserOnline']);
-			$viewedUser = $this->User->read();
-
-			if ($id === null || empty($viewedUser)) {
-				$this->Session->setFlash(__('Invalid user'), 'flash/error');
-				$this->redirect('/');
-				return;
-			}
-
-			$viewedUser['User']['number_of_entries'] = $this->User->numberOfEntries();
-
-			$entriesShownOnPage = 20;
-			$this->set(
-				'lastEntries',
-				$this->User->Entry->getRecentEntries(
-					$this->CurrentUser,
-					[
-						'user_id' => $this->User->id,
-						'limit' => $entriesShownOnPage
-					]
-				)
-			);
-
-			$this->set(
-				'hasMoreEntriesThanShownOnPage',
-					($viewedUser['User']['number_of_entries'] - $entriesShownOnPage) > 0
-			);
-
-			if ($this->CurrentUser->getId() == $id) {
-				$viewedUser['User']['ignores'] = $this->User->Ignore->ignoredBy($id);
-			}
-			$viewedUser['User']['solves_count'] = $this->User->countSolved($id);
-			$this->set('user', $viewedUser);
-			$this->set(
-					'title_for_layout',
-					$viewedUser['User']['username']
-			);
-		}
-
-		/**
-		 * @param null $id
-		 * @throws Saito\Exception\SaitoForbiddenException
-		 * @throws BadRequestException
-		 */
-	public function edit($id = null) {
-		if (!$id) {
-			throw new BadRequestException;
-		}
-		if (!$this->_isEditingAllowed($this->CurrentUser, $id)) {
-			throw new \Saito\Exception\SaitoForbiddenException("Attempt to edit user $id.", [
-				'CurrentUser' => $this->CurrentUser
-			]);
-		}
-
-		$this->set('userId', $id);
-
-		// try to save entry
-		if (!empty($this->request->data)) {
-			$data = $this->request->data['User'];
-
-			unset($data['id']);
-			//# make sure only admin can edit these fields
-			if ($this->CurrentUser['user_type'] !== 'admin') {
-				// @todo DRY: refactor this admin fields together with view
-				unset($data['username'], $data['user_email'], $data['user_type']);
-			}
-
-			$this->User->id = $id;
-			$success = $this->User->save($data);
-			if ($success) {
-				$this->redirect(['action' => 'view', $id]);
-				return;
-			} else {
-				// if empty fields are missing from send form read user again
-				$this->User->contain();
-				$user = $this->User->read();
-				$this->request->data['User'] = array_merge($user['User'],
-					$this->request->data['User']);
-
-				$this->User->set($this->request->data);
-				$this->User->validates();
-
-				$this->JsData->addAppJsMessage(
-					__('The user could not be saved. Please, try again.'),
-					['type' => 'error']);
-			}
-		}
-
-		if (empty($this->request->data)) {
-			//* View Entry by id
-			$this->User->id = $id;
-			$this->User->contain('UserOnline');
-			$this->request->data = $this->User->read();
-		}
-
-		$themes = $this->Themes->getAvailable();
-		$this->set('availableThemes', array_combine($themes, $themes));
-		$this->set('user', $this->request->data);
-		$this->set(
-				'title_for_layout',
-				__('Edit %s Profil',
-						Saito\String\Properize::prop($this->request->data['User']['username']))
-		);
-	}
-
-		public function admin_block() {
-			$this->set('UserBlock', $this->User->UserBlock->getAll());
-		}
-
-		/**
-		 * @throws BadRequestException
-		 */
-		public function lock() {
-			if (!($this->CurrentUser->isAdmin() || $this->viewVars['modLocking'])) {
-				$this->redirect('/');
-				return;
-			}
-
-			$id = (int)$this->request->data('User.lockUserId');
-			if (!$id) {
-				throw new BadRequestException;
-			}
-
-			$this->User->contain();
-			$readUser = $this->User->findById($id);
-			if (!$readUser) {
-				$this->Session->setFlash(__('User not found.'), 'flash/error');
-				$this->redirect('/');
-				return;
-			}
-
-			$editedUser = new SaitoUser($readUser['User']);
-
-			if ($id == $this->CurrentUser->getId()) {
-				$this->Session->setFlash(__("You can't lock yourself."), 'flash/error');
-			} elseif ($editedUser->isAdmin()) {
-				$this->Session->setFlash(
-					__("You can't lock administrators.", 'flash/error'),
-					'flash/error'
-				);
-			} else {
-				try {
-					$duration = (int)$this->request->data('User.lockPeriod');
-					$status = $this->User->UserBlock->block(
-						new \Saito\User\Blocker\ManualBlocker,
-						$id,
-						[
-							'adminId' => $this->CurrentUser->getId(),
-							'duration' => $duration
-						]
-					);
-					$username = $readUser['User']['username'];
-					if ($status === true) {
-						$message = __('User %s is locked.', $username);
-					} else {
-						$message = __('User %s is unlocked.', $username);
-					}
-					$this->Session->setFlash($message, 'flash/success');
-				} catch (Exception $e) {
-					$this->Session->setFlash(__('Error while un/locking.'), 'flash/error');
-				}
-			}
-			$this->redirect($this->referer());
-		}
-
-		public function unlock($id) {
-			if (!$id || !($this->CurrentUser->isAdmin() || $this->viewVars['modLocking'])) {
-				throw new BadRequestException;
-			}
-			if (!$this->User->UserBlock->unblock($id)) {
-				$this->Session->setFlash(__('Error while unlocking.'), 'flash/error');
-			}
-			$this->redirect($this->referer());
-		}
-
-		public function admin_delete($id = null) {
-			$this->User->contain();
-			$readUser = $this->User->findById($id);
-			if (!$readUser) {
-				$this->Session->setFlash(__('User not found.'), 'flash/error');
-				$this->redirect('/');
-				return;
-			}
-
-			if (isset($this->request->data['User']['modeDelete'])) {
-				if ($id == $this->CurrentUser->getId()) {
-					$this->Session->setFlash(__("You can't delete yourself."), 'flash/error');
-				} elseif ($id == 1) {
-					$this->Session->setFlash(__("You can't delete the installation account."), 'flash/error');
-				} elseif ($this->User->deleteAllExceptEntries($id)) {
-					$this->Session->setFlash(__('User %s deleted.', $readUser['User']['username']), 'flash/success');
-					$this->redirect('/');
-					return;
-				} else {
-					$this->Session->setFlash(__("Couldn't delete user."), 'flash/error');
-				}
-				$this->redirect(['controller' => 'users', 'action' => 'view', $id]);
-				return;
-			}
-			$this->set('user', $readUser);
-		}
-
-		/**
-		 * changes user password
-		 *
-		 * @param null $id
-		 * @throws \Saito\Exception\SaitoForbiddenException
-		 * @throws BadRequestException
-		 */
-		public function changepassword($id = null) {
-			if (!$id) {
-				throw new BadRequestException();
-			}
-
-			$user = $this->User->getProfile($id);
-			$allowed = $this->_isEditingAllowed($this->CurrentUser, $id);
-			if (empty($user) || !$allowed) {
-				throw new SaitoForbiddenException("Attempt to change password for user $id.",
-					['CurrentUser' => $this->CurrentUser]);
-			}
-			$this->set('userId', $id);
-			$this->set('username', $user['username']);
-
-			//# just show empty form
-			if (empty($this->request->data)) {
-				return;
-			}
-
-			//# process submitted form
-			$this->request->data = $this->_passwordAuthSwitch($this->request->data);
-			$data = [
-				'id' => $id,
-				'password_old' => $this->request->data['User']['password_old'],
-				'password' => $this->request->data['User']['password'],
-				'password_confirm' => $this->request->data['User']['password_confirm']
-			];
-			$success = $this->User->save($data);
-
-			if ($success) {
-				$this->Session->setFlash(__('change_password_success'),
-					'flash/success');
-				$this->redirect(['controller' => 'users', 'action' => 'edit', $id]);
-				return;
-			}
-
-			$this->Session->setFlash(
-				__d('nondynamic', current(array_pop($this->User->validationErrors))),
-				'flash/error'
-			);
-
-			// unset all autofill form data
-			$this->request->data = [];
-		}
-
-		/**
-		 * @throws BadRequestException
-		 */
-		private function __ajaxBeforeFilter() {
-			if (!$this->request->is('ajax')) {
-				throw new BadRequestException;
-			}
-			$this->autoRender = false;
-		}
-
-		/**
-		 * toggles slidetabs open/close
-		 *
-		 * @return $this|mixed
-		 * @throws BadRequestException
-		 */
-		public function slidetab_toggle() {
-			$this->__ajaxBeforeFilter();
-
-			$toggle = $this->request->data('slidetabKey');
-			$allowed = [
-				'show_userlist',
-				'show_recentposts',
-				'show_recententries',
-				'show_shoutbox'
-			];
-			if (!$toggle || !in_array($toggle, $allowed)) {
-				throw new BadRequestException(null, 1412949882);
-			}
-
-			$this->User->id = $this->CurrentUser->getId();
-			$newValue = $this->User->toggle($toggle);
-			$this->CurrentUser[$toggle] = $newValue;
-			return $toggle;
-		}
-
-		/**
-		 * sets slidetab-order
-		 *
-		 * @return bool
-		 * @throws BadRequestException
-		 */
-		public function slidetab_order() {
-			$this->__ajaxBeforeFilter();
-
-			$order = $this->request->data('slidetabOrder');
-			if (!$order) {
-				throw new BadRequestException;
-			}
-
-			$allowed = $this->viewVars['slidetabs'];
-			$order = array_filter( $order, function ($item) use ($allowed) {
-				return in_array($item, $allowed);
-			});
-			$order = serialize($order);
-
-			$this->User->id = $this->CurrentUser->getId();
-			$this->User->saveField('slidetab_order', $order);
-			$this->CurrentUser['slidetab_order'] = $order;
-
-			return true;
-		}
-
-		/**
-		 * @param null $id
-		 *
-		 * @throws ForbiddenException
-		 */
-		public function setcategory($id = null) {
-			if (!$this->CurrentUser->isLoggedIn()) {
-				throw new ForbiddenException();
-			}
-			$this->User->id = $this->CurrentUser->getId();
-			if ($id === 'all') {
-				$this->User->setCategory('all');
-			} elseif (!$id && $this->request->data) {
-				$this->User->setCategory($this->request->data['CatChooser']);
-			} else {
-				$this->User->setCategory($id);
-			}
-			$this->redirect($this->referer());
-		}
-
-		public function beforeFilter() {
-			Stopwatch::start('Users->beforeFilter()');
-			parent::beforeFilter();
-
-			// @todo CSRF protection
-			$this->Security->unlockedActions[] = 'slidetab_toggle';
-			$this->Security->unlockedActions[] = 'slidetab_order';
-
-			$this->Auth->allow('login', 'register', 'rs');
-			$this->set('modLocking',
-					$this->CurrentUser->isMod() && Configure::read('Saito.Settings.block_user_ui')
-			);
-
-			Stopwatch::stop('Users->beforeFilter()');
-		}
-
-		/**
-		 * Checks if the current user is allowed to edit user $userId
-		 *
-		 * @param SaitoUser $CurrentUser
-		 * @param int $userId
-		 * @return type
-		 */
-		protected function _isEditingAllowed(\Saito\User\ForumsUserInterface $CurrentUser, $userId) {
-			if ($CurrentUser->isAdmin()) {
-				return true;
-			}
-			return $CurrentUser->getId() === (int)$userId;
-		}
-
-		protected function _passwordAuthSwitch($data) {
-			$data['User']['password'] = $data['User']['user_password'];
-			unset($data['User']['user_password']);
-			return $data;
-		}
-
-	}
+    use Saito\Exception\Logger\ExceptionLogger;
+    use Saito\Exception\Logger\ForbiddenLogger;
+    use Saito\Exception\SaitoForbiddenException;
+    use Saito\User\SaitoUser;
+
+    App::uses('AppController', 'Controller');
+
+    class UsersController extends AppController {
+
+        public $name = 'Users';
+
+        public $helpers = [
+            'Farbtastic',
+            'SimpleCaptcha.SimpleCaptcha',
+            'EntryH',
+            'Map',
+            'Text'
+        ];
+
+        public function login() {
+            $this->CurrentUser->logOut();
+
+            //# just show form
+            if (empty($this->request->data['User']['username'])) {
+                return;
+            }
+
+            //# successful login with request data
+            if ($this->CurrentUser->login()) {
+                if ($this->localReferer('action') === 'login') {
+                    $this->redirect($this->Auth->redirectUrl());
+                } else {
+                    $this->redirect($this->referer());
+                }
+                return;
+            }
+
+            //# error on login
+            $this->User->contain();
+            $username = $this->request->data['User']['username'];
+            $readUser = $this->User->findByUsername($username);
+
+            $status = null;
+
+            if (!empty($readUser)) {
+                $User = new SaitoUser($readUser['User']);
+                $status = $User->isForbidden();
+            }
+
+            switch ($status) {
+                case 'locked':
+                    $ends = $this->User->UserBlock
+                        ->getBlockEndsForUser($readUser['User']['id']);
+                    if ($ends) {
+                        $message = __('user.block.pubExpEnds', [$username,
+                            CakeTime::timeAgoInWords($ends, ['accuracy' => 'hour'])]);
+                    } else {
+                        $message = __('user.block.pubExp', $username);
+                    }
+                    break;
+                case 'unactivated':
+                    $message = __('User %s is not activated yet.', $readUser['User']['username']);
+                    break;
+                default:
+                    $message = __('auth_loginerror');
+            }
+
+            // don't autofill password
+            unset($this->request->data['User']['password']);
+
+            $Logger = new ForbiddenLogger;
+            $Logger->write("Unsuccessful login for user: $username",
+                ['msgs' => [$message]]);
+
+            $this->Session->setFlash($message, 'default', [], 'auth');
+        }
+
+        public function logout() {
+            $this->CurrentUser->logout();
+        }
+
+        public function register() {
+            $this->set('status', 'view');
+
+            $this->CurrentUser->logout();
+
+            $tosRequired = Configure::read('Saito.Settings.tos_enabled');
+            $this->set(compact('tosRequired'));
+
+            // display empty form
+            if (empty($this->request->data)) {
+                return;
+            }
+
+            $data = $this->request->data;
+
+            if (!$tosRequired) {
+                $data['User']['tos_confirm'] = true;
+            }
+
+            $tosConfirmed = $data['User']['tos_confirm'];
+            if (!$tosConfirmed) {
+                return;
+            }
+
+            $data = $this->_passwordAuthSwitch($data);
+            $this->User->Behaviors->attach('SimpleCaptcha.SimpleCaptcha');
+            $user = $this->User->register($data);
+
+            // registering failed, show form again
+            if (!$user) {
+                // undo the passwordAuthSwitch() to display error message for the field
+                if (isset($this->User->validationErrors['password'])) {
+                    $this->User->validationErrors['user_password'] = $this->User->validationErrors['password'];
+                }
+                $data['User']['tos_confirm'] = false;
+                $this->request->data = $data;
+                return;
+            }
+
+            // registered successfully
+            try {
+                $forumName = Configure::read('Saito.Settings.forum_name');
+                $subject = __('register_email_subject', $forumName);
+                $email = $this->SaitoEmail->email([
+                    'recipient' => $data,
+                    'subject' => $subject,
+                    'sender' => 'register',
+                    'template' => 'user_register',
+                    'viewVars' => ['user' => $user]
+                ]);
+                // only used in test cases
+                $this->set('email', $email);
+            } catch (Exception $e) {
+                $Logger = new ExceptionLogger();
+                $Logger->write('Registering email confirmation failed', ['e' => $e]);
+                $this->set('status', 'fail: email');
+                return;
+            }
+
+            $this->set('status', 'success');
+        }
+
+        /**
+         * register success (user clicked link in confirm mail)
+         *
+         * @param $id
+         * @throws BadRequestException
+         */
+        public function rs($id = null) {
+            if (!$id) {
+                throw new BadRequestException();
+            }
+
+            $code = $this->request->query('c');
+
+            try {
+                $activated = $this->User->activate((int)$id, $code);
+            } catch (Exception $e) {
+                $activated = false;
+            }
+
+            if (!$activated) {
+                $activated = ['status' => 'fail'];
+            }
+            $this->set('status', $activated['status']);
+        }
+
+        public function admin_index() {
+            $data = $this->User->find(
+                    'all',
+                    [
+                            'contain' => false,
+                            'fields' => [
+                                    'id',
+                                    'username',
+                                    'user_type',
+                                    'user_email',
+                                    'registered',
+                                    'user_lock'
+                            ],
+                            'order' => ['User.username' => 'asc']
+                    ]
+            );
+            $this->set('users', $data);
+        }
+
+        public function index() {
+            $menuItems = [
+                'username' => [__('username_marking'), []],
+                'user_type' => [__('user_type'), []],
+                'UserOnline.logged_in' => [__('userlist_online'), ['direction' => 'desc']],
+                'registered' => [__('registered'), ['direction' => 'desc']]
+            ];
+            $showBlocked = Configure::read('Saito.Settings.block_user_ui');
+            if ($showBlocked) {
+                $menuItems['user_lock'] = [__('user.set.lock.t'), ['direction' => 'desc']];
+            }
+
+            $this->paginate = [
+                'contain' => 'UserOnline',
+                'limit' => 400,
+                'order' => ['UserOnline.logged_in' => 'desc', 'User.username' => 'asc']
+            ];
+            $users = $this->paginate('User', null, array_keys($menuItems));
+
+            $this->set(compact('menuItems', 'users'));
+        }
+
+        public function ignore() {
+            $this->request->allowMethod('POST');
+            $blockedId = $this->request->data('id');
+            $this->_ignore($blockedId, true);
+        }
+
+        public function unignore() {
+            $this->request->allowMethod('POST');
+            $blockedId = $this->request->data('id');
+            $this->_ignore($blockedId, false);
+        }
+
+        protected function _ignore($blockedId, $set) {
+            if (!$this->CurrentUser->isLoggedIn() || !is_numeric($blockedId)) {
+                throw new BadRequestException();
+            }
+            $userId = $this->CurrentUser->getId();
+            $this->User->id = $userId;
+            if (!$this->User->exists($userId) || $userId == $blockedId) {
+                throw new BadRequestException();
+            }
+            if ($set) {
+                $this->User->Ignore->ignore($userId, $blockedId);
+            } else {
+                $this->User->Ignore->unignore($userId, $blockedId);
+            }
+            $this->redirect($this->referer());
+        }
+
+        public function admin_add() {
+            if (!empty($this->request->data)) :
+                $this->request->data = $this->_passwordAuthSwitch($this->request->data);
+                if ($this->User->register($this->request->data, true)) {
+                    $this->Session->setFlash(__('user.admin.add.success'),
+                            'flash/success');
+                    $this->redirect(['action' => 'view', $this->User->id, 'admin' => false]);
+                }
+            endif;
+        }
+
+        public function map() {
+            if (!Configure::read('Saito.Settings.map_enabled')) {
+                $this->Session->setFlash(__('admin.setting.disabled', __('admin.feat.map')), 'flash/error');
+                $this->redirect('/');
+                return;
+            }
+            $users = $this->User->find('all',
+                    [
+                            'contain' => false,
+                            'conditions' => ['user_place_lat !=' => null],
+                            'fields' => [
+                                    'User.id',
+                                    'User.username',
+                                    'User.user_place_lat',
+                                    'User.user_place_lng'
+                            ]
+                    ]
+            );
+            $this->set(compact('users'));
+        }
+
+        public function name($id = null) {
+            if (!empty($id)) {
+                $this->User->contain();
+                $viewedUser = $this->User->findByUsername($id);
+                if (!empty($viewedUser)) {
+                    $this->redirect(
+                        [
+                            'controller' => 'users',
+                            'action' => 'view',
+                            $viewedUser['User']['id']
+                        ]
+                    );
+                    return;
+                }
+            }
+            $this->Session->setFlash(__('Invalid user'), 'flash/error');
+            $this->redirect('/');
+        }
+
+        public function view($id = null) {
+            // redirect view/<username> to name/<username>
+            if (!empty($id) && !is_numeric($id)) {
+                $this->redirect(
+                    [
+                        'controller' => 'users',
+                        'action' => 'name',
+                        $id
+                    ]
+                );
+                return; // test case return
+            }
+
+            $this->User->id = $id;
+            $this->User->contain(['UserBlock' => ['By'], 'UserOnline']);
+            $viewedUser = $this->User->read();
+
+            if ($id === null || empty($viewedUser)) {
+                $this->Session->setFlash(__('Invalid user'), 'flash/error');
+                $this->redirect('/');
+                return;
+            }
+
+            $viewedUser['User']['number_of_entries'] = $this->User->numberOfEntries();
+
+            $entriesShownOnPage = 20;
+            $this->set(
+                'lastEntries',
+                $this->User->Entry->getRecentEntries(
+                    $this->CurrentUser,
+                    [
+                        'user_id' => $this->User->id,
+                        'limit' => $entriesShownOnPage
+                    ]
+                )
+            );
+
+            $this->set(
+                'hasMoreEntriesThanShownOnPage',
+                    ($viewedUser['User']['number_of_entries'] - $entriesShownOnPage) > 0
+            );
+
+            if ($this->CurrentUser->getId() == $id) {
+                $viewedUser['User']['ignores'] = $this->User->Ignore->ignoredBy($id);
+            }
+            $viewedUser['User']['solves_count'] = $this->User->countSolved($id);
+            $this->set('user', $viewedUser);
+            $this->set(
+                    'title_for_layout',
+                    $viewedUser['User']['username']
+            );
+        }
+
+        /**
+         * @param null $id
+         * @throws Saito\Exception\SaitoForbiddenException
+         * @throws BadRequestException
+         */
+    public function edit($id = null) {
+        if (!$id) {
+            throw new BadRequestException;
+        }
+        if (!$this->_isEditingAllowed($this->CurrentUser, $id)) {
+            throw new \Saito\Exception\SaitoForbiddenException("Attempt to edit user $id.", [
+                'CurrentUser' => $this->CurrentUser
+            ]);
+        }
+
+        $this->set('userId', $id);
+
+        // try to save entry
+        if (!empty($this->request->data)) {
+            $data = $this->request->data['User'];
+
+            unset($data['id']);
+            //# make sure only admin can edit these fields
+            if ($this->CurrentUser['user_type'] !== 'admin') {
+                // @todo DRY: refactor this admin fields together with view
+                unset($data['username'], $data['user_email'], $data['user_type']);
+            }
+
+            $this->User->id = $id;
+            $success = $this->User->save($data);
+            if ($success) {
+                $this->redirect(['action' => 'view', $id]);
+                return;
+            } else {
+                // if empty fields are missing from send form read user again
+                $this->User->contain();
+                $user = $this->User->read();
+                $this->request->data['User'] = array_merge($user['User'],
+                    $this->request->data['User']);
+
+                $this->User->set($this->request->data);
+                $this->User->validates();
+
+                $this->JsData->addAppJsMessage(
+                    __('The user could not be saved. Please, try again.'),
+                    ['type' => 'error']);
+            }
+        }
+
+        if (empty($this->request->data)) {
+            //* View Entry by id
+            $this->User->id = $id;
+            $this->User->contain('UserOnline');
+            $this->request->data = $this->User->read();
+        }
+
+        $themes = $this->Themes->getAvailable();
+        $this->set('availableThemes', array_combine($themes, $themes));
+        $this->set('user', $this->request->data);
+        $this->set(
+                'title_for_layout',
+                __('Edit %s Profil',
+                        Saito\String\Properize::prop($this->request->data['User']['username']))
+        );
+    }
+
+        public function admin_block() {
+            $this->set('UserBlock', $this->User->UserBlock->getAll());
+        }
+
+        /**
+         * @throws BadRequestException
+         */
+        public function lock() {
+            if (!($this->CurrentUser->isAdmin() || $this->viewVars['modLocking'])) {
+                $this->redirect('/');
+                return;
+            }
+
+            $id = (int)$this->request->data('User.lockUserId');
+            if (!$id) {
+                throw new BadRequestException;
+            }
+
+            $this->User->contain();
+            $readUser = $this->User->findById($id);
+            if (!$readUser) {
+                $this->Session->setFlash(__('User not found.'), 'flash/error');
+                $this->redirect('/');
+                return;
+            }
+
+            $editedUser = new SaitoUser($readUser['User']);
+
+            if ($id == $this->CurrentUser->getId()) {
+                $this->Session->setFlash(__("You can't lock yourself."), 'flash/error');
+            } elseif ($editedUser->isAdmin()) {
+                $this->Session->setFlash(
+                    __("You can't lock administrators.", 'flash/error'),
+                    'flash/error'
+                );
+            } else {
+                try {
+                    $duration = (int)$this->request->data('User.lockPeriod');
+                    $status = $this->User->UserBlock->block(
+                        new \Saito\User\Blocker\ManualBlocker,
+                        $id,
+                        [
+                            'adminId' => $this->CurrentUser->getId(),
+                            'duration' => $duration
+                        ]
+                    );
+                    $username = $readUser['User']['username'];
+                    if ($status === true) {
+                        $message = __('User %s is locked.', $username);
+                    } else {
+                        $message = __('User %s is unlocked.', $username);
+                    }
+                    $this->Session->setFlash($message, 'flash/success');
+                } catch (Exception $e) {
+                    $this->Session->setFlash(__('Error while un/locking.'), 'flash/error');
+                }
+            }
+            $this->redirect($this->referer());
+        }
+
+        public function unlock($id) {
+            if (!$id || !($this->CurrentUser->isAdmin() || $this->viewVars['modLocking'])) {
+                throw new BadRequestException;
+            }
+            if (!$this->User->UserBlock->unblock($id)) {
+                $this->Session->setFlash(__('Error while unlocking.'), 'flash/error');
+            }
+            $this->redirect($this->referer());
+        }
+
+        public function admin_delete($id = null) {
+            $this->User->contain();
+            $readUser = $this->User->findById($id);
+            if (!$readUser) {
+                $this->Session->setFlash(__('User not found.'), 'flash/error');
+                $this->redirect('/');
+                return;
+            }
+
+            if (isset($this->request->data['User']['modeDelete'])) {
+                if ($id == $this->CurrentUser->getId()) {
+                    $this->Session->setFlash(__("You can't delete yourself."), 'flash/error');
+                } elseif ($id == 1) {
+                    $this->Session->setFlash(__("You can't delete the installation account."), 'flash/error');
+                } elseif ($this->User->deleteAllExceptEntries($id)) {
+                    $this->Session->setFlash(__('User %s deleted.', $readUser['User']['username']), 'flash/success');
+                    $this->redirect('/');
+                    return;
+                } else {
+                    $this->Session->setFlash(__("Couldn't delete user."), 'flash/error');
+                }
+                $this->redirect(['controller' => 'users', 'action' => 'view', $id]);
+                return;
+            }
+            $this->set('user', $readUser);
+        }
+
+        /**
+         * changes user password
+         *
+         * @param null $id
+         * @throws \Saito\Exception\SaitoForbiddenException
+         * @throws BadRequestException
+         */
+        public function changepassword($id = null) {
+            if (!$id) {
+                throw new BadRequestException();
+            }
+
+            $user = $this->User->getProfile($id);
+            $allowed = $this->_isEditingAllowed($this->CurrentUser, $id);
+            if (empty($user) || !$allowed) {
+                throw new SaitoForbiddenException("Attempt to change password for user $id.",
+                    ['CurrentUser' => $this->CurrentUser]);
+            }
+            $this->set('userId', $id);
+            $this->set('username', $user['username']);
+
+            //# just show empty form
+            if (empty($this->request->data)) {
+                return;
+            }
+
+            //# process submitted form
+            $this->request->data = $this->_passwordAuthSwitch($this->request->data);
+            $data = [
+                'id' => $id,
+                'password_old' => $this->request->data['User']['password_old'],
+                'password' => $this->request->data['User']['password'],
+                'password_confirm' => $this->request->data['User']['password_confirm']
+            ];
+            $success = $this->User->save($data);
+
+            if ($success) {
+                $this->Session->setFlash(__('change_password_success'),
+                    'flash/success');
+                $this->redirect(['controller' => 'users', 'action' => 'edit', $id]);
+                return;
+            }
+
+            $this->Session->setFlash(
+                __d('nondynamic', current(array_pop($this->User->validationErrors))),
+                'flash/error'
+            );
+
+            // unset all autofill form data
+            $this->request->data = [];
+        }
+
+        /**
+         * @throws BadRequestException
+         */
+        private function __ajaxBeforeFilter() {
+            if (!$this->request->is('ajax')) {
+                throw new BadRequestException;
+            }
+            $this->autoRender = false;
+        }
+
+        /**
+         * toggles slidetabs open/close
+         *
+         * @return $this|mixed
+         * @throws BadRequestException
+         */
+        public function slidetab_toggle() {
+            $this->__ajaxBeforeFilter();
+
+            $toggle = $this->request->data('slidetabKey');
+            $allowed = [
+                'show_userlist',
+                'show_recentposts',
+                'show_recententries',
+                'show_shoutbox'
+            ];
+            if (!$toggle || !in_array($toggle, $allowed)) {
+                throw new BadRequestException(null, 1412949882);
+            }
+
+            $this->User->id = $this->CurrentUser->getId();
+            $newValue = $this->User->toggle($toggle);
+            $this->CurrentUser[$toggle] = $newValue;
+            return $toggle;
+        }
+
+        /**
+         * sets slidetab-order
+         *
+         * @return bool
+         * @throws BadRequestException
+         */
+        public function slidetab_order() {
+            $this->__ajaxBeforeFilter();
+
+            $order = $this->request->data('slidetabOrder');
+            if (!$order) {
+                throw new BadRequestException;
+            }
+
+            $allowed = $this->viewVars['slidetabs'];
+            $order = array_filter( $order, function ($item) use ($allowed) {
+                return in_array($item, $allowed);
+            });
+            $order = serialize($order);
+
+            $this->User->id = $this->CurrentUser->getId();
+            $this->User->saveField('slidetab_order', $order);
+            $this->CurrentUser['slidetab_order'] = $order;
+
+            return true;
+        }
+
+        /**
+         * @param null $id
+         *
+         * @throws ForbiddenException
+         */
+        public function setcategory($id = null) {
+            if (!$this->CurrentUser->isLoggedIn()) {
+                throw new ForbiddenException();
+            }
+            $this->User->id = $this->CurrentUser->getId();
+            if ($id === 'all') {
+                $this->User->setCategory('all');
+            } elseif (!$id && $this->request->data) {
+                $this->User->setCategory($this->request->data['CatChooser']);
+            } else {
+                $this->User->setCategory($id);
+            }
+            $this->redirect($this->referer());
+        }
+
+        public function beforeFilter() {
+            Stopwatch::start('Users->beforeFilter()');
+            parent::beforeFilter();
+
+            // @todo CSRF protection
+            $this->Security->unlockedActions[] = 'slidetab_toggle';
+            $this->Security->unlockedActions[] = 'slidetab_order';
+
+            $this->Auth->allow('login', 'register', 'rs');
+            $this->set('modLocking',
+                    $this->CurrentUser->isMod() && Configure::read('Saito.Settings.block_user_ui')
+            );
+
+            Stopwatch::stop('Users->beforeFilter()');
+        }
+
+        /**
+         * Checks if the current user is allowed to edit user $userId
+         *
+         * @param SaitoUser $CurrentUser
+         * @param int $userId
+         * @return type
+         */
+        protected function _isEditingAllowed(\Saito\User\ForumsUserInterface $CurrentUser, $userId) {
+            if ($CurrentUser->isAdmin()) {
+                return true;
+            }
+            return $CurrentUser->getId() === (int)$userId;
+        }
+
+        protected function _passwordAuthSwitch($data) {
+            $data['User']['password'] = $data['User']['user_password'];
+            unset($data['User']['user_password']);
+            return $data;
+        }
+
+    }