jacobemerick / web

utility/content/MarkupCodeContent.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -10,8 +10,9 @@
 	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)
 		{

utility/content/SmartTrimContent.class.inc.php

Braces +28 added lines, -22 removed lines

@@ -33,17 +33,19 @@ 
 			return;
 		}
 		
-		if(count($args) == 2)
-			$etc = $args[1];
-		else
-			$etc = self::$ETC;
+		if(count($args) == 2) {

+					$etc = $args[1];

+		} else {

+					$etc = self::$ETC;

+		}

 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
-			$this->trim_string($length);
-        else
-            $etc = '';
+		if($length < strlen($this->content)) {

+					$this->trim_string($length);

+		} else {

+                    $etc = '';

+        }

 		$this->check_exclude_tags();
 		$this->close_tags($etc);
 	}
@@ -54,8 +56,9 @@ 
 		
 		$last_right_bracket_position = strripos($content, self::$RIGHT_BRACKET);
 		$last_left_bracket_position = strripos($content, self::$LEFT_BRACKET);
-		if($last_left_bracket_position > $last_right_bracket_position)
-			$content = substr($content, 0, $last_left_bracket_position);
+		if($last_left_bracket_position > $last_right_bracket_position) {

+					$content = substr($content, 0, $last_left_bracket_position);

+		}

 		$content = trim($content);
 		
 		$this->content = $content;
@@ -76,14 +79,16 @@ 
 		foreach($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
-				break;
+			if($max_length <= $match[1]) {

+							break;

+			}

 			
 			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
 		}
 		
-		if(substr($content, -7) == '</p><p>')
-			$content = substr($content, 0, -7);
+		if(substr($content, -7) == '</p><p>') {

+					$content = substr($content, 0, -7);

+		}

 		
 		return $content;
 	}
@@ -118,9 +123,9 @@ 
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
-			}
-			else
-				$open_tags[] = $tag;
+			} else {

+							$open_tags[] = $tag;

+			}

 		}
 		
 		$open_tags = array_reverse($open_tags);
@@ -128,13 +133,14 @@ 
 		{
 			foreach($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
-					$content .= $etc;
+				if($key == count($open_tags) - 1) {

+									$content .= $etc;

+				}

 				$content .= "</{$open_tag}>";
 			}
-		}
-		else
-			$content .= $etc;
+		} else {

+					$content .= $etc;

+		}

 		
 		$this->content = $content;
 	}

utility/content/FixPhotoContent.class.inc.php

Braces +6 added lines, -4 removed lines

@@ -37,8 +37,9 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
-			return '';
+		if($photo_result == false) {

+					return '';

+		}

 		
 		$height = $file_size[1];
 		$width = $file_size[0];
@@ -49,8 +50,9 @@ 
         }
 		
 		$domain = '/';
-		if($is_absolute)
-			$domain = Loader::getRootUrl('blog');
+		if($is_absolute) {

+					$domain = Loader::getRootUrl('blog');

+		}

 		
 		return sprintf(self::$PHOTO_CONTENT, $domain, $category, $photo, $size, $height, $width, $description, $description);
 	}

utility/content/ElapsedTimeContent.class.inc.php

Braces +59 added lines, -58 removed lines

@@ -10,64 +10,65 @@
 		$previous_time = strtotime($this->content);
 		$current_time = time();
 		
