jacobemerick / web

controller/waterfalls/CountyListController.class.inc.php

Indentation +88 added lines, -88 removed lines

@@ -6,108 +6,108 @@
 final class CountyListController extends DefaultWaterfallListController
 {
 
-	private static $DEFAULT_TITLE = '%s Waterfalls, Page %d of %d';
-	private static $DEFAULT_DESCRIPTION = 'Page %d of %d of awesome waterfalls in %s, located in the northwestern wilds of Micigan\'s Upper Peninsula.';
-	private static $DEFAULT_HEADER = 'Page %d of Awesome %s Waterfalls';
+    private static $DEFAULT_TITLE = '%s Waterfalls, Page %d of %d';
+    private static $DEFAULT_DESCRIPTION = 'Page %d of %d of awesome waterfalls in %s, located in the northwestern wilds of Micigan\'s Upper Peninsula.';
+    private static $DEFAULT_HEADER = 'Page %d of Awesome %s Waterfalls';
 
-	private static $KEYWORD_ARRAY = array(
-		'upper peninsula',
-		'michigan',
-		'keweenaw',
-		'waterfalls');
+    private static $KEYWORD_ARRAY = array(
+        'upper peninsula',
+        'michigan',
+        'keweenaw',
+        '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 $county;
+    private $county;
 
-	public function __construct()
-	{
-		$path = URLDecode::getPiece(1);
-		$this->county = CountyCollector::getByAlias($path);
+    public function __construct()
+    {
+        $path = URLDecode::getPiece(1);
+        $this->county = CountyCollector::getByAlias($path);
 		
-		if(!$this->county)
-			$this->eject();
+        if(!$this->county)
+            $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->county->name} Waterfalls | " . self::$WEBSITE_TITLE;
-		$meta_array['description'] = $this->county->description;
-		$meta_array['keywords'] = $this->get_keyword_array();
+        $meta_array['title'] = "{$this->county->name} Waterfalls | " . self::$WEBSITE_TITLE;
+        $meta_array['description'] = $this->county->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->county->name, $this->page, $this->page_count);
-		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->county->name);
-		$meta_array['keywords'] = $this->get_keyword_array();
+        $meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->county->name, $this->page, $this->page_count);
+        $meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->county->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->county->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->county->name));
+        return $keyword_array;
+    }
+
+    protected function get_initial_introduction()
+    {
+        $introduction = array();
 		
-		$introduction['title'] = $this->county->title;
-		$introduction['description'] = Content::instance('FixInternalLink', $this->county->introduction)->activate();
-		$introduction['image'] = $this->get_image_element($this->county->photo_category, $this->county->photo, $this->county->photo_description, 'medium');
+        $introduction['title'] = $this->county->title;
+        $introduction['description'] = Content::instance('FixInternalLink', $this->county->introduction)->activate();
+        $introduction['image'] = $this->get_image_element($this->county->photo_category, $this->county->photo, $this->county->photo_description, 'medium');
 		
-		return $introduction;
-	}
-
-	protected function get_subsequent_introduction()
-	{
-		return array(
-			'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->county->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 CountyCollector::getLogListForCounty($this->county->id, $total, $offset);
-	}
-
-	protected function get_item_count_result()
-	{
-		return CountyCollector::getLogCountForCounty($this->county->id);
-	}
-
-	protected function get_list_description_pattern()
-	{
-		return str_replace('%COUNTY%', $this->county->name, self::$NAVIGATION_DESCRIPTION);
-	}
-
-	protected function get_list_link_root()
-	{
-		return sprintf(self::$LINK_ROOT, $this->county->alias);
-	}
+        return $introduction;
+    }
+
+    protected function get_subsequent_introduction()
+    {
+        return array(
+            'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->county->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 CountyCollector::getLogListForCounty($this->county->id, $total, $offset);
+    }
+
+    protected function get_item_count_result()
+    {
+        return CountyCollector::getLogCountForCounty($this->county->id);
+    }
+
+    protected function get_list_description_pattern()
+    {
+        return str_replace('%COUNTY%', $this->county->name, self::$NAVIGATION_DESCRIPTION);
+    }
+
+    protected function get_list_link_root()
+    {
+        return sprintf(self::$LINK_ROOT, $this->county->alias);
+    }
 
 }
\ No newline at end of file

controller/waterfalls/LogTagListController.class.inc.php

Indentation +83 added lines, -83 removed lines

@@ -6,96 +6,96 @@
 final class LogTagListController 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 journal entries with %TAG%';
