jacobemerick / web

controller/waterfalls/CountyListController.class.inc.php

Spacing +1 added lines, -1 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();

Braces +3 added lines, -2 removed lines

@@ -28,8 +28,9 @@
 		$path = URLDecode::getPiece(1);

 		$this->county = CountyCollector::getByAlias($path);

 		

-		if(!$this->county)

-			$this->eject();

+		if(!$this->county) {

+					$this->eject();

+		}

 		

 		parent::__construct();

 	}

controller/waterfalls/DefaultListController.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -95,9 +95,9 @@ 
 	abstract protected function get_initial_meta();

 	abstract protected function get_subsequent_meta();

 

-    final protected function set_body_data($page_type = 'normal')

-    {

-        parent::set_body_data($page_type);

+	final protected function set_body_data($page_type = 'normal')

+	{

+		parent::set_body_data($page_type);

 		

 		$this->set_body('view', $this->get_list_view());

 		$this->set_body('data', $this->get_list_body_data());

@@ -107,7 +107,7 @@ 
 	{

 		$body_data_array = array();

 		

-        $body_data_array['introduction'] = $this->get_introduction();

+		$body_data_array['introduction'] = $this->get_introduction();

 		$body_data_array['items'] = array_map(array($this, 'format_item'), $this->get_items());

 		$body_data_array['navigation'] = array(

 				'description' => $this->get_list_description(),

Spacing +16 added lines, -16 removed lines

@@ -20,14 +20,14 @@ 
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();

 		

 		$items = $this->get_items();

-		if(count($items) < 1)

+		if (count($items) < 1)

 			$this->eject();

 	}

 

 	final protected function get_page_number()

 	{

 		$page = $this->get_page_number_piece();

-		if(isset($page) && is_numeric($page))

+		if (isset($page) && is_numeric($page))

 			return $page;

 		return 1;

 	}

@@ -41,7 +41,7 @@ 
 

 	final private function get_introduction()

 	{

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

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

 			return $this->get_initial_introduction();

 		

 		return $this->get_subsequent_introduction();

@@ -53,7 +53,7 @@ 
 	private $items;

 	protected function get_items()

 	{

-		if(!isset($this->items))

+		if (!isset($this->items))

 		{

 			$total = $this->get_item_count_per_page();

 			$offset = ($this->page - 1) * $this->get_item_count_per_page();

@@ -68,7 +68,7 @@ 
 	private $item_count;

 	final private function get_item_count()

 	{

-		if(!isset($this->item_count))

+		if (!isset($this->item_count))

 			$this->item_count = $this->get_item_count_result();

 		return $this->item_count;

 	}

@@ -82,7 +82,7 @@ 
 		$this->set_head('next_link', $this->get_list_next_link());

 		$this->set_head('previous_link', $this->get_list_prev_link());

 		

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

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

 			$meta_array = $this->get_initial_meta();

 		else

 			$meta_array = $this->get_subsequent_meta();

@@ -119,16 +119,16 @@ 
 

 	final private function get_list_prev_link()

 	{

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

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

 			return;

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

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

 			return $this->get_list_link_root();

 		return $this->get_list_link_root() . ($this->page - 1) . '/';

 	}

 

 	final private function get_list_next_link()

 	{

-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())

+		if (($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())

 			return;

 		return $this->get_list_link_root() . ($this->page + 1) . '/';

 	}

@@ -139,27 +139,27 @@ 
 	{

 		$link_array = array();

 		

-		if($this->get_item_count_per_page() >= $this->get_item_count())

+		if ($this->get_item_count_per_page() >= $this->get_item_count())

 			return $link_array;

 		

 		$link = new stdclass();

 		$link->anchor = '&laquo; previous';

-		if($this->get_list_prev_link() !== null)

+		if ($this->get_list_prev_link() !== null)

 			$link->uri = $this->get_list_prev_link();

 		else

 			$link->class = 'inactive';

 		$link_array[] = $link;

 		

-		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)

+		for ($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)

 		{

 			$link = new stdclass();

 			$link->anchor = $i;

 			

-			if($i == $this->page)

+			if ($i == $this->page)

 				$link->class = 'current';

 			else

 			{

-				if($i == 1)

+				if ($i == 1)

 					$link->uri = $this->get_list_link_root();

 				else

 					$link->uri = $this->get_list_link_root() . $i . '/';

@@ -170,7 +170,7 @@ 
 		

 		$link = new stdclass();

 		$link->anchor = 'next &raquo;';

-		if($this->get_list_next_link() !== null)

+		if ($this->get_list_next_link() !== null)

 			$link->uri = $this->get_list_next_link();

 		else

 			$link->class = 'inactive';

@@ -192,7 +192,7 @@ 
 

 	final protected function get_image_element($category, $path, $description, $size = 'small')

 	{

-		switch($size)

+		switch ($size)

 		{

 			case 'medium' :

 				$height = 375;

Braces +47 added lines, -35 removed lines

@@ -20,15 +20,17 @@ 
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();

 		

 		$items = $this->get_items();

-		if(count($items) < 1)

-			$this->eject();

+		if(count($items) < 1) {

+					$this->eject();

+		}

 	}

 

 	final protected function get_page_number()

 	{

 		$page = $this->get_page_number_piece();

-		if(isset($page) && is_numeric($page))

-			return $page;

+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;

 	}

 

@@ -41,8 +43,9 @@ 
 

 	final private function get_introduction()

 	{

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

-			return $this->get_initial_introduction();

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

+					return $this->get_initial_introduction();

+		}

 		

 		return $this->get_subsequent_introduction();

 	}

@@ -68,8 +71,9 @@ 
 	private $item_count;

 	final private function get_item_count()

 	{

-		if(!isset($this->item_count))

-			$this->item_count = $this->get_item_count_result();

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

+					$this->item_count = $this->get_item_count_result();

+		}

 		return $this->item_count;

 	}

 

@@ -82,10 +86,11 @@ 
 		$this->set_head('next_link', $this->get_list_next_link());

 		$this->set_head('previous_link', $this->get_list_prev_link());

 		

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

-			$meta_array = $this->get_initial_meta();

-		else

-			$meta_array = $this->get_subsequent_meta();

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

+					$meta_array = $this->get_initial_meta();

+		} else {

+					$meta_array = $this->get_subsequent_meta();

+		}

 		

 		$this->set_title($meta_array['title']);

 		$this->set_description($meta_array['description']);

@@ -119,17 +124,20 @@ 
 

 	final private function get_list_prev_link()

 	{

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

-			return;

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

-			return $this->get_list_link_root();

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

+					return;

+		}

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

+					return $this->get_list_link_root();

+		}

 		return $this->get_list_link_root() . ($this->page - 1) . '/';

 	}

 

 	final private function get_list_next_link()

 	{

-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())

-			return;

+		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count()) {

+					return;

+		}

 		return $this->get_list_link_root() . ($this->page + 1) . '/';

 	}

 

@@ -139,15 +147,17 @@ 
 	{

 		$link_array = array();

 		

-		if($this->get_item_count_per_page() >= $this->get_item_count())

-			return $link_array;

+		if($this->get_item_count_per_page() >= $this->get_item_count()) {

+					return $link_array;

+		}

 		

 		$link = new stdclass();

 		$link->anchor = '&laquo; previous';

-		if($this->get_list_prev_link() !== null)

-			$link->uri = $this->get_list_prev_link();

-		else

-			$link->class = 'inactive';

+		if($this->get_list_prev_link() !== null) {

+					$link->uri = $this->get_list_prev_link();

+		} else {

+					$link->class = 'inactive';

+		}

 		$link_array[] = $link;

 		

 		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)

@@ -155,14 +165,15 @@ 
 			$link = new stdclass();

 			$link->anchor = $i;

 			

-			if($i == $this->page)

-				$link->class = 'current';

-			else

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

+							$link->class = 'current';

+			} else

 			{

-				if($i == 1)

-					$link->uri = $this->get_list_link_root();

-				else

-					$link->uri = $this->get_list_link_root() . $i . '/';

+				if($i == 1) {

+									$link->uri = $this->get_list_link_root();

+				} else {

+									$link->uri = $this->get_list_link_root() . $i . '/';

+				}

 			}

 			

 			$link_array[] = $link;

@@ -170,10 +181,11 @@ 
 		

 		$link = new stdclass();

 		$link->anchor = 'next &raquo;';

-		if($this->get_list_next_link() !== null)

-			$link->uri = $this->get_list_next_link();

-		else

-			$link->class = 'inactive';

+		if($this->get_list_next_link() !== null) {

+					$link->uri = $this->get_list_next_link();

+		} else {

+					$link->class = 'inactive';

+		}

 		$link_array[] = $link;

 		

 		return $link_array;

controller/waterfalls/DefaultLogListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 		$companion_result = CompanionCollector::getCompanionList();

 		$companion_list = array();

 		

-		foreach($companion_result as $companion_row)

+		foreach ($companion_result as $companion_row)

 		{

 			$companion = new stdclass();

 			$companion->name = $companion_row->name;

@@ -55,7 +55,7 @@ 
 		$period_result = PeriodCollector::getPeriodList();

 		$period_list = array();

 		

-		foreach($period_result as $period_row)

+		foreach ($period_result as $period_row)

 		{

 			$period = new stdclass();

 			$period->name = $period_row->name;

controller/waterfalls/DefaultPageController.class.inc.php

Indentation +36 added lines, -36 removed lines

@@ -10,7 +10,7 @@ 
 

 	protected static $WATERFALL_SITE_ID = 5;

 

-    protected $parent_navigation_item = '';

+	protected $parent_navigation_item = '';

 

 	protected function set_head_data()

 	{

@@ -19,46 +19,46 @@ 
 		$this->add_css('waterfall');

 	}

 

-    protected function add_waterfall_js()

-    {

-        $this->add_js('jquery-1.10.2.min');

-        $this->add_js('imagelightbox.min');

-        $this->add_js('waterfall-overlay');

-        $this->add_js('waterfall-map');

-    }

+	protected function add_waterfall_js()

+	{

+		$this->add_js('jquery-1.10.2.min');

+		$this->add_js('imagelightbox.min');

+		$this->add_js('waterfall-overlay');

+		$this->add_js('waterfall-map');

+	}

 

 	protected function set_body_data($page_type = 'normal')

 	{

 		$this->set_body('activity_array', $this->get_recent_activity());

 

-        $this->set_body('main_navigation', array(

-                (object) array(

-                    'uri' => '/falls/',

-                    'anchor' => 'Falls',

-                    'is_active' => $this->parent_navigation_item === 'falls',

-                ),

-                (object) array(

-                    'uri' => '/map/',

-                    'anchor' => 'Map',

-                    'is_active' => $this->parent_navigation_item === 'map',

-                ),

-                (object) array(

-                    'uri' => '/journal/',

-                    'anchor' => 'Journal',

-                    'is_active' => $this->parent_navigation_item === 'journal',

-                ),

-                (object) array(

-                    'uri' => '/about/',

-                    'anchor' => 'About',

-                    'is_active' => $this->parent_navigation_item === 'about',

-                )

-        ));

+		$this->set_body('main_navigation', array(

+				(object) array(

+					'uri' => '/falls/',

+					'anchor' => 'Falls',

+					'is_active' => $this->parent_navigation_item === 'falls',

+				),

+				(object) array(

+					'uri' => '/map/',

+					'anchor' => 'Map',

+					'is_active' => $this->parent_navigation_item === 'map',

+				),

+				(object) array(

+					'uri' => '/journal/',

+					'anchor' => 'Journal',

+					'is_active' => $this->parent_navigation_item === 'journal',

+				),

+				(object) array(

+					'uri' => '/about/',

+					'anchor' => 'About',

+					'is_active' => $this->parent_navigation_item === 'about',

+				)

+		));

 

-        if ($page_type == 'wide') {

-            $this->set_body_view('WidePage');

-        } else {

-            $this->set_body_view('Page');

-        }

-    }

+		if ($page_type == 'wide') {

+			$this->set_body_view('WidePage');

+		} else {

+			$this->set_body_view('Page');

+		}

+	}

 

 }

controller/waterfalls/DefaultWaterfallListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 		$county_result = CountyCollector::getCountyList();

 		$county_list = array();

 		

-		foreach($county_result as $county_row)

+		foreach ($county_result as $county_row)

 		{

 			$county = new stdclass();

 			$county->name = $county_row->name;

@@ -54,7 +54,7 @@ 
 		$watercourse_result = WatercourseCollector::getWatercourseList();

 		$watercourse_list = array();

 		

-		foreach($watercourse_result as $watercourse_row)

+		foreach ($watercourse_result as $watercourse_row)

 		{

 			$watercourse = new stdclass();

 			$watercourse->name = $watercourse_row->name;

controller/waterfalls/HomeController.class.inc.php

Indentation +62 added lines, -62 removed lines

@@ -1,84 +1,84 @@
 <?

 

 Loader::load('collector', array(

-    'comment/CommentCollector',

-    'image/PhotoCollector',

-    'waterfall/LogCollector',

+	'comment/CommentCollector',

+	'image/PhotoCollector',

+	'waterfall/LogCollector',

 ));

 Loader::load('controller', 'waterfalls/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.';

-    private static $KEYWORD_ARRAY = array(

-        'waterfalls',

-        'keweenaw',

-        'upper peninsula',

-        'jacob emerick',

-    );

+	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.';

+	private static $KEYWORD_ARRAY = array(

+		'waterfalls',

+		'keweenaw',

+		'upper peninsula',

+		'jacob emerick',

+	);

 

-    private static $BANNER_IMAGE = 2661;

+	private static $BANNER_IMAGE = 2661;

 

-    protected function set_head_data()

-    {

-        parent::set_head_data();

+	protected function set_head_data()

+	{

+		parent::set_head_data();

         

-        $this->set_title(self::$TITLE);

-        $this->set_description(self::$DESCRIPTION);

-        $this->set_keywords(self::$KEYWORD_ARRAY);

-    }

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

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

+		$this->set_keywords(self::$KEYWORD_ARRAY);

+	}

 

-    protected function set_body_data($page_type = 'wide')

-    {

-        parent::set_body_data($page_type);

+	protected function set_body_data($page_type = 'wide')

+	{

+		parent::set_body_data($page_type);

         

-        $photo = PhotoCollector::getRow(self::$BANNER_IMAGE);

-        $photo_obj = (object) array(

-            'file'         => "/photo/{$photo->category}/{$photo->name}-size-full.jpg",

-            'description'  => $photo->description,

-        );

-        $this->set_body('photo', $photo_obj);

+		$photo = PhotoCollector::getRow(self::$BANNER_IMAGE);

+		$photo_obj = (object) array(

+			'file'         => "/photo/{$photo->category}/{$photo->name}-size-full.jpg",

+			'description'  => $photo->description,

+		);

+		$this->set_body('photo', $photo_obj);

         

-        $recent_log_container;

-        $recent_logs = LogCollector::getRecentList(4);

-        foreach ($recent_logs as $log) {

-            $recent_log_container[] = (object) array(

-                'photo'  => (object) array(

-                    'file'         => "/photo/{$log->photo_category}/{$log->photo}-size-thumb.jpg",

-                    'description'  => $log->photo_description,

-                ),

-                'title'  => $log->title,

-                'link'   => "/journal/{$log->alias}/",

-                'date'   => date('F j, Y', strtotime($log->publish_date)),

-            );

-        }

-        $this->set_body('logs', $recent_log_container);

+		$recent_log_container;

+		$recent_logs = LogCollector::getRecentList(4);

+		foreach ($recent_logs as $log) {

+			$recent_log_container[] = (object) array(

+				'photo'  => (object) array(

+					'file'         => "/photo/{$log->photo_category}/{$log->photo}-size-thumb.jpg",

+					'description'  => $log->photo_description,

+				),

+				'title'  => $log->title,

+				'link'   => "/journal/{$log->alias}/",

+				'date'   => date('F j, Y', strtotime($log->publish_date)),

+			);

+		}

+		$this->set_body('logs', $recent_log_container);

         

-        $recent_comments = CommentCollector::getRecentWaterfallComments();

+		$recent_comments = CommentCollector::getRecentWaterfallComments();

         

-        $recent_comment_container = array();

-        foreach($recent_comments as $comment) {

-            $body = $comment->body;

-            $body = strip_tags($body);

+		$recent_comment_container = array();

+		foreach($recent_comments as $comment) {

+			$body = $comment->body;

+			$body = strip_tags($body);

             

-            $comment_obj = new stdclass();

-            $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->location = $comment->log_title;

-            } else {

-                $comment_obj->link = Loader::getRootURL() . "{$comment->waterfall_path}/#comment-{$comment->id}";

-                $comment_obj->location = $comment->waterfall_title;

-            }

+			$comment_obj = new stdclass();

+			$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->location = $comment->log_title;

+			} else {

+				$comment_obj->link = Loader::getRootURL() . "{$comment->waterfall_path}/#comment-{$comment->id}";

+				$comment_obj->location = $comment->waterfall_title;

+			}

             

-            $recent_comment_container[] = $comment_obj;

-        }

-        $this->set_body('comments', $recent_comment_container);

+			$recent_comment_container[] = $comment_obj;

+		}

+		$this->set_body('comments', $recent_comment_container);

         

-        $this->set_body('view', 'Home');

-    }

+		$this->set_body('view', 'Home');

+	}

 

 }
\ No newline at end of file

Spacing +1 added lines, -1 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);

             

