jacobemerick / web

utility/Header.class.inc.php

Doc Comments +6 added lines

@@ -74,6 +74,9 @@ 
 		self::send($array);

 	}

 

+	/**
+	 * @param integer $timestamp
+	 */
 	public static function sendCSS($timestamp)

 	{

 		$array = array(

@@ -184,6 +187,9 @@ 
 		self::send($array);

 	}

 

+	/**
+	 * @param string[] $array
+	 */
 	private static function send($array, $gzip = true)

 	{

 		if($gzip)

Indentation +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
 	private static function start_gzipping()

 	{

 		if(!ob_start('ob_gzhandler'))

-            ob_start();

+			ob_start();

 	}

 

 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -186,10 +186,10 @@ 
 

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

 	{

-		if($gzip)

+		if ($gzip)

 			self::start_gzipping();

 		

-		foreach($array as $row)

+		foreach ($array as $row)

 		{

 			header($row, TRUE);

 		}

@@ -197,14 +197,14 @@ 
 

 	private static function get_date($timestamp = false)

 	{

-		if($timestamp == 0)

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

+		if (!ob_start('ob_gzhandler'))

             ob_start();

 	}

 

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

Doc Comments +10 added lines

@@ -69,6 +69,9 @@ 
 		return $extension;

 	}

 

+	/**
+	 * @param string $type
+	 */
 	public static function getImagePath($type, $file)

 	{

 		if($type == 'photo')

@@ -142,6 +145,10 @@ 
 		return new ReflectionClass($class_name);

 	}

 

+	/**
+	 * @param string $type
+	 * @param string $file
+	 */
 	public static function loadInstance($type, $file)

 	{

 		self::load($type, $file);

@@ -157,6 +164,9 @@ 
 		trigger_error("Requested class cannot be instance'd: {$type}, {$file}");

 	}

 

+	/**
+	 * @param string $type
+	 */
 	public static function loadNew($type, $file, $data = array())

 	{

 		self::load($type, $file);

Indentation +11 added lines, -11 removed lines

@@ -179,16 +179,16 @@
 		return self::instance()->is_live;

 	}

 

-    public static function getRootURL($site = '')

-    {

-        if (strlen($site) > 0) {

-            if ($site == 'waterfalls' && self::instance()->is_live) {

-                return 'http://www.waterfallsofthekeweenaw.com/';

-            } else {

-                return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';

-            }

-        }

-        return '/';

-    }

+	public static function getRootURL($site = '')

+	{

+		if (strlen($site) > 0) {

+			if ($site == 'waterfalls' && self::instance()->is_live) {

+				return 'http://www.waterfallsofthekeweenaw.com/';

+			} else {

+				return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/';

+			}

+		}

+		return '/';

+	}

 

 }
\ No newline at end of file

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

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

Doc Comments +9 added lines

@@ -18,6 +18,9 @@ 
 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";

 	}

 

+	/**
+	 * @param string $person
+	 */
 	public function setToAddress($email, $person = null)

 	{

 		if($person)

@@ -27,12 +30,18 @@ 
 		return $this;

 	}

 

+	/**
+	 * @param string $subject
+	 */
 	public function setSubject($subject)

 	{

 		$this->subject = $subject;

 		return $this;

 	}

 

