jacobemerick / web

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

Spacing +10 added lines, -10 removed lines

@@ -17,14 +17,14 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
+		if (!isset(self::$instance))
 			self::$instance = new Loader();
 		return self::$instance;
 	}
 
 	private function get_root()
 	{
-		if(!isset($this->root))
+		if (!isset($this->root))
 		{
 			$current_directory = dirname(__FILE__);
 			$current_directory = substr($current_directory, 0, -7);
@@ -52,7 +52,7 @@ 
 
 	private static function get_extension($type)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'collector' :
 			case 'controller' :
@@ -71,7 +71,7 @@ 
 
 	public static function getImagePath($type, $file)
 	{
-		if($type == 'photo')
+		if ($type == 'photo')
 			$type = 'photo/processed';
 		
 		$path = self::instance()->get_root();
@@ -107,18 +107,18 @@ 
 
 	public static function load($type, $files, $data = array())
 	{
-		foreach((array) $files as $file)
+		foreach ((array) $files as $file)
 		{
 			$file_path = self::instance()->get_path($type, $file);
-			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
+			if (in_array($file_path, self::instance()->get_included_files()) && $type !== 'view')
 				continue;
 			
-			if(!file_exists($file_path))
+			if (!file_exists($file_path))
 				Debugger::logMessage("Requested file does not exist: {$type}, {$file}");
 			
 			self::instance()->add_included_file($file_path);
 			
-			switch($type)
+			switch ($type)
 			{
 				case 'images' :
 				case 'scripts' :
@@ -148,7 +148,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if(
+		if (
 			$reflectionObject->hasMethod('instance') &&
 			$reflectionObject->getMethod('instance')->isStatic())
 		{
@@ -163,7 +163,7 @@ 
 		
 		$reflectionObject = self::create_reflection_class($file);
 		
-		if($reflectionObject->hasMethod('__construct'))
+		if ($reflectionObject->hasMethod('__construct'))
 			return $reflectionObject->newInstanceArgs($data);
 		else
 			return $reflectionObject->newInstance();

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

Spacing +8 added lines, -8 removed lines

@@ -26,7 +26,7 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
+		if (!isset(self::$instance))
 			self::$instance = new Visitor();
 		return self::$instance;
 	}
@@ -35,7 +35,7 @@ 
 	public static function getBrowser()
 	{
 		Loader::load('utility', 'environment/BrowserEnvironment');
-		if(!isset(self::instance()->browser))
+		if (!isset(self::instance()->browser))
 			self::instance()->browser = new BrowserEnvironment();
 		return self::instance()->browser;
 	}
@@ -44,7 +44,7 @@ 
 	public static function getPlatform()
 	{
 		Loader::load('utility', 'environment/PlatformEnvironment');
-		if(!isset(self::instance()->platform))
+		if (!isset(self::instance()->platform))
 			self::instance()->platform = new PlatformEnvironment();
 		return self::instance()->platform;
 	}
@@ -53,7 +53,7 @@ 
 	public static function getIP()
 	{
 		Loader::load('utility', 'Request');
-		if(!isset(self::instance()->ip_address))
+		if (!isset(self::instance()->ip_address))
 			self::instance()->ip_address = Request::getServer('REMOTE_ADDR');
 		return self::instance()->ip_address;
 	}
@@ -79,7 +79,7 @@ 
 		Loader::loadInstance('utility', 'Database');
 		
 		$query = $this->get_tracking_query();
-		if(Database::execute($query) == true)
+		if (Database::execute($query) == true)
 		{
 			$this->raw_visit_log_id = Database::lastInsertID();
 			return true;
@@ -94,7 +94,7 @@ 
 		
 		$columns = '`';
 		$values = "'";
-		foreach(self::$tracking_field_array as $field_column => $server_array_key)
+		foreach (self::$tracking_field_array as $field_column => $server_array_key)
 		{
 			$value = Request::getServer($server_array_key);
 			$value = Database::escape($value);
@@ -103,7 +103,7 @@ 
 			$values .= "{$value}','";
 		}
 		
-		if(Request::hasPost())
+		if (Request::hasPost())
 		{
 			$value = Request::getPost();
 			$value = serialize($value);
@@ -121,7 +121,7 @@ 
 
 	private function track_response_error($code)
 	{
-		if(isset($this->raw_visit_log_id) && $this->raw_visit_log_id > 0)
+		if (isset($this->raw_visit_log_id) && $this->raw_visit_log_id > 0)
 		{
 			$query = "UPDATE `jpemeric_stat`.`raw_visit_log` SET `code` = '{$code}' WHERE `id` = '{$this->raw_visit_log_id}' LIMIT 1";
 			return Database::execute($query);

utility/ImageOld.class.inc.php

Spacing +8 added lines, -8 removed lines

@@ -52,7 +52,7 @@ 
 
 	public function setSize($size)
 	{
-		if($this->get_version() > 1)
+		if ($this->get_version() > 1)
 			$position = strrpos($this->file, '-v');
 		else
 			$position = strrpos($this->file, '.');
@@ -62,7 +62,7 @@ 
 
 	public function getDimensions()
 	{
-		if(!$this->isValid())
+		if (!$this->isValid())
 			return false;
 		$imageinfo = getimagesize($this->getInternalPath());
 		return array($imageinfo[0], $imageinfo[1]);
@@ -85,7 +85,7 @@ 
 
 	private function get_image($image)
 	{
-		if(preg_match(self::$VERSION_PREG_MATCH, $image))
+		if (preg_match(self::$VERSION_PREG_MATCH, $image))
 			return preg_replace(self::$VERSION_PREG_MATCH, '', $image);
 		else
 			return $image;
@@ -99,7 +99,7 @@ 
 
 	private function get_file($image)
 	{
-		if($this->get_version() > 1)
+		if ($this->get_version() > 1)
 		{
 			$position = strrpos($image, '.');
 			return substr($image, 0, $position) . '-v' . $this->get_version() . substr($image, $position);
@@ -111,14 +111,14 @@ 
 	private $version;
 	private function get_version()
 	{
-		if(!$this->version)
+		if (!$this->version)
 		{
-			$path = Loader::getRoot() .'/images/' . substr($this->image, 0, strrpos($this->image, '.')) . '*';
+			$path = Loader::getRoot() . '/images/' . substr($this->image, 0, strrpos($this->image, '.')) . '*';
 			$files = glob($path);
-			if(count($files) > 0)
+			if (count($files) > 0)
 			{
 				preg_match(self::$VERSION_PREG_MATCH, $files[0], $matches);
-				if(count($matches))
+				if (count($matches))
 					$this->version = $matches[1];
 				else
 					$this->version = 1;

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