Schlaefer / Saito

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

Indentation +11 added lines, -11 removed lines

@@ -56,12 +56,12 @@ 
 		$this->captcha_result = $numberOne - $numberTwo;
 
 		# Session-Way (only one form at a time) - must be a component then
-    //$this->Session->write('Captcha.result', $result);
+	//$this->Session->write('Captcha.result', $result);
 
-    # DB-Way (several forms possible, high security via IP-Based max limits)
-    // the following should be done in a component and passed to the view/helper
-    // $Captcha = ClassRegistry::init('Captcha');
-    // $Captcha->new(); $Captcha->update(); etc
+	# DB-Way (several forms possible, high security via IP-Based max limits)
+	// the following should be done in a component and passed to the view/helper
+	// $Captcha = ClassRegistry::init('Captcha');
+	// $Captcha->new(); $Captcha->update(); etc
 
   	# Timestamp-SessionID-Hash-Way (several forms possible, not as secure)
   	$this->captcha_hash = SimpleCaptcha::buildHash(array('timestamp' => time(), 'result' => $this->captcha_result), $this->options);
@@ -93,10 +93,10 @@ 
 
 		# add passive part on active forms as well
 		$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'=>'')).
-        '</div>';
+			$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'=>'')).
+		'</div>';
 
 		return $out;
 	}