-	private static $LINK_ROOT = '/journal/tag/%s/';
-
-	private $tag;
-
-	public function __construct()
-	{
-		$alias = URLDecode::getPiece(3);
-		$this->tag = LogTagCollector::getTag($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 journal entries with %TAG%';
+    private static $LINK_ROOT = '/journal/tag/%s/';
+
+    private $tag;
+
+    public function __construct()
+    {
+        $alias = URLDecode::getPiece(3);
+        $this->tag = LogTagCollector::getTag($alias);
 		
-		if(!$this->tag)
-			$this->eject();
+        if(!$this->tag)
+            $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->tag->name} | " . self::$WEBSITE_TITLE;
-		$meta_array['description'] = $this->tag->name;
-		$meta_array['keywords'] = $this->get_keyword_array();
+        $meta_array['title'] = "{$this->tag->name} | " . self::$WEBSITE_TITLE;
+        $meta_array['description'] = $this->tag->name;
+        $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->tag->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->tag->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->tag->name));
-		return $keyword_array;
-	}
-
-	protected function get_initial_introduction()
-	{
-		return array(
-			'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->tag->name));
-	}
-
-	protected function get_subsequent_introduction()
-	{
-		return $this->get_initial_introduction();
-	}
-
-	protected function get_page_number_piece()
-	{
-		return URLDecode::getPiece(3);
-	}
-
-	protected function get_item_result($total, $offset)
-	{
-		return LogTagCollector::getLogListForTag($this->tag->id, $total, $offset);
-	}
-
-	protected function get_item_count_result()
-	{
-		return LogTagCollector::getLogCountForTag($this->tag->id);
-	}
-
-	protected function get_list_description_pattern()
-	{
-		return str_replace('%TAG%', $this->tag->name, self::$NAVIGATION_DESCRIPTION);
-	}
-
-	protected function get_list_link_root()
-	{
-		return sprintf(self::$LINK_ROOT, $this->tag->alias);
-	}
+        return $meta_array;
+    }
+
+    private function get_keyword_array()
+    {
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, strtolower($this->tag->name));
+        return $keyword_array;
+    }
+
+    protected function get_initial_introduction()
+    {
+        return array(
+            'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->tag->name));
+    }
+
+    protected function get_subsequent_introduction()
+    {
+        return $this->get_initial_introduction();
+    }
+
+    protected function get_page_number_piece()
+    {
+        return URLDecode::getPiece(3);
+    }
+
+    protected function get_item_result($total, $offset)
+    {
+        return LogTagCollector::getLogListForTag($this->tag->id, $total, $offset);
+    }
+
+    protected function get_item_count_result()
+    {
+        return LogTagCollector::getLogCountForTag($this->tag->id);
+    }
+
+    protected function get_list_description_pattern()
+    {
+        return str_replace('%TAG%', $this->tag->name, self::$NAVIGATION_DESCRIPTION);
+    }
+
+    protected function get_list_link_root()
+    {
+        return sprintf(self::$LINK_ROOT, $this->tag->alias);
+    }
 
 }
\ No newline at end of file

controller/waterfalls/DefaultLogListController.class.inc.php

Indentation +51 added lines, -51 removed lines

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

controller/waterfalls/WaterfallListController.class.inc.php

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;
+    }
 
 }

controller/PageController.class.inc.php

Indentation +231 added lines, -231 removed lines