controller/waterfalls/LogController.class.inc.php

Indentation +202 added lines, -202 removed lines

@@ -1,218 +1,218 @@
 <?

 

 Loader::load('collector', array(

-    'image/AlbumCollector',

-    'waterfall/LogCollector'));

+	'image/AlbumCollector',

+	'waterfall/LogCollector'));

 Loader::load('controller', 'waterfalls/DefaultPageController');

 

 final class LogController extends DefaultPageController

 {

 

-    private static $AUTHOR = 'Jacob Emerick';

-    private static $AUTHOR_URL = 'http://home.jacobemerick.com/';

-    private static $JOURNAL_DIRECTORY = 'journal';

-

-    private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';

-    private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';

-    private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';

-

-    private $log;

+	private static $AUTHOR = 'Jacob Emerick';

+	private static $AUTHOR_URL = 'http://home.jacobemerick.com/';

+	private static $JOURNAL_DIRECTORY = 'journal';

+

+	private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';

+	private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';

+	private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';

+

+	private $log;

 

-    public function __construct()

-    {

-        parent::__construct();

-        

-        $log_path = URLDecode::getPiece(2);

-        

-        $this->log = LogCollector::getByAlias($log_path);

-        if(!$this->log)

-            $this->eject();

-

-        $this->parent_navigation_item = 'journal';

-        

-        $this->handle_comment_submit(

-            self::$WATERFALL_SITE_ID,

-            $this->log->alias,

-            Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',

-            $this->log->title);

-        

-        $this->add_waterfall_js();

-    }

-

-    protected function set_head_data()

-    {

-        parent::set_head_data();

-        

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

-        {

-            $keyword_array[] = $tag->name;

-        }

-        

-        $this->set_keywords($keyword_array);

-    }

-

-    protected function set_body_data($page_type = 'normal')

-    {

-        parent::set_body_data($page_type);

-        

-        $this->set_body('view', 'Log');

-

-        $body_data = $this->get_formatted_log();

-        $body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);

-        $body_data['sidebar'] = $this->get_sidebar();

-        $body_data['series'] = $this->get_series();

-        $body_data['album'] = $this->get_album();

-        

-        $this->set_body('data', $body_data);

-    }