@@ -133,8 +133,8 @@ 
 
 
 		if ($options['combined'] === true) {
-            $options['between'] = $out.' = ';
-        }
+			$options['between'] = $out.' = ';
+		}
 		unset($options['combined']);
 
 		return $this->Form->input($this->__fieldName($model), $options); 

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

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
 	 * @return array 
 	 */
   protected function _generate() {
-		if ($this->captcha_generated === TRUE) return;
+		if ($this->captcha_generated === TRUE) {
+			return;
+		}
   	# Choose the first number randomly between 6 and 10. This is to stop the answer being negative.
 		$numberOne = mt_rand(6, 9);
   	# Choose the second number randomly between 0 and 5.

app/Plugin/SimpleCaptcha/Lib/SimpleCaptcha.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 class SimpleCaptcha extends Object {
-	static public $defaults = array (
+	static public $defaults = array(
 			'dummyField' => 'homepage',
 			'method' => 'hash',
 			'checkSession' => false,

app/Plugin/BbcodeParser/Test/Case/Lib/BbcodeParserTest.php

Spacing +18 added lines, -18 removed lines

@@ -284,10 +284,10 @@ 
 		public function testAtLinkKnownUsers() {
 			$input = '@Alice @Bob @Bobby Junior @Bobby Tables @Dr. No';
 			$expected =
-				"<a href='/at/Alice'>@Alice</a>" .
-				" @Bob " .
-				"<a href='/at/Bobby+Junior'>@Bobby Junior</a>" .
-				" @Bobby Tables " .
+				"<a href='/at/Alice'>@Alice</a>".
+				" @Bob ".
+				"<a href='/at/Bobby+Junior'>@Bobby Junior</a>".
+				" @Bobby Tables ".
 				"<a href='/at/Dr.+No'>@Dr. No</a>";
 
 			$result = $this->_Parser->parse($input);
@@ -580,8 +580,8 @@ 
 
 		public function testIframe() {
 			//* test allowed domain
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtube.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtube.com/embed/HdoW3t_WorU '.
 				'frameborder=0][/iframe]';
 			$expected = [
 				['iframe' => [
@@ -596,8 +596,8 @@ 
 			$this->assertTags($result, $expected);
 
 			//* test forbidden domains
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
 				'frameborder=0][/iframe]';
 			$expected = '/src/i';
 			$result = $this->_Parser->parse($input, ['video_domains_allowed' => 'youtube | vimeo']);
@@ -605,8 +605,8 @@ 
 		}
 
 		public function testIframeAllDomainsAllowed() {
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
 				'][/iframe]';
 			$expected = 'src="http://www.youtubescam.com/embed/HdoW3t_WorU';
 			$result = $this->_Parser->parse($input, ['video_domains_allowed' => '*']);
@@ -614,8 +614,8 @@ 
 		}
 
 		public function testIframeNoDomainAllowed() {
-			$input = '[iframe height=349 width=560 ' .
-				'src=http://www.youtubescam.com/embed/HdoW3t_WorU ' .
+			$input = '[iframe height=349 width=560 '.
+				'src=http://www.youtubescam.com/embed/HdoW3t_WorU '.
 				'][/iframe]';
 			$expected = '/src/i';
 			$result = $this->_Parser->parse($input, ['video_domains_allowed' => '']);
@@ -634,7 +634,7 @@ 
 
 			// test for URIs without protocol
 			$input = '[img]/somewhere/macnemo.png[/img]';
-			$expected = '<img src="' . $this->_Helper->webroot . 'somewhere/macnemo.png" alt=""/>';
+			$expected = '<img src="'.$this->_Helper->webroot.'somewhere/macnemo.png" alt=""/>';
 			$result = $this->_Parser->parse($input);
 			$this->assertEquals($expected, $result);
 
@@ -817,7 +817,7 @@ 
 		public function testCodeNoCitationMark() {
 			// [code]<citation mark>[/code] should not be cited
 			$input = h(
-				"[code]\n" . $this->_Helper->settings['quote_symbol'] . "\n[/code]"
+				"[code]\n".$this->_Helper->settings['quote_symbol']."\n[/code]"
 			);
 			$expected = '`span class=.*?richtext-citation`';
 			$result = $this->_Parser->parse($input);
@@ -832,11 +832,11 @@ 
 
 		public function testQuote() {
 			$_qs = h($this->_Helper->settings['quote_symbol']);
-			$input = $_qs . ' fo [b]test[/b] ba';
+			$input = $_qs.' fo [b]test[/b] ba';
 			$result = $this->_Parser->parse($input);
 			$expected = [
 				'span' => ['class' => 'richtext-citation'],
-				$_qs . ' fo ',
+				$_qs.' fo ',
 				'strong' => [],
 				'test',
 				'/strong',
@@ -864,7 +864,7 @@ 
 			//* test autoconversion for audio files
 			$html5AudioExtensions = array('m4a', 'ogg', 'mp3', 'wav', 'opus');
 			foreach ($html5AudioExtensions as $extension) {
-				$url = 'http://example.com/audio.' . $extension;
+				$url = 'http://example.com/audio.'.$extension;
 				$input = "[video]{$url}[/video]";
 				$result = $this->_Parser->parse($input);
 				$expected = array(
@@ -927,7 +927,7 @@ 
 			$input = "[audio]{$url}[/audio]";
 			$result = $this->_Parser->parse($input);
 			$expected = array(
-					'audio' => array( 'src' => $url, 'controls' => 'controls' ),
+					'audio' => array('src' => $url, 'controls' => 'controls'),
 			);
 			$this->assertTags($result, $expected);
 

app/Plugin/BbcodeParser/Lib/Parser.php

Spacing +3 added lines, -3 removed lines

@@ -217,7 +217,7 @@ 
 			$options = array_merge($this->_cSettings, $options);
 
 			// serializing complex objects kills PHP
-			$serializable = array_filter($options, function ($value) {
+			$serializable = array_filter($options, function($value) {
 				return !is_object($value);
 			});
 			$parserId = md5(serialize($serializable));
@@ -258,8 +258,8 @@ 
 						$this->_Parser->addCodeDefinition($builder->build());
 						break;
 					case 'class':
-						require_once (\CakePlugin::path('BbcodeParser') . DS . 'Lib' . DS . 'jBBCode' . DS . 'Definitions' . DS . 'JbbCodeDefinitions.php');
-						$class = '\Plugin\BbcodeParser\Lib\jBBCode\Definitions\\' . ucfirst($title);
+						require_once (\CakePlugin::path('BbcodeParser').DS.'Lib'.DS.'jBBCode'.DS.'Definitions'.DS.'JbbCodeDefinitions.php');
+						$class = '\Plugin\BbcodeParser\Lib\jBBCode\Definitions\\'.ucfirst($title);
 						$this->_Parser->addCodeDefinition(new $class($this->_Helper, $options));
 						break;
 					default:

app/Plugin/BbcodeParser/Lib/Helper/UrlParserTrait.php

Spacing +8 added lines, -8 removed lines

@@ -20,7 +20,7 @@ 
 				// use Cakes Validation class to detect valid URL
 				\App::uses('Validation', 'Utility');
 				if (\Validation::url($url)) {
-					$url = 'http://' . $url;
+					$url = 'http://'.$url;
 				}
 			}
 
@@ -36,7 +36,7 @@ 
 				if (!empty($url) && preg_match('/\<img\s*?src=/', $text) !== 1) {
 					$host = DomainParser::domainAndTld($url);
 					if ($host !== false && $host !== env('SERVER_NAME')) {
-						$out .= ' <span class=\'richtext-linkInfo\'>[' . $host . ']</span>';
+						$out .= ' <span class=\'richtext-linkInfo\'>['.$host.']</span>';
 					}
 				}
 			}
@@ -64,10 +64,10 @@ 
 			}
 
 			$_placeholder = ' … ';
-			$leftMargin = (int)floor($_textWordMaxLength / 2);
-			$rightMargin = (int)(-1 * ($_textWordMaxLength - $leftMargin - mb_strlen($_placeholder)));
+			$leftMargin = (int) floor($_textWordMaxLength / 2);
+			$rightMargin = (int) (-1 * ($_textWordMaxLength - $leftMargin - mb_strlen($_placeholder)));
 
-			$string = mb_substr($string, 0, $leftMargin) . $_placeholder .
+			$string = mb_substr($string, 0, $leftMargin).$_placeholder.
 				mb_substr($string, $rightMargin);
 			return $string;
 		}
@@ -79,7 +79,7 @@ 
 		 * @return string
 		 */
 		protected function _decorateTarget($string) {
-			$decorator = function ($matches) {
+			$decorator = function($matches) {
 				$out = '';
 				$url = $matches[1];
 
@@ -90,11 +90,11 @@ 
 				$parsedUrl = @parse_url($url);
 
 				if (isset($parsedUrl['host'])) {
-					if ($parsedUrl['host'] !== env('SERVER_NAME') && $parsedUrl['host'] !== "www." . env('SERVER_NAME')) {
+					if ($parsedUrl['host'] !== env('SERVER_NAME') && $parsedUrl['host'] !== "www.".env('SERVER_NAME')) {
 						$out = " rel='external' target='_blank'";
 					}
 				}
-				return $matches[0] . $out;
+				return $matches[0].$out;
 			};
 
 			return preg_replace_callback('#href=["\'](.*?)["\']#is',

app/Plugin/BbcodeParser/Lib/jBBCode/Visitors/JbbCodeAutolinkVisitor.php

Spacing +10 added lines, -10 removed lines

@@ -60,10 +60,10 @@ 
 				}
 			}
 			krsort($names);
-			$baseUrl = $this->_sOptions['webroot'] . $this->_sOptions['atBaseUrl'];
+			$baseUrl = $this->_sOptions['webroot'].$this->_sOptions['atBaseUrl'];
 			foreach ($names as $name => $v) {
 				$title = urlencode($name);
-				$link = $this->_url($baseUrl . $title, "@$name",
+				$link = $this->_url($baseUrl.$title, "@$name",
 					false);
 				$string = str_replace("@$name", $link, $string);
 			}
@@ -72,11 +72,11 @@ 
 		}
 
 		protected function _autolink($string) {
-			$replace = function ($matches) {
+			$replace = function($matches) {
 				// exclude punctuation at end of sentence from URLs
 				$ignoredEndChars = implode('|', [',', '\?', ',', '\.', '\)', '!']);
 				preg_match(
-					'/(?P<element>.*?)(?P<suffix>' . $ignoredEndChars . ')?$/',
+					'/(?P<element>.*?)(?P<suffix>'.$ignoredEndChars.')?$/',
 					$matches['element'],
 					$m
 				);
@@ -84,7 +84,7 @@ 
 				$matches = $m + $matches;
 
 				if (strpos($matches['element'], '://') === false) {
-					$matches['element'] = 'http://' . $matches['element'];
+					$matches['element'] = 'http://'.$matches['element'];
 				}
 				$matches += [
 					'prefix' => '',
@@ -93,7 +93,7 @@ 
 
 				$url = $this->_url($matches['element'], $matches['element'], false,
 					true);
-				return $matches['prefix'] . $url . $matches['suffix'];
+				return $matches['prefix'].$url.$matches['suffix'];
 			};
 
 			//# autolink http://urls
@@ -113,7 +113,7 @@ 
 			//# autolink email
 			$string = preg_replace_callback(
 				"#(?<=^|[\n ])(?P<content>([a-z0-9&\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+))#i",
-				function ($matches) {
+				function($matches) {
 					return $this->_email($matches['content']);
 				}, $string
 			);
@@ -122,12 +122,12 @@ 
 		}
 
 		protected function _hashLink($string) {
-			$baseUrl = $this->_sOptions['webroot'] . $this->_sOptions['hashBaseUrl'];
+			$baseUrl = $this->_sOptions['webroot'].$this->_sOptions['hashBaseUrl'];
 			$string = preg_replace_callback(
 				'/(?<=\s|^|])(?<tag>#)(?<element>\d+)(?!\w)/',
-				function ($m) use ($baseUrl) {
+				function($m) use ($baseUrl) {
 					$hash = $m['element'];
-					return $this->_url($baseUrl . $hash, '#' . $hash);
+					return $this->_url($baseUrl.$hash, '#'.$hash);
 				},
 				$string
 			);

app/Plugin/BbcodeParser/Lib/jBBCode/Definitions/JbbHtml5MediaCodeDefinition.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
 		protected function _audio($content) {
 			$out = "<audio src='$content' controls='controls'>";
 			$out .= Message::format(__(
-				'Your browser does not support HTML5 audio. Please updgrade to a modern ' .
+				'Your browser does not support HTML5 audio. Please updgrade to a modern '.
 				'browser. In order to watch this stream you need an HTML5 capable browser.',
 				true));
 			$out .= "</audio>";
@@ -28,7 +28,7 @@ 
 
 		protected function _video($content) {
 			// fix audio files mistakenly wrapped into an [video] tag
-			if (preg_match('/(' . implode('|', self::$_html5AudioExtensions) . ')$/i',
+			if (preg_match('/('.implode('|', self::$_html5AudioExtensions).')$/i',
 					$content) === 1
 			) {
 				return $this->_audio($content);
@@ -36,7 +36,7 @@ 
 
 			$out = "<video src='$content' controls='controls' x-webkit-airplay='allow'>";
 			$out .= Message::format(__(
-				'Your browser does not support HTML5 video. Please updgrade to a modern ' .
+				'Your browser does not support HTML5 video. Please updgrade to a modern '.
 				'browser. In order to watch this stream you need an HTML5 capable browser.',
 				true));
 			$out .= '</video>';