jacobemerick / web

utility/content/CleanCommentContent.class.inc.php

Doc Comments +8 added lines

@@ -36,6 +36,10 @@ 
 		$this->replace_element_patterns();

 	}

 

+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function process_element($pattern, $replace)

 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

@@ -75,6 +79,10 @@ 
 		$this->content = strip_tags($this->content);

 	}

 

+	/**
+	 * @param string $pattern
+	 * @param string $replace
+	 */
 	private function link_unlinked_urls($pattern, $replace)

 	{

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);

Spacing +6 added lines, -6 removed lines

@@ -40,10 +40,10 @@ 
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
+		if ($match_count < 1)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$full_match = array_shift($match);
 			$placeholder = $this->create_placeholder($full_match);
@@ -56,7 +56,7 @@ 
 
 	private function create_placeholder($text)
 	{
-		return md5($text . rand());
+		return md5($text.rand());
 	}
 
 	private function create_full_match_pattern($text)
@@ -79,10 +79,10 @@ 
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
+		if ($match_count < 1)
 			return;
 		
-		foreach($matches as $match)
+		foreach ($matches as $match)
 		{
 			$full_match = array_shift($match);
 			$full_match_pattern = $this->create_full_match_pattern($full_match);
@@ -99,7 +99,7 @@ 
 
 	private function replace_element_patterns()
 	{
-		foreach($this->replacement_array as $key => $replace)
+		foreach ($this->replacement_array as $key => $replace)
 		{
 			$this->content = str_replace($key, $replace, $this->content);
 		}

Indentation +83 added lines, -83 removed lines

@@ -5,104 +5,104 @@
 final class CleanCommentContent extends Content
 {
 
-	private static $LINK_PATTERN = '@<a.*href=["\']([^"\']*)["\'].*>(.*)</a>@i';
-	private static $BOLD_PATTERN = '@<b.*>(.*)</b>@i';
-	private static $ITALIC_PATTERN = '@<i.*>(.*)</i>@i';
-	private static $CODE_PATTERN = '@<pre[^>]*>(.*)</pre>@is';
+    private static $LINK_PATTERN = '@<a.*href=["\']([^"\']*)["\'].*>(.*)</a>@i';
+    private static $BOLD_PATTERN = '@<b.*>(.*)</b>@i';
+    private static $ITALIC_PATTERN = '@<i.*>(.*)</i>@i';
+    private static $CODE_PATTERN = '@<pre[^>]*>(.*)</pre>@is';
 
-	private static $LINK_REPLACE = '<a href="%s" rel="nofollow" target="_blank">%s</a>';
-	private static $BOLD_REPLACE = '<b>%s</b>';
-	private static $ITALIC_REPLACE = '<i>%s</i>';
-	private static $CODE_REPLACE = '<pre>%s</pre>';
+    private static $LINK_REPLACE = '<a href="%s" rel="nofollow" target="_blank">%s</a>';
+    private static $BOLD_REPLACE = '<b>%s</b>';
+    private static $ITALIC_REPLACE = '<i>%s</i>';
+    private static $CODE_REPLACE = '<pre>%s</pre>';
 
-	private static $URL_PATTERN = '@(https?://[a-z0-9\.-]+\.[a-z]{2,6}[^\s]*[^\.,\?\!;\s]+)@i';
-	private static $LINE_BREAK_PATTERN = '@([\r\n]+)@';
+    private static $URL_PATTERN = '@(https?://[a-z0-9\.-]+\.[a-z]{2,6}[^\s]*[^\.,\?\!;\s]+)@i';
+    private static $LINE_BREAK_PATTERN = '@([\r\n]+)@';
 
-	private static $LINE_BREAK_REPLACE = '<br />';
+    private static $LINE_BREAK_REPLACE = '<br />';
 
-	private $replacement_array = array();
+    private $replacement_array = array();
 
-	protected function execute()
-	{
-		$this->process_element(self::$CODE_PATTERN, self::$CODE_REPLACE);
-		$this->process_element(self::$LINK_PATTERN, self::$LINK_REPLACE);
-		$this->process_element(self::$ITALIC_PATTERN, self::$ITALIC_REPLACE);
-		$this->process_element(self::$BOLD_PATTERN, self::$BOLD_REPLACE);
+    protected function execute()
+    {
+        $this->process_element(self::$CODE_PATTERN, self::$CODE_REPLACE);
+        $this->process_element(self::$LINK_PATTERN, self::$LINK_REPLACE);
+        $this->process_element(self::$ITALIC_PATTERN, self::$ITALIC_REPLACE);
+        $this->process_element(self::$BOLD_PATTERN, self::$BOLD_REPLACE);
 		
-		$this->strip_extra_tags();
+        $this->strip_extra_tags();
 		
-		$this->link_unlinked_urls(self::$URL_PATTERN, self::$LINK_REPLACE);
-		$this->add_line_breaks();
-		$this->replace_element_patterns();
-	}
-
-	private function process_element($pattern, $replace)
-	{
-		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
+        $this->link_unlinked_urls(self::$URL_PATTERN, self::$LINK_REPLACE);
+        $this->add_line_breaks();
+        $this->replace_element_patterns();
+    }
+
+    private function process_element($pattern, $replace)
+    {
+        $match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+        if($match_count < 1)
+            return;
 		
-		foreach($matches as $match)
-		{
-			$full_match = array_shift($match);
-			$placeholder = $this->create_placeholder($full_match);
-			$full_match_pattern = $this->create_full_match_pattern($full_match);
+        foreach($matches as $match)
+        {
+            $full_match = array_shift($match);
+            $placeholder = $this->create_placeholder($full_match);
+            $full_match_pattern = $this->create_full_match_pattern($full_match);
 			
-			$this->content = preg_replace($full_match_pattern, $placeholder, $this->content, 1);
-			$this->replacement_array[$placeholder] = vsprintf($replace, $match);
-		}
-	}
-
-	private function create_placeholder($text)
-	{
-		return md5($text . rand());
-	}
-
-	private function create_full_match_pattern($text)
-	{
-		$pattern = '';
-		$pattern .= '@';
-		$pattern .= preg_quote($text, '@');
-		$pattern .= '@';
-		$pattern .= 'i';
+            $this->content = preg_replace($full_match_pattern, $placeholder, $this->content, 1);
+            $this->replacement_array[$placeholder] = vsprintf($replace, $match);
+        }
+    }
+
+    private function create_placeholder($text)
+    {
+        return md5($text . rand());
+    }
+
+    private function create_full_match_pattern($text)
+    {
+        $pattern = '';
+        $pattern .= '@';
+        $pattern .= preg_quote($text, '@');
+        $pattern .= '@';
+        $pattern .= 'i';
 		
-		return $pattern;
-	}
+        return $pattern;
+    }
 
-	private function strip_extra_tags()
-	{
-		$this->content = strip_tags($this->content);
-	}
+    private function strip_extra_tags()
+    {
+        $this->content = strip_tags($this->content);
+    }
 
-	private function link_unlinked_urls($pattern, $replace)
-	{
-		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
+    private function link_unlinked_urls($pattern, $replace)
+    {
+        $match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+        if($match_count < 1)
+            return;
 		
-		foreach($matches as $match)
-		{
-			$full_match = array_shift($match);
-			$full_match_pattern = $this->create_full_match_pattern($full_match);
-			$replace = sprintf($replace, $match[0], $match[0]);
+        foreach($matches as $match)
+        {
+            $full_match = array_shift($match);
+            $full_match_pattern = $this->create_full_match_pattern($full_match);
+            $replace = sprintf($replace, $match[0], $match[0]);
 			
-			$this->content = preg_replace($full_match_pattern, $replace, $this->content, 1);
-		}
-	}
-
-	private function add_line_breaks()
-	{
-		$this->content = preg_replace(self::$LINE_BREAK_PATTERN, self::$LINE_BREAK_REPLACE, $this->content);
-	}
-
-	private function replace_element_patterns()
-	{
-		foreach($this->replacement_array as $key => $replace)
-		{
-			$this->content = str_replace($key, $replace, $this->content);
-		}
-	}
+            $this->content = preg_replace($full_match_pattern, $replace, $this->content, 1);
+        }
+    }
+
+    private function add_line_breaks()
+    {
+        $this->content = preg_replace(self::$LINE_BREAK_PATTERN, self::$LINE_BREAK_REPLACE, $this->content);
+    }
+
+    private function replace_element_patterns()
+    {
+        foreach($this->replacement_array as $key => $replace)
+        {
+            $this->content = str_replace($key, $replace, $this->content);
+        }
+    }
 
 }
\ No newline at end of file

Braces +16 added lines, -22 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('utility', 'Content');
 
-final class CleanCommentContent extends Content
-{
+final class CleanCommentContent extends Content

+{

 
 	private static $LINK_PATTERN = '@<a.*href=["\']([^"\']*)["\'].*>(.*)</a>@i';
 	private static $BOLD_PATTERN = '@<b.*>(.*)</b>@i';
@@ -22,8 +22,7 @@ 
 
 	private $replacement_array = array();
 
-	protected function execute()
-	{
+	protected function execute() {

 		$this->process_element(self::$CODE_PATTERN, self::$CODE_REPLACE);
 		$this->process_element(self::$LINK_PATTERN, self::$LINK_REPLACE);
 		$this->process_element(self::$ITALIC_PATTERN, self::$ITALIC_REPLACE);
@@ -36,12 +35,12 @@ 
 		$this->replace_element_patterns();
 	}
 
-	private function process_element($pattern, $replace)
-	{
+	private function process_element($pattern, $replace) {

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{
@@ -54,13 +53,11 @@ 
 		}
 	}
 
-	private function create_placeholder($text)
-	{
+	private function create_placeholder($text) {

 		return md5($text . rand());
 	}
 
-	private function create_full_match_pattern($text)
-	{
+	private function create_full_match_pattern($text) {

 		$pattern = '';
 		$pattern .= '@';
 		$pattern .= preg_quote($text, '@');
@@ -70,17 +67,16 @@ 
 		return $pattern;
 	}
 
-	private function strip_extra_tags()
-	{
+	private function strip_extra_tags() {

 		$this->content = strip_tags($this->content);
 	}
 
-	private function link_unlinked_urls($pattern, $replace)
-	{
+	private function link_unlinked_urls($pattern, $replace) {

 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{
@@ -92,13 +88,11 @@ 
 		}
 	}
 
-	private function add_line_breaks()
-	{
+	private function add_line_breaks() {

 		$this->content = preg_replace(self::$LINE_BREAK_PATTERN, self::$LINE_BREAK_REPLACE, $this->content);
 	}
 
-	private function replace_element_patterns()
-	{
+	private function replace_element_patterns() {

 		foreach($this->replacement_array as $key => $replace)
 		{
 			$this->content = str_replace($key, $replace, $this->content);

utility/content/FixInternalLinkContent.class.inc.php

Doc Comments +3 added lines

@@ -23,6 +23,9 @@
 		return;

 	}

 

+	/**
+	 * @param boolean $is_absolute
+	 */
 	private function get_link($string, $is_absolute, $anchor = '')

 	{

 		list($type, $uri) = explode('/', $string, 2);

Spacing +8 added lines, -8 removed lines

@@ -12,9 +12,9 @@ 
 	protected function execute($is_absolute = true)
 	{
 		preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
+		foreach ($matches[1] as $key => $match)
 		{
-			if(isset($matches[3][$key]))
+			if (isset($matches[3][$key]))
 				$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
 			else
 				$link_content = $this->get_link($match, $is_absolute);
@@ -29,19 +29,19 @@ 
 		
 		$link = '';
 		
-		switch($type)
+		switch ($type)
 		{
 			case 'blog' :
 				Loader::load('collector', 'blog/PostCollector');
 				$post = PostCollector::getPostByURI($uri);
 				
-				if($post === NULL)
+				if ($post === NULL)
 					return;
 				
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
 				$link .= "{$post->category}/{$post->path}/";
 				
-				if($anchor == '')
+				if ($anchor == '')
 					$anchor = $post->title;
 				
 				break;
@@ -49,7 +49,7 @@ 
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
 				$link .= "tag/{$uri}/";
 				
-				if($anchor == '')
+				if ($anchor == '')
 				{
 					$anchor = $uri;
 					$anchor = str_replace('-', ' ', $anchor);
@@ -61,13 +61,13 @@ 
 				Loader::load('collector', 'waterfall/LogCollector');
 				$log = LogCollector::getByAlias($uri);
 				
-				if($log === NULL)
+				if ($log === NULL)
 					return;
 				
 				$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
 				$link .= "journal/{$log->alias}/";
 				
-				if($anchor == '')
+				if ($anchor == '')
 					$anchor = $log->title;
 				
 				break;

Indentation +57 added lines, -57 removed lines

@@ -5,74 +5,74 @@ 
 final class FixInternalLinkContent extends Content
 {
 
-	private static $LINK_PLACEHOLDER_MATCH = '@{{link="([a-z0-9/-]*)"( anchor="([a-zA-Z0-9\s]*)")?}}@';
-	private static $ERROR_CONTENT = '<span>%s</span>';
-	private static $LINK_CONTENT = '<a href="%s" target="_blank" />%s</a>';
+    private static $LINK_PLACEHOLDER_MATCH = '@{{link="([a-z0-9/-]*)"( anchor="([a-zA-Z0-9\s]*)")?}}@';
+    private static $ERROR_CONTENT = '<span>%s</span>';
+    private static $LINK_CONTENT = '<a href="%s" target="_blank" />%s</a>';
 
-	protected function execute($is_absolute = true)
-	{
-		preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
-		{
-			if(isset($matches[3][$key]))
-				$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
-			else
-				$link_content = $this->get_link($match, $is_absolute);
-			$this->content = str_replace($matches[0][$key], $link_content, $this->content);
-		}
-		return;
-	}
+    protected function execute($is_absolute = true)
+    {
+        preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);
+        foreach($matches[1] as $key => $match)
+        {
+            if(isset($matches[3][$key]))
+                $link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
+            else
+                $link_content = $this->get_link($match, $is_absolute);
+            $this->content = str_replace($matches[0][$key], $link_content, $this->content);
+        }
+        return;
+    }
 
-	private function get_link($string, $is_absolute, $anchor = '')
-	{
-		list($type, $uri) = explode('/', $string, 2);
+    private function get_link($string, $is_absolute, $anchor = '')
+    {
+        list($type, $uri) = explode('/', $string, 2);
 		
-		$link = '';
+        $link = '';
 		
-		switch($type)
-		{
-			case 'blog' :
+        switch($type)
+        {
+            case 'blog' :
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $post = $repository->findPostByPath($uri);
 
-				if($post === NULL)
-					return;
+                if($post === NULL)
+                    return;
 				
-				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
-				$link .= "{$post['category']}/{$post['path']}/";
+                $link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
+                $link .= "{$post['category']}/{$post['path']}/";
 				
-				if($anchor == '')
-					$anchor = $post['title'];
+                if($anchor == '')
+                    $anchor = $post['title'];
 				
-				break;
-			case 'blog-tag' :
-				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
-				$link .= "tag/{$uri}/";
+                break;
+            case 'blog-tag' :
+                $link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
+                $link .= "tag/{$uri}/";
 				
-				if($anchor == '')
-				{
-					$anchor = $uri;
-					$anchor = str_replace('-', ' ', $anchor);
-					$anchor = ucwords($anchor);
-				}
+                if($anchor == '')
+                {
+                    $anchor = $uri;
+                    $anchor = str_replace('-', ' ', $anchor);
+                    $anchor = ucwords($anchor);
+                }
 				
-				break;
-			case 'journal' :
-				Loader::load('collector', 'waterfall/LogCollector');
-				$log = LogCollector::getByAlias($uri);
+                break;
+            case 'journal' :
+                Loader::load('collector', 'waterfall/LogCollector');
+                $log = LogCollector::getByAlias($uri);
 				
-				if($log === NULL)
-					return;
+                if($log === NULL)
+                    return;
 				
-				$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
-				$link .= "journal/{$log->alias}/";
+                $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
+                $link .= "journal/{$log->alias}/";
 				
-				if($anchor == '')
-					$anchor = $log->title;
+                if($anchor == '')
+                    $anchor = $log->title;
 				
-				break;
-			case 'falls' :
+                break;
+            case 'falls' :
                 $pieces = explode('/', $uri);
                 if (count($pieces) == 1) {
                     Loader::load('collector', 'waterfall/WatercourseCollector');
@@ -105,12 +105,12 @@ 
                         $anchor = $waterfall->name;
                     }
                 }
-				break;
-			default :
-				break;
-		}
+                break;
+            default :
+                break;
+        }
 		
-		return sprintf(self::$LINK_CONTENT, $link, $anchor);
-	}
+        return sprintf(self::$LINK_CONTENT, $link, $anchor);
+    }
 
 }

Braces +21 added lines, -18 removed lines

@@ -2,29 +2,28 @@ 
 
 Loader::load('utility', 'Content');
 
-final class FixInternalLinkContent extends Content
-{
+final class FixInternalLinkContent extends Content

+{

 
 	private static $LINK_PLACEHOLDER_MATCH = '@{{link="([a-z0-9/-]*)"( anchor="([a-zA-Z0-9\s]*)")?}}@';
 	private static $ERROR_CONTENT = '<span>%s</span>';
 	private static $LINK_CONTENT = '<a href="%s" target="_blank" />%s</a>';
 
-	protected function execute($is_absolute = true)
-	{
+	protected function execute($is_absolute = true) {

 		preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);
 		foreach($matches[1] as $key => $match)
 		{
-			if(isset($matches[3][$key]))
-				$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
-			else
-				$link_content = $this->get_link($match, $is_absolute);
+			if(isset($matches[3][$key])) {

+							$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);

+			} else {

+							$link_content = $this->get_link($match, $is_absolute);

+			}

 			$this->content = str_replace($matches[0][$key], $link_content, $this->content);
 		}
 		return;
 	}
 
-	private function get_link($string, $is_absolute, $anchor = '')
-	{
+	private function get_link($string, $is_absolute, $anchor = '') {

 		list($type, $uri) = explode('/', $string, 2);
 		
 		$link = '';
@@ -36,14 +35,16 @@ 
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $post = $repository->findPostByPath($uri);
 
-				if($post === NULL)
-					return;
+				if($post === NULL) {

+									return;

+				}

 				
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
 				$link .= "{$post['category']}/{$post['path']}/";
 				
-				if($anchor == '')
-					$anchor = $post['title'];
+				if($anchor == '') {

+									$anchor = $post['title'];

+				}

 				
 				break;
 			case 'blog-tag' :
@@ -62,14 +63,16 @@ 
 				Loader::load('collector', 'waterfall/LogCollector');
 				$log = LogCollector::getByAlias($uri);
 				
-				if($log === NULL)
-					return;
+				if($log === NULL) {

+									return;

+				}

 				
 				$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
 				$link .= "journal/{$log->alias}/";
 				
-				if($anchor == '')
-					$anchor = $log->title;
+				if($anchor == '') {

+									$anchor = $log->title;

+				}

 				
 				break;
 			case 'falls' :

src/Domain/Blog/Post/PostRepositoryInterface.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 interface PostRepository
 {
     public function findPostByPath($category, $path);
-    public function getActivePosts($limit = null, $offset= 0);
+    public function getActivePosts($limit = null, $offset = 0);
     public function getActivePostsCount();
     public function getActivePostsByTag($tag, $limit = null, $offset = 0);
     public function getActivePostsCountByTag($tag);

Braces +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 
 namespace Jacobemerick\Web\Domain\Blog\Post;
 
-interface PostRepositoryInterface
-{
+interface PostRepositoryInterface

+{

     public function findPostByPath($path);
     public function getActivePosts($limit = null, $offset= 0);
     public function getActivePostsCount();

router/BlogRouter.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -45,11 +45,11 @@ 
 
 	protected function check_for_special_redirect($uri)
 	{
-		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
+		if (preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
 		{
 			Loader::load('collector', 'blog/PostCollector');
 			$post = PostCollector::getPostByURI($matches[2]);
-			if(!$post)
+			if (!$post)
 			{
 				Loader::loadNew('controller', '/Error404Controller')
 					->activate();
@@ -61,21 +61,21 @@ 
 		else
 		{
 			$post_uri = URLDecode::getPiece(1);
-			if($post_uri !== null)
+			if ($post_uri !== null)
 			{
 				Loader::load('collector', 'blog/PostCollector');
 				$post = PostCollector::getPostByURI($post_uri);
 				
-				if($post != false)
+				if ($post != false)
 				{
 					Loader::load('utility', 'Content');
 					$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
 				}
 			}
 		}
-		if($uri == '/search/')
+		if ($uri == '/search/')
 		{
-			if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
+			if (Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
 			{
 				$uri .= Request::getGet('search');
 				$uri .= '/';

Indentation +105 added lines, -105 removed lines

@@ -5,121 +5,121 @@
 class BlogRouter extends Router
 {
 
-	protected function get_redirect_array()
-	{
-		return array(
-			(object) array(
-				'pattern' => '@^/page_([0-9]+)/$@',
-				'replace' => '/$1/'),
-			(object) array(
-				'pattern' => '@/index.(html|htm|php)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/([0-9]{4})-([a-z]+)/$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/([0-9]{4})-([a-z]+)/([0-9]+)/$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})(/?)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})/page_([0-9]+)(/?)$@',
-				'replace' => '/'),
-			(object) array(
-				'pattern' => '@^/category_([a-z-]+)(/?)$@',
-				'replace' => '/$1/'),
-			(object) array(
-				'pattern' => '@^/category_([a-z-]+)/page_([0-9]+)(/?)$@',
-				'replace' => '/$1/$2/'),
-			(object) array(
-				'pattern' => '@^/tag_([a-z-]+)(/?)$@',
-				'replace' => '/tag/$1/'),
-			(object) array(
-				'pattern' => '@^/tag_([a-z-]+)/page_([0-9]+)(/?)$@',
-				'replace' => '/tag/$1/$2/'),
-			(object) array(
-				'pattern' => '@^/blog/(.*)$@',
-				'replace' => '/$1'));
-	}
+    protected function get_redirect_array()
+    {
+        return array(
+            (object) array(
+                'pattern' => '@^/page_([0-9]+)/$@',
+                'replace' => '/$1/'),
+            (object) array(
+                'pattern' => '@/index.(html|htm|php)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/([0-9]{4})-([a-z]+)/$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/([0-9]{4})-([a-z]+)/([0-9]+)/$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})(/?)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/month_([a-z]{3,})_([0-9]{4})/page_([0-9]+)(/?)$@',
+                'replace' => '/'),
+            (object) array(
+                'pattern' => '@^/category_([a-z-]+)(/?)$@',
+                'replace' => '/$1/'),
+            (object) array(
+                'pattern' => '@^/category_([a-z-]+)/page_([0-9]+)(/?)$@',
+                'replace' => '/$1/$2/'),
+            (object) array(
+                'pattern' => '@^/tag_([a-z-]+)(/?)$@',
+                'replace' => '/tag/$1/'),
+            (object) array(
+                'pattern' => '@^/tag_([a-z-]+)/page_([0-9]+)(/?)$@',
+                'replace' => '/tag/$1/$2/'),
+            (object) array(
+                'pattern' => '@^/blog/(.*)$@',
+                'replace' => '/$1'));
+    }
 
-	protected function check_for_special_redirect($uri)
-	{
-		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
-		{
+    protected function check_for_special_redirect($uri)
+    {
+        if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
+        {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $post = $repository->findPostByPath($matches[2]);
 
-			if(!$post)
-			{
-				Loader::loadNew('controller', '/Error404Controller')
-					->activate();
-			}
+            if(!$post)
+            {
+                Loader::loadNew('controller', '/Error404Controller')
+                    ->activate();
+            }
 			
-			Loader::load('utility', 'Content');
-			$uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
-		}
-		else
-		{
-			$post_uri = URLDecode::getPiece(1);
-			if($post_uri !== null)
-			{
+            Loader::load('utility', 'Content');
+            $uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
+        }
+        else
+        {
+            $post_uri = URLDecode::getPiece(1);
+            if($post_uri !== null)
+            {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $post = $repository->findPostByPath($post_uri);
 
-				if($post != false)
-				{
-					Loader::load('utility', 'Content');
-					$uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
-				}
-			}
-		}
-		if($uri == '/search/')
-		{
-			if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
-			{
-				$uri .= Request::getGet('search');
-				$uri .= '/';
-			}
-		}
-		return $uri;
-	}
+                if($post != false)
+                {
+                    Loader::load('utility', 'Content');
+                    $uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
+                }
+            }
+        }
+        if($uri == '/search/')
+        {
+            if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
+            {
+                $uri .= Request::getGet('search');
+                $uri .= '/';
+            }
+        }
+        return $uri;
+    }
 
-	protected function get_direct_array()
-	{
-		return array(
-			(object) array(
-				'match' => '/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/([0-9]+)/',
-				'controller' => 'HomeController'),
-			(object) array(
-				'match' => '/about/',
-				'controller' => 'AboutController'),
-			(object) array(
-				'match' => '/(hiking|personal|web-development)/',
-				'controller' => 'CategoryController'),
-			(object) array(
-				'match' => '/(hiking|personal|web-development)/([0-9]+)/',
-				'controller' => 'CategoryController'),
-			(object) array(
-				'match' => '/tag/([a-z0-9-]+)/',
-				'controller' => 'TagController'),
-			(object) array(
-				'match' => '/tag/([a-z-]+)/([0-9]+)/',
-				'controller' => 'TagController'),
-			(object) array(
-				'match' => '/search/([a-z0-9-]+)/',
-				'controller' => 'SearchController'),
-			(object) array(
-				'match' => '/search/([a-z0-9-]+)/([0-9]+)/',
-				'controller' => 'SearchController'),
-			(object) array(
-				'match' => '/([a-z-]+)/([a-z0-9-]+)/',
-				'controller' => 'PostController'));
-	}
+    protected function get_direct_array()
+    {
+        return array(
+            (object) array(
+                'match' => '/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/([0-9]+)/',
+                'controller' => 'HomeController'),
+            (object) array(
+                'match' => '/about/',
+                'controller' => 'AboutController'),
+            (object) array(
+                'match' => '/(hiking|personal|web-development)/',
+                'controller' => 'CategoryController'),
+            (object) array(
+                'match' => '/(hiking|personal|web-development)/([0-9]+)/',
+                'controller' => 'CategoryController'),
+            (object) array(
+                'match' => '/tag/([a-z0-9-]+)/',
+                'controller' => 'TagController'),
+            (object) array(
+                'match' => '/tag/([a-z-]+)/([0-9]+)/',
+                'controller' => 'TagController'),
+            (object) array(
+                'match' => '/search/([a-z0-9-]+)/',
+                'controller' => 'SearchController'),
+            (object) array(
+                'match' => '/search/([a-z0-9-]+)/([0-9]+)/',
+                'controller' => 'SearchController'),
+            (object) array(
+                'match' => '/([a-z-]+)/([a-z0-9-]+)/',
+                'controller' => 'PostController'));
+    }
 
 }

Braces +6 added lines, -10 removed lines

@@ -2,11 +2,10 @@ 
 
 Loader::load('router', 'Router');
 
-class BlogRouter extends Router
-{
+class BlogRouter extends Router

+{

 
-	protected function get_redirect_array()
-	{
+	protected function get_redirect_array() {

 		return array(
 			(object) array(
 				'pattern' => '@^/page_([0-9]+)/$@',
@@ -43,8 +42,7 @@ 
 				'replace' => '/$1'));
 	}
 
-	protected function check_for_special_redirect($uri)
-	{
+	protected function check_for_special_redirect($uri) {

 		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
 		{
         global $container;
@@ -59,8 +57,7 @@ 
 			
 			Loader::load('utility', 'Content');
 			$uri = Content::instance('URLSafe', "/{$post['category']}/{$post['path']}/")->activate();
-		}
-		else
+		} else
 		{
 			$post_uri = URLDecode::getPiece(1);
 			if($post_uri !== null)
@@ -87,8 +84,7 @@ 
 		return $uri;
 	}
 
-	protected function get_direct_array()
-	{
+	protected function get_direct_array() {

 		return array(
 			(object) array(
 				'match' => '/',

controller/AJAXController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
 	protected function set_response($message, $type = 'internal')
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'internal' :
 				$this->response['internal'] = $message;

Indentation +45 added lines, -45 removed lines

@@ -1,60 +1,60 @@
 <?php
 
 Loader::load('utility', array(
-	'Header',
-	'Request'));
+    'Header',
+    'Request'));
 
 abstract class AJAXController
 {
 
-	private static $RESPONSE_HEADER = 'sendJSON';
+    private static $RESPONSE_HEADER = 'sendJSON';
 
-	private $response = array();
+    private $response = array();
 
-	abstract protected function set_data();
+    abstract protected function set_data();
 
-	function __construct() {}
+    function __construct() {}
 
-	public function activate()
-	{
-		call_user_func(array('Header', self::$RESPONSE_HEADER));
+    public function activate()
+    {
+        call_user_func(array('Header', self::$RESPONSE_HEADER));
 		
-		$this->set_data();
-		echo $this->response_as_json();
-	}
-
-	protected function set_response($message, $type = 'internal')
-	{
-		switch($type)
-		{
-			case 'internal' :
-				$this->response['internal'] = $message;
-			break;
-			case 'error' :
-				$this->response['error'] = $message;
-			default :
-				$this->response[$type] = $message;
-			break;
-		}
-	}
-
-	protected function fail_response($message)
-	{
-		$this->set_response($message, 'error');
-		return false;
-	}
-
-	protected function eject($message)
-	{
-		$this->fail_response($message);
-		echo $this->response_as_json();
-		exit();
-	}
-
-	private function response_as_json()
-	{
-		return json_encode($this->response);
-	}
+        $this->set_data();
+        echo $this->response_as_json();
+    }
+
+    protected function set_response($message, $type = 'internal')
+    {
+        switch($type)
+        {
+            case 'internal' :
+                $this->response['internal'] = $message;
+            break;
+            case 'error' :
+                $this->response['error'] = $message;
+            default :
+                $this->response[$type] = $message;
+            break;
+        }
+    }
+
+    protected function fail_response($message)
+    {
+        $this->set_response($message, 'error');
+        return false;
+    }
+
+    protected function eject($message)
+    {
+        $this->fail_response($message);
+        echo $this->response_as_json();
+        exit();
+    }
+
+    private function response_as_json()
+    {
+        return json_encode($this->response);
+    }
 
 }
 

Braces +7 added lines, -12 removed lines

@@ -4,8 +4,8 @@ 
 	'Header',
 	'Request'));
 
-abstract class AJAXController
-{
+abstract class AJAXController

+{

 
 	private static $RESPONSE_HEADER = 'sendJSON';
 
@@ -15,16 +15,14 @@ 
 
 	function __construct() {}
 
-	public function activate()
-	{
+	public function activate() {

 		call_user_func(array('Header', self::$RESPONSE_HEADER));
 		
 		$this->set_data();
 		echo $this->response_as_json();
 	}
 
-	protected function set_response($message, $type = 'internal')
-	{
+	protected function set_response($message, $type = 'internal') {

 		switch($type)
 		{
 			case 'internal' :
@@ -38,21 +36,18 @@ 
 		}
 	}
 
-	protected function fail_response($message)
-	{
+	protected function fail_response($message) {

 		$this->set_response($message, 'error');
 		return false;
 	}
 
-	protected function eject($message)
-	{
+	protected function eject($message) {

 		$this->fail_response($message);
 		echo $this->response_as_json();
 		exit();
 	}
 
-	private function response_as_json()
-	{
+	private function response_as_json() {

 		return json_encode($this->response);
 	}
 

controller/waterfalls/DefaultLogListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 		$companion_result = CompanionCollector::getCompanionList();
 		$companion_list = array();
 		
-		foreach($companion_result as $companion_row)
+		foreach ($companion_result as $companion_row)
 		{
 			$companion = new stdclass();
 			$companion->name = $companion_row->name;
@@ -55,7 +55,7 @@ 
 		$period_result = PeriodCollector::getPeriodList();
 		$period_list = array();
 		
-		foreach($period_result as $period_row)
+		foreach ($period_result as $period_row)
 		{
 			$period = new stdclass();
 			$period->name = $period_row->name;

Indentation +51 added lines, -51 removed lines

@@ -1,73 +1,73 @@
 <?
 
 Loader::load('collector', array(
-	'comment/CommentCollector',
-	'waterfall/CompanionCollector',
-	'waterfall/LogCollector',
-	'waterfall/PeriodCollector'));
+    'comment/CommentCollector',
+    'waterfall/CompanionCollector',
+    'waterfall/LogCollector',
+    'waterfall/PeriodCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
 abstract class DefaultLogListController extends DefaultListController
 {
 
-	private static $ITEM_COUNT_PER_PAGE = 10;
+    private static $ITEM_COUNT_PER_PAGE = 10;
 
-	final protected function get_list_view()
-	{
-		return 'LogListing';
-	}
+    final protected function get_list_view()
+    {
+        return 'LogListing';
+    }
 
-	final protected function get_item_count_per_page()
-	{
-		return self::$ITEM_COUNT_PER_PAGE;
-	}
+    final protected function get_item_count_per_page()
+    {
+        return self::$ITEM_COUNT_PER_PAGE;
+    }
 
-	final protected function format_item($item)
-	{
-		$item_array = array();
+    final protected function format_item($item)
+    {
+        $item_array = array();
 		
-		$item_array['title'] = $item->title;
-		$item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description);
-		$item_array['waterfall_list'] = LogCollector::getWaterfallListForLog($item->id);
-		$item_array['introduction'] = $item->introduction;
-		$item_array['path'] = "/journal/{$item->alias}/";
-		$item_array['comment_count'] = CommentCollector::getCommentCountForURL(self::$WATERFALL_SITE_ID, $item->alias);
-		$item_array['date'] = $this->get_parsed_date($item->date);
+        $item_array['title'] = $item->title;
+        $item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description);
+        $item_array['waterfall_list'] = LogCollector::getWaterfallListForLog($item->id);
+        $item_array['introduction'] = $item->introduction;
+        $item_array['path'] = "/journal/{$item->alias}/";
+        $item_array['comment_count'] = CommentCollector::getCommentCountForURL(self::$WATERFALL_SITE_ID, $item->alias);
+        $item_array['date'] = $this->get_parsed_date($item->date);
 		
-		return $item_array;
-	}
+        return $item_array;
+    }
 
-	final protected function get_sidebar()
-	{
-		$companion_result = CompanionCollector::getCompanionList();
-		$companion_list = array();
+    final protected function get_sidebar()
+    {
+        $companion_result = CompanionCollector::getCompanionList();
+        $companion_list = array();
 		
-		foreach($companion_result as $companion_row)
-		{
-			$companion = new stdclass();
-			$companion->name = $companion_row->name;
-			$companion->uri = "/companion/{$companion_row->alias}/";
-			$companion->count = $companion_row->count;
+        foreach($companion_result as $companion_row)
+        {
+            $companion = new stdclass();
+            $companion->name = $companion_row->name;
+            $companion->uri = "/companion/{$companion_row->alias}/";
+            $companion->count = $companion_row->count;
 			
-			$companion_list[] = $companion;
-		}
+            $companion_list[] = $companion;
+        }
 		
-		$period_result = PeriodCollector::getPeriodList();
-		$period_list = array();
+        $period_result = PeriodCollector::getPeriodList();
+        $period_list = array();
 		
-		foreach($period_result as $period_row)
-		{
-			$period = new stdclass();
-			$period->name = $period_row->name;
-			$period->uri = "/period/{$period_row->alias}/";
-			$period->count = $period_row->count;
+        foreach($period_result as $period_row)
+        {
+            $period = new stdclass();
+            $period->name = $period_row->name;
+            $period->uri = "/period/{$period_row->alias}/";
+            $period->count = $period_row->count;
 			
-			$period_list[] = $period;
-		}
+            $period_list[] = $period;
+        }
 		
-		return array(
-			'companion_list' => $companion_list,
-			'period_list' => $period_list);
-	}
+        return array(
+            'companion_list' => $companion_list,
+            'period_list' => $period_list);
+    }
 
 }
\ No newline at end of file

Braces +6 added lines, -10 removed lines

@@ -7,23 +7,20 @@ 
 	'waterfall/PeriodCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
-abstract class DefaultLogListController extends DefaultListController
-{
+abstract class DefaultLogListController extends DefaultListController

+{

 
 	private static $ITEM_COUNT_PER_PAGE = 10;
 
-	final protected function get_list_view()
-	{
+	final protected function get_list_view() {

 		return 'LogListing';
 	}
 
-	final protected function get_item_count_per_page()
-	{
+	final protected function get_item_count_per_page() {

 		return self::$ITEM_COUNT_PER_PAGE;
 	}
 
-	final protected function format_item($item)
-	{
+	final protected function format_item($item) {

 		$item_array = array();
 		
 		$item_array['title'] = $item->title;
@@ -37,8 +34,7 @@ 
 		return $item_array;
 	}
 
-	final protected function get_sidebar()
-	{
+	final protected function get_sidebar() {

 		$companion_result = CompanionCollector::getCompanionList();
 		$companion_list = array();
 		

controller/waterfalls/SearchListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}

Indentation +46 added lines, -46 removed lines

@@ -5,62 +5,62 @@
 final class SearchListController extends DefaultListController
 {
 
-	private static $TITLE = 'Search Listing';
-	private static $DESCRIPTION = '';
+    private static $TITLE = 'Search Listing';
+    private static $DESCRIPTION = '';
 
-	private static $KEYWORD_ARRAY = array();
+    private static $KEYWORD_ARRAY = array();
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		$this->set_title(self::$TITLE);
-		$this->set_description(self::$DESCRIPTION);
-		$this->set_keywords(self::$KEYWORD_ARRAY);
-	}
+        $this->set_title(self::$TITLE);
+        $this->set_description(self::$DESCRIPTION);
+        $this->set_keywords(self::$KEYWORD_ARRAY);
+    }
 
-	protected function get_introduction()
-	{
-		return;
-	}
+    protected function get_introduction()
+    {
+        return;
+    }
 
-	protected function get_page_number()
-	{
-		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
+    protected function get_page_number()
+    {
+        $page = URLDecode::getPiece(2);
+        if(isset($page) && is_numeric($page))
+            return $page;
+        return 1;
+    }
 
-	protected function get_items()
-	{
-		return array();
-	}
+    protected function get_items()
+    {
+        return array();
+    }
 
-	protected function get_list_description()
-	{
-		return 'yay cloud';
-	}
+    protected function get_list_description()
+    {
+        return 'yay cloud';
+    }
 
-	protected function get_list_next_link()
-	{
-		return '/';
-	}
+    protected function get_list_next_link()
+    {
+        return '/';
+    }
 
-	protected function get_list_prev_link()
-	{
-		return '/';
-	}
+    protected function get_list_prev_link()
+    {
+        return '/';
+    }
 
-	private $total_post_count;
-	protected function get_item_count()
-	{
-		return 20;
-	}
+    private $total_post_count;
+    protected function get_item_count()
+    {
+        return 20;
+    }
 
-	protected function get_item_count_per_page()
-	{
-		return 20;
-	}
+    protected function get_item_count_per_page()
+    {
+        return 20;
+    }
 
 }
\ No newline at end of file

Braces +14 added lines, -22 removed lines

@@ -2,16 +2,15 @@ 
 
 Loader::load('controller', 'waterfalls/DefaultListController');
 
-final class SearchListController extends DefaultListController
-{
+final class SearchListController extends DefaultListController

+{

 
 	private static $TITLE = 'Search Listing';
 	private static $DESCRIPTION = '';
 
 	private static $KEYWORD_ARRAY = array();
 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		parent::set_head_data();
 		
 		$this->set_title(self::$TITLE);
@@ -19,47 +18,40 @@ 
 		$this->set_keywords(self::$KEYWORD_ARRAY);
 	}
 
-	protected function get_introduction()
-	{
+	protected function get_introduction() {

 		return;
 	}
 
-	protected function get_page_number()
-	{
+	protected function get_page_number() {

 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
-	protected function get_items()
-	{
+	protected function get_items() {

 		return array();
 	}
 
-	protected function get_list_description()
-	{
+	protected function get_list_description() {

 		return 'yay cloud';
 	}
 
-	protected function get_list_next_link()
-	{
+	protected function get_list_next_link() {

 		return '/';
 	}
 
-	protected function get_list_prev_link()
-	{
+	protected function get_list_prev_link() {

 		return '/';
 	}
 
 	private $total_post_count;
-	protected function get_item_count()
-	{
+	protected function get_item_count() {

 		return 20;
 	}
 
-	protected function get_item_count_per_page()
-	{
+	protected function get_item_count_per_page() {

 		return 20;
 	}
 

controller/waterfalls/DefaultWaterfallListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 		$county_result = CountyCollector::getCountyList();
 		$county_list = array();
 		
-		foreach($county_result as $county_row)
+		foreach ($county_result as $county_row)
 		{
 			$county = new stdclass();
 			$county->name = $county_row->name;
@@ -54,7 +54,7 @@ 
 		$watercourse_result = WatercourseCollector::getWatercourseList();
 		$watercourse_list = array();
 		
-		foreach($watercourse_result as $watercourse_row)
+		foreach ($watercourse_result as $watercourse_row)
 		{
 			$watercourse = new stdclass();
 			$watercourse->name = $watercourse_row->name;

Indentation +50 added lines, -50 removed lines

@@ -1,72 +1,72 @@
 <?
 
 Loader::load('collector', array(
-	'comment/CommentCollector',
-	'waterfall/CountyCollector',
-	'waterfall/WatercourseCollector',
-	'waterfall/WaterfallCollector'));
+    'comment/CommentCollector',
+    'waterfall/CountyCollector',
+    'waterfall/WatercourseCollector',
+    'waterfall/WaterfallCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
 abstract class DefaultWaterfallListController extends DefaultListController
 {
 
-	protected static $ITEM_COUNT_PER_PAGE = 24;
+    protected static $ITEM_COUNT_PER_PAGE = 24;
 
-	final protected function get_list_view()
-	{
-		return 'FallListing';
-	}
+    final protected function get_list_view()
+    {
+        return 'FallListing';
+    }
 
-	protected function get_item_count_per_page()
-	{
-		return self::$ITEM_COUNT_PER_PAGE;
-	}
+    protected function get_item_count_per_page()
+    {
+        return self::$ITEM_COUNT_PER_PAGE;
+    }
 
-	final protected function format_item($item)
-	{
-		$item_array = array();
+    final protected function format_item($item)
+    {
+        $item_array = array();
 		
-		$item_array['name'] = $item->name;
-		$item_array['watercourse'] = $item->watercourse;
-		$item_array['county'] = $item->county;
-		$item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description, 'medium');
-		$item_array['path'] = "/{$item->watercourse_alias}/{$item->waterfall_alias}/";
-		$item_array['comment_count'] = CommentCollector::getCommentCountForURL(self::$WATERFALL_SITE_ID, "/{$item->watercourse_alias}/{$item->waterfall_alias}/");
+        $item_array['name'] = $item->name;
+        $item_array['watercourse'] = $item->watercourse;
+        $item_array['county'] = $item->county;
+        $item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description, 'medium');
+        $item_array['path'] = "/{$item->watercourse_alias}/{$item->waterfall_alias}/";
+        $item_array['comment_count'] = CommentCollector::getCommentCountForURL(self::$WATERFALL_SITE_ID, "/{$item->watercourse_alias}/{$item->waterfall_alias}/");
 		
-		return $item_array;
-	}
+        return $item_array;
+    }
 
-	final protected function get_sidebar()
-	{
-		$county_result = CountyCollector::getCountyList();
-		$county_list = array();
+    final protected function get_sidebar()
+    {
+        $county_result = CountyCollector::getCountyList();
+        $county_list = array();
 		
-		foreach($county_result as $county_row)
-		{
-			$county = new stdclass();
-			$county->name = $county_row->name;
-			$county->uri = "/{$county_row->alias}/";
-			$county->count = $county_row->count;
+        foreach($county_result as $county_row)
+        {
+            $county = new stdclass();
+            $county->name = $county_row->name;
+            $county->uri = "/{$county_row->alias}/";
+            $county->count = $county_row->count;
 			
-			$county_list[] = $county;
-		}
+            $county_list[] = $county;
+        }
 		
-		$watercourse_result = WatercourseCollector::getWatercourseList();
-		$watercourse_list = array();
+        $watercourse_result = WatercourseCollector::getWatercourseList();
+        $watercourse_list = array();
 		
-		foreach($watercourse_result as $watercourse_row)
-		{
-			$watercourse = new stdclass();
-			$watercourse->name = $watercourse_row->name;
-			$watercourse->uri = "/{$watercourse_row->alias}/";
-			$watercourse->count = $watercourse_row->count;
+        foreach($watercourse_result as $watercourse_row)
+        {
+            $watercourse = new stdclass();
+            $watercourse->name = $watercourse_row->name;
+            $watercourse->uri = "/{$watercourse_row->alias}/";
+            $watercourse->count = $watercourse_row->count;
 			
-			$watercourse_list[] = $watercourse;
-		}
+            $watercourse_list[] = $watercourse;
+        }
 		
-		return array(
-			'county_list' => $county_list,
-			'watercourse_list' => $watercourse_list);
-	}
+        return array(
+            'county_list' => $county_list,
+            'watercourse_list' => $watercourse_list);
+    }
 
 }
\ No newline at end of file

Braces +6 added lines, -10 removed lines

@@ -7,23 +7,20 @@ 
 	'waterfall/WaterfallCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
-abstract class DefaultWaterfallListController extends DefaultListController
-{
+abstract class DefaultWaterfallListController extends DefaultListController

+{

 
 	protected static $ITEM_COUNT_PER_PAGE = 24;
 
-	final protected function get_list_view()
-	{
+	final protected function get_list_view() {

 		return 'FallListing';
 	}
 
-	protected function get_item_count_per_page()
-	{
+	protected function get_item_count_per_page() {

 		return self::$ITEM_COUNT_PER_PAGE;
 	}
 
-	final protected function format_item($item)
-	{
+	final protected function format_item($item) {

 		$item_array = array();
 		
 		$item_array['name'] = $item->name;
@@ -36,8 +33,7 @@ 
 		return $item_array;
 	}
 
-	final protected function get_sidebar()
-	{
+	final protected function get_sidebar() {

 		$county_result = CountyCollector::getCountyList();
 		$county_list = array();
 		

controller/blog/AboutController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 		Loader::load('collector', 'blog/IntroductionCollector');
 		$introduction_result = IntroductionCollector::getRow('about');
 		
-		if($introduction_result !== null)
+		if ($introduction_result !== null)
 		{
 			$introduction = array();
 			$introduction['title'] = $introduction_result->title;

Indentation +33 added lines, -33 removed lines

@@ -5,47 +5,47 @@
 final class AboutController extends DefaultPageController
 {
 
-	private static $TITLE = 'About the Blog | Jacob Emerick';
-	private static $DESCRIPTION = "A little bit about the awesomeness on Jacob Emerick's Blog, diving into the topics covered, technology used, and methodology of writing new posts.";
-
-	private static $KEYWORD_ARRAY = array(
-		'about',
-		'technologies',
-		'background',
-		'blog',
-		'Jacob Emerick');
-
-	protected function set_head_data()
-	{
-		$this->set_title(self::$TITLE);
-		$this->set_description(self::$DESCRIPTION);
-		$this->set_keywords(self::$KEYWORD_ARRAY);
+    private static $TITLE = 'About the Blog | Jacob Emerick';
+    private static $DESCRIPTION = "A little bit about the awesomeness on Jacob Emerick's Blog, diving into the topics covered, technology used, and methodology of writing new posts.";
+
+    private static $KEYWORD_ARRAY = array(
+        'about',
+        'technologies',
+        'background',
+        'blog',
+        'Jacob Emerick');
+
+    protected function set_head_data()
+    {
+        $this->set_title(self::$TITLE);
+        $this->set_description(self::$DESCRIPTION);
+        $this->set_keywords(self::$KEYWORD_ARRAY);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('view', 'About');
+    protected function set_body_data()
+    {
+        $this->set_body('view', 'About');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
-	protected function get_introduction()
-	{
+    protected function get_introduction()
+    {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
         $introduction_result = $repository->findByType('about');
 		
-		if($introduction_result !== null)
-		{
-			$introduction = array();
-			$introduction['title'] = $introduction_result['title'];
-			$introduction['content'] = $introduction_result['content'];
-			$introduction['image'] = $this->get_introduction_image($introduction_result['image']);
+        if($introduction_result !== null)
+        {
+            $introduction = array();
+            $introduction['title'] = $introduction_result['title'];
+            $introduction['content'] = $introduction_result['content'];
+            $introduction['image'] = $this->get_introduction_image($introduction_result['image']);
 			
-			return $introduction;
-		}
-	}
+            return $introduction;
+        }
+    }
 
 }

Braces +5 added lines, -8 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', 'blog/DefaultPageController');
 
-final class AboutController extends DefaultPageController
-{
+final class AboutController extends DefaultPageController

+{

 
 	private static $TITLE = 'About the Blog | Jacob Emerick';
 	private static $DESCRIPTION = "A little bit about the awesomeness on Jacob Emerick's Blog, diving into the topics covered, technology used, and methodology of writing new posts.";
@@ -15,8 +15,7 @@ 
 		'blog',
 		'Jacob Emerick');
 
-	protected function set_head_data()
-	{
+	protected function set_head_data() {

 		$this->set_title(self::$TITLE);
 		$this->set_description(self::$DESCRIPTION);
 		$this->set_keywords(self::$KEYWORD_ARRAY);
@@ -24,15 +23,13 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data() {

 		$this->set_body('view', 'About');
 		
 		parent::set_body_data();
 	}
 
-	protected function get_introduction()
-	{
+	protected function get_introduction() {

         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
         $introduction_result = $repository->findByType('about');