-

-    private function get_formatted_log()

-    {

-        $formatted_log = array();

-        

-        $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['body'] = $this->get_formatted_log_body();

-        

-        return $formatted_log;

-    }

-

-    private function get_log_introduction($log)

-    {

-        if ($log->image_description == '') {

-            Debugger::logMessage("No description for {$log->image_category}/{$log->image_name}");

-        }

-        

-        return array(

-            'title' => $log->title,

-            '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,

-            'image' => sprintf(

-                self::$MEDIUM_IMAGE_NODE,

-                $log->image_category,

-                $log->image_name,

-                $log->image_description),

-            'author' => self::$AUTHOR,

-            'author_url' => self::$AUTHOR_URL,

-        );

-    }

-

-    // @todo - link things up

-    private function get_formatted_log_body()

-    {

-        $body = $this->log->body;

-        

-        $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');

-        $body = Content::instance('FixInternalLink', $body)->activate();

-        

-        return $body;

-    }

-

-    private function get_series()

-    {

-        $series = array(

-            'previous' => array(),

-            'next' => array());

-        

-        $previous_log = LogCollector::getPreviousLog($this->log->id);

-        if($previous_log != false)

-        {

-            $series['previous'] = (object) array(

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

-        {

-            $series['next'] = (object) array(

-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',

-                'title' => $next_log->title,

-                'date' => $next_log->date);

-        }

-        

-        return $series;

-    }

-

-    private function get_sidebar()

-    {

-        $sidebar = array();

-        

-        $sidebar['companion_list'] = array();

-        $companions = LogCollector::getCompanionListForLog($this->log->id);

-        foreach($companions as $companion)

-        {

-            $sidebar['companion_list'][] = (object) array(

-                'title' => $companion->name,

-                'path' => "/companion/{$companion->alias}/");

-        }

-        

-        $sidebar['tag_list'] = array();

-        $tags = LogCollector::getTagListForLog($this->log->id);

-        foreach($tags as $tag)

-        {

-            $sidebar['tag_list'][] = (object) array(

-                'title' => $tag->name,

-                'path' => "/journal/tag/{$tag->alias}/");

-        }

-        

-        $sidebar['waterfall_list'] = array();

-        $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);

-        foreach($waterfalls as $waterfall)

-        {

-            $sidebar['waterfall_list'][] = (object) array(

-                'title' => $waterfall->name,

-                'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");

-        }

-        

-        return $sidebar;

-    }

-

-    private function get_album()

-    {

-        $album = array();

-        

-        if($this->log->album == 0)

-            return $album;

-        

-        $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);

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

+	public function __construct()

+	{

+		parent::__construct();

+        

+		$log_path = URLDecode::getPiece(2);

+        

+		$this->log = LogCollector::getByAlias($log_path);

+		if(!$this->log)

+			$this->eject();

+

+		$this->parent_navigation_item = 'journal';

+        

+		$this->handle_comment_submit(

+			self::$WATERFALL_SITE_ID,

+			$this->log->alias,

+			Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',

+			$this->log->title);

+        

+		$this->add_waterfall_js();

+	}

+

+	protected function set_head_data()

+	{

+		parent::set_head_data();

+        

+		$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)

+		{

+			$keyword_array[] = $tag->name;

+		}

+        

+		$this->set_keywords($keyword_array);

+	}

+

+	protected function set_body_data($page_type = 'normal')

+	{

+		parent::set_body_data($page_type);

+        

+		$this->set_body('view', 'Log');

+

+		$body_data = $this->get_formatted_log();

+		$body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);

+		$body_data['sidebar'] = $this->get_sidebar();

+		$body_data['series'] = $this->get_series();

+		$body_data['album'] = $this->get_album();

+        

+		$this->set_body('data', $body_data);

+	}

