jacobemerick / web

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

Braces +76 added lines, -57 removed lines

@@ -40,8 +40,9 @@ 
 			'date' => date('Y')));
 		
 		Loader::loadInstance('utility', 'Database');
-		if(Database::isConnected() === false)
-			$this->unavailable();
+		if(Database::isConnected() === false) {

+					$this->unavailable();

+		}

 	}
 
 	protected function get_domain_container()
@@ -97,8 +98,9 @@ 
 				$post->title = "Blogged about {$category}: <a href=\"{$row->url}\">{$row->title}</a>.";
 				$post->comments = $row->comments;
 				
-				if($format == 'full')
-					$post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');
+				if($format == 'full') {

+									$post->image = Content::instance('FetchFirstPhoto', $row->body)->activate(false, 'standard');

+				}

 			break;
 			case 'book' :
 				$row = BookCollector::getRow($raw_post->type_id);
@@ -106,8 +108,9 @@ 
 				$post->type = 'book';
 				$post->title = "Just finished reading {$row->title} by {$row->author}.";
 				
-				if($format == 'full')
-					$post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";
+				if($format == 'full') {

+									$post->image = "<img alt=\"{$row->title} by {$row->author}\" src=\"{$row->image}\" />";

+				}

 			break;
 			case 'distance' :
 				$row = DistanceCollector::getRow($raw_post->type_id);
@@ -116,16 +119,16 @@ 
 				if($row->type == 'running')
 				{
 					$post->title = "Ran {$row->distance} miles and felt {$row->felt}.";
-					if(strlen($row->message) > 0)
-						$post->title .= " Afterwards, I was all like '{$row->message}'.";
-				}
-				else if($row->type == 'hiking')
+					if(strlen($row->message) > 0) {

+											$post->title .= " Afterwards, I was all like '{$row->message}'.";

+					}

+				} else if($row->type == 'hiking')
 				{
 					$post->title = "Hiked {$row->distance} miles and felt {$row->felt}.";
-					if(strlen($row->title) > 0)
-						$post->title .= " I was hiking up around the {$row->title} area.";
-				}
-                else if ($row->type == 'walking') {
+					if(strlen($row->title) > 0) {

+											$post->title .= " I was hiking up around the {$row->title} area.";

+					}

+				} else if ($row->type == 'walking') {
                     $post->title = "Walked {$row->distance} miles and felt {$row->felt}.";
                 }
 			break;
@@ -140,10 +143,11 @@ 
 				
 				$post->type = 'twitter';
 				
-				if($format == 'full')
-					$post->title = $row->text_formatted_full;
-				else
-					$post->title = $row->text_formatted;
+				if($format == 'full') {

+									$post->title = $row->text_formatted_full;

+				} else {

+									$post->title = $row->text_formatted;

+				}

 				
 				$post->retweets = ($row->is_retweet == 0) ? $row->retweets : 0;
 				$post->favorites = ($row->is_retweet == 0) ? $row->favorites : 0;
@@ -153,13 +157,15 @@ 
 				
 				$post->type = 'youtube';
 				
-				if($format == 'full')
-					$post->title = "Favorited {$row->title} by {$row->author} on YouTube.";
-				else
-					$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";
+				if($format == 'full') {

+									$post->title = "Favorited {$row->title} by {$row->author} on YouTube.";

+				} else {

+									$post->title = "Favorited <a href=\"http://www.youtube.com/watch?feature=player_embedded&v={$row->video_id}\" rel=\"nofollow\" target=\"_blank\" title=\"{$row->content}\">{$row->title}</a> by {$row->author} on YouTube.";

+				}

 				
-				if($format == 'full')
-					$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";
+				if($format == 'full') {

+									$post->embed_code = "<iframe src=\"http://www.youtube.com/embed/{$row->video_id}?rel=0\" frameborder=\"0\" allowfullscreen></iframe>";

+				}

 			break;
 		}
 		
@@ -188,10 +194,11 @@ 
 		Loader::load('view', '/Head', $this->data_array['head']);
 		foreach($this->body_view_array as $view)
 		{
-			if(substr($view, 0, 1) == '/')
-				Loader::load('view', $view, $this->data_array['body']);
-			else
-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
+			if(substr($view, 0, 1) == '/') {

+							Loader::load('view', $view, $this->data_array['body']);

+			} else {

+							Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);

+			}

 		}
         
         if (URLDecode::getSite() == 'waterfalls') {
@@ -200,8 +207,9 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
-			exit;
+		if($view == '/404' || $view == '/503') {

+					exit;

+		}

 	}
 
 	protected function set_header_method($method)
@@ -261,11 +269,13 @@ 
 		
 		$js_array = array();
 		
