jacobemerick / web

controller/site/ChangelogController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		Loader::load('collector', 'data/ChangelogCollector');
 		$changelog_result = ChangelogCollector::getLast20Changes();
 		
-		foreach($changelog_result as $change)
+		foreach ($changelog_result as $change)
 		{
 			$changelog[] = (object) array(
 				'date' => (object) array(

utility/cookie/CommenterCookie.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -6,8 +6,8 @@
 {
 
 	private static $COOKIE_NAME			= 'commenter';
-	private static $COOKIE_DURATION		= 31536000; // one year
-	private static $COOKIE_DOMAIN		= 'jacobemerick.com';
+	private static $COOKIE_DURATION = 31536000; // one year
+	private static $COOKIE_DOMAIN = 'jacobemerick.com';
 	private static $COOKIE_PATH			= '/';
 
 	protected function getName()

utility/Cookie.class.inc.php

Spacing +12 added lines, -12 removed lines

@@ -21,7 +21,7 @@ 
 
 	public function setValue($value)
 	{
-		if(!$this->is_loaded)
+		if (!$this->is_loaded)
 			$this->load();
 		
 		$this->value = $value;
@@ -30,7 +30,7 @@ 
 
 	public function getValue()
 	{
-		if(!$this->is_loaded)
+		if (!$this->is_loaded)
 			$this->load();
 		return $this->value;
 	}
@@ -42,7 +42,7 @@ 
 
 	public function exists()
 	{
-		if(!$this->is_loaded)
+		if (!$this->is_loaded)
 			$this->load();
 		return $this->exists;
 	}
@@ -50,10 +50,10 @@ 
 	private final function load()
 	{
 		$name = $this->getName();
-		if(isset($_COOKIE[$name]))
+		if (isset($_COOKIE[$name]))
 			$value = $_COOKIE[$name];
 		
-		if(isset($value))
+		if (isset($value))
 		{
 			$this->value = $value;
 			$this->exists = true;
@@ -66,13 +66,13 @@ 
 
 	public final function save()
 	{
-		if(!$this->check_values())
+		if (!$this->check_values())
 		{
 			Debugger::error('Attempt to create a cookie without all of the values being set!');
 			return false;
 		}
 		
-		if(!$this->set_cookie())
+		if (!$this->set_cookie())
 		{
 			Debugger::log('There was a problem saving the cookie.');
 			return false;
@@ -84,23 +84,23 @@ 
 	private final function check_values()
 	{
 		$name = $this->getName();
-		if(empty($name) || strlen($name) < 1)
+		if (empty($name) || strlen($name) < 1)
 			return false;
 		
 		$value = $this->getValue();
-		if(!isset($value) || strlen($value) < 1)
+		if (!isset($value) || strlen($value) < 1)
 			return false;
 		
 		$expiration = $this->getExpiration();
-		if(!isset($expiration) || !is_int($expiration))
+		if (!isset($expiration) || !is_int($expiration))
 			return false;
 		
 		$domain = $this->getDomain();
-		if(!isset($domain) || strlen($domain) < 1)
+		if (!isset($domain) || strlen($domain) < 1)
 			return false;
 		
 		$path = $this->getPath();
-		if(!isset($path) || strlen($path) < 1)
+		if (!isset($path) || strlen($path) < 1)
 			return false;
 		
 		return true;

utility/content/MarkupCodeContent.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@ 
 	protected function execute($title = '')
 	{
 		preg_match_all(self::$MARKUP_DELIMITER, $this->content, $matches);
-		if(count($matches[1]) == 0)
+		if (count($matches[1]) == 0)
 			return;
 		
-		foreach($matches[3] as $key => $match)
+		foreach ($matches[3] as $key => $match)
 		{
 			$replacement = $match;
 			$replacement = $this->wrap_in_list($replacement);
@@ -29,7 +29,7 @@ 
 	{
 		$content_array = explode("\n", $content);
 		
-		foreach($content_array as $key => $row)
+		foreach ($content_array as $key => $row)
 		{
 			$new_row = ($key % 2 == 0) ? '<li class="even">' : '<li class="odd">';
 			$new_row .= '<p>';
@@ -46,7 +46,7 @@ 
 
 	private function highlight_code($content, $type)
 	{
-		switch($type)
+		switch ($type)
 		{
 			default :
 				return $content;

utility/content/FixInternalLinkContent.class.inc.php

Spacing +8 added lines, -8 removed lines

@@ -12,9 +12,9 @@ 
 	protected function execute($is_absolute = true)
 	{
 		preg_match_all(self::$LINK_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
+		foreach ($matches[1] as $key => $match)
 		{
-			if(isset($matches[3][$key]))
+			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);
@@ -29,19 +29,19 @@ 
 		
 		$link = '';
 		
-		switch($type)
+		switch ($type)
 		{
 			case 'blog' :
 				Loader::load('collector', 'blog/PostCollector');
 				$post = PostCollector::getPostByURI($uri);
 				
-				if($post === NULL)
+				if ($post === NULL)
 					return;
 				
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
 				$link .= "{$post->category}/{$post->path}/";
 				
-				if($anchor == '')
+				if ($anchor == '')
 					$anchor = $post->title;
 				
 				break;
@@ -49,7 +49,7 @@ 
 				$link .= ($is_absolute) ? Loader::getRootURL('blog') : '/';
 				$link .= "tag/{$uri}/";
 				
-				if($anchor == '')
+				if ($anchor == '')
 				{
 					$anchor = $uri;
 					$anchor = str_replace('-', ' ', $anchor);
@@ -61,13 +61,13 @@ 
 				Loader::load('collector', 'waterfall/LogCollector');
 				$log = LogCollector::getByAlias($uri);
 				
-				if($log === NULL)
+				if ($log === NULL)
 					return;
 				
 				$link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/';
 				$link .= "journal/{$log->alias}/";
 				
-				if($anchor == '')
+				if ($anchor == '')
 					$anchor = $log->title;
 				
 				break;

utility/content/FixPhotoContent.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -12,7 +12,7 @@ 
 	protected function execute($is_absolute = false, $size = 'medium')
 	{
 		preg_match_all(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $matches);
-		foreach($matches[1] as $key => $match)
+		foreach ($matches[1] as $key => $match)
 		{
 			$photo_content = $this->get_photo_content($match, $size, $is_absolute);
 			$this->content = str_replace($matches[0][$key], $photo_content, $this->content);
@@ -37,7 +37,7 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
+		if ($photo_result == false)
 			return '';
 		
 		$height = $file_size[1];
@@ -49,7 +49,7 @@ 
         }
 		
 		$domain = '/';
-		if($is_absolute)
+		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

Spacing +28 added lines, -28 removed lines

@@ -10,61 +10,61 @@
 		$previous_time = strtotime($this->content);
 		$current_time = time();
 		
-		if($current_time <= $previous_time)
+		if ($current_time <= $previous_time)
 			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 30)
+		else if (($current_time - $previous_time) < 30)
 			$this->content = 'few seconds ago';
-		else if(($current_time - $previous_time) < 1.5 * 60)
+		else if (($current_time - $previous_time) < 1.5 * 60)
 			$this->content = 'a minute ago';
-		else if(($current_time - $previous_time) < 4 * 60)
+		else if (($current_time - $previous_time) < 4 * 60)
 			$this->content = 'few minutes ago';
-		else if(($current_time - $previous_time) < 7 * 60)
+		else if (($current_time - $previous_time) < 7 * 60)
 			$this->content = 'five minutes ago';
-		else if(($current_time - $previous_time) < 12 * 60)
+		else if (($current_time - $previous_time) < 12 * 60)
 			$this->content = 'ten minutes ago';
-		else if(($current_time - $previous_time) < 17 * 60)
+		else if (($current_time - $previous_time) < 17 * 60)
 			$this->content = 'fifteen minutes ago';
-		else if(($current_time - $previous_time) < 22 * 60)
+		else if (($current_time - $previous_time) < 22 * 60)
 			$this->content = 'twenty minutes ago';
-		else if(($current_time - $previous_time) < 37 * 60)
+		else if (($current_time - $previous_time) < 37 * 60)
 			$this->content = 'half hour ago';
-		else if(($current_time - $previous_time) < 52 * 60)
+		else if (($current_time - $previous_time) < 52 * 60)
 			$this->content = 'forty-five minutes ago';
-		else if(($current_time - $previous_time) < 1.5 * 60 * 60)
+		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)
+		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)
+		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)
+		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')
+		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')
+		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)
+		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')
+		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')
+		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)
+		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)
+		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))
+		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)
+		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)
+		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)
+		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))
+		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)
+		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)
+		else if (($current_time - $previous_time) < 4 * 4 * 7 * 24 * 60 * 60)
 			$this->content = 'several months ago';
 		else
 			$this->content = 'long ago';

utility/content/FetchFirstPhotoContent.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 
 	protected function execute($is_absolute = false, $size = 'thumb')
 	{
-		if(preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
+		if (preg_match(self::$PHOTO_PLACEHOLDER_MATCH, $this->content, $match) === 1)
 			$this->content = $this->get_thumb($match[1], $is_absolute, $size);
 		else
 			$this->content = self::$DEFAULT_RETURN;
@@ -34,7 +34,7 @@ 
 		
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::fetchRow($category, $photo);
-		if($photo_result == false)
+		if ($photo_result == false)
 			return '';
 		
 		$height = $file_size[1];
@@ -42,7 +42,7 @@ 
 		$description = $photo_result->description;
 		
 		$domain = '/';
-		if($is_absolute)
+		if ($is_absolute)
 			$domain = Loader::getRootUrl();
 		
 		return sprintf(self::$IMAGE_NODE, $domain, $category, $photo, $size, $extension, $height, $width, $description);

utility/Validate.class.inc.php

Spacing +11 added lines, -11 removed lines

@@ -11,39 +11,39 @@ 
 
 	public static function isBoolean($value, $strict = false)
 	{
-		if($strict && ($value === true || $value === false))
+		if ($strict && ($value === true || $value === false))
 			return true;
-		if(!$strict && ((bool) $value === true || (bool) $value === false))
+		if (!$strict && ((bool) $value === true || (bool) $value === false))
 			return true;
 		return false;
 	}
 
 	public static function isDate($value)
 	{
-		if(strtotime($value) !== -1)
+		if (strtotime($value) !== -1)
 			return true;
-		if(date('y', $value) !== false)
+		if (date('y', $value) !== false)
 			return true;
 		return false;
 	}
 
 	public static function isInteger($value, $strict = false)
 	{
-		if($strict)
+		if ($strict)
 			return is_int($value);
 		return (int) $value == $value;
 	}
 
 	public static function isIP($value)
 	{
-		if(self::isInteger(ip2long($value)))
+		if (self::isInteger(ip2long($value)))
 			return true;
 		return false;
 	}
 
 	public static function isString($value, $strict = false)
 	{
-		if($strict)
+		if ($strict)
 			return is_string($value);
 		return (string) $value == $value;
 	}
@@ -67,14 +67,14 @@ 
 	private static function check_value($pattern, $string)
 	{
 		preg_match($pattern, $string, $matches);
-		if(empty($matches))
+		if (empty($matches))
 			return false;
 		return $matches[0] == $string;
 	}
 
 	public static function checkRequest($type, $key, $validation, $strict = false)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'server':
 				$value = Request::getServer($key);
@@ -84,10 +84,10 @@ 
 			break;
 		}
 		
-		if($value == false)
+		if ($value == false)
 			return false;
 		
-		switch($validation)
+		switch ($validation)
 		{
 			case 'boolean':
 				return self::isBoolean($value, $strict);