-		if($current_time <= $previous_time)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 30)
-			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 1.5 * 60)
-			$this->content = 'a minute ago';
-		else if(($current_time - $previous_time) < 4 * 60)
-			$this->content = 'few minutes ago';
-		else if(($current_time - $previous_time) < 7 * 60)
-			$this->content = 'five minutes ago';
-		else if(($current_time - $previous_time) < 12 * 60)
-			$this->content = 'ten minutes ago';
-		else if(($current_time - $previous_time) < 17 * 60)
-			$this->content = 'fifteen minutes ago';
-		else if(($current_time - $previous_time) < 22 * 60)
-			$this->content = 'twenty minutes ago';
-		else if(($current_time - $previous_time) < 37 * 60)
-			$this->content = 'half hour ago';
-		else if(($current_time - $previous_time) < 52 * 60)
-			$this->content = 'forty-five minutes ago';
-		else if(($current_time - $previous_time) < 1.5 * 60 * 60)
-			$this->content = 'an hour ago';
-		else if(($current_time - $previous_time) < 2.5 * 60 * 60)
-			$this->content = 'two hours ago';
-		else if(($current_time - $previous_time) < 3.5 * 60 * 60)
-			$this->content = 'three hours ago';
-		else if(($current_time - $previous_time) < 4.5 * 60 * 60)
-			$this->content = 'few hours ago';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm')
-			$this->content = 'this afternoon';
-		else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am')
-			$this->content = 'this morning';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17)
-			$this->content = 'yesterday evening';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm')
-			$this->content = 'yesterday afternoon';
-		else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am')
-			$this->content = 'yesterday morning';
-		else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2)
-			$this->content = 'two days ago';
-		else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3)
-			$this->content = 'three days ago';
-		else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time))
-			$this->content = 'earlier this week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3)
-			$this->content = 'late last week';
-		else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1)
-			$this->content = 'early last week';
-		else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60)
-			$this->content = 'few weeks ago';
-		else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time))
-			$this->content = 'earlier this month';
-		else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1)
-			$this->content = 'last month';
-		else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
-			$this->content = 'several months ago';
-		else
-			$this->content = 'long ago';
+		if($current_time <= $previous_time) {

+					$this->content = 'few seconds ago';

+		} else if(($current_time - $previous_time) < 30) {

+					$this->content = 'few seconds ago';

+		} else if(($current_time - $previous_time) < 1.5 * 60) {

+					$this->content = 'a minute ago';

+		} else if(($current_time - $previous_time) < 4 * 60) {

+					$this->content = 'few minutes ago';

+		} else if(($current_time - $previous_time) < 7 * 60) {

+					$this->content = 'five minutes ago';

+		} else if(($current_time - $previous_time) < 12 * 60) {

+					$this->content = 'ten minutes ago';

+		} else if(($current_time - $previous_time) < 17 * 60) {

+					$this->content = 'fifteen minutes ago';

+		} else if(($current_time - $previous_time) < 22 * 60) {

+					$this->content = 'twenty minutes ago';

+		} else if(($current_time - $previous_time) < 37 * 60) {

+					$this->content = 'half hour ago';

+		} else if(($current_time - $previous_time) < 52 * 60) {

+					$this->content = 'forty-five minutes ago';

+		} else if(($current_time - $previous_time) < 1.5 * 60 * 60) {

+					$this->content = 'an hour ago';

+		} else if(($current_time - $previous_time) < 2.5 * 60 * 60) {

+					$this->content = 'two hours ago';

+		} else if(($current_time - $previous_time) < 3.5 * 60 * 60) {

+					$this->content = 'three hours ago';

+		} else if(($current_time - $previous_time) < 4.5 * 60 * 60) {

+					$this->content = 'few hours ago';

+		} else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'pm') {

+					$this->content = 'this afternoon';

+		} else if(($current_time - $previous_time) < 1 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) && date('a', $previous_time) == 'am') {

+					$this->content = 'this morning';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm' && date('G', $previous_time) >= 17) {

+					$this->content = 'yesterday evening';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'pm') {

+					$this->content = 'yesterday afternoon';

+		} else if(($current_time - $previous_time) < 2 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 1 && date('a', $previous_time) == 'am') {

+					$this->content = 'yesterday morning';

+		} else if(($current_time - $previous_time) < 3 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 2) {

+					$this->content = 'two days ago';

+		} else if(($current_time - $previous_time) < 4 * 24 * 60 * 60 && date('j', $current_time) == date('j', $previous_time) + 3) {

+					$this->content = 'three days ago';

+		} else if(($current_time - $previous_time) < 1 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time)) {

+					$this->content = 'earlier this week';

+		} else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1 && date('w', $previous_time) >= 3) {

+					$this->content = 'late last week';

+		} else if(($current_time - $previous_time) < 2 * 7 * 24 * 60 * 60 && date('W', $current_time) == date('W', $previous_time) + 1) {

+					$this->content = 'early last week';

+		} else if(($current_time - $previous_time) < 3 * 7 * 24 * 60 * 60) {

+					$this->content = 'few weeks ago';

+		} else if(($current_time - $previous_time) < 1.25* 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time)) {

+					$this->content = 'earlier this month';

+		} else if(($current_time - $previous_time) < 2 * 4 * 7 * 24 * 60 * 60 && date('n', $current_time) == date('n', $previous_time) + 1) {

+					$this->content = 'last month';

+		} else if(($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60) {

+					$this->content = 'several months ago';

+		} else {

+					$this->content = 'long ago';

+		}

 	}
 
 }
