jacobemerick / web

controller/home/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 +52 added lines, -52 removed lines

@@ -5,73 +5,73 @@
 final class ContactController extends DefaultPageController
 {
 
-	private static $TITLE = 'Contact | Jacob Emerick';
-	private static $DESCRIPTION = 'Contact page to reach Jacob Emerick by email or social networks';
+    private static $TITLE = 'Contact | Jacob Emerick';
+    private static $DESCRIPTION = 'Contact page to reach Jacob Emerick by email or social networks';
 
-	private static $KEYWORD_ARRAY = array(
-		'Jacob Emerick',
-		'jacobemerick',
-		'jpemeric',
-		'contact',
-		'email',
-		'connect');
+    private static $KEYWORD_ARRAY = array(
+        'Jacob Emerick',
+        'jacobemerick',
+        'jpemeric',
+        'contact',
+        'email',
+        'connect');
 
-	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('Home Page Contact')
-      ->setPlainMessage(
+        ->addTo($container['config']->admin_email)
+        ->setSubject('Home Page 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'),

controller/home/HomeController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -48,11 +48,11 @@
     $recentPosts = $postRepository->getActivePosts(3);
 
 		$recent_post_array = array();
-		foreach($recentPosts as $postResult)
+		foreach ($recentPosts as $postResult)
 		{
 			$post = new stdclass();
 			$post->title = $postResult['title'];
-			$post->url = Loader::getRootUrl('blog') . "{$postResult['category']}/{$postResult['path']}/";
+			$post->url = Loader::getRootUrl('blog')."{$postResult['category']}/{$postResult['path']}/";
 			$post->category = ucwords(str_replace('-', ' ', $postResult['category']));
 			$post->thumb = Content::instance('FetchFirstPhoto', $postResult['body'])->activate();
 			$post->body = Content::instance('SmartTrim', $postResult['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);

Indentation +41 added lines, -41 removed lines

@@ -8,58 +8,58 @@
 final class HomeController extends DefaultPageController
 {
 
-	private static $TITLE = "Jacob Emerick's Home | Web Developer, Hiker, Innovator";
-	private static $DESCRIPTION = 'Home page for Jacob Emerick, with links to his blog, waterfall site, and other side projects';
+    private static $TITLE = "Jacob Emerick's Home | Web Developer, Hiker, Innovator";
+    private static $DESCRIPTION = 'Home page for Jacob Emerick, with links to his blog, waterfall site, and other side projects';
 
-	private static $KEYWORD_ARRAY = array(
-		'Jacob Emerick',
-		'jacobemerick',
-		'jpemeric',
-		'home',
-		'web developer',
-		'hiker',
-		'application programmer',
-		'innovator');
+    private static $KEYWORD_ARRAY = array(
+        'Jacob Emerick',
+        'jacobemerick',
+        'jpemeric',
+        'home',
+        'web developer',
+        'hiker',
+        'application programmer',
+        'innovator');
 
-	private static $POST_LENGTH_SHORT = 160;
-	private static $POST_LENGTH_LONG = 240;
+    private static $POST_LENGTH_SHORT = 160;
+    private static $POST_LENGTH_LONG = 240;
 
-	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('post_array', $this->get_recent_posts());
-		$this->set_body_view('Home');
+    protected function set_body_data()
+    {
+        $this->set_body('post_array', $this->get_recent_posts());
+        $this->set_body_view('Home');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
-	private function get_recent_posts()
-	{
+    private function get_recent_posts()
+    {
     global $container;
     $postRepository = new MysqlPostRepository($container['db_connection_locator']);
     $recentPosts = $postRepository->getActivePosts(3);
 
-		$recent_post_array = array();
-		foreach($recentPosts as $postResult)
-		{
-			$post = new stdclass();
-			$post->title = $postResult['title'];
-			$post->url = Loader::getRootUrl('blog') . "{$postResult['category']}/{$postResult['path']}/";
-			$post->category = ucwords(str_replace('-', ' ', $postResult['category']));
-			$post->thumb = Content::instance('FetchFirstPhoto', $postResult['body'])->activate();
-			$post->body = Content::instance('SmartTrim', $postResult['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);
+        $recent_post_array = array();
+        foreach($recentPosts as $postResult)
+        {
+            $post = new stdclass();
+            $post->title = $postResult['title'];
+            $post->url = Loader::getRootUrl('blog') . "{$postResult['category']}/{$postResult['path']}/";
+            $post->category = ucwords(str_replace('-', ' ', $postResult['category']));
+            $post->thumb = Content::instance('FetchFirstPhoto', $postResult['body'])->activate();
+            $post->body = Content::instance('SmartTrim', $postResult['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);
 						
-			$recent_post_array[] = $post;
-		}
-		return $recent_post_array;
-	}
+            $recent_post_array[] = $post;
+        }
+        return $recent_post_array;
+    }
 
 }

Braces +8 added lines, -8 removed lines

@@ -5,8 +5,8 @@ 
 Loader::load('controller', 'home/DefaultPageController');
 Loader::load('utility', 'Content');
 
-final class HomeController extends DefaultPageController
-{
+final class HomeController extends DefaultPageController

+{

 
 	private static $TITLE = "Jacob Emerick's Home | Web Developer, Hiker, Innovator";
 	private static $DESCRIPTION = 'Home page for Jacob Emerick, with links to his blog, waterfall site, and other side projects';
@@ -24,8 +24,8 @@ 
 	private static $POST_LENGTH_SHORT = 160;
 	private static $POST_LENGTH_LONG = 240;
 
-	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);
@@ -33,16 +33,16 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('post_array', $this->get_recent_posts());
 		$this->set_body_view('Home');
 		
 		parent::set_body_data();
 	}
 
-	private function get_recent_posts()
-	{
+	private function get_recent_posts()

+	{

     global $container;
     $postRepository = new MysqlPostRepository($container['db_connection_locator']);
     $recentPosts = $postRepository->getActivePosts(3);

controller/blog/TagController.class.inc.php

Spacing +11 added lines, -11 removed lines

@@ -30,7 +30,7 @@ 
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->findTagByTitle($tag);
 
-		if($tag_result === false)
+		if ($tag_result === false)
 			$this->eject();
 		
 		$this->tag = $tag_result;
@@ -42,7 +42,7 @@ 
 	{
 		parent::set_head_data();
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 		{
 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->tag['tag'])));
 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag['tag'])));
@@ -62,13 +62,13 @@ 
 	{
 		$tag = ucwords($this->tag['tag']);
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 		{
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
         $introduction_result = $repository->findByType('tag', $this->tag['tag']);
 			
-			if($introduction_result !== false)
+			if ($introduction_result !== false)
 			{
 				$introduction = array();
 				$introduction['title'] = $introduction_result['title'];
@@ -89,7 +89,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;
 	}
@@ -111,24 +111,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', "/tag/{$this->tag['tag']}/")->activate();
-		return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page - 1) . '/')->activate();
+		return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/".($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', "/tag/{$this->tag['tag']}/" . ($this->page + 1) . '/')->activate();
+		return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/".($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)) {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $this->total_post_count = $repository->getActivePostsCountByTag($this->tag['id']);

Indentation +98 added lines, -98 removed lines

@@ -5,136 +5,136 @@
 final class TagController extends DefaultListController
 {
 
-	private static $TITLE_MAIN = "%s Tag | Jacob Emerick's Blog";
-	private static $DESCRIPTION_MAIN = "Posts tagged with %s on Jacob Emerick's Blog, a website about Upper Peninsula hiking and web development best practices.";
+    private static $TITLE_MAIN = "%s Tag | Jacob Emerick's Blog";
+    private static $DESCRIPTION_MAIN = "Posts tagged with %s on Jacob Emerick's Blog, a website about Upper Peninsula hiking and web development best practices.";
 
-	private static $TITLE_PAGINATED = "%s - Page %d of %d | Jacob Emerick's Blog";
-	private static $DESCRIPTION_PAGINATED = "Page %d of %d with posts tagged with %s on Jacob Emerick's Blog, a website about the hiking and development adventures of a young man.";
+    private static $TITLE_PAGINATED = "%s - Page %d of %d | Jacob Emerick's Blog";
+    private static $DESCRIPTION_PAGINATED = "Page %d of %d with posts tagged with %s on Jacob Emerick's Blog, a website about the hiking and development adventures of a young man.";
 
-	private static $KEYWORD_ARRAY = array(
-		'hiking',
-		'web development',
-		'blog',
-		'Jacob Emerick');
+    private static $KEYWORD_ARRAY = array(
+        'hiking',
+        'web development',
+        'blog',
+        'Jacob Emerick');
 
-	private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts tagged with %s.';
+    private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts tagged with %s.';
 
-	private $tag;
+    private $tag;
 
-	public function __construct()
-	{
-		$tag = URLDecode::getPiece(2);
-		$tag = str_replace('-', ' ', $tag);
+    public function __construct()
+    {
+        $tag = URLDecode::getPiece(2);
+        $tag = str_replace('-', ' ', $tag);
 
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->findTagByTitle($tag);
 
-		if($tag_result === false)
-			$this->eject();
+        if($tag_result === false)
+            $this->eject();
 		
-		$this->tag = $tag_result;
+        $this->tag = $tag_result;
 		
-		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->tag['tag'])));
-			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag['tag'])));
-		}
-		else
-		{
-			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->tag['tag']), $this->page, $this->total_pages));
-			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->tag['tag'])));
-		}
+        if($this->page == 1)
+        {
+            $this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->tag['tag'])));
+            $this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag['tag'])));
+        }
+        else
+        {
+            $this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->tag['tag']), $this->page, $this->total_pages));
+            $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->tag['tag'])));
+        }
 		