+

+	private function get_formatted_log()

+	{

+		$formatted_log = array();

+        

+		$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['body'] = $this->get_formatted_log_body();

+        

+		return $formatted_log;

+	}

+

+	private function get_log_introduction($log)

+	{

+		if ($log->image_description == '') {

+			Debugger::logMessage("No description for {$log->image_category}/{$log->image_name}");

+		}

+        

+		return array(

+			'title' => $log->title,

+			'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,

+			'image' => sprintf(

+				self::$MEDIUM_IMAGE_NODE,

+				$log->image_category,

+				$log->image_name,

+				$log->image_description),

+			'author' => self::$AUTHOR,

+			'author_url' => self::$AUTHOR_URL,

+		);

+	}

+

+	// @todo - link things up

+	private function get_formatted_log_body()

+	{

+		$body = $this->log->body;

+        

+		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');

+		$body = Content::instance('FixInternalLink', $body)->activate();

+        

+		return $body;

+	}

+

+	private function get_series()

+	{

+		$series = array(

+			'previous' => array(),

+			'next' => array());

+        

+		$previous_log = LogCollector::getPreviousLog($this->log->id);

+		if($previous_log != false)

+		{

+			$series['previous'] = (object) array(

+				'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)

+		{

+			$series['next'] = (object) array(

+				'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',

+				'title' => $next_log->title,

+				'date' => $next_log->date);

+		}

+        

+		return $series;

+	}

+

+	private function get_sidebar()

+	{

+		$sidebar = array();

+        

+		$sidebar['companion_list'] = array();

+		$companions = LogCollector::getCompanionListForLog($this->log->id);

+		foreach($companions as $companion)

+		{

+			$sidebar['companion_list'][] = (object) array(

+				'title' => $companion->name,

+				'path' => "/companion/{$companion->alias}/");

+		}

+        

+		$sidebar['tag_list'] = array();

+		$tags = LogCollector::getTagListForLog($this->log->id);

+		foreach($tags as $tag)

+		{

+			$sidebar['tag_list'][] = (object) array(

+				'title' => $tag->name,

+				'path' => "/journal/tag/{$tag->alias}/");

+		}

+        

+		$sidebar['waterfall_list'] = array();

+		$waterfalls = LogCollector::getWaterfallListForLog($this->log->id);

+		foreach($waterfalls as $waterfall)

+		{

+			$sidebar['waterfall_list'][] = (object) array(

+				'title' => $waterfall->name,

+				'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");

+		}

+        

+		return $sidebar;

+	}

+

+	private function get_album()

+	{

+		$album = array();

+        

+		if($this->log->album == 0)

+			return $album;

+        

+		$photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);

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

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

             

-            if ($photo->description == '') {

-                Debugger::logMessage("No description for {$photo->category}/{$photo->name}");

-            }

+			if ($photo->description == '') {

+				Debugger::logMessage("No description for {$photo->category}/{$photo->name}");

+			}

             

-            $photo_array['image_node'] = sprintf(

-                self::$THUMB_IMAGE_NODE,

-                $photo->category,

-                $photo->name,

-                $photo->description,

-                $height,

-                $width);

+			$photo_array['image_node'] = sprintf(

+				self::$THUMB_IMAGE_NODE,

+				$photo->category,

+				$photo->name,

+				$photo->description,

+				$height,

+				$width);

             

-            $album[] = (object) $photo_array;

-        }

+			$album[] = (object) $photo_array;

+		}

         

-        return $album;

-    }

