jacobemerick / web

utility/Database.class.inc.php

Spacing +9 added lines, -9 removed lines

@@ -36,7 +36,7 @@ 
 		$mysqli = new mysqli($host, $username, $password);
 		
 		$has_connection_error = $mysqli->connect_error;
-		if(isset($has_connection_error))
+		if (isset($has_connection_error))
 			$this->has_connection_error = true;
 		
 		return $mysqli;
@@ -44,7 +44,7 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance)) {
+		if (!isset(self::$instance)) {
             global $config;
             self::$instance = new Database(
                 $config->database->master,
@@ -63,11 +63,11 @@ 
 	public static function select($query)
 	{
 		$start = microtime(true);
-		if($result = self::instance()->read_connection->query($query))
+		if ($result = self::instance()->read_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			$array = array();
-			while($row = $result->fetch_object())
+			while ($row = $result->fetch_object())
 				$array[] = $row;
 			$result->close();
 			return $array;
@@ -79,7 +79,7 @@ 
 	public static function selectRow($query)
 	{
 		$result = self::select($query);
-		if(is_array($result))
+		if (is_array($result))
 			return array_pop($result);
 		return false;
 	}
@@ -87,7 +87,7 @@ 
 	public static function execute($query)
 	{
 		$start = microtime(true);
-		if(self::instance()->write_connection->query($query))
+		if (self::instance()->write_connection->query($query))
 		{
 			self::instance()->log_query($query, $start);
 			return true;
@@ -99,7 +99,7 @@ 
 	public static function lastInsertID()
 	{
 		$id = self::instance()->write_connection->insert_id;
-		if($id == 0)
+		if ($id == 0)
 			return false;
 		return $id;
 	}
@@ -119,7 +119,7 @@ 
 	private function gather_query_data()
 	{
 		$query_data = array();
-		foreach($this->query_log as $query)
+		foreach ($this->query_log as $query)
 		{
 			$query = self::explain($query);
 			$query_data[] = $query;
@@ -131,7 +131,7 @@ 
 	{
 		$sql = 'EXPLAIN ' . $query['sql'];
 		
-		if($result = self::instance()->read_connection->query($sql))
+		if ($result = self::instance()->read_connection->query($sql))
 		{
 			$row = $result->fetch_assoc();
 			$query['explain'] = $row;

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/URLDecode.class.inc.php

Spacing +8 added lines, -8 removed lines

@@ -15,11 +15,11 @@ 
 	static private function form_url_array($host, $uri)
 	{
 		$uri = substr($uri, 1);
-		if(strpos($uri, '?'))
+		if (strpos($uri, '?'))
 			$uri = substr($uri, 0, strpos($uri, '?'));
 		$uri_array = explode('/', $uri);
 		
-		if(!Loader::isLive())
+		if (!Loader::isLive())
 			$host = substr($host, strpos($host, '.') + 1);
 		
 		self::$array['host'] = $host;
@@ -33,7 +33,7 @@ 
 		self::$array['base'] = 'http://' . (!Loader::isLive() ? 'dev.' : '') . $host . '/';
 		self::$array['uri'] = '/' . implode('/', $uri_array);
 		
-		if(end($uri_array) == '')
+		if (end($uri_array) == '')
 			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);
 		self::$array['pieces'] = (array) $uri_array;
 	}
@@ -61,21 +61,21 @@ 
 	static function getExtension()
 	{
 		$file = self::getPiece(-1);
-		if(substr($file, -1) == '/')
+		if (substr($file, -1) == '/')
 			return false;
-		return substr($file, strrpos($file, '.') + 1);;
+		return substr($file, strrpos($file, '.') + 1); ;
 	}
 
 	static function getPiece($piece = null)
 	{
-		if(!$piece)
+		if (!$piece)
 			return self::$array['pieces'];
 		
-		if($piece == -1)
+		if ($piece == -1)
 			return end(self::$array['pieces']);
 		
 		$piece = $piece - 1;
-		if(array_key_exists($piece, self::$array['pieces']))
+		if (array_key_exists($piece, self::$array['pieces']))
 			return self::$array['pieces'][$piece];
 		return;
 	}

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/SmartTrimContent.class.inc.php

Spacing +13 added lines, -13 removed lines

@@ -27,20 +27,20 @@ 
 	protected function execute()
 	{
 		$args = func_get_args();
-		if(count($args) < 1)
+		if (count($args) < 1)
 		{
 			trigger_error('Someone called SmartTrimContent w/o defining a length... bad!');
 			return;
 		}
 		
-		if(count($args) == 2)
+		if (count($args) == 2)
 			$etc = $args[1];
 		else
 			$etc = self::$ETC;
 		
 		$length = $args[0];
 		
-		if($length < strlen($this->content))
+		if ($length < strlen($this->content))
 			$this->trim_string($length);
         else
             $etc = '';
@@ -54,7 +54,7 @@ 
 		
 		$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)
+		if ($last_left_bracket_position > $last_right_bracket_position)
 			$content = substr($content, 0, $last_left_bracket_position);
 		$content = trim($content);
 		
@@ -73,16 +73,16 @@ 
 		$content = current($content);
 		
 		$max_length = $length;
-		foreach($matches[0] as $match)
+		foreach ($matches[0] as $match)
 		{
 			$max_length += strlen($match[0]);
-			if($max_length <= $match[1])
+			if ($max_length <= $match[1])
 				break;
 			
 			$content = substr($content, 0, $match[1]) . $match[0] . substr($content, $match[1]);
 		}
 		
-		if(substr($content, -7) == '</p><p>')
+		if (substr($content, -7) == '</p><p>')
 			$content = substr($content, 0, -7);
 		
 		return $content;
@@ -94,7 +94,7 @@ 
 		$tags_preg = $this->get_tags_preg(self::$EXCLUDE_TAGS);
 		preg_match_all($tags_preg, $content, $matches, PREG_OFFSET_CAPTURE);
 		
-		if(count($matches[1]) % 2 == 1)
+		if (count($matches[1]) % 2 == 1)
 		{
 			$cut_tag = end($matches[1]);
 			$cut_tag_position = $cut_tag[1] - 1;
@@ -112,9 +112,9 @@ 
 		preg_match_all($tags_preg, $content, $matches);
 		$open_tags = array();
 		
-		foreach($matches[1] as $tag)
+		foreach ($matches[1] as $tag)
 		{
-			if(in_array($tag, $open_tags))
+			if (in_array($tag, $open_tags))
 			{
 				$key = array_search($tag, $open_tags);
 				unset($open_tags[$key]);
@@ -124,11 +124,11 @@ 
 		}
 		
 		$open_tags = array_reverse($open_tags);
-		if(count($open_tags) > 0)
+		if (count($open_tags) > 0)
 		{
-			foreach($open_tags as $key => $open_tag)
+			foreach ($open_tags as $key => $open_tag)
 			{
-				if($key == count($open_tags) - 1)
+				if ($key == count($open_tags) - 1)
 					$content .= $etc;
 				$content .= "</{$open_tag}>";
 			}

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';