@@ -5,52 +5,52 @@ 
 abstract class PageController
 {
 
-	private static $TRACKING_CODE = 'UA-11745070-1';
+    private static $TRACKING_CODE = 'UA-11745070-1';
 	
-	protected static $DEPRECATED_BLOGS = array(
-		10 => 63,
-		55 => 67,
-	);
-
-	private $headers;
-	private $css_array = array();
-	private $font_css_array = array();
-	private $js_array = array();
-
-	private $data_array = array();
-	private $body_view_array = array();
-
-	protected function set_head_data() {}
-	protected function set_body_data() {}
-	protected function set_data() {}
-
-	public function __construct()
-	{
-		$this->set_header_method('sendHTML');
+    protected static $DEPRECATED_BLOGS = array(
+        10 => 63,
+        55 => 67,
+    );
+
+    private $headers;
+    private $css_array = array();
+    private $font_css_array = array();
+    private $js_array = array();
+
+    private $data_array = array();
+    private $body_view_array = array();
+
+    protected function set_head_data() {}
+    protected function set_body_data() {}
+    protected function set_data() {}
+
+    public function __construct()
+    {
+        $this->set_header_method('sendHTML');
 		
-		$this->set_head('google_verification', 'sgAISiuoWfK54KXnOfm2oU4vQdad8eyNCQX7LkZ1OxM');
-		$this->set_head('bing_verification', 'AF1A4CEA30A7589590E9294C4B512607');
+        $this->set_head('google_verification', 'sgAISiuoWfK54KXnOfm2oU4vQdad8eyNCQX7LkZ1OxM');
+        $this->set_head('bing_verification', 'AF1A4CEA30A7589590E9294C4B512607');
 		
-		$this->set_body('domain_container', $this->get_domain_container());
-		$this->set_body('footer', array(
-			'link' => Loader::getRootUrl('site'),
-			'anchor' => 'jacobemerick.com',
-			'date' => date('Y')));
-	}
-
-	protected function get_domain_container()
-	{
-		$domain_container = new stdclass();
+        $this->set_body('domain_container', $this->get_domain_container());
+        $this->set_body('footer', array(
+            'link' => Loader::getRootUrl('site'),
+            'anchor' => 'jacobemerick.com',
+            'date' => date('Y')));
+    }
+
+    protected function get_domain_container()
+    {
+        $domain_container = new stdclass();
 		
-		$domain_container->blog = Loader::getRootUrl('blog');
-		$domain_container->home = Loader::getRootUrl('home');
-		$domain_container->lifestream = Loader::getRootUrl('lifestream');
-		$domain_container->map = Loader::getRootUrl('map');
-		$domain_container->portfolio = Loader::getRootUrl('portfolio');
-		$domain_container->waterfalls = Loader::getRootUrl('waterfalls');
+        $domain_container->blog = Loader::getRootUrl('blog');
+        $domain_container->home = Loader::getRootUrl('home');
+        $domain_container->lifestream = Loader::getRootUrl('lifestream');
+        $domain_container->map = Loader::getRootUrl('map');
+        $domain_container->portfolio = Loader::getRootUrl('portfolio');
+        $domain_container->waterfalls = Loader::getRootUrl('waterfalls');
 		
-		return $domain_container;
-	}
+        return $domain_container;
+    }
 
     protected function get_recent_activity()
     {
@@ -84,24 +84,24 @@ 
         return (object) $post;
     }
 
-	public function activate()
-	{
-		$this->set_head_data();
-		$this->set_body_data();
-		$this->set_data();
+    public function activate()
+    {
+        $this->set_head_data();
+        $this->set_body_data();
+        $this->set_data();
 		
-		$this->load_assets();
+        $this->load_assets();
 		
-		$headers = $this->headers;
-		Header::$headers();
-		Loader::load('view', '/Head', $this->data_array['head']);
-		foreach($this->body_view_array as $view)
-		{
-			if(substr($view, 0, 1) == '/')
-				Loader::load('view', $view, $this->data_array['body']);
-			else
-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
-		}
+        $headers = $this->headers;
+        Header::$headers();
+        Loader::load('view', '/Head', $this->data_array['head']);
+        foreach($this->body_view_array as $view)
+        {
+            if(substr($view, 0, 1) == '/')
+                Loader::load('view', $view, $this->data_array['body']);
+            else
+                Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
+        }
         
         if (URLDecode::getSite() == 'waterfalls') {
             Loader::load('view', '/WaterfallFoot');
@@ -109,211 +109,211 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
-			exit;
-	}
-
-	protected function set_header_method($method)
-	{
-		$this->headers = $method;
-	}
-
-	protected function set_title($value)
-	{
-		$this->set_head('title', $value);
-	}
-
-	protected function set_author($value)
-	{
-		$this->set_head('author', $value);
-	}
-
-	protected function set_description($value)
-	{
-		$this->set_head('description', $value);
-	}
-
-	protected function set_keywords($array)
-	{
-		$this->set_head('keywords', implode(', ', $array));
-	}
+        if($view == '/404' || $view == '/503')
+            exit;
+    }
+
+    protected function set_header_method($method)
+    {
+        $this->headers = $method;
+    }
+
+    protected function set_title($value)
+    {
+        $this->set_head('title', $value);
+    }
+
+    protected function set_author($value)
+    {
+        $this->set_head('author', $value);
+    }
+
+    protected function set_description($value)
+    {
+        $this->set_head('description', $value);
+    }
+
+    protected function set_keywords($array)
+    {
+        $this->set_head('keywords', implode(', ', $array));
+    }
 	
-	protected function set_canonical($url)
-	{
-		$this->set_head('canonical', $url);
-	}
-
-	protected function set_head($set, $value)
-	{
-		$this->data_array['head'][$set] = $value;
-	}
-
-	protected function set_body($set, $value)
-	{
-		$this->data_array['body'][$set] = $value;
-	}
-
-	protected function add_css($file, $version = 1)
-	{
-		$this->css_array[] = [$file, $version];
-	}
-
-	protected function add_js($file)
-	{
-		$this->js_array[] = $file;
-	}
-
-	private function load_assets()
-	{
+    protected function set_canonical($url)
+    {
+        $this->set_head('canonical', $url);
+    }
+
+    protected function set_head($set, $value)
+    {
+        $this->data_array['head'][$set] = $value;
+    }
+
+    protected function set_body($set, $value)
+    {
+        $this->data_array['body'][$set] = $value;
+    }
+
+    protected function add_css($file, $version = 1)
+    {
+        $this->css_array[] = [$file, $version];
+    }
+
+    protected function add_js($file)
+    {
+        $this->js_array[] = $file;
+    }
+
+    private function load_assets()
+    {
     $css_array = array_map(function ($stylesheet) {
-      $path = "/css/{$stylesheet[0]}.css";
-      if ($stylesheet[1] > 1) {
+        $path = "/css/{$stylesheet[0]}.css";
+        if ($stylesheet[1] > 1) {
         $path .= "?v={$stylesheet[1]}";
-      }
-      return $path;
+        }
+        return $path;
     }, $this->css_array);
     $js_array = array_map(function ($script) {
-      if (substr($script, 0, 4) == 'http') {
+        if (substr($script, 0, 4) == 'http') {
         return $script;
-      }
-      return "/js/{$script}.min.js";
+        }
+        return "/js/{$script}.min.js";
     }, $this->js_array);
 		
-		$this->set_head('css_link_array', $css_array);
-		$this->set_head('js_link_array', $js_array);
-	}
-
-	protected function set_body_view($view)
-	{
-		$this->body_view_array[] = $view;
-	}
-
-	protected function eject()
-	{
-		if(get_class($this) !== 'Error404Controller')
-			Loader::loadNew('controller', '/Error404Controller')->activate();
-	}
-
-	protected function unavailable()
-	{
-		if(get_class($this) !== 'Error503Controller')
-			Loader::loadNew('controller', '/Error503Controller')->activate();
-	}
-
-	protected function redirect($uri, $method = 301)
-	{
-		switch($method)
-		{
-			case 301 :
-				if(get_class($this) !== 'Error301Controller')
-					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
-				break;
-			case 303 :
-				if(get_class($this) !== 'Error303Controller')
-					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
-				break;
-		}
-	}
-
-	final protected function get_parsed_date($date)
-	{
-		$parsed_date = new stdclass();
+        $this->set_head('css_link_array', $css_array);
+        $this->set_head('js_link_array', $js_array);
+    }
+
+    protected function set_body_view($view)
+    {
+        $this->body_view_array[] = $view;
+    }
+
+    protected function eject()
+    {
+        if(get_class($this) !== 'Error404Controller')
+            Loader::loadNew('controller', '/Error404Controller')->activate();
+    }
+
+    protected function unavailable()
+    {
+        if(get_class($this) !== 'Error503Controller')
+            Loader::loadNew('controller', '/Error503Controller')->activate();
+    }
+
+    protected function redirect($uri, $method = 301)
+    {
+        switch($method)
+        {
+            case 301 :
+                if(get_class($this) !== 'Error301Controller')
+                    Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
+                break;
+            case 303 :
+                if(get_class($this) !== 'Error303Controller')
+                    Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
+                break;
+        }
+    }
+
+    final protected function get_parsed_date($date)
+    {
+        $parsed_date = new stdclass();
 		
-		$parsed_date->stamp = date('c', strtotime($date));
-		$parsed_date->friendly = date('F j, Y', strtotime($date));
-		$parsed_date->elapsed = Content::instance('ElapsedTime', $date)->activate();
+        $parsed_date->stamp = date('c', strtotime($date));
+        $parsed_date->friendly = date('F j, Y', strtotime($date));
+        $parsed_date->elapsed = Content::instance('ElapsedTime', $date)->activate();
 		
-		return $parsed_date;
-	}
-
-	private $comment_errors;
-	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
-	{
-		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
-		{
-			$parameters = array($site_id, $path, $redirect_url, $page_title);
-			$this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
-		}
+        return $parsed_date;
+    }
+
+    private $comment_errors;
+    protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
+    {
+        if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
+        {
+            $parameters = array($site_id, $path, $redirect_url, $page_title);
+            $this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
+        }
 		
-		return;
-	}
+        return;
+    }
 
-	protected function get_comment_array($site, $path)
-	{
-		Loader::load('collector', 'comment/CommentCollector');
+    protected function get_comment_array($site, $path)
+    {
+        Loader::load('collector', 'comment/CommentCollector');
 		
-		$commenter = $this->get_commenter();
+        $commenter = $this->get_commenter();
 		
-		$comment_array = array();
-		$comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);
+        $comment_array = array();
+        $comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);
 		
-		foreach($comment_result as $comment)
-		{
-			$comment_object = new stdclass();
-			$comment_object->id = $comment->id;
-			$comment_object->body = $comment->body_format;
-			$comment_object->date = date("M j, 'y", strtotime($comment->date));
-			$comment_object->name = $comment->name;
-			$comment_object->url = $comment->url;
-			$comment_object->trusted = $comment->trusted;
+        foreach($comment_result as $comment)
+        {
+            $comment_object = new stdclass();
+            $comment_object->id = $comment->id;
+            $comment_object->body = $comment->body_format;
+            $comment_object->date = date("M j, 'y", strtotime($comment->date));
+            $comment_object->name = $comment->name;
+            $comment_object->url = $comment->url;
+            $comment_object->trusted = $comment->trusted;
 			
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
-				$comment_object->errors = $this->comment_errors;
-			else
-				$comment_object->errors = array();
+            if($comment->reply == 0 && Request::getPost('type') == $comment->id)
+                $comment_object->errors = $this->comment_errors;
+            else
+                $comment_object->errors = array();
 			
-			if($comment->reply == 0)
-			{
-				$comment_object->replies = array();
-				$comment_array[$comment->id] = $comment_object;
-			}
-			else
-				$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;
-		}
+            if($comment->reply == 0)
+            {
+                $comment_object->replies = array();
+                $comment_array[$comment->id] = $comment_object;
+            }
+            else
+                $comment_array[$comment->reply]->replies[$comment->id] = $comment_object;
+        }
 		
-		$comment_count = CommentCollector::getCommentCountForURL($site, $path);
+        $comment_count = CommentCollector::getCommentCountForURL($site, $path);
 
-		return array(
-			'comments' => $comment_array,
-			'commenter' => $commenter,
-			'errors' => $this->comment_errors,
-			'comment_count' => $comment_count);
-	}
+        return array(
+            'comments' => $comment_array,
+            'commenter' => $commenter,
+            'errors' => $this->comment_errors,
+            'comment_count' => $comment_count);
+    }
 
