Inspection of "Quick fixes" - jacobemerick/web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 8fa960...c81f91 )

by Jacob

created 2016-03-02 12:51 UTC

Status

Braces +47 added lines, -35 removed lines patch added patch discarded remove patch

@@ -20,15 +20,17 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 	{
 		$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 @@  discard block
 block discarded – undo
 			$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 @@  discard block
 block discarded – undo
 		
 		$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;

Please login to merge, or discard this patch.

controller/waterfalls/CompanionListController.class.inc.php 1 patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -27,8 +27,9 @@
 block discarded – undo
 		$alias = URLDecode::getPiece(2);
 		$this->companion = CompanionCollector::getByAlias($alias);
 		
-		if(!$this->companion)
-			$this->eject();
+		if(!$this->companion) {
+					$this->eject();
+		}
 		
 		parent::__construct();
 	}

Please login to merge, or discard this patch.

controller/blog/SearchController.class.inc.php 1 patch

Braces +26 added lines, -21 removed lines patch added patch discarded remove patch

@@ -49,8 +49,7 @@  discard block
 block discarded – undo
 		{
 			$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 @@  discard block
 block discarded – undo
 
 	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 @@  discard block
 block discarded – undo
 
 	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;
 	}
 

Please login to merge, or discard this patch.

controller/blog/DefaultListController.class.inc.php 1 patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -60,8 +60,9 @@
 block discarded – undo
 		{
 			$post_array[] = $this->format_post($post, true);
 		}
-		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;
 	}
 

Please login to merge, or discard this patch.

controller/site/DefaultPageController.class.inc.php 1 patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

