Schlaefer / Saito

app/Config/bootstrap.php

Braces +3 added lines, -1 removed lines

@@ -212,8 +212,10 @@
  */
 if ( file_exists(APP . 'Config' . DS . 'installed.txt') ) :
 	Configure::write('Saito.installed', TRUE);
-else :
+else {
+    :
 	Configure::write('Saito.installed', FALSE);
+}
 endif;
 
 /**

app/Controller/Component/CurrentUserComponent.php

Braces +3 added lines, -1 removed lines

@@ -305,8 +305,10 @@
 
 			if ($this->isLoggedIn()):
 				$this->_Controller->Auth->allow();
-			else:
+			else {
+			    :
 				$this->_Controller->Auth->deny();
+			}
 			endif;
 
 			$this->_Controller->Auth->autoRedirect = false; // don't redirect after Auth->login()

app/Controller/CategoriesController.php

Braces +6 added lines, -2 removed lines

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

app/Controller/EntriesController.php

Braces +9 added lines, -3 removed lines

@@ -242,7 +242,8 @@ 
 							$this->_stop();
 						}
 					// answering through POST request
-					else :
+					else {
+					    :
 						if ($this->localReferer('action') === 'mix') {
 							// answer request came from mix ansicht
 							$this->redirect(
@@ -253,6 +254,7 @@ 
 									'#' => $this->Entry->id
 								]
 							);
+					}
 
 						} else {
 							// normal posting from entries/add or entries/view
@@ -267,7 +269,8 @@ 
 						}
 						return;
 					endif;
-				else :
+				else {
+				    :
 					// Error while trying to save a post
 					if (count($this->Entry->validationErrors) === 0) {
 						$this->Session->setFlash(
@@ -276,6 +279,7 @@ 
 							),
 							'flash/error'
 						);
+				}
 					}
 				endif;
 
@@ -584,10 +588,12 @@ 
 				);
 				$entry = $this->dic->newInstance('\Saito\Posting\Posting', ['rawData' => $newEntry]);
 				$this->set('entry', $entry);
-			else :
+			else {
+			    :
 				// validation errors
 				foreach ($errors as $field => $error) {
 					$message = __d('nondynamic', $field) . ": " . __d( 'nondynamic', $error[0]);
+			}
 					$this->JsData->addAppJsMessage(
 						$message,
 						[

app/Plugin/FileUpload/Model/Behavior/FileUploadBehavior.php

Braces +3 added lines, -6 removed lines

@@ -69,8 +69,7 @@ 
           return false; // we couldn't save the file, return false
         }
         unset($Model->data[$Model->alias][$this->options['fileVar']]);
-      }
-      else {
+      } else {
         unset($Model->data[$Model->alias]);
       }
     }
@@ -88,13 +87,11 @@ 
       if($this->Uploader->hasUpload()){
         if($this->Uploader->checkFile() && $this->Uploader->checkType() && $this->Uploader->checkSize()){
           $Model->beforeValidate();
-        }
-        else {
+        } else {
           $Model->validationErrors[$this->options['fileVar']] = $this->Uploader->showErrors();
         }
       }
-    }
-    elseif(isset($this->options['required']) && $this->options['required']){
+    } elseif(isset($this->options['required']) && $this->options['required']){
       $Model->validationErrors[$this->options['fileVar']] = 'No File';
     }
     return $Model->beforeValidate();

app/Plugin/FileUpload/Vendor/uploader.php

Braces +10 added lines, -15 removed lines

@@ -72,12 +72,10 @@ 
         $Model = ClassRegistry::init($this->options['fileModel']);
         if(method_exists($Model, $this->options['fileNameFunction'])){
           $fileName = $Model->{$this->options['fileNameFunction']}($fileName);
-        }
-        elseif(function_exists($this->options['fileNameFunction'])){
+        } elseif(function_exists($this->options['fileNameFunction'])){
           $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
         }
-      }
-      else {
+      } else {
         if(function_exists($this->options['fileNameFunction'])){
           $fileName = call_user_func($this->options['fileNameFunction'], $fileName);
         }
@@ -140,8 +138,7 @@ 
     if(move_uploaded_file($this->file['tmp_name'], $target_path)){
       $this->finalFile = basename($target_path);
       return $this->finalFile;
-    }
-    else{
+    } else{
       $this->_error('Unable to save temp file to file system.');
       return false;
     }
@@ -154,7 +151,9 @@ 
     * @return void
     */
   function setFile($file = null){
-    if($file) $this->file = $file;
+    if($file) {
+        $this->file = $file;
+    }
   }
 
   /**
@@ -203,8 +202,7 @@ 
         if(is_array($types) && !in_array($this->file['type'], $types)){
           $this->_error("{$this->file['type']} is not an allowed type.");
           return false;
-        }
-        else {
+        } else {
           return true;
         }
       }
@@ -226,8 +224,7 @@ 
     if($this->hasUpload() && $this->file){
       if(isset($this->file['error']) && $this->file['error'] == UPLOAD_ERR_OK ) {
         return true;
-      }
-      else {
+      } else {
         $this->_error($this->uploadErrors[$this->file['error']]);
       }
     }
@@ -246,11 +243,9 @@ 
     if($this->hasUpload() && $this->file){
       if(!$this->options['maxFileSize']){ //We don't want to test maxFileSize
         return true;
-      }
-      elseif($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']){
+      } elseif($this->options['maxFileSize'] && $this->file['size'] < $this->options['maxFileSize']){
         return true;
-      }
-      else {
+      } else {
         // $this->_error("File exceeds {$this->options['maxFileSize']} byte limit.");
 				$this->_error("File exceeds size limit.");
       }

app/Plugin/FileUpload/View/Helper/FileUploadHelper.php

Braces +32 added lines, -39 removed lines

@@ -115,8 +115,7 @@ 
     $img = false;
     if(is_string($name)){
       $img = $this->_getImageByName();
-    }
-    elseif(is_int($name)){
+    } elseif(is_int($name)){
       $img = $this->_getImageById();
     }
 
@@ -145,8 +144,7 @@ 
       unset($options['model'], $options['var']);
 
       return $this->Form->input("{$configs['model']}.".$this->inputCount++.".{$configs['var']}", array_merge(array('type'=>'file'), $options));
-    }
-    else {
+    } else {
       return "<input type='file' name='data[{$configs['var']}][".$this->inputCount++."]' />";
     }
   }
@@ -166,8 +164,7 @@ 
     if(!empty($upload)){
       $this->fileName = $upload[$this->settings['fileModel']][$this->settings['fields']['name']];
       return $this->_getImageByName();
-    }
-    else{
+    } else{
       return false;
     }
   }
@@ -180,8 +177,7 @@ 
   function _getFullPath(){
     if($this->_isOutsideSource()){
       return $this->fileName;
-    }
-    else {
+    } else {
       return WWW_ROOT . $this->_getUploadPath();
     }
   }
@@ -194,8 +190,7 @@ 
   function _getImagePath(){
     if($this->_isOutsideSource()){
       return $this->fileName;
-    }
-    else {
+    } else {
       return '/' . $this->_getUploadPath();
     }
   }
@@ -227,7 +222,9 @@ 
     */
   function _getImageByName(){
     //only proceed if we actually have the file in question
-    if(!$this->_isOutsideSource() && !file_exists($this->_getFullPath())) return false;
+    if(!$this->_isOutsideSource() && !file_exists($this->_getFullPath())) {
+        return false;
+    }
 
     //resize if we have resize on, a width, and if it doesn't already exist.
     if($this->options['autoResize'] && $this->options['width'] > 0 && !file_exists($this->_getResizeNameOrPath($this->_getFullPath()))){
@@ -257,8 +254,7 @@ 
     $this->newImage = new RResizeImage($this->_getFullPath());
     if($this->newImage->imgWidth > $this->options['width']){
       $this->newImage->resize_limitwh($this->options['width'], 0, $this->_getResizeNameOrPath($this->_getFullPath()));
-    }
-    else {
+    } else {
       //$this->autoResize = false;
     }
   }
@@ -272,12 +268,10 @@ 
     if(!$this->_isOutsideSource() && $this->options['autoResize'] && $this->options['width'] > 0){
       if(isset($this->newImage) && $this->newImage->imgWidth && $this->newImage->imgWidth <= $this->options['width']){
         $image = $this->_getImagePath();
-      }
-      else {
+      } else {
         $image = $this->_getResizeNameOrPath($this->_getImagePath());
       }
-    }
-    else {
+    } else {
       $image = $this->_getImagePath();
     }
 
@@ -285,13 +279,14 @@ 
     //unset the default options
     unset($options['resizedDir'], $options['uploadDir'], $options['imagePathOnly'], $options['autoResize'], $options['resizeThumbOnly']);
     //unset width only if we're not an outsourced image, we have resize turned on, or we don't have a width to begin with.
-    if(!$this->_isOutsideSource() && ($this->options['resizeThumbOnly'] || !$options['width'])) unset($options['width']);
+    if(!$this->_isOutsideSource() && ($this->options['resizeThumbOnly'] || !$options['width'])) {
+        unset($options['width']);
+    }
 
     //return the impage path or image html
     if($this->options['imagePathOnly']){
       return $image;
-    }
-    else {
+    } else {
       return $this->Html->image($image, $options);
     }
   }
