jacobemerick / web

controller/blog/PostController.class.inc.php

Spacing +14 added lines, -14 removed lines

@@ -27,13 +27,13 @@ 
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $this->post = $repository->findPostByPath(URLDecode::getPiece(2));
 
-		if($this->post == null)
+		if ($this->post == null)
 			$this->eject();
 		
 		$this->handle_comment_submit(
 			self::$BLOG_SITE_ID,
 			$this->post['path'],
-			Loader::getRootUrl('blog') . $this->post['category'] . '/' . $this->post['path'] . '/',
+			Loader::getRootUrl('blog').$this->post['category'].'/'.$this->post['path'].'/',
 			$this->post['title']);
 
         global $container;
@@ -58,7 +58,7 @@ 
 			$log_id = self::$DEPRECATED_BLOGS[$this->post['id']];
 			$log = LogCollector::getById($log_id);
 			if (!empty($log)) {
-				$log_url = Loader::getRootUrl('waterfalls') . "journal/{$log->alias}/";
+				$log_url = Loader::getRootUrl('waterfalls')."journal/{$log->alias}/";
 				$this->set_canonical($log_url);
 			}
 		}
@@ -95,7 +95,7 @@ 
 		$keyword_array = array();
 		$keywords = $this->tags;
 		
-		foreach($keywords as $keyword)
+		foreach ($keywords as $keyword)
 		{
 			$keyword_array[] = $keyword['tag'];
 		}
