jacobemerick / web

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 +23 added lines, -18 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(

+		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(

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

+					return array(

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

-		else

-			return array(

+		} 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;

 	}

 

controller/blog/TagController.class.inc.php

Braces +19 added lines, -14 removed lines

@@ -28,8 +28,9 @@ 
 		$tag = str_replace('-', ' ', $tag);

 		

 		$tag_result = TagCollector::getSingleTag($tag);

-		if($tag_result === false)

-			$this->eject();

+		if($tag_result === false) {

+					$this->eject();

+		}

 		

 		$this->tag = $tag_result;

 		

@@ -44,8 +45,7 @@ 
 		{

 			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->tag->tag)));

 			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag->tag)));

-		}

-		else

+		} else

 		{

 			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->tag->tag), $this->page, $this->total_pages));

 			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->tag->tag)));

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

 	}

 

@@ -106,25 +107,29 @@ 
 

 	protected function get_list_next_link()

 	{

-		if($this->page == 1)

-			return;

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

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

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

+					return;

+		}

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

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

+		}

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

 	}

 

 	private $total_post_count;

 	protected function get_total_post_count()

 	{

-		if(!isset($this->total_post_count))

-			$this->total_post_count = PostCollector::getPostCountForTag($this->tag->id);

+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = PostCollector::getPostCountForTag($this->tag->id);

+		}

 		return $this->total_post_count;

 	}

 

controller/home/ContactController.class.inc.php

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/images/HomeController.class.inc.php

Braces +10 added lines, -8 removed lines

@@ -18,12 +18,13 @@ 
 		

 		if(

 			URLDecode::getSite() == 'images' ||

-			URLDecode::getExtension() == 'ico')

-			$file = "/css/{$file}";

-		else if(URLDecode::getSite() == 'portfolio')

-			$file = "/portfolio/{$file}";

-		else if(substr($file, 0, 7) == '/photo/')

-			$file = '/photo/processed/' . substr($file, 7);

+			URLDecode::getExtension() == 'ico') {

+					$file = "/css/{$file}";

+		} else if(URLDecode::getSite() == 'portfolio') {

+					$file = "/portfolio/{$file}";

+		} else if(substr($file, 0, 7) == '/photo/') {

+					$file = '/photo/processed/' . substr($file, 7);

+		}

 		

 		$this->use_old_image_logic($file);

 		

@@ -78,8 +79,9 @@ 
 

 	protected function eject()

 	{

-		if(get_class($this) !== 'Error404Controller')

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

+		if(get_class($this) !== 'Error404Controller') {

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

+		}

 	}

 

 }

controller/lifestream/DefaultListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -59,8 +59,9 @@
 		{

 			$post_array[] = $this->expand_post($post, 'full');

 		}

-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')

-			$this->eject();

+		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search') {

+					$this->eject();

+		}

 		return $post_array;

 	}

 

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 = ActivityCollector::getCount();

+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = ActivityCollector::getCount();

+		}

 		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 = ActivityCollector::getPost($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 = ActivityCollector::getCountForTag($this->tag);

+		if(!isset($this->total_post_count)) {

+					$this->total_post_count = ActivityCollector::getCountForTag($this->tag);

+		}

 		return $this->total_post_count;

 	}