jacobemerick / web

router/PortfolioRouter.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -27,12 +27,12 @@
 
 	protected function check_for_special_redirect($uri)
 	{
-		if(preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))
+		if (preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))
 		{
 			Loader::load('collector', 'portfolio/PortfolioCollector');
 			$piece = PortfolioCollector::getPieceByURI($matches[1]);
 			
-			if($piece === null)
+			if ($piece === null)
 			{
 				Loader::loadNew('controller', '/Error404Controller')
 					->activate();

collector/waterfall/WatercourseCollector.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -153,9 +153,9 @@
 		return self::run_query($query);
 	}
 
-    public static function getParentWatercourse($watercourse)
-    {
-    }
+	public static function getParentWatercourse($watercourse)
+	{
+	}
 
 	public static function getLogCountForWatercourse($watercourse)
 	{

controller/AJAXController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 
 	protected function set_response($message, $type = 'internal')
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'internal' :
 				$this->response['internal'] = $message;

controller/lifestream/TagController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -46,7 +46,7 @@ 
 
 	private function get_title()
 	{
-		switch($this->tag)
+		switch ($this->tag)
 		{
 			case 'blog' :
 				return 'Jacob has a Blog';
@@ -71,7 +71,7 @@ 
 
 	private function get_description()
 	{
-		switch($this->tag)
+		switch ($this->tag)
 		{
 			case 'blog' :
 				return 'Yeah, Jacob has a blog. Check out his posting activity.';
@@ -97,7 +97,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -117,16 +117,16 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return Loader::getRootUrl('lifestream') . $this->tag . '/';
 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
 	}
@@ -134,7 +134,7 @@ 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
+		if (!isset($this->total_post_count))
 			$this->total_post_count = ActivityCollector::getCountForTag($this->tag);
 		return $this->total_post_count;
 	}

Braces +15 added lines, -10 removed lines

@@ -97,8 +97,9 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
@@ -117,25 +118,29 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream') . $this->tag . '/';
+		if($this->page == 1) {

+					return;

+		}

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

+					return Loader::getRootUrl('lifestream') . $this->tag . '/';

+		}

 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page - 1) . '/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Loader::getRootUrl('lifestream') . $this->tag . '/page/' . ($this->page + 1) . '/';
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);
+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = $this->activityRepository->getActivitiesByTypeCount($this->tag);

+		}

 		return $this->total_post_count;
 	}
 

Indentation +6 added lines, -6 removed lines

@@ -57,9 +57,9 @@ 
 			case 'distance' :
 				return 'Run, Jacob, and Hike';
 			break;
-      case 'github' :
-        return 'Jacob, Code Monkey';
-      break;
+	  case 'github' :
+		return 'Jacob, Code Monkey';
+	  break;
 			case 'hulu' :
 				return 'Jacob watches Hulu';
 			break;
@@ -85,9 +85,9 @@ 
 			case 'distance' :
 				return 'All the cool kids like to be in shape. Jacob goes running and hiking.';
 			break;
-      case 'github' :
-        return 'Since he is trying to be a developer, Jacob codes. Here is some code that he pushed around on the Githubs.';
-      break;
+	  case 'github' :
+		return 'Since he is trying to be a developer, Jacob codes. Here is some code that he pushed around on the Githubs.';
+	  break;
 			case 'hulu' :
 				return 'Occasionally Jacob chills and watches some Hulu. Well, used to, anyways.';
 			break;

controller/lifestream/HomeController.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -58,16 +58,16 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return Loader::getRootUrl('lifestream');
 		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page - 1) . '/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
 			return;
 		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/';
 	}
@@ -75,7 +75,7 @@ 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
+		if (!isset($this->total_post_count))
 			$this->total_post_count = ActivityCollector::getCount();
 		return $this->total_post_count;
 	}

