Schlaefer / Saito

app/Controller/EntriesController.php

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

app/Controller/ContactsController.php

Spacing +1 added lines, -1 removed lines

@@ -128,7 +128,7 @@
 				$Logger->write('Contact email failed', ['e' => $e]);
 
 				$this->Session->setFlash(
-					__('Message couldn\'t be send! ' . $e->getMessage()),
+					__('Message couldn\'t be send! '.$e->getMessage()),
 					'flash/error'
 				);
 			}

Indentation +135 added lines, -135 removed lines

@@ -1,137 +1,137 @@
 <?php
 
-	App::uses('AppController', 'Controller');
-
-	class ContactsController extends AppController {
-
-		public $uses = [];
-
-		public function beforeFilter() {
-			parent::beforeFilter();
-			$this->showDisclaimer = true;
-			$this->Auth->allow('owner');
-		}
-
-		/**
-		 * Contacts forum's owner via contact address
-		 */
-		public function owner() {
-			//* show form
-			if (empty($this->request->data)) {
-				return;
-			}
-
-			$recipient = $this->SaitoEmail->getPredefinedSender('contact');
-
-			if ($this->CurrentUser->isLoggedIn()) {
-				$sender = $this->CurrentUser->getId();
-			} else {
-				$senderContact = $this->request->data['Message']['sender_contact'];
-
-				App::uses('Validation', 'Utility');
-				if (!Validation::email($senderContact)) {
-					$this->JsData->addAppJsMessage(__('error_email_not-valid'), [
-						'type' => 'error',
-						'channel' => 'form',
-						'element' => '#MessageSenderContact'
-					]);
-					return;
-				}
-
-				$sender['User'] = [
-					'username' => '',
-					'user_email' => $senderContact
-				];
-			}
-
-			$this->_contact($recipient, $sender);
-		}
-
-		/**
-		 * Contacts individual user
-		 *
-		 * @param null $id
-		 * @throws InvalidArgumentException
-		 * @throws BadRequestException
-		 */
-		public function user($id = null) {
-			if (empty($id) || !$this->CurrentUser->isLoggedIn()) {
-				throw new BadRequestException();
-			}
-
-			$this->User->id = $id;
-			$this->User->contain();
-			$recipient = $this->User->read();
-
-			if (empty($recipient) || !$recipient['User']['personal_messages']) {
-				throw new InvalidArgumentException();
-			}
-
-			$this->set('title_for_page',
-				__('user_contact_title', $recipient['User']['username'])
-			);
-
-			//* show form
-			if (empty($this->request->data)) {
-				$this->request->data = $recipient;
-				return;
-			}
-
-			$sender = $this->CurrentUser->getId();
-
-			$this->_contact($recipient, $sender);
-		}
-
-		protected function _contact($recipient, $sender) {
-			$validationError = false;
-
-			// validate and set subject
-			$subject = rtrim($this->request->data['Message']['subject']);
-			if (empty($subject)) {
-				$this->JsData->addAppJsMessage(
-					__('error_subject_empty'),
-					[
-						'type' => 'error',
-						'channel' => 'form',
-						'element' => '#MessageSubject'
-					]
-				);
-				$validationError = true;
-			}
-
-			$this->request->data = $this->request->data + $recipient;
-
-			if ($validationError) {
-				return;
-			}
-
-			try {
-				$email = [
-					'recipient' => $recipient,
-					'sender' => $sender,
-					'subject' => $subject,
-					'message' => $this->request->data['Message']['text'],
-					'template' => 'user_contact'
-				];
-
-				if (isset($this->request->data['Message']['carbon_copy']) && $this->request->data['Message']['carbon_copy']) {
-					$email['ccsender'] = true;
-				}
-
-				$mail = $this->SaitoEmail->email($email);
-				$this->set('email', $mail); // for evaluating send mail in test cases
-				$this->Session->setFlash(__('Message was send.'), 'flash/success');
-				$this->redirect('/');
-				return;
-			} catch (Exception $e) {
-				$Logger = new Saito\Logger\ExceptionLogger();
-				$Logger->write('Contact email failed', ['e' => $e]);
-
-				$this->Session->setFlash(
-					__('Message couldn\'t be send! ' . $e->getMessage()),
-					'flash/error'
-				);
-			}
-		}
-
-	}
+    App::uses('AppController', 'Controller');
+
+    class ContactsController extends AppController {
+
+        public $uses = [];
+
+        public function beforeFilter() {
+            parent::beforeFilter();
+            $this->showDisclaimer = true;
+            $this->Auth->allow('owner');
+        }
+
+        /**
+         * Contacts forum's owner via contact address
+         */
+        public function owner() {
+            //* show form
+            if (empty($this->request->data)) {
+                return;
+            }
+
+            $recipient = $this->SaitoEmail->getPredefinedSender('contact');
+
+            if ($this->CurrentUser->isLoggedIn()) {
+                $sender = $this->CurrentUser->getId();
+            } else {
+                $senderContact = $this->request->data['Message']['sender_contact'];
+
+                App::uses('Validation', 'Utility');
+                if (!Validation::email($senderContact)) {
+                    $this->JsData->addAppJsMessage(__('error_email_not-valid'), [
+                        'type' => 'error',
+                        'channel' => 'form',
+                        'element' => '#MessageSenderContact'
+                    ]);
+                    return;
+                }
+
+                $sender['User'] = [
+                    'username' => '',
+                    'user_email' => $senderContact
+                ];
+            }
+
+            $this->_contact($recipient, $sender);
+        }
+
+        /**
+         * Contacts individual user
+         *
+         * @param null $id
+         * @throws InvalidArgumentException
+         * @throws BadRequestException
+         */
+        public function user($id = null) {
+            if (empty($id) || !$this->CurrentUser->isLoggedIn()) {
+                throw new BadRequestException();
+            }
+
+            $this->User->id = $id;
+            $this->User->contain();
+            $recipient = $this->User->read();
+
+            if (empty($recipient) || !$recipient['User']['personal_messages']) {
+                throw new InvalidArgumentException();
+            }
+
+            $this->set('title_for_page',
+                __('user_contact_title', $recipient['User']['username'])
+            );
+
+            //* show form
+            if (empty($this->request->data)) {
+                $this->request->data = $recipient;
+                return;
+            }
+
+            $sender = $this->CurrentUser->getId();
+
+            $this->_contact($recipient, $sender);
+        }
+
+        protected function _contact($recipient, $sender) {
+            $validationError = false;
+
+            // validate and set subject
+            $subject = rtrim($this->request->data['Message']['subject']);
+            if (empty($subject)) {
+                $this->JsData->addAppJsMessage(
+                    __('error_subject_empty'),
+                    [
+                        'type' => 'error',
+                        'channel' => 'form',
+                        'element' => '#MessageSubject'
+                    ]
+                );
+                $validationError = true;
+            }
+
+            $this->request->data = $this->request->data + $recipient;
+
+            if ($validationError) {
+                return;
+            }
+
+            try {
+                $email = [
+                    'recipient' => $recipient,
+                    'sender' => $sender,
+                    'subject' => $subject,
+                    'message' => $this->request->data['Message']['text'],
+                    'template' => 'user_contact'
+                ];
+
+                if (isset($this->request->data['Message']['carbon_copy']) && $this->request->data['Message']['carbon_copy']) {
+                    $email['ccsender'] = true;
+                }
+
+                $mail = $this->SaitoEmail->email($email);
+                $this->set('email', $mail); // for evaluating send mail in test cases
+                $this->Session->setFlash(__('Message was send.'), 'flash/success');
+                $this->redirect('/');
+                return;
+            } catch (Exception $e) {
+                $Logger = new Saito\Logger\ExceptionLogger();
+                $Logger->write('Contact email failed', ['e' => $e]);
+
+                $this->Session->setFlash(
+                    __('Message couldn\'t be send! ' . $e->getMessage()),
+                    'flash/error'
+                );
+            }
+        }
+
+    }

