jacobemerick / web

controller/blog/CategoryController.class.inc.php

Braces +15 added lines, -14 removed lines

@@ -74,8 +74,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_HIKING);
 					$this->set_description(self::$DESCRIPTION_MAIN_HIKING);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_HIKING, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_HIKING, $this->page, $this->total_pages));
@@ -87,8 +86,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_PERSONAL);
 					$this->set_description(self::$DESCRIPTION_MAIN_PERSONAL);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_PERSONAL, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_PERSONAL, $this->page, $this->total_pages));
@@ -100,8 +98,7 @@ 
 				{
 					$this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT);
 					$this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT);
-				}
-				else
+				} else
 				{
 					$this->set_title(sprintf(self::$TITLE_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
 					$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED_WEBDEVELOPMENT, $this->page, $this->total_pages));
@@ -134,8 +131,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;
 	}
 
@@ -156,17 +154,20 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/{$this->category->link}/")->activate();
+		if($this->page == 1) {

+					return;

+		}

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

+					return Content::instance('URLSafe', "/{$this->category->link}/")->activate();

+		}

 		return Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page - 1) . '/')->activate();
 	}
 
 	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 Content::instance('URLSafe', "/{$this->category->link}/" . ($this->page + 1) . '/')->activate();
 	}
 

controller/blog/DefaultPageController.class.inc.php

Braces +12 added lines, -8 removed lines

@@ -41,8 +41,9 @@ 
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::getRow($id);
 		
-		if($photo_result == null)
-			return;
+		if($photo_result == null) {

+					return;

+		}

 		
 		$name = $photo_result->name;
 		$category = $photo_result->category;
@@ -106,8 +107,9 @@ 
 	{
 		$body = $post['body'];
 		
-		if($trim)
-			$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
+		if($trim) {

+					$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);

+		}

 		
 		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
 		$body = Content::instance('MarkupCode', $body)->activate();
@@ -134,8 +136,9 @@ 
 		$cloud_array = array();
 		foreach($tag_result as $tag)
 		{
-			if($tag['count'] < self::$MINIMUM_TAG_COUNT)
-				continue;
+			if($tag['count'] < self::$MINIMUM_TAG_COUNT) {

+							continue;

+			}

 			
 			$tag_object = new stdclass();
 			$tag_object->name = $tag['tag'];
@@ -153,8 +156,9 @@ 
 		
 		foreach($tag_result as $tag)
 		{
-			if($tag['count'] > $maximum)
-				$maximum = $tag['count'];
+			if($tag['count'] > $maximum) {

+							$maximum = $tag['count'];

+			}

 		}
 		return $maximum;
 	}

controller/PageController.class.inc.php

Braces +37 added lines, -27 removed lines

@@ -102,10 +102,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') {
@@ -114,8 +115,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)
@@ -195,14 +197,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)
@@ -210,12 +214,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;
 		}
 	}
@@ -262,18 +268,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);
@@ -302,16 +309,19 @@ 
 
 		$commenter_cookie_value = json_decode($_COOKIE['commenter']);
 		
-		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;