+		return $album;

+	}

 

 }
\ No newline at end of file

Spacing +10 added lines, -10 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';

@@ -48,7 +48,7 @@ 
         

         $keyword_array = array();

         $tag_result = LogCollector::getTagListForLog($this->log->id);

-        foreach($tag_result as $tag)

+        foreach ($tag_result as $tag)

         {

             $keyword_array[] = $tag->name;

         }

@@ -124,7 +124,7 @@ 
             '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 . '/',

@@ -133,7 +133,7 @@ 
         }

         

         $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 . '/',

@@ -150,7 +150,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,

@@ -159,7 +159,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,

@@ -168,7 +168,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,

@@ -182,17 +182,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 +11 added lines, -8 removed lines

@@ -25,8 +25,9 @@ 
         $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';

         

@@ -182,8 +183,9 @@ 
     {

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

@@ -192,10 +194,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);

+            }

             

             if ($photo->description == '') {

                 Debugger::logMessage("No description for {$photo->category}/{$photo->name}");

controller/waterfalls/LogTagListController.class.inc.php

Spacing +1 added lines, -1 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();

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 		$alias = URLDecode::getPiece(3);

 		$this->tag = LogTagCollector::getTag($alias);

 		

-		if(!$this->tag)

-			$this->eject();

+		if(!$this->tag) {

+					$this->eject();

+		}

 		

 		parent::__construct();

 	}

