jacobemerick / web

utility/Debugger.class.inc.php

Braces +15 added lines, -10 removed lines

@@ -24,8 +24,9 @@ 
 
 	public static function instance()
 	{
-		if(!isset(self::$instance))
-			self::$instance = new Debugger();
+		if(!isset(self::$instance)) {

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

+		}

 		return self::$instance;
 	}
 
@@ -52,12 +53,15 @@ 
 
 	public static function internal_error($code, $string, $file = null, $line = null, $context = null)
 	{
-		if($file == null)
-			$file = self::$UNKNOWN_ERROR_FILE;
-		if($line == null)
-			$line = self::$UNKNOWN_ERROR_LINE;
-		if($context == null)
-			$context = self::$UNKNOWN_ERROR_CONTEXT;
+		if($file == null) {

+					$file = self::$UNKNOWN_ERROR_FILE;

+		}

+		if($line == null) {

+					$line = self::$UNKNOWN_ERROR_LINE;

+		}

+		if($context == null) {

+					$context = self::$UNKNOWN_ERROR_CONTEXT;

+		}

 		
 		self::instance()->console->logError(new Exception($string), "{$string}... TYPE: {$code}");
 		
@@ -68,8 +72,9 @@ 
 	{
 		$error = error_get_last();
 		
-		if(isset($error))
-			self::internal_error($error['type'], $error['message'], $error['file'], $error['line']);
+		if(isset($error)) {

+					self::internal_error($error['type'], $error['message'], $error['file'], $error['line']);

+		}

 		
 		self::display();
 		return true;

router/BlogRouter.class.inc.php

Braces +1 added lines, -2 removed lines

@@ -57,8 +57,7 @@
 			
 			Loader::load('utility', 'Content');
 			$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
-		}
-		else
+		} else
 		{
 			$post_uri = URLDecode::getPiece(1);
 			if($post_uri !== null)

collector/comment/CommentCollector.class.inc.php

Braces +5 added lines, -4 removed lines

@@ -163,10 +163,11 @@
 	{
 		$path = self::escape($path);
 		
-		if($commenter != 0)
-			$trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
-		else
-			$trusted_commenter_clause = "`commenter`.`trusted` = '1'";
+		if($commenter != 0) {

+					$trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";

+		} else {

+					$trusted_commenter_clause = "`commenter`.`trusted` = '1'";

+		}

 		
 		$query = "
 			SELECT

controller/sitemap/PortfolioSitemapController.class.inc.php

Braces +5 added lines, -4 removed lines

@@ -18,10 +18,11 @@
 		
 		foreach($pieces as $piece)
 		{
-			if($piece->category == 1)
-				$this->addURL("web/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);
-			else
-				$this->addURL("print/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);
+			if($piece->category == 1) {

+							$this->addURL("web/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);

+			} else {

+							$this->addURL("print/{$piece->title_url}/", date('Y-01-01'), 'yearly', .7);

+			}

 		}
 	}
 

controller/SitemapController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
 
 	protected function addURL($loc, $lastmod = false, $changefreq = 'monthly', $priority = .5)
 	{
-		if(!$lastmod)
-			$lastmod = $this->default_lastmod;
+		if(!$lastmod) {

+					$lastmod = $this->default_lastmod;

+		}

 		
 		$url = $this->xml->addChild('url');
 		

controller/ajax/SubmitCommentController.class.inc.php

Braces +34 added lines, -26 removed lines

@@ -14,20 +14,27 @@ 
 
 	protected function set_data()
 	{
-		if(!Validate::checkRequest('post', 'name', 'name'))
-			return $this->fail_response('You must include a valid name.');
-		if(!Validate::checkRequest('post', 'email', 'email'))
-			return $this->fail_response('You must include a valid email.');
-		if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
-			return $this->fail_response('Please include a valid website.');
-		if(!Validate::checkRequest('post', 'comment', 'string'))
-			return $this->fail_response('You must enter a comment.');
-		if(!Validate::checkRequest('post', 'save', 'boolean'))
-			return $this->fail_response('You entered an invalid save request.');
-		if(!Validate::checkRequest('post', 'notify', 'boolean'))
-			return $this->fail_response('You entered an invalid notify request.');
-		if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
-			return $this->fail_response('You entered an invalid reply value.');
+		if(!Validate::checkRequest('post', 'name', 'name')) {

+					return $this->fail_response('You must include a valid name.');

+		}

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

+					return $this->fail_response('You must include a valid email.');

+		}

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

+					return $this->fail_response('Please include a valid website.');

+		}

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

+					return $this->fail_response('You must enter a comment.');

+		}

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

+					return $this->fail_response('You entered an invalid save request.');

+		}

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

+					return $this->fail_response('You entered an invalid notify request.');

+		}

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

+					return $this->fail_response('You entered an invalid reply value.');

+		}

 		
 		$referer_url = Request::getServer('HTTP_REFERER');
 		$url = explode('/', $referer_url);
