jacobemerick / web

controller/Error404Controller.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 		Loader::load('collector', 'SiteCollector');

 		$site_result = SiteCollector::getSitesForMenu();

 		

-		foreach($site_result as $site)

+		foreach ($site_result as $site)

 		{

 			$site_array[] = array(

 				'url' => $site->url,

controller/SitemapController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 

 	protected function addURL($loc, $lastmod = false, $changefreq = 'monthly', $priority = .5)

 	{

-		if(!$lastmod)

+		if (!$lastmod)

 			$lastmod = $this->default_lastmod;

 		

 		$url = $this->xml->addChild('url');

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
 

 	protected function addURL($loc, $lastmod = false, $changefreq = 'monthly', $priority = .5)

 	{

-		if(!$lastmod)

-			$lastmod = $this->default_lastmod;

+		if(!$lastmod) {

+					$lastmod = $this->default_lastmod;

+		}

 		

 		$url = $this->xml->addChild('url');

 		

controller/ajax/SubmitCommentController.class.inc.php

Spacing +16 added lines, -16 removed lines

@@ -14,19 +14,19 @@ 
 

 	protected function set_data()

 	{

-		if(!Validate::checkRequest('post', 'name', 'name'))

+		if (!Validate::checkRequest('post', 'name', 'name'))

 			return $this->fail_response('You must include a valid name.');

-		if(!Validate::checkRequest('post', 'email', 'email'))

+		if (!Validate::checkRequest('post', 'email', 'email'))

 			return $this->fail_response('You must include a valid email.');

-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))

+		if (Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))

 			return $this->fail_response('Please include a valid website.');

-		if(!Validate::checkRequest('post', 'comment', 'string'))

+		if (!Validate::checkRequest('post', 'comment', 'string'))

 			return $this->fail_response('You must enter a comment.');

-		if(!Validate::checkRequest('post', 'save', 'boolean'))

+		if (!Validate::checkRequest('post', 'save', 'boolean'))

 			return $this->fail_response('You entered an invalid save request.');

-		if(!Validate::checkRequest('post', 'notify', 'boolean'))

+		if (!Validate::checkRequest('post', 'notify', 'boolean'))

 			return $this->fail_response('You entered an invalid notify request.');

-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))

+		if (Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))

 			return $this->fail_response('You entered an invalid reply value.');

 		

 		$referer_url = Request::getServer('HTTP_REFERER');

@@ -35,11 +35,11 @@ 
 		$url = array_pop($url);

 		$post = PostCollector::getPostByURI($url);

 		

-		if($post === null)

+		if ($post === null)

 			return $this->fail_response('There seems to be a problem with this page.', 'error');

 		

 		$commentpage_result = CommentCollector::getCommentPageByURL($post->path, 2);

-		if($commentpage_result === null)

+		if ($commentpage_result === null)

 		{

 			$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site_id`, `url`) VALUES ('%d', '%s')";

 			

@@ -56,7 +56,7 @@ 
 		$save = (Request::getPost('save') == 'true') ? 1 : 0;

 		

 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));

-		if($commenter_result === null)

+		if ($commenter_result === null)

 		{

 			$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`,`save`) VALUES ('%s','%s','%s','%s')";

 			

@@ -70,7 +70,7 @@ 
 		}

 		else

 		{

-			if($commenter_result->save !== $save)

+			if ($commenter_result->save !== $save)

 			{

 				$query = "UPDATE `jpemeric_comment`.`commenter` SET `save` = '%s' WHERE `id` = '%d'";

 				

@@ -81,7 +81,7 @@ 
 		}

 		

 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));

-		if($comment_result === null)