\ No newline at end of file

utility/content/CleanCommentContent.class.inc.php

Braces +6 added lines, -4 removed lines

@@ -40,8 +40,9 @@ 
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{
@@ -79,8 +80,9 @@ 
 	{
 		$match_count = preg_match_all($pattern, $this->content, $matches, PREG_SET_ORDER);
 		
-		if($match_count < 1)
-			return;
+		if($match_count < 1) {

+					return;

+		}

 		
 		foreach($matches as $match)
 		{

utility/Validate.class.inc.php

Braces +27 added lines, -18 removed lines

@@ -11,40 +11,47 @@ 
 
 	public static function isBoolean($value, $strict = false)
 	{
-		if($strict && ($value === true || $value === false))
-			return true;
-		if(!$strict && ((bool) $value === true || (bool) $value === false))
-			return true;
+		if($strict && ($value === true || $value === false)) {

+					return true;

+		}

+		if(!$strict && ((bool) $value === true || (bool) $value === false)) {

+					return true;

+		}

 		return false;
 	}
 
 	public static function isDate($value)
 	{
-		if(strtotime($value) !== -1)
-			return true;
-		if(date('y', $value) !== false)
-			return true;
+		if(strtotime($value) !== -1) {

+					return true;

+		}

+		if(date('y', $value) !== false) {

+					return true;

+		}

 		return false;
 	}
 
 	public static function isInteger($value, $strict = false)
 	{
-		if($strict)
-			return is_int($value);
+		if($strict) {

+					return is_int($value);

+		}

 		return (int) $value == $value;
 	}
 
 	public static function isIP($value)
 	{
-		if(self::isInteger(ip2long($value)))
-			return true;
+		if(self::isInteger(ip2long($value))) {

+					return true;

+		}

 		return false;
 	}
 
 	public static function isString($value, $strict = false)
 	{
-		if($strict)
-			return is_string($value);
+		if($strict) {

+					return is_string($value);

+		}

 		return (string) $value == $value;
 	}
 
@@ -67,8 +74,9 @@ 
 	private static function check_value($pattern, $string)
 	{
 		preg_match($pattern, $string, $matches);
-		if(empty($matches))
-			return false;
+		if(empty($matches)) {

+					return false;

+		}

 		return $matches[0] == $string;
 	}
 
@@ -84,8 +92,9 @@ 
 			break;
 		}
 		
-		if($value == false)
-			return false;
+		if($value == false) {

+					return false;

+		}

 		
 		switch($validation)
 		{

utility/Request.class.inc.php

Braces +12 added lines, -8 removed lines

@@ -20,8 +20,9 @@ 
 	{
 		if($key)
 		{
-			if(isset(self::$server[$key]))
-				return self::$server[$key];
+			if(isset(self::$server[$key])) {

+							return self::$server[$key];

+			}

 			return false;
 		}
 		return self::$server;
@@ -29,8 +30,9 @@ 
 
 	static function isAjax()
 	{
-		if(self::getServer(self::$AJAX_REQUEST))
-			return true;
+		if(self::getServer(self::$AJAX_REQUEST)) {

+					return true;

+		}

 		return false;
 	}
 
@@ -38,8 +40,9 @@ 
 	{
 		if($key)
 		{
-			if(isset(self::$get[$key]))
-				return self::$get[$key];
+			if(isset(self::$get[$key])) {

+							return self::$get[$key];

+			}

 			return false;
 		}
 		return self::$get;
@@ -49,8 +52,9 @@ 
 	{
 		if($key)
 		{
-			if(isset(self::$post[$key]))
-				return self::$post[$key];
+			if(isset(self::$post[$key])) {

+							return self::$post[$key];

+			}

 			return false;
 		}
 		return self::$post;

controller/lifestream/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/home/ContactController.class.inc.php

Braces +12 added lines, -8 removed lines

@@ -33,17 +33,21 @@
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
-			return (object) array('display' => 'normal');
+		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') {

+					return (object) array('display' => 'normal');

+		}

 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_result['message'] = 'please write a message';
+		if(!Validate::checkRequest('post', 'name', 'string')) {

+					$error_result['name'] = 'please enter your name';

+		}

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

+					$error_result['email'] = 'please enter a valid email';

+		}

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

+					$error_result['message'] = 'please write a message';

+		}

 		
 		$values = (object) array(
 			'name' => Request::getPost('name'),