Inspection of "Adds skeleton and a few tests for activity stream..." - jacobemerick/web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( a2526c...4c6be8 )

by Jacob

created 2016-02-20 23:02 UTC

Status

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.

utility/Database.class.inc.php 1 patch

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

@@ -36,8 +36,9 @@  discard block
 block discarded – undo
 		$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 @@  discard block
 block discarded – undo
 		{
 			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 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	public static function lastInsertID()
 	{
 		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
-			return false;
+		if($id == 0) {
+					return false;
+		}
 		return $id;
 	}
 

Please login to merge, or discard this patch.

utility/URLDecode.class.inc.php 1 patch

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

@@ -15,12 +15,14 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 		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 @@  discard block
 block discarded – undo
 	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;
 	}
 

Please login to merge, or discard this patch.

utility/Cookie.class.inc.php 1 patch

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

@@ -21,8 +21,9 @@  discard block
 block discarded – undo
 
 	public function setValue($value)
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {
+					$this->load();
+		}
 		
 		$this->value = $value;
 		return $this;
@@ -30,8 +31,9 @@  discard block
 block discarded – undo
 
 	public function getValue()
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {
+					$this->load();
+		}
 		return $this->value;
 	}
 
@@ -42,24 +44,26 @@  discard block
 block discarded – undo
 
 	public function exists()
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {
+					$this->load();
+		}
 		return $this->exists;
 	}
 
 	private final function load()
 	{
 		$name = $this->getName();
-		if(isset($_COOKIE[$name]))
-			$value = $_COOKIE[$name];
+		if(isset($_COOKIE[$name])) {
+					$value = $_COOKIE[$name];
+		}
 		
 		if(isset($value))
 		{
 			$this->value = $value;
 			$this->exists = true;
-		}
-		else
-			$this->exists = false;
+		} else {
+					$this->exists = false;
+		}
 		
 		$this->is_loaded = true;
 	}
@@ -84,24 +88,29 @@  discard block
 block discarded – undo
 	private final function check_values()
 	{
 		$name = $this->getName();
-		if(empty($name) || strlen($name) < 1)
-			return false;
+		if(empty($name) || strlen($name) < 1) {
+					return false;
+		}
 		
 		$value = $this->getValue();
-		if(!isset($value) || strlen($value) < 1)
-			return false;
+		if(!isset($value) || strlen($value) < 1) {
+					return false;
+		}
 		
 		$expiration = $this->getExpiration();
-		if(!isset($expiration) || !is_int($expiration))
-			return false;
+		if(!isset($expiration) || !is_int($expiration)) {
+					return false;
+		}
 		
 		$domain = $this->getDomain();
-		if(!isset($domain) || strlen($domain) < 1)
-			return false;
+		if(!isset($domain) || strlen($domain) < 1) {
+					return false;
+		}
 		
 		$path = $this->getPath();
-		if(!isset($path) || strlen($path) < 1)
-			return false;
+		if(!isset($path) || strlen($path) < 1) {
+					return false;
+		}
 		
 		return true;
 	}

Please login to merge, or discard this patch.

utility/content/MarkupCodeContent.class.inc.php 1 patch

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

@@ -10,8 +10,9 @@
 block discarded – undo
 	protected function execute($title = '')
 	{
 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
-			return;
+		if(count($matches[1]) == 0) {
+					return;
+		}
 		
 		foreach($matches[3] as $key => $match)
 		{

Please login to merge, or discard this patch.

utility/content/FixInternalLinkContent.class.inc.php 1 patch

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

@@ -14,10 +14,11 @@  discard block
 block discarded – undo
 		preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);
 		foreach($matches[1] as $key => $match)
 		{
-			if(isset($matches[3][$key]))
-				$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
-			else
-				$link_content = $this->get_link($match, $is_absolute);
+			if(isset($matches[3][$key])) {
+							$link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
+			} else {
+							$link_content = $this->get_link($match, $is_absolute);
+			}
 			$this->content = str_replace($matches[0][$key], $link_content, $this->content);
 		}
 		return;
@@ -35,14 +36,16 @@  discard block
 block discarded – undo
 				Loader::load('collector', 'blog/PostCollector');
 				$post = PostCollector::getPostByURI($uri);
 				
-				if($post === NULL)
-					return;
+				if($post === NULL) {
+									return;
+				}
 				
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
 				$link .= "{$post->category}/{$post->path}/";
 				
-				if($anchor == '')
-					$anchor = $post->title;
+				if($anchor == '') {
+									$anchor = $post->title;
+				}
 				
 				break;
 			case 'blog-tag' :
@@ -61,14 +64,16 @@  discard block
 block discarded – undo
 				Loader::load('collector', 'waterfall/LogCollector');
 				$log = LogCollector::getByAlias($uri);
 				
-				if($log === NULL)
-					return;
+				if($log === NULL) {
+									return;
+				}
 				
 				$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
 				$link .= "journal/{$log->alias}/";
 				
-				if($anchor == '')
-					$anchor = $log->title;
+				if($anchor == '') {
+									$anchor = $log->title;
+				}
 				
 				break;
 			case 'falls' :

Please login to merge, or discard this patch.

		@@ -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,

		@@ -36,8 +36,9 @@ discard block
		block discarded – undo
36	36	$mysqli = new mysqli($host, $username, $password);
37	37
38	38	$has_connection_error = $mysqli->connect_error;
39		- if(isset($has_connection_error))
40		- $this->has_connection_error = true;
	39	+ if(isset($has_connection_error)) {
	40	+ $this->has_connection_error = true;
	41	+ }
41	42
42	43	return $mysqli;
43	44	}
		@@ -67,8 +68,9 @@ discard block
		block discarded – undo