-	private function get_commenter()
-	{
-		Loader::load('collector', 'comment/CommentCollector');
+    private function get_commenter()
+    {
+        Loader::load('collector', 'comment/CommentCollector');
 
-		$commenter = new stdclass();
+        $commenter = new stdclass();
 		
-		$commenter->id = 0;
-		$commenter->name = '';
-		$commenter->email = '';
-		$commenter->website = '';
+        $commenter->id = 0;
+        $commenter->name = '';
+        $commenter->email = '';
+        $commenter->website = '';
 
     if (!isset($_COOKIE['commenter'])) {
-      return $commenter;
+        return $commenter;
     }
 
-		$commenter_cookie_value = json_decode($_COOKIE['commenter']);
+        $commenter_cookie_value = json_decode($_COOKIE['commenter']);
 		
-		if($commenter_cookie_value === NULL)
-			return $commenter;
+        if($commenter_cookie_value === NULL)
+            return $commenter;
 		
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
-			return $commenter;
+        if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
+            return $commenter;
 		
-		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
+        $commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
 		
-		if($commenter_object === NULL)
-			return $commenter;
+        if($commenter_object === NULL)
+            return $commenter;
 		
-		$commenter->id = $commenter_object->id;
-		$commenter->name = $commenter_object->name;
-		$commenter->email = $commenter_object->email;
-		$commenter->website = $commenter_object->url;
+        $commenter->id = $commenter_object->id;
+        $commenter->name = $commenter_object->name;
+        $commenter->email = $commenter_object->email;
+        $commenter->website = $commenter_object->url;
 		
-		return $commenter;
-	}
+        return $commenter;
+    }
 
 }