@@ -435,8 +430,12 @@ 
 				$this->_error="Could not resize given image";
 				return false;
 			}
-			if($width<=0)	$width=$this->imgWidth;
-			if($height<=0) $height=$this->imgHeight;
+			if($width<=0) {
+			    $width=$this->imgWidth;
+			}
+			if($height<=0) {
+			    $height=$this->imgHeight;
+			}
 
 			return $this->_resize($width,$height,$newfile);
 		}
@@ -461,11 +460,9 @@ 
 			$this->_getImageInfo();
 			if($this->imgType=='GIF'){
 				$this->_img=@imagecreatefromgif($this->imgFile);
-			}
-			elseif($this->imgType=='JPG'){
+			} elseif($this->imgType=='JPG'){
 				$this->_img=@imagecreatefromjpeg($this->imgFile);
-			}
-			elseif($this->imgType=='PNG'){
+			} elseif($this->imgType=='PNG'){
 				$this->_img=@imagecreatefrompng($this->imgFile);
 			}
 
@@ -497,7 +494,9 @@ 
 			if($this->imgType=='GIF' || $this->imgType=='PNG')	{
 				/** Code to keep transparency of image **/
 				$colorcount = imagecolorstotal($this->_img);
-				if ($colorcount == 0) $colorcount = 256;
+				if ($colorcount == 0) {
+				    $colorcount = 256;
+				}
 				imagetruecolortopalette($newimg,true,$colorcount);
 				imagepalettecopy($newimg,$this->_img);
 				$transparentcolor = imagecolortransparent($this->_img);
@@ -511,8 +510,7 @@ 
 				if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
 			   		$newfile=@substr_replace($this->imgFile,"_har",-@strlen($matches[0]),0);
         }
