jacobemerick / web

controller/waterfalls/LogController.class.inc.php

Spacing +16 added lines, -16 removed lines

@@ -25,7 +25,7 @@ 
         $log_path = URLDecode::getPiece(2);
         
         $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
+        if (!$this->log)
             $this->eject();
 
         $this->parent_navigation_item = 'journal';
@@ -33,7 +33,7 @@ 
         $this->handle_comment_submit(
             self::$WATERFALL_SITE_ID,
             $this->log->alias,
-            Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
+            Loader::getRootUrl('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$this->log->alias.'/',
             $this->log->title);
         
         $this->add_waterfall_js();
@@ -43,12 +43,12 @@ 
     {
         parent::set_head_data();
         
-        $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
+        $this->set_title("{$this->log->title} | ".self::$WEBSITE_TITLE);
         $this->set_description($this->log->introduction);
         
         $keyword_array = array();
         $tag_result = LogCollector::getTagListForLog($this->log->id);
-        foreach($tag_result as $tag)
+        foreach ($tag_result as $tag)
         {
             $keyword_array[] = $tag->name;
         }
@@ -77,7 +77,7 @@ 
         
         $formatted_log['introduction'] = $this->get_log_introduction($this->log);
         $formatted_log['title'] = $this->log->title;
-        $formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
+        $formatted_log['url'] = Loader::getRootURL('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$this->log->alias.'/';
 
         $formatted_log['body'] = $this->get_formatted_log_body();
         
@@ -88,7 +88,7 @@ 
     {
         return array(
             'title' => $log->title,
-            'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
+            'url' => Loader::getRootURL('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$log->alias.'/',
             'date' => $this->get_parsed_date($log->date),
             'publish_date' => $this->get_parsed_date($log->publish_date),
             'introduction' => $log->introduction,
@@ -120,19 +120,19 @@ 
             'next' => array());
         
         $previous_log = LogCollector::getPreviousLog($this->log->id);
-        if($previous_log != false)
+        if ($previous_log != false)
         {
             $series['previous'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
+                'path' => '/'.self::$JOURNAL_DIRECTORY.'/'.$previous_log->alias.'/',
                 'title' => $previous_log->title,
                 'date' => $previous_log->date);
         }
         
         $next_log = LogCollector::getNextLog($this->log->id);
-        if($next_log != false)
+        if ($next_log != false)
         {
             $series['next'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
+                'path' => '/'.self::$JOURNAL_DIRECTORY.'/'.$next_log->alias.'/',
                 'title' => $next_log->title,
                 'date' => $next_log->date);
         }
@@ -146,7 +146,7 @@ 
         
         $sidebar['companion_list'] = array();
         $companions = LogCollector::getCompanionListForLog($this->log->id);
-        foreach($companions as $companion)
+        foreach ($companions as $companion)
         {
             $sidebar['companion_list'][] = (object) array(
                 'title' => $companion->name,
@@ -155,7 +155,7 @@ 
         
         $sidebar['tag_list'] = array();
         $tags = LogCollector::getTagListForLog($this->log->id);
-        foreach($tags as $tag)
+        foreach ($tags as $tag)
         {
             $sidebar['tag_list'][] = (object) array(
                 'title' => $tag->name,
@@ -164,7 +164,7 @@ 
         
         $sidebar['waterfall_list'] = array();
         $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
-        foreach($waterfalls as $waterfall)
+        foreach ($waterfalls as $waterfall)
         {
             $sidebar['waterfall_list'][] = (object) array(
                 'title' => $waterfall->name,
@@ -178,17 +178,17 @@ 
     {
         $album = array();
         
-        if($this->log->album == 0)
+        if ($this->log->album == 0)
             return $album;
         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
-        foreach($photo_list as $photo)
+        foreach ($photo_list as $photo)
         {
             $photo_array = array();
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
+            if ($photo->height < $photo->width)
                 list($height, $width) = array(75, 100);
             else
                 list($height, $width) = array(100, 75);

Braces +22 added lines, -28 removed lines

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

+{

 
     private static $AUTHOR = 'Jacob Emerick';
     private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
@@ -18,15 +18,15 @@ 
 
     private $log;
 
-    public function __construct()
-    {
+    public function __construct() {

         parent::__construct();
         
         $log_path = URLDecode::getPiece(2);
         
         $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
-            $this->eject();
+        if(!$this->log) {

+                    $this->eject();

+        }

 
         $this->parent_navigation_item = 'journal';
         
@@ -39,8 +39,7 @@ 
         $this->add_waterfall_js();
     }
 
-    protected function set_head_data()
-    {
+    protected function set_head_data() {

         parent::set_head_data();
         
         $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
@@ -56,8 +55,7 @@ 
         $this->set_keywords($keyword_array);
     }
 
-    protected function set_body_data($page_type = 'normal')
-    {
+    protected function set_body_data($page_type = 'normal') {

         parent::set_body_data($page_type);
         
         $this->set_body('view', 'Log');
@@ -71,8 +69,7 @@ 
         $this->set_body('data', $body_data);
     }
 
-    private function get_formatted_log()
-    {
+    private function get_formatted_log() {

         $formatted_log = array();
         
         $formatted_log['introduction'] = $this->get_log_introduction($this->log);
@@ -84,8 +81,7 @@ 
         return $formatted_log;
     }
 
-    private function get_log_introduction($log)
-    {
+    private function get_log_introduction($log) {

         return array(
             'title' => $log->title,
             'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
@@ -103,8 +99,7 @@ 
     }
 
     // @todo - link things up
-    private function get_formatted_log_body()
-    {
+    private function get_formatted_log_body() {

         $body = $this->log->body;
         
         $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
@@ -113,8 +108,7 @@ 
         return $body;
     }
 
-    private function get_series()
-    {
+    private function get_series() {

         $series = array(
             'previous' => array(),
             'next' => array());
@@ -140,8 +134,7 @@ 
         return $series;
     }
 
-    private function get_sidebar()
-    {
+    private function get_sidebar() {

         $sidebar = array();
         
         $sidebar['companion_list'] = array();
@@ -174,12 +167,12 @@ 
         return $sidebar;
     }
 
-    private function get_album()
-    {
+    private function get_album() {

         $album = array();
         
-        if($this->log->album == 0)
-            return $album;
+        if($this->log->album == 0) {

+                    return $album;

+        }

         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
         foreach($photo_list as $photo)
@@ -188,10 +181,11 @@ 
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+            if($photo->height < $photo->width) {

+                            list($height, $width) = array(75, 100);

+            } else {

+                            list($height, $width) = array(100, 75);

+            }

             
             $photo_array['image_node'] = sprintf(
                 self::$THUMB_IMAGE_NODE,

controller/waterfalls/WaterfallController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -33,7 +33,7 @@ 
         $this->handle_comment_submit(
             self::$WATERFALL_SITE_ID,
             "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}",
-            Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
+            Loader::getRootUrl('waterfalls')."{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
             $this->waterfall->name);
         
         $this->add_waterfall_js();
@@ -43,7 +43,7 @@ 
     {
         parent::set_head_data();
 
-        $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
+        $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | ".self::$WEBSITE_TITLE);
         $this->set_description($this->waterfall->description);
         $this->set_keywords((array) $this->waterfall->name);
     }
@@ -112,17 +112,17 @@ 
     {
         $album = array();
         
-        if($this->waterfall->album == 0)
+        if ($this->waterfall->album == 0)
             return $album;
         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
-        foreach($photo_list as $photo)
+        foreach ($photo_list as $photo)
         {
             $photo_array = array();
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
+            if ($photo->height < $photo->width)
                 list($height, $width) = array(75, 100);
             else
                 list($height, $width) = array(100, 75);
@@ -147,14 +147,14 @@ 
 		$sidebar_data['name'] = $waterfall->name;
 		$sidebar_data['watercourse'] = $waterfall->watercourse;
         $sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
-		$sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
+		$sidebar_data['rating_display'] = ($waterfall->rating / 2).'/5';
         $sidebar_data['rating'] = $waterfall->rating;
 		$sidebar_data['height'] = Content::instance('ImperialUnit', $waterfall->height)->activate('inches');
 		$sidebar_data['width'] = Content::instance('ImperialUnit', $waterfall->width)->activate('inches');
 		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');
 		$sidebar_data['drop_count'] = $waterfall->drop_count;
 		
-        $sidebar_data['county'] = (object) array (
+        $sidebar_data['county'] = (object) array(
             'name' => $waterfall->county,
             'alias' => $waterfall->county_alias,
             'title' => $waterfall->county_title,

Indentation +17 added lines, -17 removed lines

@@ -27,7 +27,7 @@ 
 
         $this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);
         if (!$this->waterfall) {
-              $this->eject();
+                $this->eject();
         }
         
         $this->handle_comment_submit(
@@ -141,18 +141,18 @@ 
         return $album;
     }
 
-	private function get_sidebar($waterfall)
-	{
-		$sidebar_data = array();
-		$sidebar_data['name'] = $waterfall->name;
-		$sidebar_data['watercourse'] = $waterfall->watercourse;
+    private function get_sidebar($waterfall)
+    {
+        $sidebar_data = array();
+        $sidebar_data['name'] = $waterfall->name;
+        $sidebar_data['watercourse'] = $waterfall->watercourse;
         $sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
-		$sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
+        $sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
         $sidebar_data['rating'] = $waterfall->rating;
-		$sidebar_data['height'] = Content::instance('ImperialUnit', $waterfall->height)->activate('inches');
-		$sidebar_data['width'] = Content::instance('ImperialUnit', $waterfall->width)->activate('inches');
-		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');
-		$sidebar_data['drop_count'] = $waterfall->drop_count;
+        $sidebar_data['height'] = Content::instance('ImperialUnit', $waterfall->height)->activate('inches');
+        $sidebar_data['width'] = Content::instance('ImperialUnit', $waterfall->width)->activate('inches');
+        $sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');
+        $sidebar_data['drop_count'] = $waterfall->drop_count;
 		
         $sidebar_data['county'] = (object) array (
             'name' => $waterfall->county,
@@ -160,10 +160,10 @@ 
             'title' => $waterfall->county_title,
         );
         
-		$sidebar_data['nearest_town'] = $waterfall->nearest_town;
-		$sidebar_data['latitude'] = round($waterfall->latitude, 5);
-		$sidebar_data['longitude'] = round($waterfall->longitude, 5);
-		$sidebar_data['elevation'] = Content::instance('ImperialUnit', $waterfall->elevation)->activate('feet');
+        $sidebar_data['nearest_town'] = $waterfall->nearest_town;
+        $sidebar_data['latitude'] = round($waterfall->latitude, 5);
+        $sidebar_data['longitude'] = round($waterfall->longitude, 5);
+        $sidebar_data['elevation'] = Content::instance('ImperialUnit', $waterfall->elevation)->activate('feet');
         
         $sidebar_data['map'] = $this->get_map_piece($waterfall);
         
@@ -171,8 +171,8 @@ 
         
         $sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);
 		
-		return $sidebar_data;
-	}
+        return $sidebar_data;
+    }
 
     private function get_journal_list($waterfall)
     {

Braces +22 added lines, -32 removed lines

@@ -7,8 +7,8 @@ 
     'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
-final class WaterfallController extends DefaultPageController
-{
+final class WaterfallController extends DefaultPageController

+{

 
     private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';
 
@@ -18,8 +18,7 @@ 
 
     private $waterfall;
 
-    public function __construct()
-    {
+    public function __construct() {

         parent::__construct();
 
         $path_watercourse = URLDecode::getPiece(1);
@@ -39,8 +38,7 @@ 
         $this->add_waterfall_js();
     }
 
-    protected function set_head_data()
-    {
+    protected function set_head_data() {

         parent::set_head_data();
 
         $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
@@ -48,8 +46,7 @@ 
         $this->set_keywords((array) $this->waterfall->name);
     }
 
-    protected function set_body_data($page_type = 'normal')
-    {
+    protected function set_body_data($page_type = 'normal') {

         parent::set_body_data($page_type);
 
         $body_data = $this->format_waterfall_data($this->waterfall);
@@ -60,8 +57,7 @@ 
         $this->set_body('view', 'Fall');
     }
 
-    private function format_waterfall_data($waterfall)
-    {
+    private function format_waterfall_data($waterfall) {

         $waterfall_data = array();
         $waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);
         $waterfall_data['name'] = $waterfall->name;
@@ -77,8 +73,7 @@ 
         return $waterfall_data;
     }
 
-    private function get_waterfall_introduction($waterfall)
-    {
+    private function get_waterfall_introduction($waterfall) {

         return array(
             'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
             'name' => $waterfall->name,
@@ -87,8 +82,7 @@ 
         );
     }
 
-    private function get_main_watercourse($alias)
-    {
+    private function get_main_watercourse($alias) {

         $watercourse = WatercourseCollector::getByAlias($alias);
         if ($watercourse->parent != 0) {
             $watercourse = WatercourseCollector::getById($watercourse->parent);
@@ -101,19 +95,18 @@ 
         );
     }
 
-    private function format_waterfall_content($content)
-    {
+    private function format_waterfall_content($content) {

         $content = Content::instance('FixInternalLink', $content)->activate();
         
         return $content;
     }
 
-    private function get_album()
-    {
+    private function get_album() {

         $album = array();
         
-        if($this->waterfall->album == 0)
-            return $album;
+        if($this->waterfall->album == 0) {

+                    return $album;

+        }

         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
         foreach($photo_list as $photo)
@@ -122,10 +115,11 @@ 
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+            if($photo->height < $photo->width) {

+                            list($height, $width) = array(75, 100);

+            } else {

+                            list($height, $width) = array(100, 75);

+            }

             
             $photo_array['image_node'] = sprintf(
                 self::$THUMB_IMAGE_NODE,
@@ -141,8 +135,7 @@ 
         return $album;
     }
 
-	private function get_sidebar($waterfall)
-	{
+	private function get_sidebar($waterfall) {

 		$sidebar_data = array();
 		$sidebar_data['name'] = $waterfall->name;
 		$sidebar_data['watercourse'] = $waterfall->watercourse;
@@ -174,8 +167,7 @@ 
 		return $sidebar_data;
 	}
 
-    private function get_journal_list($waterfall)
-    {
+    private function get_journal_list($waterfall) {

         $list = array();
         $log_result = LogCollector::getLogListForWaterfall($waterfall);
         foreach ($log_result as $log_row) {
@@ -189,8 +181,7 @@ 
         return $list;
     }
 
-    private function get_map_piece($waterfall)
-    {
+    private function get_map_piece($waterfall) {

         $map_holder = array();
         
         $url = 'https://maps.googleapis.com/maps/api/staticmap';
@@ -211,8 +202,7 @@ 
         return (object) $map_holder;
     }
 
-    private function get_nearby_list($waterfall)
-    {
+    private function get_nearby_list($waterfall) {

         $nearby_list = array();
         
         $result = WaterfallCollector::getNearbyList($waterfall);

controller/waterfalls/CountyListController.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 		$path = URLDecode::getPiece(1);
 		$this->county = CountyCollector::getByAlias($path);
 		
-		if(!$this->county)
+		if (!$this->county)
 			$this->eject();
 		
 		parent::__construct();
@@ -38,7 +38,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = "{$this->county->name} Waterfalls | " . self::$WEBSITE_TITLE;
+		$meta_array['title'] = "{$this->county->name} Waterfalls | ".self::$WEBSITE_TITLE;
 		$meta_array['description'] = $this->county->description;
 		$meta_array['keywords'] = $this->get_keyword_array();
 		
@@ -49,7 +49,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->county->name, $this->page, $this->page_count);
+		$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();
 		

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

Braces +17 added lines, -28 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('collector', 'waterfall/CountyCollector');
 Loader::load('controller', 'waterfalls/DefaultWaterfallListController');
 
-final class CountyListController extends DefaultWaterfallListController
-{
+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.';
@@ -23,19 +23,18 @@ 
 
 	private $county;
 
-	public function __construct()
-	{
+	public function __construct() {

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

+					$this->eject();

+		}

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

 		$meta_array = array();
 		
 		$meta_array['title'] = "{$this->county->name} Waterfalls | " . self::$WEBSITE_TITLE;
@@ -45,8 +44,7 @@ 
 		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->county->name, $this->page, $this->page_count);
@@ -56,15 +54,13 @@ 
 		return $meta_array;
 	}
 
-	private function get_keyword_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()
-	{
+	protected function get_initial_introduction() {

 		$introduction = array();
 		
 		$introduction['title'] = $this->county->title;
@@ -74,39 +70,32 @@ 
 		return $introduction;
 	}
 
-	protected function get_subsequent_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()
-	{
+	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 CountyCollector::getLogListForCounty($this->county->id, $total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result() {

 		return CountyCollector::getLogCountForCounty($this->county->id);
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern() {

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

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

controller/waterfalls/LogTagListController.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
 		$alias = URLDecode::getPiece(3);
 		$this->tag = LogTagCollector::getTag($alias);
 		
-		if(!$this->tag)
+		if (!$this->tag)
 			$this->eject();
 		
 		parent::__construct();
@@ -37,7 +37,7 @@ 
 	{
 		$meta_array = array();
 		
-		$meta_array['title'] = "{$this->tag->name} | " . self::$WEBSITE_TITLE;
+		$meta_array['title'] = "{$this->tag->name} | ".self::$WEBSITE_TITLE;
 		$meta_array['description'] = $this->tag->name;
 		$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->tag->name);
 		$meta_array['keywords'] = $this->get_keyword_array();
 		

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

Braces +16 added lines, -26 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('collector', 'waterfall/LogTagCollector');
 Loader::load('controller', 'waterfalls/DefaultLogListController');
 
-final class LogTagListController extends DefaultLogListController
-{
+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';
@@ -22,19 +22,18 @@ 
 
 	private $tag;
 
-	public function __construct()
-	{
+	public function __construct() {

 		$alias = URLDecode::getPiece(3);
 		$this->tag = LogTagCollector::getTag($alias);
 		
-		if(!$this->tag)
-			$this->eject();
+		if(!$this->tag) {

+					$this->eject();

+		}

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

 		$meta_array = array();
 		
 		$meta_array['title'] = "{$this->tag->name} | " . self::$WEBSITE_TITLE;
@@ -44,8 +43,7 @@ 
 		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,46 +53,38 @@ 
 		return $meta_array;
 	}
 
-	private function get_keyword_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()
-	{
+	protected function get_initial_introduction() {

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

 		return $this->get_initial_introduction();
 	}
 
-	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 LogTagCollector::getLogListForTag($this->tag->id, $total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result() {

 		return LogTagCollector::getLogCountForTag($this->tag->id);
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern() {

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

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

controller/waterfalls/PeriodListController.class.inc.php

Spacing +3 added lines, -3 removed lines

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

Indentation +85 added lines, -85 removed lines

@@ -6,104 +6,104 @@
 final class PeriodListController extends DefaultLogListController
 {
 
-	private static $DEFAULT_TITLE = '%s Hiking Stories, Page %d of %d';
-	private static $DEFAULT_DESCRIPTION = 'Page %d of %d of epic %s hiking stories written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
-	private static $DEFAULT_HEADER = 'Page %d of Awesome %s Waterfall Hiking Stories';
+    private static $DEFAULT_TITLE = '%s Hiking Stories, Page %d of %d';
+    private static $DEFAULT_DESCRIPTION = 'Page %d of %d of epic %s hiking stories written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
+    private static $DEFAULT_HEADER = 'Page %d of Awesome %s Waterfall Hiking Stories';
 
-	private static $KEYWORD_ARRAY = array(
-		'journal',
-		'stories',
-		'blog',
-		'waterfalls');
+    private static $KEYWORD_ARRAY = array(
+        'journal',
+        'stories',
+        'blog',
+        'waterfalls');
 
-	private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d %PERIOD% journal entries';
-	private static $LINK_ROOT = '/period/%s/';
+    private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d %PERIOD% journal entries';
+    private static $LINK_ROOT = '/period/%s/';
 
-	private $period;
+    private $period;
 
-	public function __construct()
-	{
-		$alias = URLDecode::getPiece(2);
-		$this->period = PeriodCollector::getByAlias($alias);
+    public function __construct()
+    {
+        $alias = URLDecode::getPiece(2);
+        $this->period = PeriodCollector::getByAlias($alias);
 		
-		if(!$this->period)
-			$this->eject();
+        if(!$this->period)
+            $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 - {$this->period->name} | " . self::$WEBSITE_TITLE;
-		$meta_array['description'] = $this->period->description;
-		$meta_array['keywords'] = $this->get_keyword_array();
+        $meta_array['title'] = "Hiking Stories - {$this->period->name} | " . self::$WEBSITE_TITLE;
+        $meta_array['description'] = $this->period->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->period->name, $this->page, $this->page_count);
-		$meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->period->name);
-		$meta_array['keywords'] = $this->get_keyword_array();
+        $meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->period->name, $this->page, $this->page_count);
+        $meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->period->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->period->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->period->name));
+        return $keyword_array;
+    }
+
+    protected function get_initial_introduction()
+    {
+        $introduction = array();
 		
-		$introduction['title'] = $this->period->title;
-		$introduction['description'] = Content::instance('FixInternalLink', $this->period->introduction)->activate();
-		$introduction['image'] = $this->get_image_element($this->period->photo_category, $this->period->photo, $this->period->photo_description, 'medium');
+        $introduction['title'] = $this->period->title;
+        $introduction['description'] = Content::instance('FixInternalLink', $this->period->introduction)->activate();
+        $introduction['image'] = $this->get_image_element($this->period->photo_category, $this->period->photo, $this->period->photo_description, 'medium');
 		
-		return $introduction;
-	}
-
-	protected function get_subsequent_introduction()
-	{
-		return array(
-			'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->period->name));
-	}
-
-	protected function get_page_number_piece()
-	{
-		return URLDecode::getPiece(3);
-	}
-
-	protected function get_item_result($total, $offset)
-	{
-		return PeriodCollector::getLogListForPeriod($this->period->id, $total, $offset);
-	}
-
-	protected function get_item_count_result()
-	{
-		return PeriodCollector::getLogCountForPeriod($this->period->id);
-	}
-
-	protected function get_list_description_pattern()
-	{
-		$period = $this->period->name;
-		$period = strtolower($period);
-		$navigation_description = str_replace('%PERIOD%', $period, self::$NAVIGATION_DESCRIPTION);
-		return $navigation_description;
-	}
-
-	protected function get_list_link_root()
-	{
-		return sprintf(self::$LINK_ROOT, $this->period->alias);
-	}
+        return $introduction;
+    }
+
+    protected function get_subsequent_introduction()
+    {
+        return array(
+            'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->period->name));
+    }
+
+    protected function get_page_number_piece()
+    {
+        return URLDecode::getPiece(3);
+    }
+
+    protected function get_item_result($total, $offset)
+    {
+        return PeriodCollector::getLogListForPeriod($this->period->id, $total, $offset);
+    }
+
+    protected function get_item_count_result()
+    {
+        return PeriodCollector::getLogCountForPeriod($this->period->id);
+    }
+
+    protected function get_list_description_pattern()
+    {
+        $period = $this->period->name;
+        $period = strtolower($period);
+        $navigation_description = str_replace('%PERIOD%', $period, self::$NAVIGATION_DESCRIPTION);
+        return $navigation_description;
+    }
+
+    protected function get_list_link_root()
+    {
+        return sprintf(self::$LINK_ROOT, $this->period->alias);
+    }
 
 }
\ No newline at end of file

Braces +16 added lines, -26 removed lines

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

+{

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

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

+					$this->eject();

+		}

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

 		$meta_array = array();
 		
 		$meta_array['title'] = "Hiking Stories - {$this->period->name} | " . self::$WEBSITE_TITLE;
@@ -43,8 +42,7 @@ 
 		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->period->name, $this->page, $this->page_count);
@@ -54,15 +52,13 @@ 
 		return $meta_array;
 	}
 
-	private function get_keyword_array()
-	{
+	private function get_keyword_array() {

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

 		$introduction = array();
 		
 		$introduction['title'] = $this->period->title;
@@ -72,37 +68,31 @@ 
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction() {

 		return array(
 			'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->period->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 PeriodCollector::getLogListForPeriod($this->period->id, $total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result() {

 		return PeriodCollector::getLogCountForPeriod($this->period->id);
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern() {

 		$period = $this->period->name;
 		$period = strtolower($period);
 		$navigation_description = str_replace('%PERIOD%', $period, self::$NAVIGATION_DESCRIPTION);
 		return $navigation_description;
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root() {

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

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 +16 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,18 @@ 
 
 	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 +43,7 @@ 
 		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 +53,13 @@ 
 		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 +69,28 @@ 
 		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/HomeController.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
         $recent_comments = CommentCollector::getRecentWaterfallComments();
         
         $recent_comment_container = array();
-        foreach($recent_comments as $comment) {
+        foreach ($recent_comments as $comment) {
             $body = $comment->body;
             $body = strip_tags($body);
             
@@ -67,10 +67,10 @@ 
             $comment_obj->description = Content::instance('SmartTrim', $body)->activate(50);
             $comment_obj->commenter = $comment->name;
             if (!empty($comment->log_path)) {
-                $comment_obj->link = Loader::getRootURL() . "{$comment->log_path}/#comment-{$comment->id}";
+                $comment_obj->link = Loader::getRootURL()."{$comment->log_path}/#comment-{$comment->id}";
                 $comment_obj->location = $comment->log_title;
             } else {
-                $comment_obj->link = Loader::getRootURL() . "{$comment->waterfall_path}/#comment-{$comment->id}";
+                $comment_obj->link = Loader::getRootURL()."{$comment->waterfall_path}/#comment-{$comment->id}";
                 $comment_obj->location = $comment->waterfall_title;
             }
             

Braces +4 added lines, -6 removed lines

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

+{

 
     private static $TITLE = 'Waterfalls of the Keweenaw | Stories and Tips from Jacob Emerick';
     private static $DESCRIPTION = 'Stories, maps, and details about many of the waterfalls in the Upper Peninsula of Michigan, compiled by Jacob Emerick.';
@@ -21,8 +21,7 @@ 
 
     private static $BANNER_IMAGE = 2661;
 
-    protected function set_head_data()
-    {
+    protected function set_head_data() {

         parent::set_head_data();
         
         $this->set_title(self::$TITLE);
@@ -30,8 +29,7 @@ 
         $this->set_keywords(self::$KEYWORD_ARRAY);
     }
 
-    protected function set_body_data($page_type = 'wide')
-    {
+    protected function set_body_data($page_type = 'wide') {

         parent::set_body_data($page_type);
         
         $photo = PhotoCollector::getRow(self::$BANNER_IMAGE);

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 +11 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,7 @@ 
 	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 +38,7 @@ 
 		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 +48,7 @@ 
 		return $meta_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction() {

 		$introduction = array();
 		
 		$introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
@@ -63,34 +60,28 @@ 
 		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 +11 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,7 @@ 
 	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 +38,7 @@ 
 		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 +48,7 @@ 
 		return $meta_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction() {

 		$introduction = array();
 		
 		$introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
@@ -63,34 +60,28 @@ 
 		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;
 	}