jacobemerick / web

router/mymap.php

Spacing +1 added lines, -1 removed lines

@@ -20,6 +20,6 @@
 	)

 );

 

-Router::route($redirect,$direct);

+Router::route($redirect, $direct);

 

 ?>
\ No newline at end of file

utility/CronController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 		{

 			//if(!$this->time_to_run($frequency))

 			//	continue;

-            if ($cron != 'TwitterCron') continue;

+			if ($cron != 'TwitterCron') continue;

 			

 			Loader::load('utility', "cron/{$cron}");

 			$reflection = new ReflectionClass($cron);

Spacing +6 added lines, -6 removed lines

@@ -22,7 +22,7 @@ 
 

 	public function activate()

 	{

-		foreach(self::$CRON_ARRAY as $cron => $frequency)

+		foreach (self::$CRON_ARRAY as $cron => $frequency)

 		{

 			//if(!$this->time_to_run($frequency))

 			//	continue;

@@ -49,19 +49,19 @@ 
 		$operator = explode(' ', $frequency);

 		list($time['minute'], $time['hour'], $time['day'], $time['month'], $time['weekday']) = $operator;

 		

-		foreach($time as $key => $value)

+		foreach ($time as $key => $value)

 		{

-			if($value == '*')

+			if ($value == '*')

 				continue;

-			if(stristr($value, '/'))

+			if (stristr($value, '/'))

 			{

 				$value = substr($value, 2);

-				if($cur[$key] % $value == 0)

+				if ($cur[$key] % $value == 0)

 					continue;

 				else

 					return;

 			}

-			if($cur[$key] == $value)

+			if ($cur[$key] == $value)

 				continue;

 			return;

 		}

Braces +14 added lines, -9 removed lines

@@ -26,7 +26,9 @@ 
 		{

 			//if(!$this->time_to_run($frequency))

 			//	continue;

-            if ($cron != 'TwitterCron') continue;

+            if ($cron != 'TwitterCron') {

+            	continue;

+            }

 			

 			Loader::load('utility', "cron/{$cron}");

 			$reflection = new ReflectionClass($cron);

@@ -51,18 +53,21 @@ 
 		

 		foreach($time as $key => $value)

 		{

-			if($value == '*')

-				continue;

+			if($value == '*') {

+							continue;

+			}

 			if(stristr($value, '/'))

 			{

 				$value = substr($value, 2);

-				if($cur[$key] % $value == 0)

-					continue;

-				else

-					return;

+				if($cur[$key] % $value == 0) {

+									continue;

+				} else {

+									return;

+				}

+			}

+			if($cur[$key] == $value) {

+							continue;

 			}

-			if($cur[$key] == $value)

-				continue;

 			return;

 		}

 		return true;

utility/Database.class.inc.php

Indentation +17 added lines, -17 removed lines

@@ -16,17 +16,17 @@ 
 

 	private function __construct($write_params, $read_params)

 	{

-        $this->write_connection = $this->connect(

-            $write_params->host,

-            $write_params->user,

-            $write_params->password

-        );

-

-        $this->read_connection = $this->connect(

-            $read_params->host,

-            $read_params->user,

-            $read_params->password

-        );

+		$this->write_connection = $this->connect(

+			$write_params->host,

+			$write_params->user,

+			$write_params->password

+		);

+

+		$this->read_connection = $this->connect(

+			$read_params->host,

+			$read_params->user,

+			$read_params->password

+		);

 

 		return $this;

 	}

@@ -45,12 +45,12 @@ 
 	public static function instance()

 	{

 		if(!isset(self::$instance)) {

-            global $config;

-            self::$instance = new Database(

-                $config->database->master,

-                $config->database->slave

-            );

-        }

+			global $config;

+			self::$instance = new Database(

+				$config->database->master,

+				$config->database->slave

+			);

+		}

 

 		return self::$instance;

 	}

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;

Braces +12 added lines, -8 removed lines

@@ -36,8 +36,9 @@ 
 		$mysqli = new mysqli($host, $username, $password);

 		

 		$has_connection_error = $mysqli->connect_error;

-		if(isset($has_connection_error))

-			$this->has_connection_error = true;

+		if(isset($has_connection_error)) {

+					$this->has_connection_error = true;

+		}

 		

 		return $mysqli;

 	}

@@ -67,8 +68,9 @@ 
 		{

 			self::instance()->log_query($query, $start);

 			$array = array();

-			while($row = $result->fetch_object())

-				$array[] = $row;

+			while($row = $result->fetch_object()) {

+							$array[] = $row;

+			}

 			$result->close();

 			return $array;

 		}

@@ -79,8 +81,9 @@ 
 	public static function selectRow($query)

 	{

 		$result = self::select($query);

-		if(is_array($result))

-			return array_pop($result);

+		if(is_array($result)) {

+					return array_pop($result);

+		}

 		return false;

 	}

 

@@ -99,8 +102,9 @@ 
 	public static function lastInsertID()

 	{

 		$id = self::instance()->write_connection->insert_id;

-		if($id == 0)

-			return false;

+		if($id == 0) {

+					return false;

+		}

 		return $id;

 	}

 

utility/Environment.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 

 	public function __construct($user_agent = null)

 	{

-		if(!isset($user_agent))

+		if (!isset($user_agent))

 			$user_agent = Request::getServer('HTTP_USER_AGENT');

 		$this->user_agent = $user_agent;

 	}

Braces +3 added lines, -2 removed lines

@@ -9,8 +9,9 @@
 

 	public function __construct($user_agent = null)

 	{

-		if(!isset($user_agent))

-			$user_agent = Request::getServer('HTTP_USER_AGENT');

+		if(!isset($user_agent)) {

+					$user_agent = Request::getServer('HTTP_USER_AGENT');

+		}

 		$this->user_agent = $user_agent;

 	}

 

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;

Braces +20 added lines, -16 removed lines

@@ -52,18 +52,20 @@ 
 

 	public function setSize($size)

 	{

-		if($this->get_version() > 1)

-			$position = strrpos($this->file, '-v');

-		else

-			$position = strrpos($this->file, '.');

+		if($this->get_version() > 1) {

+					$position = strrpos($this->file, '-v');

+		} else {

+					$position = strrpos($this->file, '.');

+		}

 		

 		$this->file = substr($this->file, 0, $position) . '-s' . $size . substr($this->file, $position);

 	}

 

 	public function getDimensions()

 	{

-		if(!$this->isValid())

-			return false;

+		if(!$this->isValid()) {

+					return false;

+		}

 		$imageinfo = getimagesize($this->getInternalPath());

 		return array($imageinfo[0], $imageinfo[1]);

 	}

@@ -85,10 +87,11 @@ 
 

 	private function get_image($image)

 	{

-		if(preg_match(self::$VERSION_PREG_MATCH, $image))

-			return preg_replace(self::$VERSION_PREG_MATCH, '', $image);

-		else

-			return $image;

+		if(preg_match(self::$VERSION_PREG_MATCH, $image)) {

+					return preg_replace(self::$VERSION_PREG_MATCH, '', $image);

+		} else {

+					return $image;

+		}

 	}

 

 	private function get_image_meta($image)

@@ -103,9 +106,9 @@ 
 		{

 			$position = strrpos($image, '.');

 			return substr($image, 0, $position) . '-v' . $this->get_version() . substr($image, $position);

+		} else {

+					return $image;

 		}

-		else

-			return $image;

 	}

 

 	private $version;

@@ -118,10 +121,11 @@ 
 			if(count($files) > 0)

 			{

 				preg_match(self::$VERSION_PREG_MATCH, $files[0], $matches);

-				if(count($matches))

-					$this->version = $matches[1];

-				else

-					$this->version = 1;

+				if(count($matches)) {

+									$this->version = $matches[1];

+				} else {

+									$this->version = 1;

+				}

 			}

 		}

 		return $this->version;

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