-			}
-			elseif(!empty($newfile)){
+			} elseif(!empty($newfile)){
 				if(!@preg_match("/\..*+$/",@basename($newfile))){
 					if(@preg_match("/\..*+$/",@basename($this->imgFile),$matches)){
 					   $newfile=$newfile.$matches[0];
@@ -523,26 +521,21 @@ 
 			if($this->imgType=='GIF'){
 				if(!empty($newfile)){
           @imagegif($newimg,$newfile);
-        }
-				else {
+        } else {
 					@header("Content-type: image/gif");
 					@imagegif($newimg);
 				}
-			}
-			elseif($this->imgType=='JPG'){
+			} elseif($this->imgType=='JPG'){
 				if(!empty($newfile)){
 					@imagejpeg($newimg,$newfile);
-        }
-				else	{
+        } else	{
 					@header("Content-type: image/jpeg");
 					@imagejpeg($newimg);
 				}
-			}
-			elseif($this->imgType=='PNG'){
+			} elseif($this->imgType=='PNG'){
 				if(!empty($newfile)){
 					@imagepng($newimg,$newfile);
-        }
-				else{
+        } else{
 					@header("Content-type: image/png");
 					@imagepng($newimg);
 				}

app/Plugin/Install/Controller/InstallController.php

Braces +2 added lines, -4 removed lines

@@ -132,8 +132,7 @@ 
 		try {
 			@ConnectionManager::create('default', $config);
 			$db = ConnectionManager::getDataSource('default');
-		}
-		catch (MissingConnectionException $e) {
+		} catch (MissingConnectionException $e) {
 			$this->Session->setFlash(__('Could not connect to database: %s', $e->getMessage()), 'default', array('class' => 'error'));
 			$this->redirect(array('action' => 'database'));
 		}
@@ -196,8 +195,7 @@ 
 					$create = $db->createSchema($schema, $table);
 					try {
 						$db->execute($create);
-					}
-					catch (PDOException $e) {
+					} catch (PDOException $e) {
 						$this->Session->setFlash(__('Could not create table: %s', $e->getMessage()), 'default', array('class' => 'error'));
 						$this->redirect(array('action' => 'database'));
 					}

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

Braces +87 added lines, -57 removed lines

@@ -193,8 +193,12 @@ 
 	# Fake Textile class. It calls Markdown instead.
 	class Textile {
 		function TextileThis($text, $lite='', $encode='') {
-			if ($lite == '' && $encode == '')    $text = Markdown($text);
-			if (function_exists('SmartyPants'))  $text = SmartyPants($text);
+			if ($lite == '' && $encode == '') {
+			    $text = Markdown($text);
+			}
+			if (function_exists('SmartyPants')) {
+			    $text = SmartyPants($text);
+			}
 			return $text;
 		}
 		# Fake restricted version: restrictions are not supported for now.
@@ -387,7 +391,9 @@ 
 
 
 	function hashHTMLBlocks($text) {
-		if ($this->no_markup)  return $text;
+		if ($this->no_markup) {
+		    return $text;
+		}
 
 		$less_than_tab = $this->tab_width - 1;
 
@@ -673,7 +679,9 @@ 
 	#
 	# Turn Markdown link shortcuts into XHTML <a> tags.
 	#
-		if ($this->in_anchor) return $text;
+		if ($this->in_anchor) {
+		    return $text;
+		}
 		$this->in_anchor = true;
 
 		#
@@ -767,8 +775,7 @@ 
 			$link_text = $this->runSpanGamut($link_text);
 			$result .= ">$link_text</a>";
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			$result = $whole_match;
 		}
 		return $result;
@@ -869,8 +876,7 @@ 
 			}
 			$result .= $this->empty_element_suffix;
 			$result = $this->hashPart($result);
-		}
-		else {
+		} else {
 			# If there's no such link ID, leave intact:
 			$result = $whole_match;
 		}
@@ -928,8 +934,9 @@ 
 	}
 	function _doHeaders_callback_setext($matches) {
 		# Terrible hack to check we haven't found an empty list item.
-		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1]))
-			return $matches[0];
+		if ($matches[2] == '-' && preg_match('{^-(?: |$)}', $matches[1])) {
+					return $matches[0];
+		}
 
 		$level = $matches[2]{0} == '=' ? 1 : 2;
 		$block = "<h$level>".$this->runSpanGamut($matches[1])."</h$level>";
