jacobemerick / web

controller/portfolio/PieceController.class.inc.php

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
 		Loader::load('collector', 'portfolio/PortfolioCollector');
 		$portfolio_result = PortfolioCollector::getPieceByURI($this->title_url);
 		
-		if($portfolio_result === null)
+		if ($portfolio_result === null)
 			$this->eject();
 		
 		$portfolio_image_result = PortfolioCollector::getImagesForPiece($portfolio_result->id, 2);
@@ -51,7 +51,7 @@ 
 		$main_image->width = $dimensions[0];
 		$main_image->height = $dimensions[1];
 		
-		foreach($portfolio_image_result as $portfolio_image)
+		foreach ($portfolio_image_result as $portfolio_image)
 		{
 			$thumb = $portfolio_image->name;
 			$thumb_array = explode('.', $thumb);
@@ -72,7 +72,7 @@ 
 		
 		$portfolio_tag_result = PortfolioCollector::getTagsForPiece($portfolio_result->id);
 		
-		foreach($portfolio_tag_result as $portfolio_tag)
+		foreach ($portfolio_tag_result as $portfolio_tag)
 		{
 			$tag_array[] = $portfolio_tag->name;
 		}

Braces +3 added lines, -2 removed lines

@@ -36,8 +36,9 @@
 		Loader::load('collector', 'portfolio/PortfolioCollector');
 		$portfolio_result = PortfolioCollector::getPieceByURI($this->title_url);
 		
-		if($portfolio_result === null)
-			$this->eject();
+		if($portfolio_result === null) {

+					$this->eject();

+		}

 		
 		$portfolio_image_result = PortfolioCollector::getImagesForPiece($portfolio_result->id, 2);
 		$image = new ImageOld("portfolio/{$portfolio_image_result[0]->name}");

module/form/CommentSubmitModule.class.inc.php

Indentation +11 added lines, -11 removed lines

@@ -172,24 +172,24 @@
 			}
 		}
         
-        $site = URLDecode::getSite();
+		$site = URLDecode::getSite();
         