@@ -56,14 +56,16 @@
 block discarded – undo
 	{
 		$current_uri = URLDecode::getPiece(1);
 		
-		if(!isset($current_uri))
-			return 'About';
+		if(!isset($current_uri)) {
+					return 'About';
+		}
 		
 		$menu = self::$MENU;
 		foreach($menu as $link)
 		{
-			if($link['uri'] == $current_uri)
-				return $link['name'];
+			if($link['uri'] == $current_uri) {
+							return $link['name'];
+			}
 		}
 		
 		return 'About';

Please login to merge, or discard this patch.

controller/site/ContactController.class.inc.php 1 patch

Braces +12 added lines, -8 removed lines patch added patch discarded remove patch

@@ -29,15 +29,19 @@
 block discarded – undo
 
 	private function get_form_results()
 	{
-		if(!Request::hasPost())
-			return array();
+		if(!Request::hasPost()) {
+					return array();
+		}
 		
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_message['name'] = 'Please enter a value for your name.';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_message['email'] = 'Please enter a valid email address.';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_message['message'] = 'Please enter a message.';
+		if(!Validate::checkRequest('post', 'name', 'string')) {
+					$error_message['name'] = 'Please enter a value for your name.';
+		}
+		if(!Validate::checkRequest('post', 'email', 'string')) {
+					$error_message['email'] = 'Please enter a valid email address.';
+		}
+		if(!Validate::checkRequest('post', 'message', 'string')) {
+					$error_message['message'] = 'Please enter a message.';
+		}
 		
 		if(!empty($error_message))
 		{

Please login to merge, or discard this patch.

controller/portfolio/DefaultPageController.class.inc.php 1 patch

Braces +10 added lines, -8 removed lines patch added patch discarded remove patch

@@ -39,10 +39,11 @@  discard block
 block discarded – undo
 				'name' => 'Contact',
 				'link' => Loader::getRootURL() . 'contact/'));
 		
-		if(!URLDecode::getPiece(1))
-			$active_page = 'About';
-		else
-			$active_page = ucfirst(URLDecode::getPiece(1));
+		if(!URLDecode::getPiece(1)) {
+					$active_page = 'About';
+		} else {
+					$active_page = ucfirst(URLDecode::getPiece(1));
+		}
 		
 		foreach($menu as $menu_item)
 		{
@@ -63,10 +64,11 @@  discard block
 block discarded – undo
 		{
 			$piece_obj = new stdclass();
 			$piece_obj->title = $piece->title;
-			if("{$piece->category}" == 1)
-				$piece_obj->url = Loader::getRootURL() . "web/{$piece->title_url}/";
-			else
-				$piece_obj->url = Loader::getRootURL() . "print/{$piece->title_url}/";
+			if("{$piece->category}" == 1) {
+							$piece_obj->url = Loader::getRootURL() . "web/{$piece->title_url}/";
+			} else {
+							$piece_obj->url = Loader::getRootURL() . "print/{$piece->title_url}/";
+			}
 			$piece_obj->image = "/{$piece->image}";
 			$piece_array[] = $piece_obj;
 		}

Please login to merge, or discard this patch.

controller/portfolio/PieceController.class.inc.php 1 patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

@@ -36,8 +36,9 @@
 block discarded – undo
 		Loader::load('collector', 'portfolio/PortfolioCollector');
 		$portfolio_result = PortfolioCollector::getPieceByURI($this->title_url);
 		
-		if($portfolio_result === null)
-			$this->eject();
+		if($portfolio_result === null) {
+					$this->eject();
+		}
 		
 		$portfolio_image_result = PortfolioCollector::getImagesForPiece($portfolio_result->id, 2);
 		$image = new ImageOld("portfolio/{$portfolio_image_result[0]->name}");

Please login to merge, or discard this patch.

module/form/CommentSubmitModule.class.inc.php 1 patch

Braces +48 added lines, -32 removed lines patch added patch discarded remove patch

@@ -26,16 +26,20 @@  discard block
 block discarded – undo
 
 	public function activate()
 	{
-		if(!Request::hasPost())
-			return false;
-		if(!Request::getPost('submit') == 'Submit Comment')
-			return false;
+		if(!Request::hasPost()) {
+					return false;
+		}
+		if(!Request::getPost('submit') == 'Submit Comment') {
+					return false;
+		}
 		
 		$errors = $this->fetch_errors();
-		if(count($errors) > 0)
-			return $errors;
-		if(Request::getPost('catch') !== '')
-			return false;
+		if(count($errors) > 0) {
+					return $errors;
+		}
+		if(Request::getPost('catch') !== '') {
+					return false;
+		}
 		
 		$page_id = $this->save_comment_page();
 		$commenter_id = $this->save_commenter();
@@ -50,18 +54,24 @@  discard block
 block discarded – undo
 	private function fetch_errors()
 	{
 		$errors = array();
-		if(!Validate::checkRequest('post', 'name', 'name'))
-			$errors['name'] = 'You must include a valid name';
-		if(!Validate::checkRequest('post', 'email', 'email'))
-			$errors['email'] = 'You must include a valid email';
-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
-			$errors['website'] = 'Please enter a valid website';
-		if(!Validate::checkRequest('post', 'comment', 'string'))
-			$errors['comment'] = 'You must enter a comment';
-		if(Request::getPost('notify') && Request::getPost('notify') != 'check')
-			$errors['notify'] = 'You entered an invalid notify request';
-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
-			$errors['reply'] = 'You entered an invalid reply request';
+		if(!Validate::checkRequest('post', 'name', 'name')) {
+					$errors['name'] = 'You must include a valid name';
+		}
+		if(!Validate::checkRequest('post', 'email', 'email')) {
+					$errors['email'] = 'You must include a valid email';
+		}
+		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url')) {
+					$errors['website'] = 'Please enter a valid website';
+		}
+		if(!Validate::checkRequest('post', 'comment', 'string')) {
+					$errors['comment'] = 'You must enter a comment';
+		}
+		if(Request::getPost('notify') && Request::getPost('notify') != 'check') {
+					$errors['notify'] = 'You entered an invalid notify request';
+		}
+		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer')) {
+					$errors['reply'] = 'You entered an invalid reply request';
+		}
 		
 		return $errors;
 	}
@@ -69,8 +79,9 @@  discard block
 block discarded – undo
 	private function save_comment_page()
 	{
 		$page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);
-		if($page_result !== null)
-			return $page_result->id;
+		if($page_result !== null) {
+					return $page_result->id;
+		}
 		
 		$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";
 		$query = sprintf($query, $this->site, $this->path);
@@ -85,8 +96,9 @@  discard block
 block discarded – undo
 			'name' => Request::getPost('name'),
 			'email' => Request::getPost('email'));
 		