@@ -996,8 +1003,7 @@ 
 						'.$whole_list_re.'
 					}mx',
 					array(&$this, '_doLists_callback'), $text);
-			}
-			else {
+			} else {
 				$text = preg_replace_callback('{
 						(?:(?<=\n)\n|\A\n?) # Must eat the newline
 						'.$whole_list_re.'
@@ -1087,8 +1093,7 @@ 
 			# Replace marker with the appropriate whitespace indentation
 			$item = $leading_space . str_repeat(' ', strlen($marker_space)) . $item;
 			$item = $this->runBlockGamut($this->outdent($item)."\n");
-		}
-		else {
+		} else {
 			# Recursion for sub-lists:
 			$item = $this->doLists($this->outdent($item));
 			$item = preg_replace('/\n+$/', '', $item);
@@ -1358,8 +1363,7 @@ 
 				$value = preg_replace('/^([ ]*)/', "<p>", $value);
 				$value .= "</p>";
 				$grafs[$key] = $this->unhash($value);
-			}
-			else {
+			} else {
 				# Is a block.
 				# Modify elements of @grafs in-place...
 				$graf = $value;
@@ -1507,8 +1511,11 @@ 
 				# roughly 10% raw, 45% hex, 45% dec
 				# '@' *must* be encoded. I insist.
 				if ($r > 90 && $char != '@') /* do nothing */;
-				else if ($r < 45) $chars[$key] = '&#x'.dechex($ord).';';
-				else              $chars[$key] = '&#'.$ord.';';
+				else if ($r < 45) {
+				    $chars[$key] = '&#x'.dechex($ord).';';
+				} else {
+				    $chars[$key] = '&#'.$ord.';';
+				}
 			}
 		}
 