controller/lifestream/TagController.class.inc.php

Indentation +126 added lines, -126 removed lines

@@ -5,144 +5,144 @@
 final class TagController extends DefaultListController
 {
 
-	private static $TITLE = "%s Activity | Jacob Emerick's Lifestream";
-	private static $DESCRIPTION = "%s activity on Jacob Emerick's lifestream, all nice and paginated in one awesome website.";
+    private static $TITLE = "%s Activity | Jacob Emerick's Lifestream";
+    private static $DESCRIPTION = "%s activity on Jacob Emerick's lifestream, all nice and paginated in one awesome website.";
 
-	private static $KEYWORD_ARRAY = array(
-		'lifestream',
-		'activity stream',
-		'Jacob Emerick');
+    private static $KEYWORD_ARRAY = array(
+        'lifestream',
+        'activity stream',
+        'Jacob Emerick');
 
-	private static $LIST_DESCRIPTION = 'viewing %d - %d of %d %s activities';
+    private static $LIST_DESCRIPTION = 'viewing %d - %d of %d %s activities';
 
-	private $tag;
+    private $tag;
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 		
-		$this->tag = URLDecode::getPiece(1);
-	}
+        $this->tag = URLDecode::getPiece(1);
+    }
 
-	protected function set_head_data()
-	{
-		$this->set_title(sprintf(self::$TITLE, ucwords($this->tag)));
-		$this->set_description(sprintf(self::$DESCRIPTION, ucwords($this->tag)));
+    protected function set_head_data()
+    {
+        $this->set_title(sprintf(self::$TITLE, ucwords($this->tag)));
+        $this->set_description(sprintf(self::$DESCRIPTION, ucwords($this->tag)));
 		
-		$keyword_array = self::$KEYWORD_ARRAY;
-		array_unshift($keyword_array, $this->tag);
-		$this->set_keywords($keyword_array);
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, $this->tag);
+        $this->set_keywords($keyword_array);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('title', $this->get_title());
-		$this->set_body('description', $this->get_description());
+    protected function set_body_data()
+    {
+        $this->set_body('title', $this->get_title());
+        $this->set_body('description', $this->get_description());
 		
-		parent::set_body_data();
-	}
-
-	private function get_title()
-	{
-		switch($this->tag)
-		{
-			case 'blog' :
-				return 'Jacob has a Blog';
-			break;
-			case 'book' :
-				return 'Jacob reads Books';
-			break;
-			case 'distance' :
-				return 'Run, Jacob, and Hike';
-			break;
-      case 'github' :
+        parent::set_body_data();
+    }
+
+    private function get_title()
+    {
+        switch($this->tag)
+        {
+            case 'blog' :
+                return 'Jacob has a Blog';
+            break;
+            case 'book' :
+                return 'Jacob reads Books';
+            break;
+            case 'distance' :
+                return 'Run, Jacob, and Hike';
+            break;
+        case 'github' :
         return 'Jacob, Code Monkey';
-      break;
-			case 'hulu' :
-				return 'Jacob watches Hulu';
-			break;
-			case 'twitter' :
-				return 'Jacob likes to Tweet';
-			break;
-			case 'youtube' :
-				return 'Videos Jacob Likes';
-			break;
-		}
-	}
-
-	private function get_description()
-	{
-		switch($this->tag)
-		{
-			case 'blog' :
-				return 'Yeah, Jacob has a blog. Check out his posting activity.';
-			break;
-			case 'book' :
-				return "Outside of building websites, hiking, and <em>being awesome</em>, Jacob reads books. Check out what he's been reading.";
-			break;
-			case 'distance' :
-				return 'All the cool kids like to be in shape. Jacob goes running and hiking.';
-			break;
-      case 'github' :
+        break;
+            case 'hulu' :
+                return 'Jacob watches Hulu';
+            break;
+            case 'twitter' :
+                return 'Jacob likes to Tweet';
+            break;
+            case 'youtube' :
+                return 'Videos Jacob Likes';
+            break;
+        }
+    }
+
+    private function get_description()
+    {
+        switch($this->tag)
+        {
+            case 'blog' :
+                return 'Yeah, Jacob has a blog. Check out his posting activity.';
+            break;
+            case 'book' :
+                return "Outside of building websites, hiking, and <em>being awesome</em>, Jacob reads books. Check out what he's been reading.";
+            break;
+            case 'distance' :
+                return 'All the cool kids like to be in shape. Jacob goes running and hiking.';
+            break;
+        case 'github' :
         return 'Since he is trying to be a developer, Jacob codes. Here is some code that he pushed around on the Githubs.';
-      break;
-			case 'hulu' :
-				return 'Occasionally Jacob chills and watches some Hulu. Well, used to, anyways.';
-			break;
-			case 'twitter' :
-				return 'All the cool kids are on Twitter. The cool kids and Jacob. Check his tweets, yo.';
-			break;
-			case 'youtube' :
-				return 'Jacob watches videos on YouTube. Some videos he likes more than others.';
-			break;
-		}
-	}
-
-	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 $this->activityRepository->getActivitiesByType($this->tag, 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());
+        break;
+            case 'hulu' :
+                return 'Occasionally Jacob chills and watches some Hulu. Well, used to, anyways.';
+            break;
+            case 'twitter' :
+                return 'All the cool kids are on Twitter. The cool kids and Jacob. Check his tweets, yo.';
+            break;
+            case 'youtube' :
+                return 'Jacob watches videos on YouTube. Some videos he likes more than others.';
+            break;
+        }
+    }
+
+    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 $this->activityRepository->getActivitiesByType($this->tag, 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());
 		
