jacobemerick / web

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

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
 

 	public function setToAddress($email, $person = null)

 	{

-		if($person)

+		if ($person)

 			$this->to[] = "{$person} <{$email}>";

 		else

 			$this->to[] = "{$email}";

@@ -41,7 +41,7 @@ 
 

 	public function send()

 	{

-		if(!Loader::isLive())

+		if (!Loader::isLive())

 		{

 			Debugger::logMessage("Email Failed:\n\n{$this->message}");

 			return;

@@ -51,14 +51,14 @@ 
 		$subject = $this->subject;

 		$message = $this->message;

 		

-		if(empty($to) || empty($subject) || empty($message))

+		if (empty($to) || empty($subject) || empty($message))

 		{

 			Debugger::logMessage("Attempted to send an email without all of the required fields.");

 			return;

 		}

 		

 		$header = '';

-		foreach($this->headers as $key => $value)

+		foreach ($this->headers as $key => $value)

 		{

 			$header .= "{$key}: {$value}\r\n";

 		}

utility/Request.class.inc.php

Spacing +7 added lines, -7 removed lines

@@ -18,9 +18,9 @@ 
 

 	static function getServer($key = null)

 	{

-		if($key)

+		if ($key)

 		{

-			if(isset(self::$server[$key]))

+			if (isset(self::$server[$key]))

 				return self::$server[$key];

 			return false;

 		}

@@ -29,16 +29,16 @@ 
 

 	static function isAjax()

 	{

-		if(self::getServer(self::$AJAX_REQUEST))

+		if (self::getServer(self::$AJAX_REQUEST))

 			return true;

 		return false;

 	}

 

 	static function getGet($key = null)

 	{

-		if($key)

+		if ($key)

 		{

-			if(isset(self::$get[$key]))

+			if (isset(self::$get[$key]))

 				return self::$get[$key];

 			return false;

 		}

@@ -47,9 +47,9 @@ 
 

 	static function getPost($key = null)

 	{

-		if($key)

+		if ($key)

 		{

-			if(isset(self::$post[$key]))

+			if (isset(self::$post[$key]))

 				return self::$post[$key];

 			return false;

 		}

utility/Search.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -39,20 +39,20 @@ 
 	public function perform()

 	{

 		$weighted_array = array();

-		foreach($this->result as $row)

+		foreach ($this->result as $row)

 		{

 			$weight = $this->get_search_weight($row);

-			if($weight > 0)

+			if ($weight > 0)

 				$weighted_array[$row->id] = $weight;

 		}

 		arsort($weighted_array);

 		

 		$final_array = array();

-		foreach($weighted_array as $id => $weight)

+		foreach ($weighted_array as $id => $weight)

 		{

-			foreach($this->result as $row)

+			foreach ($this->result as $row)

 			{

-				if($row->id == $id)

+				if ($row->id == $id)

 					$final_array[] = $row;

 			}

 		}

@@ -62,7 +62,7 @@ 
 	private function get_search_weight($row)

 	{

 		$weight = 0;

-		foreach($this->weight as $weight_array)

+		foreach ($this->weight as $weight_array)

 		{

 			$text = $row->{$weight_array['field']};

 			$weight += $weight_array['weight'] * substr_count(strtolower($text), strtolower($this->query));

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/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);

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

Spacing +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@ 
 	protected function execute()

 	{

 		$is_acceptable = true;

-		foreach($this->getUnacceptableWords() as $unacceptableWord)

+		foreach ($this->getUnacceptableWords() as $unacceptableWord)

 		{

-			if(stristr($unacceptableWord->word, $this->content))

+			if (stristr($unacceptableWord->word, $this->content))

 				$is_acceptable = false;

 		}

 		return $is_acceptable;

@@ -20,7 +20,7 @@ 
 	private $unacceptableWords;

 	private function getUnacceptableWords()

 	{

-		if(!$this->unacceptableWords)

+		if (!$this->unacceptableWords)

 			$this->unacceptableWords = UnacceptableWordCollector::getWords();

 		return $this->unacceptableWords;

 	}

utility/content/AutolinkTwitterHashContent.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -10,12 +10,12 @@ 
 

 	protected function execute()

 	{

-		if(stristr($this->content, '#') === false)

+		if (stristr($this->content, '#') === false)

 			return;

 		

 		// yeah yeah, i'm currently ignoring the link, whatevs

 		$parameters = func_get_args();

-		if(count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))

+		if (count($parameters) > 1 || (count($parameters) == 1 && !is_array($parameters[0])))

 		{

 			trigger_error('Unexpected parameters passed into AutolinkTwitterHash!');

 			return;

@@ -23,10 +23,10 @@ 
 		$parameters = array_shift($parameters);

 		

 		$found_hash = preg_match_all(self::$HASH_PATTERN, $this->content, $matches, PREG_SET_ORDER);

-		if($found_hash === false || $found_hash === 0)

+		if ($found_hash === false || $found_hash === 0)

 			return;

 		

-		foreach($matches as $match)

+		foreach ($matches as $match)

 		{

 			$replacement = $this->get_replacement_link($match[1], $match[0]);

 			$this->content = str_replace($match[0], $replacement, $this->content);