@@ -1566,8 +1573,7 @@ 
 			if (isset($parts[1])) {
 				$output .= $this->handleSpanToken($parts[1], $parts[2]);
 				$str = $parts[2];
-			}
-			else {
+			} else {
 				break;
 			}
 		}
@@ -1649,7 +1655,9 @@ 
 	# function that will loosely count the number of UTF-8 characters with a
 	# regular expression.
 	#
-		if (function_exists($this->utf8_strlen)) return;
+		if (function_exists($this->utf8_strlen)) {
+		    return;
+		}
 		$this->utf8_strlen = create_function('$text', 'return preg_match_all(
 			"/[\\\\x00-\\\\xBF]|[\\\\xC0-\\\\xFF][\\\\x80-\\\\xBF]*/",
 			$text, $m);');
@@ -1744,8 +1752,9 @@ 
 		$this->footnote_counter = 1;
 
 		foreach ($this->predef_abbr as $abbr_word => $abbr_desc) {
-			if ($this->abbr_word_re)
-				$this->abbr_word_re .= '|';
+			if ($this->abbr_word_re) {
+							$this->abbr_word_re .= '|';
+			}
 			$this->abbr_word_re .= preg_quote($abbr_word);
 			$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
 		}
@@ -1834,7 +1843,9 @@ 
 	#
 	# Returns an array of that form: ( processed text , remaining text )
 	#
-		if ($text === '') return array('', '');
+		if ($text === '') {
+		    return array('', '');
+		}
 
 		# Regex to check for the presense of newlines around a block tag.
 		$newline_before_re = '/(?:^\n?|\n\n)*$/';
@@ -1940,8 +1951,7 @@ 
 					# End marker found: pass text unchanged until marker.
 					$parsed .= $tag . $matches[0];
 					$text = substr($text, strlen($matches[0]));
-				}
-				else {
+				} else {
 					# Unmatched marker: just skip it.
 					$parsed .= $tag;
 				}
@@ -1966,8 +1976,7 @@ 
 					# End marker found: pass text unchanged until marker.
 					$parsed .= $tag . $matches[0];
 					$text = substr($text, strlen($matches[0]));
-				}
-				else {
+				} else {
 					# No end marker: just skip it.
 					$parsed .= $tag;
 				}
@@ -2014,8 +2023,11 @@ 
 				#
 				# Increase/decrease nested tag count.
 				#
-				if ($tag{1} == '/')						$depth--;
-				else if ($tag{strlen($tag)-2} != '/')	$depth++;
+				if ($tag{1} == '/') {
+				    $depth--;
+				} else if ($tag{strlen($tag)-2} != '/') {
+				    $depth++;
+				}
 
 				if ($depth < 0) {
 					#
@@ -2027,8 +2039,7 @@ 
 				}
 
 				$parsed .= $tag;
-			}
-			else {
+			} else {
 				$parsed .= $tag;
 			}
 		} while ($depth >= 0);
@@ -2046,7 +2057,9 @@ 
 	#
 	# Returns an array of that form: ( processed text , remaining text )
 	#
-		if ($text === '') return array('', '');
+		if ($text === '') {
+		    return array('', '');
+		}
 
 		# Regex to match `markdown` attribute inside of a tag.
 		$markdown_attr_re = '
@@ -2097,8 +2110,9 @@ 
 		# Get the name of the starting tag.
 		# (This pattern makes $base_tag_name_re safe without quoting.)
 		#
-		if (preg_match('/^<([\w:$]*)\b/', $text, $matches))
-			$base_tag_name_re = $matches[1];
+		if (preg_match('/^<([\w:$]*)\b/', $text, $matches)) {
+					$base_tag_name_re = $matches[1];
+		}
 
 		#
 		# Loop through every tag until we find the corresponding closing tag.
