jacobemerick / web

controller/waterfalls/CompanionListController.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
 		$alias = URLDecode::getPiece(2);
 		$this->companion = CompanionCollector::getByAlias($alias);
 		
-		if(!$this->companion)
+		if (!$this->companion)
 			$this->eject();
 		
 		parent::__construct();
@@ -37,7 +37,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = "Hiking Stories with {$this->companion->name} | " . self::$WEBSITE_TITLE;
+		$meta_array['title'] = "Hiking Stories with {$this->companion->name} | ".self::$WEBSITE_TITLE;
 		$meta_array['description'] = $this->companion->description;
 		$meta_array['keywords'] = $this->get_keyword_array();
 		
@@ -48,7 +48,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->companion->name, $this->page, $this->page_count);
+		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE.' | '.self::$WEBSITE_TITLE, $this->companion->name, $this->page, $this->page_count);
 		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->companion->name);
 		$meta_array['keywords'] = $this->get_keyword_array();
 		

Indentation +87 added lines, -87 removed lines

@@ -6,102 +6,102 @@
 final class CompanionListController extends DefaultLogListController
 {
 
-	private static $DEFAULT_TITLE = 'Hiking with %s, Page %d of %d';
-	private static $DEFAULT_DESCRIPTION = 'Page %d of %d of legendary hiking stories with %s written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
-	private static $DEFAULT_HEADER = 'Page %d of Legendary Hiking Stories with %s';
-
-	private static $KEYWORD_ARRAY = array(
-		'hiking companions',
-		'journal',
-		'stories',
-		'blog',
-		'waterfalls');
-
-	private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d journal entries with %COMPANION%';
-	private static $LINK_ROOT = '/companion/%s/';
-
-	private $companion;
-
-	public function __construct()
-	{
-		$alias = URLDecode::getPiece(2);
-		$this->companion = CompanionCollector::getByAlias($alias);
+    private static $DEFAULT_TITLE = 'Hiking with %s, Page %d of %d';
+    private static $DEFAULT_DESCRIPTION = 'Page %d of %d of legendary hiking stories with %s written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
+    private static $DEFAULT_HEADER = 'Page %d of Legendary Hiking Stories with %s';
+
+    private static $KEYWORD_ARRAY = array(
+        'hiking companions',
+        'journal',
+        'stories',
+        'blog',
+        'waterfalls');
+
+    private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d journal entries with %COMPANION%';
+    private static $LINK_ROOT = '/companion/%s/';
+
+    private $companion;
+
+    public function __construct()
+    {
+        $alias = URLDecode::getPiece(2);
+        $this->companion = CompanionCollector::getByAlias($alias);
 		
-		if(!$this->companion)
-			$this->eject();
+        if(!$this->companion)
+            $this->eject();
 		
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 
-	protected function get_initial_meta()
-	{
-		$meta_array = array();
+    protected function get_initial_meta()
+    {
+        $meta_array = array();
 		
-		$meta_array['title'] = "Hiking Stories with {$this->companion->name} | " . self::$WEBSITE_TITLE;
-		$meta_array['description'] = $this->companion->description;
-		$meta_array['keywords'] = $this->get_keyword_array();
+        $meta_array['title'] = "Hiking Stories with {$this->companion->name} | " . self::$WEBSITE_TITLE;
+        $meta_array['description'] = $this->companion->description;
+        $meta_array['keywords'] = $this->get_keyword_array();
 		
-		return $meta_array;
-	}
+        return $meta_array;
+    }
 
-	protected function get_subsequent_meta()
-	{
-		$meta_array = array();
+    protected function get_subsequent_meta()
+    {
+        $meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->companion->name, $this->page, $this->page_count);
-		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->companion->name);
-		$meta_array['keywords'] = $this->get_keyword_array();
+        $meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->companion->name, $this->page, $this->page_count);
+        $meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->companion->name);
+        $meta_array['keywords'] = $this->get_keyword_array();
 		
-		return $meta_array;
-	}
-
-	private function get_keyword_array()
-	{
-		$keyword_array = self::$KEYWORD_ARRAY;
-		array_unshift($keyword_array, strtolower($this->companion->name));
-		return $keyword_array;
-	}
-
-	protected function get_initial_introduction()
-	{
-		$introduction = array();
+        return $meta_array;
+    }
+
+    private function get_keyword_array()
+    {
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, strtolower($this->companion->name));
+        return $keyword_array;
+    }
+
+    protected function get_initial_introduction()
+    {
+        $introduction = array();
 		
-		$introduction['title'] = $this->companion->title;
-		$introduction['description'] = Content::instance('FixInternalLink', $this->companion->introduction)->activate();
-		$introduction['image'] = $this->get_image_element($this->companion->photo_category, $this->companion->photo, $this->companion->photo_description, 'medium');
+        $introduction['title'] = $this->companion->title;
+        $introduction['description'] = Content::instance('FixInternalLink', $this->companion->introduction)->activate();
+        $introduction['image'] = $this->get_image_element($this->companion->photo_category, $this->companion->photo, $this->companion->photo_description, 'medium');
 		
-		return $introduction;
-	}
-
-	protected function get_subsequent_introduction()
-	{
-		return array(
-			'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->companion->name));
-	}
-
-	protected function get_page_number_piece()
-	{
-		return URLDecode::getPiece(3);
-	}
-
-	protected function get_item_result($total, $offset)
-	{
-		return CompanionCollector::getLogListForCompanion($this->companion->id, $total, $offset);
-	}
-
-	protected function get_item_count_result()
-	{
-		return CompanionCollector::getLogCountForCompanion($this->companion->id);
-	}
-
-	protected function get_list_description_pattern()
-	{
-		return str_replace('%COMPANION%', $this->companion->name, self::$NAVIGATION_DESCRIPTION);
-	}
-
-	protected function get_list_link_root()
-	{
-		return sprintf(self::$LINK_ROOT, $this->companion->alias);
-	}
+        return $introduction;
+    }
+
+    protected function get_subsequent_introduction()
+    {
+        return array(
+            'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->companion->name));
+    }
+
+    protected function get_page_number_piece()
+    {
+        return URLDecode::getPiece(3);
+    }
+
+    protected function get_item_result($total, $offset)
+    {
+        return CompanionCollector::getLogListForCompanion($this->companion->id, $total, $offset);
+    }
+
+    protected function get_item_count_result()
+    {
+        return CompanionCollector::getLogCountForCompanion($this->companion->id);
+    }
+
+    protected function get_list_description_pattern()
+    {
+        return str_replace('%COMPANION%', $this->companion->name, self::$NAVIGATION_DESCRIPTION);
+    }
+
+    protected function get_list_link_root()
+    {
+        return sprintf(self::$LINK_ROOT, $this->companion->alias);
+    }
 
 }
