jacobemerick / web

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

controller/blog/DefaultListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -60,8 +60,9 @@
 		{
 			$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;
 	}
 

controller/site/DefaultPageController.class.inc.php

Braces +6 added lines, -4 removed lines

@@ -56,14 +56,16 @@
 	{
 		$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';

controller/site/ContactController.class.inc.php

Braces +12 added lines, -8 removed lines

@@ -29,15 +29,19 @@
 
 	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))
 		{

module/form/CommentSubmitModule.class.inc.php

Braces +48 added lines, -32 removed lines

@@ -26,16 +26,20 @@ 
 
 	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 @@ 
 	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 @@ 
 	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 @@ 
 			'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 @@ 
 			->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 @@ 
 	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 @@ 
 		$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 @@ 
 			
 			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,

utility/Database.class.inc.php

Braces +12 added lines, -8 removed lines

@@ -36,8 +36,9 @@ 
 		$mysqli = new mysqli($host, $username, $password);
 		
 		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
-			$this->has_connection_error = true;
+		if(isset($has_connection_error)) {

+					$this->has_connection_error = true;

+		}

 		
 		return $mysqli;
 	}
@@ -67,8 +68,9 @@ 
 		{
 			self::instance()->log_query($query, $start);
 			$array = array();
-			while($row = $result->fetch_object())
-				$array[] = $row;
+			while($row = $result->fetch_object()) {

+							$array[] = $row;

+			}

 			$result->close();
 			return $array;
 		}
@@ -79,8 +81,9 @@ 
 	public static function selectRow($query)
 	{
 		$result = self::select($query);
-		if(is_array($result))
-			return array_pop($result);
+		if(is_array($result)) {

+					return array_pop($result);

+		}

 		return false;
 	}
 
@@ -99,8 +102,9 @@ 
 	public static function lastInsertID()
 	{
 		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
-			return false;
+		if($id == 0) {

+					return false;

+		}

 		return $id;
 	}
 

utility/URLDecode.class.inc.php

Braces +21 added lines, -14 removed lines

@@ -15,12 +15,14 @@ 
 	static private function form_url_array($host, $uri)
 	{
 		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
-			$uri = substr($uri, 0, strpos($uri, '?'));
+		if(strpos($uri, '?')) {

+					$uri = substr($uri, 0, strpos($uri, '?'));

+		}

 		$uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
-			$host = substr($host, strpos($host, '.') + 1);
+		if(!Loader::isLive()) {

+					$host = substr($host, strpos($host, '.') + 1);

+		}

 		
 		self::$array['host'] = $host;
 		
@@ -33,8 +35,9 @@ 
 		self::$array['base'] = 'http://' . (!Loader::isLive() ? 'dev.' : '') . $host . '/';
 		self::$array['uri'] = '/' . implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
-			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
+		if(end($uri_array) == '') {

+					$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);

+		}

 		self::$array['pieces'] = (array) $uri_array;
 	}
 
@@ -61,22 +64,26 @@ 
 	static function getExtension()
 	{
 		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
-			return false;
+		if(substr($file, -1) == '/') {

+					return false;

+		}

 		return substr($file, strrpos($file, '.') + 1);;
 	}
 
 	static function getPiece($piece = null)
 	{
-		if(!$piece)
-			return self::$array['pieces'];
+		if(!$piece) {

+					return self::$array['pieces'];

+		}

 		
-		if($piece == -1)
-			return end(self::$array['pieces']);
+		if($piece == -1) {

+					return end(self::$array['pieces']);

+		}

 		
 		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
-			return self::$array['pieces'][$piece];
+		if(array_key_exists($piece, self::$array['pieces'])) {

+					return self::$array['pieces'][$piece];

+		}

 		return;
 	}