@@ -2135,15 +2149,17 @@ 
 			{
 				# Just add the tag to the block as if it was text.
 				$block_text .= $tag;
-			}
-			else {
+			} else {
 				#
 				# Increase/decrease nested tag count. Only do so if
 				# the tag's name match base tag's.
 				#
 				if (preg_match('{^</?'.$base_tag_name_re.'\b}', $tag)) {
-					if ($tag{1} == '/')						$depth--;
-					else if ($tag{strlen($tag)-2} != '/')	$depth++;
+					if ($tag{1} == '/') {
+					    $depth--;
+					} else if ($tag{strlen($tag)-2} != '/') {
+					    $depth++;
+					}
 				}
 
 				#
@@ -2190,13 +2206,17 @@ 
 					}
 
 					# Append tag content to parsed text.
-					if (!$span_mode)	$parsed .= "\n\n$block_text\n\n";
-					else				$parsed .= "$block_text";
+					if (!$span_mode) {
+					    $parsed .= "\n\n$block_text\n\n";
+					} else {
+					    $parsed .= "$block_text";
+					}
 
 					# Start over a new block.
 					$block_text = "";
+				} else {
+				    $block_text .= $tag;
 				}
-				else $block_text .= $tag;
 			}
 
 		} while ($depth > 0);
@@ -2261,12 +2281,15 @@ 
 		return $text;
 	}
 	function _doHeaders_attr($attr) {
-		if (empty($attr))  return "";
+		if (empty($attr)) {
+		    return "";
+		}
 		return " id=\"$attr\"";
 	}
 	function _doHeaders_callback_setext($matches) {
-		if ($matches[3] == '-' && preg_match('{^- }', $matches[1]))
-			return $matches[0];
+		if ($matches[3] == '-' && preg_match('{^- }', $matches[1])) {
+					return $matches[0];
+		}
 		$level = $matches[3]{0} == '=' ? 1 : 2;
 		$attr  = $this->_doHeaders_attr($id =& $matches[2]);
 		$block = "<h$level$attr>".$this->runSpanGamut($matches[1])."</h$level>";
@@ -2364,10 +2387,15 @@ 
 		# Reading alignement from header 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"';
-			else if (preg_match('/^ *:-+ *$/', $s))	$attr[$n] = ' align="left"';
-			else									$attr[$n] = '';
+			if (preg_match('/^ *-+: *$/', $s)) {
+			    $attr[$n] = ' align="right"';
+			} else if (preg_match('/^ *:-+: *$/', $s)) {
+			    $attr[$n] = ' align="center"';
+			} else if (preg_match('/^ *:-+ *$/', $s)) {
+			    $attr[$n] = ' align="left"';
+			} else {
+			    $attr[$n] = '';
+			}
 		}
 
 		# Parsing span elements, including code spans, character escapes,
@@ -2380,8 +2408,9 @@ 
 		$text = "<table>\n";
 		$text .= "<thead>\n";
 		$text .= "<tr>\n";
-		foreach ($headers as $n => $header)
-			$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+		foreach ($headers as $n => $header) {
+					$text .= "  <th$attr[$n]>".$this->runSpanGamut(trim($header))."</th>\n";
+		}
 		$text .= "</tr>\n";
 		$text .= "</thead>\n";
 
@@ -2399,8 +2428,9 @@ 
 			$row_cells = array_pad($row_cells, $col_count, '');
 
 			$text .= "<tr>\n";
-			foreach ($row_cells as $n => $cell)
-				$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+			foreach ($row_cells as $n => $cell) {
+							$text .= "  <td$attr[$n]>".$this->runSpanGamut(trim($cell))."</td>\n";
+			}
 			$text .= "</tr>\n";
 		}
 		$text .= "</tbody>\n";
@@ -2526,8 +2556,7 @@ 
 			$def = str_repeat(' ', strlen($marker_space)) . $def;
 			$def = $this->runBlockGamut($this->outdent($def . "\n\n"));
 			$def = "\n". $def ."\n";
-		}
-		else {
+		} else {
 			$def = rtrim($def);
 			$def = $this->runSpanGamut($this->outdent($def));
 		}
@@ -2801,8 +2830,9 @@ 
 	function _stripAbbreviations_callback($matches) {
 		$abbr_word = $matches[1];
 		$abbr_desc = $matches[2];
-		if ($this->abbr_word_re)
-			$this->abbr_word_re .= '|';
+		if ($this->abbr_word_re) {
+					$this->abbr_word_re .= '|';
+		}
 		$this->abbr_word_re .= preg_quote($abbr_word);
 		$this->abbr_desciptions[$abbr_word] = trim($abbr_desc);
 		return ''; # String that will replace the block