Braces +6 added lines, -4 removed lines

@@ -42,8 +42,9 @@ 
 		foreach($this->result as $row)

 		{

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

-			if($weight > 0)

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

+			if($weight > 0) {

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

+			}

 		}

 		arsort($weighted_array);

 		

@@ -52,8 +53,9 @@ 
 		{

 			foreach($this->result as $row)

 			{

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

-					$final_array[] = $row;

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

+									$final_array[] = $row;

+				}

 			}

 		}

 		return $final_array;

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

Braces +12 added lines, -8 removed lines

@@ -26,8 +26,9 @@ 
 

 	public static function instance()

 	{

-		if(!isset(self::$instance))

-			self::$instance = new Visitor();

+		if(!isset(self::$instance)) {

+					self::$instance = new Visitor();

+		}

 		return self::$instance;

 	}

 

@@ -35,8 +36,9 @@ 
 	public static function getBrowser()

 	{

 		Loader::load('utility', 'environment/BrowserEnvironment');

-		if(!isset(self::instance()->browser))

-			self::instance()->browser = new BrowserEnvironment();

+		if(!isset(self::instance()->browser)) {

+					self::instance()->browser = new BrowserEnvironment();

+		}

 		return self::instance()->browser;

 	}

 

@@ -44,8 +46,9 @@ 
 	public static function getPlatform()

 	{

 		Loader::load('utility', 'environment/PlatformEnvironment');

-		if(!isset(self::instance()->platform))

-			self::instance()->platform = new PlatformEnvironment();

+		if(!isset(self::instance()->platform)) {

+					self::instance()->platform = new PlatformEnvironment();

+		}

 		return self::instance()->platform;

 	}

 

@@ -53,8 +56,9 @@ 
 	public static function getIP()

 	{

 		Loader::load('utility', 'Request');

-		if(!isset(self::instance()->ip_address))

-			self::instance()->ip_address = Request::getServer('REMOTE_ADDR');

+		if(!isset(self::instance()->ip_address)) {

+					self::instance()->ip_address = Request::getServer('REMOTE_ADDR');

+		}

 		return self::instance()->ip_address;

 	}

 

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;

 	}

Braces +6 added lines, -4 removed lines

@@ -11,8 +11,9 @@ 
 		$is_acceptable = true;

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

 		{

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

-				$is_acceptable = false;

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

+							$is_acceptable = false;

+			}

 		}

 		return $is_acceptable;

 	}

@@ -20,8 +21,9 @@ 
 	private $unacceptableWords;

 	private function getUnacceptableWords()

 	{

-		if(!$this->unacceptableWords)

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

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

Braces +6 added lines, -4 removed lines

@@ -10,8 +10,9 @@ 
 

 	protected function execute()

 	{

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

-			return;

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

+					return;

+		}

 		

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

 		$parameters = func_get_args();

@@ -23,8 +24,9 @@ 
 		$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)

-			return;

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

+					return;

+		}

 		

 		foreach($matches as $match)

 		{