-        if ($site == 'blog') {
-            $message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
-        } else if ($site == 'waterfalls') {
-            $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
-        }
+		if ($site == 'blog') {
+			$message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
+		} else if ($site == 'waterfalls') {
+			$message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
+		}
         
 		foreach($email_recipient_array as $email_recipient)
 		{
 			$mail = new Mail();
 			$mail->setToAddress($email_recipient['email'], $email_recipient['name']);
             
-            if ($site == 'blog') {
-                $mail->setSubject("New Comment on Jacob Emerick's Blog");
-            } else if ($site == 'waterfalls') {
-                $mail->setSubject("New Comment on Waterfalls of the Keweenaw");
-            }
+			if ($site == 'blog') {
+				$mail->setSubject("New Comment on Jacob Emerick's Blog");
+			} else if ($site == 'waterfalls') {
+				$mail->setSubject("New Comment on Waterfalls of the Keweenaw");
+			}
             
 			$mail->setMessage($message);
 			$mail->send();

Spacing +19 added lines, -19 removed lines

@@ -26,15 +26,15 @@ 
 
 	public function activate()
 	{
-		if(!Request::hasPost())
+		if (!Request::hasPost())
 			return false;
-		if(!Request::getPost('submit') == 'Submit Comment')
+		if (!Request::getPost('submit') == 'Submit Comment')
 			return false;
 		
 		$errors = $this->fetch_errors();
-		if(count($errors) > 0)
+		if (count($errors) > 0)
 			return $errors;
-		if(Request::getPost('catch') !== '')
+		if (Request::getPost('catch') !== '')
 			return false;
 		
 		$page_id = $this->save_comment_page();
@@ -50,17 +50,17 @@ 
 	private function fetch_errors()
 	{
 		$errors = array();
-		if(!Validate::checkRequest('post', 'name', 'name'))
+		if (!Validate::checkRequest('post', 'name', 'name'))
 			$errors['name'] = 'You must include a valid name';
-		if(!Validate::checkRequest('post', 'email', 'email'))
+		if (!Validate::checkRequest('post', 'email', 'email'))
 			$errors['email'] = 'You must include a valid email';
-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
+		if (Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
 			$errors['website'] = 'Please enter a valid website';
-		if(!Validate::checkRequest('post', 'comment', 'string'))
+		if (!Validate::checkRequest('post', 'comment', 'string'))
 			$errors['comment'] = 'You must enter a comment';
-		if(Request::getPost('notify') && Request::getPost('notify') != 'check')
+		if (Request::getPost('notify') && Request::getPost('notify') != 'check')
 			$errors['notify'] = 'You entered an invalid notify request';
-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
+		if (Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
 			$errors['reply'] = 'You entered an invalid reply request';
 		
 		return $errors;
@@ -69,7 +69,7 @@ 
 	private function save_comment_page()
 	{
 		$page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);
-		if($page_result !== null)
+		if ($page_result !== null)
 			return $page_result->id;
 		
 		$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";
@@ -85,7 +85,7 @@ 
 			'name' => Request::getPost('name'),
 			'email' => Request::getPost('email'));
 		
-		if(Request::getPost('website') != '')
+		if (Request::getPost('website') != '')
 			$cookie_value['website'] = Request::getPost('website');
 		
 		$cookie_value = json_encode($cookie_value);
@@ -95,7 +95,7 @@ 
 			->save();
 		
 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
-		if($commenter_result !== null)
+		if ($commenter_result !== null)
 			return $commenter_result->id;
 		
 		$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";
@@ -112,7 +112,7 @@ 
 	private function save_comment()
 	{
 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));
-		if($comment_result !== null)
+		if ($comment_result !== null)
 			return $comment_result->id;
 		
 		$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";
@@ -133,7 +133,7 @@ 
 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
 		
 		$reply = Database::escape(Request::getPost('type'));
-		if($reply == 'new')
+		if ($reply == 'new')
 			$reply = 0;
 		// else check to make sure value is legit
 		
@@ -157,13 +157,13 @@ 
 		
 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
 		
-		if($commenter_result->trusted == 1)
+		if ($commenter_result->trusted == 1)
 		{
 			$notification_result = CommentCollector::getNotificationForPage($page);
 			
-			foreach($notification_result as $notification_row)
+			foreach ($notification_result as $notification_row)
 			{
-				if($notification_row->email == Request::getPost('email'))
+				if ($notification_row->email == Request::getPost('email'))
 					continue;
 				
 				$email_recipient_array[$notification_row->email] = array(
@@ -180,7 +180,7 @@ 
             $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
         }
         
-		foreach($email_recipient_array as $email_recipient)
+		foreach ($email_recipient_array as $email_recipient)
 		{
 			$mail = new Mail();
 			$mail->setToAddress($email_recipient['email'], $email_recipient['name']);

Braces +48 added lines, -32 removed lines

@@ -26,16 +26,20 @@ 
 
 	public function activate()
 	{
-		if(!Request::hasPost())
-			return false;
-		if(!Request::getPost('submit') == 'Submit Comment')
-			return false;
+		if(!Request::hasPost()) {

+					return false;

+		}

+		if(!Request::getPost('submit') == 'Submit Comment') {

+					return false;

+		}

 		
 		$errors = $this->fetch_errors();
-		if(count($errors) > 0)
-			return $errors;
-		if(Request::getPost('catch') !== '')
-			return false;
+		if(count($errors) > 0) {

+					return $errors;

+		}

+		if(Request::getPost('catch') !== '') {

+					return false;

+		}

 		
 		$page_id = $this->save_comment_page();
 		$commenter_id = $this->save_commenter();
@@ -50,18 +54,24 @@ 
 	private function fetch_errors()
 	{
 		$errors = array();
-		if(!Validate::checkRequest('post', 'name', 'name'))
-			$errors['name'] = 'You must include a valid name';
-		if(!Validate::checkRequest('post', 'email', 'email'))
-			$errors['email'] = 'You must include a valid email';
-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
-			$errors['website'] = 'Please enter a valid website';
-		if(!Validate::checkRequest('post', 'comment', 'string'))
-			$errors['comment'] = 'You must enter a comment';
-		if(Request::getPost('notify') && Request::getPost('notify') != 'check')
-			$errors['notify'] = 'You entered an invalid notify request';
-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
-			$errors['reply'] = 'You entered an invalid reply request';
+		if(!Validate::checkRequest('post', 'name', 'name')) {

+					$errors['name'] = 'You must include a valid name';

+		}

+		if(!Validate::checkRequest('post', 'email', 'email')) {

+					$errors['email'] = 'You must include a valid email';

+		}

+		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url')) {

+					$errors['website'] = 'Please enter a valid website';

+		}

+		if(!Validate::checkRequest('post', 'comment', 'string')) {

+					$errors['comment'] = 'You must enter a comment';

+		}

+		if(Request::getPost('notify') && Request::getPost('notify') != 'check') {

+					$errors['notify'] = 'You entered an invalid notify request';

+		}

+		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer')) {

+					$errors['reply'] = 'You entered an invalid reply request';

+		}

 		
 		return $errors;
 	}
@@ -69,8 +79,9 @@ 
 	private function save_comment_page()
 	{
 		$page_result = CommentCollector::getCommentPageByURL($this->path, $this->site);
-		if($page_result !== null)
-			return $page_result->id;
+		if($page_result !== null) {

+					return $page_result->id;

+		}

 		
 		$query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";
 		$query = sprintf($query, $this->site, $this->path);
@@ -85,8 +96,9 @@ 
 			'name' => Request::getPost('name'),
 			'email' => Request::getPost('email'));
 		
-		if(Request::getPost('website') != '')
-			$cookie_value['website'] = Request::getPost('website');
+		if(Request::getPost('website') != '') {

+					$cookie_value['website'] = Request::getPost('website');

+		}

 		
 		$cookie_value = json_encode($cookie_value);
 		
@@ -95,8 +107,9 @@ 
 			->save();
 		
 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
-		if($commenter_result !== null)
-			return $commenter_result->id;
+		if($commenter_result !== null) {

+					return $commenter_result->id;

+		}

 		
 		$query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";
 		
@@ -112,8 +125,9 @@ 
 	private function save_comment()
 	{
 		$comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));
-		if($comment_result !== null)
-			return $comment_result->id;
+		if($comment_result !== null) {

+					return $comment_result->id;

+		}

 		
 		$query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";
 		
@@ -133,8 +147,9 @@ 
 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
 		
 		$reply = Database::escape(Request::getPost('type'));
-		if($reply == 'new')
-			$reply = 0;
+		if($reply == 'new') {

+					$reply = 0;

+		}

 		// else check to make sure value is legit
 		
 		$notify = (Request::getPost('notify') == 'check') ? 1 : 0;
@@ -163,8 +178,9 @@ 
 			
 			foreach($notification_result as $notification_row)
 			{
-				if($notification_row->email == Request::getPost('email'))
-					continue;
+				if($notification_row->email == Request::getPost('email')) {

+									continue;

+				}

 				
 				$email_recipient_array[$notification_row->email] = array(
 					'email' => $notification_row->email,

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

Indentation +4 added lines, -4 removed lines

@@ -22,10 +22,10 @@
 
 	protected function getDomain()
 	{
-        $site = URLDecode::getSite();
-        if ($site == 'waterfalls' && Loader::isLive()) {
-            return 'waterfallsofthekeweenaw.com';
-        }
+		$site = URLDecode::getSite();
+		if ($site == 'waterfalls' && Loader::isLive()) {
+			return 'waterfallsofthekeweenaw.com';
+		}
 		return self::$COOKIE_DOMAIN;
 	}
 

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

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 '/';
+	}
 
 }

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

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

Braces +30 added lines, -21 removed lines

@@ -21,8 +21,9 @@ 
 
 	public function setValue($value)
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		
 		$this->value = $value;
 		return $this;
@@ -30,8 +31,9 @@ 
 
 	public function getValue()
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		return $this->value;
 	}
 
@@ -42,24 +44,26 @@ 
 
 	public function exists()
 	{
-		if(!$this->is_loaded)
-			$this->load();
+		if(!$this->is_loaded) {

+					$this->load();

+		}

 		return $this->exists;
 	}
 
 	private final function load()
 	{
 		$name = $this->getName();
-		if(isset($_COOKIE[$name]))
-			$value = $_COOKIE[$name];
+		if(isset($_COOKIE[$name])) {

+					$value = $_COOKIE[$name];

+		}

 		
 		if(isset($value))
 		{
 			$this->value = $value;
 			$this->exists = true;
-		}
-		else
-			$this->exists = false;
+		} else {

+					$this->exists = false;

+		}

 		
 		$this->is_loaded = true;
 	}
@@ -84,24 +88,29 @@ 
 	private final function check_values()
 	{
 		$name = $this->getName();
-		if(empty($name) || strlen($name) < 1)
-			return false;
+		if(empty($name) || strlen($name) < 1) {

+					return false;

+		}

 		
 		$value = $this->getValue();
-		if(!isset($value) || strlen($value) < 1)
-			return false;
+		if(!isset($value) || strlen($value) < 1) {

+					return false;

+		}

 		
 		$expiration = $this->getExpiration();
-		if(!isset($expiration) || !is_int($expiration))
-			return false;
+		if(!isset($expiration) || !is_int($expiration)) {

+					return false;

+		}

 		
 		$domain = $this->getDomain();
-		if(!isset($domain) || strlen($domain) < 1)
-			return false;
+		if(!isset($domain) || strlen($domain) < 1) {

+					return false;

+		}

 		
 		$path = $this->getPath();
-		if(!isset($path) || strlen($path) < 1)
-			return false;
+		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);

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