67	68	{
68	69	self::instance()->log_query($query, $start);
69	70	$array = array();
70		- while($row = $result->fetch_object())
71		- $array[] = $row;
	71	+ while($row = $result->fetch_object()) {
	72	+ $array[] = $row;
	73	+ }
72	74	$result->close();
73	75	return $array;
74	76	}
		@@ -79,8 +81,9 @@ discard block
		block discarded – undo
79	81	public static function selectRow($query)
80	82	{
81	83	$result = self::select($query);
82		- if(is_array($result))
83		- return array_pop($result);
	84	+ if(is_array($result)) {
	85	+ return array_pop($result);
	86	+ }
84	87	return false;
85	88	}
86	89
		@@ -99,8 +102,9 @@ discard block
		block discarded – undo
99	102	public static function lastInsertID()
100	103	{
101	104	$id = self::instance()->write_connection->insert_id;
102		- if($id == 0)
103		- return false;
	105	+ if($id == 0) {
	106	+ return false;
	107	+ }
104	108	return $id;
105	109	}
106	110

		@@ -15,12 +15,14 @@ discard block
		block discarded – undo
15	15	static private function form_url_array($host, $uri)
16	16	{
17	17	$uri = substr($uri, 1);
18		- if(strpos($uri, '?'))
19		- $uri = substr($uri, 0, strpos($uri, '?'));
	18	+ if(strpos($uri, '?')) {
	19	+ $uri = substr($uri, 0, strpos($uri, '?'));
	20	+ }
20	21	$uri_array = explode('/', $uri);
21	22
22		- if(!Loader::isLive())
23		- $host = substr($host, strpos($host, '.') + 1);
	23	+ if(!Loader::isLive()) {
	24	+ $host = substr($host, strpos($host, '.') + 1);
	25	+ }
24	26
25	27	self::$array['host'] = $host;
26	28
		@@ -33,8 +35,9 @@ discard block
		block discarded – undo
33	35	self::$array['base'] = 'http://' . (!Loader::isLive() ? 'dev.' : '') . $host . '/';
34	36	self::$array['uri'] = '/' . implode('/', $uri_array);
35	37
36		- if(end($uri_array) == '')
37		- $uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
	38	+ if(end($uri_array) == '') {
	39	+ $uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
	40	+ }
38	41	self::$array['pieces'] = (array) $uri_array;
39	42	}
40	43
		@@ -61,22 +64,26 @@ discard block
		block discarded – undo
61	64	static function getExtension()
62	65	{
63	66	$file = self::getPiece(-1);
64		- if(substr($file, -1) == '/')
65		- return false;
	67	+ if(substr($file, -1) == '/') {
	68	+ return false;
	69	+ }
66	70	return substr($file, strrpos($file, '.') + 1);;
67	71	}
68	72
69	73	static function getPiece($piece = null)
70	74	{
71		- if(!$piece)
72		- return self::$array['pieces'];
	75	+ if(!$piece) {
	76	+ return self::$array['pieces'];
	77	+ }
73	78
74		- if($piece == -1)
75		- return end(self::$array['pieces']);
	79	+ if($piece == -1) {
	80	+ return end(self::$array['pieces']);
	81	+ }
76	82
77	83	$piece = $piece - 1;
78		- if(array_key_exists($piece, self::$array['pieces']))
79		- return self::$array['pieces'][$piece];
	84	+ if(array_key_exists($piece, self::$array['pieces'])) {
	85	+ return self::$array['pieces'][$piece];
	86	+ }
80	87	return;
81	88	}
82	89

		@@ -21,8 +21,9 @@ discard block
		block discarded – undo