-		$keyword_array = self::$KEYWORD_ARRAY;
-		array_unshift($keyword_array, $this->tag['tag']);
-		$this->set_keywords($keyword_array);
-	}
-
-	protected function get_introduction()
-	{
-		$tag = ucwords($this->tag['tag']);
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, $this->tag['tag']);
+        $this->set_keywords($keyword_array);
+    }
+
+    protected function get_introduction()
+    {
+        $tag = ucwords($this->tag['tag']);
 		
-		if($this->page == 1)
-		{
+        if($this->page == 1)
+        {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
         $introduction_result = $repository->findByType('tag', $this->tag['tag']);
 			
-			if($introduction_result !== false)
-			{
-				$introduction = array();
-				$introduction['title'] = $introduction_result['title'];
-				$introduction['content'] = $introduction_result['content'];
-				$introduction['image'] = $this->get_introduction_image($introduction_result['image']);
+            if($introduction_result !== false)
+            {
+                $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' => "Viewing posts about {$tag}.");
-		}
+            return array(
+                'title' => "Viewing posts about {$tag}.");
+        }
 		
-		return array(
-			'title' => "{$tag} posts, page {$this->page} of {$this->total_pages}.");
-	}
-
-	protected function get_page_number()
-	{
-		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
-
-	protected function get_list_results()
-	{
+        return array(
+            'title' => "{$tag} posts, page {$this->page} of {$this->total_pages}.");
+    }
+
+    protected function get_page_number()
+    {
+        $page = URLDecode::getPiece(3);
+        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->getActivePostsByTag($this->tag['id'], 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(), $this->tag['tag']);
-	}
-
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/")->activate();
-		return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($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', "/tag/{$this->tag['tag']}/" . ($this->page + 1) . '/')->activate();
-	}
-
-	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count)) {
+        return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->tag['tag']);
+    }
+
+    protected function get_list_next_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/")->activate();
+        return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($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', "/tag/{$this->tag['tag']}/" . ($this->page + 1) . '/')->activate();
+    }
+
+    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->getActivePostsCountByTag($this->tag['id']);
     }
 