@@ -35,8 +42,9 @@ 
 		$url = array_pop($url);
 		$post = PostCollector::getPostByURI($url);
 		
-		if($post === null)
-			return $this->fail_response('There seems to be a problem with this page.', 'error');
+		if($post === null) {

+					return $this->fail_response('There seems to be a problem with this page.', 'error');

+		}

 		
 		$commentpage_result = CommentCollector::getCommentPageByURL($post->path, 2);
 		if($commentpage_result === null)
@@ -49,9 +57,9 @@ 
 			$query = sprintf($query, $site_id, $url);
 			Database::execute($query);
 			$commentpage_id = Database::lastInsertID();
-		}
-		else
-			$commentpage_id = $commentpage_result->id;
+		} else {

+					$commentpage_id = $commentpage_result->id;

+		}

 		
 		$save = (Request::getPost('save') == 'true') ? 1 : 0;
 		
@@ -67,8 +75,7 @@ 
 			$query = sprintf($query, $name, $email, $website, $save);
 			Database::execute($query);
 			$commenter_id = Database::lastInsertID();
-		}
-		else
+		} else
 		{
 			if($commenter_result->save !== $save)
 			{
@@ -90,9 +97,9 @@ 
 			$query = sprintf($query, $body);
 			Database::execute($query);
 			$comment_id = Database::lastInsertID();
-		}
-		else
-			$comment_id = $comment_result->id;
+		} else {

+					$comment_id = $comment_result->id;

+		}

 		
 		$query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter_id`,`comment_id`,`reply`,`notify`,`commentpage_id`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
 		
@@ -114,8 +121,9 @@ 
 		
 		foreach($notification_result as $notification_row)
 		{
-			if($notification_row->email == $email)
-				continue;
+			if($notification_row->email == $email) {

+							continue;

+			}

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

controller/waterfalls/WaterfallController.class.inc.php

Braces +8 added lines, -6 removed lines

@@ -112,8 +112,9 @@ 
     {
         $album = array();
         
-        if($this->waterfall->album == 0)
-            return $album;
+        if($this->waterfall->album == 0) {

+                    return $album;

+        }

         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
         foreach($photo_list as $photo)
@@ -122,10 +123,11 @@ 
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+            if($photo->height < $photo->width) {

+                            list($height, $width) = array(75, 100);

+            } else {

+                            list($height, $width) = array(100, 75);

+            }

             
             $photo_array['image_node'] = sprintf(
                 self::$THUMB_IMAGE_NODE,

controller/waterfalls/CountyListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -28,8 +28,9 @@
 		$path = URLDecode::getPiece(1);
 		$this->county = CountyCollector::getByAlias($path);
 		
-		if(!$this->county)
-			$this->eject();
+		if(!$this->county) {

+					$this->eject();

+		}

 		
 		parent::__construct();
 	}

controller/waterfalls/LogController.class.inc.php

Braces +11 added lines, -8 removed lines

@@ -25,8 +25,9 @@ 
         $log_path = URLDecode::getPiece(2);
         
         $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
-            $this->eject();
+        if(!$this->log) {

+                    $this->eject();

+        }

 
         $this->parent_navigation_item = 'journal';
         
@@ -182,8 +183,9 @@ 
     {
         $album = array();
         
-        if($this->log->album == 0)
-            return $album;
+        if($this->log->album == 0) {

+                    return $album;

+        }

         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
         foreach($photo_list as $photo)
@@ -192,10 +194,11 @@ 
             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
             $photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+            if($photo->height < $photo->width) {

+                            list($height, $width) = array(75, 100);

+            } else {

+                            list($height, $width) = array(100, 75);

+            }

             
             if ($photo->description == '') {
                 Debugger::logMessage("No description for {$photo->category}/{$photo->name}");