-		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->tag);
-	}
-
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream') . $this->tag . '/';
-		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
-	}
-
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
-		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
-	}
-
-	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);
-		return $this->total_post_count;
-	}
+        return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->tag);
+    }
+
+    protected function get_list_next_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return Loader::getRootUrl('lifestream') . $this->tag . '/';
+        return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
+    }
+
+    protected function get_list_prev_link()
+    {
+        if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+            return;
+        return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
+    }
+
+    private $total_post_count;
+    protected function get_total_post_count()
+    {
+        if(!isset($this->total_post_count))
+            $this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);
+        return $this->total_post_count;
+    }
 
 }

controller/lifestream/PostController.class.inc.php

Indentation +90 added lines, -90 removed lines

@@ -5,112 +5,112 @@
 final class PostController extends DefaultPageController
 {
 
-	private static $TITLE = "Post %d | %s Activity | Jacob Emerick's Lifestream";
-	private static $DESCRIPTION = "Post %d of %s activity on Jacob Emerick's Lifestream.";
+    private static $TITLE = "Post %d | %s Activity | Jacob Emerick's Lifestream";
+    private static $DESCRIPTION = "Post %d of %s activity on Jacob Emerick's Lifestream.";
 
-	private static $KEYWORD_ARRAY = array(
-		'lifestream',
-		'activity stream',
-		'Jacob Emerick');
+    private static $KEYWORD_ARRAY = array(
+        'lifestream',
+        'activity stream',
+        'Jacob Emerick');
 
-	private $post;
+    private $post;
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 		
-		$id = URLDecode::getPiece(2);
-		if(!$id || !is_numeric($id))
-			$this->eject();
+        $id = URLDecode::getPiece(2);
+        if(!$id || !is_numeric($id))
+            $this->eject();
 		
-		$post = $this->activityRepository->getActivityById($id);
-		if(!$post)
-			$this->eject();
+        $post = $this->activityRepository->getActivityById($id);
+        if(!$post)
+            $this->eject();
 		
-		if(URLDecode::getPiece(1) != $post['type'])
-			$this->eject();
+        if(URLDecode::getPiece(1) != $post['type'])
+            $this->eject();
 		
-		$this->post = $post;
-	}
+        $this->post = $post;
+    }
 