+		if ($comment_result === null)

 		{

 			$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`) VALUES ('%s')";

 			

@@ -112,9 +112,9 @@ 
 		

 		$notification_result = CommentCollector::getNotificationForPage($commentpage_id);

 		

-		foreach($notification_result as $notification_row)

+		foreach ($notification_result as $notification_row)

 		{

-			if($notification_row->email == $email)

+			if ($notification_row->email == $email)

 				continue;

 			

 			$email_recipient_array[$notification_row->email] = array(

@@ -123,7 +123,7 @@ 
 		}

 		

 		$message = "Hello!\nThere has been a new post on the post '{$post->title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to {$config->admin_email} if you do would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$referer_url}#comments to see and reply to all the comments on this post.\nThank you!";

-		foreach($email_recipient_array as $email_recipient)

+		foreach ($email_recipient_array as $email_recipient)

 		{

 			$mail = new Mail();

 			$mail->setToAddress($email_recipient['email'], $email_recipient['name']);

@@ -132,7 +132,7 @@ 
 			$mail->send();

 		}

 		

-		if(Request::getPost('save') == true)

+		if (Request::getPost('save') == true)

 		{

 			/*

 			$cookie = new Cookie('jpe_commenter');

Braces +32 added lines, -24 removed lines

@@ -14,20 +14,27 @@ 
 

 	protected function set_data()

 	{

-		if(!Validate::checkRequest('post', 'name', 'name'))

-			return $this->fail_response('You must include a valid name.');

-		if(!Validate::checkRequest('post', 'email', 'email'))

-			return $this->fail_response('You must include a valid email.');

-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))

-			return $this->fail_response('Please include a valid website.');

-		if(!Validate::checkRequest('post', 'comment', 'string'))

-			return $this->fail_response('You must enter a comment.');

-		if(!Validate::checkRequest('post', 'save', 'boolean'))

-			return $this->fail_response('You entered an invalid save request.');

-		if(!Validate::checkRequest('post', 'notify', 'boolean'))

-			return $this->fail_response('You entered an invalid notify request.');

-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))

-			return $this->fail_response('You entered an invalid reply value.');

+		if(!Validate::checkRequest('post', 'name', 'name')) {

+					return $this->fail_response('You must include a valid name.');

+		}

+		if(!Validate::checkRequest('post', 'email', 'email')) {

+					return $this->fail_response('You must include a valid email.');

+		}

+		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url')) {

+					return $this->fail_response('Please include a valid website.');

+		}

+		if(!Validate::checkRequest('post', 'comment', 'string')) {

+					return $this->fail_response('You must enter a comment.');

+		}

+		if(!Validate::checkRequest('post', 'save', 'boolean')) {

+					return $this->fail_response('You entered an invalid save request.');

+		}

+		if(!Validate::checkRequest('post', 'notify', 'boolean')) {

+					return $this->fail_response('You entered an invalid notify request.');

+		}

+		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer')) {

+					return $this->fail_response('You entered an invalid reply value.');

+		}

 		

 		$referer_url = Request::getServer('HTTP_REFERER');

 		$url = explode('/', $referer_url);

@@ -35,8 +42,9 @@ 
 		$url = array_pop($url);

 		$post = PostCollector::getPostByURI($url);

 		

-		if($post === null)

-			return $this->fail_response('There seems to be a problem with this page.', 'error');

+		if($post === null) {

+					return $this->fail_response('There seems to be a problem with this page.', 'error');

+		}

 		

 		$commentpage_result = CommentCollector::getCommentPageByURL($post->path, 2);

 		if($commentpage_result === null)

@@ -49,9 +57,9 @@ 
 			$query = sprintf($query, $site_id, $url);

 			Database::execute($query);

 			$commentpage_id = Database::lastInsertID();

+		} else {

+					$commentpage_id = $commentpage_result->id;

 		}

-		else

-			$commentpage_id = $commentpage_result->id;

 		

 		$save = (Request::getPost('save') == 'true') ? 1 : 0;

 		

@@ -67,8 +75,7 @@ 
 			$query = sprintf($query, $name, $email, $website, $save);

 			Database::execute($query);

 			$commenter_id = Database::lastInsertID();

-		}

-		else

+		} else

 		{

 			if($commenter_result->save !== $save)

 			{

@@ -90,9 +97,9 @@ 
 			$query = sprintf($query, $body);

 			Database::execute($query);

 			$comment_id = Database::lastInsertID();

+		} else {

+					$comment_id = $comment_result->id;

 		}

-		else

-			$comment_id = $comment_result->id;

 		

 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter_id`,`comment_id`,`reply`,`notify`,`commentpage_id`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";

 		

@@ -114,8 +121,9 @@ 
 		

 		foreach($notification_result as $notification_row)

 		{

-			if($notification_row->email == $email)

-				continue;

+			if($notification_row->email == $email) {

+							continue;

+			}

 			

 			$email_recipient_array[$notification_row->email] = array(

 				'email' => $notification_row->email,

controller/blog/AboutController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 		Loader::load('collector', 'blog/IntroductionCollector');

 		$introduction_result = IntroductionCollector::getRow('about');

 		

-		if($introduction_result !== null)

+		if ($introduction_result !== null)

 		{

 			$introduction = array();

 			$introduction['title'] = $introduction_result->title;

controller/blog/CategoryController.class.inc.php

Spacing +10 added lines, -10 removed lines

@@ -67,10 +67,10 @@ 
 	{

 		parent::set_head_data();

 		

-		switch($this->category->display)

+		switch ($this->category->display)

 		{

 			case 'Hiking' :

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

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

 				{

 					$this->set_title(self::$TITLE_MAIN_HIKING);

 					$this->set_description(self::$DESCRIPTION_MAIN_HIKING);

@@ -83,7 +83,7 @@ 
 				$this->set_keywords(self::$KEYWORD_ARRAY_HIKING);

 			break;

 			case 'Personal' :

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

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

 				{

 					$this->set_title(self::$TITLE_MAIN_PERSONAL);

 					$this->set_description(self::$DESCRIPTION_MAIN_PERSONAL);

@@ -96,7 +96,7 @@ 
 				$this->set_keywords(self::$KEYWORD_ARRAY_PERSONAL);

 			break;

 			case 'Web Development' :

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

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

 				{

 					$this->set_title(self::$TITLE_MAIN_WEBDEVELOPMENT);

 					$this->set_description(self::$DESCRIPTION_MAIN_WEBDEVELOPMENT);

@@ -113,7 +113,7 @@ 
 

 	protected function get_introduction()

 	{

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

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

 		{

 			Loader::load('collector', 'blog/IntroductionCollector');

 			$introduction_result = IntroductionCollector::getRow('category', $this->category->link);

@@ -133,7 +133,7 @@ 
 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(2);

-		if(isset($page) && is_numeric($page))

+		if (isset($page) && is_numeric($page))

 			return $page;

 		return 1;

 	}

@@ -153,16 +153,16 @@ 
 

 	protected function get_list_next_link()

 	{

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

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

 			return;

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

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

+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())

 			return;

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

 	}

@@ -170,7 +170,7 @@ 
 	private $total_post_count;

 	protected function get_total_post_count()

 	{

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

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

 			$this->total_post_count = PostCollector::getPostCountForCategory($this->category->link);

 		return $this->total_post_count;

 	}

Braces +18 added lines, -16 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));

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

 	}

 

@@ -153,25 +151,29 @@ 
 

 	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();

 	}

 

 	private $total_post_count;

 	protected function get_total_post_count()

 	{

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

-			$this->total_post_count = PostCollector::getPostCountForCategory($this->category->link);

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

+					$this->total_post_count = PostCollector::getPostCountForCategory($this->category->link);

+		}

 		return $this->total_post_count;

 	}

 

controller/blog/HomeController.class.inc.php

Spacing +8 added lines, -8 removed lines

@@ -32,12 +32,12 @@ 
 	{

 		parent::set_head_data();

 		

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

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

 			$this->set_title(self::$TITLE_MAIN);

 		else

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

 		

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

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

 			$this->set_description(self::$DESCRIPTION_MAIN);

 		else

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

@@ -47,7 +47,7 @@ 
 

 	protected function get_introduction()

 	{

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

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

 		{

 			Loader::load('collector', 'blog/IntroductionCollector');

 			$introduction_result = IntroductionCollector::getRow('home');

@@ -67,7 +67,7 @@ 
 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(1);

-		if(isset($page) && is_numeric($page))

+		if (isset($page) && is_numeric($page))

 			return $page;

 		return 1;

 	}

@@ -87,16 +87,16 @@ 
 

 	protected function get_list_next_link()

 	{

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

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

 			return;

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

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

 			return '/';

 		return '/' . ($this->page - 1) . '/';

 	}

 

 	protected function get_list_prev_link()

 	{

-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())

+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())

 			return;

 		return '/' . ($this->page + 1) . '/';

 	}

@@ -104,7 +104,7 @@ 
 	private $total_post_count;

 	protected function get_total_post_count()

 	{

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

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

 			$this->total_post_count = PostCollector::getMainPostCount();

 		return $this->total_post_count;

 	}

Braces +25 added lines, -18 removed lines

@@ -32,15 +32,17 @@ 
 	{

 		parent::set_head_data();

 		

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

-			$this->set_title(self::$TITLE_MAIN);

-		else

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

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

+					$this->set_title(self::$TITLE_MAIN);

+		} else {

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

+		}

 		

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

-			$this->set_description(self::$DESCRIPTION_MAIN);

-		else

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

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

+					$this->set_description(self::$DESCRIPTION_MAIN);

+		} else {

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

+		}

 		

 		$this->set_keywords(self::$KEYWORD_ARRAY);

 	}

@@ -67,8 +69,9 @@ 
 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(1);

-		if(isset($page) && is_numeric($page))

-			return $page;

+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;

 	}

 

@@ -87,25 +90,29 @@ 
 

 	protected function get_list_next_link()

 	{

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

-			return;

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

-			return '/';

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

+					return;

+		}

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

+					return '/';

+		}

 		return '/' . ($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 '/' . ($this->page + 1) . '/';

 	}

 

 	private $total_post_count;

 	protected function get_total_post_count()

 	{

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

-			$this->total_post_count = PostCollector::getMainPostCount();

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

+					$this->total_post_count = PostCollector::getMainPostCount();

+		}

 		return $this->total_post_count;

 	}

 