Indentation +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
 
 	protected function get_list_results()
 	{
-    return $this->activityRepository->getActivities(self::$POSTS_PER_PAGE, $this->offset);
+	return $this->activityRepository->getActivities(self::$POSTS_PER_PAGE, $this->offset);
 	}
 
 	protected function get_list_description()

Braces +15 added lines, -10 removed lines

@@ -38,8 +38,9 @@ 
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
@@ -58,25 +59,29 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Loader::getRootUrl('lifestream');
+		if($this->page == 1) {

+					return;

+		}

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

+					return Loader::getRootUrl('lifestream');

+		}

 		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page - 1) . '/';
 	}
 
 	protected function get_list_prev_link()
 	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
+		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {

+					return;

+		}

 		return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/';
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = $this->activityRepository->getActivitiesCount();
+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = $this->activityRepository->getActivitiesCount();

+		}

 		return $this->total_post_count;
 	}
 

controller/ajax/SubmitCommentController.class.inc.php

Spacing +16 added lines, -16 removed lines

@@ -14,19 +14,19 @@ 
 
 	protected function set_data()
 	{
-		if(!Validate::checkRequest('post', 'name', 'name'))
+		if (!Validate::checkRequest('post', 'name', 'name'))
 			return $this->fail_response('You must include a valid name.');
-		if(!Validate::checkRequest('post', 'email', 'email'))
+		if (!Validate::checkRequest('post', 'email', 'email'))
 			return $this->fail_response('You must include a valid email.');
-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
+		if (Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
 			return $this->fail_response('Please include a valid website.');
-		if(!Validate::checkRequest('post', 'comment', 'string'))
+		if (!Validate::checkRequest('post', 'comment', 'string'))
 			return $this->fail_response('You must enter a comment.');
-		if(!Validate::checkRequest('post', 'save', 'boolean'))
+		if (!Validate::checkRequest('post', 'save', 'boolean'))
 			return $this->fail_response('You entered an invalid save request.');
-		if(!Validate::checkRequest('post', 'notify', 'boolean'))
+		if (!Validate::checkRequest('post', 'notify', 'boolean'))
 			return $this->fail_response('You entered an invalid notify request.');
-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
+		if (Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
 			return $this->fail_response('You entered an invalid reply value.');
 		
 		$referer_url = Request::getServer('HTTP_REFERER');
@@ -35,11 +35,11 @@ 
 		$url = array_pop($url);
 		$post = PostCollector::getPostByURI($url);
 		
-		if($post === null)
+		if ($post === null)
 			return $this->fail_response('There seems to be a problem with this page.', 'error');
 		
 		$commentpage_result = CommentCollector::getCommentPageByURL($post->path, 2);
-		if($commentpage_result === null)
+		if ($commentpage_result === null)
 		{
 			$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site_id`, `url`) VALUES ('%d', '%s')";
 			
@@ -56,7 +56,7 @@ 
 		$save = (Request::getPost('save') == 'true') ? 1 : 0;
 		
 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
-		if($commenter_result === null)
+		if ($commenter_result === null)
 		{
 			$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`,`save`) VALUES ('%s','%s','%s','%s')";
 			
@@ -70,7 +70,7 @@ 
 		}
 		else
 		{
-			if($commenter_result->save !== $save)
+			if ($commenter_result->save !== $save)
 			{
 				$query = "UPDATE `jpemeric_comment`.`commenter` SET `save` = '%s' WHERE `id` = '%d'";
 				
@@ -81,7 +81,7 @@ 
 		}
 		
 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));
-		if($comment_result === null)
+		if ($comment_result === null)
 		{
 			$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`) VALUES ('%s')";
 			
@@ -112,9 +112,9 @@ 
 		
 		$notification_result = CommentCollector::getNotificationForPage($commentpage_id);
 		
-		foreach($notification_result as $notification_row)
+		foreach ($notification_result as $notification_row)
 		{
-			if($notification_row->email == $email)
+			if ($notification_row->email == $email)
 				continue;
 			
 			$email_recipient_array[$notification_row->email] = array(
@@ -123,7 +123,7 @@ 
 		}
 		
 		$message = "Hello!\nThere has been a new post on the post '{$post->title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to {$config->admin_email} if you do would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$referer_url}#comments to see and reply to all the comments on this post.\nThank you!";
-		foreach($email_recipient_array as $email_recipient)
+		foreach ($email_recipient_array as $email_recipient)
 		{
 			$mail = new Mail();
 			$mail->setToAddress($email_recipient['email'], $email_recipient['name']);
@@ -132,7 +132,7 @@ 
 			$mail->send();
 		}
 		
-		if(Request::getPost('save') == true)
+		if (Request::getPost('save') == true)
 		{
 			/*
 			$cookie = new Cookie('jpe_commenter');

Braces +34 added lines, -26 removed lines

@@ -14,20 +14,27 @@ 
 
 	protected function set_data()
 	{
-		if(!Validate::checkRequest('post', 'name', 'name'))
-			return $this->fail_response('You must include a valid name.');
-		if(!Validate::checkRequest('post', 'email', 'email'))
-			return $this->fail_response('You must include a valid email.');
-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
-			return $this->fail_response('Please include a valid website.');
-		if(!Validate::checkRequest('post', 'comment', 'string'))
-			return $this->fail_response('You must enter a comment.');
-		if(!Validate::checkRequest('post', 'save', 'boolean'))
-			return $this->fail_response('You entered an invalid save request.');
-		if(!Validate::checkRequest('post', 'notify', 'boolean'))
-			return $this->fail_response('You entered an invalid notify request.');
-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
-			return $this->fail_response('You entered an invalid reply value.');
+		if(!Validate::checkRequest('post', 'name', 'name')) {

+					return $this->fail_response('You must include a valid name.');

+		}

+		if(!Validate::checkRequest('post', 'email', 'email')) {

+					return $this->fail_response('You must include a valid email.');

+		}

+		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url')) {

+					return $this->fail_response('Please include a valid website.');

+		}

+		if(!Validate::checkRequest('post', 'comment', 'string')) {

+					return $this->fail_response('You must enter a comment.');

+		}

+		if(!Validate::checkRequest('post', 'save', 'boolean')) {

+					return $this->fail_response('You entered an invalid save request.');

+		}

+		if(!Validate::checkRequest('post', 'notify', 'boolean')) {

+					return $this->fail_response('You entered an invalid notify request.');

+		}

+		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer')) {

+					return $this->fail_response('You entered an invalid reply value.');

+		}

 		
 		$referer_url = Request::getServer('HTTP_REFERER');
 		$url = explode('/', $referer_url);
@@ -35,8 +42,9 @@ 
 		$url = array_pop($url);
 		$post = PostCollector::getPostByURI($url);
 		
-		if($post === null)
-			return $this->fail_response('There seems to be a problem with this page.', 'error');
+		if($post === null) {

+					return $this->fail_response('There seems to be a problem with this page.', 'error');

+		}

 		
 		$commentpage_result = CommentCollector::getCommentPageByURL($post->path, 2);
 		if($commentpage_result === null)
@@ -49,9 +57,9 @@ 
 			$query = sprintf($query, $site_id, $url);
 			Database::execute($query);
 			$commentpage_id = Database::lastInsertID();
-		}
-		else
-			$commentpage_id = $commentpage_result->id;
+		} else {

+					$commentpage_id = $commentpage_result->id;

+		}

 		
 		$save = (Request::getPost('save') == 'true') ? 1 : 0;
 		
@@ -67,8 +75,7 @@ 
 			$query = sprintf($query, $name, $email, $website, $save);
 			Database::execute($query);
 			$commenter_id = Database::lastInsertID();
-		}
-		else
+		} else
 		{
 			if($commenter_result->save !== $save)
 			{
@@ -90,9 +97,9 @@ 
 			$query = sprintf($query, $body);
 			Database::execute($query);
 			$comment_id = Database::lastInsertID();
-		}
-		else
-			$comment_id = $comment_result->id;
+		} else {

+					$comment_id = $comment_result->id;

+		}

 		
 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter_id`,`comment_id`,`reply`,`notify`,`commentpage_id`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
 		
@@ -114,8 +121,9 @@ 
 		
 		foreach($notification_result as $notification_row)
 		{
-			if($notification_row->email == $email)
-				continue;
+			if($notification_row->email == $email) {

+							continue;

+			}

 			
 			$email_recipient_array[$notification_row->email] = array(
 				'email' => $notification_row->email,

controller/waterfalls/WaterfallController.class.inc.php

Indentation +193 added lines, -193 removed lines

@@ -1,231 +1,231 @@
 <?
 
 Loader::load('collector', array(
-    'image/AlbumCollector',
-    'waterfall/WatercourseCollector',
-    'waterfall/WaterfallCollector',
-    'waterfall/LogCollector'));
+	'image/AlbumCollector',
+	'waterfall/WatercourseCollector',
+	'waterfall/WaterfallCollector',
+	'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/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" />';
-
-    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-medium.jpg" alt="%s" height="375" width="500" />';
-
-    private $waterfall;
-
-    public function __construct()
-    {
-        parent::__construct();
-
-        $path_watercourse = URLDecode::getPiece(1);
-        $path_fall = URLDecode::getPiece(2);
-
-        $this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);
-        if (!$this->waterfall) {
-              $this->eject();
-        }
-        
-        $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}/",
-            $this->waterfall->name);
-        
-        $this->add_waterfall_js();
-    }
-
-    protected function set_head_data()
-    {
-        parent::set_head_data();
-
-        $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);
-    }
-
-    protected function set_body_data($page_type = 'normal')
-    {
-        parent::set_body_data($page_type);
-
-        $body_data = $this->format_waterfall_data($this->waterfall);
-        $body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}");
-
-        $this->set_body('data', $body_data);
-
-        $this->set_body('view', 'Fall');
-    }
-
-    private function format_waterfall_data($waterfall)
-    {
-        $waterfall_data = array();
-        $waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);
-        $waterfall_data['name'] = $waterfall->name;
-        $waterfall_data['watercourse'] = $waterfall->watercourse;
-        $waterfall_data['path'] = "/{$waterfall->watercourse_alias}/{$waterfall->alias}/";
-        $waterfall_data['tagline'] = $waterfall->introduction;
-        $waterfall_data['main_photo'] = sprintf(self::$STANDARD_IMAGE_NODE, $waterfall->photo_category, $waterfall->photo, $waterfall->photo_description);
-        $waterfall_data['album'] = $this->get_album();
-        $waterfall_data['body'] = $this->format_waterfall_content($waterfall->body);
-        $waterfall_data['directions'] = $this->format_waterfall_content($waterfall->directions);
-        $waterfall_data['sidebar'] = $this->get_sidebar($waterfall);
-
-        return $waterfall_data;
-    }
-
-    private function get_waterfall_introduction($waterfall)
-    {
-        return array(
-            'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
-            'name' => $waterfall->name,
-            'watercourse' => $waterfall->watercourse,
-            'tagline' => $waterfall->introduction,
-        );
-    }
-
-    private function get_main_watercourse($alias)
-    {
-        $watercourse = WatercourseCollector::getByAlias($alias);
-        if ($watercourse->parent != 0) {
-            $watercourse = WatercourseCollector::getById($watercourse->parent);
-        }
-        
-        return (object) array(
-            'name' => $watercourse->name,
-            'title' => $watercourse->name,
-            'alias' => $watercourse->alias,
-        );
-    }
-
-    private function format_waterfall_content($content)
-    {
-        $content = Content::instance('FixInternalLink', $content)->activate();
-        
-        return $content;
-    }
-
-    private function get_album()
-    {
-        $album = array();
-        
-        if($this->waterfall->album == 0)
-            return $album;
-        
-        $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->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;
+	private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';
+
+	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-medium.jpg" alt="%s" height="375" width="500" />';
+
+	private $waterfall;
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		$path_watercourse = URLDecode::getPiece(1);
+		$path_fall = URLDecode::getPiece(2);
+
+		$this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);
+		if (!$this->waterfall) {
+			  $this->eject();
+		}
+        
+		$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}/",
+			$this->waterfall->name);
+        
+		$this->add_waterfall_js();
+	}
+
+	protected function set_head_data()
+	{
+		parent::set_head_data();
+
+		$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);
+	}
+
+	protected function set_body_data($page_type = 'normal')
+	{
+		parent::set_body_data($page_type);
+
+		$body_data = $this->format_waterfall_data($this->waterfall);
+		$body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}");
+
+		$this->set_body('data', $body_data);
+
+		$this->set_body('view', 'Fall');
+	}
+
+	private function format_waterfall_data($waterfall)
+	{
+		$waterfall_data = array();
+		$waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);
+		$waterfall_data['name'] = $waterfall->name;
+		$waterfall_data['watercourse'] = $waterfall->watercourse;
+		$waterfall_data['path'] = "/{$waterfall->watercourse_alias}/{$waterfall->alias}/";
+		$waterfall_data['tagline'] = $waterfall->introduction;
+		$waterfall_data['main_photo'] = sprintf(self::$STANDARD_IMAGE_NODE, $waterfall->photo_category, $waterfall->photo, $waterfall->photo_description);
+		$waterfall_data['album'] = $this->get_album();
+		$waterfall_data['body'] = $this->format_waterfall_content($waterfall->body);
+		$waterfall_data['directions'] = $this->format_waterfall_content($waterfall->directions);
+		$waterfall_data['sidebar'] = $this->get_sidebar($waterfall);
+
+		return $waterfall_data;
+	}
+
+	private function get_waterfall_introduction($waterfall)
+	{
+		return array(
+			'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
+			'name' => $waterfall->name,
+			'watercourse' => $waterfall->watercourse,
+			'tagline' => $waterfall->introduction,
+		);
+	}
+
+	private function get_main_watercourse($alias)
+	{
+		$watercourse = WatercourseCollector::getByAlias($alias);
+		if ($watercourse->parent != 0) {
+			$watercourse = WatercourseCollector::getById($watercourse->parent);
+		}
+        
+		return (object) array(
+			'name' => $watercourse->name,
+			'title' => $watercourse->name,
+			'alias' => $watercourse->alias,
+		);
+	}
+
+	private function format_waterfall_content($content)
+	{
+		$content = Content::instance('FixInternalLink', $content)->activate();
+        
+		return $content;
+	}
+
+	private function get_album()
+	{
+		$album = array();
+        
+		if($this->waterfall->album == 0)
+			return $album;
+        
+		$photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->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);
             
