jacobemerick / web

utility/Environment.class.inc.php

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

Braces +9 added lines, -6 removed lines

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

 	private static function send($array, $gzip = true)

 	{

-		if($gzip)

-			self::start_gzipping();

+		if($gzip) {

+					self::start_gzipping();

+		}

 		

 		foreach($array as $row)

 		{

@@ -197,15 +198,17 @@ 
 

 	private static function get_date($timestamp = false)

 	{

-		if($timestamp == 0)

-			$timestamp = time();

+		if($timestamp == 0) {

+					$timestamp = time();

+		}

 		return gmdate('D, d M Y H:i:s \G\M\T', $timestamp);

 	}

 

 	private static function start_gzipping()

 	{

-		if(!ob_start('ob_gzhandler'))

-            ob_start();

+		if(!ob_start('ob_gzhandler')) {

+		            ob_start();

+		}

 	}

 

 }
\ No newline at end of file

utility/ImageOld.class.inc.php

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

Braces +17 added lines, -12 removed lines

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

 	public static function instance()

 	{

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

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

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

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

+		}

 		return self::$instance;

 	}

 

@@ -71,8 +72,9 @@ 
 

 	public static function getImagePath($type, $file)

 	{

-		if($type == 'photo')

-			$type = 'photo/processed';

+		if($type == 'photo') {

+					$type = 'photo/processed';

+		}

 		

 		$path = self::instance()->get_root();

 		$path .= 'images';

@@ -110,11 +112,13 @@ 
 		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')

-				continue;

+			if(in_array($file_path, self::instance()->get_included_files()) && $type !== 'view') {

+							continue;

+			}

 			

-			if(!file_exists($file_path))

-				Debugger::logMessage("Requested file does not exist: {$type}, {$file}");

+			if(!file_exists($file_path)) {

+							Debugger::logMessage("Requested file does not exist: {$type}, {$file}");

+			}

 			

 			self::instance()->add_included_file($file_path);

 			

@@ -163,10 +167,11 @@ 
 		

 		$reflectionObject = self::create_reflection_class($file);

 		

-		if($reflectionObject->hasMethod('__construct'))

-			return $reflectionObject->newInstanceArgs($data);

-		else

-			return $reflectionObject->newInstance();

+		if($reflectionObject->hasMethod('__construct')) {

+					return $reflectionObject->newInstanceArgs($data);

+		} else {

+					return $reflectionObject->newInstance();

+		}

 	}

 

 	public static function getRoot()

utility/Mail.class.inc.php

Braces +5 added lines, -4 removed lines

@@ -20,10 +20,11 @@
 

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

 	{

-		if($person)

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

-		else

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

+		if($person) {

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

+		} else {

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

+		}

 		return $this;

 	}

 

utility/Request.class.inc.php

Braces +12 added lines, -8 removed lines

@@ -20,8 +20,9 @@ 
 	{

 		if($key)

 		{

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

-				return self::$server[$key];

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

+							return self::$server[$key];

+			}

 			return false;

 		}

 		return self::$server;

@@ -29,8 +30,9 @@ 
 

 	static function isAjax()

 	{

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

-			return true;

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

+					return true;

+		}

 		return false;

 	}

 

@@ -38,8 +40,9 @@ 
 	{

 		if($key)

 		{

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

-				return self::$get[$key];

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

+							return self::$get[$key];

+			}

 			return false;

 		}

 		return self::$get;

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

 		if($key)

 		{

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

-				return self::$post[$key];

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

+							return self::$post[$key];

+			}

 			return false;

 		}

 		return self::$post;

utility/Search.class.inc.php

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

Braces +21 added lines, -14 removed lines

