jacobemerick / web

controller/home/HomeController.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -43,9 +43,9 @@
 
 	private function get_recent_posts()
 	{
-    global $container;
-    $postRepository = new MysqlPostRepository($container['db_connection_locator']);
-    $recentPosts = $postRepository->getActivePosts(3);
+	global $container;
+	$postRepository = new MysqlPostRepository($container['db_connection_locator']);
+	$recentPosts = $postRepository->getActivePosts(3);
 
 		$recent_post_array = array();
 		foreach($recentPosts as $postResult)

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
     $recentPosts = $postRepository->getActivePosts(3);
 
 		$recent_post_array = array();
-		foreach($recentPosts as $postResult)
+		foreach ($recentPosts as $postResult)
 		{
 			$post = new stdclass();
 			$post->title = $postResult['title'];

router/WaterfallRouter.class.inc.php

Indentation +62 added lines, -62 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 
 Loader::load('collector', array(
-    'waterfall/LogCollector',
-    'waterfall/WaterfallCollector'));
+	'waterfall/LogCollector',
+	'waterfall/WaterfallCollector'));
 Loader::load('router', 'Router');
 
 class WaterfallRouter extends Router
@@ -26,15 +26,15 @@ 
 			(object) array(
 				'pattern' => '@^/falls/results(/?)$@',
 				'replace' => '/falls/'),
-            (object) array(
-                'pattern' => '@^/log(/?)$@',
-                'replace' => '/journal/'),
-            (object) array(
-                'pattern' => '@^/log/(\d+)(/?)$@',
-                'replace' => '/journal/$1'),
-            (object) array(
-                'pattern' => '@^/map/([^/]+)(/?)$@',
-                'replace' => '/map/'),
+			(object) array(
+				'pattern' => '@^/log(/?)$@',
+				'replace' => '/journal/'),
+			(object) array(
+				'pattern' => '@^/log/(\d+)(/?)$@',
+				'replace' => '/journal/$1'),
+			(object) array(
+				'pattern' => '@^/map/([^/]+)(/?)$@',
+				'replace' => '/map/'),
 			(object) array(
 				'pattern' => '@^/about/([a-z]*)(/?)$@',
 				'replace' => '/about/'),
@@ -73,57 +73,57 @@ 
 
 	protected function check_for_special_redirect($uri)
 	{
-        if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
-            $alias = $matches[1];
-            $alias = str_replace("'", '', $alias);
-            $alias .= '-falls';
-            $result = WaterfallCollector::getByOldAlias($alias);
-            if ($result !== null) {
-                return "/{$result->watercourse_alias}/{$result->alias}/";
-            } else {
-                Loader::loadNew('controller', '/Error404Controller')->activate();
-            }
-        }
+		if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
+			$alias = $matches[1];
+			$alias = str_replace("'", '', $alias);
+			$alias .= '-falls';
+			$result = WaterfallCollector::getByOldAlias($alias);
+			if ($result !== null) {
+				return "/{$result->watercourse_alias}/{$result->alias}/";
+			} else {
+				Loader::loadNew('controller', '/Error404Controller')->activate();
+			}
+		}
         
-        if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {
-            $alias = $matches[1];
-            $alias = explode('-', $alias);
-            array_pop($alias);
-            $alias = implode('-', $alias);
-            $alias = str_replace("'", '', $alias);
-            $alias .= '-falls';
-            $result = WaterfallCollector::getByOldAlias($alias);
-            if ($result !== null) {
-                return "/{$result->watercourse_alias}/{$result->alias}/";
-            } else {
-                Loader::loadNew('controller', '/Error404Controller')->activate();
-            }
-        }
+		if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {
+			$alias = $matches[1];
+			$alias = explode('-', $alias);
+			array_pop($alias);
+			$alias = implode('-', $alias);
+			$alias = str_replace("'", '', $alias);
+			$alias .= '-falls';
+			$result = WaterfallCollector::getByOldAlias($alias);
+			if ($result !== null) {
+				return "/{$result->watercourse_alias}/{$result->alias}/";
+			} else {
+				Loader::loadNew('controller', '/Error404Controller')->activate();
+			}
+		}
         