controller/blog/PostController.class.inc.php

Spacing +10 added lines, -10 removed lines

@@ -27,7 +27,7 @@ 
 		parent::__construct();

 		

 		$this->post = PostCollector::getPostByURI(URLDecode::getPiece(2));

-		if($this->post == null)

+		if ($this->post == null)

 			$this->eject();

 		

 		$this->handle_comment_submit(

@@ -89,7 +89,7 @@ 
 		$keyword_array = array();

 		$keywords = $this->tags;

 		

-		foreach($keywords as $keyword)

+		foreach ($keywords as $keyword)

 		{

 			$keyword_array[] = $keyword->tag;

 		}

@@ -103,16 +103,16 @@ 
 	private function get_series_posts()

 	{

 		$series_posts = $this->fetch_series_posts();

-		if(count($series_posts) < 1)

+		if (count($series_posts) < 1)

 			return array();

 		

 		$previous_post = new stdclass();

 		$next_post = new stdclass();

 		

 		$found_current_post = false;

-		foreach($series_posts as $post_row)

+		foreach ($series_posts as $post_row)

 		{

-			if($post_row->post == $this->post->id)

+			if ($post_row->post == $this->post->id)

 			{

 				$found_current_post = true;

 				continue;

@@ -132,7 +132,7 @@ 
 

 			$post->url = Loader::getRootUrl('blog') . "{$post_row->category}/{$post_row->path}/";

 			

-			if(!$found_current_post)

+			if (!$found_current_post)

 				$previous_post = $post;

 			else

 			{

@@ -151,7 +151,7 @@ 
 	private $series_posts;

 	private function fetch_series_posts()

 	{

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

+		if (!isset($this->series_posts))

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

 		return $this->series_posts;

 	}

@@ -159,14 +159,14 @@ 
 	private function get_related_posts()

 	{

 		$tag_array = array();

-		foreach($this->tags as $tag)

+		foreach ($this->tags as $tag)

 		{

 			$tag_array[] = $tag->id;

 		}

 		

 		$series_posts = $this->fetch_series_posts();

 		$exclude_post_array = array();

-		foreach($series_posts as $series_post)

+		foreach ($series_posts as $series_post)

 		{

 			$exclude_post_array[] = $series_post->post;

 		}

@@ -174,7 +174,7 @@ 
 		$post_array = array();

 		$post_result = PostCollector::getRelatedPosts($this->post->id, $tag_array, $exclude_post_array);

 		

-		foreach($post_result as $post_row)

+		foreach ($post_result as $post_row)

 		{

 			$post = new stdclass();

 			$post->title = $post_row->title;

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

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	{

 		$query = URLDecode::getPiece(2);

 		$query = urldecode($query);

-        $query = str_replace('-', ' ', $query);

+		$query = str_replace('-', ' ', $query);

 		

 		$this->query = $query;

 		

Spacing +9 added lines, -9 removed lines

@@ -45,7 +45,7 @@ 
 	{

 		parent::set_head_data();

 		

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

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

 		{

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

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

@@ -63,10 +63,10 @@ 
 

 	protected function get_introduction()

 	{

-		if($this->total_pages > 1)

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

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

 			return array(

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

 		else

@@ -77,7 +77,7 @@ 
 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(3);

-		if(isset($page) && is_numeric($page))

+		if (isset($page) && is_numeric($page))

 			return $page;

 		return 1;

 	}

@@ -85,7 +85,7 @@ 
 	private $search_result;

 	private function get_search_result()

 	{

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

+		if (!isset($this->search_result))

 		{

 			$posts = PostCollector::getMainList(self::$MAXIMUM_SEARCH_POSTS);

 			

@@ -113,16 +113,16 @@ 
 

 	protected function get_list_next_link()

 	{

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

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

 			return;

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

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

+		if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())

 			return;

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

 	}

@@ -130,7 +130,7 @@ 
 	private $total_post_count;

 	protected function get_total_post_count()

 	{

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

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

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

 		return $this->total_post_count;

 	}

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

Spacing +9 added lines, -9 removed lines

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

 		

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

-		if($tag_result === false)

+		if ($tag_result === false)

 			$this->eject();

 		

 		$this->tag = $tag_result;

@@ -40,7 +40,7 @@ 
 	{

 		parent::set_head_data();

 		

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

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

 		{

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

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

@@ -60,12 +60,12 @@ 
 	{

 		$tag = ucwords($this->tag->tag);

 		

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

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

 		{

 			Loader::load('collector', 'blog/IntroductionCollector');

 			$introduction_result = IntroductionCollector::getRow('tag', $this->tag->tag);

 			

-			if($introduction_result !== null)

+			if ($introduction_result !== null)

 			{

 				$introduction = array();

 				$introduction['title'] = $introduction_result->title;

@@ -86,7 +86,7 @@ 
 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(3);

-		if(isset($page) && is_numeric($page))

+		if (isset($page) && is_numeric($page))

 			return $page;

 		return 1;

 	}

@@ -106,16 +106,16 @@ 
 

 	protected function get_list_next_link()

 	{

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

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

 			return;

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

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

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

 	}

@@ -123,7 +123,7 @@ 
 	private $total_post_count;

 	protected function get_total_post_count()

 	{

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

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

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

 		return $this->total_post_count;

 	}

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;

 	}