-		return $this->total_post_count;
-	}
+        return $this->total_post_count;
+    }
 
 }

Braces +36 added lines, -32 removed lines

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

+{

 
 	private static $TITLE_MAIN = "%s Tag | Jacob Emerick's Blog";
 	private static $DESCRIPTION_MAIN = "Posts tagged with %s on Jacob Emerick's Blog, a website about Upper Peninsula hiking and web development best practices.";
@@ -21,8 +21,8 @@ 
 
 	private $tag;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		$tag = URLDecode::getPiece(2);
 		$tag = str_replace('-', ' ', $tag);
 
@@ -30,24 +30,24 @@ 
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->findTagByTitle($tag);
 
-		if($tag_result === false)
-			$this->eject();
+		if($tag_result === false) {

+					$this->eject();

+		}

 		
 		$this->tag = $tag_result;
 		
 		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->tag['tag'])));
 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag['tag'])));
-		}
-		else
+		} else
 		{
 			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->tag['tag']), $this->page, $this->total_pages));
 			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->tag['tag'])));
@@ -58,8 +58,8 @@ 
 		$this->set_keywords($keyword_array);
 	}
 
-	protected function get_introduction()
-	{
+	protected function get_introduction()

+	{

 		$tag = ucwords($this->tag['tag']);
 		
 		if($this->page == 1)
@@ -86,48 +86,52 @@ 
 			'title' => "{$tag} posts, page {$this->page} of {$this->total_pages}.");
 	}
 
