jacobemerick / web

controller/waterfalls/SearchListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,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;
 	}
 

controller/waterfalls/ContactController.class.inc.php

Braces +12 added lines, -8 removed lines

@@ -33,17 +33,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/waterfalls/LogTagListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 		$alias = URLDecode::getPiece(3);
 		$this->tag = LogTagCollector::getTag($alias);
 		
-		if(!$this->tag)
-			$this->eject();
+		if(!$this->tag) {

+					$this->eject();

+		}

 		
 		parent::__construct();
 	}

controller/waterfalls/WatercourseListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -29,8 +29,9 @@
 		$path = URLDecode::getPiece(1);
 		$this->watercourse = WatercourseCollector::getByAlias($path);
 		
-		if(!$this->watercourse)
-			$this->eject();
+		if(!$this->watercourse) {

+					$this->eject();

+		}

 	
 		parent::__construct();
 	}

controller/waterfalls/DefaultListController.class.inc.php

Braces +47 added lines, -35 removed lines

@@ -20,15 +20,17 @@ 
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();
 		
 		$items = $this->get_items();
-		if(count($items) < 1)
-			$this->eject();
+		if(count($items) < 1) {

+					$this->eject();

+		}

 	}
 
 	final protected function get_page_number()
 	{
 		$page = $this->get_page_number_piece();
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
@@ -41,8 +43,9 @@ 
 
 	final private function get_introduction()
 	{
-		if($this->page == 1)
-			return $this->get_initial_introduction();
+		if($this->page == 1) {

+					return $this->get_initial_introduction();

+		}

 		
 		return $this->get_subsequent_introduction();
 	}
@@ -68,8 +71,9 @@ 
 	private $item_count;
 	final private function get_item_count()
 	{
-		if(!isset($this->item_count))
-			$this->item_count = $this->get_item_count_result();
+		if(!isset($this->item_count)) {

+					$this->item_count = $this->get_item_count_result();

+		}

 		return $this->item_count;
 	}
 
@@ -82,10 +86,11 @@ 
 		$this->set_head('next_link', $this->get_list_next_link());
 		$this->set_head('previous_link', $this->get_list_prev_link());
 		
-		if($this->page == 1)
-			$meta_array = $this->get_initial_meta();
-		else
-			$meta_array = $this->get_subsequent_meta();
+		if($this->page == 1) {

+					$meta_array = $this->get_initial_meta();

+		} else {

+					$meta_array = $this->get_subsequent_meta();

+		}

 		
 		$this->set_title($meta_array['title']);
 		$this->set_description($meta_array['description']);
@@ -119,17 +124,20 @@ 
 
 	final private function get_list_prev_link()
 	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return $this->get_list_link_root();
+		if($this->page == 1) {

+					return;

+		}

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

+					return $this->get_list_link_root();

+		}

 		return $this->get_list_link_root() . ($this->page - 1) . '/';
 	}
 
 	final private function get_list_next_link()
 	{
-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
-			return;
+		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count()) {

+					return;

+		}

 		return $this->get_list_link_root() . ($this->page + 1) . '/';
 	}
 
@@ -139,15 +147,17 @@ 
 	{
 		$link_array = array();
 		
-		if($this->get_item_count_per_page() >= $this->get_item_count())
-			return $link_array;
+		if($this->get_item_count_per_page() >= $this->get_item_count()) {

+					return $link_array;

+		}

 		
 		$link = new stdclass();
 		$link->anchor = '&laquo; previous';
-		if($this->get_list_prev_link() !== null)
-			$link->uri = $this->get_list_prev_link();
-		else
-			$link->class = 'inactive';
+		if($this->get_list_prev_link() !== null) {

+					$link->uri = $this->get_list_prev_link();

+		} else {

+					$link->class = 'inactive';

+		}

 		$link_array[] = $link;
 		
 		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
@@ -155,14 +165,15 @@ 
 			$link = new stdclass();
 			$link->anchor = $i;
 			
-			if($i == $this->page)
-				$link->class = 'current';
-			else
+			if($i == $this->page) {

+							$link->class = 'current';

+			} else
 			{
-				if($i == 1)
-					$link->uri = $this->get_list_link_root();
-				else
-					$link->uri = $this->get_list_link_root() . $i . '/';
+				if($i == 1) {

+									$link->uri = $this->get_list_link_root();

+				} else {

+									$link->uri = $this->get_list_link_root() . $i . '/';

+				}

 			}
 			
 			$link_array[] = $link;
@@ -170,10 +181,11 @@ 
 		
 		$link = new stdclass();
 		$link->anchor = 'next &raquo;';
-		if($this->get_list_next_link() !== null)
-			$link->uri = $this->get_list_next_link();
-		else
-			$link->class = 'inactive';
+		if($this->get_list_next_link() !== null) {

+					$link->uri = $this->get_list_next_link();

+		} else {

+					$link->class = 'inactive';

+		}

 		$link_array[] = $link;
 		
 		return $link_array;

controller/waterfalls/CompanionListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 		$alias = URLDecode::getPiece(2);
 		$this->companion = CompanionCollector::getByAlias($alias);
 		
-		if(!$this->companion)
-			$this->eject();
+		if(!$this->companion) {

+					$this->eject();

+		}

 		
 		parent::__construct();
 	}