controller/waterfalls/MapController.class.inc.php

Indentation +48 added lines, -48 removed lines

@@ -6,62 +6,62 @@
 final class MapController extends DefaultPageController

 {

 

-    private static $TITLE = 'Map of Upper Peninsula Waterfalls';

-    private static $DESCRIPTION = '';

-    private static $KEYWORD_ARRAY = array();

+	private static $TITLE = 'Map of Upper Peninsula Waterfalls';

+	private static $DESCRIPTION = '';

+	private static $KEYWORD_ARRAY = array();

 

-    private static $HIDE_ON_INITIAL_LOAD_LIST = array(

-        'Lower Tahquamenon Falls',

-        'Rainbow Falls',

-        'Sandstone Falls',

-        'Upper Tahquamenon Falls',

-    );

+	private static $HIDE_ON_INITIAL_LOAD_LIST = array(

+		'Lower Tahquamenon Falls',

+		'Rainbow Falls',

+		'Sandstone Falls',

+		'Upper Tahquamenon Falls',

+	);

 

-    public function __construct()

-    {

-        parent::__construct();

+	public function __construct()

+	{

+		parent::__construct();

 

-        $this->add_js('https://maps.googleapis.com/maps/api/js?sensor=false');

-        $this->add_waterfall_js();

-    }

+		$this->add_js('https://maps.googleapis.com/maps/api/js?sensor=false');

+		$this->add_waterfall_js();

+	}

 

-    protected function set_head_data()

-    {

-        parent::set_head_data();

+	protected function set_head_data()

+	{

+		parent::set_head_data();

         

-        $this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);

-        $this->set_description(self::$DESCRIPTION);

-        $this->set_keywords(self::$KEYWORD_ARRAY);

-    }

+		$this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);

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