-	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;
 	}
 
-	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->getActivePostsByTag($this->tag['id'], 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(), $this->tag['tag']);
 	}
 
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/")->activate();
+	protected function get_list_next_link()

+	{

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

+					return;

+		}

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

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

+		}

 		return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($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', "/tag/{$this->tag['tag']}/" . ($this->page + 1) . '/')->activate();
 	}
 
 	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/CategoryController.class.inc.php

Spacing +12 added lines, -12 removed lines

@@ -67,10 +67,10 @@ 
 	{
 		parent::set_head_data();
 		
-		switch($this->category->display)
+		switch ($this->category->display)
 		{
 			case 'Hiking' :
-				if($this->page == 1)
+				if ($this->page == 1)
 				{
 					$this->set_title(self::$TITLE_MAIN_HIKING);
 					$this->set_description(self::$DESCRIPTION_MAIN_HIKING);
@@ -83,7 +83,7 @@ 
 				$this->set_keywords(self::$KEYWORD_ARRAY_HIKING);
 			break;
 			case 'Personal' :
-				if($this->page == 1)
+				if ($this->page == 1)
 				{
 					$this->set_title(self::$TITLE_MAIN_PERSONAL);
 					$this->set_description(self::$DESCRIPTION_MAIN_PERSONAL);
@@ -96,7 +96,7 @@ 
 				$this->set_keywords(self::$KEYWORD_ARRAY_PERSONAL);
 			break;
 			case 'Web Development' :
-				if($this->page == 1)
+				if ($this->page == 1)
 				{
 					$this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT);
 					$this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT);
@@ -113,7 +113,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']);
@@ -134,7 +134,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;
 	}
@@ -156,24 +156,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', "/{$this->category->link}/")->activate();
-		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page - 1) . '/')->activate();
+		return Content::instance('URLSafe', "/{$this->category->link}/".($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', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate();
+		return Content::instance('URLSafe', "/{$this->category->link}/".($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)) {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $this->total_post_count = $repository->getActivePostsCountByCategory($this->category->link);

Indentation +157 added lines, -157 removed lines

@@ -5,180 +5,180 @@
 final class CategoryController extends DefaultListController
 {
 
-	private static $TITLE_MAIN_HIKING = "Hiking | Posts on Upper Peninsula Exploring on Jacob Emerick's Blog";
-	private static $DESCRIPTION_MAIN_HIKING = "Posts on Jacob Emerick's Blog about hiking the Upper Peninsula, exploring the Huron Mountains, and hunting waterfalls in the Keweenaw.";
-
-	private static $TITLE_MAIN_PERSONAL = "Personal | Posts about life changes on Jacob Emerick's Blog";
-	private static $DESCRIPTION_MAIN_PERSONAL = "Stories about life changes for Jacob and Katie. New jobs, getting married, and general thoughts on things.";
-
-	private static $TITLE_MAIN_WEBDEVELOPMENT = "Web Development | Tutorials and Best Practices on Jacob Emerick's Blog";
-	private static $DESCRIPTION_MAIN_WEBDEVELOPMENT = "Variety of tutorials and advice on best practices on Jacob Emerick's Blog, with a focus on object-orientated PHP development and project management.";
-
-	private static $TITLE_PAGINATED_HIKING = "Hiking - Page %d of %d | Jacob Emerick's Blog";
-	private static $DESCRIPTION_PAGINATED_HIKING = "Page %d of %d about hiking on Jacob Emerick's Blog. Posts about hiking the Upper Peninsula, exploring the Huron Mountains, and hunting waterfalls of the Keweenaw.";
-
-	private static $TITLE_PAGINATED_PERSONAL = "Personal - Page %d of %d | Jacob Emerick's Blog";
-	private static $DESCRIPTION_PAGINATED_PERSONAL = "Page %d of %d of personal posts on Jacob Emerick's Blog about life changes and general musings.";
-
-	private static $TITLE_PAGINATED_WEBDEVELOPMENT = "Web Development - Page %d of %d | Jacob Emerick's Blog";
-	private static $DESCRIPTION_PAGINATED_WEBDEVELOPMENT = "Page %d of %d of posts on web development, ranging from general tutorials to advanced best practices, on Jacob Emerick's Blog.";
-
-	private static $KEYWORD_ARRAY_HIKING = array(
-		'hiking',
-		'upper peninsula',
-		'huron mountains',
-		'keweenaw',
-		'michigan',
-		'backpacking',
-		'Jacob Emerick');
-
-	private static $KEYWORD_ARRAY_PERSONAL = array(
-		'dealerfire',
-		'sparknet',
-		'katie',
-		'logan',
-		'marriage',
-		'Jacob Emerick');
-
-	private static $KEYWORD_ARRAY_WEBDEVELOPMENT = array(
-		'best practices',
-		'object orientated php',
-		'data abstraction',
-		'semantic web',
-		'responsive design',
-		'responsible development',
-		'Jacob Emerick');
-
-	private $category;
-
-	private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts in the %s category.';
-
-	public function __construct()
-	{
-		$url = URLDecode::getPiece(1);
-		$this->category = (object) array(
-			'display' => ucwords(str_replace('-', ' ', $url)),
-			'link' => $url);
+    private static $TITLE_MAIN_HIKING = "Hiking | Posts on Upper Peninsula Exploring on Jacob Emerick's Blog";
+    private static $DESCRIPTION_MAIN_HIKING = "Posts on Jacob Emerick's Blog about hiking the Upper Peninsula, exploring the Huron Mountains, and hunting waterfalls in the Keweenaw.";
+
+    private static $TITLE_MAIN_PERSONAL = "Personal | Posts about life changes on Jacob Emerick's Blog";
+    private static $DESCRIPTION_MAIN_PERSONAL = "Stories about life changes for Jacob and Katie. New jobs, getting married, and general thoughts on things.";
+
+    private static $TITLE_MAIN_WEBDEVELOPMENT = "Web Development | Tutorials and Best Practices on Jacob Emerick's Blog";
+    private static $DESCRIPTION_MAIN_WEBDEVELOPMENT = "Variety of tutorials and advice on best practices on Jacob Emerick's Blog, with a focus on object-orientated PHP development and project management.";
+
+    private static $TITLE_PAGINATED_HIKING = "Hiking - Page %d of %d | Jacob Emerick's Blog";
+    private static $DESCRIPTION_PAGINATED_HIKING = "Page %d of %d about hiking on Jacob Emerick's Blog. Posts about hiking the Upper Peninsula, exploring the Huron Mountains, and hunting waterfalls of the Keweenaw.";
+
+    private static $TITLE_PAGINATED_PERSONAL = "Personal - Page %d of %d | Jacob Emerick's Blog";
+    private static $DESCRIPTION_PAGINATED_PERSONAL = "Page %d of %d of personal posts on Jacob Emerick's Blog about life changes and general musings.";
+
+    private static $TITLE_PAGINATED_WEBDEVELOPMENT = "Web Development - Page %d of %d | Jacob Emerick's Blog";
+    private static $DESCRIPTION_PAGINATED_WEBDEVELOPMENT = "Page %d of %d of posts on web development, ranging from general tutorials to advanced best practices, on Jacob Emerick's Blog.";
+
+    private static $KEYWORD_ARRAY_HIKING = array(
+        'hiking',
+        'upper peninsula',
+        'huron mountains',
+        'keweenaw',
+        'michigan',
+        'backpacking',
+        'Jacob Emerick');
+
+    private static $KEYWORD_ARRAY_PERSONAL = array(
+        'dealerfire',
+        'sparknet',
+        'katie',
+        'logan',
+        'marriage',
+        'Jacob Emerick');
+
+    private static $KEYWORD_ARRAY_WEBDEVELOPMENT = array(
+        'best practices',
+        'object orientated php',
+        'data abstraction',
+        'semantic web',
+        'responsive design',
+        'responsible development',
+        'Jacob Emerick');
+
+    private $category;
+
+    private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts in the %s category.';
+
+    public function __construct()
+    {
+        $url = URLDecode::getPiece(1);
+        $this->category = (object) array(
+            'display' => ucwords(str_replace('-', ' ', $url)),
+            'link' => $url);
 		
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		switch($this->category->display)
-		{
-			case 'Hiking' :
-				if($this->page == 1)
-				{
-					$this->set_title(self::$TITLE_MAIN_HIKING);
-					$this->set_description(self::$DESCRIPTION_MAIN_HIKING);
-				}
-				else
-				{
-					$this->set_title(sprintf(self::$TITLE_PAGINATED_HIKING, $this->page, $this->total_pages));
-					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_HIKING, $this->page, $this->total_pages));
-				}
-				$this->set_keywords(self::$KEYWORD_ARRAY_HIKING);
-			break;
-			case 'Personal' :
-				if($this->page == 1)
-				{
-					$this->set_title(self::$TITLE_MAIN_PERSONAL);
-					$this->set_description(self::$DESCRIPTION_MAIN_PERSONAL);
-				}
-				else
-				{
-					$this->set_title(sprintf(self::$TITLE_PAGINATED_PERSONAL, $this->page, $this->total_pages));
-					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_PERSONAL, $this->page, $this->total_pages));
-				}
-				$this->set_keywords(self::$KEYWORD_ARRAY_PERSONAL);
-			break;
-			case 'Web Development' :
-				if($this->page == 1)
-				{
-					$this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT);
-					$this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT);
-				}
-				else
-				{
-					$this->set_title(sprintf(self::$TITLE_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
-					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
-				}
-				$this->set_keywords(self::$KEYWORD_ARRAY_WEBDEVELOPMENT);
-			break;
-		}
-	}
-
-	protected function get_introduction()
-	{
-		if($this->page == 1)
-		{
+        switch($this->category->display)
+        {
+            case 'Hiking' :
+                if($this->page == 1)
+                {
+                    $this->set_title(self::$TITLE_MAIN_HIKING);
+                    $this->set_description(self::$DESCRIPTION_MAIN_HIKING);
+                }
+                else
+                {
+                    $this->set_title(sprintf(self::$TITLE_PAGINATED_HIKING, $this->page, $this->total_pages));
+                    $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_HIKING, $this->page, $this->total_pages));
+                }
+                $this->set_keywords(self::$KEYWORD_ARRAY_HIKING);
+            break;
+            case 'Personal' :
+                if($this->page == 1)
+                {
+                    $this->set_title(self::$TITLE_MAIN_PERSONAL);
+                    $this->set_description(self::$DESCRIPTION_MAIN_PERSONAL);
+                }
+                else
+                {
+                    $this->set_title(sprintf(self::$TITLE_PAGINATED_PERSONAL, $this->page, $this->total_pages));
+                    $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_PERSONAL, $this->page, $this->total_pages));
+                }
+                $this->set_keywords(self::$KEYWORD_ARRAY_PERSONAL);
+            break;
+            case 'Web Development' :
+                if($this->page == 1)
+                {
+                    $this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT);
+                    $this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT);
+                }
+                else
+                {
+                    $this->set_title(sprintf(self::$TITLE_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
+                    $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
+                }
+                $this->set_keywords(self::$KEYWORD_ARRAY_WEBDEVELOPMENT);
+            break;
+        }
+    }
+
+    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('category', $this->category->link);
 			
