Schlaefer / Saito

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

app/Controller/Component/SaitoEmailComponent.php

Spacing +2 added lines, -2 removed lines

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

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

app/Controller/Component/Auth/Mlf2PasswordHasher.php

Spacing +3 added lines, -3 removed lines

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

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

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 {

app/Controller/UploadsController.php

Spacing +7 added lines, -7 removed lines

@@ -46,10 +46,10 @@ 
 					$a['Upload'] = $this->request->data['Upload'][0];
 					$a['Upload']['user_id'] = $this->Session->read('Auth.User.id');
 					$a['Upload']['file']['name'] = Inflector::slug(
-								$a['Upload']['user_id'] . '_' .
+								$a['Upload']['user_id'].'_'.
 								pathinfo($a['Upload']['file']['name'], PATHINFO_FILENAME)
-							) .
-							'.' . pathinfo(
+							).
+							'.'.pathinfo(
 								$a['Upload']['file']['name'],
 								PATHINFO_EXTENSION
 							);
@@ -60,7 +60,7 @@ 
 					$this->Upload->Behaviors->FileUpload->setUp(
 						$this->Upload,
 						array(
-							'maxFileSize' => (int)Configure::read(
+							'maxFileSize' => (int) Configure::read(
 								'Saito.Settings.upload_max_img_size'
 							) * 1024
 						)
@@ -117,10 +117,10 @@ 
 			}
 			$this->autoRender = false;
 
-			$this->Upload->id = (int)$id;
+			$this->Upload->id = (int) $id;
 			$file = $this->Upload->read();
 			if ($file &&
-					(int)$file['Upload']['user_id'] === $this->CurrentUser->getId()
+					(int) $file['Upload']['user_id'] === $this->CurrentUser->getId()
 			) {
 				if (!$this->Upload->delete(null, false)) {
 					$this->JsData->addAppJsMessage(
@@ -149,7 +149,7 @@ 
 		}
 
 		protected function _init() {
-			$this->maxUploadsPerUser = (int)Configure::read(
+			$this->maxUploadsPerUser = (int) Configure::read(
 				'Saito.Settings.upload_max_number_of_uploads'
 			);
 			$countCurrent = $this->Upload->countUser($this->CurrentUser->getId());

app/Plugin/SimpleCaptcha/View/Helper/SimpleCaptchaHelper.php

Spacing +7 added lines, -7 removed lines

@@ -17,16 +17,16 @@ 
 
 	private $captcha_text	 	= null;
 	private $captcha_result = null;
-	private $captcha_hash		= null;
+	private $captcha_hash = null;
 	private $captcha_generated = false;
 
 	function __construct(View $View, $settings = array()) {
 		$this->options = SimpleCaptcha::$defaults;
 
 		# Set up an array with the operators that we want to use. With difficulty=1 it is only subtraction and addition.
-		$this->captcha_operator_convert = array( '-' );
+		$this->captcha_operator_convert = array('-');
 
-		$configs = (array)Configure::read('Captcha');
+		$configs = (array) Configure::read('Captcha');
 		if (!empty($configs)) {
 			$this->options = array_merge($this->options, $configs);
 		}
@@ -50,7 +50,7 @@ 
   	$captchaOperator = $this->captcha_operator_convert[mt_rand(0, count($this->captcha_operator_convert) - 1)];
 
   	# Get the equation in textual form to show to the user.
-  	$this->captcha_text =  $numberOne . ' ' . $captchaOperator . ' ' . $numberTwo;
+  	$this->captcha_text = $numberOne.' '.$captchaOperator.' '.$numberTwo;
 
   	# Evaluate the equation and get the result.
 		$this->captcha_result = $numberOne - $numberTwo;
@@ -78,7 +78,7 @@ 
 	 * @return string
 	 */
 	public function input($model = null, $options = array()) {
-		return $this->active($model, $options) . $this->passive($model, $options);
+		return $this->active($model, $options).$this->passive($model, $options);
 		return $out;
 	}
 
@@ -95,7 +95,7 @@ 
 		$out = '<div style="display:none">'.
             $this->Form->input($field.'_hash', array('value'=>$this->captcha_hash)).
             $this->Form->input($field.'_time', array('value'=>time())).
-            $this->Form->input((!empty($model)?$model.'.':'').$this->options['dummyField'], array('value'=>'')).
+            $this->Form->input((!empty($model) ? $model.'.' : '').$this->options['dummyField'], array('value'=>'')).
         '</div>';
 
 		return $out;
@@ -117,7 +117,7 @@ 
 				'class'=>'captcha',
 				'value'=>'',
 				'maxlength'=>3,
-				'label'=>__('Captcha',true),
+				'label'=>__('Captcha', true),
 				'combined'=>true, 'autocomplete'=>'off'
 			);
 		$options = array_merge($defaultOptions, $options);

app/Plugin/SimpleCaptcha/Model/Behavior/SimpleCaptchaBehavior.php

Spacing +7 added lines, -7 removed lines

@@ -91,7 +91,7 @@ 
 		$dummyField = $this->settings[$this->Model->alias]['dummyField'];
 		if (!empty($data[$dummyField])) {
 			# dummy field not empty - SPAM!
-			return $this->error('Illegal content', 'DummyField = \'' . $data[$dummyField] . '\'');
+			return $this->error('Illegal content', 'DummyField = \''.$data[$dummyField].'\'');
 		}
 		return true;
 	}
@@ -108,7 +108,7 @@ 
 		}
 
 		if (isSet($data['captcha_hash']) && isSet($data['captcha_time'])
-				&& ( $data['captcha_time'] < time() - $this->settings[$this->Model->alias]['minTime'] )
+				&& ($data['captcha_time'] < time() - $this->settings[$this->Model->alias]['minTime'])
 		) {
 			return true;
 		}
@@ -127,7 +127,7 @@ 
 			return true;
 		}
 		if (isSet($data['captcha_hash']) && isSet($data['captcha_time'])
-				&& ( $data['captcha_time'] + $this->settings[$this->Model->alias]['maxTime'] > time() )
+				&& ($data['captcha_time'] + $this->settings[$this->Model->alias]['maxTime'] > time())
 		) {
 			return true;
 		}
@@ -161,7 +161,7 @@ 
 			return true;
 		}
 		# wrong captcha content or session expired
-		return $this->error('Captcha incorrect', 'SubmittedResult = \'' . $data['captcha'] . '\'');
+		return $this->error('Captcha incorrect', 'SubmittedResult = \''.$data['captcha'].'\'');
 	}
 
 	/**
@@ -210,12 +210,12 @@ 
 		}
 
 		App::import('Component', 'RequestHandler');
-		$msg = 'Ip \'' . RequestHandlerComponent::getClientIP() . '\', Agent \'' . env('HTTP_USER_AGENT') . '\', Referer \'' . env('HTTP_REFERER') . '\', Host-Referer \'' . RequestHandlerComponent::getReferer() . '\'';
+		$msg = 'Ip \''.RequestHandlerComponent::getClientIP().'\', Agent \''.env('HTTP_USER_AGENT').'\', Referer \''.env('HTTP_REFERER').'\', Host-Referer \''.RequestHandlerComponent::getReferer().'\'';
 		if (!empty($this->error)) {
-			$msg .= ', ' . $this->error;
+			$msg .= ', '.$this->error;
 		}
 		if (!empty($this->internalError)) {
-			$msg .= ' (' . $this->internalError . ')';
+			$msg .= ' ('.$this->internalError.')';
 		}
 		$this->log($msg, 'captcha');
 		return true;