@@ -109,16 +109,16 @@ 
 	private function get_series_posts()
 	{
 		$series_posts = $this->fetch_series_posts();
-		if(count($series_posts) < 1)
+		if (count($series_posts) < 1)
 			return array();
 		
 		$previous_post = new stdclass();
 		$next_post = new stdclass();
 		
 		$found_current_post = false;
-		foreach($series_posts as $post_row)
+		foreach ($series_posts as $post_row)
 		{
-			if($post_row['post'] == $this->post['id'])
+			if ($post_row['post'] == $this->post['id'])
 			{
 				$found_current_post = true;
 				continue;
@@ -146,9 +146,9 @@ 
 				$post->title = $post_row['title'];
 			}
 
-			$post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
+			$post->url = Loader::getRootUrl('blog')."{$post_row['category']}/{$post_row['path']}/";
 			
-			if(!$found_current_post)
+			if (!$found_current_post)
 				$previous_post = $post;
 			else
 			{
@@ -167,7 +167,7 @@ 
 	private $series_posts;
 	private function fetch_series_posts()
 	{
-      if(!isset($this->series_posts)) {
+      if (!isset($this->series_posts)) {
           global $container;
           $repository = new Jacobemerick\Web\Domain\Blog\Series\MysqlSeriesRepository($container['db_connection_locator']);
           $this->series_posts = $repository->getSeriesForPost($this->post['id']);
@@ -178,14 +178,14 @@ 
 	private function get_related_posts()
 	{
 		$tag_array = array();
-		foreach($this->tags as $tag)
+		foreach ($this->tags as $tag)
 		{
 			$tag_array[] = $tag['id'];
 		}
 		
 		$series_posts = $this->fetch_series_posts();
 		$exclude_post_array = array();
-		foreach($series_posts as $series_post)
+		foreach ($series_posts as $series_post)
 		{
 			$exclude_post_array[] = $series_post['post'];
 		}
@@ -196,11 +196,11 @@ 
 
         $post_array = array();
 		
-		foreach($post_result as $post_row)
+		foreach ($post_result as $post_row)
 		{
 			$post = new stdclass();
 			$post->title = $post_row['title'];
-			$post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
+			$post->url = Loader::getRootUrl('blog')."{$post_row['category']}/{$post_row['path']}/";
 			$post->category = ucwords(str_replace('-', ' ', $post_row['category']));
 			$post->thumb = Content::instance('FetchFirstPhoto', $post_row['body'])->activate();
 			$post->body = Content::instance('SmartTrim', $post_row['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);

Indentation +155 added lines, -155 removed lines

@@ -6,194 +6,194 @@ 
 final class PostController extends DefaultPageController
 {
 
-	private static $PAGE_DESCRIPTION_LIMIT = 250;
+    private static $PAGE_DESCRIPTION_LIMIT = 250;
 
-	private static $TITLE = "%s | Jacob Emerick's Blog";
-	private static $AUTHOR = 'Jacob Emerick';
-	private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
+    private static $TITLE = "%s | Jacob Emerick's Blog";
+    private static $AUTHOR = 'Jacob Emerick';
+    private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
 
-	private static $POST_LENGTH_SHORT = 100;
-	private static $POST_LENGTH_LONG = 140;
+    private static $POST_LENGTH_SHORT = 100;
+    private static $POST_LENGTH_LONG = 140;
 
-	private $post;
-	private $tags;
-	private $comment_errors = array();
+    private $post;
+    private $tags;
+    private $comment_errors = array();
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 		
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $this->post = $repository->findPostByPath(URLDecode::getPiece(2));
 
-		if($this->post == null)
-			$this->eject();
+        if($this->post == null)
+            $this->eject();
 		
-		$this->handle_comment_submit(
-			self::$BLOG_SITE_ID,
-			$this->post['path'],
-			Loader::getRootUrl('blog') . $this->post['category'] . '/' . $this->post['path'] . '/',
-			$this->post['title']);
+        $this->handle_comment_submit(
+            self::$BLOG_SITE_ID,
+            $this->post['path'],
+            Loader::getRootUrl('blog') . $this->post['category'] . '/' . $this->post['path'] . '/',
+            $this->post['title']);
 
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $this->tags = $repository->getTagsForPost($this->post['id']);
-	}
+    }
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		$this->set_title(sprintf(self::$TITLE, $this->post['title']));
-		$this->set_description($this->get_post_description());
-		$this->set_keywords($this->get_post_keywords());
-		$this->set_author(self::$AUTHOR);
+        $this->set_title(sprintf(self::$TITLE, $this->post['title']));
+        $this->set_description($this->get_post_description());
+        $this->set_keywords($this->get_post_keywords());
+        $this->set_author(self::$AUTHOR);
 
     $photo = Content::instance('FetchFirstPhoto', $this->post['body'])->activate(true);
     $photo = preg_match('/^<img src="([a-z-:\.\/]+)" [^>]+>$/', $photo, $matches);
     $this->set_head('thumbnail', $matches[1]);
 
-		if (array_key_exists($this->post['id'], self::$DEPRECATED_BLOGS)) {
-			$log_id = self::$DEPRECATED_BLOGS[$this->post['id']];
-			$log = LogCollector::getById($log_id);
-			if (!empty($log)) {
-				$log_url = Loader::getRootUrl('waterfalls') . "journal/{$log->alias}/";
-				$this->set_canonical($log_url);
-			}
-		}
-	}
-
-	protected function get_introduction() {}
-
-	protected function set_body_data()
-	{
-		parent::set_body_data();
+        if (array_key_exists($this->post['id'], self::$DEPRECATED_BLOGS)) {
+            $log_id = self::$DEPRECATED_BLOGS[$this->post['id']];
+            $log = LogCollector::getById($log_id);
+            if (!empty($log)) {
+                $log_url = Loader::getRootUrl('waterfalls') . "journal/{$log->alias}/";
+                $this->set_canonical($log_url);
+            }
+        }
+    }
+
+    protected function get_introduction() {}
+
+    protected function set_body_data()
+    {
+        parent::set_body_data();
 		
-		$this->set_body('title', $this->post['title']);
-		$this->set_body('view', 'Post');
-		$this->set_body('data', array(
-			'post' => $this->format_post($this->post, false),
-			'series_posts' => $this->get_series_posts(),
-			'related_posts' => $this->get_related_posts(),
-			'author' => self::$AUTHOR,
-			'author_url' => self::$AUTHOR_URL,
-      'comment_array' => $this->get_comment_array(
-          'blog.jacobemerick.com',
-          "{$this->post['category']}/{$this->post['path']}"
-      ),
+        $this->set_body('title', $this->post['title']);
+        $this->set_body('view', 'Post');
+        $this->set_body('data', array(
+            'post' => $this->format_post($this->post, false),
+            'series_posts' => $this->get_series_posts(),
+            'related_posts' => $this->get_related_posts(),
+            'author' => self::$AUTHOR,
+            'author_url' => self::$AUTHOR_URL,
+        'comment_array' => $this->get_comment_array(
+            'blog.jacobemerick.com',
+            "{$this->post['category']}/{$this->post['path']}"
+        ),
     ));
-	}
+    }
 
-	protected function get_post_description()
-	{
-		$description = $this->post['body'];
-		$description = strip_tags($description);
-		$description = Content::instance('SmartTrim', $description)->activate(self::$PAGE_DESCRIPTION_LIMIT);
+    protected function get_post_description()
+    {
+        $description = $this->post['body'];
+        $description = strip_tags($description);
+        $description = Content::instance('SmartTrim', $description)->activate(self::$PAGE_DESCRIPTION_LIMIT);
 		
-		return $description;
-	}
+        return $description;
+    }
 
-	protected function get_post_keywords()
-	{
-		$keyword_array = array();
-		$keywords = $this->tags;
+    protected function get_post_keywords()
+    {
+        $keyword_array = array();
+        $keywords = $this->tags;
 		
-		foreach($keywords as $keyword)
-		{
-			$keyword_array[] = $keyword['tag'];
-		}
+        foreach($keywords as $keyword)
+        {
+            $keyword_array[] = $keyword['tag'];
+        }
 		
-		$keyword_array[] = 'blog';
-		$keyword_array[] = 'Jacob Emerick';
+        $keyword_array[] = 'blog';
+        $keyword_array[] = 'Jacob Emerick';
 		
-		return $keyword_array;
-	}
-
-	private function get_series_posts()
-	{
-		$series_posts = $this->fetch_series_posts();
-		if(count($series_posts) < 1)
-			return array();
+        return $keyword_array;
+    }
+
+    private function get_series_posts()
+    {
+        $series_posts = $this->fetch_series_posts();
+        if(count($series_posts) < 1)
+            return array();
 		
-		$previous_post = new stdclass();
-		$next_post = new stdclass();
+        $previous_post = new stdclass();
+        $next_post = new stdclass();
 		
-		$found_current_post = false;
-		foreach($series_posts as $post_row)
-		{
-			if($post_row['post'] == $this->post['id'])
-			{
-				$found_current_post = true;
-				continue;
-			}
+        $found_current_post = false;
+        foreach($series_posts as $post_row)
+        {
+            if($post_row['post'] == $this->post['id'])
+            {
+                $found_current_post = true;
+                continue;
+            }
 			
-			$post = new stdclass();
+            $post = new stdclass();
 
-      if (
+        if (
         strpos($post_row['title'], 'Rainy Supe Loop') === 0 ||
         strpos($post_row['title'], 'Malapais Loop') === 0 ||
         strpos($post_row['title'], 'Mazatzal Peak Loop') === 0 ||
         strpos($post_row['title'], 'Dripping Springs Loop') === 0
-      ) {
+        ) {
         $title = $post_row['title'];
         $title = explode(':', $title);
         $title = array_pop($title);
         $title = trim($title);
         $post->title = $title;
-      } else if (strpos($post_row['title'], 'Isle Royale') === 0) {
-				$title = $post_row['title'];
-				$title = explode(',', $title);
-				$title = array_pop($title);
-				$title = trim($title);
-				$post->title = $title;
-			} else {
-				$post->title = $post_row['title'];
-			}
-
-			$post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
+        } else if (strpos($post_row['title'], 'Isle Royale') === 0) {
+                $title = $post_row['title'];
+                $title = explode(',', $title);
+                $title = array_pop($title);
+                $title = trim($title);
+                $post->title = $title;
+            } else {
+                $post->title = $post_row['title'];
+            }
+
+            $post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
 			
-			if(!$found_current_post)
-				$previous_post = $post;
-			else
-			{
-				$next_post = $post;
-				break;
-			}
-		}
+            if(!$found_current_post)
+                $previous_post = $post;
+            else
+            {
+                $next_post = $post;
+                break;
+            }
+        }
 		
-		return array(
-			'title' => $post_row['series_title'],
-			'description' => Content::instance('FixInternalLink', $post_row['series_description'])->activate(),
-			'previous' => $previous_post,
-			'next' => $next_post);
-	}
-
-	private $series_posts;
-	private function fetch_series_posts()
-	{
-      if(!isset($this->series_posts)) {
-          global $container;
-          $repository = new Jacobemerick\Web\Domain\Blog\Series\MysqlSeriesRepository($container['db_connection_locator']);
-          $this->series_posts = $repository->getSeriesForPost($this->post['id']);
-      }
-      return $this->series_posts;
-	}
-
-	private function get_related_posts()
-	{
-		$tag_array = array();
-		foreach($this->tags as $tag)
-		{
-			$tag_array[] = $tag['id'];
-		}
+        return array(
+            'title' => $post_row['series_title'],
+            'description' => Content::instance('FixInternalLink', $post_row['series_description'])->activate(),
+            'previous' => $previous_post,
+            'next' => $next_post);
+    }
+
+    private $series_posts;
+    private function fetch_series_posts()
+    {
+        if(!isset($this->series_posts)) {
+            global $container;
+            $repository = new Jacobemerick\Web\Domain\Blog\Series\MysqlSeriesRepository($container['db_connection_locator']);
+            $this->series_posts = $repository->getSeriesForPost($this->post['id']);
+        }
+        return $this->series_posts;
+    }
+
+    private function get_related_posts()
+    {
+        $tag_array = array();
+        foreach($this->tags as $tag)
+        {
+            $tag_array[] = $tag['id'];
+        }
 		
-		$series_posts = $this->fetch_series_posts();
-		$exclude_post_array = array();
-		foreach($series_posts as $series_post)
-		{
-			$exclude_post_array[] = $series_post['post'];
-		}
+        $series_posts = $this->fetch_series_posts();
+        $exclude_post_array = array();
+        foreach($series_posts as $series_post)
+        {
+            $exclude_post_array[] = $series_post['post'];
+        }
 
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
@@ -201,18 +201,18 @@ 
 
         $post_array = array();
 		
-		foreach($post_result as $post_row)
-		{
-			$post = new stdclass();
-			$post->title = $post_row['title'];
-			$post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
-			$post->category = ucwords(str_replace('-', ' ', $post_row['category']));
-			$post->thumb = Content::instance('FetchFirstPhoto', $post_row['body'])->activate();
-			$post->body = Content::instance('SmartTrim', $post_row['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);
+        foreach($post_result as $post_row)
+        {
+            $post = new stdclass();
+            $post->title = $post_row['title'];
+            $post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
+            $post->category = ucwords(str_replace('-', ' ', $post_row['category']));
+            $post->thumb = Content::instance('FetchFirstPhoto', $post_row['body'])->activate();
+            $post->body = Content::instance('SmartTrim', $post_row['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);
 			
-			$post_array[] = $post;
-		}
+            $post_array[] = $post;
+        }
 		
-		return $post_array;
-	}
+        return $post_array;
+    }
 }

Braces +30 added lines, -26 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('collector', 'waterfall/LogCollector');
 Loader::load('controller', 'blog/DefaultPageController');
 
-final class PostController extends DefaultPageController
-{
+final class PostController extends DefaultPageController

+{

 
 	private static $PAGE_DESCRIPTION_LIMIT = 250;
 
@@ -19,16 +19,17 @@ 
 	private $tags;
 	private $comment_errors = array();
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		parent::__construct();
 		
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $this->post = $repository->findPostByPath(URLDecode::getPiece(2));
 
-		if($this->post == null)
-			$this->eject();
+		if($this->post == null) {

+					$this->eject();

+		}

 		
 		$this->handle_comment_submit(
 			self::$BLOG_SITE_ID,
@@ -41,8 +42,8 @@ 
         $this->tags = $repository->getTagsForPost($this->post['id']);
 	}
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
 		$this->set_title(sprintf(self::$TITLE, $this->post['title']));
@@ -64,10 +65,12 @@ 
 		}
 	}
 
-	protected function get_introduction() {}
+	protected function get_introduction()

+	{

+}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		parent::set_body_data();
 		
 		$this->set_body('title', $this->post['title']);
@@ -85,8 +88,8 @@ 
     ));
 	}
 
-	protected function get_post_description()
-	{
+	protected function get_post_description()

+	{

 		$description = $this->post['body'];
 		$description = strip_tags($description);
 		$description = Content::instance('SmartTrim', $description)->activate(self::$PAGE_DESCRIPTION_LIMIT);
@@ -94,8 +97,8 @@ 
 		return $description;
 	}
 
-	protected function get_post_keywords()
-	{
+	protected function get_post_keywords()

+	{

 		$keyword_array = array();
 		$keywords = $this->tags;
 		
@@ -110,11 +113,12 @@ 
 		return $keyword_array;
 	}
 
-	private function get_series_posts()
-	{
+	private function get_series_posts()

+	{

 		$series_posts = $this->fetch_series_posts();
-		if(count($series_posts) < 1)
-			return array();
+		if(count($series_posts) < 1) {

+					return array();

+		}

 		
 		$previous_post = new stdclass();
 		$next_post = new stdclass();
@@ -153,9 +157,9 @@ 
 
 			$post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
 			
-			if(!$found_current_post)
-				$previous_post = $post;
-			else
+			if(!$found_current_post) {

+							$previous_post = $post;

+			} else
 			{
 				$next_post = $post;
 				break;
@@ -170,8 +174,8 @@ 
 	}
 
 	private $series_posts;
-	private function fetch_series_posts()
-	{
+	private function fetch_series_posts()

+	{

       if(!isset($this->series_posts)) {
           global $container;
           $repository = new Jacobemerick\Web\Domain\Blog\Series\MysqlSeriesRepository($container['db_connection_locator']);
@@ -180,8 +184,8 @@ 
       return $this->series_posts;
 	}
 
-	private function get_related_posts()
-	{
+	private function get_related_posts()

+	{

 		$tag_array = array();
 		foreach($this->tags as $tag)
 		{

controller/blog/HomeController.class.inc.php

Spacing +10 added lines, -10 removed lines

@@ -32,12 +32,12 @@ 
 	{
 		parent::set_head_data();
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 			$this->set_title(self::$TITLE_MAIN);
 		else
 			$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 			$this->set_description(self::$DESCRIPTION_MAIN);
 		else
 			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
@@ -47,7 +47,7 @@ 
 
 	protected function get_introduction()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 		{
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
@@ -68,7 +68,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(1);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -90,24 +90,24 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return '/';
-		return '/' . ($this->page - 1) . '/';
+		return '/'.($this->page - 1).'/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
-		return '/' . ($this->page + 1) . '/';
+		return '/'.($this->page + 1).'/';
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-      if(!isset($this->total_post_count)) {
+      if (!isset($this->total_post_count)) {
           global $container;
           $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
           $this->total_post_count = $repository->getActivePostsCount();

Indentation +95 added lines, -95 removed lines

@@ -5,115 +5,115 @@
 final class HomeController extends DefaultListController
 {
 
-	private static $TITLE_MAIN = "Jacob Emerick's Blog | Posts on Hiking, Web Development, and more";
-	private static $TITLE_PAGINATED = "Page %d of %d in Jacob Emerick's Blog";
-
-	private static $DESCRIPTION_MAIN = "Jacob Emerick's Blog - a collection of posts about hiking the Upper Peninsula, learning to be a web developer, and other experiences of a young man.";
-	private static $DESCRIPTION_PAGINATED = "Page %d of %d of posts about hiking in the Upper Peninsula, learning to be a web developer, and more on Jacob Emerick's Blog.";
-
-	private static $KEYWORD_ARRAY = array(
-		'blog',
-		'Jacob Emerick',
-		'hiking',
-		'Huron Mountains',
-		'Peshekee Highlands',
-		'Keweenaw',
-		'Michigan',
-		'Upper Peninsula',
-		'leadership',
-		'web development',
-		'php programming',
-		'data handling',
-		'optimization');
-
-	private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d total posts.';
-
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    private static $TITLE_MAIN = "Jacob Emerick's Blog | Posts on Hiking, Web Development, and more";
+    private static $TITLE_PAGINATED = "Page %d of %d in Jacob Emerick's Blog";
+
+    private static $DESCRIPTION_MAIN = "Jacob Emerick's Blog - a collection of posts about hiking the Upper Peninsula, learning to be a web developer, and other experiences of a young man.";
+    private static $DESCRIPTION_PAGINATED = "Page %d of %d of posts about hiking in the Upper Peninsula, learning to be a web developer, and more on Jacob Emerick's Blog.";
+
+    private static $KEYWORD_ARRAY = array(
+        'blog',
+        'Jacob Emerick',
+        'hiking',
+        'Huron Mountains',
+        'Peshekee Highlands',
+        'Keweenaw',
+        'Michigan',
+        'Upper Peninsula',
+        'leadership',
+        'web development',
+        'php programming',
+        'data handling',
+        'optimization');
+
+    private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d total posts.';
+
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		if($this->page == 1)
-			$this->set_title(self::$TITLE_MAIN);
-		else
-			$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
+        if($this->page == 1)
+            $this->set_title(self::$TITLE_MAIN);
+        else
+            $this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
 		
-		if($this->page == 1)
-			$this->set_description(self::$DESCRIPTION_MAIN);
-		else
-			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
+        if($this->page == 1)
+            $this->set_description(self::$DESCRIPTION_MAIN);
+        else
+            $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
 		
-		$this->set_keywords(self::$KEYWORD_ARRAY);
-	}
+        $this->set_keywords(self::$KEYWORD_ARRAY);
+    }
 
-	protected function get_introduction()
-	{
-		if($this->page == 1)
-		{
+    protected function get_introduction()
+    {
+        if($this->page == 1)
+        {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
         $introduction_result = $repository->findByType('home');
 			
-			$introduction = array();
-			$introduction['title'] = $introduction_result['title'];
-			$introduction['content'] = $introduction_result['content'];
-			$introduction['image'] = $this->get_introduction_image($introduction_result['image']);
+            $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;
+        }
 		
-		return array(
-			'title' => "All of Jacob Emerick's posts, page {$this->page} of {$this->total_pages}.");
-	}
-
-	protected function get_page_number()
-	{
-		$page = URLDecode::getPiece(1);
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
-
-	protected function get_list_results()
-	{
+        return array(
+            'title' => "All of Jacob Emerick's posts, page {$this->page} of {$this->total_pages}.");
+    }
+
+    protected function get_page_number()
+    {
+        $page = URLDecode::getPiece(1);
+        if(isset($page) && is_numeric($page))
+            return $page;
+        return 1;
+    }
+
+    protected function get_list_results()
+    {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         return $repository->getActivePosts(self::$POSTS_PER_PAGE, $this->offset);
-	}
+    }
 
-	protected function get_list_description()
-	{
-		$start = $this->offset + 1;
-		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
+    protected function get_list_description()
+    {
+        $start = $this->offset + 1;
+        $end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
-		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count());
-	}
-
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return '/';
-		return '/' . ($this->page - 1) . '/';
-	}
-
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
-		return '/' . ($this->page + 1) . '/';
-	}
-
-	private $total_post_count;
-	protected function get_total_post_count()
-	{
-      if(!isset($this->total_post_count)) {
-          global $container;
-          $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-          $this->total_post_count = $repository->getActivePostsCount();
-      }
-
-		return $this->total_post_count;
-	}
+        return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count());
+    }
+
+    protected function get_list_next_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return '/';
+        return '/' . ($this->page - 1) . '/';
+    }
+
+    protected function get_list_prev_link()
+    {
+        if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+            return;
+        return '/' . ($this->page + 1) . '/';
+    }
+
+    private $total_post_count;
+    protected function get_total_post_count()
+    {
+        if(!isset($this->total_post_count)) {
+            global $container;
+            $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+            $this->total_post_count = $repository->getActivePostsCount();
+        }
+
+        return $this->total_post_count;
+    }
 
 }

Braces +40 added lines, -34 removed lines

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

+{

 
 	private static $TITLE_MAIN = "Jacob Emerick's Blog | Posts on Hiking, Web Development, and more";
 	private static $TITLE_PAGINATED = "Page %d of %d in Jacob Emerick's Blog";
@@ -28,25 +28,27 @@ 
 
 	private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d total posts.';
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
-		if($this->page == 1)
-			$this->set_title(self::$TITLE_MAIN);
-		else
-			$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
+		if($this->page == 1) {

+					$this->set_title(self::$TITLE_MAIN);

+		} else {

+					$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));

+		}

 		
-		if($this->page == 1)
-			$this->set_description(self::$DESCRIPTION_MAIN);
-		else
-			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
+		if($this->page == 1) {

+					$this->set_description(self::$DESCRIPTION_MAIN);

+		} else {

+					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));

+		}

 		
 		$this->set_keywords(self::$KEYWORD_ARRAY);
 	}
 
-	protected function get_introduction()
-	{
+	protected function get_introduction()

+	{

 		if($this->page == 1)
 		{
         global $container;
@@ -65,48 +67,52 @@ 
 			'title' => "All of Jacob Emerick's posts, page {$this->page} of {$this->total_pages}.");
 	}
 
-	protected function get_page_number()
-	{
+	protected function get_page_number()

+	{

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

+					return $page;

+		}

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

+	{

         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         return $repository->getActivePosts(self::$POSTS_PER_PAGE, $this->offset);
 	}
 
-	protected function get_list_description()
-	{
+	protected function get_list_description()

+	{

 		$start = $this->offset + 1;
 		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
 		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count());
 	}
 
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return '/';
+	protected function get_list_next_link()

+	{

+		if($this->page == 1) {

+					return;

+		}

+		if($this->page == 2) {

+					return '/';

+		}

 		return '/' . ($this->page - 1) . '/';
 	}
 
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+	protected function get_list_prev_link()

+	{

+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return '/' . ($this->page + 1) . '/';
 	}
 
 	private $total_post_count;
-	protected function get_total_post_count()
-	{
+	protected function get_total_post_count()

+	{

       if(!isset($this->total_post_count)) {
           global $container;
           $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);

controller/blog/SearchController.class.inc.php

Spacing +11 added lines, -11 removed lines

@@ -44,7 +44,7 @@ 
 	{
 		parent::set_head_data();
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 		{
 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
@@ -62,10 +62,10 @@ 
 
 	protected function get_introduction()
 	{
-		if($this->total_pages > 1)
+		if ($this->total_pages > 1)
 			return array(
 				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
-		else if($this->total_pages == 1)
+		else if ($this->total_pages == 1)
 			return array(
 				'title' => "Posts from search '{$this->query}'.");
 		else
@@ -76,7 +76,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -84,7 +84,7 @@ 
 	private $search_result;
 	private function get_search_result()
 	{
-		if(!isset($this->search_result))
+		if (!isset($this->search_result))
 		{
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
@@ -114,24 +114,24 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
-		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
+		return Content::instance('URLSafe', "/search/{$this->query}/".($this->page - 1).'/')->activate();
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
-		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
+		return Content::instance('URLSafe', "/search/{$this->query}/".($this->page + 1).'/')->activate();
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
+		if (!isset($this->total_post_count))
 			$this->total_post_count = count($this->get_search_result());
 		return $this->total_post_count;
 	}

Indentation +118 added lines, -118 removed lines

@@ -6,134 +6,134 @@
 final class SearchController extends DefaultListController
 {
 
-	private static $TITLE_MAIN = "%s Search | Jacob Emerick's Blog";
-	private static $DESCRIPTION_MAIN = "Posts containing the phrase %s on Jacob Emerick's Blog.";
-
-	private static $TITLE_PAGINATED = "%s Search - Page %d of %d | Jacob Emerick's Blog";
-	private static $DESCRIPTION_PAGINATED = "Page %d of %d with posts containing the phrase %s on Jacob Emerick's Blog.";
-
-	private static $KEYWORD_ARRAY = array(
-		'hiking',
-		'web development',
-		'blog',
-		'Jacob Emerick');
-
-	private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts containing the phrase %s.';
-	private static $SEARCH_WEIGHTS = array(
-		array(
-			'field' => 'title',
-			'weight' => 8),
-		array(
-			'field' => 'body',
-			'weight' => 4));
-
-	private $query;
-
-	public function __construct()
-	{
-		$query = URLDecode::getPiece(2);
-		$query = urldecode($query);
+    private static $TITLE_MAIN = "%s Search | Jacob Emerick's Blog";
+    private static $DESCRIPTION_MAIN = "Posts containing the phrase %s on Jacob Emerick's Blog.";
+
+    private static $TITLE_PAGINATED = "%s Search - Page %d of %d | Jacob Emerick's Blog";
+    private static $DESCRIPTION_PAGINATED = "Page %d of %d with posts containing the phrase %s on Jacob Emerick's Blog.";
+
+    private static $KEYWORD_ARRAY = array(
+        'hiking',
+        'web development',
+        'blog',
+        'Jacob Emerick');
+
+    private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts containing the phrase %s.';
+    private static $SEARCH_WEIGHTS = array(
+        array(
+            'field' => 'title',
+            'weight' => 8),
+        array(
+            'field' => 'body',
+            'weight' => 4));
+
+    private $query;
+
+    public function __construct()
+    {
+        $query = URLDecode::getPiece(2);
+        $query = urldecode($query);
         $query = str_replace('-', ' ', $query);
 		
-		$this->query = $query;
+        $this->query = $query;
 		
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		if($this->page == 1)
-		{
-			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
-			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
-		}
-		else
-		{
-			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->query), $this->page, $this->total_pages));
-			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->query)));
-		}
+        if($this->page == 1)
+        {
+            $this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
+            $this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
+        }
+        else
+        {
+            $this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->query), $this->page, $this->total_pages));
+            $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->query)));
+        }
 		
-		$keyword_array = self::$KEYWORD_ARRAY;
-		array_unshift($keyword_array, $this->query);
-		$this->set_keywords($keyword_array);
-	}
-
-	protected function get_introduction()
-	{
-		if($this->total_pages > 1)
-			return array(
-				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
-		else if($this->total_pages == 1)
-			return array(
-				'title' => "Posts from search '{$this->query}'.");
-		else
-			return array(
-				'title' => "Sorry, '{$this->query}' didn't return any posts.");
-	}
-
-	protected function get_page_number()
-	{
-		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
-
-	private $search_result;
-	private function get_search_result()
-	{
-		if(!isset($this->search_result))
-		{
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, $this->query);
+        $this->set_keywords($keyword_array);
+    }
+
+    protected function get_introduction()
+    {
+        if($this->total_pages > 1)
+            return array(
+                'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
+        else if($this->total_pages == 1)
+            return array(
+                'title' => "Posts from search '{$this->query}'.");
+        else
+            return array(
+                'title' => "Sorry, '{$this->query}' didn't return any posts.");
+    }
+
+    protected function get_page_number()
+    {
+        $page = URLDecode::getPiece(3);
+        if(isset($page) && is_numeric($page))
+            return $page;
+        return 1;
+    }
+
+    private $search_result;
+    private function get_search_result()
+    {
+        if(!isset($this->search_result))
+        {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $posts = $repository->getActivePosts();
 			
-			$this->search_result = Search::instance()
-				->setQuery($this->query)
-				->setResult($posts)
-				->setWeight(self::$SEARCH_WEIGHTS)
-				->perform();
-		}
-		return $this->search_result;
-	}
-
-	protected function get_list_results()
-	{
-		return array_slice($this->get_search_result(), $this->offset, self::$POSTS_PER_PAGE);
-	}
-
-	protected function get_list_description()
-	{
-		$start = $this->offset + 1;
-		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
+            $this->search_result = Search::instance()
+                ->setQuery($this->query)
+                ->setResult($posts)
+                ->setWeight(self::$SEARCH_WEIGHTS)
+                ->perform();
+        }
+        return $this->search_result;
+    }
+
+    protected function get_list_results()
+    {
+        return array_slice($this->get_search_result(), $this->offset, self::$POSTS_PER_PAGE);
+    }
+
+    protected function get_list_description()
+    {
+        $start = $this->offset + 1;
+        $end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
-		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->query);
-	}
-
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
-		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
-	}
-
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
-		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
-	}
-
-	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = count($this->get_search_result());
-		return $this->total_post_count;
-	}
+        return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->query);
+    }
+
+    protected function get_list_next_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
+        return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
+    }
+
+    protected function get_list_prev_link()
+    {
+        if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+            return;
+        return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
+    }
+
+    private $total_post_count;
+    protected function get_total_post_count()
+    {
+        if(!isset($this->total_post_count))
+            $this->total_post_count = count($this->get_search_result());
+        return $this->total_post_count;
+    }
 
 }

Braces +48 added lines, -43 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('controller', 'blog/DefaultListController');
 Loader::load('utility', 'Search');
 
-final class SearchController extends DefaultListController
-{
+final class SearchController extends DefaultListController

+{

 
 	private static $TITLE_MAIN = "%s Search | Jacob Emerick's Blog";
 	private static $DESCRIPTION_MAIN = "Posts containing the phrase %s on Jacob Emerick's Blog.";
@@ -29,8 +29,8 @@ 
 
 	private $query;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		$query = URLDecode::getPiece(2);
 		$query = urldecode($query);
         $query = str_replace('-', ' ', $query);
@@ -40,16 +40,15 @@ 
 		parent::__construct();
 	}
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
 		if($this->page == 1)
 		{
 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
-		}
-		else
+		} else
 		{
 			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->query), $this->page, $this->total_pages));
 			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->query)));
@@ -60,30 +59,32 @@ 
 		$this->set_keywords($keyword_array);
 	}
 
