jacobemerick / web

controller/sitemap/PortfolioSitemapController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -16,9 +16,9 @@
 		
 		$pieces = PortfolioCollector::getAllPieces();
 		
-		foreach($pieces as $piece)
+		foreach ($pieces as $piece)
 		{
-			if($piece->category == 1)
+			if ($piece->category == 1)
 				$this->addURL("web/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);
 			else
 				$this->addURL("print/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);

Braces +5 added lines, -4 removed lines

@@ -18,10 +18,11 @@
 		
 		foreach($pieces as $piece)
 		{
-			if($piece->category == 1)
-				$this->addURL("web/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);
-			else
-				$this->addURL("print/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);
+			if($piece->category == 1) {

+							$this->addURL("web/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);

+			} else {

+							$this->addURL("print/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);

+			}

 		}
 	}
 

controller/sitemap/LifestreamSitemapController.class.inc.php

Spacing +10 added lines, -10 removed lines

@@ -7,16 +7,16 @@ 
 {
 
 	private static $HOME_PAGE_RANK			= .9;
-	private static $TAG_PAGE_RANK			= .3;
-	private static $PAGINATED_PAGE_RANK		= .1;
+	private static $TAG_PAGE_RANK = .3;
+	private static $PAGINATED_PAGE_RANK = .1;
 	private static $POST_PAGE_RANK			= .5;
-	private static $ABOUT_PAGE_RANK			= .7;
+	private static $ABOUT_PAGE_RANK = .7;
 
 	private static $HOME_PAGE_CHANGEFREQ		= 'hourly';
 	private static $TAG_PAGE_CHANGEFREQ			= 'daily';
-	private static $PAGINATED_PAGE_CHANGEFREQ	= 'daily';
+	private static $PAGINATED_PAGE_CHANGEFREQ = 'daily';
 	private static $POST_PAGE_CHANGEFREQ		= 'weekly';
-	private static $ABOUT_PAGE_CHANGEFREQ		= 'monthly';
+	private static $ABOUT_PAGE_CHANGEFREQ = 'monthly';
 
 	private static $POSTS_PER_PAGE = 15;
 
@@ -42,12 +42,12 @@ 
 		$posts = ActivityCollector::getAll();
 		
 		$tag_post_holder = array();
-		foreach($posts as $post)
+		foreach ($posts as $post)
 		{
 			$tag_post_holder[$post->type][] = $post;
 		}
 		
-		foreach($tag_post_holder as $tag => $posts)
+		foreach ($tag_post_holder as $tag => $posts)
 		{
 			$url = "{$tag}/";
 			$this->add_paginated_pages($posts, $url, self::$TAG_PAGE_CHANGEFREQ, self::$TAG_PAGE_RANK);
@@ -58,7 +58,7 @@ 
 	{
 		$posts = ActivityCollector::getAll();
 		
-		foreach($posts as $post)
+		foreach ($posts as $post)
 		{
 			$this->addURL("{$post->type}/{$post->id}/", date('Y-m-d', strtotime('last Monday')), self::$POST_PAGE_CHANGEFREQ, self::$POST_PAGE_RANK);
 		}
@@ -66,7 +66,7 @@ 
 
 	private function add_paginated_pages($posts, $base_url, $changefreq, $rank)
 	{
-		switch($changefreq)
+		switch ($changefreq)
 		{
 			case 'hourly' :
 				$lastmod = date('Y-m-d H:00:00');
@@ -83,7 +83,7 @@ 
 		}
 		
 		$this->addURL($base_url, $lastmod, $changefreq, $rank);
-		for($i = 2; (($i - 1) * self::$POSTS_PER_PAGE) < count($posts); $i++)
+		for ($i = 2; (($i - 1) * self::$POSTS_PER_PAGE) < count($posts); $i++)
 		{
 			$this->addURL("{$base_url}page/{$i}/", date('Y-m-01'), self::$PAGINATED_PAGE_CHANGEFREQ, self::$PAGINATED_PAGE_RANK);
 		}

controller/RobotController.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 	{
 		$entry = new stdclass();
 		$entry->agent = self::$ALL_ROBOTS;
-		if($url)
+		if ($url)
 			$entry->allow = $url;
 		else
 		{
@@ -42,7 +42,7 @@ 
 	{
 		$entry = new stdclass();
 		$entry->agent = self::$ALL_ROBOTS;
-		if($url)
+		if ($url)
 			$entry->disallow = $url;
 		else
 			$entry->disallow = self::$ALL_URL;
@@ -55,18 +55,18 @@ 
 		$this->set_data();
 		Header::sendRobot();
 		
-		foreach($this->entries as $key => $entry)
+		foreach ($this->entries as $key => $entry)
 		{
-			if($key == 0)
+			if ($key == 0)
 				echo "User-agent: {$entry->agent}\n";
-			if(isset($entry->disallow) && $entry->disallow != '')
+			if (isset($entry->disallow) && $entry->disallow != '')
 				echo "Disallow: {$entry->disallow}\n";
-			if(isset($entry->allow))
+			if (isset($entry->allow))
 				echo "Allow: {$entry->allow}\n";
 			//echo "\n";
 		}
 		
-		if($this->show_sitemap)
+		if ($this->show_sitemap)
 		{
 			echo "\n";
 			$sitemap = URLDecode::getBase() . 'sitemap.xml';

Braces +17 added lines, -13 removed lines

@@ -27,9 +27,9 @@ 
 	{
 		$entry = new stdclass();
 		$entry->agent = self::$ALL_ROBOTS;
-		if($url)
-			$entry->allow = $url;
-		else
+		if($url) {

+					$entry->allow = $url;

+		} else
 		{
 			$entry->disallow = '';
 			$entry->allow = self::$ALL_URL;
@@ -42,10 +42,11 @@ 
 	{
 		$entry = new stdclass();
 		$entry->agent = self::$ALL_ROBOTS;
-		if($url)
-			$entry->disallow = $url;
-		else
-			$entry->disallow = self::$ALL_URL;
+		if($url) {

+					$entry->disallow = $url;

+		} else {

+					$entry->disallow = self::$ALL_URL;

+		}

 		
 		$this->entries[] = $entry;
 	}
@@ -57,12 +58,15 @@ 
 		
 		foreach($this->entries as $key => $entry)
 		{
-			if($key == 0)
-				echo "User-agent: {$entry->agent}\n";
-			if(isset($entry->disallow) && $entry->disallow != '')
-				echo "Disallow: {$entry->disallow}\n";
-			if(isset($entry->allow))
-				echo "Allow: {$entry->allow}\n";
+			if($key == 0) {

+							echo "User-agent: {$entry->agent}\n";

+			}

+			if(isset($entry->disallow) && $entry->disallow != '') {

+							echo "Disallow: {$entry->disallow}\n";

+			}

+			if(isset($entry->allow)) {

+							echo "Allow: {$entry->allow}\n";

+			}

 			//echo "\n";
 		}
 		

controller/SitemapController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 
 	protected function addURL($loc, $lastmod = false, $changefreq = 'monthly', $priority = .5)
 	{
-		if(!$lastmod)
+		if (!$lastmod)
 			$lastmod = $this->default_lastmod;
 		
 		$url = $this->xml->addChild('url');

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
 
 	protected function addURL($loc, $lastmod = false, $changefreq = 'monthly', $priority = .5)
 	{
-		if(!$lastmod)
-			$lastmod = $this->default_lastmod;
+		if(!$lastmod) {

+					$lastmod = $this->default_lastmod;

+		}

 		
 		$url = $this->xml->addChild('url');
 		

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/home/ContactController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 				'values' => $values);
 		}
 		
-        global $config;
+		global $config;
 		$mail = Loader::loadNew('utility', 'Mail');
 		$mail->setToAddress($config->admin_email, 'Jacob Emerick');
 		$mail->setSubject('Home Page Contact');

Spacing +5 added lines, -5 removed lines

@@ -35,16 +35,16 @@ 
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
+		if (!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
 			return (object) array('display' => 'normal');
 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
+		if (!Validate::checkRequest('post', 'name', 'string'))
 			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
+		if (!Validate::checkRequest('post', 'email', 'string'))
 			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
+		if (!Validate::checkRequest('post', 'message', 'string'))
 			$error_result['message'] = 'please write a message';
 		
 		$values = (object) array(
@@ -52,7 +52,7 @@ 
 			'email' => Request::getPost('email'),
 			'message' => Request::getPost('message'));
 		
-		if(count($error_result) > 0)
+		if (count($error_result) > 0)
 		{
 			return (object) array(
 				'display' => 'error',

Braces +12 added lines, -8 removed lines

@@ -35,17 +35,21 @@
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
-			return (object) array('display' => 'normal');
+		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') {

+					return (object) array('display' => 'normal');

+		}

 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_result['message'] = 'please write a message';
+		if(!Validate::checkRequest('post', 'name', 'string')) {

+					$error_result['name'] = 'please enter your name';

+		}

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

+					$error_result['email'] = 'please enter a valid email';

+		}

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

+					$error_result['message'] = 'please write a message';

+		}

 		
 		$values = (object) array(
 			'name' => Request::getPost('name'),

controller/PageController.class.inc.php

Indentation +8 added lines, -8 removed lines

@@ -125,9 +125,9 @@ 
 					if(strlen($row->title) > 0)
 						$post->title .= " I was hiking up around the {$row->title} area.";
 				}
-                else if ($row->type == 'walking') {
-                    $post->title = "Walked {$row->distance} miles and felt {$row->felt}.";
-                }
+				else if ($row->type == 'walking') {
+					$post->title = "Walked {$row->distance} miles and felt {$row->felt}.";
+				}
 			break;
 			case 'hulu' :
 				$row = HuluCollector::getRow($raw_post->type_id);
@@ -194,11 +194,11 @@ 
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
 		}
         
-        if (URLDecode::getSite() == 'waterfalls') {
-            Loader::load('view', '/WaterfallFoot');
-        } else {
-            Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
-        }
+		if (URLDecode::getSite() == 'waterfalls') {
+			Loader::load('view', '/WaterfallFoot');
+		} else {
+			Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
+		}
 		
 		if($view == '/404' || $view == '/503')
 			exit;

Spacing +31 added lines, -31 removed lines

@@ -40,7 +40,7 @@ 
 			'date' => date('Y')));
 		
 		Loader::loadInstance('utility', 'Database');
-		if(Database::isConnected() === false)
+		if (Database::isConnected() === false)
 			$this->unavailable();
 	}
 
@@ -65,9 +65,9 @@ 
 		$post_array = array();
 		$post_result = ActivityCollector::getRecent();
 		
-		foreach($post_result as $row)
+		foreach ($post_result as $row)
 		{
-			$post_array[] = $this->expand_post($row);;
+			$post_array[] = $this->expand_post($row); ;
 		}
 		
 		return $post_array;
@@ -86,7 +86,7 @@ 
 		
 		$post = new stdclass();
 		
-		switch($raw_post->type)
+		switch ($raw_post->type)
 		{
 			case 'blog' :
 				$row = BlogCollector::getRow($raw_post->type_id);
@@ -97,7 +97,7 @@ 
 				$post->title = "Blogged about {$category}: <a href=\"{$row->url}\">{$row->title}</a>.";
 				$post->comments = $row->comments;
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');
 			break;
 			case 'book' :
@@ -106,23 +106,23 @@ 
 				$post->type = 'book';
 				$post->title = "Just finished reading {$row->title} by {$row->author}.";
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";
 			break;
 			case 'distance' :
 				$row = DistanceCollector::getRow($raw_post->type_id);
 				
 				$post->type = 'distance';
-				if($row->type == 'running')
+				if ($row->type == 'running')
 				{
 					$post->title = "Ran {$row->distance} miles and felt {$row->felt}.";
-					if(strlen($row->message) > 0)
+					if (strlen($row->message) > 0)
 						$post->title .= " Afterwards, I was all like '{$row->message}'.";
 				}
-				else if($row->type == 'hiking')
+				else if ($row->type == 'hiking')
 				{
 					$post->title = "Hiked {$row->distance} miles and felt {$row->felt}.";
-					if(strlen($row->title) > 0)
+					if (strlen($row->title) > 0)
 						$post->title .= " I was hiking up around the {$row->title} area.";
 				}
                 else if ($row->type == 'walking') {
@@ -140,7 +140,7 @@ 
 				
 				$post->type = 'twitter';
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->title = $row->text_formatted_full;
 				else
 					$post->title = $row->text_formatted;
@@ -153,12 +153,12 @@ 
 				
 				$post->type = 'youtube';
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->title = "Favorited {$row->title} by {$row->author} on YouTube.";
 				else
 					$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";
 				
-				if($format == 'full')
+				if ($format == 'full')
 					$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";
 			break;
 		}
@@ -186,9 +186,9 @@ 
 		$headers = $this->headers;
 		Header::$headers();
 		Loader::load('view', '/Head', $this->data_array['head']);
-		foreach($this->body_view_array as $view)
+		foreach ($this->body_view_array as $view)
 		{
-			if(substr($view, 0, 1) == '/')
+			if (substr($view, 0, 1) == '/')
 				Loader::load('view', $view, $this->data_array['body']);
 			else
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
@@ -200,7 +200,7 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
+		if ($view == '/404' || $view == '/503')
 			exit;
 	}
 
@@ -261,10 +261,10 @@ 
 		
 		$js_array = array();
 		
-		if(count($this->js_array) > 0)
+		if (count($this->js_array) > 0)
 			$js_array = array_merge($js_array, $this->js_array);
 		
-		if(count($js_array) > 0)
+		if (count($js_array) > 0)
 			$js_array = Asset::getJS($js_array);
 		
 		$this->set_head('css_link_array', $css_array);
@@ -278,26 +278,26 @@ 
 
 	protected function eject()
 	{
-		if(get_class($this) !== 'Error404Controller')
+		if (get_class($this) !== 'Error404Controller')
 			Loader::loadNew('controller', '/Error404Controller')->activate();
 	}
 
 	protected function unavailable()
 	{
-		if(get_class($this) !== 'Error503Controller')
+		if (get_class($this) !== 'Error503Controller')
 			Loader::loadNew('controller', '/Error503Controller')->activate();
 	}
 
 	protected function redirect($uri, $method = 301)
 	{
-		switch($method)
+		switch ($method)
 		{
 			case 301 :
-				if(get_class($this) !== 'Error301Controller')
+				if (get_class($this) !== 'Error301Controller')
 					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
 				break;
 			case 303 :
-				if(get_class($this) !== 'Error303Controller')
+				if (get_class($this) !== 'Error303Controller')
 					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
 				break;
 		}
@@ -317,7 +317,7 @@ 
 	private $comment_errors;
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
 	{
-		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
+		if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
 		{
 			$parameters = array($site_id, $path, $redirect_url, $page_title);
 			$this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
@@ -335,7 +335,7 @@ 
 		$comment_array = array();
 		$comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);
 		
-		foreach($comment_result as $comment)
+		foreach ($comment_result as $comment)
 		{
 			$comment_object = new stdclass();
 			$comment_object->id = $comment->id;
@@ -345,12 +345,12 @@ 
 			$comment_object->url = $comment->url;
 			$comment_object->trusted = $comment->trusted;
 			
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
+			if ($comment->reply == 0 && Request::getPost('type') == $comment->id)
 				$comment_object->errors = $this->comment_errors;
 			else
 				$comment_object->errors = array();
 			
-			if($comment->reply == 0)
+			if ($comment->reply == 0)
 			{
 				$comment_object->replies = array();
 				$comment_array[$comment->id] = $comment_object;
@@ -381,21 +381,21 @@ 
 		$commenter->website = '';
 		
 		$commenter_cookie = Cookie::instance('Commenter');
-		if(!$commenter_cookie->exists())
+		if (!$commenter_cookie->exists())
 			return $commenter;
 		
 		$commenter_cookie_value = $commenter_cookie->getValue();
 		$commenter_cookie_value = json_decode($commenter_cookie_value);
 		
-		if($commenter_cookie_value === NULL)
+		if ($commenter_cookie_value === NULL)
 			return $commenter;
 		
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
+		if (!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
 			return $commenter;
 		
 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
 		
-		if($commenter_object === NULL)
+		if ($commenter_object === NULL)
 			return $commenter;
 		
 		$commenter->id = $commenter_object->id;

Braces +76 added lines, -57 removed lines

@@ -40,8 +40,9 @@ 
 			'date' => date('Y')));
 		
 		Loader::loadInstance('utility', 'Database');
-		if(Database::isConnected() === false)
-			$this->unavailable();
+		if(Database::isConnected() === false) {

+					$this->unavailable();

+		}

 	}
 
 	protected function get_domain_container()
@@ -97,8 +98,9 @@ 
 				$post->title = "Blogged about {$category}: <a href=\"{$row->url}\">{$row->title}</a>.";
 				$post->comments = $row->comments;
 				
-				if($format == 'full')
-					$post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');
+				if($format == 'full') {

+									$post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');

+				}

 			break;
 			case 'book' :
 				$row = BookCollector::getRow($raw_post->type_id);
@@ -106,8 +108,9 @@ 
 				$post->type = 'book';
 				$post->title = "Just finished reading {$row->title} by {$row->author}.";
 				
-				if($format == 'full')
-					$post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";
+				if($format == 'full') {

+									$post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";

+				}

 			break;
 			case 'distance' :
 				$row = DistanceCollector::getRow($raw_post->type_id);
@@ -116,16 +119,16 @@ 
 				if($row->type == 'running')
 				{
 					$post->title = "Ran {$row->distance} miles and felt {$row->felt}.";
-					if(strlen($row->message) > 0)
-						$post->title .= " Afterwards, I was all like '{$row->message}'.";
-				}
-				else if($row->type == 'hiking')
+					if(strlen($row->message) > 0) {

+											$post->title .= " Afterwards, I was all like '{$row->message}'.";

+					}

+				} else if($row->type == 'hiking')
 				{
 					$post->title = "Hiked {$row->distance} miles and felt {$row->felt}.";
-					if(strlen($row->title) > 0)
-						$post->title .= " I was hiking up around the {$row->title} area.";
-				}
-                else if ($row->type == 'walking') {
+					if(strlen($row->title) > 0) {

+											$post->title .= " I was hiking up around the {$row->title} area.";

+					}

+				} else if ($row->type == 'walking') {
                     $post->title = "Walked {$row->distance} miles and felt {$row->felt}.";
                 }
 			break;
@@ -140,10 +143,11 @@ 
 				
 				$post->type = 'twitter';
 				
-				if($format == 'full')
-					$post->title = $row->text_formatted_full;
-				else
-					$post->title = $row->text_formatted;
+				if($format == 'full') {

+									$post->title = $row->text_formatted_full;

+				} else {

+									$post->title = $row->text_formatted;

+				}

 				
 				$post->retweets = ($row->is_retweet == 0) ? $row->retweets : 0;
 				$post->favorites = ($row->is_retweet == 0) ? $row->favorites : 0;
@@ -153,13 +157,15 @@ 
 				
 				$post->type = 'youtube';
 				
-				if($format == 'full')
-					$post->title = "Favorited {$row->title} by {$row->author} on YouTube.";
-				else
-					$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";
+				if($format == 'full') {

+									$post->title = "Favorited {$row->title} by {$row->author} on YouTube.";

+				} else {

+									$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";

+				}

 				
-				if($format == 'full')
-					$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";
+				if($format == 'full') {

+									$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";

+				}

 			break;
 		}
 		
@@ -188,10 +194,11 @@ 
 		Loader::load('view', '/Head', $this->data_array['head']);
 		foreach($this->body_view_array as $view)
 		{
-			if(substr($view, 0, 1) == '/')
-				Loader::load('view', $view, $this->data_array['body']);
-			else
-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
+			if(substr($view, 0, 1) == '/') {

+							Loader::load('view', $view, $this->data_array['body']);

+			} else {

+							Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);

+			}

 		}
         
         if (URLDecode::getSite() == 'waterfalls') {
@@ -200,8 +207,9 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
-			exit;
+		if($view == '/404' || $view == '/503') {

+					exit;

+		}

 	}
 
 	protected function set_header_method($method)
@@ -261,11 +269,13 @@ 
 		
 		$js_array = array();
 		
-		if(count($this->js_array) > 0)
-			$js_array = array_merge($js_array, $this->js_array);
+		if(count($this->js_array) > 0) {

+					$js_array = array_merge($js_array, $this->js_array);

+		}

 		
-		if(count($js_array) > 0)
-			$js_array = Asset::getJS($js_array);
+		if(count($js_array) > 0) {

+					$js_array = Asset::getJS($js_array);

+		}

 		
 		$this->set_head('css_link_array', $css_array);
 		$this->set_head('js_link_array', $js_array);
@@ -278,14 +288,16 @@ 
 
 	protected function eject()
 	{
-		if(get_class($this) !== 'Error404Controller')
-			Loader::loadNew('controller', '/Error404Controller')->activate();
+		if(get_class($this) !== 'Error404Controller') {

+					Loader::loadNew('controller', '/Error404Controller')->activate();

+		}

 	}
 
 	protected function unavailable()
 	{
-		if(get_class($this) !== 'Error503Controller')
-			Loader::loadNew('controller', '/Error503Controller')->activate();
+		if(get_class($this) !== 'Error503Controller') {

+					Loader::loadNew('controller', '/Error503Controller')->activate();

+		}

 	}
 
 	protected function redirect($uri, $method = 301)
@@ -293,12 +305,14 @@ 
 		switch($method)
 		{
 			case 301 :
-				if(get_class($this) !== 'Error301Controller')
-					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
+				if(get_class($this) !== 'Error301Controller') {

+									Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();

+				}

 				break;
 			case 303 :
-				if(get_class($this) !== 'Error303Controller')
-					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
+				if(get_class($this) !== 'Error303Controller') {

+									Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();

+				}

 				break;
 		}
 	}
@@ -345,18 +359,19 @@ 
 			$comment_object->url = $comment->url;
 			$comment_object->trusted = $comment->trusted;
 			
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
-				$comment_object->errors = $this->comment_errors;
-			else
-				$comment_object->errors = array();
+			if($comment->reply == 0 && Request::getPost('type') == $comment->id) {

+							$comment_object->errors = $this->comment_errors;

+			} else {

+							$comment_object->errors = array();

+			}

 			
 			if($comment->reply == 0)
 			{
 				$comment_object->replies = array();
 				$comment_array[$comment->id] = $comment_object;
-			}
-			else
-				$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;
+			} else {

+							$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;

+			}

 		}
 		
 		$comment_count = CommentCollector::getCommentCountForURL($site, $path);
@@ -381,22 +396,26 @@ 
 		$commenter->website = '';
 		
 		$commenter_cookie = Cookie::instance('Commenter');
-		if(!$commenter_cookie->exists())
-			return $commenter;
+		if(!$commenter_cookie->exists()) {

+					return $commenter;

+		}

 		
 		$commenter_cookie_value = $commenter_cookie->getValue();
 		$commenter_cookie_value = json_decode($commenter_cookie_value);
 		
-		if($commenter_cookie_value === NULL)
-			return $commenter;
+		if($commenter_cookie_value === NULL) {

+					return $commenter;

+		}

 		
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
-			return $commenter;
+		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) {

+					return $commenter;

+		}

 		
 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
 		
-		if($commenter_object === NULL)
-			return $commenter;
+		if($commenter_object === NULL) {

+					return $commenter;

+		}

 		
 		$commenter->id = $commenter_object->id;
 		$commenter->name = $commenter_object->name;

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