jacobemerick / web

controller/PageController.class.inc.php

Braces +70 added lines, -53 removed lines

@@ -38,8 +38,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()
@@ -96,8 +97,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']);
@@ -105,8 +107,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']);
@@ -115,16 +118,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;
@@ -139,10 +142,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;
@@ -152,13 +156,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;
 		}
 		
@@ -187,10 +193,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') {
@@ -199,8 +206,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)
@@ -273,14 +281,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)
@@ -288,12 +298,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;
 		}
 	}
@@ -340,18 +352,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);
@@ -376,22 +389,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;

router/Router.class.inc.php

Braces +42 added lines, -28 removed lines

@@ -19,16 +19,21 @@ 
 
 	private static function get_router_name()
 	{
-		if(Request::isAJAX())
-			return 'AJAXRouter';
-		if(URLDecode::getURI() == '/sitemap.xml')
-			return 'SitemapRouter';
-		if(URLDecode::getURI() == '/rss/')
-			return 'RSSRouter';
-		if(URLDecode::getExtension() == 'jpg')
-			return 'ImageRouter';
-		if(URLDecode::getExtension() == 'png')
-			return 'ImageRouter';
+		if(Request::isAJAX()) {

+					return 'AJAXRouter';

+		}

+		if(URLDecode::getURI() == '/sitemap.xml') {

+					return 'SitemapRouter';

+		}

+		if(URLDecode::getURI() == '/rss/') {

+					return 'RSSRouter';

+		}

+		if(URLDecode::getExtension() == 'jpg') {

+					return 'ImageRouter';

+		}

+		if(URLDecode::getExtension() == 'png') {

+					return 'ImageRouter';

+		}

 		
 		switch(URLDecode::getSite())
 		{
@@ -85,19 +90,22 @@ 
 		
 		$redirect_uri = $this->check_for_special_redirect($redirect_uri);
 		
-		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/')
-			$redirect_uri .= '/';
+		if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {

+					$redirect_uri .= '/';

+		}

 		
         if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
             $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri;
         }
         
-		if($redirect_uri == URLDecode::getURI())
-			return;
+		if($redirect_uri == URLDecode::getURI()) {

+					return;

+		}

 		
 		$controller_check = $redirect_uri;
-		if(substr($redirect_uri, 0, 4) == 'http')
-			$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
+		if(substr($redirect_uri, 0, 4) == 'http') {

+					$controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);

+		}

 		
 		$controller = $this->get_controller($controller_check);
 		if($controller == '/Error404Controller')
@@ -146,11 +154,13 @@ 
 	{
 		foreach($this->get_direct_array() as $check)
 		{
-			if($uri == $check->match)
-				return "{$this->get_primary_folder()}/{$check->controller}";
+			if($uri == $check->match) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 			
-			if(preg_match("@^{$check->match}$@", $uri))
-				return "{$this->get_primary_folder()}/{$check->controller}";
+			if(preg_match("@^{$check->match}$@", $uri)) {

+							return "{$this->get_primary_folder()}/{$check->controller}";

+			}

 		}
 		
 		return '/Error404Controller';
@@ -158,16 +168,20 @@ 
 
 	final private function get_primary_folder()
 	{
-		if(Request::isAjax())
-			return 'ajax';
-		if(URLDecode::getURI() == '/sitemap.xml')
-			return 'sitemap';
-		if(URLDecode::getURI() == '/rss/')
-			return 'rss';
+		if(Request::isAjax()) {

+					return 'ajax';

+		}

+		if(URLDecode::getURI() == '/sitemap.xml') {

+					return 'sitemap';

+		}

+		if(URLDecode::getURI() == '/rss/') {

+					return 'rss';

+		}

 		if(
 			URLDecode::getExtension() == 'jpg' ||
-			URLDecode::getExtension() == 'png')
-			return 'images';
+			URLDecode::getExtension() == 'png') {

+					return 'images';

+		}

 		
 		return URLDecode::getSite();
 	}

utility/Loader.class.inc.php

Braces +14 added lines, -10 removed lines

@@ -17,8 +17,9 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
-			self::$instance = new Loader();
+		if(!isset(self::$instance)) {

+					self::$instance = new Loader();

+		}

 		return self::$instance;
 	}
 
@@ -107,11 +108,13 @@ 
 		foreach((array) $files as $file)
 		{
 			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
-				continue;
+			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view') {

+							continue;

+			}

 			
-			if(!file_exists($file_path))
-				Debugger::logMessage("Requested file does not exist: {$type}, {$file}");
+			if(!file_exists($file_path)) {

+							Debugger::logMessage("Requested file does not exist: {$type}, {$file}");

+			}

 			
 			self::instance()->add_included_file($file_path);
 			
@@ -160,10 +163,11 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
-			return $reflectionObject->newInstanceArgs($data);
-		else
-			return $reflectionObject->newInstance();
+		if($reflectionObject->hasMethod('__construct')) {

+					return $reflectionObject->newInstanceArgs($data);

+		} else {

+					return $reflectionObject->newInstance();

+		}

 	}
 
 	public static function getRoot()