-		if(Request::getPost('website') != '')
-			$cookie_value['website'] = Request::getPost('website');
+		if(Request::getPost('website') != '') {
+					$cookie_value['website'] = Request::getPost('website');
+		}
 		
 		$cookie_value = json_encode($cookie_value);
 		
@@ -95,8 +107,9 @@  discard block
 block discarded – undo
 			->save();
 		
 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
-		if($commenter_result !== null)
-			return $commenter_result->id;
+		if($commenter_result !== null) {
+					return $commenter_result->id;
+		}
 		
 		$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";
 		
@@ -112,8 +125,9 @@  discard block
 block discarded – undo
 	private function save_comment()
 	{
 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));
-		if($comment_result !== null)
-			return $comment_result->id;
+		if($comment_result !== null) {
+					return $comment_result->id;
+		}
 		
 		$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";
 		
@@ -133,8 +147,9 @@  discard block
 block discarded – undo
 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
 		
 		$reply = Database::escape(Request::getPost('type'));
-		if($reply == 'new')
-			$reply = 0;
+		if($reply == 'new') {
+					$reply = 0;
+		}
 		// else check to make sure value is legit
 		
 		$notify = (Request::getPost('notify') == 'check') ? 1 : 0;
@@ -163,8 +178,9 @@  discard block
 block discarded – undo
 			
 			foreach($notification_result as $notification_row)
 			{
-				if($notification_row->email == Request::getPost('email'))
-					continue;
+				if($notification_row->email == Request::getPost('email')) {
+									continue;
+				}
 				
 				$email_recipient_array[$notification_row->email] = array(
 					'email' => $notification_row->email,

Please login to merge, or discard this patch.

		@@ -20,15 +20,17 @@ discard block
		block discarded – undo
20	20	$this->offset = ($this->page - 1) * $this->get_item_count_per_page();
21	21
22	22	$items = $this->get_items();
23		- if(count($items) < 1)
24		- $this->eject();
	23	+ if(count($items) < 1) {
	24	+ $this->eject();
	25	+ }
25	26	}
26	27
27	28	final protected function get_page_number()
28	29	{
29	30	$page = $this->get_page_number_piece();
30		- if(isset($page) && is_numeric($page))
31		- return $page;
	31	+ if(isset($page) && is_numeric($page)) {
	32	+ return $page;
	33	+ }
32	34	return 1;
33	35	}
34	36
		@@ -41,8 +43,9 @@ discard block
		block discarded – undo
41	43
42	44	final private function get_introduction()
43	45	{
44		- if($this->page == 1)
45		- return $this->get_initial_introduction();
	46	+ if($this->page == 1) {
	47	+ return $this->get_initial_introduction();
	48	+ }
46	49
47	50	return $this->get_subsequent_introduction();
48	51	}
		@@ -68,8 +71,9 @@ discard block
		block discarded – undo
68	71	private $item_count;
69	72	final private function get_item_count()
70	73	{
71		- if(!isset($this->item_count))
72		- $this->item_count = $this->get_item_count_result();
	74	+ if(!isset($this->item_count)) {
	75	+ $this->item_count = $this->get_item_count_result();
	76	+ }
73	77	return $this->item_count;
74	78	}
75	79
		@@ -82,10 +86,11 @@ discard block
		block discarded – undo
82	86	$this->set_head('next_link', $this->get_list_next_link());
83	87	$this->set_head('previous_link', $this->get_list_prev_link());
84	88
85		- if($this->page == 1)
86		- $meta_array = $this->get_initial_meta();
87		- else
88		- $meta_array = $this->get_subsequent_meta();
	89	+ if($this->page == 1) {
	90	+ $meta_array = $this->get_initial_meta();
	91	+ } else {
	92	+ $meta_array = $this->get_subsequent_meta();
	93	+ }
89	94
90	95	$this->set_title($meta_array['title']);
91	96	$this->set_description($meta_array['description']);
		@@ -119,17 +124,20 @@ discard block
		block discarded – undo
119	124
120	125	final private function get_list_prev_link()
121	126	{
122		- if($this->page == 1)
123		- return;
124		- if($this->page == 2)
125		- return $this->get_list_link_root();
	127	+ if($this->page == 1) {
	128	+ return;
	129	+ }
	130	+ if($this->page == 2) {
	131	+ return $this->get_list_link_root();
	132	+ }
126	133	return $this->get_list_link_root() . ($this->page - 1) . '/';
127	134	}
128	135
129	136	final private function get_list_next_link()
130	137	{
131		- if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
132		- return;
	138	+ if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count()) {
	139	+ return;
	140	+ }
133	141	return $this->get_list_link_root() . ($this->page + 1) . '/';
134	142	}
135	143
		@@ -139,15 +147,17 @@ discard block
		block discarded – undo