-	protected function get_introduction()
-	{
-		if($this->total_pages > 1)
-			return array(
-				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
-		else if($this->total_pages == 1)
-			return array(
-				'title' => "Posts from search '{$this->query}'.");
-		else
-			return array(
-				'title' => "Sorry, '{$this->query}' didn't return any posts.");
+	protected function get_introduction()

+	{

+		if($this->total_pages > 1) {

+					return array(
+				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");

+		} else if($this->total_pages == 1) {

+					return array(
+				'title' => "Posts from search '{$this->query}'.");

+		} else {

+					return array(
+				'title' => "Sorry, '{$this->query}' didn't return any posts.");

+		}

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

+	{

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

+					return $page;

+		}

 		return 1;
 	}
 
 	private $search_result;
-	private function get_search_result()
-	{
+	private function get_search_result()

+	{

 		if(!isset($this->search_result))
 		{
         global $container;
@@ -99,40 +100,44 @@ 
 		return $this->search_result;
 	}
 
-	protected function get_list_results()
-	{
+	protected function get_list_results()

+	{

 		return array_slice($this->get_search_result(), $this->offset, self::$POSTS_PER_PAGE);
 	}
 
-	protected function get_list_description()
-	{
+	protected function get_list_description()

+	{

 		$start = $this->offset + 1;
 		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
 		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->query);
 	}
 
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
+	protected function get_list_next_link()

+	{

+		if($this->page == 1) {

+					return;

+		}

+		if($this->page == 2) {

+					return Content::instance('URLSafe', "/search/{$this->query}/")->activate();

+		}

 		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
 	}
 
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+	protected function get_list_prev_link()

+	{

+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
 	}
 
 	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = count($this->get_search_result());
+	protected function get_total_post_count()

+	{

+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = count($this->get_search_result());

+		}

 		return $this->total_post_count;
 	}
 

controller/portfolio/ResumeController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     {
         $this->set_body('body_view', 'Resume');
 
-        $resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}";
+        $resumePath = Loader::getRootURL('portfolio')."/jsonresume/{$this->resume}";
         $resume = file_get_contents($resumePath);
         $resume = json_decode($resume, true);
         $this->set_body('body_data', $resume);

Braces +6 added lines, -6 removed lines

@@ -2,13 +2,13 @@ 
 
 Loader::load('controller', 'portfolio/DefaultPageController');
 
-class ResumeController extends DefaultPageController
-{
+class ResumeController extends DefaultPageController

+{

 
     protected $resume = 'resume-20160318.json';
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         $this->set_title("Resume | Jacob Emerick's Portfolio");
         $this->set_description("Resume for Jacob Emerick, a software engineer extraordinaire");
         $this->set_keywords([
@@ -21,8 +21,8 @@ 
         ]);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()

+    {

         $this->set_body('body_view', 'Resume');
 
         $resumePath = Loader::getRootURL('portfolio') . "/jsonresume/{$this->resume}";

controller/portfolio/ContactController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -89,7 +89,7 @@
 
         return [
             'success' =>
-                "Thank you for your message, {$_POST['name']}! " .
+                "Thank you for your message, {$_POST['name']}! ".
                 "I'll get back to you as soon as possible."
         ];
     }

Braces +8 added lines, -8 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('controller', 'portfolio/DefaultPageController');
 
-class ContactController extends DefaultPageController
-{
+class ContactController extends DefaultPageController

+{

 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         $this->set_title("Contact Page | Jacob Emerick's Portfolio");
         $this->set_description("Contact page for Jacob Emerick's Portfolio");
         $this->set_keywords([
@@ -19,8 +19,8 @@ 
         ]);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()

+    {

         $this->set_body('body_view', 'Contact');
 
         $body_data = [];
@@ -33,8 +33,8 @@ 
         parent::set_body_data();
     }
 
-    private function process_form_data()
-    {
+    private function process_form_data()

+    {

         $errors = [];
 
         if (

controller/portfolio/DefaultPageController.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -33,15 +33,15 @@ 
             ],
             [
                 'name' => 'Projects',
-                'link' => Loader::getRootURL() . 'projects/',
+                'link' => Loader::getRootURL().'projects/',
             ],
             [
                 'name' => 'Résumé',
-                'link' => Loader::getRootURL() . 'resume/',
+                'link' => Loader::getRootURL().'resume/',
             ],
             [
                 'name' => 'Contact',
-                'link' => Loader::getRootURL() . 'contact/',
+                'link' => Loader::getRootURL().'contact/',
             ],
         ];
 
@@ -51,7 +51,7 @@ 
             $active_page = ucfirst(URLDecode::getPiece(1));
         }
 
-        return array_map(function ($row) use ($active_page) {
+        return array_map(function($row) use ($active_page) {
             $row = (object) $row;
             $row->active = ($row->name == $active_page);
             return $row;

Braces +8 added lines, -8 removed lines

@@ -2,19 +2,19 @@ 
 
 Loader::load('controller', '/PageController');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController

+{

 
-    public function __construct()
-    {
+    public function __construct()

+    {

         parent::__construct();
 
         $this->add_css('reset');
         $this->add_css('portfolio', 4);
     }
 
-    protected function set_body_data()
-    {
+    protected function set_body_data()

+    {

         $this->set_body('header_data', [
             'menu' => $this->get_menu(),
             'home_link' => Loader::getRootURL(),
@@ -24,8 +24,8 @@ 
         $this->set_body_view('Page');
     }
 
-    protected function get_menu()
-    {
+    protected function get_menu()

+    {

         $menu = [
             [
                 'name' => 'About',

controller/waterfalls/ContactController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -35,16 +35,16 @@ 
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
+		if (!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
 			return (object) array('display' => 'normal');
 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
+		if (!Validate::checkRequest('post', 'name', 'string'))
 			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
+		if (!Validate::checkRequest('post', 'email', 'string'))
 			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
+		if (!Validate::checkRequest('post', 'message', 'string'))
 			$error_result['message'] = 'please write a message';
 		
 		$values = (object) array(
@@ -52,7 +52,7 @@ 
 			'email' => Request::getPost('email'),
 			'message' => Request::getPost('message'));
 		
-		if(count($error_result) > 0)
+		if (count($error_result) > 0)
 		{
 			return (object) array(
 				'display' => 'error',
@@ -65,8 +65,8 @@ 
       ->addTo($container['config']->admin_email)
       ->setSubject('Home Page Contact')
       ->setPlainMessage(
-        "Name: {$values->name}\n" .
-        "Email: {$values->email}\n" .
+        "Name: {$values->name}\n".
+        "Email: {$values->email}\n".
         "Message: {$values->message}"
       )
       ->send();		

Indentation +50 added lines, -50 removed lines

@@ -5,71 +5,71 @@
 final class ContactController extends DefaultPageController
 {
 
-	private static $TITLE = 'Contact Jacob Emerick | Waterfalls of the Keweenaw';
-	private static $DESCRIPTION = 'Contact page to reach Jacob Emerick by email or social networks';
+    private static $TITLE = 'Contact Jacob Emerick | Waterfalls of the Keweenaw';
+    private static $DESCRIPTION = 'Contact page to reach Jacob Emerick by email or social networks';
 
-	private static $KEYWORD_ARRAY = array(
-		'contact',
-		'email',
-		'waterfalls',
-		'Jacob Emerick');
+    private static $KEYWORD_ARRAY = array(
+        'contact',
+        'email',
+        'waterfalls',
+        'Jacob Emerick');
 
-	protected function set_head_data()
-	{
-		$this->set_title(self::$TITLE);
-		$this->set_description(self::$DESCRIPTION);
-		$this->set_keywords(self::$KEYWORD_ARRAY);
+    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('form_container', $this->process_form());
-		$this->set_body('view', 'Contact');
+    protected function set_body_data()
+    {
+        $this->set_body('form_container', $this->process_form());
+        $this->set_body('view', 'Contact');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
-	private function process_form()
-	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
-			return (object) array('display' => 'normal');
+    private function process_form()
+    {
+        if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
+            return (object) array('display' => 'normal');
 		
-		Loader::load('utility', 'Validate');
-		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_result['message'] = 'please write a message';
+        Loader::load('utility', 'Validate');
+        $error_result = array();
+        if(!Validate::checkRequest('post', 'name', 'string'))
+            $error_result['name'] = 'please enter your name';
+        if(!Validate::checkRequest('post', 'email', 'string'))
+            $error_result['email'] = 'please enter a valid email';
+        if(!Validate::checkRequest('post', 'message', 'string'))
+            $error_result['message'] = 'please write a message';
 		
-		$values = (object) array(
-			'name' => Request::getPost('name'),
-			'email' => Request::getPost('email'),
-			'message' => Request::getPost('message'));
+        $values = (object) array(
+            'name' => Request::getPost('name'),
+            'email' => Request::getPost('email'),
+            'message' => Request::getPost('message'));
 		
-		if(count($error_result) > 0)
-		{
-			return (object) array(
-				'display' => 'error',
-				'messages' => $error_result,
-				'values' => $values);
-		}
+        if(count($error_result) > 0)
+        {
+            return (object) array(
+                'display' => 'error',
+                'messages' => $error_result,
+                'values' => $values);
+        }
 
     global $container;
     $sent = $container['mail']
-      ->addTo($container['config']->admin_email)
-      ->setSubject('Waterfall Site Contact')
-      ->setPlainMessage(
+        ->addTo($container['config']->admin_email)
+        ->setSubject('Waterfall Site Contact')
+        ->setPlainMessage(
         "Name: {$values->name}\n" .
         "Email: {$values->email}\n" .
         "Message: {$values->message}"
-      )
-      ->send();
+        )
+        ->send();
 
-		return (object) array('display' => 'success');
-	}
+        return (object) array('display' => 'success');
+    }
 
 }

Braces +20 added lines, -16 removed lines

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

+{

 
 	private static $TITLE = 'Contact Jacob Emerick | Waterfalls of the Keweenaw';
 	private static $DESCRIPTION = 'Contact page to reach Jacob Emerick by email or social networks';
@@ -14,8 +14,8 @@ 
 		'waterfalls',
 		'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);
@@ -23,27 +23,31 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('form_container', $this->process_form());
 		$this->set_body('view', 'Contact');
 		
 		parent::set_body_data();
 	}
 
-	private function process_form()
-	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
-			return (object) array('display' => 'normal');
+	private function process_form()

+	{

+		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') {

+					return (object) array('display' => 'normal');

+		}

 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_result['message'] = 'please write a message';
+		if(!Validate::checkRequest('post', 'name', 'string')) {

+					$error_result['name'] = 'please enter your name';

+		}

+		if(!Validate::checkRequest('post', 'email', 'string')) {

+					$error_result['email'] = 'please enter a valid email';

+		}

+		if(!Validate::checkRequest('post', 'message', 'string')) {

+					$error_result['message'] = 'please write a message';

+		}

 		
 		$values = (object) array(
 			'name' => Request::getPost('name'),

public/site/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'portfolio';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

public/home/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'portfolio';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');