\ No newline at end of file

Braces +27 added lines, -26 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('collector', 'waterfall/CompanionCollector');
 Loader::load('controller', 'waterfalls/DefaultLogListController');
 
-final class CompanionListController extends DefaultLogListController
-{
+final class CompanionListController extends DefaultLogListController

+{

 
 	private static $DEFAULT_TITLE = 'Hiking with %s, Page %d of %d';
 	private static $DEFAULT_DESCRIPTION = 'Page %d of %d of legendary hiking stories with %s written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
@@ -22,19 +22,20 @@ 
 
 	private $companion;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		$alias = URLDecode::getPiece(2);
 		$this->companion = CompanionCollector::getByAlias($alias);
 		
-		if(!$this->companion)
-			$this->eject();
+		if(!$this->companion) {

+					$this->eject();

+		}

 		
 		parent::__construct();
 	}
 
-	protected function get_initial_meta()
-	{
+	protected function get_initial_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = "Hiking Stories with {$this->companion->name} | " . self::$WEBSITE_TITLE;
@@ -44,8 +45,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_subsequent_meta()
-	{
+	protected function get_subsequent_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->companion->name, $this->page, $this->page_count);
@@ -55,15 +56,15 @@ 
 		return $meta_array;
 	}
 
-	private function get_keyword_array()
-	{
+	private function get_keyword_array()

+	{

 		$keyword_array = self::$KEYWORD_ARRAY;
 		array_unshift($keyword_array, strtolower($this->companion->name));
 		return $keyword_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction()

+	{

 		$introduction = array();
 		
 		$introduction['title'] = $this->companion->title;
@@ -73,34 +74,34 @@ 
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction()

+	{

 		return array(
 			'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->companion->name));
 	}
 
-	protected function get_page_number_piece()
-	{
+	protected function get_page_number_piece()

+	{

 		return URLDecode::getPiece(3);
 	}
 
-	protected function get_item_result($total, $offset)
-	{
+	protected function get_item_result($total, $offset)

+	{

 		return CompanionCollector::getLogListForCompanion($this->companion->id, $total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result()

+	{

 		return CompanionCollector::getLogCountForCompanion($this->companion->id);
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern()

+	{

 		return str_replace('%COMPANION%', $this->companion->name, self::$NAVIGATION_DESCRIPTION);
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root()

+	{

 		return sprintf(self::$LINK_ROOT, $this->companion->alias);
 	}
 

controller/waterfalls/WaterfallListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
+		$meta_array['title'] = self::$PRIMARY_TITLE.' | '.self::$WEBSITE_TITLE;
 		$meta_array['description'] = self::$PRIMARY_DESCRIPTION;
 		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
 		
@@ -43,7 +43,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page, $this->page_count);
+		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE.' | '.self::$WEBSITE_TITLE, $this->page, $this->page_count);
 		$meta_array['description'] = sprintf(self::$SECONDARY_DESCRIPTION, $this->page, $this->page_count);
 		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
 		

Indentation +78 added lines, -78 removed lines

@@ -1,97 +1,97 @@
 <?
 
 Loader::load('collector', array(
-	'image/PhotoCollector',
-	'waterfall/WaterfallCollector'));
+    'image/PhotoCollector',
+    'waterfall/WaterfallCollector'));
 Loader::load('controller', 'waterfalls/DefaultWaterfallListController');
 
 final class WaterfallListController extends DefaultWaterfallListController
 {
 
-	private static $PRIMARY_TITLE = 'Full Listing of Falls';
-	private static $PRIMARY_DESCRIPTION = 'List of waterfalls found in the general Keweenaw Area, complete with photos, descriptions, directions, and maps.';
-	private static $PRIMARY_INTRODUCTION_HEADER = 'A Giant List of Waterfalls';
-	private static $PRIMARY_INTRODUCTION_IMAGE = 2212;
-	private static $PRIMARY_INTRODUCTION_DESCRIPTION = "Jacob has been to a lot of waterfalls. From the sandstone drops of Ontonagon to the volcanic plunges of the Huron Mountains to Keweenaw Ridge's craggy slides, he's gotten around. Some of the falls end up being surprising finds, numerous drops that are not documented anywhere else, while others end up being huge disappointments that barely warrant the long searches and planning stages.";
-
-	private static $SECONDARY_TITLE = 'Falls Listing, Page %d of %d';
-	private static $SECONDARY_DESCRIPTION = 'Page %d of %d of waterfalls found in the general Keweenaw area.';
-	private static $SECONDARY_INTRODUCTION_HEADER = 'Page %d of %d of the full waterfall listing';
-
-	private static $KEYWORD_ARRAY = array(
-		'journal',
-		'stories',
-		'blog',
-		'waterfalls',
-		'hiking companions');
-
-	private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d total waterfalls';
-	private static $LINK_ROOT = '/falls/';
-
-	protected function get_initial_meta()
-	{
-		$meta_array = array();
+    private static $PRIMARY_TITLE = 'Full Listing of Falls';
+    private static $PRIMARY_DESCRIPTION = 'List of waterfalls found in the general Keweenaw Area, complete with photos, descriptions, directions, and maps.';
+    private static $PRIMARY_INTRODUCTION_HEADER = 'A Giant List of Waterfalls';
+    private static $PRIMARY_INTRODUCTION_IMAGE = 2212;
+    private static $PRIMARY_INTRODUCTION_DESCRIPTION = "Jacob has been to a lot of waterfalls. From the sandstone drops of Ontonagon to the volcanic plunges of the Huron Mountains to Keweenaw Ridge's craggy slides, he's gotten around. Some of the falls end up being surprising finds, numerous drops that are not documented anywhere else, while others end up being huge disappointments that barely warrant the long searches and planning stages.";
+
+    private static $SECONDARY_TITLE = 'Falls Listing, Page %d of %d';
+    private static $SECONDARY_DESCRIPTION = 'Page %d of %d of waterfalls found in the general Keweenaw area.';
+    private static $SECONDARY_INTRODUCTION_HEADER = 'Page %d of %d of the full waterfall listing';
+
+    private static $KEYWORD_ARRAY = array(
+        'journal',
+        'stories',
+        'blog',
+        'waterfalls',
+        'hiking companions');
+
+    private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d total waterfalls';
+    private static $LINK_ROOT = '/falls/';
+
+    protected function get_initial_meta()
+    {
+        $meta_array = array();
 		
-		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
-		$meta_array['description'] = self::$PRIMARY_DESCRIPTION;
-		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
+        $meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
+        $meta_array['description'] = self::$PRIMARY_DESCRIPTION;
+        $meta_array['keywords'] = self::$KEYWORD_ARRAY;
 		
-		return $meta_array;
-	}
+        return $meta_array;
+    }
 
-	protected function get_subsequent_meta()
-	{
-		$meta_array = array();
+    protected function get_subsequent_meta()
+    {
+        $meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page, $this->page_count);
-		$meta_array['description'] = sprintf(self::$SECONDARY_DESCRIPTION, $this->page, $this->page_count);
-		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
+        $meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page, $this->page_count);
+        $meta_array['description'] = sprintf(self::$SECONDARY_DESCRIPTION, $this->page, $this->page_count);
+        $meta_array['keywords'] = self::$KEYWORD_ARRAY;
 		
-		return $meta_array;
-	}
+        return $meta_array;
+    }
 
-	protected function get_initial_introduction()
-	{
-		$introduction = array();
+    protected function get_initial_introduction()
+    {
+        $introduction = array();
 		
-		$introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
-		$introduction['description'] = self::$PRIMARY_INTRODUCTION_DESCRIPTION;
+        $introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
+        $introduction['description'] = self::$PRIMARY_INTRODUCTION_DESCRIPTION;
 		
-		$image = PhotoCollector::getRow(self::$PRIMARY_INTRODUCTION_IMAGE);
-		$introduction['image'] = $this->get_image_element($image->category, $image->name, $image->description, 'medium');
+        $image = PhotoCollector::getRow(self::$PRIMARY_INTRODUCTION_IMAGE);
+        $introduction['image'] = $this->get_image_element($image->category, $image->name, $image->description, 'medium');
 		
-		return $introduction;
-	}
-
-	protected function get_subsequent_introduction()
-	{
-		return array(
-			'title' => sprintf(self::$SECONDARY_INTRODUCTION_HEADER, $this->page, $this->page_count));
-	}
-
-	protected function get_page_number_piece()
-	{
-		return URLDecode::getPiece(2);
-	}
-
-	protected function get_item_result($total, $offset)
-	{
-		return WaterfallCollector::getList($total, $offset);
-	}
-
-	protected function get_item_count_result()
-	{
-		return WaterfallCollector::getListCount();
-	}
-
-	protected function get_list_description_pattern()
-	{
-		return self::$NAVIGATION_DESCRIPTION;
-	}
-
-	protected function get_list_link_root()
-	{
-		return self::$LINK_ROOT;
-	}
+        return $introduction;
+    }
+
+    protected function get_subsequent_introduction()
+    {
+        return array(
+            'title' => sprintf(self::$SECONDARY_INTRODUCTION_HEADER, $this->page, $this->page_count));
+    }
+
+    protected function get_page_number_piece()
+    {
+        return URLDecode::getPiece(2);
+    }
+
+    protected function get_item_result($total, $offset)
+    {
+        return WaterfallCollector::getList($total, $offset);
+    }
+
+    protected function get_item_count_result()
+    {
+        return WaterfallCollector::getListCount();
+    }
+
+    protected function get_list_description_pattern()
+    {
+        return self::$NAVIGATION_DESCRIPTION;
+    }
+
+    protected function get_list_link_root()
+    {
+        return self::$LINK_ROOT;
+    }
 
 }

Braces +20 added lines, -20 removed lines

@@ -5,8 +5,8 @@ 
 	'waterfall/WaterfallCollector'));
 Loader::load('controller', 'waterfalls/DefaultWaterfallListController');
 
-final class WaterfallListController extends DefaultWaterfallListController
-{
+final class WaterfallListController extends DefaultWaterfallListController

+{

 
 	private static $PRIMARY_TITLE = 'Full Listing of Falls';
 	private static $PRIMARY_DESCRIPTION = 'List of waterfalls found in the general Keweenaw Area, complete with photos, descriptions, directions, and maps.';
@@ -28,8 +28,8 @@ 
 	private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d total waterfalls';
 	private static $LINK_ROOT = '/falls/';
 
-	protected function get_initial_meta()
-	{
+	protected function get_initial_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
@@ -39,8 +39,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_subsequent_meta()
-	{
+	protected function get_subsequent_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page, $this->page_count);
@@ -50,8 +50,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction()

+	{

 		$introduction = array();
 		
 		$introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
@@ -63,34 +63,34 @@ 
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction()

+	{

 		return array(
 			'title' => sprintf(self::$SECONDARY_INTRODUCTION_HEADER, $this->page, $this->page_count));
 	}
 
-	protected function get_page_number_piece()
-	{
+	protected function get_page_number_piece()

+	{

 		return URLDecode::getPiece(2);
 	}
 
-	protected function get_item_result($total, $offset)
-	{
+	protected function get_item_result($total, $offset)

+	{

 		return WaterfallCollector::getList($total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result()

+	{

 		return WaterfallCollector::getListCount();
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern()

+	{

 		return self::$NAVIGATION_DESCRIPTION;
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root()

+	{

 		return self::$LINK_ROOT;
 	}
 

controller/waterfalls/LogListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
+		$meta_array['title'] = self::$PRIMARY_TITLE.' | '.self::$WEBSITE_TITLE;
 		$meta_array['description'] = self::$PRIMARY_DESCRIPTION;
 		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
 		
@@ -43,7 +43,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page);
+		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE.' | '.self::$WEBSITE_TITLE, $this->page);
 		$meta_array['description'] = sprintf(self::$SECONDARY_DESCRIPTION, $this->page, $this->page_count);
 		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
 		

Indentation +78 added lines, -78 removed lines

@@ -1,97 +1,97 @@
 <?
 
 Loader::load('collector', array(
-	'image/PhotoCollector',
-	'waterfall/LogCollector'));
+    'image/PhotoCollector',
+    'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultLogListController');
 
 final class LogListController extends DefaultLogListController
 {
 
-	private static $PRIMARY_TITLE = 'Journal from Waterfall Hikes';
-	private static $PRIMARY_DESCRIPTION = 'Stories written by Jacob Emerick about his epic waterfall adventures in the general Keweenaw, Ontonagon, and Marquette areas.';
-	private static $PRIMARY_INTRODUCTION_HEADER = 'Journal of Waterfall Adventuring';
-	private static $PRIMARY_INTRODUCTION_IMAGE = 707;
-	private static $PRIMARY_INTRODUCTION_DESCRIPTION = 'Whether he is hiking alone through the woods, with Logan running ahead to chase down deer, or with a group of friends, every hike that Jacob sets out turns into an adventure. Hopping from slick rock to rock along a small creek in the city, splashing through deep water over an uncertain riverbed, or pushing thick branches out of the way in thick brush, every journey turns into a little story of discovery.';
-
-	private static $SECONDARY_TITLE = 'Journal Entries - Page %d';
-	private static $SECONDARY_DESCRIPTION = 'Page %d of %d of epic hiking stories written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
-	private static $SECONDARY_INTRODUCTION_HEADER = 'Waterfall Adventure Journal, Page %d of %d';
-
-	private static $KEYWORD_ARRAY = array(
-		'journal',
-		'travel log',
-		'blog',
-		'waterfalls',
-		'hiking companions');
-
-	private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d total journal entries';
-	private static $LINK_ROOT = '/journal/';
-
-	protected function get_initial_meta()
-	{
-		$meta_array = array();
+    private static $PRIMARY_TITLE = 'Journal from Waterfall Hikes';
+    private static $PRIMARY_DESCRIPTION = 'Stories written by Jacob Emerick about his epic waterfall adventures in the general Keweenaw, Ontonagon, and Marquette areas.';
+    private static $PRIMARY_INTRODUCTION_HEADER = 'Journal of Waterfall Adventuring';
+    private static $PRIMARY_INTRODUCTION_IMAGE = 707;
+    private static $PRIMARY_INTRODUCTION_DESCRIPTION = 'Whether he is hiking alone through the woods, with Logan running ahead to chase down deer, or with a group of friends, every hike that Jacob sets out turns into an adventure. Hopping from slick rock to rock along a small creek in the city, splashing through deep water over an uncertain riverbed, or pushing thick branches out of the way in thick brush, every journey turns into a little story of discovery.';
+
+    private static $SECONDARY_TITLE = 'Journal Entries - Page %d';
+    private static $SECONDARY_DESCRIPTION = 'Page %d of %d of epic hiking stories written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
+    private static $SECONDARY_INTRODUCTION_HEADER = 'Waterfall Adventure Journal, Page %d of %d';
+
+    private static $KEYWORD_ARRAY = array(
+        'journal',
+        'travel log',
+        'blog',
+        'waterfalls',
+        'hiking companions');
+
+    private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d total journal entries';
+    private static $LINK_ROOT = '/journal/';
+
+    protected function get_initial_meta()
+    {
+        $meta_array = array();
 		
-		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
-		$meta_array['description'] = self::$PRIMARY_DESCRIPTION;
-		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
+        $meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
+        $meta_array['description'] = self::$PRIMARY_DESCRIPTION;
+        $meta_array['keywords'] = self::$KEYWORD_ARRAY;
 		
-		return $meta_array;
-	}
+        return $meta_array;
+    }
 
-	protected function get_subsequent_meta()
-	{
-		$meta_array = array();
+    protected function get_subsequent_meta()
+    {
+        $meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page);
-		$meta_array['description'] = sprintf(self::$SECONDARY_DESCRIPTION, $this->page, $this->page_count);
-		$meta_array['keywords'] = self::$KEYWORD_ARRAY;
+        $meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page);
+        $meta_array['description'] = sprintf(self::$SECONDARY_DESCRIPTION, $this->page, $this->page_count);
+        $meta_array['keywords'] = self::$KEYWORD_ARRAY;
 		
-		return $meta_array;
-	}
+        return $meta_array;
+    }
 
-	protected function get_initial_introduction()
-	{
-		$introduction = array();
+    protected function get_initial_introduction()
+    {
+        $introduction = array();
 		
-		$introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
-		$introduction['description'] = self::$PRIMARY_INTRODUCTION_DESCRIPTION;
+        $introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
+        $introduction['description'] = self::$PRIMARY_INTRODUCTION_DESCRIPTION;
 		
-		$image = PhotoCollector::getRow(self::$PRIMARY_INTRODUCTION_IMAGE);
-		$introduction['image'] = $this->get_image_element($image->category, $image->name, $image->description, 'medium');
+        $image = PhotoCollector::getRow(self::$PRIMARY_INTRODUCTION_IMAGE);
+        $introduction['image'] = $this->get_image_element($image->category, $image->name, $image->description, 'medium');
 		
-		return $introduction;
-	}
-
-	protected function get_subsequent_introduction()
-	{
-		return array(
-			'title' => sprintf(self::$SECONDARY_INTRODUCTION_HEADER, $this->page, $this->page_count));
-	}
-
-	protected function get_page_number_piece()
-	{
-		return URLDecode::getPiece(2);
-	}
-
-	protected function get_item_result($total, $offset)
-	{
-		return LogCollector::getList($total, $offset);
-	}
-
-	protected function get_item_count_result()
-	{
-		return LogCollector::getListCount();
-	}
-
-	protected function get_list_description_pattern()
-	{
-		return self::$NAVIGATION_DESCRIPTION;
-	}
-
-	protected function get_list_link_root()
-	{
-		return self::$LINK_ROOT;
-	}
+        return $introduction;
+    }
+
+    protected function get_subsequent_introduction()
+    {
+        return array(
+            'title' => sprintf(self::$SECONDARY_INTRODUCTION_HEADER, $this->page, $this->page_count));
+    }
+
+    protected function get_page_number_piece()
+    {
+        return URLDecode::getPiece(2);
+    }
+
+    protected function get_item_result($total, $offset)
+    {
+        return LogCollector::getList($total, $offset);
+    }
+
+    protected function get_item_count_result()
+    {
+        return LogCollector::getListCount();
+    }
+
+    protected function get_list_description_pattern()
+    {
+        return self::$NAVIGATION_DESCRIPTION;
+    }
+
+    protected function get_list_link_root()
+    {
+        return self::$LINK_ROOT;
+    }
 
 }
\ No newline at end of file

Braces +20 added lines, -20 removed lines

@@ -5,8 +5,8 @@ 
 	'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultLogListController');
 
-final class LogListController extends DefaultLogListController
-{
+final class LogListController extends DefaultLogListController

+{

 
 	private static $PRIMARY_TITLE = 'Journal from Waterfall Hikes';
 	private static $PRIMARY_DESCRIPTION = 'Stories written by Jacob Emerick about his epic waterfall adventures in the general Keweenaw, Ontonagon, and Marquette areas.';
@@ -28,8 +28,8 @@ 
 	private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d total journal entries';
 	private static $LINK_ROOT = '/journal/';
 
-	protected function get_initial_meta()
-	{
+	protected function get_initial_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
@@ -39,8 +39,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_subsequent_meta()
-	{
+	protected function get_subsequent_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page);
@@ -50,8 +50,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction()

+	{

 		$introduction = array();
 		
 		$introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
@@ -63,34 +63,34 @@ 
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction()

+	{

 		return array(
 			'title' => sprintf(self::$SECONDARY_INTRODUCTION_HEADER, $this->page, $this->page_count));
 	}
 
-	protected function get_page_number_piece()
-	{
+	protected function get_page_number_piece()

+	{

 		return URLDecode::getPiece(2);
 	}
 
-	protected function get_item_result($total, $offset)
-	{
+	protected function get_item_result($total, $offset)

+	{

 		return LogCollector::getList($total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result()

+	{

 		return LogCollector::getListCount();
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern()

+	{

 		return self::$NAVIGATION_DESCRIPTION;
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root()

+	{

 		return self::$LINK_ROOT;
 	}
 

controller/waterfalls/WatercourseListController.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 		$path = URLDecode::getPiece(1);
 		$this->watercourse = WatercourseCollector::getByAlias($path);
 		
-		if(!$this->watercourse)
+		if (!$this->watercourse)
 			$this->eject();
 	
 		parent::__construct();
@@ -39,7 +39,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = "{$this->watercourse->name} | " . self::$WEBSITE_TITLE;
+		$meta_array['title'] = "{$this->watercourse->name} | ".self::$WEBSITE_TITLE;
 		$meta_array['description'] = $this->watercourse->description;
 		$meta_array['keywords'] = $this->get_keyword_array();
 		
@@ -50,7 +50,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->watercourse->name, $this->page, $this->page_count);
+		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE.' | '.self::$WEBSITE_TITLE, $this->watercourse->name, $this->page, $this->page_count);
 		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->watercourse->name);
 		$meta_array['keywords'] = $this->get_keyword_array();
 		

Indentation +89 added lines, -89 removed lines

@@ -6,109 +6,109 @@
 final class WatercourseListController extends DefaultWaterfallListController
 {
 
-	private static $DEFAULT_TITLE = 'Hiking with %s, Page %d of %d';
-	private static $DEFAULT_DESCRIPTION = 'Page %d of %d of legendary hiking stories with %s written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
-	private static $DEFAULT_HEADER = 'Page %d of Legendary Hiking Stories with %s';
+    private static $DEFAULT_TITLE = 'Hiking with %s, Page %d of %d';
+    private static $DEFAULT_DESCRIPTION = 'Page %d of %d of legendary hiking stories with %s written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
+    private static $DEFAULT_HEADER = 'Page %d of Legendary Hiking Stories with %s';
 
-	private static $KEYWORD_ARRAY = array(
-		'hiking companions',
-		'journal',
-		'stories',
-		'blog',
-		'waterfalls');
+    private static $KEYWORD_ARRAY = array(
+        'hiking companions',
+        'journal',
+        'stories',
+        'blog',
+        'waterfalls');
 
-	private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d waterfalls in %COUNTY%';
-	private static $LINK_ROOT = '/%s/';
+    private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d waterfalls in %COUNTY%';
+    private static $LINK_ROOT = '/%s/';
 
-	protected static $ITEM_COUNT_PER_PAGE = 12;
+    protected static $ITEM_COUNT_PER_PAGE = 12;
 
-	private $watercourse;
+    private $watercourse;
 
-	public function __construct()
-	{
-		$path = URLDecode::getPiece(1);
-		$this->watercourse = WatercourseCollector::getByAlias($path);
+    public function __construct()
+    {
+        $path = URLDecode::getPiece(1);
+        $this->watercourse = WatercourseCollector::getByAlias($path);
 		
-		if(!$this->watercourse)
-			$this->eject();
+        if(!$this->watercourse)
+            $this->eject();
 	
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 
-	protected function get_initial_meta()
-	{
-		$meta_array = array();
+    protected function get_initial_meta()
+    {
+        $meta_array = array();
 		
-		$meta_array['title'] = "{$this->watercourse->name} | " . self::$WEBSITE_TITLE;
-		$meta_array['description'] = $this->watercourse->description;
-		$meta_array['keywords'] = $this->get_keyword_array();
+        $meta_array['title'] = "{$this->watercourse->name} | " . self::$WEBSITE_TITLE;
+        $meta_array['description'] = $this->watercourse->description;
+        $meta_array['keywords'] = $this->get_keyword_array();
 		
-		return $meta_array;
-	}
+        return $meta_array;
+    }
 
-	protected function get_subsequent_meta()
-	{
-		$meta_array = array();
+    protected function get_subsequent_meta()
+    {
+        $meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->watercourse->name, $this->page, $this->page_count);
-		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->watercourse->name);
-		$meta_array['keywords'] = $this->get_keyword_array();
+        $meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->watercourse->name, $this->page, $this->page_count);
+        $meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->watercourse->name);
+        $meta_array['keywords'] = $this->get_keyword_array();
 		
-		return $meta_array;
-	}
-
-	private function get_keyword_array()
-	{
-		$keyword_array = self::$KEYWORD_ARRAY;
-		array_unshift($keyword_array, strtolower($this->watercourse->name));
-		return $keyword_array;
-	}
-
-	protected function get_initial_introduction()
-	{
-		$introduction = array();
+        return $meta_array;
+    }
+
+    private function get_keyword_array()
+    {
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, strtolower($this->watercourse->name));
+        return $keyword_array;
+    }
+
+    protected function get_initial_introduction()
+    {
+        $introduction = array();
 		
-		$introduction['title'] = $this->watercourse->header;
-		$introduction['description'] = Content::instance('FixInternalLink', $this->watercourse->introduction)->activate();
-		$introduction['image'] = $this->get_image_element($this->watercourse->photo_category, $this->watercourse->photo, $this->watercourse->photo_description, 'medium');
+        $introduction['title'] = $this->watercourse->header;
+        $introduction['description'] = Content::instance('FixInternalLink', $this->watercourse->introduction)->activate();
+        $introduction['image'] = $this->get_image_element($this->watercourse->photo_category, $this->watercourse->photo, $this->watercourse->photo_description, 'medium');
 		
-		return $introduction;
-	}
-
-	protected function get_subsequent_introduction()
-	{
-		return array(
-			'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->watercourse->name));
-	}
-
-	protected function get_item_count_per_page()
-	{
-		return self::$ITEM_COUNT_PER_PAGE;
-	}
-
-	protected function get_page_number_piece()
-	{
-		return URLDecode::getPiece(2);
-	}
-
-	protected function get_item_result($total, $offset)
-	{
-		return WatercourseCollector::getLogListForWatercourse($this->watercourse->id, $total, $offset);
-	}
-
-	protected function get_item_count_result()
-	{
-		return WatercourseCollector::getLogCountForWatercourse($this->watercourse->id);
-	}
-
-	protected function get_list_description_pattern()
-	{
-		return str_replace('%COUNTY%', $this->watercourse->name, self::$NAVIGATION_DESCRIPTION);
-	}
-
-	protected function get_list_link_root()
-	{
-		return sprintf(self::$LINK_ROOT, $this->watercourse->alias);
-	}
+        return $introduction;
+    }
+
+    protected function get_subsequent_introduction()
+    {
+        return array(
+            'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->watercourse->name));
+    }
+
+    protected function get_item_count_per_page()
+    {
+        return self::$ITEM_COUNT_PER_PAGE;
+    }
+
+    protected function get_page_number_piece()
+    {
+        return URLDecode::getPiece(2);
+    }
+
+    protected function get_item_result($total, $offset)
+    {
+        return WatercourseCollector::getLogListForWatercourse($this->watercourse->id, $total, $offset);
+    }
+
+    protected function get_item_count_result()
+    {
+        return WatercourseCollector::getLogCountForWatercourse($this->watercourse->id);
+    }
+
+    protected function get_list_description_pattern()
+    {
+        return str_replace('%COUNTY%', $this->watercourse->name, self::$NAVIGATION_DESCRIPTION);
+    }
+
+    protected function get_list_link_root()
+    {
+        return sprintf(self::$LINK_ROOT, $this->watercourse->alias);
+    }
 
 }
\ No newline at end of file

Braces +29 added lines, -28 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('collector', 'waterfall/WaterfallCollector');
 Loader::load('controller', 'waterfalls/DefaultWaterfallListController');
 
-final class WatercourseListController extends DefaultWaterfallListController
-{
+final class WatercourseListController extends DefaultWaterfallListController

+{

 
 	private static $DEFAULT_TITLE = 'Hiking with %s, Page %d of %d';
 	private static $DEFAULT_DESCRIPTION = 'Page %d of %d of legendary hiking stories with %s written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
@@ -24,19 +24,20 @@ 
 
 	private $watercourse;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		$path = URLDecode::getPiece(1);
 		$this->watercourse = WatercourseCollector::getByAlias($path);
 		
-		if(!$this->watercourse)
-			$this->eject();
+		if(!$this->watercourse) {

+					$this->eject();

+		}

 	
 		parent::__construct();
 	}
 
-	protected function get_initial_meta()
-	{
+	protected function get_initial_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = "{$this->watercourse->name} | " . self::$WEBSITE_TITLE;
@@ -46,8 +47,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_subsequent_meta()
-	{
+	protected function get_subsequent_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->watercourse->name, $this->page, $this->page_count);
@@ -57,15 +58,15 @@ 
 		return $meta_array;
 	}
 
-	private function get_keyword_array()
-	{
+	private function get_keyword_array()

+	{

 		$keyword_array = self::$KEYWORD_ARRAY;
 		array_unshift($keyword_array, strtolower($this->watercourse->name));
 		return $keyword_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction()

+	{

 		$introduction = array();
 		
 		$introduction['title'] = $this->watercourse->header;
@@ -75,39 +76,39 @@ 
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction()

+	{

 		return array(
 			'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->watercourse->name));
 	}
 
-	protected function get_item_count_per_page()
-	{
+	protected function get_item_count_per_page()

+	{

 		return self::$ITEM_COUNT_PER_PAGE;
 	}
 
-	protected function get_page_number_piece()
-	{
+	protected function get_page_number_piece()

+	{

 		return URLDecode::getPiece(2);
 	}
 
-	protected function get_item_result($total, $offset)
-	{
+	protected function get_item_result($total, $offset)

+	{

 		return WatercourseCollector::getLogListForWatercourse($this->watercourse->id, $total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result()

+	{

 		return WatercourseCollector::getLogCountForWatercourse($this->watercourse->id);
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern()

+	{

 		return str_replace('%COUNTY%', $this->watercourse->name, self::$NAVIGATION_DESCRIPTION);
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root()

+	{

 		return sprintf(self::$LINK_ROOT, $this->watercourse->alias);
 	}
 

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', 'home/DefaultPageController');
 
-final class ContactController extends DefaultPageController
-{
+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';
@@ -16,8 +16,8 @@ 
 		'email',
 		'connect');
 
-	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);
@@ -25,27 +25,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/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);

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)
 		{

Indentation +155 added lines, -155 removed lines

@@ -6,131 +6,131 @@ 
 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 ||
@@ -140,65 +140,65 @@ 
         strpos($post_row['title'], 'Across the Mazatzals') === 0 ||
         strpos($post_row['title'], 'Upper Mazzie Loop') === 0 ||
         strpos($post_row['title'], 'Moody-Coon 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']);
@@ -206,18 +206,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;
+    }
 }