139	147	{
140	148	$link_array = array();
141	149
142		- if($this->get_item_count_per_page() >= $this->get_item_count())
143		- return $link_array;
	150	+ if($this->get_item_count_per_page() >= $this->get_item_count()) {
	151	+ return $link_array;
	152	+ }
144	153
145	154	$link = new stdclass();
146	155	$link->anchor = '« previous';
147		- if($this->get_list_prev_link() !== null)
148		- $link->uri = $this->get_list_prev_link();
149		- else
150		- $link->class = 'inactive';
	156	+ if($this->get_list_prev_link() !== null) {
	157	+ $link->uri = $this->get_list_prev_link();
	158	+ } else {
	159	+ $link->class = 'inactive';
	160	+ }
151	161	$link_array[] = $link;
152	162
153	163	for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
		@@ -155,14 +165,15 @@ discard block
		block discarded – undo
155	165	$link = new stdclass();
156	166	$link->anchor = $i;
157	167
158		- if($i == $this->page)
159		- $link->class = 'current';
160		- else
	168	+ if($i == $this->page) {
	169	+ $link->class = 'current';
	170	+ } else
161	171	{
162		- if($i == 1)
163		- $link->uri = $this->get_list_link_root();
164		- else
165		- $link->uri = $this->get_list_link_root() . $i . '/';
	172	+ if($i == 1) {
	173	+ $link->uri = $this->get_list_link_root();
	174	+ } else {
	175	+ $link->uri = $this->get_list_link_root() . $i . '/';
	176	+ }
166	177	}
167	178
168	179	$link_array[] = $link;
		@@ -170,10 +181,11 @@ discard block
		block discarded – undo
170	181
171	182	$link = new stdclass();
172	183	$link->anchor = 'next »';
173		- if($this->get_list_next_link() !== null)
174		- $link->uri = $this->get_list_next_link();
175		- else
176		- $link->class = 'inactive';
	184	+ if($this->get_list_next_link() !== null) {
	185	+ $link->uri = $this->get_list_next_link();
	186	+ } else {
	187	+ $link->class = 'inactive';
	188	+ }
177	189	$link_array[] = $link;
178	190
179	191	return $link_array;

		@@ -27,8 +27,9 @@
		block discarded – undo
27	27	$alias = URLDecode::getPiece(2);
28	28	$this->companion = CompanionCollector::getByAlias($alias);
29	29
30		- if(!$this->companion)
31		- $this->eject();
	30	+ if(!$this->companion) {
	31	+ $this->eject();
	32	+ }
32	33
33	34	parent::__construct();
34	35	}

		@@ -49,8 +49,7 @@ discard block
		block discarded – undo
49	49	{
50	50	$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
51	51	$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
52		- }
53		- else
	52	+ } else
54	53	{
55	54	$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->query), $this->page, $this->total_pages));
56	55	$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->query)));
		@@ -63,22 +62,24 @@ discard block
		block discarded – undo