+	/**
+	 * @param string $message
+	 */
 	public function setMessage($message)

 	{

 		$this->message = $message;

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 

 	public function __construct()

 	{

-        global $config;

+		global $config;

 		$this->headers['From'] = self::$FROM;

 		$this->headers['Reply-To'] = "Jacob <{$config->admin_email}>";

 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";

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

 		}

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

Doc Comments +6 added lines

@@ -18,6 +18,9 @@ 
 	private $console;

 	private $profile = array();

 

+	/**
+	 * @param Console $console
+	 */
 	public function __construct($console)

 	{

 		$this->start_time = self::getMicrotime();

@@ -128,6 +131,9 @@ 
 		return $time[1] + $time[0];

 	}

 

+	/**
+	 * @param integer $memory
+	 */
 	private function get_readable_memory_usage($memory)

 	{

 		foreach(self::$MEMORY_SIZE_ARRAY as $key => $memory_size)

Spacing +12 added lines, -12 removed lines

@@ -27,12 +27,12 @@ 
 	private function get_console_log()

 	{

 		$log = $this->console->getLog();

-		if(!isset($log['debugger_log']))

+		if (!isset($log['debugger_log']))

 			return;

 		

-		foreach($log['debugger_log'] as $key => $log_item)

+		foreach ($log['debugger_log'] as $key => $log_item)

 		{

-			switch($log_item['type'])

+			switch ($log_item['type'])

 			{

 				case 'log' :

 				case 'error' :

@@ -55,7 +55,7 @@ 
 		$included_files = $this->get_files();

 		$file_array = array();

 		

-		foreach($included_files as $file)

+		foreach ($included_files as $file)

 		{

 			$file_size = filesize($file);

 			$file_array[] = array(

@@ -74,11 +74,11 @@ 
 		$total_file_size = 0;

 		$largest_file_size = 0;

 		

-		foreach($included_files as $file)

+		foreach ($included_files as $file)

 		{

 			$file_size = filesize($file);

 			$total_file_size += $file_size;

-			if($file_size > $largest_file_size)

+			if ($file_size > $largest_file_size)

 				$largest_file_size = $file_size;

 		}

 		

@@ -130,15 +130,15 @@ 
 

 	private function get_readable_memory_usage($memory)

 	{

-		foreach(self::$MEMORY_SIZE_ARRAY as $key => $memory_size)

+		foreach (self::$MEMORY_SIZE_ARRAY as $key => $memory_size)

 		{

-			if($memory < 1024)

+			if ($memory < 1024)

 				break;

-			if(count(self::$MEMORY_SIZE_ARRAY) != $key + 1)

+			if (count(self::$MEMORY_SIZE_ARRAY) != $key + 1)

 				$memory /= 1024;

 		}

 		

-		if($memory_size == 'bytes')

+		if ($memory_size == 'bytes')

 			return sprintf('%01d %s', $memory, $memory_size);

 		return sprintf('%01.2f %s', $memory, $memory_size);

 	}

@@ -154,9 +154,9 @@ 
 

 	private function get_readable_time($time)

 	{

-		if($time >= 60000)

+		if ($time >= 60000)

 			return number_format(($time / 60000), 3, '.', '') . ' m';

-		else if($time >= 1000 && $time < 60000)

+		else if ($time >= 1000 && $time < 60000)

 			return number_format(($time / 1000), 3, '.', '') . ' s';

 		else

 			return number_format($time, 3, '.', '') . ' ms';

Braces +22 added lines, -16 removed lines

@@ -27,8 +27,9 @@ 
 	private function get_console_log()

 	{

 		$log = $this->console->getLog();

-		if(!isset($log['debugger_log']))

-			return;

+		if(!isset($log['debugger_log'])) {

+					return;

+		}

 		

 		foreach($log['debugger_log'] as $key => $log_item)

 		{

@@ -78,8 +79,9 @@ 
 		{

 			$file_size = filesize($file);

 			$total_file_size += $file_size;

-			if($file_size > $largest_file_size)

-				$largest_file_size = $file_size;

+			if($file_size > $largest_file_size) {

+							$largest_file_size = $file_size;

+			}

 		}

 		

 		return array(

@@ -132,14 +134,17 @@ 
 	{

 		foreach(self::$MEMORY_SIZE_ARRAY as $key => $memory_size)

 		{

-			if($memory < 1024)

-				break;

-			if(count(self::$MEMORY_SIZE_ARRAY) != $key + 1)

-				$memory /= 1024;

+			if($memory < 1024) {

+							break;

+			}

+			if(count(self::$MEMORY_SIZE_ARRAY) != $key + 1) {

+							$memory /= 1024;

+			}

 		}

 		

-		if($memory_size == 'bytes')

-			return sprintf('%01d %s', $memory, $memory_size);

+		if($memory_size == 'bytes') {

+					return sprintf('%01d %s', $memory, $memory_size);

+		}

 		return sprintf('%01.2f %s', $memory, $memory_size);

 	}

 

@@ -154,12 +159,13 @@ 
 

 	private function get_readable_time($time)

 	{

-		if($time >= 60000)

-			return number_format(($time / 60000), 3, '.', '') . ' m';

-		else if($time >= 1000 && $time < 60000)

-			return number_format(($time / 1000), 3, '.', '') . ' s';

-		else

-			return number_format($time, 3, '.', '') . ' ms';

+		if($time >= 60000) {

+					return number_format(($time / 60000), 3, '.', '') . ' m';

+		} else if($time >= 1000 && $time < 60000) {

+					return number_format(($time / 1000), 3, '.', '') . ' s';

+		} else {

+					return number_format($time, 3, '.', '') . ' ms';

+		}

 	}

 

 	private function collect_profile_array()

utility/Request.class.inc.php

Doc Comments +3 added lines

@@ -34,6 +34,9 @@
 		return false;

 	}

 

+	/**
+	 * @param string $key
+	 */
 	static function getGet($key = null)

 	{

 		if($key)

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;

 		}

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

Doc Comments +6 added lines

@@ -38,6 +38,9 @@ 
 		self::$array['pieces'] = (array) $uri_array;

 	}

 

+	/**
+	 * @return string
+	 */
 	static function getSite()

 	{

 		return self::$array['site'];

@@ -66,6 +69,9 @@ 
 		return substr($file, strrpos($file, '.') + 1);;

 	}

 

+	/**
+	 * @param integer $piece
+	 */
 	static function getPiece($piece = null)

 	{

 		if(!$piece)

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;

 	}

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

Doc Comments +5 added lines

@@ -72,6 +72,11 @@
 		return $matches[0] == $string;

 	}

 

+	/**
+	 * @param string $type
+	 * @param string $key
+	 * @param string $validation
+	 */
 	public static function checkRequest($type, $key, $validation, $strict = false)

 	{

 		switch($type)

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

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)

 		{

bootstrap.php

Indentation +20 added lines, -20 removed lines

@@ -7,7 +7,7 @@ 
 
 $handle = @fopen($configuration_path, 'r');
 if ($handle === false) {
-    throw new RuntimeException("Could not load configuration");
+	throw new RuntimeException("Could not load configuration");
 }
 $configuration = fread($handle, filesize($configuration_path));
 fclose($handle);
@@ -15,34 +15,34 @@ 
 $configuration = json_decode($configuration);
 $last_json_error = json_last_error();
 if ($last_json_error !== JSON_ERROR_NONE) {
-    throw new RuntimeException("Could not parse configuration - JSON error detected");
+	throw new RuntimeException("Could not parse configuration - JSON error detected");
 }
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
 $db_connections->setDefault(function () use ($configuration) {
-    $connection = $configuration->database->slave;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $configuration->database->slave;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setWrite('master', function () use ($configuration) {
-    $connection = $configuration->database->master;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $configuration->database->master;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setRead('slave', function () use ($configuration) {
-    $connection = $configuration->database->slave;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $configuration->database->slave;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 
 // setup the service locator

Spacing +3 added lines, -3 removed lines

@@ -20,7 +20,7 @@ 
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
-$db_connections->setDefault(function () use ($configuration) {
+$db_connections->setDefault(function() use ($configuration) {
     $connection = $configuration->database->slave;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -28,7 +28,7 @@ 
         $connection->password
     );
 });
-$db_connections->setWrite('master', function () use ($configuration) {
+$db_connections->setWrite('master', function() use ($configuration) {
     $connection = $configuration->database->master;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -36,7 +36,7 @@ 
         $connection->password
     );
 });
-$db_connections->setRead('slave', function () use ($configuration) {
+$db_connections->setRead('slave', function() use ($configuration) {
     $connection = $configuration->database->slave;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",

collector/waterfall/WatercourseCollector.class.inc.php

Indentation +3 added lines, -3 removed lines

@@ -153,9 +153,9 @@
 		return self::run_query($query);

 	}

 

-    public static function getParentWatercourse($watercourse)

-    {

-    }

+	public static function getParentWatercourse($watercourse)

+	{

+	}

 

 	public static function getLogCountForWatercourse($watercourse)

 	{