21	21
22	22	public function setValue($value)
23	23	{
24		- if(!$this->is_loaded)
25		- $this->load();
	24	+ if(!$this->is_loaded) {
	25	+ $this->load();
	26	+ }
26	27
27	28	$this->value = $value;
28	29	return $this;
		@@ -30,8 +31,9 @@ discard block
		block discarded – undo
30	31
31	32	public function getValue()
32	33	{
33		- if(!$this->is_loaded)
34		- $this->load();
	34	+ if(!$this->is_loaded) {
	35	+ $this->load();
	36	+ }
35	37	return $this->value;
36	38	}
37	39
		@@ -42,24 +44,26 @@ discard block
		block discarded – undo
42	44
43	45	public function exists()
44	46	{
45		- if(!$this->is_loaded)
46		- $this->load();
	47	+ if(!$this->is_loaded) {
	48	+ $this->load();
	49	+ }
47	50	return $this->exists;
48	51	}
49	52
50	53	private final function load()
51	54	{
52	55	$name = $this->getName();
53		- if(isset($_COOKIE[$name]))
54		- $value = $_COOKIE[$name];
	56	+ if(isset($_COOKIE[$name])) {
	57	+ $value = $_COOKIE[$name];
	58	+ }
55	59
56	60	if(isset($value))
57	61	{
58	62	$this->value = $value;
59	63	$this->exists = true;
60		- }
61		- else
62		- $this->exists = false;
	64	+ } else {
	65	+ $this->exists = false;
	66	+ }
63	67
64	68	$this->is_loaded = true;
65	69	}
		@@ -84,24 +88,29 @@ discard block
		block discarded – undo
84	88	private final function check_values()
85	89	{
86	90	$name = $this->getName();
87		- if(empty($name) \|\| strlen($name) < 1)
88		- return false;
	91	+ if(empty($name) \|\| strlen($name) < 1) {
	92	+ return false;
	93	+ }
89	94
90	95	$value = $this->getValue();
91		- if(!isset($value) \|\| strlen($value) < 1)
92		- return false;
	96	+ if(!isset($value) \|\| strlen($value) < 1) {
	97	+ return false;
	98	+ }
93	99
94	100	$expiration = $this->getExpiration();
95		- if(!isset($expiration) \|\| !is_int($expiration))
96		- return false;
	101	+ if(!isset($expiration) \|\| !is_int($expiration)) {
	102	+ return false;
	103	+ }
97	104
98	105	$domain = $this->getDomain();
99		- if(!isset($domain) \|\| strlen($domain) < 1)
100		- return false;
	106	+ if(!isset($domain) \|\| strlen($domain) < 1) {
	107	+ return false;
	108	+ }
101	109
102	110	$path = $this->getPath();
103		- if(!isset($path) \|\| strlen($path) < 1)
104		- return false;
	111	+ if(!isset($path) \|\| strlen($path) < 1) {
	112	+ return false;
	113	+ }
105	114
106	115	return true;
107	116	}

		@@ -10,8 +10,9 @@
		block discarded – undo
10	10	protected function execute($title = '')
11	11	{
12	12	preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
13		- if(count($matches[1]) == 0)
14		- return;
	13	+ if(count($matches[1]) == 0) {
	14	+ return;
	15	+ }
15	16
16	17	foreach($matches[3] as $key => $match)
17	18	{

		@@ -14,10 +14,11 @@ discard block
		block discarded – undo
14	14	preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);
15	15	foreach($matches[1] as $key => $match)
16	16	{
17		- if(isset($matches[3][$key]))
18		- $link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
19		- else
20		- $link_content = $this->get_link($match, $is_absolute);
	17	+ if(isset($matches[3][$key])) {
	18	+ $link_content = $this->get_link($match, $is_absolute, $matches[3][$key]);
	19	+ } else {
	20	+ $link_content = $this->get_link($match, $is_absolute);
	21	+ }
21	22	$this->content = str_replace($matches[0][$key], $link_content, $this->content);
22	23	}
23	24	return;
		@@ -35,14 +36,16 @@ discard block
		block discarded – undo
35	36	Loader::load('collector', 'blog/PostCollector');
36	37	$post = PostCollector::getPostByURI($uri);
37	38
38		- if($post === NULL)
39		- return;
	39	+ if($post === NULL) {
	40	+ return;
	41	+ }
40	42
41	43	$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
42	44	$link .= "{$post->category}/{$post->path}/";
43	45
44		- if($anchor == '')
45		- $anchor = $post->title;
	46	+ if($anchor == '') {
	47	+ $anchor = $post->title;
	48	+ }
46	49
47	50	break;
48	51	case 'blog-tag' :
		@@ -61,14 +64,16 @@ discard block
		block discarded – undo
61	64	Loader::load('collector', 'waterfall/LogCollector');
62	65	$log = LogCollector::getByAlias($uri);
63	66
64		- if($log === NULL)
65		- return;
	67	+ if($log === NULL) {
	68	+ return;
	69	+ }
66	70
67	71	$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
68	72	$link .= "journal/{$log->alias}/";
69	73
70		- if($anchor == '')
71		- $anchor = $log->title;
	74	+ if($anchor == '') {
	75	+ $anchor = $log->title;
	76	+ }
72	77
73	78	break;
74	79	case 'falls' :

jacobemerick / web

Push — master ( a2526c...4c6be8 )

Status

Category

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

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

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

Braces +30 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 +17 added lines, -12 removed lines patch added patch discarded remove patch