jacobemerick / web

controller/PageController.class.inc.php

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()
@@ -98,8 +99,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 = $bookRepository->getBookById($raw_post['type_id']);
@@ -107,8 +109,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 = $distanceRepository->getDistanceById($raw_post['type_id']);
@@ -117,16 +120,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;
@@ -141,10 +144,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;
@@ -154,13 +158,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;
 		}
 		
@@ -189,10 +195,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') {
@@ -201,8 +208,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)
@@ -262,11 +270,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);
@@ -279,14 +289,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)
@@ -294,12 +306,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;
 		}
 	}
@@ -346,18 +360,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);
@@ -382,22 +397,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/lifestream/HomeController.class.inc.php

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->postRepository->getPostsCount();
+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = $this->postRepository->getPostsCount();

+		}

 		return $this->total_post_count;
 	}
 

controller/lifestream/PostController.class.inc.php

Braces +9 added lines, -6 removed lines

@@ -20,15 +20,18 @@
 		parent::__construct();
 		
 		$id = URLDecode::getPiece(2);
-		if(!$id || !is_numeric($id))
-			$this->eject();
+		if(!$id || !is_numeric($id)) {

+					$this->eject();

+		}

 		
 		$post = $this->postRepository->getPostById($id);
-		if(!$post)
-			$this->eject();
+		if(!$post) {

+					$this->eject();

+		}

 		
-		if(URLDecode::getPiece(1) != $post['type'])
-			$this->eject();
+		if(URLDecode::getPiece(1) != $post['type']) {

+					$this->eject();

+		}

 		
 		$this->post = $post;
 	}

controller/lifestream/TagController.class.inc.php

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->postRepository->getPostsByTypeCount($this->tag);
+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = $this->postRepository->getPostsByTypeCount($this->tag);

+		}

 		return $this->total_post_count;
 	}