Schlaefer / Saito

app/Controller/Component/SaitoEmailComponent.php

Indentation +255 added lines, -255 removed lines

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

app/Controller/Component/CurrentUserComponent.php

Indentation +254 added lines, -254 removed lines

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

app/Controller/Component/ShoutsComponent.php

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

Indentation +55 added lines, -55 removed lines

@@ -1,67 +1,67 @@
 <?php
 
-	use Saito\Cache\CacheSupport;
-	use Saito\Cache\ItemCache;
-	use Saito\Cache\LineCacheSupportCachelet;
-	use Saito\Cache\SaitoCacheEngineAppCache;
+    use Saito\Cache\CacheSupport;
+    use Saito\Cache\ItemCache;
+    use Saito\Cache\LineCacheSupportCachelet;
+    use Saito\Cache\SaitoCacheEngineAppCache;
 
-	App::uses('Component', 'Controller');
+    App::uses('Component', 'Controller');
 
-	class CacheSupportComponent extends Component {
+    class CacheSupportComponent extends Component {
 
-		protected $_CacheSupport;
+        protected $_CacheSupport;
 
-		/** * @var ItemCache */
-		public $LineCache;
+        /** * @var ItemCache */
+        public $LineCache;
 
-		public function initialize(Controller $Controller) {
-			$this->_CacheSupport = new CacheSupport();
-			if ($Controller->modelClass) {
-				$Controller->{$Controller->modelClass}->SharedObjects['CacheSupport'] = $this->_CacheSupport;
-			}
-			$this->_addConfigureCachelets();
-			$this->_initLineCache($Controller);
-		}
+        public function initialize(Controller $Controller) {
+            $this->_CacheSupport = new CacheSupport();
+            if ($Controller->modelClass) {
+                $Controller->{$Controller->modelClass}->SharedObjects['CacheSupport'] = $this->_CacheSupport;
+            }
+            $this->_addConfigureCachelets();
+            $this->_initLineCache($Controller);
+        }
 
-		protected function _initLineCache() {
-			$this->LineCache = new ItemCache(
-				'Saito.LineCache',
-				new SaitoCacheEngineAppCache,
-				// duration: update relative time values in HTML at least every hour
-				['duration' => 3600, 'maxItems' => 600]
-			);
-			$this->_CacheSupport->add(new LineCacheSupportCachelet($this->LineCache));
-		}
+        protected function _initLineCache() {
+            $this->LineCache = new ItemCache(
+                'Saito.LineCache',
+                new SaitoCacheEngineAppCache,
+                // duration: update relative time values in HTML at least every hour
+                ['duration' => 3600, 'maxItems' => 600]
+            );
+            $this->_CacheSupport->add(new LineCacheSupportCachelet($this->LineCache));
+        }
 
-		/**
-		 * Adds additional cachelets from Configure `Saito.Cachelets`
-		 *
-		 * E.g. use in `Plugin/<foo>/Config/bootstrap.php`:
-		 *
-		 * <code>
-		 * Configure::write('Saito.Cachelets.M', ['location' => 'M.Lib', 'name' => 'MCacheSupportCachelet']);
-		 * </code>
-		 */
-		protected function _addConfigureCachelets() {
-			$_additionalCachelets = Configure::read('Saito.Cachelets');
-			if (!$_additionalCachelets) {
-				return;
-			}
-			foreach ($_additionalCachelets as $_c) {
-				App::uses($_c['name'], $_c['location']);
-				$this->_CacheSupport->add(new $_c['name']);
-			}
-		}
+        /**
+         * Adds additional cachelets from Configure `Saito.Cachelets`
+         *
+         * E.g. use in `Plugin/<foo>/Config/bootstrap.php`:
+         *
+         * <code>
+         * Configure::write('Saito.Cachelets.M', ['location' => 'M.Lib', 'name' => 'MCacheSupportCachelet']);
+         * </code>
+         */
+        protected function _addConfigureCachelets() {
+            $_additionalCachelets = Configure::read('Saito.Cachelets');
+            if (!$_additionalCachelets) {
+                return;
+            }
+            foreach ($_additionalCachelets as $_c) {
+                App::uses($_c['name'], $_c['location']);
+                $this->_CacheSupport->add(new $_c['name']);
+            }
+        }
 
-		public function beforeRender(Controller $Controller) {
-			$Controller->set('LineCache', $this->LineCache);
-		}
+        public function beforeRender(Controller $Controller) {
+            $Controller->set('LineCache', $this->LineCache);
+        }
 
-		public function __call($method, $params) {
-			$proxy = [$this->_CacheSupport, $method];
-			if (is_callable($proxy)) {
-				return call_user_func_array($proxy, $params);
-			}
-		}
+        public function __call($method, $params) {
+            $proxy = [$this->_CacheSupport, $method];
+            if (is_callable($proxy)) {
+                return call_user_func_array($proxy, $params);
+            }
+        }
 
-	}
+    }

app/Controller/Component/Auth/MlfAuthenticate.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 
-	App::uses('FormAuthenticate', 'Controller/Component/Auth');
+    App::uses('FormAuthenticate', 'Controller/Component/Auth');
 