63	62
64	63	protected function get_introduction()
65	64	{
66		- if($this->total_pages > 1)
67		- return array(
68		- 'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
69		- else if($this->total_pages == 1)
70		- return array(
71		- 'title' => "Posts from search '{$this->query}'.");
72		- else
73		- return array(
74		- 'title' => "Sorry, '{$this->query}' didn't return any posts.");
	65	+ if($this->total_pages > 1) {
	66	+ return array(
	67	+ 'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
	68	+ } else if($this->total_pages == 1) {
	69	+ return array(
	70	+ 'title' => "Posts from search '{$this->query}'.");
	71	+ } else {
	72	+ return array(
	73	+ 'title' => "Sorry, '{$this->query}' didn't return any posts.");
	74	+ }
75	75	}
76	76
77	77	protected function get_page_number()
78	78	{
79	79	$page = URLDecode::getPiece(3);
80		- if(isset($page) && is_numeric($page))
81		- return $page;
	80	+ if(isset($page) && is_numeric($page)) {
	81	+ return $page;
	82	+ }
82	83	return 1;
83	84	}
84	85
		@@ -113,25 +114,29 @@ discard block
		block discarded – undo
113	114
114	115	protected function get_list_next_link()
115	116	{
116		- if($this->page == 1)
117		- return;
118		- if($this->page == 2)
119		- return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
	117	+ if($this->page == 1) {
	118	+ return;
	119	+ }
	120	+ if($this->page == 2) {
	121	+ return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
	122	+ }
120	123	return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
121	124	}
122	125
123	126	protected function get_list_prev_link()
124	127	{
125		- if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
126		- return;
	128	+ if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) {
	129	+ return;
	130	+ }
127	131	return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
128	132	}
129	133
130	134	private $total_post_count;
131	135	protected function get_total_post_count()
132	136	{
133		- if(!isset($this->total_post_count))
134		- $this->total_post_count = count($this->get_search_result());
	137	+ if(!isset($this->total_post_count)) {
	138	+ $this->total_post_count = count($this->get_search_result());
	139	+ }
135	140	return $this->total_post_count;
136	141	}
137	142

		@@ -60,8 +60,9 @@
		block discarded – undo
60	60	{
61	61	$post_array[] = $this->format_post($post, true);
62	62	}
63		- if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
64		- $this->eject();
	63	+ if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search') {
	64	+ $this->eject();
	65	+ }
65	66	return $post_array;
66	67	}
67	68

		@@ -56,14 +56,16 @@
		block discarded – undo