-	protected function set_head_data()
-	{
-		$this->set_title(sprintf(self::$TITLE, $this->post['id'], ucwords($this->post['type'])));
-		$this->set_description(sprintf(self::$DESCRIPTION, $this->post['id'], ucwords($this->post['type'])));
+    protected function set_head_data()
+    {
+        $this->set_title(sprintf(self::$TITLE, $this->post['id'], ucwords($this->post['type'])));
+        $this->set_description(sprintf(self::$DESCRIPTION, $this->post['id'], ucwords($this->post['type'])));
 		
-		$keyword_array = self::$KEYWORD_ARRAY;
-		array_unshift($keyword_array, $this->post['type']);
-		$this->set_keywords($keyword_array);
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, $this->post['type']);
+        $this->set_keywords($keyword_array);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('title', $this->get_title());
-		$this->set_body('description', $this->get_description());
+    protected function set_body_data()
+    {
+        $this->set_body('title', $this->get_title());
+        $this->set_body('description', $this->get_description());
 		
-		$this->set_body('post', $this->expand_post($this->post, 'full'));
-		$this->set_body('type', 'single');
-		$this->set_body('view', 'Post');
+        $this->set_body('post', $this->expand_post($this->post, 'full'));
+        $this->set_body('type', 'single');
+        $this->set_body('view', 'Post');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
-	private function get_title()
-	{
-		switch($this->post['type'])
-		{
-			case 'blog' :
-				return 'Jacob blogged';
-			break;
-			case 'book' :
-				return 'Jacob read again';
-			break;
-			case 'distance' :
-				return 'Jacob ran xor hiked';
-			break;
-      case 'github' :
+    private function get_title()
+    {
+        switch($this->post['type'])
+        {
+            case 'blog' :
+                return 'Jacob blogged';
+            break;
+            case 'book' :
+                return 'Jacob read again';
+            break;
+            case 'distance' :
+                return 'Jacob ran xor hiked';
+            break;
+        case 'github' :
         return 'Jacob did code';
-      break;
-			case 'hulu' :
-				return 'What Jacob watched';
-			break;
-			case 'twitter' :
-				return 'What Jacob tweeted';
-			break;
-			case 'youtube' :
-				return 'Jacob Liked a Video';
-			break;
-		}
-	}
+        break;
+            case 'hulu' :
+                return 'What Jacob watched';
+            break;
+            case 'twitter' :
+                return 'What Jacob tweeted';
+            break;
+            case 'youtube' :
+                return 'Jacob Liked a Video';
+            break;
+        }
+    }
 
-	private function get_description()
-	{
-		switch($this->post['type'])
-		{
-			case 'blog' :
-				return 'Another awesome blog post from Jacob. Did I mention it was awesome?';
-			break;
-			case 'book' :
-				return "Yup, Jacob read another book. Don't tell his parents.";
-			break;
-			case 'distance' :
-				return 'Well, it might have been both at the same time if there was a bear.';
-			break;
-      case 'github' :
+    private function get_description()
+    {
+        switch($this->post['type'])
+        {
+            case 'blog' :
+                return 'Another awesome blog post from Jacob. Did I mention it was awesome?';
+            break;
+            case 'book' :
+                return "Yup, Jacob read another book. Don't tell his parents.";
+            break;
+            case 'distance' :
+                return 'Well, it might have been both at the same time if there was a bear.';
+            break;
+        case 'github' :
         return 'An epic code change by Jacob on the Githubs.';
-      break;
-			case 'hulu' :
-				return 'It was a cold, dark night, so Jacob watched something on Hulu.';
-			break;
-			case 'twitter' :
-				return 'Just another awesome insight/thought/RT/random from Jacob.';
-			break;
-			case 'youtube' :
-				return "This is a video that Jacob liked on Youtube. It's probably awesome. You should check it out.";
-			break;
-		}
-	}
+        break;
+            case 'hulu' :
+                return 'It was a cold, dark night, so Jacob watched something on Hulu.';
+            break;
+            case 'twitter' :
+                return 'Just another awesome insight/thought/RT/random from Jacob.';
+            break;
+            case 'youtube' :
+                return "This is a video that Jacob liked on Youtube. It's probably awesome. You should check it out.";
+            break;
+        }
+    }
 
 }

controller/lifestream/DefaultListController.class.inc.php

Indentation +48 added lines, -48 removed lines

@@ -5,63 +5,63 @@
 abstract class DefaultListController extends DefaultPageController
 {
 
-	protected static $POSTS_PER_PAGE = 15;
+    protected static $POSTS_PER_PAGE = 15;
 
-	protected $page;
-	protected $offset;
+    protected $page;
+    protected $offset;
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 
-		$this->page = $this->get_page_number();
-		$this->offset = ($this->page - 1) * self::$POSTS_PER_PAGE;
-	}
+        $this->page = $this->get_page_number();
+        $this->offset = ($this->page - 1) * self::$POSTS_PER_PAGE;
+    }
 