@@ -15,12 +15,14 @@ 
 	static private function form_url_array($host, $uri)

 	{

 		$uri = substr($uri, 1);

-		if(strpos($uri, '?'))

-			$uri = substr($uri, 0, strpos($uri, '?'));

+		if(strpos($uri, '?')) {

+					$uri = substr($uri, 0, strpos($uri, '?'));

+		}

 		$uri_array = explode('/', $uri);

 		

-		if(!Loader::isLive())

-			$host = substr($host, strpos($host, '.') + 1);

+		if(!Loader::isLive()) {

+					$host = substr($host, strpos($host, '.') + 1);

+		}

 		

 		self::$array['host'] = $host;

 		

@@ -33,8 +35,9 @@ 
 		self::$array['base'] = 'http://' . (!Loader::isLive() ? 'dev.' : '') . $host . '/';

 		self::$array['uri'] = '/' . implode('/', $uri_array);

 		

-		if(end($uri_array) == '')

-			$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);

+		if(end($uri_array) == '') {

+					$uri_array = array_slice($uri_array, 0, count($uri_array) - 1);

+		}

 		self::$array['pieces'] = (array) $uri_array;

 	}

 

@@ -61,22 +64,26 @@ 
 	static function getExtension()

 	{

 		$file = self::getPiece(-1);

-		if(substr($file, -1) == '/')

-			return false;

+		if(substr($file, -1) == '/') {

+					return false;

+		}

 		return substr($file, strrpos($file, '.') + 1);;

 	}

 

 	static function getPiece($piece = null)

 	{

-		if(!$piece)

-			return self::$array['pieces'];

+		if(!$piece) {

+					return self::$array['pieces'];

+		}

 		

-		if($piece == -1)

-			return end(self::$array['pieces']);

+		if($piece == -1) {

+					return end(self::$array['pieces']);

+		}

 		

 		$piece = $piece - 1;

-		if(array_key_exists($piece, self::$array['pieces']))

-			return self::$array['pieces'][$piece];

+		if(array_key_exists($piece, self::$array['pieces'])) {

+					return self::$array['pieces'][$piece];

+		}

 		return;

 	}

 

utility/Validate.class.inc.php

Braces +27 added lines, -18 removed lines

@@ -11,40 +11,47 @@ 
 

 	public static function isBoolean($value, $strict = false)

 	{

-		if($strict && ($value === true || $value === false))

-			return true;

-		if(!$strict && ((bool) $value === true || (bool) $value === false))

-			return true;

+		if($strict && ($value === true || $value === false)) {

+					return true;

+		}

+		if(!$strict && ((bool) $value === true || (bool) $value === false)) {

+					return true;

+		}

 		return false;

 	}

 

 	public static function isDate($value)

 	{

-		if(strtotime($value) !== -1)

-			return true;

-		if(date('y', $value) !== false)

-			return true;

+		if(strtotime($value) !== -1) {

+					return true;

+		}

+		if(date('y', $value) !== false) {

+					return true;

+		}

 		return false;

 	}

 

 	public static function isInteger($value, $strict = false)

 	{

-		if($strict)

-			return is_int($value);

+		if($strict) {

+					return is_int($value);

+		}

 		return (int) $value == $value;

 	}

 

 	public static function isIP($value)

 	{

-		if(self::isInteger(ip2long($value)))

-			return true;

+		if(self::isInteger(ip2long($value))) {

+					return true;

+		}

 		return false;

 	}

 

 	public static function isString($value, $strict = false)

 	{

-		if($strict)

-			return is_string($value);

+		if($strict) {

+					return is_string($value);

+		}

 		return (string) $value == $value;

 	}

 

@@ -67,8 +74,9 @@ 
 	private static function check_value($pattern, $string)

 	{

 		preg_match($pattern, $string, $matches);

-		if(empty($matches))

-			return false;

+		if(empty($matches)) {

+					return false;

+		}

 		return $matches[0] == $string;

 	}

 

@@ -84,8 +92,9 @@ 
 			break;

 		}

 		

-		if($value == false)

-			return false;

+		if($value == false) {

+					return false;

+		}

 		

 		switch($validation)

 		{