app/Controller/UsersController.php

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

app/Controller/EsnotificationsController.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 
 			$deactivate = $this->Esnotification->read('deactivate');
 			if (!isset($this->request->params['named']['token'])
-					|| (int)$this->request->params['named']['token'] !== (int)$deactivate['Esnotification']['deactivate']
+					|| (int) $this->request->params['named']['token'] !== (int) $deactivate['Esnotification']['deactivate']
 			) {
 				throw new MethodNotAllowedException();
 			}

Indentation +25 added lines, -25 removed lines

@@ -1,13 +1,13 @@ 
 <?php
 
-	App::uses('AppController', 'Controller');
+    App::uses('AppController', 'Controller');
 
 /**
  * Esnotifications Controller
  *
  * @property Esnotification $Esnotification
  */
-	class EsnotificationsController extends AppController {
+    class EsnotificationsController extends AppController {
 
 /**
  * delete method
@@ -17,30 +17,30 @@ 
  * @param string $id
  * @return void
  */
-		public function unsubscribe($id = null) {
-			$this->Esnotification->id = $id;
-			if (!$this->Esnotification->exists()) {
-				throw new NotFoundException(__('Invalid esnotification'));
-			}
+        public function unsubscribe($id = null) {
+            $this->Esnotification->id = $id;
+            if (!$this->Esnotification->exists()) {
+                throw new NotFoundException(__('Invalid esnotification'));
+            }
 
-			$deactivate = $this->Esnotification->read('deactivate');
-			if (!isset($this->request->params['named']['token'])
-					|| (int)$this->request->params['named']['token'] !== (int)$deactivate['Esnotification']['deactivate']
-			) {
-				throw new MethodNotAllowedException();
-			}
-			if ($this->Esnotification->deleteNotificationWithId($id)) {
-				$this->Session->setFlash(__('Succesfully unsubscribed.'), 'flash/success');
-				$this->redirect('/');
-			}
-			$this->Session->setFlash(__('Error. Could not unsubscribe.'));
-			$this->redirect('/');
-		}
+            $deactivate = $this->Esnotification->read('deactivate');
+            if (!isset($this->request->params['named']['token'])
+                    || (int)$this->request->params['named']['token'] !== (int)$deactivate['Esnotification']['deactivate']
+            ) {
+                throw new MethodNotAllowedException();
+            }
+            if ($this->Esnotification->deleteNotificationWithId($id)) {
+                $this->Session->setFlash(__('Succesfully unsubscribed.'), 'flash/success');
+                $this->redirect('/');
+            }
+            $this->Session->setFlash(__('Error. Could not unsubscribe.'));
+            $this->redirect('/');
+        }
 
-		public function beforeFilter() {
-			parent::beforeFilter();
-			$this->Auth->allow('unsubscribe');
-		}
+        public function beforeFilter() {
+            parent::beforeFilter();
+            $this->Auth->allow('unsubscribe');
+        }
 
-	}
+    }
 

app/Controller/BookmarksController.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 			'entry_id' => $this->request->data['id'],
 		];
 		$this->Bookmark->create();
-		return (bool)$this->Bookmark->save($data);
+		return (bool) $this->Bookmark->save($data);
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 		$this->_getBookmark($id, $this->CurrentUser->getId());
 		$this->autoRender = false;
 		$this->Bookmark->id = $id;