-        if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {
-            $date = $matches[1];
-            $date = explode('-', $date);
-            $date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);
-            $date = date('Y-m-d', $date);
-            $result = LogCollector::getByDate($date);
-            if ($result !== null) {
-                return "/journal/{$result->alias}/";
-            } else {
-                Loader::loadNew('controller', '/Error404Controller')->activate();
-            }
-        }
+		if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {
+			$date = $matches[1];
+			$date = explode('-', $date);
+			$date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);
+			$date = date('Y-m-d', $date);
+			$result = LogCollector::getByDate($date);
+			if ($result !== null) {
+				return "/journal/{$result->alias}/";
+			} else {
+				Loader::loadNew('controller', '/Error404Controller')->activate();
+			}
+		}
         
-        if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {
-            $alias = $matches[1];
-            $alias = str_replace("'", '', $alias);
-            $alias .= '-falls';
-            $result = WaterfallCollector::getByOldAlias($alias);
-            if ($result !== null) {
-                return "/map/#{$result->watercourse_alias}/{$result->alias}";
-            } else {
-                Loader::loadNew('controller', '/Error404Controller')->activate();
-            }
-        }
+		if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {
+			$alias = $matches[1];
+			$alias = str_replace("'", '', $alias);
+			$alias .= '-falls';
+			$result = WaterfallCollector::getByOldAlias($alias);
+			if ($result !== null) {
+				return "/map/#{$result->watercourse_alias}/{$result->alias}";
+			} else {
+				Loader::loadNew('controller', '/Error404Controller')->activate();
+			}
+		}
         
 		return $uri;
 	}
@@ -164,9 +164,9 @@ 
 			(object) array(
 				'match' => '/map/',
 				'controller' => 'MapController'),
-            (object) array(
-                'match' => '/map/#[a-z-/]+',
-                'controller' => 'MapController'),
+			(object) array(
+				'match' => '/map/#[a-z-/]+',
+				'controller' => 'MapController'),
 			(object) array(
 				'match' => '/journal/',
 				'controller' => 'LogListController'),

router/BlogRouter.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -45,11 +45,11 @@ 
 
 	protected function check_for_special_redirect($uri)
 	{
-		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
+		if (preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
 		{
 			Loader::load('collector', 'blog/PostCollector');
 			$post = PostCollector::getPostByURI($matches[2]);
-			if(!$post)
+			if (!$post)
 			{
 				Loader::loadNew('controller', '/Error404Controller')
 					->activate();
@@ -61,21 +61,21 @@ 
 		else
 		{
 			$post_uri = URLDecode::getPiece(1);
-			if($post_uri !== null)
+			if ($post_uri !== null)
 			{
 				Loader::load('collector', 'blog/PostCollector');
 				$post = PostCollector::getPostByURI($post_uri);
 				
-				if($post != false)
+				if ($post != false)
 				{
 					Loader::load('utility', 'Content');
 					$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
 				}
 			}
 		}
-		if($uri == '/search/')
+		if ($uri == '/search/')
 		{
-			if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
+			if (Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
 			{
 				$uri .= Request::getGet('search');
 				$uri .= '/';

Braces +1 added lines, -2 removed lines

@@ -57,8 +57,7 @@
 			
 			Loader::load('utility', 'Content');
 			$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
-		}
-		else
+		} else
 		{
 			$post_uri = URLDecode::getPiece(1);
 			if($post_uri !== null)

Indentation +6 added lines, -6 removed lines

@@ -47,9 +47,9 @@ 
 	{
 		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
 		{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-        $post = $repository->findPostByPath($matches[2]);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+		$post = $repository->findPostByPath($matches[2]);
 
 			if(!$post)
 			{
@@ -65,9 +65,9 @@ 
 			$post_uri = URLDecode::getPiece(1);
 			if($post_uri !== null)
 			{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-        $post = $repository->findPostByPath($post_uri);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+		$post = $repository->findPostByPath($post_uri);
 
 				if($post != false)
 				{

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/waterfalls/WaterfallController.class.inc.php

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,

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 = 'https://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 = 'https://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;
+	}
 
 }

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