Schlaefer / Saito

app/Plugin/Install/Config/routes.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
 
 $path = '/';
-$url = array('plugin' => 'install' ,'controller' => 'install');
-if (file_exists(APP . 'Config' . DS.'settings.yml')) {
+$url = array('plugin' => 'install', 'controller' => 'install');
+if (file_exists(APP.'Config'.DS.'settings.yml')) {
 	$request = Router::getRequest();
 	if (!Configure::read('Install.secured') &&
 	    strpos($request->url, 'finish') == false

app/Plugin/Install/Console/Command/InstallShell.php

Spacing +5 added lines, -5 removed lines

@@ -65,17 +65,17 @@ 
 			$recordString .= implode(",\n", $values);
 			$recordString .= "\n\t\t),\n";
 		}
-		$className = $modelAlias . 'Data';
+		$className = $modelAlias.'Data';
 		$content = "<?php\n";
-			$content .= "class " . $modelAlias . "Data" . " {\n\n";
-				$content .= "\tpublic \$table = '" . $table . "';\n\n";
+			$content .= "class ".$modelAlias."Data"." {\n\n";
+				$content .= "\tpublic \$table = '".$table."';\n\n";
 				$content .= "\tpublic \$records = array(\n";
 					$content .= $recordString;
 				$content .= "\t);\n\n";
 			$content .= "}\n";
 
 		// write file
-		$filePath = APP . 'Plugin' .DS. 'Install'. DS. 'Config' .DS. 'Data' .DS. $modelAlias . 'Data.php';
+		$filePath = APP.'Plugin'.DS.'Install'.DS.'Config'.DS.'Data'.DS.$modelAlias.'Data.php';
 		if (!file_exists($filePath)) {
 			touch($filePath);
 		}
@@ -83,7 +83,7 @@ 
 		$file = new File($filePath, true);
 		$file->write($content);
 
-		$this->out('New file generated: ' . $filePath);
+		$this->out('New file generated: '.$filePath);
 	}
 
 }

app/Plugin/Install/Model/Install.php

Spacing +6 added lines, -6 removed lines

@@ -30,20 +30,20 @@ 
 		}
 
 		protected function _markInstalled() {
-			touch(APP . 'Config' . DS . 'installed.txt');
+			touch(APP.'Config'.DS.'installed.txt');
 		}
 
 		protected function _createSecurity() {
-			$File = new File(APP . 'Config' . DS . 'core.php');
+			$File = new File(APP.'Config'.DS.'core.php');
 
 			// save previous core file
 			// copy(APP . 'Config' . DS.'settings.yml.install', APP . 'Config' . DS.'settings.yml');
-			$File->copy(APP . 'Config' . DS . 'core.' . date('YmdHis',
-					time()) . '.php');
+			$File->copy(APP.'Config'.DS.'core.'.date('YmdHis',
+					time()).'.php');
 
 			// set new salt and seed value
 			$salt = Security::generateAuthKey();
-			$seed = mt_rand() . mt_rand();
+			$seed = mt_rand().mt_rand();
 			$contents = $File->read();
 			$contents = preg_replace('/(?<=Configure::write\(\'Security.salt\', \')([^\' ]+)(?=\'\))/',
 					$salt,
@@ -92,7 +92,7 @@ 
 				$this->log($User->validationErrors);
 			}
 
-			return (bool)$saved;
+			return (bool) $saved;
 		}
 
 	}

app/Plugin/Install/Controller/InstallController.php

Spacing +11 added lines, -11 removed lines