controller/RSSController.class.inc.php

Braces +9 added lines, -6 removed lines

@@ -25,8 +25,9 @@ 
 
 	final protected function setLink($url = null)
 	{
-		if(!isset($url))
-			$url = URLDecode::getBase();
+		if(!isset($url)) {

+					$url = URLDecode::getBase();

+		}

 		$this->xml->channel->addChild('link', $url);
 	}
 
@@ -50,8 +51,9 @@ 
 
 	final protected function setCopyright($copyright = null)
 	{
-		if(!isset($copyright))
-			$copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';
+		if(!isset($copyright)) {

+					$copyright = 'Copyright ' . date('Y') . ' Jacob Emerick';

+		}

 		$this->xml->channel->addChild('copyright', $copyright);
 	}
 
@@ -66,8 +68,9 @@ 
 
 	final protected function setPubDate($date = null)
 	{
-		if(!isset($date))
-			$date = date('r');
+		if(!isset($date)) {

+					$date = date('r');

+		}

 		$this->xml->channel->addChild('pubDate', $date);
 	}
 

controller/blog/PostController.class.inc.php

Braces +12 added lines, -9 removed lines

@@ -27,8 +27,9 @@ 
 		parent::__construct();
 		
 		$this->post = PostCollector::getPostByURI(URLDecode::getPiece(2));
-		if($this->post == null)
-			$this->eject();
+		if($this->post == null) {

+					$this->eject();

+		}

 		
 		$this->handle_comment_submit(
 			self::$BLOG_SITE_ID,
@@ -103,8 +104,9 @@ 
 	private function get_series_posts()
 	{
 		$series_posts = $this->fetch_series_posts();
-		if(count($series_posts) < 1)
-			return array();
+		if(count($series_posts) < 1) {

+					return array();

+		}

 		
 		$previous_post = new stdclass();
 		$next_post = new stdclass();
@@ -132,9 +134,9 @@ 
 
 			$post->url = Loader::getRootUrl('blog') . "{$post_row->category}/{$post_row->path}/";
 			
-			if(!$found_current_post)
-				$previous_post = $post;
-			else
+			if(!$found_current_post) {

+							$previous_post = $post;

+			} else
 			{
 				$next_post = $post;
 				break;
@@ -151,8 +153,9 @@ 
 	private $series_posts;
 	private function fetch_series_posts()
 	{
-		if(!isset($this->series_posts))
-			$this->series_posts = SeriesCollector::getSeriesForPost($this->post->id);
+		if(!isset($this->series_posts)) {

+					$this->series_posts = SeriesCollector::getSeriesForPost($this->post->id);

+		}

 		return $this->series_posts;
 	}
 

controller/blog/SearchController.class.inc.php

Braces +26 added lines, -21 removed lines

@@ -49,8 +49,7 @@ 
 		{
 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
-		}
-		else
+		} else
 		{
 			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->query), $this->page, $this->total_pages));
 			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->query)));
@@ -63,22 +62,24 @@ 
 
 	protected function get_introduction()
 	{
-		if($this->total_pages > 1)
-			return array(
-				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
-		else if($this->total_pages == 1)
-			return array(
-				'title' => "Posts from search '{$this->query}'.");
-		else
-			return array(
-				'title' => "Sorry, '{$this->query}' didn't return any posts.");
+		if($this->total_pages > 1) {

+					return array(
+				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");

+		} else if($this->total_pages == 1) {

+					return array(
+				'title' => "Posts from search '{$this->query}'.");

+		} else {

+					return array(
+				'title' => "Sorry, '{$this->query}' didn't return any posts.");

+		}

 	}
 
 	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;
 	}
 
@@ -113,25 +114,29 @@ 
 
 	protected function get_list_next_link()
 	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
+		if($this->page == 1) {

+					return;

+		}

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

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

+		}

 		return Content::instance('URLSafe', "/search/{$this->query}/" . ($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', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
 	}
 
 	private $total_post_count;
 	protected function get_total_post_count()
 	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = count($this->get_search_result());
+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = count($this->get_search_result());

+		}

 		return $this->total_post_count;
 	}