-	class MlfAuthenticate extends FormAuthenticate {
+    class MlfAuthenticate extends FormAuthenticate {
 
-		public function __construct(ComponentCollection $collection, $settings) {
-			$this->settings['passwordHasher'] = 'Mlf';
-			parent::__construct($collection, $settings);
-		}
+        public function __construct(ComponentCollection $collection, $settings) {
+            $this->settings['passwordHasher'] = 'Mlf';
+            parent::__construct($collection, $settings);
+        }
 
-	}
+    }

app/Controller/Component/Auth/MlfPasswordHasher.php

Indentation +10 added lines, -10 removed lines

@@ -1,19 +1,19 @@
 <?php
 
-	App::uses('AbstractPasswordHasher', 'Controller/Component/Auth');
-	App::uses('Security', 'Utility');
+    App::uses('AbstractPasswordHasher', 'Controller/Component/Auth');
+    App::uses('Security', 'Utility');
 
 /**
  * mylittleforum 1.x unsalted md5 passwords
  */
-	class MlfPasswordHasher extends AbstractPasswordHasher {
+    class MlfPasswordHasher extends AbstractPasswordHasher {
 
-		public function hash($password) {
-			return Security::hash($password, 'md5', false);
-		}
+        public function hash($password) {
+            return Security::hash($password, 'md5', false);
+        }
 
-		public function check($password, $hash) {
-			return $hash === self::hash($password);
-		}
+        public function check($password, $hash) {
+            return $hash === self::hash($password);
+        }
 
-	}
+    }

app/Controller/Component/Auth/Mlf2PasswordHasher.php

Indentation +27 added lines, -27 removed lines

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

app/Controller/Component/Auth/Mlf2Authenticate.php

Indentation +10 added lines, -10 removed lines

@@ -1,15 +1,15 @@
 <?php
 
-	App::uses('FormAuthenticate', 'Controller/Component/Auth');
+    App::uses('FormAuthenticate', 'Controller/Component/Auth');
 
-	/**
-	 * mylittleforum 2.x auth with salted sha1 passwords
-	 */
-	class Mlf2Authenticate extends FormAuthenticate {
+    /**
+     * mylittleforum 2.x auth with salted sha1 passwords
+     */
+    class Mlf2Authenticate extends FormAuthenticate {
 
-		public function __construct(ComponentCollection $collection, $settings) {
-			$this->settings['passwordHasher'] = 'Mlf2';
-			parent::__construct($collection, $settings);
-		}
+        public function __construct(ComponentCollection $collection, $settings) {
+            $this->settings['passwordHasher'] = 'Mlf2';
+            parent::__construct($collection, $settings);
+        }
 
-	}
+    }

app/Controller/Component/ParserComponent.php

Indentation +42 added lines, -42 removed lines

@@ -1,44 +1,44 @@
 <?php
 
-	use \Saito\User\Userlist;
-
-	App::uses('Component', 'Controller');
-
-	class ParserComponent extends Component {
-
-		/** @var SaitoMarkupSettings */
-		protected $_settings;
-
-		public function initialize(Controller $controller) {
-			// is needed in Markup Behavior
-			$this->_settings = new Saito\Markup\Settings([
-				'server' => Router::fullBaseUrl(),
-				'webroot' => $controller->webroot
-			]);
-		}
-
-		public function beforeRender(Controller $controller) {
-				$this->_initHelper($controller);
-		}
-
-		/**
-		 * Inits the ParserHelper for use in a View
-		 *
-		 * Call this instead of including in the controller's $helpers array.
-		 */
-		protected function _initHelper(Controller $controller) {
-			$userlist = new Userlist\UserlistModel();
-			$userlist->set($controller->User);
-			$smilies = new \Saito\Smiley\Cache($controller);
-			$controller->set('smiliesData', $smilies);
-
-			$this->_settings->add([
-				'quote_symbol' => Configure::read('Saito.Settings.quote_symbol'),
-				'smiliesData' => $smilies,
-				'UserList' => $userlist
-			]);
-
-			$controller->helpers['Parser'] = $this->_settings->get();
-		}
-
-	}
+    use \Saito\User\Userlist;
+
+    App::uses('Component', 'Controller');
+
+    class ParserComponent extends Component {
+
+        /** @var SaitoMarkupSettings */
+        protected $_settings;
+
+        public function initialize(Controller $controller) {
+            // is needed in Markup Behavior
+            $this->_settings = new Saito\Markup\Settings([
+                'server' => Router::fullBaseUrl(),
+                'webroot' => $controller->webroot
+            ]);
+        }
+
+        public function beforeRender(Controller $controller) {
+                $this->_initHelper($controller);
+        }
+
+        /**
+         * Inits the ParserHelper for use in a View
+         *
+         * Call this instead of including in the controller's $helpers array.
+         */
+        protected function _initHelper(Controller $controller) {
+            $userlist = new Userlist\UserlistModel();
+            $userlist->set($controller->User);
+            $smilies = new \Saito\Smiley\Cache($controller);
+            $controller->set('smiliesData', $smilies);
+
+            $this->_settings->add([
+                'quote_symbol' => Configure::read('Saito.Settings.quote_symbol'),
+                'smiliesData' => $smilies,
+                'UserList' => $userlist
+            ]);
+
+            $controller->helpers['Parser'] = $this->_settings->get();
+        }
+
+    }