@@ -83,7 +83,7 @@ 
  * @return void
  */
 	protected function _check() {
-		if (file_exists(APP . 'Config' . DS . 'installed.txt')) {
+		if (file_exists(APP.'Config'.DS.'installed.txt')) {
 //		if (Configure::read('Install.installed') && Configure::read('Install.secured')) {
 			$this->Session->setFlash('Already Installed');
 			$this->redirect('/');
@@ -142,16 +142,16 @@ 
 			return;
 		}
 
-		copy(APP . 'Config' . DS.'database.php.install', APP . 'Config' . DS.'database.php');
+		copy(APP.'Config'.DS.'database.php.install', APP.'Config'.DS.'database.php');
 		App::uses('File', 'Utility');
-		$file = new File(APP . 'Config' . DS.'database.php', true);
+		$file = new File(APP.'Config'.DS.'database.php', true);
 		$content = $file->read();
 
 		foreach ($config AS $configKey => $configValue) {
-			$content = str_replace('{default_' . $configKey . '}', $configValue, $content);
+			$content = str_replace('{default_'.$configKey.'}', $configValue, $content);
 		}
 
-		if($file->write($content) ) {
+		if ($file->write($content)) {
 			return $this->redirect(array('action' => 'data'));
 		} else {
 			$this->Session->setFlash(__('Could not write database.php file.'), 'default', array('class' => 'error'));
@@ -166,7 +166,7 @@ 
 		$nextValue = $model->find('first', array(
 			'fields' => sprintf('MAX(%s.%s) as max', $model->alias, $model->primaryKey),
 			));
-		$nextValue = empty($nextValue[0]['max']) ? 1 :  $nextValue[0]['max'] + 1;
+		$nextValue = empty($nextValue[0]['max']) ? 1 : $nextValue[0]['max'] + 1;
 		$sql = sprintf('alter sequence %s restart with %d', $db->getSequence($model), $nextValue);
 		$db->execute($sql);
 	}
@@ -187,12 +187,12 @@ 
 
 			$db = ConnectionManager::getDataSource('default');
 			$brokenSequence = $db instanceof Postgres;
-			if(!$db->isConnected()) {
+			if (!$db->isConnected()) {
 				$this->Session->setFlash(__('Could not connect to database.'), 'default', array('class' => 'error'));
 			} else {
 				$schema = new CakeSchema(array('name'=>'app'));
 				$schema = $schema->load();
-				foreach($schema->tables as $table => $fields) {
+				foreach ($schema->tables as $table => $fields) {
 					$create = $db->createSchema($schema, $table);
 					try {
 						$db->execute($create);
@@ -203,10 +203,10 @@ 
 					}
 				}
 
-				$path = CakePlugin::path('Install') .DS. 'Config' .DS. 'Data' .DS;
+				$path = CakePlugin::path('Install').DS.'Config'.DS.'Data'.DS;
 				$dataObjects = App::objects('class', $path);
 				foreach ($dataObjects as $data) {
-					include($path . $data . '.php');
+					include($path.$data.'.php');
 					$classVars = get_class_vars($data);
 					$modelAlias = substr($data, 0, -4);
 					$table = $classVars['table'];
@@ -219,7 +219,7 @@ 
 					));
 					if (is_array($records) && count($records) > 0) {
 						$i = 1;
-						foreach($records as $record) {
+						foreach ($records as $record) {
 							if (!isset($record['id'])) {
 								$record['id'] = $i++;
 							}

app/Plugin/Markitup/Vendor/parser/markdown/markdown.php

Spacing +119 added lines, -119 removed lines

@@ -12,8 +12,8 @@ 
 #
 
 
-define( 'MARKDOWN_VERSION',  "1.0.1n" ); # Sat 10 Oct 2009
-define( 'MARKDOWNEXTRA_VERSION',  "1.2.4" ); # Sat 10 Oct 2009
+define('MARKDOWN_VERSION', "1.0.1n"); # Sat 10 Oct 2009
+define('MARKDOWNEXTRA_VERSION', "1.2.4"); # Sat 10 Oct 2009
 
 
 #
@@ -21,18 +21,18 @@ 
 #
 
 # Change to ">" for HTML output
-@define( 'MARKDOWN_EMPTY_ELEMENT_SUFFIX',  " />");
+@define('MARKDOWN_EMPTY_ELEMENT_SUFFIX', " />");
 
 # Define the width of a tab for code blocks.
-@define( 'MARKDOWN_TAB_WIDTH',     4 );
+@define('MARKDOWN_TAB_WIDTH', 4);
 
 # Optional title attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_TITLE',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_TITLE',     "" );
+@define('MARKDOWN_FN_LINK_TITLE', "");
+@define('MARKDOWN_FN_BACKLINK_TITLE', "");
 
 # Optional class attribute for footnote links and backlinks.
-@define( 'MARKDOWN_FN_LINK_CLASS',         "" );
-@define( 'MARKDOWN_FN_BACKLINK_CLASS',     "" );
+@define('MARKDOWN_FN_LINK_CLASS', "");
+@define('MARKDOWN_FN_BACKLINK_CLASS', "");
 
 
 #
@@ -40,14 +40,14 @@ 
 #
 
 # Change to false to remove Markdown from posts and/or comments.
-@define( 'MARKDOWN_WP_POSTS',      true );
-@define( 'MARKDOWN_WP_COMMENTS',   true );
+@define('MARKDOWN_WP_POSTS', true);
+@define('MARKDOWN_WP_COMMENTS', true);
 
 
 
 ### Standard Function Interface ###
 
-@define( 'MARKDOWN_PARSER_CLASS',  'MarkdownExtra_Parser' );
+@define('MARKDOWN_PARSER_CLASS', 'MarkdownExtra_Parser');
 
 function Markdown($text) {
 #
@@ -85,19 +85,19 @@ 
 	# - Run Markdown on excerpt, then remove all tags.
 	# - Add paragraph tag around the excerpt, but remove it for the excerpt rss.
 	if (MARKDOWN_WP_POSTS) {
-		remove_filter('the_content',     'wpautop');
+		remove_filter('the_content', 'wpautop');
         remove_filter('the_content_rss', 'wpautop');
-		remove_filter('the_excerpt',     'wpautop');
-		add_filter('the_content',     'mdwp_MarkdownPost', 6);
+		remove_filter('the_excerpt', 'wpautop');
+		add_filter('the_content', 'mdwp_MarkdownPost', 6);
         add_filter('the_content_rss', 'mdwp_MarkdownPost', 6);
 		add_filter('get_the_excerpt', 'mdwp_MarkdownPost', 6);
 		add_filter('get_the_excerpt', 'trim', 7);
-		add_filter('the_excerpt',     'mdwp_add_p');
+		add_filter('the_excerpt', 'mdwp_add_p');
 		add_filter('the_excerpt_rss', 'mdwp_strip_p');
 
-		remove_filter('content_save_pre',  'balanceTags', 50);
-		remove_filter('excerpt_save_pre',  'balanceTags', 50);
-		add_filter('the_content',  	  'balanceTags', 50);
+		remove_filter('content_save_pre', 'balanceTags', 50);
+		remove_filter('excerpt_save_pre', 'balanceTags', 50);
+		add_filter('the_content', 'balanceTags', 50);
 		add_filter('get_the_excerpt', 'balanceTags', 9);
 	}
 
@@ -111,7 +111,7 @@ 
 		if (is_single() || is_page() || is_feed()) {
 			$parser->fn_id_prefix = "";
 		} else {
-			$parser->fn_id_prefix = get_the_ID() . ".";
+			$parser->fn_id_prefix = get_the_ID().".";
 		}
 		return $parser->transform($text);
 	}
@@ -127,7 +127,7 @@ 
 		add_filter('pre_comment_content', 'Markdown', 6);
 		add_filter('pre_comment_content', 'mdwp_hide_tags', 8);
 		add_filter('pre_comment_content', 'mdwp_show_tags', 12);
-		add_filter('get_comment_text',    'Markdown', 6);
+		add_filter('get_comment_text', 'Markdown', 6);
 		add_filter('get_comment_excerpt', 'Markdown', 6);
 		add_filter('get_comment_excerpt', 'mdwp_strip_p', 7);
 
@@ -192,13 +192,13 @@ 
 	@include_once 'smartypants.php';
 	# Fake Textile class. It calls Markdown instead.
 	class Textile {
-		function TextileThis($text, $lite='', $encode='') {
+		function TextileThis($text, $lite = '', $encode = '') {
 			if ($lite == '' && $encode == '')    $text = Markdown($text);
 			if (function_exists('SmartyPants'))  $text = SmartyPants($text);
 			return $text;
 		}
 		# Fake restricted version: restrictions are not supported for now.
-		function TextileRestricted($text, $lite='', $noimage='') {
+		function TextileRestricted($text, $lite = '', $noimage = '') {
 			return $this->TextileThis($text, $lite);
 		}
 		# Workaround to ensure compatibility with TextPattern 4.0.3.
@@ -332,7 +332,7 @@ 
 
 		$this->teardown();
 
-		return $text . "\n";
+		return $text."\n";
 	}
 
 	var $document_gamut = array(
@@ -381,7 +381,7 @@ 
 		$link_id = strtolower($matches[1]);
 		$url = $matches[2] == '' ? $matches[3] : $matches[2];
 		$this->urls[$link_id] = $url;
-		$this->titles[$link_id] =& $matches[4];
+		$this->titles[$link_id] = & $matches[4];
 		return ''; # String that will replace the block
 	}
 
@@ -434,8 +434,8 @@ 
 					(?>
 					  />
 					|
-					  >', $nested_tags_level).	# end of opening tag
-					  '.*?'.					# last level nested tag content
+					  >', $nested_tags_level).# end of opening tag
+					  '.*?'.# last level nested tag content
 			str_repeat('
 					  </\2\s*>	# closing nested tag
 					)
@@ -547,7 +547,7 @@ 
 
 		# Then hash the block.
 		static $i = 0;
-		$key = "$boundary\x1A" . ++$i . $boundary;
+		$key = "$boundary\x1A".++$i.$boundary;
 		$this->html_hashes[$key] = $text;
 		return $key; # String that will replace the tag.
 	}
@@ -740,9 +740,9 @@ 
 		return $text;
 	}
 	function _doAnchors_reference_callback($matches) {
-		$whole_match =  $matches[1];
-		$link_text   =  $matches[2];
-		$link_id     =& $matches[3];
+		$whole_match = $matches[1];
+		$link_text   = $matches[2];
+		$link_id     = & $matches[3];
 
 		if ($link_id == "") {
 			# for shortcut links like [this][] or [this].
@@ -758,10 +758,10 @@ 
 			$url = $this->encodeAttribute($url);
 
 			$result = "<a href=\"$url\"";
-			if ( isset( $this->titles[$link_id] ) ) {
+			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 
 			$link_text = $this->runSpanGamut($link_text);
@@ -774,17 +774,17 @@ 
 		return $result;
 	}
 	function _doAnchors_inline_callback($matches) {
-		$whole_match	=  $matches[1];
-		$link_text		=  $this->runSpanGamut($matches[2]);
-		$url			=  $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
+		$whole_match = $matches[1];
+		$link_text = $this->runSpanGamut($matches[2]);
+		$url = $matches[3] == '' ? $matches[4] : $matches[3];
+		$title = & $matches[7];
 
 		$url = $this->encodeAttribute($url);
 
 		$result = "<a href=\"$url\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\"";
+			$result .= " title=\"$title\"";
 		}
 
 		$link_text = $this->runSpanGamut($link_text);
@@ -865,7 +865,7 @@ 
 			if (isset($this->titles[$link_id])) {
 				$title = $this->titles[$link_id];
 				$title = $this->encodeAttribute($title);
-				$result .=  " title=\"$title\"";
+				$result .= " title=\"$title\"";
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
@@ -878,17 +878,17 @@ 
 		return $result;
 	}
 	function _doImages_inline_callback($matches) {
-		$whole_match	= $matches[1];
-		$alt_text		= $matches[2];
-		$url			= $matches[3] == '' ? $matches[4] : $matches[3];
-		$title			=& $matches[7];
+		$whole_match = $matches[1];
+		$alt_text = $matches[2];
+		$url = $matches[3] == '' ? $matches[4] : $matches[3];
+		$title = & $matches[7];
 
 		$alt_text = $this->encodeAttribute($alt_text);
 		$url = $this->encodeAttribute($url);
 		$result = "<img src=\"$url\" alt=\"$alt_text\"";
 		if (isset($title)) {
 			$title = $this->encodeAttribute($title);
-			$result .=  " title=\"$title\""; # $title already quoted
+			$result .= " title=\"$title\""; # $title already quoted
 		}
 		$result .= $this->empty_element_suffix;
 
@@ -933,12 +933,12 @@ 
 
 		$level = $matches[2]{0} == '=' ? 1 : 2;
 		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 	function _doHeaders_callback_atx($matches) {
 		$level = strlen($matches[1]);
 		$block = "<h$level>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 
 
@@ -1017,13 +1017,13 @@ 
 		$list = $matches[1];
 		$list_type = preg_match("/$marker_ul_re/", $matches[4]) ? "ul" : "ol";
 
-		$marker_any_re = ( $list_type == "ul" ? $marker_ul_re : $marker_ol_re );
+		$marker_any_re = ($list_type == "ul" ? $marker_ul_re : $marker_ol_re);
 
 		$list .= "\n";
 		$result = $this->processListItems($list, $marker_any_re);
 
-		$result = $this->hashBlock("<$list_type>\n" . $result . "</$list_type>");
-		return "\n". $result ."\n\n";
+		$result = $this->hashBlock("<$list_type>\n".$result."</$list_type>");
+		return "\n".$result."\n\n";
 	}
 
 	var $list_level = 0;
@@ -1076,16 +1076,16 @@ 
 	}
 	function _processListItems_callback($matches) {
 		$item = $matches[4];
-		$leading_line =& $matches[1];
-		$leading_space =& $matches[2];
+		$leading_line = & $matches[1];
+		$leading_space = & $matches[2];
 		$marker_space = $matches[3];
-		$tailing_blank_line =& $matches[5];
+		$tailing_blank_line = & $matches[5];
 
 		if ($leading_line || $tailing_blank_line ||
 			preg_match('/\n{2,}/', $item))
 		{
 			# Replace marker with the appropriate whitespace indentation
-			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
+			$item = $leading_space.str_repeat(' ', strlen($marker_space)).$item;
 			$item = $this->runBlockGamut($this->outdent($item)."\n");
 		}
 		else {
@@ -1095,7 +1095,7 @@ 
 			$item = $this->runSpanGamut($item);
 		}
 
-		return "<li>" . $item . "</li>\n";
+		return "<li>".$item."</li>\n";
 	}
 
 
@@ -1173,7 +1173,7 @@ 
 				$token_relist[] = $strong_re;
 
 				# Construct master expression from list.
-				$token_re = '{('. implode('|', $token_relist) .')}';
+				$token_re = '{('.implode('|', $token_relist).')}';
 				$this->em_strong_prepared_relist["$em$strong"] = $token_re;
 			}
 		}
@@ -1199,8 +1199,8 @@ 
 			#
 			$parts = preg_split($token_re, $text, 2, PREG_SPLIT_DELIM_CAPTURE);
 			$text_stack[0] .= $parts[0];
-			$token =& $parts[1];
-			$text =& $parts[2];
+			$token = & $parts[1];
+			$text = & $parts[2];
 
 			if (empty($token)) {
 				# Reached end of text span: empty stack without emitting.
@@ -1227,7 +1227,7 @@ 
 				} else {
 					# Other closing marker: close one em or strong and
 					# change current token state to match the other
-					$token_stack[0] = str_repeat($token{0}, 3-$token_len);
+					$token_stack[0] = str_repeat($token{0}, 3 - $token_len);
 					$tag = $token_len == 2 ? "strong" : "em";
 					$span = $text_stack[0];
 					$span = $this->runSpanGamut($span);
@@ -1321,7 +1321,7 @@ 
 		$bq = $matches[1];
 		# trim one level of quoting - trim whitespace-only lines
 		$bq = preg_replace('/^[ ]*>[ ]?|^[ ]+$/m', '', $bq);
-		$bq = $this->runBlockGamut($bq);		# recurse
+		$bq = $this->runBlockGamut($bq); # recurse
 
 		$bq = preg_replace('/^/m', "  ", $bq);
 		# These leading spaces cause problem with <pre> content,
@@ -1329,7 +1329,7 @@ 
 		$bq = preg_replace_callback('{(\s*<pre>.+?</pre>)}sx',
 			array(&$this, '_doBlockQuotes_callback2'), $bq);
 
-		return "\n". $this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
+		return "\n".$this->hashBlock("<blockquote>\n$bq\n</blockquote>")."\n\n";
 	}
 	function _doBlockQuotes_callback2($matches) {
 		$pre = $matches[1];
@@ -1431,7 +1431,7 @@ 
 			# Ampersand-encoding based entirely on Nat Irons's Amputator
 			# MT plugin: <http://bumppo.net/projects/amputator/>
 			$text = preg_replace('/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/',
-								'&amp;', $text);;
+								'&amp;', $text); ;
 		}
 		# Encode remaining <'s
 		$text = str_replace('<', '&lt;', $text);
@@ -1495,9 +1495,9 @@ 
 	#	Based by a filter by Matthew Wickline, posted to BBEdit-Talk.
 	#   With some optimizations by Milian Wolff.
 	#
-		$addr = "mailto:" . $addr;
+		$addr = "mailto:".$addr;
 		$chars = preg_split('/(?<!^)(?!$)/', $addr);
-		$seed = (int)abs(crc32($addr) / strlen($addr)); # Deterministic seed.
+		$seed = (int) abs(crc32($addr) / strlen($addr)); # Deterministic seed.
 
 		foreach ($chars as $key => $char) {
 			$ord = ord($char);
@@ -1533,7 +1533,7 @@ 
 				|
 					(?<![`\\\\])
 					`+						# code span marker
-			'.( $this->no_markup ? '' : '
+			'.($this->no_markup ? '' : '
 				|
 					<!--    .*?     -->		# comment
 				|
@@ -1583,7 +1583,7 @@ 
 	#
 		switch ($token{0}) {
 			case "\\":
-				return $this->hashPart("&#". ord($token{1}). ";");
+				return $this->hashPart("&#".ord($token{1}).";");
 			case "`":
 				# Search for end marker in remaining text.
 				if (preg_match('/^(.*?[^`])'.preg_quote($token).'(?!`)(.*)$/sm',
@@ -1638,7 +1638,7 @@ 
 			# Calculate amount of space, insert spaces, insert block.
 			$amount = $this->tab_width -
 				$strlen($line, 'UTF-8') % $this->tab_width;
-			$line .= str_repeat(" ", $amount) . $block;
+			$line .= str_repeat(" ", $amount).$block;
 		}
 		return $line;
 	}
@@ -1802,7 +1802,7 @@ 
 		#
 		# Call the HTML-in-Markdown hasher.
 		#
-		list($text, ) = $this->_hashHTMLBlocks_inMarkdown($text);
+		list($text,) = $this->_hashHTMLBlocks_inMarkdown($text);
 
 		return $text;
 	}
@@ -1874,25 +1874,25 @@ 
 				|
 					# Code span marker
 					`+
-				'. ( !$span ? ' # If not in span.
+				'. (!$span ? ' # If not in span.
 				|
 					# Indented code block
 					(?: ^[ ]*\n | ^ | \n[ ]*\n )
-					[ ]{'.($indent+4).'}[^\n]* \n
+					[ ]{'.($indent + 4).'}[^\n]* \n
 					(?>
-						(?: [ ]{'.($indent+4).'}[^\n]* | [ ]* ) \n
+						(?: [ ]{'.($indent + 4).'}[^\n]* | [ ]* ) \n
 					)*
 				|
 					# Fenced code block marker
 					(?> ^ | \n )
 					[ ]{'.($indent).'}~~~+[ ]*\n
-				' : '' ). ' # End (if not is span).
+				' : '').' # End (if not is span).
 				)
 			}xs';
 
 
-		$depth = 0;		# Current depth inside the tag tree.
-		$parsed = "";	# Parsed text that will be returned.
+		$depth = 0; # Current depth inside the tag tree.
+		$parsed = ""; # Parsed text that will be returned.
 
 		#
 		# Loop through every tag until we find the closing tag of the parent
@@ -1913,7 +1913,7 @@ 
 			if ($span) {
 				$void = $this->hashPart("", ':');
 				$newline = "$void\n";
-				$parts[0] = $void . str_replace("\n", $newline, $parts[0]) . $void;
+				$parts[0] = $void.str_replace("\n", $newline, $parts[0]).$void;
 			}
 
 			$parsed .= $parts[0]; # Text before current tag.
@@ -1938,7 +1938,7 @@ 
 					$text, $matches))
 				{
 					# End marker found: pass text unchanged until marker.
-					$parsed .= $tag . $matches[0];
+					$parsed .= $tag.$matches[0];
 					$text = substr($text, strlen($matches[0]));
 				}
 				else {
@@ -1964,7 +1964,7 @@ 
 					$matches))
 				{
 					# End marker found: pass text unchanged until marker.
-					$parsed .= $tag . $matches[0];
+					$parsed .= $tag.$matches[0];
 					$text = substr($text, strlen($matches[0]));
 				}
 				else {
@@ -1978,14 +1978,14 @@ 
 			#               used as a block tag (tag is alone on it's line).
 			#
 			else if (preg_match('{^<(?:'.$this->block_tags_re.')\b}', $tag) ||
-				(	preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
+				(preg_match('{^<(?:'.$this->context_block_tags_re.')\b}', $tag) &&
 					preg_match($newline_before_re, $parsed) &&
-					preg_match($newline_after_re, $text)	)
+					preg_match($newline_after_re, $text))
 				)
 			{
 				# Need to parse tag and following text using the HTML parser.
 				list($block_text, $text) =
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashBlock", true);
+					$this->_hashHTMLBlocks_inHTML($tag.$text, "hashBlock", true);
 
 				# Make sure it stays outside of any paragraph by adding newlines.
 				$parsed .= "\n\n$block_text\n\n";
@@ -2000,7 +2000,7 @@ 
 				# Need to parse tag and following text using the HTML parser.
 				# (don't check for markdown attribute)
 				list($block_text, $text) =
-					$this->_hashHTMLBlocks_inHTML($tag . $text, "hashClean", false);
+					$this->_hashHTMLBlocks_inHTML($tag.$text, "hashClean", false);
 
 				$parsed .= $block_text;
 			}
@@ -2015,14 +2015,14 @@ 
 				# Increase/decrease nested tag count.
 				#
 				if ($tag{1} == '/')						$depth--;
-				else if ($tag{strlen($tag)-2} != '/')	$depth++;
+				else if ($tag{strlen($tag) - 2} != '/')	$depth++;
 
 				if ($depth < 0) {
 					#
 					# Going out of parent element. Clean up and break so we
 					# return to the calling function.
 					#
-					$text = $tag . $text;
+					$text = $tag.$text;
 					break;
 				}
 
@@ -2087,11 +2087,11 @@ 
 				)
 			}xs';
 
-		$original_text = $text;		# Save original text in case of faliure.
+		$original_text = $text; # Save original text in case of faliure.
 
-		$depth		= 0;	# Current depth inside the tag tree.
-		$block_text	= "";	# Temporary text holder for current text.
-		$parsed		= "";	# Parsed text that will be returned.
+		$depth = 0; # Current depth inside the tag tree.
+		$block_text = ""; # Temporary text holder for current text.
+		$parsed = ""; # Parsed text that will be returned.
 
 		#
 		# Get the name of the starting tag.
@@ -2143,7 +2143,7 @@ 
 				#
 				if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
 					if ($tag{1} == '/')						$depth--;
-					else if ($tag{strlen($tag)-2} != '/')	$depth++;
+					else if ($tag{strlen($tag) - 2} != '/')	$depth++;
 				}
 
 				#
@@ -2151,13 +2151,13 @@ 
 				#
 				if ($md_attr &&
 					preg_match($markdown_attr_re, $tag, $attr_m) &&
-					preg_match('/^1|block|span$/', $attr_m[2] . $attr_m[3]))
+					preg_match('/^1|block|span$/', $attr_m[2].$attr_m[3]))
 				{
 					# Remove `markdown` attribute from opening tag.
 					$tag = preg_replace($markdown_attr_re, '', $tag);
 
 					# Check if text inside this tag must be parsed in span mode.
-					$this->mode = $attr_m[2] . $attr_m[3];
+					$this->mode = $attr_m[2].$attr_m[3];
 					$span_mode = $this->mode == 'span' || $this->mode != 'block' &&
 						preg_match('{^<(?:'.$this->contain_span_tags_re.')\b}', $tag);
 
@@ -2268,15 +2268,15 @@ 
 		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
 			return $matches[0];
 		$level = $matches[3]{0} == '=' ? 1 : 2;
-		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
+		$attr  = $this->_doHeaders_attr($id = & $matches[2]);
 		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 	function _doHeaders_callback_atx($matches) {
 		$level = strlen($matches[1]);
-		$attr  = $this->_doHeaders_attr($id =& $matches[3]);
+		$attr  = $this->_doHeaders_attr($id = & $matches[3]);
 		$block = "<h$level$attr>".$this->runSpanGamut($matches[2])."</h$level>";
-		return "\n" . $this->hashBlock($block) . "\n\n";
+		return "\n".$this->hashBlock($block)."\n\n";
 	}
 
 
@@ -2342,8 +2342,8 @@ 
 		return $text;
 	}
 	function _doTable_leadingPipe_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
+		$head = $matches[1];
+		$underline = $matches[2];
 		$content	= $matches[3];
 
 		# Remove leading pipe for each row.
@@ -2352,17 +2352,17 @@ 
 		return $this->_doTable_callback(array($matches[0], $head, $underline, $content));
 	}
 	function _doTable_callback($matches) {
-		$head		= $matches[1];
-		$underline	= $matches[2];
-		$content	= $matches[3];
+		$head = $matches[1];
+		$underline = $matches[2];
+		$content = $matches[3];
 
 		# Remove any tailing pipes for each line.
-		$head		= preg_replace('/[|] *$/m', '', $head);
-		$underline	= preg_replace('/[|] *$/m', '', $underline);
-		$content	= preg_replace('/[|] *$/m', '', $content);
+		$head = preg_replace('/[|] *$/m', '', $head);
+		$underline = preg_replace('/[|] *$/m', '', $underline);
+		$content = preg_replace('/[|] *$/m', '', $content);
 
 		# Reading alignement from header underline.
-		$separators	= preg_split('/ *[|] */', $underline);
+		$separators = preg_split('/ *[|] */', $underline);
 		foreach ($separators as $n => $s) {
 			if (preg_match('/^ *-+: *$/', $s))		$attr[$n] = ' align="right"';
 			else if (preg_match('/^ *:-+: *$/', $s))$attr[$n] = ' align="center"';
@@ -2372,9 +2372,9 @@ 
 
 		# Parsing span elements, including code spans, character escapes,
 		# and inline HTML tags, so that pipes inside those gets ignored.
-		$head		= $this->parseSpan($head);
-		$headers	= preg_split('/ *[|] */', $head);
-		$col_count	= count($headers);
+		$head = $this->parseSpan($head);
+		$headers = preg_split('/ *[|] */', $head);
+		$col_count = count($headers);
 
 		# Write column headers.
 		$text = "<table>\n";
@@ -2406,7 +2406,7 @@ 
 		$text .= "</tbody>\n";
 		$text .= "</table>";
 
-		return $this->hashBlock($text) . "\n";
+		return $this->hashBlock($text)."\n";
 	}
 
 
@@ -2459,8 +2459,8 @@ 
 		# Turn double returns into triple returns, so that we can make a
 		# paragraph for the last item in a list, if necessary:
 		$result = trim($this->processDefListItems($list));
-		$result = "<dl>\n" . $result . "\n</dl>";
-		return $this->hashBlock($result) . "\n\n";
+		$result = "<dl>\n".$result."\n</dl>";
+		return $this->hashBlock($result)."\n\n";
 	}
 
 
@@ -2512,27 +2512,27 @@ 
 		$text = '';
 		foreach ($terms as $term) {
 			$term = $this->runSpanGamut(trim($term));
-			$text .= "\n<dt>" . $term . "</dt>";
+			$text .= "\n<dt>".$term."</dt>";
 		}
-		return $text . "\n";
+		return $text."\n";
 	}
 	function _processDefListItems_callback_dd($matches) {
 		$leading_line	= $matches[1];
 		$marker_space	= $matches[2];
-		$def			= $matches[3];
+		$def = $matches[3];
 
 		if ($leading_line || preg_match('/\n{2,}/', $def)) {
 			# Replace marker with the appropriate whitespace indentation
-			$def = str_repeat(' ', strlen($marker_space)) . $def;
-			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
-			$def = "\n". $def ."\n";
+			$def = str_repeat(' ', strlen($marker_space)).$def;
+			$def = $this->runBlockGamut($this->outdent($def."\n\n"));
+			$def = "\n".$def."\n";
 		}
 		else {
 			$def = rtrim($def);
 			$def = $this->runSpanGamut($this->outdent($def));
 		}
 
-		return "\n<dd>" . $def . "</dd>\n";
+		return "\n<dd>".$def."</dd>\n";
 	}
 
 
@@ -2670,7 +2670,7 @@ 
 		return $text;
 	}
 	function _stripFootnotes_callback($matches) {
-		$note_id = $this->fn_id_prefix . $matches[1];
+		$note_id = $this->fn_id_prefix.$matches[1];
 		$this->footnotes[$note_id] = $this->outdent($matches[2]);
 		return ''; # String that will replace the block
 	}
@@ -2698,7 +2698,7 @@ 
 		if (!empty($this->footnotes_ordered)) {
 			$text .= "\n\n";
 			$text .= "<div class=\"footnotes\">\n";
-			$text .= "<hr". $this->empty_element_suffix ."\n";
+			$text .= "<hr".$this->empty_element_suffix."\n";
 			$text .= "<ol>\n\n";
 
 			$attr = " rev=\"footnote\"";
@@ -2730,13 +2730,13 @@ 
 				# Add backlink to last paragraph; create new paragraph if needed.
 				$backlink = "<a href=\"#fnref:$note_id\"$attr>&#8617;</a>";
 				if (preg_match('{</p>$}', $footnote)) {
-					$footnote = substr($footnote, 0, -4) . "&#160;$backlink</p>";
+					$footnote = substr($footnote, 0, -4)."&#160;$backlink</p>";
 				} else {
 					$footnote .= "\n\n<p>$backlink</p>";
 				}
 
 				$text .= "<li id=\"fn:$note_id\">\n";
-				$text .= $footnote . "\n";
+				$text .= $footnote."\n";
 				$text .= "</li>\n\n";
 			}
 
@@ -2746,7 +2746,7 @@ 
 		return $text;
 	}
 	function _appendFootnotes_callback($matches) {
-		$node_id = $this->fn_id_prefix . $matches[1];
+		$node_id = $this->fn_id_prefix.$matches[1];
 
 		# Create footnote marker only if it has a corresponding footnote *and*
 		# the footnote hasn't been used by another marker.

app/Plugin/Markitup/View/Helper/MarkitupHelper.php

Spacing +19 added lines, -19 removed lines

@@ -35,7 +35,7 @@ 
  * @return string  An <textarea /> element.
  */
 	public function editor($name, $settings = array()) {
-		echo $this->Html->script($this->paths['js'] . 'jquery.markitup',
+		echo $this->Html->script($this->paths['js'].'jquery.markitup',
 			['inline' => true]);
 		$config = $this->_build($settings);
 		$settings = $config['settings'];
@@ -48,20 +48,20 @@ 
 			$class = $textarea['class'];
 		}
 		$markItUpInstance = uniqid('markItUp');
-		$textarea['class'] = $class . ' ' . $markItUpInstance;
+		$textarea['class'] = $class.' '.$markItUpInstance;
 
-		$id = '.' . $markItUpInstance;
+		$id = '.'.$markItUpInstance;
 
 		// $out[] = 'jQuery.noConflict();';
 		$out[] = 'jQuery(function() {';
-		$out[] = '  jQuery("' . $id . '").markItUp(';
-		$out[] = '     ' . $settings['settings'] . ',';
+		$out[] = '  jQuery("'.$id.'").markItUp(';
+		$out[] = '     '.$settings['settings'].',';
 		$out[] = '     {';
-		$out[] = '        previewParserPath:"' . $settings['parser'] . '"';
+		$out[] = '        previewParserPath:"'.$settings['parser'].'"';
 		$out[] = '     }';
 		$out[] = '  );';
 		$out[] = '});';
-		return $this->Form->input($name, $textarea) . $this->Html->scriptBlock(join("\n", $out));
+		return $this->Form->input($name, $textarea).$this->Html->scriptBlock(join("\n", $out));
 	}
 
 /**
@@ -75,12 +75,12 @@ 
  * @return string An <a /> element.
  */
 	public function create($title, $fieldName = "", $settings = array(), $htmlAttributes = array(), $confirmMessage = false) {
-		$id = ($fieldName{0} === '#') ? $fieldName : '#' . parent::domId($fieldName);
+		$id = ($fieldName{0} === '#') ? $fieldName : '#'.parent::domId($fieldName);
 
 		$config = $this->_build($settings);
 		$settings = $config['settings'];
 		$htmlAttributes = array_merge($htmlAttributes,
-			array('onclick' => 'jQuery("' . $id . '").markItUpRemove(); jQuery("' . $id . '").markItUp(' . $settings['settings'] . ', { previewParserPath:"' . $settings['parser'] . '" }); return false;'));
+			array('onclick' => 'jQuery("'.$id.'").markItUpRemove(); jQuery("'.$id.'").markItUp('.$settings['settings'].', { previewParserPath:"'.$settings['parser'].'" }); return false;'));
 		return $this->Html->link($title, "#", $htmlAttributes, $confirmMessage, false);
 	}
 
@@ -94,9 +94,9 @@ 
  * @return string An <a /> element.
  */
 	public function destroy($title, $fieldName = "", $htmlAttributes = array(), $confirmMessage = false) {
-		$id = ($fieldName{0} === '#') ? $fieldName : '#' . parent::domId($fieldName);
+		$id = ($fieldName{0} === '#') ? $fieldName : '#'.parent::domId($fieldName);
 		$htmlAttributes = array_merge($htmlAttributes,
-			array('onclick' => 'jQuery("' . $id . '").markItUpRemove(); return false;'));
+			array('onclick' => 'jQuery("'.$id.'").markItUpRemove(); return false;'));
 		return $this->Html->link($title, "#", $htmlAttributes, $confirmMessage, false);
 	}
 
@@ -111,19 +111,19 @@ 
  */
 	public function insert($title, $fieldName = null, $content = array(), $htmlAttributes = array(), $confirmMessage = false) {
 		if (isset($fieldName)) {
-			$content['target'] = ($fieldName{0} === '#') ? $fieldName : '#' . parent::domId($fieldName);
+			$content['target'] = ($fieldName{0} === '#') ? $fieldName : '#'.parent::domId($fieldName);
 		}
 		if (!is_array($content)) {
 			$content['replaceWith'] = $content;
 		}
 		$properties = '';
 		foreach ($content as $k => $v) {
-			$properties .= $k . ':"' . addslashes($v) . '",';
+			$properties .= $k.':"'.addslashes($v).'",';
 		}
 		$properties = substr($properties, 0, -1);
 
 		$htmlAttributes = array_merge($htmlAttributes,
-			array('onclick' => '$.markItUp( { ' . $properties . ' } ); return false;'));
+			array('onclick' => '$.markItUp( { '.$properties.' } ); return false;'));
 		return $this->Html->link($title, "#", $htmlAttributes, $confirmMessage, false);
 	}
 
@@ -146,11 +146,11 @@ 
 			if (!isset($file)) {
 				$file = null;
 			}
-			App::import('Vendor', $plugin . '.' . $class, null, null, $file);
+			App::import('Vendor', $plugin.'.'.$class, null, null, $file);
 			$content = $class($content);
 		}
 
-		echo $this->Html->css($this->paths['css'] . 'templates' . DS . 'preview', null, array('inline' => false));
+		echo $this->Html->css($this->paths['css'].'templates'.DS.'preview', null, array('inline' => false));
 
 		return $content;
 	}
@@ -173,11 +173,11 @@ 
 		}
 
 		echo $this->Html->css(array(
-			$this->paths['css'] . 'skins' . DS . $settings['skin'] . DS . 'style',
-			$this->paths['css'] . 'sets' . DS . $settings['set'] . DS . 'style',
+			$this->paths['css'].'skins'.DS.$settings['skin'].DS.'style',
+			$this->paths['css'].'sets'.DS.$settings['set'].DS.'style',
 		), null, array('inline' => true));
 
-		echo $this->Html->script($this->paths['js'] . 'sets' . DS . $settings['set'] . DS . 'set', true);
+		echo $this->Html->script($this->paths['js'].'sets'.DS.$settings['set'].DS.'set', true);
 
 		return array('settings' => $settings, 'default' => $default);
 	}

app/Plugin/Embedly/Vendor/Embedly.php

Spacing +3 added lines, -3 removed lines

@@ -202,7 +202,7 @@ 
                 if (!$match) {
                     //print("rejecting $url");
                     unset($params['urls'][$i]);
-                    $rejects[$i] = (object)array(
+                    $rejects[$i] = (object) array(
                         'error_code' => '401',
                         'error_message' => 'This service requires an Embedly key',
                         'type' => 'error'
@@ -243,7 +243,7 @@ 
             array_push($merged_result, $obj);
         }
 
-        if($justone) {
+        if ($justone) {
             return array_shift($merged_result);
         }
 
@@ -365,7 +365,7 @@ 
      */
     public static function paramify($input)
     {
-        if(is_string($input)) {
+        if (is_string($input)) {
             return array('urls' => $input);
         }
 

app/Plugin/Embedly/View/Helper/EmbedlyHelper.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 			$request = ['urls' => [$string]];
 			$obj = current($api->oembed($request));
 		} catch (Exception $e) {
-			return 'Embedding failded: ' . $e->getMessage();
+			return 'Embedding failded: '.$e->getMessage();
 		}
 
 		if (isset($obj->html) && $obj->type !== 'link') {

app/Test/Case/AllControllerTest.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 		public static function suite() {
 			$suite = new CakeTestSuite('All controller and component tests.');
-			$suite->addTestDirectory(TESTS . 'Case' . DS . 'Controller');
+			$suite->addTestDirectory(TESTS.'Case'.DS.'Controller');
 			return $suite;
 		}