jacobemerick / web

controller/waterfalls/HomeController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         $recent_comments = CommentCollector::getRecentWaterfallComments();

         

         $recent_comment_container = array();

-        foreach($recent_comments as $comment) {

+        foreach ($recent_comments as $comment) {

             $body = $comment->body;

             $body = strip_tags($body);

             

controller/waterfalls/LogController.class.inc.php

Spacing +10 added lines, -10 removed lines

@@ -25,7 +25,7 @@ 
         $log_path = URLDecode::getPiece(2);

         

         $this->log = LogCollector::getByAlias($log_path);

-        if(!$this->log)

+        if (!$this->log)

             $this->eject();

 

         $this->parent_navigation_item = 'journal';

@@ -48,7 +48,7 @@ 
         

         $keyword_array = array();

         $tag_result = LogCollector::getTagListForLog($this->log->id);

-        foreach($tag_result as $tag)

+        foreach ($tag_result as $tag)

         {

             $keyword_array[] = $tag->name;

         }

@@ -124,7 +124,7 @@ 
             'next' => array());

         

         $previous_log = LogCollector::getPreviousLog($this->log->id);

-        if($previous_log != false)

+        if ($previous_log != false)

         {

             $series['previous'] = (object) array(

                 'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',

@@ -133,7 +133,7 @@ 
         }

         

         $next_log = LogCollector::getNextLog($this->log->id);

-        if($next_log != false)

+        if ($next_log != false)

         {

             $series['next'] = (object) array(

                 'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',

@@ -150,7 +150,7 @@ 
         

         $sidebar['companion_list'] = array();

         $companions = LogCollector::getCompanionListForLog($this->log->id);

-        foreach($companions as $companion)

+        foreach ($companions as $companion)

         {

             $sidebar['companion_list'][] = (object) array(

                 'title' => $companion->name,

@@ -159,7 +159,7 @@ 
         

         $sidebar['tag_list'] = array();

         $tags = LogCollector::getTagListForLog($this->log->id);

-        foreach($tags as $tag)

+        foreach ($tags as $tag)

         {

             $sidebar['tag_list'][] = (object) array(

                 'title' => $tag->name,

@@ -168,7 +168,7 @@ 
         

         $sidebar['waterfall_list'] = array();

         $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);

-        foreach($waterfalls as $waterfall)

+        foreach ($waterfalls as $waterfall)

         {

             $sidebar['waterfall_list'][] = (object) array(

                 'title' => $waterfall->name,

@@ -182,17 +182,17 @@ 
     {

         $album = array();

         

-        if($this->log->album == 0)

+        if ($this->log->album == 0)

             return $album;

         

         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);

-        foreach($photo_list as $photo)

+        foreach ($photo_list as $photo)

         {

             $photo_array = array();

             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);

             $photo_array['description'] = $photo->description;

             

-            if($photo->height < $photo->width)

+            if ($photo->height < $photo->width)

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

             else

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

controller/waterfalls/LogTagListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		$alias = URLDecode::getPiece(3);

 		$this->tag = LogTagCollector::getTag($alias);

 		

-		if(!$this->tag)

+		if (!$this->tag)

 			$this->eject();

 		

 		parent::__construct();

controller/waterfalls/PeriodListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 		$alias = URLDecode::getPiece(2);

 		$this->period = PeriodCollector::getByAlias($alias);

 		

-		if(!$this->period)

+		if (!$this->period)

 			$this->eject();

 		

 		parent::__construct();

controller/waterfalls/SearchListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	protected function get_page_number()

 	{

 		$page = URLDecode::getPiece(2);

-		if(isset($page) && is_numeric($page))

+		if (isset($page) && is_numeric($page))

 			return $page;

 		return 1;

 	}

controller/waterfalls/WatercourseListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		$path = URLDecode::getPiece(1);

 		$this->watercourse = WatercourseCollector::getByAlias($path);

 		

-		if(!$this->watercourse)

+		if (!$this->watercourse)

 			$this->eject();

 	

 		parent::__construct();

controller/waterfalls/WaterfallController.class.inc.php

Spacing +4 added lines, -4 removed lines

@@ -112,17 +112,17 @@ 
     {

         $album = array();

         

-        if($this->waterfall->album == 0)

+        if ($this->waterfall->album == 0)

             return $album;

         

         $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);

-        foreach($photo_list as $photo)

+        foreach ($photo_list as $photo)

         {

             $photo_array = array();

             $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);

             $photo_array['description'] = $photo->description;

             

-            if($photo->height < $photo->width)

+            if ($photo->height < $photo->width)

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

             else

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

@@ -154,7 +154,7 @@ 
 		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');

 		$sidebar_data['drop_count'] = $waterfall->drop_count;

 		

-        $sidebar_data['county'] = (object) array (

+        $sidebar_data['county'] = (object) array(

             'name' => $waterfall->county,

             'alias' => $waterfall->county_alias,

             'title' => $waterfall->county_title,

module/form/CommentSubmitModule.class.inc.php

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

router/BlogRouter.class.inc.php

Spacing +6 added lines, -6 removed lines

@@ -45,11 +45,11 @@ 
 

 	protected function check_for_special_redirect($uri)

 	{

-		if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))

+		if (preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))

 		{

 			Loader::load('collector', 'blog/PostCollector');

 			$post = PostCollector::getPostByURI($matches[2]);

-			if(!$post)

+			if (!$post)

 			{

 				Loader::loadNew('controller', '/Error404Controller')

 					->activate();

@@ -61,21 +61,21 @@ 
 		else

 		{

 			$post_uri = URLDecode::getPiece(1);

-			if($post_uri !== null)

+			if ($post_uri !== null)

 			{

 				Loader::load('collector', 'blog/PostCollector');

 				$post = PostCollector::getPostByURI($post_uri);

 				

-				if($post != false)

+				if ($post != false)

 				{

 					Loader::load('utility', 'Content');

 					$uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();

 				}

 			}

 		}

-		if($uri == '/search/')

+		if ($uri == '/search/')

 		{

-			if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))

+			if (Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))

 			{

 				$uri .= Request::getGet('search');

 				$uri .= '/';