-			$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' => "Posts about {$this->category->display}, page {$this->page} of {$this->total_pages}.");
-	}
-
-	protected function get_page_number()
-	{
-		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
-
-	protected function get_list_results()
-	{
+        return array(
+            'title' => "Posts about {$this->category->display}, page {$this->page} of {$this->total_pages}.");
+    }
+
+    protected function get_page_number()
+    {
+        $page = URLDecode::getPiece(2);
+        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->getActivePostsByCategory($this->category->link, 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(), $this->category->display);
-	}
-
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/{$this->category->link}/")->activate();
-		return Content::instance('URLSafe', "/{$this->category->link}/" . ($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', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate();
-	}
-
-	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count)) {
+        return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->category->display);
+    }
+
+    protected function get_list_next_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return Content::instance('URLSafe', "/{$this->category->link}/")->activate();
+        return Content::instance('URLSafe', "/{$this->category->link}/" . ($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', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate();
+    }
+
+    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->getActivePostsCountByCategory($this->category->link);
     }
-		return $this->total_post_count;
-	}
+        return $this->total_post_count;
+    }
 
 }

Braces +35 added lines, -34 removed lines

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

+{

 
 	private static $TITLE_MAIN_HIKING = "Hiking | Posts on Upper Peninsula Exploring on Jacob Emerick's Blog";
 	private static $DESCRIPTION_MAIN_HIKING = "Posts on Jacob Emerick's Blog about hiking the Upper Peninsula, exploring the Huron Mountains, and hunting waterfalls in the Keweenaw.";
@@ -53,8 +53,8 @@ 
 
 	private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts in the %s category.';
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		$url = URLDecode::getPiece(1);
 		$this->category = (object) array(
 			'display' => ucwords(str_replace('-', ' ', $url)),
@@ -63,8 +63,8 @@ 
 		parent::__construct();
 	}
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
 		switch($this->category->display)
@@ -74,8 +74,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_HIKING);
 					$this->set_description(self::$DESCRIPTION_MAIN_HIKING);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_HIKING, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_HIKING, $this->page, $this->total_pages));
@@ -87,8 +86,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_PERSONAL);
 					$this->set_description(self::$DESCRIPTION_MAIN_PERSONAL);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_PERSONAL, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_PERSONAL, $this->page, $this->total_pages));
@@ -100,8 +98,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT);
 					$this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
@@ -111,8 +108,8 @@ 
 		}
 	}
 
-	protected function get_introduction()
-	{
+	protected function get_introduction()

+	{

 		if($this->page == 1)
 		{
         global $container;
@@ -131,48 +128,52 @@ 
 			'title' => "Posts about {$this->category->display}, page {$this->page} of {$this->total_pages}.");
 	}
 
-	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_list_results()
-	{
+	protected function get_list_results()

+	{

         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         return $repository->getActivePostsByCategory($this->category->link, 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(), $this->category->display);
 	}
 
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/{$this->category->link}/")->activate();
+	protected function get_list_next_link()

+	{

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

+					return;

+		}

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

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

+		}

 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($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', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate();
 	}
 
 	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/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',