+		$this->set_keywords(self::$KEYWORD_ARRAY);

+	}

 

-    protected function set_body_data($page_type = 'wide')

-    {

-        parent::set_body_data($page_type);

+	protected function set_body_data($page_type = 'wide')

+	{

+		parent::set_body_data($page_type);

         

-        $this->set_head('full_page_map', true);

-        $this->set_body('waterfall_list', $this->fetch_waterfall_list());

-        $this->set_body('view', 'Map');

-    }

+		$this->set_head('full_page_map', true);

+		$this->set_body('waterfall_list', $this->fetch_waterfall_list());

+		$this->set_body('view', 'Map');

+	}

 

-    private function fetch_waterfall_list()

-    {

-        $list = WaterfallCollector::getMapList();

-        array_walk($list, array($this, 'parse_waterfall'));

-        return $list;

-    }

+	private function fetch_waterfall_list()

+	{

+		$list = WaterfallCollector::getMapList();

+		array_walk($list, array($this, 'parse_waterfall'));

+		return $list;

+	}

 

-    private function parse_waterfall(&$waterfall)

-    {

-        $waterfall = (object) array(

-            'name'  => $waterfall->name,

-            'latitude' => $waterfall->latitude,

-            'longitude' => $waterfall->longitude,

-            'link' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",

-            'image' => "/photo/{$waterfall->photo_category}/{$waterfall->photo}-size-medium.jpg",

-            'image_alt' => $waterfall->photo_description,

-            'watercourse' => $waterfall->watercourse,

-            'hide_on_initial_load' => (in_array($waterfall->name, self::$HIDE_ON_INITIAL_LOAD_LIST)),

-        );

-    }

+	private function parse_waterfall(&$waterfall)

+	{

+		$waterfall = (object) array(

+			'name'  => $waterfall->name,

+			'latitude' => $waterfall->latitude,

+			'longitude' => $waterfall->longitude,

+			'link' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",

+			'image' => "/photo/{$waterfall->photo_category}/{$waterfall->photo}-size-medium.jpg",

+			'image_alt' => $waterfall->photo_description,

+			'watercourse' => $waterfall->watercourse,

+			'hide_on_initial_load' => (in_array($waterfall->name, self::$HIDE_ON_INITIAL_LOAD_LIST)),

+		);

+	}

 

 }