56	56	{
57	57	$current_uri = URLDecode::getPiece(1);
58	58
59		- if(!isset($current_uri))
60		- return 'About';
	59	+ if(!isset($current_uri)) {
	60	+ return 'About';
	61	+ }
61	62
62	63	$menu = self::$MENU;
63	64	foreach($menu as $link)
64	65	{
65		- if($link['uri'] == $current_uri)
66		- return $link['name'];
	66	+ if($link['uri'] == $current_uri) {
	67	+ return $link['name'];
	68	+ }
67	69	}
68	70
69	71	return 'About';

		@@ -29,15 +29,19 @@
		block discarded – undo
29	29
30	30	private function get_form_results()
31	31	{
32		- if(!Request::hasPost())
33		- return array();
	32	+ if(!Request::hasPost()) {
	33	+ return array();
	34	+ }
34	35
35		- if(!Validate::checkRequest('post', 'name', 'string'))
36		- $error_message['name'] = 'Please enter a value for your name.';
37		- if(!Validate::checkRequest('post', 'email', 'string'))
38		- $error_message['email'] = 'Please enter a valid email address.';
39		- if(!Validate::checkRequest('post', 'message', 'string'))
40		- $error_message['message'] = 'Please enter a message.';
	36	+ if(!Validate::checkRequest('post', 'name', 'string')) {
	37	+ $error_message['name'] = 'Please enter a value for your name.';
	38	+ }
	39	+ if(!Validate::checkRequest('post', 'email', 'string')) {
	40	+ $error_message['email'] = 'Please enter a valid email address.';
	41	+ }
	42	+ if(!Validate::checkRequest('post', 'message', 'string')) {
	43	+ $error_message['message'] = 'Please enter a message.';
	44	+ }
41	45
42	46	if(!empty($error_message))
43	47	{

		@@ -39,10 +39,11 @@ discard block
		block discarded – undo
39	39	'name' => 'Contact',
40	40	'link' => Loader::getRootURL() . 'contact/'));
41	41
42		- if(!URLDecode::getPiece(1))
43		- $active_page = 'About';
44		- else
45		- $active_page = ucfirst(URLDecode::getPiece(1));
	42	+ if(!URLDecode::getPiece(1)) {
	43	+ $active_page = 'About';
	44	+ } else {
	45	+ $active_page = ucfirst(URLDecode::getPiece(1));
	46	+ }
46	47
47	48	foreach($menu as $menu_item)
48	49	{
		@@ -63,10 +64,11 @@ discard block
		block discarded – undo
63	64	{
64	65	$piece_obj = new stdclass();
65	66	$piece_obj->title = $piece->title;
66		- if("{$piece->category}" == 1)
67		- $piece_obj->url = Loader::getRootURL() . "web/{$piece->title_url}/";
68		- else
69		- $piece_obj->url = Loader::getRootURL() . "print/{$piece->title_url}/";
	67	+ if("{$piece->category}" == 1) {
	68	+ $piece_obj->url = Loader::getRootURL() . "web/{$piece->title_url}/";
	69	+ } else {
	70	+ $piece_obj->url = Loader::getRootURL() . "print/{$piece->title_url}/";
	71	+ }
70	72	$piece_obj->image = "/{$piece->image}";
71	73	$piece_array[] = $piece_obj;
72	74	}

		@@ -36,8 +36,9 @@
		block discarded – undo
36	36	Loader::load('collector', 'portfolio/PortfolioCollector');
37	37	$portfolio_result = PortfolioCollector::getPieceByURI($this->title_url);
38	38
39		- if($portfolio_result === null)
40		- $this->eject();
	39	+ if($portfolio_result === null) {
	40	+ $this->eject();
	41	+ }
41	42
42	43	$portfolio_image_result = PortfolioCollector::getImagesForPiece($portfolio_result->id, 2);
43	44	$image = new ImageOld("portfolio/{$portfolio_image_result[0]->name}");

		@@ -26,16 +26,20 @@ discard block
		block discarded – undo
26	26
27	27	public function activate()
28	28	{
29		- if(!Request::hasPost())
30		- return false;
31		- if(!Request::getPost('submit') == 'Submit Comment')
32		- return false;
	29	+ if(!Request::hasPost()) {
	30	+ return false;
	31	+ }
	32	+ if(!Request::getPost('submit') == 'Submit Comment') {
	33	+ return false;
	34	+ }
33	35
34	36	$errors = $this->fetch_errors();
35		- if(count($errors) > 0)
36		- return $errors;
37		- if(Request::getPost('catch') !== '')
38		- return false;
	37	+ if(count($errors) > 0) {
	38	+ return $errors;
	39	+ }
	40	+ if(Request::getPost('catch') !== '') {
	41	+ return false;
	42	+ }
39	43
40	44	$page_id = $this->save_comment_page();
41	45	$commenter_id = $this->save_commenter();
		@@ -50,18 +54,24 @@ discard block
		block discarded – undo
50	54	private function fetch_errors()
51	55	{
52	56	$errors = array();
53		- if(!Validate::checkRequest('post', 'name', 'name'))
54		- $errors['name'] = 'You must include a valid name';
55		- if(!Validate::checkRequest('post', 'email', 'email'))
56		- $errors['email'] = 'You must include a valid email';
57		- if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
58		- $errors['website'] = 'Please enter a valid website';
59		- if(!Validate::checkRequest('post', 'comment', 'string'))
60		- $errors['comment'] = 'You must enter a comment';
61		- if(Request::getPost('notify') && Request::getPost('notify') != 'check')
62		- $errors['notify'] = 'You entered an invalid notify request';
63		- if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
64		- $errors['reply'] = 'You entered an invalid reply request';
	57	+ if(!Validate::checkRequest('post', 'name', 'name')) {
	58	+ $errors['name'] = 'You must include a valid name';
	59	+ }
	60	+ if(!Validate::checkRequest('post', 'email', 'email')) {
	61	+ $errors['email'] = 'You must include a valid email';
	62	+ }
	63	+ if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url')) {
	64	+ $errors['website'] = 'Please enter a valid website';
	65	+ }
	66	+ if(!Validate::checkRequest('post', 'comment', 'string')) {
	67	+ $errors['comment'] = 'You must enter a comment';
	68	+ }
	69	+ if(Request::getPost('notify') && Request::getPost('notify') != 'check') {
	70	+ $errors['notify'] = 'You entered an invalid notify request';
	71	+ }
	72	+ if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer')) {
	73	+ $errors['reply'] = 'You entered an invalid reply request';
	74	+ }
65	75
66	76	return $errors;
67	77	}
		@@ -69,8 +79,9 @@ discard block
		block discarded – undo
69	79	private function save_comment_page()
70	80	{
71	81	$page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);
72		- if($page_result !== null)
73		- return $page_result->id;
	82	+ if($page_result !== null) {
	83	+ return $page_result->id;
	84	+ }
74	85
75	86	$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";
76	87	$query = sprintf($query, $this->site, $this->path);
		@@ -85,8 +96,9 @@ discard block
		block discarded – undo
85	96	'name' => Request::getPost('name'),
86	97	'email' => Request::getPost('email'));
87	98
88		- if(Request::getPost('website') != '')
89		- $cookie_value['website'] = Request::getPost('website');
	99	+ if(Request::getPost('website') != '') {
	100	+ $cookie_value['website'] = Request::getPost('website');
	101	+ }