-		if(count($this->js_array) > 0)
-			$js_array = array_merge($js_array, $this->js_array);
+		if(count($this->js_array) > 0) {

+					$js_array = array_merge($js_array, $this->js_array);

+		}

 		
-		if(count($js_array) > 0)
-			$js_array = Asset::getJS($js_array);
+		if(count($js_array) > 0) {

+					$js_array = Asset::getJS($js_array);

+		}

 		
 		$this->set_head('css_link_array', $css_array);
 		$this->set_head('js_link_array', $js_array);
@@ -278,14 +288,16 @@ 
 
 	protected function eject()
 	{
-		if(get_class($this) !== 'Error404Controller')
-			Loader::loadNew('controller', '/Error404Controller')->activate();
+		if(get_class($this) !== 'Error404Controller') {

+					Loader::loadNew('controller', '/Error404Controller')->activate();

+		}

 	}
 
 	protected function unavailable()
 	{
-		if(get_class($this) !== 'Error503Controller')
-			Loader::loadNew('controller', '/Error503Controller')->activate();
+		if(get_class($this) !== 'Error503Controller') {

+					Loader::loadNew('controller', '/Error503Controller')->activate();

+		}

 	}
 
 	protected function redirect($uri, $method = 301)
@@ -293,12 +305,14 @@ 
 		switch($method)
 		{
 			case 301 :
-				if(get_class($this) !== 'Error301Controller')
-					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
+				if(get_class($this) !== 'Error301Controller') {

+									Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();

+				}

 				break;
 			case 303 :
-				if(get_class($this) !== 'Error303Controller')
-					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
+				if(get_class($this) !== 'Error303Controller') {

+									Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();

+				}

 				break;
 		}
 	}
@@ -345,18 +359,19 @@ 
 			$comment_object->url = $comment->url;
 			$comment_object->trusted = $comment->trusted;
 			
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
-				$comment_object->errors = $this->comment_errors;
-			else
-				$comment_object->errors = array();
+			if($comment->reply == 0 && Request::getPost('type') == $comment->id) {

+							$comment_object->errors = $this->comment_errors;

+			} else {

+							$comment_object->errors = array();

+			}

 			
 			if($comment->reply == 0)
 			{
 				$comment_object->replies = array();
 				$comment_array[$comment->id] = $comment_object;
-			}
-			else
-				$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;
+			} else {

+							$comment_array[$comment->reply]->replies[$comment->id] = $comment_object;

+			}

 		}
 		
 		$comment_count = CommentCollector::getCommentCountForURL($site, $path);
@@ -381,22 +396,26 @@ 
 		$commenter->website = '';
 		
 		$commenter_cookie = Cookie::instance('Commenter');
-		if(!$commenter_cookie->exists())
-			return $commenter;
+		if(!$commenter_cookie->exists()) {

+					return $commenter;

+		}

 		
 		$commenter_cookie_value = $commenter_cookie->getValue();
 		$commenter_cookie_value = json_decode($commenter_cookie_value);
 		
-		if($commenter_cookie_value === NULL)
-			return $commenter;
+		if($commenter_cookie_value === NULL) {

+					return $commenter;

+		}

 		
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
-			return $commenter;
+		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) {

+					return $commenter;

+		}

 		
 		$commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : ''));
 		
-		if($commenter_object === NULL)
-			return $commenter;
+		if($commenter_object === NULL) {

+					return $commenter;

+		}

 		
 		$commenter->id = $commenter_object->id;
 		$commenter->name = $commenter_object->name;

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

controller/waterfalls/PeriodListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -26,8 +26,9 @@
 		$alias = URLDecode::getPiece(2);
 		$this->period = PeriodCollector::getByAlias($alias);
 		
-		if(!$this->period)
-			$this->eject();
+		if(!$this->period) {

+					$this->eject();

+		}

 		
 		parent::__construct();
 	}

controller/waterfalls/SearchListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 

controller/waterfalls/ContactController.class.inc.php

Braces +12 added lines, -8 removed lines

@@ -33,17 +33,21 @@
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
-			return (object) array('display' => 'normal');
+		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') {

+					return (object) array('display' => 'normal');

+		}

 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_result['message'] = 'please write a message';
+		if(!Validate::checkRequest('post', 'name', 'string')) {

+					$error_result['name'] = 'please enter your name';

+		}

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

+					$error_result['email'] = 'please enter a valid email';

+		}

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

+					$error_result['message'] = 'please write a message';

+		}

 		
 		$values = (object) array(
 			'name' => Request::getPost('name'),

controller/waterfalls/LogTagListController.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 		$alias = URLDecode::getPiece(3);
 		$this->tag = LogTagCollector::getTag($alias);
 		
-		if(!$this->tag)
-			$this->eject();
+		if(!$this->tag) {

+					$this->eject();

+		}

 		
 		parent::__construct();
 	}