-            $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;
+	}
 
 	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['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
 		$sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
-        $sidebar_data['rating'] = $waterfall->rating;
+		$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 (
-            'name' => $waterfall->county,
-            'alias' => $waterfall->county_alias,
-            'title' => $waterfall->county_title,
-        );
+		$sidebar_data['county'] = (object) array (
+			'name' => $waterfall->county,
+			'alias' => $waterfall->county_alias,
+			'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['map'] = $this->get_map_piece($waterfall);
+		$sidebar_data['map'] = $this->get_map_piece($waterfall);
         
-        $sidebar_data['journal_list'] = $this->get_journal_list($waterfall->id);
+		$sidebar_data['journal_list'] = $this->get_journal_list($waterfall->id);
         
-        $sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);
+		$sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);
 		
 		return $sidebar_data;
 	}
 
-    private function get_journal_list($waterfall)
-    {
-        $list = array();
-        $log_result = LogCollector::getLogListForWaterfall($waterfall);
-        foreach ($log_result as $log_row) {
-            $list[] = (object) array(
-                'date' => date('F j, Y', strtotime($log_row->date)),
-                'title' => $log_row->title,
-                'url' => "/journal/{$log_row->alias}/",
-            );
-        }
-        
-        return $list;
-    }
-
-    private function get_map_piece($waterfall)
-    {
-        $map_holder = array();
-        
-        $url = 'http://maps.googleapis.com/maps/api/staticmap';
-        $url .= "?center={$waterfall->latitude},{$waterfall->longitude}";
-        $url .= "&zoom=8";
-        $url .= "&maptype=terrain";
-        $url .= "&size=230x200";
-        $url .= "&markers=color:red|size:small|{$waterfall->latitude},{$waterfall->longitude}";
-        $url .= "&sensor=false";
-        $url .= "&key=AIzaSyA3eWALjUTSIa44KsbOUYRpG0oMd3aNo00";
-        
-        $image = "<img src=\"{$url}\" height=\"200\" width=\"230\" alt=\"{$waterfall->name} Location\" />";
-        $map_holder['image'] = $image;
-        
-        $map_holder['uri'] = '/map/';
-        $map_holder['title'] = "View {$waterfall->name} on a larger map";
-        
-        return (object) $map_holder;
-    }
-
-    private function get_nearby_list($waterfall)
-    {
-        $nearby_list = array();
-        
-        $result = WaterfallCollector::getNearbyList($waterfall);
-        foreach ($result as $row) {
-            $nearby_list[] = (object) array(
-                'url' => "/{$row->watercourse_alias}/{$row->alias}/",
-                'anchor' => $row->name,
-                'title' => "{$row->name} of {$row->watercourse}",
-                'distance' => Content::instance('ImperialUnit', $row->distance)->activate(false),
-            );
-        }
-        
-        return $nearby_list;
-    }
+	private function get_journal_list($waterfall)
+	{
+		$list = array();
+		$log_result = LogCollector::getLogListForWaterfall($waterfall);
+		foreach ($log_result as $log_row) {
+			$list[] = (object) array(
+				'date' => date('F j, Y', strtotime($log_row->date)),
+				'title' => $log_row->title,
+				'url' => "/journal/{$log_row->alias}/",
+			);
+		}
+        
+		return $list;
+	}
+
+	private function get_map_piece($waterfall)
+	{
+		$map_holder = array();
+        
+		$url = 'http://maps.googleapis.com/maps/api/staticmap';
+		$url .= "?center={$waterfall->latitude},{$waterfall->longitude}";
+		$url .= "&zoom=8";
+		$url .= "&maptype=terrain";
+		$url .= "&size=230x200";
+		$url .= "&markers=color:red|size:small|{$waterfall->latitude},{$waterfall->longitude}";
+		$url .= "&sensor=false";
+		$url .= "&key=AIzaSyA3eWALjUTSIa44KsbOUYRpG0oMd3aNo00";
+        
+		$image = "<img src=\"{$url}\" height=\"200\" width=\"230\" alt=\"{$waterfall->name} Location\" />";
+		$map_holder['image'] = $image;
+        
+		$map_holder['uri'] = '/map/';
+		$map_holder['title'] = "View {$waterfall->name} on a larger map";
+        
+		return (object) $map_holder;
+	}
+
+	private function get_nearby_list($waterfall)
+	{
+		$nearby_list = array();
+        
+		$result = WaterfallCollector::getNearbyList($waterfall);
+		foreach ($result as $row) {
+			$nearby_list[] = (object) array(
+				'url' => "/{$row->watercourse_alias}/{$row->alias}/",
+				'anchor' => $row->name,
+				'title' => "{$row->name} of {$row->watercourse}",
+				'distance' => Content::instance('ImperialUnit', $row->distance)->activate(false),
+			);
+		}
+        
+		return $nearby_list;
+	}
 
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -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);
@@ -154,7 +154,7 @@ 
 		$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,

Braces +8 added lines, -6 removed lines

@@ -112,8 +112,9 @@ 
     {
         $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 +123,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/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/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}");