-	abstract protected function get_page_number();
-	abstract protected function get_list_results();
-	abstract protected function get_list_description();
-	abstract protected function get_list_next_link();
-	abstract protected function get_list_prev_link();
-	abstract protected function get_total_post_count();
+    abstract protected function get_page_number();
+    abstract protected function get_list_results();
+    abstract protected function get_list_description();
+    abstract protected function get_list_next_link();
+    abstract protected function get_list_prev_link();
+    abstract protected function get_total_post_count();
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		$this->set_head('next_link', $this->get_list_next_link());
-		$this->set_head('previous_link', $this->get_list_prev_link());
-	}
+        $this->set_head('next_link', $this->get_list_next_link());
+        $this->set_head('previous_link', $this->get_list_prev_link());
+    }
 
-	protected function set_body_data()
-	{
-		parent::set_body_data();
+    protected function set_body_data()
+    {
+        parent::set_body_data();
 		
-		$this->set_body('view', 'Listing');
-		$this->set_body('data', $this->get_list_body_data());
-	}
+        $this->set_body('view', 'Listing');
+        $this->set_body('data', $this->get_list_body_data());
+    }
 
-	final private function get_list_body_data()
-	{
-		return array(
-			'posts' => $this->get_list_posts(),
-			'type' => 'list',
-			'pagination' => array(
-				'description' => $this->get_list_description(),
-				'next' => $this->get_list_next_link(),
-				'prev' => $this->get_list_prev_link()));
-	}
+    final private function get_list_body_data()
+    {
+        return array(
+            'posts' => $this->get_list_posts(),
+            'type' => 'list',
+            'pagination' => array(
+                'description' => $this->get_list_description(),
+                'next' => $this->get_list_next_link(),
+                'prev' => $this->get_list_prev_link()));
+    }
 
-	final private function get_list_posts()
-	{
-		$post_array = array();
-		foreach($this->get_list_results() as $post)
-		{
-			$post_array[] = $this->expand_post($post, 'full');
-		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
-			$this->eject();
-		return $post_array;
-	}
+    final private function get_list_posts()
+    {
+        $post_array = array();
+        foreach($this->get_list_results() as $post)
+        {
+            $post_array[] = $this->expand_post($post, 'full');
+        }
+        if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
+            $this->eject();
+        return $post_array;
+    }
 
 }

controller/lifestream/DefaultPageController.class.inc.php

Indentation +15 added lines, -15 removed lines

@@ -6,25 +6,25 @@
 abstract class DefaultPageController extends PageController
 {
 
-  protected $activityRepository;
+    protected $activityRepository;
 
-  public function __construct()
-  {
+    public function __construct()
+    {
     parent::__construct();
 
     global $container;
     $this->activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
-  }
-
-	protected function set_head_data()
-	{
-		$this->add_css('normalize');
-		$this->add_css('lifestream', 2);
-	}
-
-	protected function set_body_data()
-	{
-		$this->set_body_view('Page');
-	}
+    }
+
+    protected function set_head_data()
+    {
+        $this->add_css('normalize');
+        $this->add_css('lifestream', 2);
+    }
+
+    protected function set_body_data()
+    {
+        $this->set_body_view('Page');
+    }
 
 }