-		return (bool)$this->Bookmark->delete();
+		return (bool) $this->Bookmark->delete();
 	}
 
 	public function beforeFilter() {

Indentation +107 added lines, -107 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-	App::uses('AppController', 'Controller');
+    App::uses('AppController', 'Controller');
 
 /**
  * Bookmarks Controller
@@ -9,127 +9,127 @@ 
  */
 class BookmarksController extends AppController {
 
-	public $helpers = ['EntryH'];
+    public $helpers = ['EntryH'];
 
 /**
  * @throws MethodNotAllowedException
  */
-	public function index() {
-		if (!$this->CurrentUser->isLoggedIn()) {
-			throw new MethodNotAllowedException;
-		}
-		$bookmarks = $this->Bookmark->find('all', [
-			'contain' => ['Entry' => ['Category', 'User']],
-			'conditions' => ['Bookmark.user_id' => $this->CurrentUser->getId()],
-			'order' => 'Bookmark.id DESC',
-		]);
-		$this->set('bookmarks', $bookmarks);
-	}
+    public function index() {
+        if (!$this->CurrentUser->isLoggedIn()) {
+            throw new MethodNotAllowedException;
+        }
+        $bookmarks = $this->Bookmark->find('all', [
+            'contain' => ['Entry' => ['Category', 'User']],
+            'conditions' => ['Bookmark.user_id' => $this->CurrentUser->getId()],
+            'order' => 'Bookmark.id DESC',
+        ]);
+        $this->set('bookmarks', $bookmarks);
+    }
 
 /**
  * @return bool
  * @throws MethodNotAllowedException
  * @throws BadRequestException
  */
-	public function add() {
-		if (!$this->request->is('ajax')) {
-			throw new BadRequestException;
-		}
-		if (!$this->CurrentUser->isLoggedIn()) {
-			throw new MethodNotAllowedException;
-		}
-		$this->autoRender = false;
-		if (!$this->request->is('post')) {
-			return false;
-		}
-
-		$data = [
-			'user_id' => $this->CurrentUser->getId(),
-			'entry_id' => $this->request->data['id'],
-		];
-		$this->Bookmark->create();
-		return (bool)$this->Bookmark->save($data);
-	}
-
-	/**
-	 * @param null $id
-	 * @throws NotFoundException
-	 * @throws MethodNotAllowedException
-	 */
-	public function edit($id = null) {
-		$bookmark = $this->_getBookmark($id);
-
-		if (!$this->request->is('post') && !$this->request->is('put')) {
-			$posting = array(
-				'Entry' => $bookmark['Entry'],
-				'Category' => $bookmark['Entry']['Category'],
-				'User' => $bookmark['Entry']['User'],
-			);
-			$this->set('entry', $this->dic->newInstance('\Saito\Posting\Posting',
-				['rawData' => $posting]));
-			$this->request->data = $bookmark;
-			return;
-		}
-
-		$data['Bookmark'] = [
-			'id' => $id,
-			'comment' => $this->request->data['Bookmark']['comment']
-		];
-		$success = $this->Bookmark->save($data);
-		if (!$success) {
-			$this->Session->setFlash(
-				__('The bookmark could not be saved. Please, try again.'));
-			return;
-		}
-		$this->redirect(['action' => 'index',
-			'#' => $bookmark['Bookmark']['entry_id']]);
-	}
+    public function add() {
+        if (!$this->request->is('ajax')) {
+            throw new BadRequestException;
+        }
+        if (!$this->CurrentUser->isLoggedIn()) {
+            throw new MethodNotAllowedException;
+        }
+        $this->autoRender = false;
+        if (!$this->request->is('post')) {
+            return false;
+        }
+
+        $data = [
+            'user_id' => $this->CurrentUser->getId(),
+            'entry_id' => $this->request->data['id'],
+        ];
+        $this->Bookmark->create();
+        return (bool)$this->Bookmark->save($data);
+    }
+
+    /**
+     * @param null $id
+     * @throws NotFoundException
+     * @throws MethodNotAllowedException
+     */
+    public function edit($id = null) {
+        $bookmark = $this->_getBookmark($id);
+
+        if (!$this->request->is('post') && !$this->request->is('put')) {
+            $posting = array(
+                'Entry' => $bookmark['Entry'],
+                'Category' => $bookmark['Entry']['Category'],
+                'User' => $bookmark['Entry']['User'],
+            );
+            $this->set('entry', $this->dic->newInstance('\Saito\Posting\Posting',
+                ['rawData' => $posting]));
+            $this->request->data = $bookmark;
+            return;
+        }
+
+        $data['Bookmark'] = [
+            'id' => $id,
+            'comment' => $this->request->data['Bookmark']['comment']
+        ];
+        $success = $this->Bookmark->save($data);
+        if (!$success) {
+            $this->Session->setFlash(
+                __('The bookmark could not be saved. Please, try again.'));
+            return;
+        }
+        $this->redirect(['action' => 'index',
+            '#' => $bookmark['Bookmark']['entry_id']]);
+    }
 
 /**
  * @param null $id
  * @return bool
  * @throws BadRequestException
  */
-	public function delete($id = null) {
-		if (!$this->request->is('ajax')) {
-			throw new BadRequestException;
-		}
-
-		$this->_getBookmark($id, $this->CurrentUser->getId());
-		$this->autoRender = false;
-		$this->Bookmark->id = $id;
-		return (bool)$this->Bookmark->delete();
-	}
-
-	public function beforeFilter() {
-		parent::beforeFilter();
-
-		$this->Security->unlockedActions = ['add'];
-	}
-
-	/**
-	 * @param $id
-	 * @throws NotFoundException
-	 * @throws MethodNotAllowedException
-	 * @throws Saito\Exception\SaitoForbiddenException
-	 * @return mixed
-	 */
-	protected function _getBookmark($id) {
-		if (!$this->CurrentUser->isLoggedIn()) {
-			throw new MethodNotAllowedException;
-		}
-
-		if (!$this->Bookmark->exists($id)) {
-			throw new NotFoundException(__('Invalid bookmark.'));
-		}
-
-		$this->Bookmark->contain(['Entry' => ['Category', 'User']]);
-		$bookmark = $this->Bookmark->findById($id);
-
-		if ($bookmark['Bookmark']['user_id'] != $this->CurrentUser->getId()) {
-			throw new Saito\Exception\SaitoForbiddenException("Attempt to edit bookmark $id.");
-		}
-		return $bookmark;
-	}
+    public function delete($id = null) {
+        if (!$this->request->is('ajax')) {
+            throw new BadRequestException;
+        }
+
+        $this->_getBookmark($id, $this->CurrentUser->getId());
+        $this->autoRender = false;
+        $this->Bookmark->id = $id;
+        return (bool)$this->Bookmark->delete();
+    }
+
+    public function beforeFilter() {
+        parent::beforeFilter();
+
+        $this->Security->unlockedActions = ['add'];
+    }
+
+    /**
+     * @param $id
+     * @throws NotFoundException
+     * @throws MethodNotAllowedException
+     * @throws Saito\Exception\SaitoForbiddenException
+     * @return mixed
+     */
+    protected function _getBookmark($id) {
+        if (!$this->CurrentUser->isLoggedIn()) {
+            throw new MethodNotAllowedException;
+        }
+
+        if (!$this->Bookmark->exists($id)) {
+            throw new NotFoundException(__('Invalid bookmark.'));
+        }
+
+        $this->Bookmark->contain(['Entry' => ['Category', 'User']]);
+        $bookmark = $this->Bookmark->findById($id);
+
+        if ($bookmark['Bookmark']['user_id'] != $this->CurrentUser->getId()) {
+            throw new Saito\Exception\SaitoForbiddenException("Attempt to edit bookmark $id.");
+        }
+        return $bookmark;
+    }
 
 }
\ No newline at end of file

app/Controller/CategoriesController.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 				if (isset($this->request->data['Category']['modeMove']) && isset($this->request->data['Category']['targetCategory'])):
 					/* move category items before deleting the cateogry */
 
-					$targetId = (int)$this->request->data['Category']['targetCategory'];
+					$targetId = (int) $this->request->data['Category']['targetCategory'];
 
 					/* make sure that target category exists */
 					$this->Category->contain();

Indentation +120 added lines, -120 removed lines

@@ -1,123 +1,123 @@
 <?php
 
-	App::uses('AppController', 'Controller');
-
-	class CategoriesController extends AppController {
-
-		public $name = 'Categories';
-
-		public $paginate = [
-			/**
-			 * sets limit unrealisticly high so we should never reach the upper limit
-			 * i.e. always show all entries on one page
-			 */
-				'limit' => 1000,
-		];
-
-		public function admin_index() {
-			$this->Category->recursive = 0;
-			$this->set('categories', $this->paginate());
-		}
-
-		public function admin_add() {
-			if (!empty($this->request->data)) {
-				$this->Category->create();
-				if ($this->Category->save($this->request->data)) {
-					$this->Session->setFlash(__('The category has been saved'));
-					$this->redirect(array('action' => 'index'));
-				} else {
-					$this->Session->setFlash(__('The category could not be saved. Please, try again.'));
-				}
-			}
-		}
-
-		public function admin_edit($id = null) {
-			if (!$id && empty($this->request->data)) {
-				$this->Session->setFlash(__('Invalid category'));
-				$this->redirect(array('action' => 'index'));
-			}
-			if (!empty($this->request->data)) {
-				if ($this->Category->save($this->request->data)) {
-					$this->Session->setFlash(__('The category has been saved'));
-					$this->redirect(array('action' => 'index'));
-				} else {
-					$this->Session->setFlash(__('The category could not be saved. Please, try again.'));
-				}
-			}
-			if (empty($this->request->data)) {
-				$this->Category->contain();
-				$this->request->data = $this->Category->read(null, $id);
-			}
-		}
-
-		public function admin_delete($id = null) {
-			if (!$id) {
-				$this->Session->setFlash(__('Invalid id for category'), 'flash/error');
-				$this->redirect($this->referer(array('action' => 'index')));
-				exit();
-			}
-
-			/* check if category to exists */
-			$this->Category->contain();
-			$categoryToDelete = $this->Category->findById($id);
-			if (empty($categoryToDelete)) :
-				$this->Session->setFlash(__('Category not found.'), 'flash/error');
-				$this->redirect($this->referer(array('action' => 'index')));
-				exit();
-			endif;
-
-			if (isset($this->request->data['Category']['modeDelete'])):
-				$failure = false;
-
-				if (isset($this->request->data['Category']['modeMove']) && isset($this->request->data['Category']['targetCategory'])):
-					/* move category items before deleting the cateogry */
-
-					$targetId = (int)$this->request->data['Category']['targetCategory'];
-
-					/* make sure that target category exists */
-					$this->Category->contain();
-					$categoryToDelete = $this->Category->findById($targetId);
-					if (empty($categoryToDelete)) :
-						$this->Session->setFlash(__('Target category not found.'),
-								'flash/error');
-						$this->redirect($this->referer());
-						exit();
-					endif;
-
-					$this->Category->id = $id;
-					if ($this->Category->mergeIntoCategory($targetId) == false) :
-						$this->Session->setFlash(__('Error moving category.'),
-								'flash/error');
-						$failure = $failure || true;
-					else:
-						$this->Session->setFlash(__('Category moved.'), 'flash/notice');
-					endif;
-				endif;
-
-				$this->Category->id = $id;
-				if ($this->Category->deleteWithAllEntries() == false) :
-					$this->Session->setFlash(__("Error deleting category."),
-							'flash/error');
-					$failure = $failure || true;
-				else:
-					$this->Session->setFlash(__('Category deleted.'), 'flash/notice');
-				endif;
-
-				if ($failure == false) :
-					$this->redirect(array('action' => 'index', 'admin' => true));
-					exit();
-				endif;
-
-			endif; // move or delete category
-
-			/* get categories for target <select> */
-			$categories = $this->CurrentUser->Categories->getAllowed('list');
-			unset($categories[$id]);
-			$this->set('targetCategory', $categories);
-
-			$this->Category->contain();
-			$this->request->data = $this->Category->read(null, $id);
-		}
-
-	}
+    App::uses('AppController', 'Controller');
+
+    class CategoriesController extends AppController {
+
+        public $name = 'Categories';
+
+        public $paginate = [
+            /**
+             * sets limit unrealisticly high so we should never reach the upper limit
+             * i.e. always show all entries on one page
+             */
+                'limit' => 1000,
+        ];
+
+        public function admin_index() {
+            $this->Category->recursive = 0;
+            $this->set('categories', $this->paginate());
+        }
+
+        public function admin_add() {
+            if (!empty($this->request->data)) {
+                $this->Category->create();
+                if ($this->Category->save($this->request->data)) {
+                    $this->Session->setFlash(__('The category has been saved'));
+                    $this->redirect(array('action' => 'index'));
+                } else {
+                    $this->Session->setFlash(__('The category could not be saved. Please, try again.'));
+                }
+            }
+        }
+
+        public function admin_edit($id = null) {
+            if (!$id && empty($this->request->data)) {
+                $this->Session->setFlash(__('Invalid category'));
+                $this->redirect(array('action' => 'index'));
+            }
+            if (!empty($this->request->data)) {
+                if ($this->Category->save($this->request->data)) {
+                    $this->Session->setFlash(__('The category has been saved'));
+                    $this->redirect(array('action' => 'index'));
+                } else {
+                    $this->Session->setFlash(__('The category could not be saved. Please, try again.'));
+                }
+            }
+            if (empty($this->request->data)) {
+                $this->Category->contain();
+                $this->request->data = $this->Category->read(null, $id);
+            }
+        }
+
+        public function admin_delete($id = null) {
+            if (!$id) {
+                $this->Session->setFlash(__('Invalid id for category'), 'flash/error');
+                $this->redirect($this->referer(array('action' => 'index')));
+                exit();
+            }
+
+            /* check if category to exists */
+            $this->Category->contain();
+            $categoryToDelete = $this->Category->findById($id);
+            if (empty($categoryToDelete)) :
+                $this->Session->setFlash(__('Category not found.'), 'flash/error');
+                $this->redirect($this->referer(array('action' => 'index')));
+                exit();
+            endif;
+
+            if (isset($this->request->data['Category']['modeDelete'])):
+                $failure = false;
+
+                if (isset($this->request->data['Category']['modeMove']) && isset($this->request->data['Category']['targetCategory'])):
+                    /* move category items before deleting the cateogry */
+
+                    $targetId = (int)$this->request->data['Category']['targetCategory'];
+
+                    /* make sure that target category exists */
+                    $this->Category->contain();
+                    $categoryToDelete = $this->Category->findById($targetId);
+                    if (empty($categoryToDelete)) :
+                        $this->Session->setFlash(__('Target category not found.'),
+                                'flash/error');
+                        $this->redirect($this->referer());
+                        exit();
+                    endif;
+
+                    $this->Category->id = $id;
+                    if ($this->Category->mergeIntoCategory($targetId) == false) :
+                        $this->Session->setFlash(__('Error moving category.'),
+                                'flash/error');
+                        $failure = $failure || true;
+                    else:
+                        $this->Session->setFlash(__('Category moved.'), 'flash/notice');
+                    endif;
+                endif;
+
+                $this->Category->id = $id;
+                if ($this->Category->deleteWithAllEntries() == false) :
+                    $this->Session->setFlash(__("Error deleting category."),
+                            'flash/error');
+                    $failure = $failure || true;
+                else:
+                    $this->Session->setFlash(__('Category deleted.'), 'flash/notice');
+                endif;
+
+                if ($failure == false) :
+                    $this->redirect(array('action' => 'index', 'admin' => true));
+                    exit();
+                endif;
+
+            endif; // move or delete category
+
+            /* get categories for target <select> */
+            $categories = $this->CurrentUser->Categories->getAllowed('list');
+            unset($categories[$id]);
+            $this->set('targetCategory', $categories);
+
+            $this->Category->contain();
+            $this->request->data = $this->Category->read(null, $id);
+        }
+
+    }
 

app/Controller/SettingsController.php

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 
 		public function admin_edit($id = null) {
 			if (!$id) {
-				$this->redirect(array( 'action ' => 'index' ));
+				$this->redirect(array('action ' => 'index'));
 			}
 
 			$this->Setting->id = $id;

Indentation +83 added lines, -83 removed lines

@@ -1,94 +1,94 @@
 <?php
 
-	App::uses('AppController', 'Controller');
+    App::uses('AppController', 'Controller');
 
-	class SettingsController extends AppController {
+    class SettingsController extends AppController {
 
-		public $name = 'Settings';
+        public $name = 'Settings';
 
-		public $helpers = [
-			'Setting',
-			'TimeH'
-		];
+        public $helpers = [
+            'Setting',
+            'TimeH'
+        ];
 
-		protected $_settingsShownInAdminIndex = [
-				'api_crossdomain' => 1,
-				'api_enabled' => 1,
-				'autolink' => 1,
-				'bbcode_img' => 1,
-				'block_user_ui' => 1,
-			// Activates and deactivates the category-chooser on entries/index
-				'category_chooser_global' => 1,
-			// Allows users to show the category-chooser even if the default
-			// setting `category_chooser_global` is off
-				'category_chooser_user_override' => 1,
-				'edit_delay' => 1,
-				'edit_period' => 1,
-				'embedly_enabled' => 1,
-				'embedly_key' => 1,
-				'email_contact' => 1,
-				'email_register' => 1,
-				'email_system' => 1,
-				'forum_disabled' => 1,
-				'forum_disabled_text' => 1,
-				'forum_email' => 1,
-				'forum_name' => 1,
-				'map_enabled' => 1,
-				'map_api_key' => 1,
-				'quote_symbol' => 1,
-				'shoutbox_enabled' => 1,
-				'shoutbox_max_shouts' => 1,
-				'smilies' => 1,
-				'signature_separator' => 1,
-				'stopwatch_get' => 1,
-				'store_ip' => 1,
-				'store_ip_anonymized' => 1,
-				'subject_maxlength' => 1,
-				'text_word_maxlength' => 1,
-				'thread_depth_indent' => 1,
-				'timezone' => 1,
-				'topics_per_page' => 1,
-				'tos_enabled' => 1,
-				'tos_url' => 1,
-				'upload_max_img_size' => 1,
-				'upload_max_number_of_uploads' => 1,
-				'video_domains_allowed' => 1,
-		];
+        protected $_settingsShownInAdminIndex = [
+                'api_crossdomain' => 1,
+                'api_enabled' => 1,
+                'autolink' => 1,
+                'bbcode_img' => 1,
+                'block_user_ui' => 1,
+            // Activates and deactivates the category-chooser on entries/index
+                'category_chooser_global' => 1,
+            // Allows users to show the category-chooser even if the default
+            // setting `category_chooser_global` is off
+                'category_chooser_user_override' => 1,
+                'edit_delay' => 1,
+                'edit_period' => 1,
+                'embedly_enabled' => 1,
+                'embedly_key' => 1,
+                'email_contact' => 1,
+                'email_register' => 1,
+                'email_system' => 1,
+                'forum_disabled' => 1,
+                'forum_disabled_text' => 1,
+                'forum_email' => 1,
+                'forum_name' => 1,
+                'map_enabled' => 1,
+                'map_api_key' => 1,
+                'quote_symbol' => 1,
+                'shoutbox_enabled' => 1,
+                'shoutbox_max_shouts' => 1,
+                'smilies' => 1,
+                'signature_separator' => 1,
+                'stopwatch_get' => 1,
+                'store_ip' => 1,
+                'store_ip_anonymized' => 1,
+                'subject_maxlength' => 1,
+                'text_word_maxlength' => 1,
+                'thread_depth_indent' => 1,
+                'timezone' => 1,
+                'topics_per_page' => 1,
+                'tos_enabled' => 1,
+                'tos_url' => 1,
+                'upload_max_img_size' => 1,
+                'upload_max_number_of_uploads' => 1,
+                'video_domains_allowed' => 1,
+        ];
 
-		public function admin_index() {
-			$settings = $this->request->data = $this->Setting->getSettings();
-			$settings = array_intersect_key($settings, $this->_settingsShownInAdminIndex);
-			$this->set('Settings', $settings);
-		}
+        public function admin_index() {
+            $settings = $this->request->data = $this->Setting->getSettings();
+            $settings = array_intersect_key($settings, $this->_settingsShownInAdminIndex);
+            $this->set('Settings', $settings);
+        }
 
-		public function admin_edit($id = null) {
-			if (!$id) {
-				$this->redirect(array( 'action ' => 'index' ));
-			}
+        public function admin_edit($id = null) {
+            if (!$id) {
+                $this->redirect(array( 'action ' => 'index' ));
+            }
 
-			$this->Setting->id = $id;
+            $this->Setting->id = $id;
 
-			if (empty($this->request->data)) {
-				$this->request->data = $this->Setting->read();
-				if (empty($this->request->data)) {
-					$this->Session->setFlash("Couldn't find parameter: {$id}", 'flash/error');
-					$this->redirect(array(
-							'controller' => 'settings', 'action' => 'index', 'admin' => true )
-					);
-				}
-				if ($id === 'timezone') :
-					$this->render('admin_timezone');
-				endif;
-			} else {
-				$this->Setting->id = $id;
-				if ($this->Setting->save($this->request->data)) {
-					$this->Session->setFlash('Saved. @lo', 'flash/notice');
-					$this->redirect(['action' => 'index', '#' => $id]);
-					return;
-				} else {
-					$this->Session->setFlash('Something went wrong @lo', 'flash/error');
-				}
-			}
-		}
+            if (empty($this->request->data)) {
+                $this->request->data = $this->Setting->read();
+                if (empty($this->request->data)) {
+                    $this->Session->setFlash("Couldn't find parameter: {$id}", 'flash/error');
+                    $this->redirect(array(
+                            'controller' => 'settings', 'action' => 'index', 'admin' => true )
+                    );
+                }
+                if ($id === 'timezone') :
+                    $this->render('admin_timezone');
+                endif;
+            } else {
+                $this->Setting->id = $id;
+                if ($this->Setting->save($this->request->data)) {
+                    $this->Session->setFlash('Saved. @lo', 'flash/notice');
+                    $this->redirect(['action' => 'index', '#' => $id]);
+                    return;
+                } else {
+                    $this->Session->setFlash('Something went wrong @lo', 'flash/error');
+                }
+            }
+        }
 
-	}
+    }

app/Controller/SearchesController.php

Spacing +4 added lines, -4 removed lines

@@ -79,8 +79,8 @@ 
 			$order = '`Entry`.`time` DESC';
 			$fields = '*';
 			if ($query['order'] === 'rank') {
-				$order = 'rating DESC, ' . $order;
-				$fields = $fields . ", (MATCH (Entry.subject) AGAINST ('$q' IN BOOLEAN MODE)*2) + (MATCH (Entry.text) AGAINST ('$q' IN BOOLEAN MODE)) + (MATCH (Entry.name) AGAINST ('$q' IN BOOLEAN MODE)*4) AS rating";
+				$order = 'rating DESC, '.$order;
+				$fields = $fields.", (MATCH (Entry.subject) AGAINST ('$q' IN BOOLEAN MODE)*2) + (MATCH (Entry.text) AGAINST ('$q' IN BOOLEAN MODE)) + (MATCH (Entry.name) AGAINST ('$q' IN BOOLEAN MODE)*4) AS rating";
 			}
 
 			// query
@@ -152,8 +152,8 @@ 
 						'Y-m-d H:i:s',
 						mktime(0, 0, 0, $month, 1, $year));
 
-				if (isset($query['category_id']) && (int)$query['category_id'] !== 0) {
-					if (!isset($categories[(int)$query['category_id']])) {
+				if (isset($query['category_id']) && (int) $query['category_id'] !== 0) {
+					if (!isset($categories[(int) $query['category_id']])) {
 						throw new NotFoundException;
 					}
 				} else {

Indentation +186 added lines, -186 removed lines

@@ -1,188 +1,188 @@
 <?php
 
-	use Saito\SimpleSearchString;
-
-	App::uses('AppController', 'Controller');
-
-	class SearchesController extends AppController {
-
-		public $components = [
-				'Paginator',
-				'Search.Prg' => [
-					'commonProcess' => [
-						'allowedParams' => ['nstrict'],
-						'keepPassed' => true,
-						'filterEmpty' => true,
-						'paramType' => 'querystring'
-					]
-				]
-		];
-
-		public $helpers = ['Form', 'Html', 'EntryH'];
-
-		public $uses = [
-				'Entry'
-		];
-
-		protected $_paginateConfig = [
-				'limit' => 25
-		];
-
-		public function beforeFilter() {
-			parent::beforeFilter();
-			$this->Auth->allow('simple');
-		}
-
-		public function simple() {
-			$defaults = [
-					'order' => 'time'
-			];
-			$this->set('order', $defaults['order']);
-
-			// @todo pgsql
-			$db = $this->Entry->getDataSource();
-			// @codingStandardsIgnoreStart
-			// on 5.5 phpcs assumes this is the deprecated PHP MySQL extension
-			if (!($db instanceof Mysql)) {
-				// @codingStandardsIgnoreEnd
-				$this->redirect(['action' => 'advanced']);
-				return;
-			}
-
-			$minWordLength = $this->Entry->query("SHOW VARIABLES LIKE 'ft_min_word_len'")[0];
-			$minWordLength = array_shift($minWordLength)['Value'];
-			$this->set(compact('minWordLength'));
-
-			if (!isset($this->request->query['q'])) {
-				// request for empty search form
-				return;
-			}
-
-			$this->_filterQuery(['q', 'page', 'order']);
-			$qRaw = $this->request->query['q'];
-			$query = $this->request->query += $defaults;
-			$this->set(['q' => $qRaw, 'order' => $query['order']]);
-
-			// test query is valid
-			$SearchString = new SimpleSearchString($qRaw, $minWordLength);
-			$this->set('minChars', $minWordLength);
-
-			$query['q'] = $SearchString->replaceOperators();
-			$omitted = $SearchString->getOmittedWords();
-			$this->set('omittedWords', $omitted);
-
-			// sanitize search-term for manual SQL-query
-			$query['q'] = $this->_sanitize($query['q']);
-
-			// build query
-			$q = $query['q'];
-			$order = '`Entry`.`time` DESC';
-			$fields = '*';
-			if ($query['order'] === 'rank') {
-				$order = 'rating DESC, ' . $order;
-				$fields = $fields . ", (MATCH (Entry.subject) AGAINST ('$q' IN BOOLEAN MODE)*2) + (MATCH (Entry.text) AGAINST ('$q' IN BOOLEAN MODE)) + (MATCH (Entry.name) AGAINST ('$q' IN BOOLEAN MODE)*4) AS rating";
-			}
-
-			// query
-			$this->Paginator->settings = [
-					'fields' => $fields,
-					'conditions' => [
-							"MATCH (Entry.subject, Entry.text, Entry.name) AGAINST ('$q' IN BOOLEAN MODE)",
-							'Entry.category_id' => $this->CurrentUser->Categories->getAllowed()
-					],
-					'order' => $order,
-					'paramType' => 'querystring'
-			];
-			$this->Paginator->settings += $this->_paginateConfig;
-			$results = $this->Paginator->paginate('Entry');
-			$this->set('results', $results);
-		}
-
-		/**
-		 * @throws NotFoundException
-		 * @throws BadRequestException
-		 */
-		public function advanced() {
-			// year for date drop-down
-			$first = $this->Entry->find('first',
-					['contain' => false, 'order' => 'Entry.id ASC']);
-			if ($first !== false) {
-				$startDate = strtotime($first['Entry']['time']);
-			} else {
-				$startDate = time();
-			}
-			$this->set('start_year', date('Y', $startDate));
-
-			// category drop-down
-			$categories = $this->CurrentUser->Categories->getAllowed('list');
-			$this->set('categories', $categories);
-
-			// calculate current month and year
-			if (isset($this->request->query['month'])) {
-				$month = $this->request->query['month'];
-				$year = $this->request->query['year'];
-			} else {
-				$month = date('n', $startDate);
-				$year = date('Y', $startDate);
-			}
-
-			$this->Prg->commonProcess();
-			$query = $this->Prg->parsedParams();
-
-			if (!empty($query['subject']) || !empty($query['text']) ||
-					!empty($query['name'])
-			) {
-				// strict username search: set before parseCriteria
-				if (!empty($this->request->query['nstrict'])) {
-					// presetVars controller var isn't working in Search v2.3
-					$this->Entry->filterArgs['name']['type'] = 'value';
-				}
-
-				$settings = [
-								'conditions' => $this->Entry->parseCriteria($query),
-								'order' => ['Entry.time' => 'DESC'],
-								'paramType' => 'querystring'
-						] + $this->_paginateConfig;
-
-				$time = mktime(0, 0, 0, $month, 1, $year);
-				if (!$time) {
-					throw new BadRequestException;
-				}
-				$settings['conditions']['time >'] = date(
-						'Y-m-d H:i:s',
-						mktime(0, 0, 0, $month, 1, $year));
-
-				if (isset($query['category_id']) && (int)$query['category_id'] !== 0) {
-					if (!isset($categories[(int)$query['category_id']])) {
-						throw new NotFoundException;
-					}
-				} else {
-					$settings['conditions']['Entry.category_id'] = $this->CurrentUser
-						->Categories->getAllowed();
-				}
-				$this->Paginator->settings = $settings;
-				unset(
-					$this->request->query['direction'],
-					$this->request->query['sort']
-				);
-				$this->set('results',
-					$this->Paginator->paginate(null, null, ['Entry.time']));
-			}
-
-			if (!isset($query['category_id'])) {
-				$this->request->data['Entry']['category_id'] = 0;
-			}
-
-			$this->set(compact('month', 'year'));
-		}
-
-		protected function _sanitize($string) {
-			return Sanitize::escape($string, $this->Entry->useDbConfig);
-		}
-
-		protected function _filterQuery($params) {
-			$this->request->query = array_intersect_key($this->request->query,
-					array_fill_keys($params, 1));
-		}
-
-	}
+    use Saito\SimpleSearchString;
+
+    App::uses('AppController', 'Controller');
+
+    class SearchesController extends AppController {
+
+        public $components = [
+                'Paginator',
+                'Search.Prg' => [
+                    'commonProcess' => [
+                        'allowedParams' => ['nstrict'],
+                        'keepPassed' => true,
+                        'filterEmpty' => true,
+                        'paramType' => 'querystring'
+                    ]
+                ]
+        ];
+
+        public $helpers = ['Form', 'Html', 'EntryH'];
+
+        public $uses = [
+                'Entry'
+        ];
+
+        protected $_paginateConfig = [
+                'limit' => 25
+        ];
+
+        public function beforeFilter() {
+            parent::beforeFilter();
+            $this->Auth->allow('simple');
+        }
+
+        public function simple() {
+            $defaults = [
+                    'order' => 'time'
+            ];
+            $this->set('order', $defaults['order']);
+
+            // @todo pgsql
+            $db = $this->Entry->getDataSource();
+            // @codingStandardsIgnoreStart
+            // on 5.5 phpcs assumes this is the deprecated PHP MySQL extension
+            if (!($db instanceof Mysql)) {
+                // @codingStandardsIgnoreEnd
+                $this->redirect(['action' => 'advanced']);
+                return;
+            }
+
+            $minWordLength = $this->Entry->query("SHOW VARIABLES LIKE 'ft_min_word_len'")[0];
+            $minWordLength = array_shift($minWordLength)['Value'];
+            $this->set(compact('minWordLength'));
+
+            if (!isset($this->request->query['q'])) {
+                // request for empty search form
+                return;
+            }
+
+            $this->_filterQuery(['q', 'page', 'order']);
+            $qRaw = $this->request->query['q'];
+            $query = $this->request->query += $defaults;
+            $this->set(['q' => $qRaw, 'order' => $query['order']]);
+
+            // test query is valid
+            $SearchString = new SimpleSearchString($qRaw, $minWordLength);
+            $this->set('minChars', $minWordLength);
+
+            $query['q'] = $SearchString->replaceOperators();
+            $omitted = $SearchString->getOmittedWords();
+            $this->set('omittedWords', $omitted);
+
+            // sanitize search-term for manual SQL-query
+            $query['q'] = $this->_sanitize($query['q']);
+
+            // build query
+            $q = $query['q'];
+            $order = '`Entry`.`time` DESC';
+            $fields = '*';
+            if ($query['order'] === 'rank') {
+                $order = 'rating DESC, ' . $order;
+                $fields = $fields . ", (MATCH (Entry.subject) AGAINST ('$q' IN BOOLEAN MODE)*2) + (MATCH (Entry.text) AGAINST ('$q' IN BOOLEAN MODE)) + (MATCH (Entry.name) AGAINST ('$q' IN BOOLEAN MODE)*4) AS rating";
+            }
+
+            // query
+            $this->Paginator->settings = [
+                    'fields' => $fields,
+                    'conditions' => [
+                            "MATCH (Entry.subject, Entry.text, Entry.name) AGAINST ('$q' IN BOOLEAN MODE)",
+                            'Entry.category_id' => $this->CurrentUser->Categories->getAllowed()
+                    ],
+                    'order' => $order,
+                    'paramType' => 'querystring'
+            ];
+            $this->Paginator->settings += $this->_paginateConfig;
+            $results = $this->Paginator->paginate('Entry');
+            $this->set('results', $results);
+        }
+
+        /**
+         * @throws NotFoundException
+         * @throws BadRequestException
+         */
+        public function advanced() {
+            // year for date drop-down
+            $first = $this->Entry->find('first',
+                    ['contain' => false, 'order' => 'Entry.id ASC']);
+            if ($first !== false) {
+                $startDate = strtotime($first['Entry']['time']);
+            } else {
+                $startDate = time();
+            }
+            $this->set('start_year', date('Y', $startDate));
+
+            // category drop-down
+            $categories = $this->CurrentUser->Categories->getAllowed('list');
+            $this->set('categories', $categories);
+
+            // calculate current month and year
+            if (isset($this->request->query['month'])) {
+                $month = $this->request->query['month'];
+                $year = $this->request->query['year'];
+            } else {
+                $month = date('n', $startDate);
+                $year = date('Y', $startDate);
+            }
+
+            $this->Prg->commonProcess();
+            $query = $this->Prg->parsedParams();
+
+            if (!empty($query['subject']) || !empty($query['text']) ||
+                    !empty($query['name'])
+            ) {
+                // strict username search: set before parseCriteria
+                if (!empty($this->request->query['nstrict'])) {
+                    // presetVars controller var isn't working in Search v2.3
+                    $this->Entry->filterArgs['name']['type'] = 'value';
+                }
+
+                $settings = [
+                                'conditions' => $this->Entry->parseCriteria($query),
+                                'order' => ['Entry.time' => 'DESC'],
+                                'paramType' => 'querystring'
+                        ] + $this->_paginateConfig;
+
+                $time = mktime(0, 0, 0, $month, 1, $year);
+                if (!$time) {
+                    throw new BadRequestException;
+                }
+                $settings['conditions']['time >'] = date(
+                        'Y-m-d H:i:s',
+                        mktime(0, 0, 0, $month, 1, $year));
+
+                if (isset($query['category_id']) && (int)$query['category_id'] !== 0) {
+                    if (!isset($categories[(int)$query['category_id']])) {
+                        throw new NotFoundException;
+                    }
+                } else {
+                    $settings['conditions']['Entry.category_id'] = $this->CurrentUser
+                        ->Categories->getAllowed();
+                }
+                $this->Paginator->settings = $settings;
+                unset(
+                    $this->request->query['direction'],
+                    $this->request->query['sort']
+                );
+                $this->set('results',
+                    $this->Paginator->paginate(null, null, ['Entry.time']));
+            }
+
+            if (!isset($query['category_id'])) {
+                $this->request->data['Entry']['category_id'] = 0;
+            }
+
+            $this->set(compact('month', 'year'));
+        }
+
+        protected function _sanitize($string) {
+            return Sanitize::escape($string, $this->Entry->useDbConfig);
+        }
+
+        protected function _filterQuery($params) {
+            $this->request->query = array_intersect_key($this->request->query,
+                    array_fill_keys($params, 1));
+        }
+
+    }

app/Controller/StatusController.php

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