90	102
91	103	$cookie_value = json_encode($cookie_value);
92	104
		@@ -95,8 +107,9 @@ discard block
		block discarded – undo
95	107	->save();
96	108
97	109	$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
98		- if($commenter_result !== null)
99		- return $commenter_result->id;
	110	+ if($commenter_result !== null) {
	111	+ return $commenter_result->id;
	112	+ }
100	113
101	114	$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";
102	115
		@@ -112,8 +125,9 @@ discard block
		block discarded – undo
112	125	private function save_comment()
113	126	{
114	127	$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));
115		- if($comment_result !== null)
116		- return $comment_result->id;
	128	+ if($comment_result !== null) {
	129	+ return $comment_result->id;
	130	+ }
117	131
118	132	$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";
119	133
		@@ -133,8 +147,9 @@ discard block
		block discarded – undo
133	147	$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
134	148
135	149	$reply = Database::escape(Request::getPost('type'));
136		- if($reply == 'new')
137		- $reply = 0;
	150	+ if($reply == 'new') {
	151	+ $reply = 0;
	152	+ }
138	153	// else check to make sure value is legit
139	154
140	155	$notify = (Request::getPost('notify') == 'check') ? 1 : 0;
		@@ -163,8 +178,9 @@ discard block
		block discarded – undo
163	178
164	179	foreach($notification_result as $notification_row)
165	180	{
166		- if($notification_row->email == Request::getPost('email'))
167		- continue;
	181	+ if($notification_row->email == Request::getPost('email')) {
	182	+ continue;
	183	+ }
168	184
169	185	$email_recipient_array[$notification_row->email] = array(
170	186	'email' => $notification_row->email,

jacobemerick / web

Push — master ( 8fa960...c81f91 )

Status

Category

Braces +47 added lines, -35 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Braces +26 added lines, -21 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Braces +6 added lines, -4 removed lines patch added patch discarded remove patch

Braces +12 added lines, -8 removed lines patch added patch discarded remove patch

Braces +10 added lines, -8 removed lines patch added patch discarded remove patch

Braces +3 added lines, -2 removed lines patch added patch discarded remove patch

Braces +48 added lines, -32 removed lines patch added patch discarded remove patch