Schlaefer / Saito

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

Braces +6 added lines, -2 removed lines

@@ -89,8 +89,10 @@ 
 						$this->Session->setFlash(__('Error moving category.'),
 								'flash/error');
 						$failure = $failure || true;
-					else:
+					else {
+					    :
 						$this->Session->setFlash(__('Category moved.'), 'flash/notice');
+					}
 					endif;
 				endif;
 
@@ -99,8 +101,10 @@ 
 					$this->Session->setFlash(__("Error deleting category."),
 							'flash/error');
 					$failure = $failure || true;
-				else:
+				else {
+				    :
 					$this->Session->setFlash(__('Category deleted.'), 'flash/notice');
+				}
 				endif;
 
 				if ($failure == false) :

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 {

Doc Comments +3 added lines

@@ -180,6 +180,9 @@
 			return Sanitize::escape($string, $this->Entry->useDbConfig);
 		}
 
+		/**
+		 * @param string[] $params
+		 */
 		protected function _filterQuery($params) {
 			$this->request->query = array_intersect_key($this->request->query,
 					array_fill_keys($params, 1));

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

Spacing +6 added lines, -6 removed lines

@@ -136,7 +136,7 @@ 
 
 			// activate stopwatch in debug mode
 			$this->set('showStopwatchOutput', false);
-			if ((int)Configure::read('debug') > 0) {
+			if ((int) Configure::read('debug') > 0) {
 				$this->set('showStopwatchOutput', true);
 			};
 
@@ -183,7 +183,7 @@ 
 
 			$this->set('lastAction', $this->localReferer('action'));
 			$this->set('lastController', $this->localReferer('controller'));
-			$this->set('isDebug', (int)Configure::read('debug') > 0);
+			$this->set('isDebug', (int) Configure::read('debug') > 0);
 			$this->_setLayoutTitles();
 
 			$this->_setXFrameOptionsHeader();
@@ -288,7 +288,7 @@ 
 			} else {
 				$_pageTitle = __d(
 					'page_titles',
-						$this->params['controller'] . '/' . $this->params['action']
+						$this->params['controller'].'/'.$this->params['action']
 				);
 			}
 			$this->set('title_for_page', $_pageTitle);
@@ -449,9 +449,9 @@ 
 		 */
 		protected function _l10nRenderFile() {
 			$locale = Configure::read('Config.language');
-			$l10nViewPath = $this->viewPath . DS . $locale;
-			$l10nViewFile = $l10nViewPath . DS . $this->view . '.ctp';
-			if ($locale && file_exists(APP . 'View' . DS . $l10nViewFile)
+			$l10nViewPath = $this->viewPath.DS.$locale;
+			$l10nViewFile = $l10nViewPath.DS.$this->view.'.ctp';
+			if ($locale && file_exists(APP.'View'.DS.$l10nViewFile)
 			) {
 				$this->viewPath = $l10nViewPath;
 			}

Indentation +395 added lines, -395 removed lines

@@ -1,196 +1,196 @@ 
 <?php
 
-	use Saito\Exception\SaitoBlackholeException;
+    use Saito\Exception\SaitoBlackholeException;
 
-	App::uses('Controller', 'Controller');
-	App::uses('CakeEmail', 'Network/Email');
-	App::import('Lib', 'Stopwatch.Stopwatch');
+    App::uses('Controller', 'Controller');
+    App::uses('CakeEmail', 'Network/Email');
+    App::import('Lib', 'Stopwatch.Stopwatch');
 
-	if (Configure::read('debug') > 0) {
-		App::uses('FireCake', 'DebugKit.Lib');
-	}
+    if (Configure::read('debug') > 0) {
+        App::uses('FireCake', 'DebugKit.Lib');
+    }
 
-	class AppController extends Controller {
+    class AppController extends Controller {
 
-		public $components = [
-			// 'DebugKit.Toolbar',
+        public $components = [
+            // 'DebugKit.Toolbar',
 
-			// Leave in front to catch all unauthorized access first
-			'Security', 'Auth',
-			// Leave in front to have it available in all Components
-			'Detectors.Detectors',
+            // Leave in front to catch all unauthorized access first
+            'Security', 'Auth',
+            // Leave in front to have it available in all Components
+            'Detectors.Detectors',
 /**
- * You have to have Cookie before CurrentUser to have the salt initialized.
- * Check by deleting Session cookie when persistent cookie is present.
- * @td maybe bug in Cake, because Cookies should be initialized in CurrentUser's $components
- */
-			'Cookie',
-			'CurrentUser',
-			'CacheSupport',
-			'Cron.Cron',
-			'JsData',
-			'Parser',
-			'SaitoEmail',
-			'EmailNotification',
-			// Enabling data view for rss/xml and json
-			'RequestHandler',
-			'Session',
-			'Themes'
-		];
-
-		public $helpers = [
-			'JsData',
-			// 'Markitup.Markitup',
-			'Layout',
-			'RequireJs',
-			'SaitoHelp.SaitoHelp',
-			'Stopwatch.Stopwatch',
-			'TimeH',
-			'UserH',
-			// CakePHP helpers
-			'Js' => array('Jquery'),
-			'Html',
-			'Form',
-			'Session'
-		];
-
-		public $uses = [
-			'Setting',
-			'User'
-		];
+             * You have to have Cookie before CurrentUser to have the salt initialized.
+             * Check by deleting Session cookie when persistent cookie is present.
+             * @td maybe bug in Cake, because Cookies should be initialized in CurrentUser's $components
+             */
+            'Cookie',
+            'CurrentUser',
+            'CacheSupport',
+            'Cron.Cron',
+            'JsData',
+            'Parser',
+            'SaitoEmail',
+            'EmailNotification',
+            // Enabling data view for rss/xml and json
+            'RequestHandler',
+            'Session',
+            'Themes'
+        ];
+
+        public $helpers = [
+            'JsData',
+            // 'Markitup.Markitup',
+            'Layout',
+            'RequireJs',
+            'SaitoHelp.SaitoHelp',
+            'Stopwatch.Stopwatch',
+            'TimeH',
+            'UserH',
+            // CakePHP helpers
+            'Js' => array('Jquery'),
+            'Html',
+            'Form',
+            'Session'
+        ];
+
+        public $uses = [
+            'Setting',
+            'User'
+        ];
 
 /**
  * name of the theme used
  *
  * @var string
  */
-		public $theme = 'paz';
+        public $theme = 'paz';
 
 /**
  * S(l)idetabs used by the application
  *
  * @var array
  */
-		public $installedSlidetabs = [
-			'slidetab_userlist',
-			'slidetab_recentposts',
-			'slidetab_recententries',
-			'slidetab_shoutbox'
-		];
+        public $installedSlidetabs = [
+            'slidetab_userlist',
+            'slidetab_recentposts',
+            'slidetab_recententries',
+            'slidetab_shoutbox'
+        ];
 
 /**
  * Are app stats calculated
  *
  * @var bool
  */
-		protected $_areAppStatsSet = false;
+        protected $_areAppStatsSet = false;
 
 /**
  * @var bool show disclaimer in page footer
  */
-		public $showDisclaimer = false;
-
-		/**
-		 * objects shared between controllers & models
-		 *
-		 * Avoids a lot of boilerplate code and shuffling around singletons.
-		 *
-		 * @var array objects shared between controllers & models
-		 */
-		public $SharedObjects = [];
-
-		public function __construct($request = null, $response = null) {
-			Stopwatch::start(
-				'---------------------- Controller ----------------------'
-			);
-
-			ClassRegistry::addObject('dic', \Saito\DicSetup::getNewDic());
-			parent::__construct($request, $response);
-		}
-
-		public function __get($name) {
-			switch ($name) {
-				case 'dic':
-					return ClassRegistry::getObject('dic');
-				default:
-					return parent::__get($name);
-			}
-		}
-
-		public function beforeFilter() {
-			Stopwatch::start('App->beforeFilter()');
-
-			// must be called before CakeError early return
-			$this->Themes->theme(Configure::read('Saito.themes'));
-			$this->Setting->load(Configure::read('Saito.Settings'));
-
-			// CakeErrors run through this beforeFilter, which is usually not necessary
-			// for error messages
-			if ($this->name === 'CakeError') {
-					return;
-			}
-
-			$this->Security->blackHoleCallback = 'blackhole';
-			$this->Security->csrfUseOnce = false;
-			$this->Security->csrfExpires = '+3 hours';
-
-			// activate stopwatch in debug mode
-			$this->set('showStopwatchOutput', false);
-			if ((int)Configure::read('debug') > 0) {
-				$this->set('showStopwatchOutput', true);
-			};
-
-			// setup for admin area
-			if (isset($this->params['admin'])):
-				$this->_beforeFilterAdminArea();
-			endif;
-
-			// disable forum with admin pref
-			if (Configure::read('Saito.Settings.forum_disabled') &&
-					$this->request['action'] !== 'login' &&
-					!$this->CurrentUser->isAdmin()
-			) {
-				$this->Themes->setDefault();
-				return $this->render('/Pages/forum_disabled', 'barebone');
-				exit;
-			}
-
-			$this->_setupSlideTabs();
-
-			$this->_setConfigurationFromGetParams();
-
-			// must be set after all language chooser
-			\Saito\String\Properize::setLanguage(Configure::read('Config.language'));
-
-			// allow sql explain for DebugKit toolbar
-			if ($this->request->plugin === 'debug_kit') {
-				$this->Auth->allow('sql_explain');
-			}
-
-			$this->_l10nRenderFile();
-
-			Stopwatch::stop('App->beforeFilter()');
-		}
-
-		public function beforeRender() {
-			Stopwatch::start('App->beforeRender()');
-
-			parent::beforeRender();
-
-			if ($this->showDisclaimer) {
-				$this->_showDisclaimer();
-			}
-
-			$this->set('lastAction', $this->localReferer('action'));
-			$this->set('lastController', $this->localReferer('controller'));
-			$this->set('isDebug', (int)Configure::read('debug') > 0);
-			$this->_setLayoutTitles();
-
-			$this->_setXFrameOptionsHeader();
-
-			Stopwatch::stop('App->beforeRender()');
-			Stopwatch::start('---------------------- Rendering ---------------------- ');
-		}
+        public $showDisclaimer = false;
+
+        /**
+         * objects shared between controllers & models
+         *
+         * Avoids a lot of boilerplate code and shuffling around singletons.
+         *
+         * @var array objects shared between controllers & models
+         */
+        public $SharedObjects = [];
+
+        public function __construct($request = null, $response = null) {
+            Stopwatch::start(
+                '---------------------- Controller ----------------------'
+            );
+
+            ClassRegistry::addObject('dic', \Saito\DicSetup::getNewDic());
+            parent::__construct($request, $response);
+        }
+
+        public function __get($name) {
+            switch ($name) {
+                case 'dic':
+                    return ClassRegistry::getObject('dic');
+                default:
+                    return parent::__get($name);
+            }
+        }
+
+        public function beforeFilter() {
+            Stopwatch::start('App->beforeFilter()');
+
+            // must be called before CakeError early return
+            $this->Themes->theme(Configure::read('Saito.themes'));
+            $this->Setting->load(Configure::read('Saito.Settings'));
+
+            // CakeErrors run through this beforeFilter, which is usually not necessary
+            // for error messages
+            if ($this->name === 'CakeError') {
+                    return;
+            }
+
+            $this->Security->blackHoleCallback = 'blackhole';
+            $this->Security->csrfUseOnce = false;
+            $this->Security->csrfExpires = '+3 hours';
+
+            // activate stopwatch in debug mode
+            $this->set('showStopwatchOutput', false);
+            if ((int)Configure::read('debug') > 0) {
+                $this->set('showStopwatchOutput', true);
+            };
+
+            // setup for admin area
+            if (isset($this->params['admin'])):
+                $this->_beforeFilterAdminArea();
+            endif;
+
+            // disable forum with admin pref
+            if (Configure::read('Saito.Settings.forum_disabled') &&
+                    $this->request['action'] !== 'login' &&
+                    !$this->CurrentUser->isAdmin()
+            ) {
+                $this->Themes->setDefault();
+                return $this->render('/Pages/forum_disabled', 'barebone');
+                exit;
+            }
+
+            $this->_setupSlideTabs();
+
+            $this->_setConfigurationFromGetParams();
+
+            // must be set after all language chooser
+            \Saito\String\Properize::setLanguage(Configure::read('Config.language'));
+
+            // allow sql explain for DebugKit toolbar
+            if ($this->request->plugin === 'debug_kit') {
+                $this->Auth->allow('sql_explain');
+            }
+
+            $this->_l10nRenderFile();
+
+            Stopwatch::stop('App->beforeFilter()');
+        }
+
+        public function beforeRender() {
+            Stopwatch::start('App->beforeRender()');
+
+            parent::beforeRender();
+
+            if ($this->showDisclaimer) {
+                $this->_showDisclaimer();
+            }
+
+            $this->set('lastAction', $this->localReferer('action'));
+            $this->set('lastController', $this->localReferer('controller'));
+            $this->set('isDebug', (int)Configure::read('debug') > 0);
+            $this->_setLayoutTitles();
+
+            $this->_setXFrameOptionsHeader();
+
+            Stopwatch::stop('App->beforeRender()');
+            Stopwatch::start('---------------------- Rendering ---------------------- ');
+        }
 
 /**
  * Sets forum configuration from GET parameter in url
@@ -199,120 +199,120 @@ 
  * - stopwatch:true
  * - lang:<lang_id>
  */
-		protected function _setConfigurationFromGetParams() {
-			if (!$this->CurrentUser->isLoggedIn()) {
-				return;
-			}
-
-			// change theme on the fly with ?theme=<name>
-			if (isset($this->request->query['theme'])) {
-				$this->theme = $this->request->query['theme'];
-			}
-
-			// activate stopwatch
-			if (isset($this->request->query['stopwatch']) && Configure::read('Saito.Settings.stopwatch_get')) {
-				$this->set('showStopwatchOutput', true);
-			};
-
-			// change language
-			if (isset($this->request->query['lang'])) {
-				$L10n = ClassRegistry::init('L10n');
-				$lang = $this->request->query['lang'];
-				if ($L10n->catalog($lang)) {
-					Configure::write('Config.language', $lang);
-				}
-			};
-		}
+        protected function _setConfigurationFromGetParams() {
+            if (!$this->CurrentUser->isLoggedIn()) {
+                return;
+            }
+
+            // change theme on the fly with ?theme=<name>
+            if (isset($this->request->query['theme'])) {
+                $this->theme = $this->request->query['theme'];
+            }
+
+            // activate stopwatch
+            if (isset($this->request->query['stopwatch']) && Configure::read('Saito.Settings.stopwatch_get')) {
+                $this->set('showStopwatchOutput', true);
+            };
+
+            // change language
+            if (isset($this->request->query['lang'])) {
+                $L10n = ClassRegistry::init('L10n');
+                $lang = $this->request->query['lang'];
+                if ($L10n->catalog($lang)) {
+                    Configure::write('Config.language', $lang);
+                }
+            };
+        }
 
 /**
  * sets layout/title/page vars
  *
  * @td helper?
  */
-		protected function _setLayoutTitles() {
-			$_pageTitle = $this->_setPageTitle();
-			$_forumName = $this->_setForumName();
-			$this->_setForumTitle($_pageTitle, $_forumName);
-		}
-
-		/**
-		 * Sets forum name according to forum settings if not already set
-		 *
-		 * @return string
-		 */
-		protected function _setForumName() {
-			if (isset($this->viewVars['forum_name'])) {
-				return $this->viewVars['forum_name'];
-			}
-			$_forumName = Configure::read('Saito.Settings.forum_name');
-			$this->set('forum_name', $_forumName);
-			return $_forumName;
-		}
-
-		/**
-		 * Sets forum title `<page> - <forum>`
-		 *
-		 * @param string $pageTitle
-		 * @param string $forumName
-		 * @return string
-		 */
-		protected function _setForumTitle($pageTitle, $forumName) {
-			$_forumTitle = $pageTitle;
-			if (!empty($forumName)) {
-				$_forumTitle = CakeText::insert(__('forum-title-template'),
-						['page' => $pageTitle, 'forum' => $forumName]);
-			}
-			$this->set('title_for_layout', $_forumTitle);
-			return $_forumTitle;
-		}
-
-		/**
-		 * Sets page title
-		 *
-		 * Looks in this order for:
-		 * 1. title_for_page
-		 * 2. title_for_layout
-		 * 3. `page_titles.po` language file with 'controller/view' title,
-		 * 		use plural for for controller title: 'entries/index' (not 'entry/index')!
-		 *
-		 * @return string
-		 */
-		protected function _setPageTitle() {
-			if (isset($this->viewVars['title_for_page'])) {
-				$_pageTitle = $this->viewVars['title_for_page'];
-			} elseif (isset($this->viewVars['title_for_layout'])) {
-				// provides CakePHP backwards-compatibility
-				$_pageTitle = $this->viewVars['title_for_layout'];
-			} elseif ($this->name === 'CakeError') {
-				$_pageTitle = '';
-			} else {
-				$_pageTitle = __d(
-					'page_titles',
-						$this->params['controller'] . '/' . $this->params['action']
-				);
-			}
-			$this->set('title_for_page', $_pageTitle);
-			return $_pageTitle;
-		}
-
-		protected function _setXFrameOptionsHeader() {
-			$xFO = Configure::read('Saito.X-Frame-Options');
-			if (empty($xFO)) {
-				$xFO = 'SAMEORIGIN';
-			}
-			$this->response->header('X-Frame-Options', $xFO);
-		}
-
-		/**
-		 *
-		 *
-		 * @param $type
-		 * @throws Saito\Exception\SaitoBlackholeException
-		 */
-		public function blackhole($type) {
-			throw new SaitoBlackholeException($type,
-				['CurrentUser' => $this->CurrentUser]);
-		}
+        protected function _setLayoutTitles() {
+            $_pageTitle = $this->_setPageTitle();
+            $_forumName = $this->_setForumName();
+            $this->_setForumTitle($_pageTitle, $_forumName);
+        }
+
+        /**
+         * Sets forum name according to forum settings if not already set
+         *
+         * @return string
+         */
+        protected function _setForumName() {
+            if (isset($this->viewVars['forum_name'])) {
+                return $this->viewVars['forum_name'];
+            }
+            $_forumName = Configure::read('Saito.Settings.forum_name');
+            $this->set('forum_name', $_forumName);
+            return $_forumName;
+        }
+
+        /**
+         * Sets forum title `<page> - <forum>`
+         *
+         * @param string $pageTitle
+         * @param string $forumName
+         * @return string
+         */
+        protected function _setForumTitle($pageTitle, $forumName) {
+            $_forumTitle = $pageTitle;
+            if (!empty($forumName)) {
+                $_forumTitle = CakeText::insert(__('forum-title-template'),
+                        ['page' => $pageTitle, 'forum' => $forumName]);
+            }
+            $this->set('title_for_layout', $_forumTitle);
+            return $_forumTitle;
+        }
+
+        /**
+         * Sets page title
+         *
+         * Looks in this order for:
+         * 1. title_for_page
+         * 2. title_for_layout
+         * 3. `page_titles.po` language file with 'controller/view' title,
+         * 		use plural for for controller title: 'entries/index' (not 'entry/index')!
+         *
+         * @return string
+         */
+        protected function _setPageTitle() {
+            if (isset($this->viewVars['title_for_page'])) {
+                $_pageTitle = $this->viewVars['title_for_page'];
+            } elseif (isset($this->viewVars['title_for_layout'])) {
+                // provides CakePHP backwards-compatibility
+                $_pageTitle = $this->viewVars['title_for_layout'];
+            } elseif ($this->name === 'CakeError') {
+                $_pageTitle = '';
+            } else {
+                $_pageTitle = __d(
+                    'page_titles',
+                        $this->params['controller'] . '/' . $this->params['action']
+                );
+            }
+            $this->set('title_for_page', $_pageTitle);
+            return $_pageTitle;
+        }
+
+        protected function _setXFrameOptionsHeader() {
+            $xFO = Configure::read('Saito.X-Frame-Options');
+            if (empty($xFO)) {
+                $xFO = 'SAMEORIGIN';
+            }
+            $this->response->header('X-Frame-Options', $xFO);
+        }
+
+        /**
+         *
+         *
+         * @param $type
+         * @throws Saito\Exception\SaitoBlackholeException
+         */
+        public function blackhole($type) {
+            throw new SaitoBlackholeException($type,
+                ['CurrentUser' => $this->CurrentUser]);
+        }
 
 /**
  * Custom referer which can return only referer's action or controller
@@ -320,141 +320,141 @@ 
  * @param string $type 'controller' or 'action'
  * @return string
  */
-		public function localReferer($type = null) {
-			$referer = parent::referer(null, true);
-			$parsed = Router::parse($referer);
-			if (isset($parsed[$type])) {
-				return $parsed[$type];
-			} else {
-				if ($type === 'action') {
-					return 'index';
-				} elseif ($type === 'controller') {
-					return 'entries';
-				}
-			}
-			return $referer;
-		}
+        public function localReferer($type = null) {
+            $referer = parent::referer(null, true);
+            $parsed = Router::parse($referer);
+            if (isset($parsed[$type])) {
+                return $parsed[$type];
+            } else {
+                if ($type === 'action') {
+                    return 'index';
+                } elseif ($type === 'controller') {
+                    return 'entries';
+                }
+            }
+            return $referer;
+        }
 
 /**
  * Setup which slidetabs are available and user sorting
  *
  * @throws ForbiddenException
  */
-		protected function _setupSlideTabs() {
-			$slidetabs = $this->installedSlidetabs;
-
-			if (!empty($this->CurrentUser['slidetab_order'])) {
-				$slidetabsUser = unserialize($this->CurrentUser['slidetab_order']);
-				// disabled tabs still set in user-prefs are unset
-				$slidetabsUser = array_intersect($slidetabsUser, $this->installedSlidetabs);
-				// new tabs not set in user-prefs are added
-				$slidetabs = array_unique(array_merge($slidetabsUser, $this->installedSlidetabs));
-			}
-			if (Configure::read('Saito.Settings.shoutbox_enabled') == false) {
-				unset($slidetabs[array_search('slidetab_shoutbox', $slidetabs)]);
-			}
-			$this->set('slidetabs', $slidetabs);
-		}
-
-		protected function _beforeFilterAdminArea() {
-			// protect the admin area
-			if ($this->CurrentUser->isAdmin() !== true) :
-				throw new ForbiddenException();
-			endif;
-
-			$this->layout = 'admin';
-		}
-
-		/**
-		 * manually require auth and redirect cycle
-		 */
-		protected function _requireAuth() {
-			$this->Session->setFlash(__('auth_autherror'), 'flash/warning');
-			$here = $this->request->here(false);
-			$this->Auth->redirectUrl($here);
-			$this->redirect(['controller' => 'users', 'action' => 'login']);
-		}
+        protected function _setupSlideTabs() {
+            $slidetabs = $this->installedSlidetabs;
+
+            if (!empty($this->CurrentUser['slidetab_order'])) {
+                $slidetabsUser = unserialize($this->CurrentUser['slidetab_order']);
+                // disabled tabs still set in user-prefs are unset
+                $slidetabsUser = array_intersect($slidetabsUser, $this->installedSlidetabs);
+                // new tabs not set in user-prefs are added
+                $slidetabs = array_unique(array_merge($slidetabsUser, $this->installedSlidetabs));
+            }
+            if (Configure::read('Saito.Settings.shoutbox_enabled') == false) {
+                unset($slidetabs[array_search('slidetab_shoutbox', $slidetabs)]);
+            }
+            $this->set('slidetabs', $slidetabs);
+        }
+
+        protected function _beforeFilterAdminArea() {
+            // protect the admin area
+            if ($this->CurrentUser->isAdmin() !== true) :
+                throw new ForbiddenException();
+            endif;
+
+            $this->layout = 'admin';
+        }
+
+        /**
+         * manually require auth and redirect cycle
+         */
+        protected function _requireAuth() {
+            $this->Session->setFlash(__('auth_autherror'), 'flash/warning');
+            $here = $this->request->here(false);
+            $this->Auth->redirectUrl($here);
+            $this->redirect(['controller' => 'users', 'action' => 'login']);
+        }
 
 /**
  * Shows the disclaimer in the layout
  */
-		protected function _showDisclaimer() {
-			$this->_setAppStats();
-			$this->set('showDisclaimer', true);
-		}
+        protected function _showDisclaimer() {
+            $this->_setAppStats();
+            $this->set('showDisclaimer', true);
+        }
 
 /**
  * Set application statistics used in the disclaimer
  */
-		protected function _setAppStats() {
-			if ($this->_areAppStatsSet) {
-				return;
-			}
-			Stopwatch::start('AppController->_setAppStats()');
-			$this->_areAppStatsSet = true;
-
-			$loggedinUsers = $this->User->UserOnline->getLoggedIn();
-			$this->set('UsersOnline', $loggedinUsers);
-
-			/* @var $headCounter array or false */
-			$headCounter = Cache::read('header_counter', 'short');
-			if (!$headCounter) {
-				$countableItems = [
-					'user_online' => ['model' => 'UserOnline', 'conditions' => ''],
-					'user' => ['model' => 'User', 'conditions' => ''],
-					'entries' => ['model' => 'Entry', 'conditions' => ''],
-					'threads' => [
-						'model' => 'Entry',
-						'conditions' => ['pid' => 0]
-					]
-				];
-
-				if (!isset($this->Entry)) {
-					$this->loadModel('Entry');
-				}
-
-				// @td foreach not longer feasable, refactor
-				foreach ($countableItems as $titel => $options) {
-					if ($options['model'] === 'Entry') {
-						$headCounter[$titel] = $this->{$options['model']}->find(
-							'count',
-							['contain' => false, 'conditions' => $options['conditions']]
-						);
-					} elseif ($options['model'] === 'User') {
-						$headCounter[$titel] = $this->Entry->{$options['model']}->find(
-							'count',
-							['contain' => false, 'conditions' => $options['conditions']]
-						);
-					} elseif ($options['model'] === 'UserOnline') {
-						$headCounter[$titel] = $this->Entry->User->{$options['model']}->find(
-							'count',
-							['contain' => false, 'conditions' => $options['conditions']]
-						);
-					}
-				}
-				$headCounter['latestUser'] = $this->Entry->User->find('latest');
-				Cache::write('header_counter', $headCounter, 'short');
-			}
-			$headCounter['user_registered'] = count($loggedinUsers);
-			$anonUser = $headCounter['user_online'] - $headCounter['user_registered'];
-			// compensate for cached 'user_online' so that user_anonymous can't get negative
-			$headCounter['user_anonymous'] = ($anonUser < 0) ? 0 : $anonUser;
-
-			$this->set('HeaderCounter', $headCounter);
-			Stopwatch::stop('AppController->_setAppStats()');
-		}
-
-		/**
-		 * sets l10n .ctp file if available
-		 */
-		protected function _l10nRenderFile() {
-			$locale = Configure::read('Config.language');
-			$l10nViewPath = $this->viewPath . DS . $locale;
-			$l10nViewFile = $l10nViewPath . DS . $this->view . '.ctp';
-			if ($locale && file_exists(APP . 'View' . DS . $l10nViewFile)
-			) {
-				$this->viewPath = $l10nViewPath;
-			}
-		}
-
-	}
+        protected function _setAppStats() {
+            if ($this->_areAppStatsSet) {
+                return;
+            }
+            Stopwatch::start('AppController->_setAppStats()');
+            $this->_areAppStatsSet = true;
+
+            $loggedinUsers = $this->User->UserOnline->getLoggedIn();
+            $this->set('UsersOnline', $loggedinUsers);
+
+            /* @var $headCounter array or false */
+            $headCounter = Cache::read('header_counter', 'short');
+            if (!$headCounter) {
+                $countableItems = [
+                    'user_online' => ['model' => 'UserOnline', 'conditions' => ''],
+                    'user' => ['model' => 'User', 'conditions' => ''],
+                    'entries' => ['model' => 'Entry', 'conditions' => ''],
+                    'threads' => [
+                        'model' => 'Entry',
+                        'conditions' => ['pid' => 0]
+                    ]
+                ];
+
+                if (!isset($this->Entry)) {
+                    $this->loadModel('Entry');
+                }
+
+                // @td foreach not longer feasable, refactor
+                foreach ($countableItems as $titel => $options) {
+                    if ($options['model'] === 'Entry') {
+                        $headCounter[$titel] = $this->{$options['model']}->find(
+                            'count',
+                            ['contain' => false, 'conditions' => $options['conditions']]
+                        );
+                    } elseif ($options['model'] === 'User') {
+                        $headCounter[$titel] = $this->Entry->{$options['model']}->find(
+                            'count',
+                            ['contain' => false, 'conditions' => $options['conditions']]
+                        );
+                    } elseif ($options['model'] === 'UserOnline') {
+                        $headCounter[$titel] = $this->Entry->User->{$options['model']}->find(
+                            'count',
+                            ['contain' => false, 'conditions' => $options['conditions']]
+                        );
+                    }
+                }
+                $headCounter['latestUser'] = $this->Entry->User->find('latest');
+                Cache::write('header_counter', $headCounter, 'short');
+            }
+            $headCounter['user_registered'] = count($loggedinUsers);
+            $anonUser = $headCounter['user_online'] - $headCounter['user_registered'];
+            // compensate for cached 'user_online' so that user_anonymous can't get negative
+            $headCounter['user_anonymous'] = ($anonUser < 0) ? 0 : $anonUser;
+
+            $this->set('HeaderCounter', $headCounter);
+            Stopwatch::stop('AppController->_setAppStats()');
+        }
+
+        /**
+         * sets l10n .ctp file if available
+         */
+        protected function _l10nRenderFile() {
+            $locale = Configure::read('Config.language');
+            $l10nViewPath = $this->viewPath . DS . $locale;
+            $l10nViewFile = $l10nViewPath . DS . $this->view . '.ctp';
+            if ($locale && file_exists(APP . 'View' . DS . $l10nViewFile)
+            ) {
+                $this->viewPath = $l10nViewPath;
+            }
+        }
+
+    }

app/Controller/Component/ThemesComponent.php

Spacing +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
 		 * @return array with Theme names
 		 */
 		public function themeDirs() {
-			$_ThemeDir = new Folder(App::paths()['View'][0] . 'Themed');
+			$_ThemeDir = new Folder(App::paths()['View'][0].'Themed');
 			return $_ThemeDir->read()[0];
 		}
 

Indentation +135 added lines, -135 removed lines

@@ -1,137 +1,137 @@
 <?php
 
-	App::uses('App', 'Core');
-	App::uses('Folder', 'Utility');
-	App::uses('Component', 'Controller');
-
-	class ThemesComponent extends Component {
-
-		protected $_config = null;
-
-		protected $_applied = null;
-
-		protected $_available = [];
-
-		protected $_Controller = null;
-
-		public function initialize(Controller $controller) {
-			$this->_Controller = $controller;
-		}
-
-		/**
-		 * Sets and/or gets current theme
-		 *
-		 * @param mixed $params name string or config array
-		 * @return string current theme
-		 * @throws InvalidArgumentException
-		 * @throws UnexpectedValueException
-		 */
-		public function theme($params = null) {
-			if (is_array($params)) {
-				$this->_config = $params;
-				$this->_setTheme($this->_getApplied());
-			} elseif (is_string($params)) {
-				$this->_setTheme($params);
-			}
-			if (empty($this->_applied)) {
-				if ($params === null) {
-					throw new UnexpectedValueException(
-						sprintf(
-							'Theme could not be determined: %s',
-							print_r($params, true)
-						)
-					);
-				} else {
-					throw new InvalidArgumentException('Theme is not set yet.');
-				}
-			}
-			return $this->_applied;
-		}
-
-		/**
-		 * Gets currently applied theme
-		 */
-		protected function _getApplied() {
-			if ($this->_applied) {
-				return $this->_applied;
-			}
-			if ($this->_Controller->CurrentUser->isLoggedIn()) {
-				$_userTheme = $this->_Controller->CurrentUser['user_theme'];
-				if (in_array($_userTheme, $this->getAvailable())) {
-						$this->_applied = $_userTheme;
-				}
-			}
-			if (!$this->_applied) {
-				$this->_applied = $this->_config['default'];
-			}
-			return $this->_applied;
-		}
-
-		public function setDefault() {
-			$this->_setTheme($this->_config['default']);
-		}
-
-		protected function _setTheme($theme) {
-			$this->_applied = $theme;
-			$this->_Controller->theme = $this->_applied;
-		}
-
-		/**
-		 * Gets available themes
-		 *
-		 * @return array
-		 */
-		public function getAvailable() {
-			if (!$this->_available) {
-				$this->_setAvailable();
-			}
-			return $this->_available;
-		}
-
-		/**
-		 * Sets available themes
-		 */
-		protected function _setAvailable() {
-			$_themesSubset = [];
-
-			$this->_available = $this->themeDirs();
-
-			// allowed themes for all users
-			if (isset($this->_config['available']['all'])) {
-				if ($this->_config['available']['all'] !== '*') {
-					$_themesSubset = $this->_config['available']['all'];
-				}
-			} else {
-				$_themesSubset = [$this->_config['default']];
-			}
-
-			// allowed user themes
-			$_currentUserId = $this->_Controller->CurrentUser->getId();
-			if (isset($this->_config['available']['users'][$_currentUserId])) {
-				$_themesSubset = array_merge($_themesSubset,
-						$this->_config['available']['users'][$_currentUserId]);
-			}
-
-			// filter themes
-			if ($_themesSubset) {
-				$this->_available = array_intersect($this->_available, $_themesSubset);
-			}
-
-			// default theme is always available
-			array_unshift($this->_available, $this->_config['default']);
-
-			// make sure default/every theme is in list only one time
-			$this->_available = array_unique($this->_available);
-		}
-
-		/**
-		 * Reads all available themes from disk
-		 *
-		 * @return array with Theme names
-		 */
-		public function themeDirs() {
-			$_ThemeDir = new Folder(App::paths()['View'][0] . 'Themed');
-			return $_ThemeDir->read()[0];
-		}
-
-	}
+    App::uses('App', 'Core');
+    App::uses('Folder', 'Utility');
+    App::uses('Component', 'Controller');
+
+    class ThemesComponent extends Component {
+
+        protected $_config = null;
+
+        protected $_applied = null;
+
+        protected $_available = [];
+
+        protected $_Controller = null;
+
+        public function initialize(Controller $controller) {
+            $this->_Controller = $controller;
+        }
+
+        /**
+         * Sets and/or gets current theme
+         *
+         * @param mixed $params name string or config array
+         * @return string current theme
+         * @throws InvalidArgumentException
+         * @throws UnexpectedValueException
+         */
+        public function theme($params = null) {
+            if (is_array($params)) {
+                $this->_config = $params;
+                $this->_setTheme($this->_getApplied());
+            } elseif (is_string($params)) {
+                $this->_setTheme($params);
+            }
+            if (empty($this->_applied)) {
+                if ($params === null) {
+                    throw new UnexpectedValueException(
+                        sprintf(
+                            'Theme could not be determined: %s',
+                            print_r($params, true)
+                        )
+                    );
+                } else {
+                    throw new InvalidArgumentException('Theme is not set yet.');
+                }
+            }
+            return $this->_applied;
+        }
+
+        /**
+         * Gets currently applied theme
+         */
+        protected function _getApplied() {
+            if ($this->_applied) {
+                return $this->_applied;
+            }
+            if ($this->_Controller->CurrentUser->isLoggedIn()) {
+                $_userTheme = $this->_Controller->CurrentUser['user_theme'];
+                if (in_array($_userTheme, $this->getAvailable())) {
+                        $this->_applied = $_userTheme;
+                }
+            }
+            if (!$this->_applied) {
+                $this->_applied = $this->_config['default'];
+            }
+            return $this->_applied;
+        }
+
+        public function setDefault() {
+            $this->_setTheme($this->_config['default']);
+        }
+
+        protected function _setTheme($theme) {
+            $this->_applied = $theme;
+            $this->_Controller->theme = $this->_applied;
+        }
+
+        /**
+         * Gets available themes
+         *
+         * @return array
+         */
+        public function getAvailable() {
+            if (!$this->_available) {
+                $this->_setAvailable();
+            }
+            return $this->_available;
+        }
+
+        /**
+         * Sets available themes
+         */
+        protected function _setAvailable() {
+            $_themesSubset = [];
+
+            $this->_available = $this->themeDirs();
+
+            // allowed themes for all users
+            if (isset($this->_config['available']['all'])) {
+                if ($this->_config['available']['all'] !== '*') {
+                    $_themesSubset = $this->_config['available']['all'];
+                }
+            } else {
+                $_themesSubset = [$this->_config['default']];
+            }
+
+            // allowed user themes
+            $_currentUserId = $this->_Controller->CurrentUser->getId();
+            if (isset($this->_config['available']['users'][$_currentUserId])) {
+                $_themesSubset = array_merge($_themesSubset,
+                        $this->_config['available']['users'][$_currentUserId]);
+            }
+
+            // filter themes
+            if ($_themesSubset) {
+                $this->_available = array_intersect($this->_available, $_themesSubset);
+            }
+
+            // default theme is always available
+            array_unshift($this->_available, $this->_config['default']);
+
+            // make sure default/every theme is in list only one time
+            $this->_available = array_unique($this->_available);
+        }
+
+        /**
+         * Reads all available themes from disk
+         *
+         * @return array with Theme names
+         */
+        public function themeDirs() {
+            $_ThemeDir = new Folder(App::paths()['View'][0] . 'Themed');
+            return $_ThemeDir->read()[0];
+        }
+
+    }

app/Controller/Component/ShoutsComponent.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 		public function startup(Controller $controller) {
 			$this->_Controller = $controller;
-			$this->settings['maxNumberOfShouts'] = (int)Configure::read(
+			$this->settings['maxNumberOfShouts'] = (int) Configure::read(
 				'Saito.Settings.shoutbox_max_shouts');
 		}
 

Indentation +30 added lines, -30 removed lines

@@ -1,42 +1,42 @@
 <?php
 
-	App::uses('Component', 'Controller');
+    App::uses('Component', 'Controller');
 
-	class ShoutsComponent extends Component {
+    class ShoutsComponent extends Component {
 
-		public $settings = ['maxNumberOfShouts' => 10];
+        public $settings = ['maxNumberOfShouts' => 10];
 
-		protected $_Controller;
+        protected $_Controller;
 
-		protected $_ShoutModel = null;
+        protected $_ShoutModel = null;
 
-		public function startup(Controller $controller) {
-			$this->_Controller = $controller;
-			$this->settings['maxNumberOfShouts'] = (int)Configure::read(
-				'Saito.Settings.shoutbox_max_shouts');
-		}
+        public function startup(Controller $controller) {
+            $this->_Controller = $controller;
+            $this->settings['maxNumberOfShouts'] = (int)Configure::read(
+                'Saito.Settings.shoutbox_max_shouts');
+        }
 
-		public function setShoutsForView() {
-			// @performance only do if cache is not valid and html need to be rendered
-			$this->_Controller->set('shouts', $this->get());
-		}
+        public function setShoutsForView() {
+            // @performance only do if cache is not valid and html need to be rendered
+            $this->_Controller->set('shouts', $this->get());
+        }
 
-		public function get() {
-			return $this->_model()->get();
-		}
+        public function get() {
+            return $this->_model()->get();
+        }
 
-		public function push($data) {
-			return $this->_model()->push($data);
-		}
+        public function push($data) {
+            return $this->_model()->push($data);
+        }
 
-		protected function _model() {
-			if ($this->_ShoutModel !== null) {
-				return $this->_ShoutModel;
-			}
-			$this->_Controller->loadModel('Shout');
-			$this->_ShoutModel = $this->_Controller->Shout;
-			$this->_ShoutModel->maxNumberOfShouts = $this->settings['maxNumberOfShouts'];
-			return $this->_ShoutModel;
-		}
+        protected function _model() {
+            if ($this->_ShoutModel !== null) {
+                return $this->_ShoutModel;
+            }
+            $this->_Controller->loadModel('Shout');
+            $this->_ShoutModel = $this->_Controller->Shout;
+            $this->_ShoutModel->maxNumberOfShouts = $this->settings['maxNumberOfShouts'];
+            return $this->_ShoutModel;
+        }
 
-	}
+    }

app/Controller/Component/EmailNotificationComponent.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
 				$event->data['subject'],
 				'EmailNotification');
 			if ($recipients):
-				$method = '_' . $this->_handledEvents[$event->name()];
+				$method = '_'.$this->_handledEvents[$event->name()];
 				if (method_exists($this, $method)) {
 					$this->$method($event, $recipients);
 				}
@@ -43,10 +43,10 @@ 
 							'conditions' => ['Entry.id' => $event->data['data']['Entry'][$idKey]]
 					]);
 
-			$lang = Configure::read( 'Config.language');
+			$lang = Configure::read('Config.language');
 			$config = [
 					'subject' => __('New reply to "%s"', $subject['Entry']['subject']),
-					'template' => $lang . DS . 'notification-model-entry-afterReply',
+					'template' => $lang.DS.'notification-model-entry-afterReply',
 					'viewVars' => [
 							'parentEntry' => $subject,
 							'newEntry' => $event->data['data'],
@@ -76,7 +76,7 @@ 
 				'subject' => __('Successfull registration'),
 				'template' => Configure::read(
 					'Config.language'
-				) . DS . 'notification-admin-user_activated',
+				).DS.'notification-admin-user_activated',
 				'viewVars' => array('user' => $newUser, 'ip' => env('REMOTE_ADDR')),
 
 			];
@@ -89,7 +89,7 @@ 
 		protected function _shouldRecipientReceiveReplyMessage($recipient, $entry) {
 			if (Configure::read('debug') === 0 &&
 					// don't send answer if new entry belongs to the user itself
-					(int)$recipient['id'] === (int)$entry['user_id']
+					(int) $recipient['id'] === (int) $entry['user_id']
 			) {
 				return false;
 			} else {

Indentation +98 added lines, -98 removed lines

@@ -1,113 +1,113 @@
 <?php
 
-	App::uses('NotificationComponent', 'Lib/Controller/Component');
+    App::uses('NotificationComponent', 'Lib/Controller/Component');
 
-	class EmailNotificationComponent extends NotificationComponent {
+    class EmailNotificationComponent extends NotificationComponent {
 
-		protected $_handledEvents = array(
-			'Model.Entry.replyToEntry' => 'modelEntryReplyToEntry',
-			'Model.Entry.replyToThread' => 'modelEntryReplyToThread',
-		);
+        protected $_handledEvents = array(
+            'Model.Entry.replyToEntry' => 'modelEntryReplyToEntry',
+            'Model.Entry.replyToThread' => 'modelEntryReplyToThread',
+        );
 
-		public function implementedEvents() {
-			$handledEvents = parent::implementedEvents();
-			$handledEvents['Model.User.afterActivate'] = 'userActivatedAdminNotice';
-			return $handledEvents;
-		}
+        public function implementedEvents() {
+            $handledEvents = parent::implementedEvents();
+            $handledEvents['Model.User.afterActivate'] = 'userActivatedAdminNotice';
+            return $handledEvents;
+        }
 
-		protected function _process($event) {
-			$recipients = $this->_Esevent->getUsersForEventOnSubjectWithReceiver(
-				$event->name(),
-				$event->data['subject'],
-				'EmailNotification');
-			if ($recipients):
-				$method = '_' . $this->_handledEvents[$event->name()];
-				if (method_exists($this, $method)) {
-					$this->$method($event, $recipients);
-				}
-			endif;
-		}
+        protected function _process($event) {
+            $recipients = $this->_Esevent->getUsersForEventOnSubjectWithReceiver(
+                $event->name(),
+                $event->data['subject'],
+                'EmailNotification');
+            if ($recipients):
+                $method = '_' . $this->_handledEvents[$event->name()];
+                if (method_exists($this, $method)) {
+                    $this->$method($event, $recipients);
+                }
+            endif;
+        }
 
-		protected function _modelEntryReplyToThread($event, array $recipients) {
-			$this->_entryReply($recipients, $event, 'tid');
-		}
+        protected function _modelEntryReplyToThread($event, array $recipients) {
+            $this->_entryReply($recipients, $event, 'tid');
+        }
 
-		protected function _modelEntryReplyToEntry($event, array $recipients) {
-			$this->_entryReply($recipients, $event, 'pid');
-		}
+        protected function _modelEntryReplyToEntry($event, array $recipients) {
+            $this->_entryReply($recipients, $event, 'pid');
+        }
 
-		protected function _entryReply($recipients, $event, $idKey) {
-			$subject = $event->subject()->find('first',
-					[
-							'contain' => ['User'],
-							'conditions' => ['Entry.id' => $event->data['data']['Entry'][$idKey]]
-					]);
+        protected function _entryReply($recipients, $event, $idKey) {
+            $subject = $event->subject()->find('first',
+                    [
+                            'contain' => ['User'],
+                            'conditions' => ['Entry.id' => $event->data['data']['Entry'][$idKey]]
+                    ]);
 
-			$lang = Configure::read( 'Config.language');
-			$config = [
-					'subject' => __('New reply to "%s"', $subject['Entry']['subject']),
-					'template' => $lang . DS . 'notification-model-entry-afterReply',
-					'viewVars' => [
-							'parentEntry' => $subject,
-							'newEntry' => $event->data['data'],
-					]
-			];
-			foreach ($recipients as $recipient) {
-				if (!$this->_shouldRecipientReceiveReplyMessage($recipient,
-						$event->data['data']['Entry'])
-				) {
-					continue;
-				}
-				$config['recipient'] = ['User' => $recipient];
-				$config['viewVars']['recipient'] = $recipient;
-				$config['viewVars']['notification'] = $recipient['Esnotification'];
-				$this->_email($config);
-			}
-			return $config;
-		}
+            $lang = Configure::read( 'Config.language');
+            $config = [
+                    'subject' => __('New reply to "%s"', $subject['Entry']['subject']),
+                    'template' => $lang . DS . 'notification-model-entry-afterReply',
+                    'viewVars' => [
+                            'parentEntry' => $subject,
+                            'newEntry' => $event->data['data'],
+                    ]
+            ];
+            foreach ($recipients as $recipient) {
+                if (!$this->_shouldRecipientReceiveReplyMessage($recipient,
+                        $event->data['data']['Entry'])
+                ) {
+                    continue;
+                }
+                $config['recipient'] = ['User' => $recipient];
+                $config['viewVars']['recipient'] = $recipient;
+                $config['viewVars']['notification'] = $recipient['Esnotification'];
+                $this->_email($config);
+            }
+            return $config;
+        }
 
-		public function userActivatedAdminNotice($event) {
-			$recipients = Configure::read('Saito.Notification.userActivatedAdminNoticeToUserWithID');
-			if (!is_array($recipients)) {
-				return;
-			}
-			$newUser = $event->data['User'];
-			$config = [
-				'subject' => __('Successfull registration'),
-				'template' => Configure::read(
-					'Config.language'
-				) . DS . 'notification-admin-user_activated',
-				'viewVars' => array('user' => $newUser, 'ip' => env('REMOTE_ADDR')),
+        public function userActivatedAdminNotice($event) {
+            $recipients = Configure::read('Saito.Notification.userActivatedAdminNoticeToUserWithID');
+            if (!is_array($recipients)) {
+                return;
+            }
+            $newUser = $event->data['User'];
+            $config = [
+                'subject' => __('Successfull registration'),
+                'template' => Configure::read(
+                    'Config.language'
+                ) . DS . 'notification-admin-user_activated',
+                'viewVars' => array('user' => $newUser, 'ip' => env('REMOTE_ADDR')),
 
-			];
-			foreach ($recipients as $recipient) :
-				$config['recipient'] = $recipient;
-				$this->_email($config);
-			endforeach;
-		}
+            ];
+            foreach ($recipients as $recipient) :
+                $config['recipient'] = $recipient;
+                $this->_email($config);
+            endforeach;
+        }
 
-		protected function _shouldRecipientReceiveReplyMessage($recipient, $entry) {
-			if (Configure::read('debug') === 0 &&
-					// don't send answer if new entry belongs to the user itself
-					(int)$recipient['id'] === (int)$entry['user_id']
-			) {
-				return false;
-			} else {
-				return true;
-			}
-		}
+        protected function _shouldRecipientReceiveReplyMessage($recipient, $entry) {
+            if (Configure::read('debug') === 0 &&
+                    // don't send answer if new entry belongs to the user itself
+                    (int)$recipient['id'] === (int)$entry['user_id']
+            ) {
+                return false;
+            } else {
+                return true;
+            }
+        }
 
-		protected function _email($config) {
-			$config['sender'] = 'system';
-			try {
-				$this->_Controller->SaitoEmail->email($config);
-			} catch (Exception $e) {
-				$Logger = new Saito\Logger\ExceptionLogger();
-				$Logger->write('Error in EmailNotificationComponent::_email()', [
-					'e' => $e,
-					'msgs' => ['config' => $config]
-				]);
-			}
-		}
+        protected function _email($config) {
+            $config['sender'] = 'system';
+            try {
+                $this->_Controller->SaitoEmail->email($config);
+            } catch (Exception $e) {
+                $Logger = new Saito\Logger\ExceptionLogger();
+                $Logger->write('Error in EmailNotificationComponent::_email()', [
+                    'e' => $e,
+                    'msgs' => ['config' => $config]
+                ]);
+            }
+        }
 
-	}
\ No newline at end of file
+    }
\ No newline at end of file