jacobemerick / web

controller/blog/DefaultPageController.class.inc.php

Indentation +108 added lines, -108 removed lines

@@ -18,14 +18,14 @@ 
 
 	protected function set_head_data()
 	{
-    $this->set_head('rss_link', [
-      'title' => 'Jacob Emerick Blog Feed',
-      'url' => '/rss.xml'
-    ]);
-    $this->set_head('rss_comment_link', [
-      'title' => 'Jacob Emerick Blog Comment Feed',
-      'url' => '/rss-comments.xml'
-    ]);
+	$this->set_head('rss_link', [
+	  'title' => 'Jacob Emerick Blog Feed',
+	  'url' => '/rss.xml'
+	]);
+	$this->set_head('rss_comment_link', [
+	  'title' => 'Jacob Emerick Blog Comment Feed',
+	  'url' => '/rss-comments.xml'
+	]);
 		
 		$this->add_css('normalize');
 		$this->add_css('blog');
@@ -83,57 +83,57 @@ 
 	final private function get_comments_for_post($post)
 	{
 		$count = CommentCollector::getCommentCountForURL(self::$BLOG_SITE_ID, $post['path']);
-    $count_from_service = $this->get_comments_for_post_from_service($post);
-
-    if ($count_from_service !== null && $count_from_service != $count) {
-        global $container;
-        $container['console']->log('Mismatch between comment service and legacy db');
-        $container['console']->log("{$count}, {$count_from_service} in service");
-    }
-    return $count;
+	$count_from_service = $this->get_comments_for_post_from_service($post);
+
+	if ($count_from_service !== null && $count_from_service != $count) {
+		global $container;
+		$container['console']->log('Mismatch between comment service and legacy db');
+		$container['console']->log("{$count}, {$count_from_service} in service");
+	}
+	return $count;
 	}
 
-    final private function get_comments_for_post_from_service($post)
-    {
-        global $config;
-        $configuration = new Jacobemerick\CommentService\Configuration();
-        $configuration->setUsername($config->comments->user);
-        $configuration->setPassword($config->comments->password);
-        $configuration->addDefaultHeader('Content-Type', 'application/json');
-        $configuration->setHost($config->comments->host);
-        $configuration->setCurlTimeout($config->comments->timeout);
-
-        $client = new Jacobemerick\CommentService\ApiClient($configuration);
-        $api = new Jacobemerick\CommentService\Api\DefaultApi($client);
-
-        $start = microtime(true);
-        try {
-            $comment_response = $api->getComments(
-                null,
-                null,
-                null,
-                'blog.jacobemerick.com',
-                "{$post['category']}/{$post['path']}"
-            );
-        } catch (Exception $e) {
-            global $container;
-            $container['logger']->warning("CommentService | Comment Count | {$e->getMessage()}");
-            return;
-        }
-        $elapsed = microtime(true) - $start;
-        global $container;
-        $container['logger']->info("CommentService | Comment Count | {$elapsed}");
-
-        return count($comment_response);
-    }
+	final private function get_comments_for_post_from_service($post)
+	{
+		global $config;
+		$configuration = new Jacobemerick\CommentService\Configuration();
+		$configuration->setUsername($config->comments->user);
+		$configuration->setPassword($config->comments->password);
+		$configuration->addDefaultHeader('Content-Type', 'application/json');
+		$configuration->setHost($config->comments->host);
+		$configuration->setCurlTimeout($config->comments->timeout);
+
+		$client = new Jacobemerick\CommentService\ApiClient($configuration);
+		$api = new Jacobemerick\CommentService\Api\DefaultApi($client);
+
+		$start = microtime(true);
+		try {
+			$comment_response = $api->getComments(
+				null,
+				null,
+				null,
+				'blog.jacobemerick.com',
+				"{$post['category']}/{$post['path']}"
+			);
+		} catch (Exception $e) {
+			global $container;
+			$container['logger']->warning("CommentService | Comment Count | {$e->getMessage()}");
+			return;
+		}
+		$elapsed = microtime(true) - $start;
+		global $container;
+		$container['logger']->info("CommentService | Comment Count | {$elapsed}");
+
+		return count($comment_response);
+	}
 
 	final private function get_tags_for_post($post)
 	{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
-        $tag_result = $repository->getTagsForPost($post['id']);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
+		$tag_result = $repository->getTagsForPost($post['id']);
 
-        $tag_array = array();
+		$tag_array = array();
 		foreach($tag_result as $tag)
 		{
 			$tag_object = new stdclass();
@@ -167,9 +167,9 @@ 
 
 	final private function get_tag_cloud()
 	{
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
-        $tag_result = $repository->getTagCloud();
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
+		$tag_result = $repository->getTagCloud();
 		
 		$maximum_tag_count = $this->get_maximum_tag_count($tag_result);
 		
@@ -218,61 +218,61 @@ 
 			$array[] = $comment_obj;
 		}
 
-    $comment_service_array = $this->get_comments_from_service();
-    if ($comment_service_array !== null && $comment_service_array !== $array) {
-      global $container;
-      $container['console']->log('Mismatch between comment service and legacy db');
-      $container['console']->log($comment_service_array[0]);
-      $container['console']->log($array[0]);
-    }
+	$comment_service_array = $this->get_comments_from_service();
+	if ($comment_service_array !== null && $comment_service_array !== $array) {
+	  global $container;
+	  $container['console']->log('Mismatch between comment service and legacy db');
+	  $container['console']->log($comment_service_array[0]);
+	  $container['console']->log($array[0]);
+	}
 		return $array;
 	}
 
-    final private function get_comments_from_service()
-    {
-        global $config;
-        $configuration = new Jacobemerick\CommentService\Configuration();
-        $configuration->setUsername($config->comments->user);
-        $configuration->setPassword($config->comments->password);
-        $configuration->addDefaultHeader('Content-Type', 'application/json');
-        $configuration->setHost($config->comments->host);
-        $configuration->setCurlTimeout($config->comments->timeout);
-
-        $client = new Jacobemerick\CommentService\ApiClient($configuration);
-        $api = new Jacobemerick\CommentService\Api\DefaultApi($client);
-
-        $start = microtime(true);
-        try {
-            $comment_response = $api->getComments(
-                1,
-                self::$RECENT_COMMENT_COUNT,
-                '-date',
-                'blog.jacobemerick.com'
-            );
-        } catch (Exception $e) {
-            global $container;
-            $container['logger']->warning("CommentService | Sidebar | {$e->getMessage()}");
-            return;
-        }
+	final private function get_comments_from_service()
+	{
+		global $config;
+		$configuration = new Jacobemerick\CommentService\Configuration();
+		$configuration->setUsername($config->comments->user);
+		$configuration->setPassword($config->comments->password);
+		$configuration->addDefaultHeader('Content-Type', 'application/json');
+		$configuration->setHost($config->comments->host);
+		$configuration->setCurlTimeout($config->comments->timeout);
+
+		$client = new Jacobemerick\CommentService\ApiClient($configuration);
+		$api = new Jacobemerick\CommentService\Api\DefaultApi($client);
+
+		$start = microtime(true);
+		try {
+			$comment_response = $api->getComments(
+				1,
+				self::$RECENT_COMMENT_COUNT,
+				'-date',
+				'blog.jacobemerick.com'
+			);
+		} catch (Exception $e) {
+			global $container;
+			$container['logger']->warning("CommentService | Sidebar | {$e->getMessage()}");
+			return;
+		}
  
-        $elapsed = microtime(true) - $start;
-        global $container;
-        $container['logger']->info("CommentService | Sidebar | {$elapsed}");
-
-        $array = array();
-        foreach($comment_response as $comment)
-        {
-            $body = $comment->getBody();
-            $body = Content::instance('CleanComment', $body)->activate();
-            $body = strip_tags($body);
-
-            $comment_obj = new stdclass();
-            $comment_obj->description = Content::instance('SmartTrim', $body)->activate(30);
-            $comment_obj->commenter = $comment->getCommenter()->getName();
-            $comment_obj->link = "{$comment->getUrl()}/#comment-{$comment->getId()}";
-            $array[] = $comment_obj;
-        }
-        return $array;
-    }
+		$elapsed = microtime(true) - $start;
+		global $container;
+		$container['logger']->info("CommentService | Sidebar | {$elapsed}");
+
+		$array = array();
+		foreach($comment_response as $comment)
+		{
+			$body = $comment->getBody();
+			$body = Content::instance('CleanComment', $body)->activate();
+			$body = strip_tags($body);
+
+			$comment_obj = new stdclass();
+			$comment_obj->description = Content::instance('SmartTrim', $body)->activate(30);
+			$comment_obj->commenter = $comment->getCommenter()->getName();
+			$comment_obj->link = "{$comment->getUrl()}/#comment-{$comment->getId()}";
+			$array[] = $comment_obj;
+		}
+		return $array;
+	}
 
 }

controller/PageController.class.inc.php

Indentation +52 added lines, -52 removed lines

@@ -57,37 +57,37 @@ 
 		return $domain_container;
 	}
 
-    protected function get_recent_activity()
-    {
-        global $container;
-        $activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
-        $post_result = $activityRepository->getActivities(5);
-
-        $post_array = array();
-        foreach($post_result as $row) {
-            array_push($post_array, $this->expand_post($row));
-        }
-
-        return $post_array;
-    }
-
-    protected function expand_post($raw_post, $format = 'short')
-    {
-        $post = [
-            'type' => $raw_post['type'],
-            'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
-            'date' => $this->get_parsed_date($raw_post['datetime']),
-        ];
-
-        if ($format != 'short') {
-            $post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
-
-            $metadata = json_decode($raw_post['metadata'], true);
-            $post = array_merge($post, $metadata);
-        }
-
-        return (object) $post;
-    }
+	protected function get_recent_activity()
+	{
+		global $container;
+		$activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
+		$post_result = $activityRepository->getActivities(5);
+
+		$post_array = array();
+		foreach($post_result as $row) {
+			array_push($post_array, $this->expand_post($row));
+		}
+
+		return $post_array;
+	}
+
+	protected function expand_post($raw_post, $format = 'short')
+	{
+		$post = [
+			'type' => $raw_post['type'],
+			'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
+			'date' => $this->get_parsed_date($raw_post['datetime']),
+		];
+
+		if ($format != 'short') {
+			$post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
+
+			$metadata = json_decode($raw_post['metadata'], true);
+			$post = array_merge($post, $metadata);
+		}
+
+		return (object) $post;
+	}
 
 	public function activate()
 	{
@@ -108,11 +108,11 @@ 
 				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
 		}
         
-        if (URLDecode::getSite() == 'waterfalls') {
-            Loader::load('view', '/WaterfallFoot');
-        } else {
-            Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
-        }
+		if (URLDecode::getSite() == 'waterfalls') {
+			Loader::load('view', '/WaterfallFoot');
+		} else {
+			Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
+		}
 		
 		if($view == '/404' || $view == '/503')
 			exit;
@@ -170,19 +170,19 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
-      $path = "/css/{$stylesheet[0]}.css";
-      if ($stylesheet[1] > 1) {
-        $path .= "?v={$stylesheet[1]}";
-      }
-      return $path;
-    }, $this->css_array);
-    $js_array = array_map(function ($script) {
-      if (substr($script, 0, 4) == 'http') {
-        return $script;
-      }
-      return "/js/{$script}.min.js";
-    }, $this->js_array);
+	$css_array = array_map(function ($stylesheet) {
+	  $path = "/css/{$stylesheet[0]}.css";
+	  if ($stylesheet[1] > 1) {
+		$path .= "?v={$stylesheet[1]}";
+	  }
+	  return $path;
+	}, $this->css_array);
+	$js_array = array_map(function ($script) {
+	  if (substr($script, 0, 4) == 'http') {
+		return $script;
+	  }
+	  return "/js/{$script}.min.js";
+	}, $this->js_array);
 		
 		$this->set_head('css_link_array', $css_array);
 		$this->set_head('js_link_array', $js_array);
@@ -296,9 +296,9 @@ 
 		$commenter->email = '';
 		$commenter->website = '';
 
-    if (!isset($_COOKIE['commenter'])) {
-      return $commenter;
-    }
+	if (!isset($_COOKIE['commenter'])) {
+	  return $commenter;
+	}
 
 		$commenter_cookie_value = json_decode($_COOKIE['commenter']);
 		

Spacing +20 added lines, -20 removed lines

@@ -64,7 +64,7 @@ 
         $post_result = $activityRepository->getActivities(5);
 
         $post_array = array();
-        foreach($post_result as $row) {
+        foreach ($post_result as $row) {
             array_push($post_array, $this->expand_post($row));
         }
 
@@ -80,7 +80,7 @@ 
         ];
 
         if ($format != 'short') {
-            $post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/";
+            $post['url'] = Loader::getRootUrl('lifestream')."{$raw_post['type']}/{$raw_post['id']}/";
 
             $metadata = json_decode($raw_post['metadata'], true);
             $post = array_merge($post, $metadata);
@@ -100,12 +100,12 @@ 
 		$headers = $this->headers;
 		Header::$headers();
 		Loader::load('view', '/Head', $this->data_array['head']);
-		foreach($this->body_view_array as $view)
+		foreach ($this->body_view_array as $view)
 		{
-			if(substr($view, 0, 1) == '/')
+			if (substr($view, 0, 1) == '/')
 				Loader::load('view', $view, $this->data_array['body']);
 			else
-				Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']);
+				Loader::load('view', URLDecode::getSite().'/'.$view, $this->data_array['body']);
 		}
         
         if (URLDecode::getSite() == 'waterfalls') {
@@ -114,7 +114,7 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
+		if ($view == '/404' || $view == '/503')
 			exit;
 	}
 
@@ -170,14 +170,14 @@ 
 
 	private function load_assets()
 	{
-    $css_array = array_map(function ($stylesheet) {
+    $css_array = array_map(function($stylesheet) {
       $path = "/css/{$stylesheet[0]}.css";
       if ($stylesheet[1] > 1) {
         $path .= "?v={$stylesheet[1]}";
       }
       return $path;
     }, $this->css_array);
-    $js_array = array_map(function ($script) {
+    $js_array = array_map(function($script) {
       if (substr($script, 0, 4) == 'http') {
         return $script;
       }
@@ -195,26 +195,26 @@ 
 
 	protected function eject()
 	{
-		if(get_class($this) !== 'Error404Controller')
+		if (get_class($this) !== 'Error404Controller')
 			Loader::loadNew('controller', '/Error404Controller')->activate();
 	}
 
 	protected function unavailable()
 	{
-		if(get_class($this) !== 'Error503Controller')
+		if (get_class($this) !== 'Error503Controller')
 			Loader::loadNew('controller', '/Error503Controller')->activate();
 	}
 
 	protected function redirect($uri, $method = 301)
 	{
-		switch($method)
+		switch ($method)
 		{
 			case 301 :
-				if(get_class($this) !== 'Error301Controller')
+				if (get_class($this) !== 'Error301Controller')
 					Loader::loadNew('controller', '/Error301Controller', array($uri))->activate();
 				break;
 			case 303 :
-				if(get_class($this) !== 'Error303Controller')
+				if (get_class($this) !== 'Error303Controller')
 					Loader::loadNew('controller', '/Error303Controller', array($uri))->activate();
 				break;
 		}
@@ -234,7 +234,7 @@ 
 	private $comment_errors;
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
 	{
-		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
+		if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
 		{
 			$parameters = array($site_id, $path, $redirect_url, $page_title);
 			$this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate();
@@ -252,7 +252,7 @@ 
 		$comment_array = array();
 		$comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id);
 		
-		foreach($comment_result as $comment)
+		foreach ($comment_result as $comment)
 		{
 			$comment_object = new stdclass();
 			$comment_object->id = $comment->id;
@@ -262,12 +262,12 @@ 
 			$comment_object->url = $comment->url;
 			$comment_object->trusted = $comment->trusted;
 			
-			if($comment->reply == 0 && Request::getPost('type') == $comment->id)
+			if ($comment->reply == 0 && Request::getPost('type') == $comment->id)
 				$comment_object->errors = $this->comment_errors;
 			else
 				$comment_object->errors = array();
 			
-			if($comment->reply == 0)
+			if ($comment->reply == 0)
 			{
 				$comment_object->replies = array();
 				$comment_array[$comment->id] = $comment_object;
@@ -302,15 +302,15 @@ 
 
 		$commenter_cookie_value = json_decode($_COOKIE['commenter']);
 		
-		if($commenter_cookie_value === NULL)
+		if ($commenter_cookie_value === NULL)
 			return $commenter;
 		
-		if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email))
+		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)
+		if ($commenter_object === NULL)
 			return $commenter;
 		
 		$commenter->id = $commenter_object->id;

Braces +37 added lines, -27 removed lines

@@ -102,10 +102,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') {
@@ -114,8 +115,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)
@@ -195,14 +197,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)
@@ -210,12 +214,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;
 		}
 	}
@@ -262,18 +268,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);
@@ -302,16 +309,19 @@ 
 
 		$commenter_cookie_value = json_decode($_COOKIE['commenter']);
 		
-		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;

module/form/CommentSubmitModule.class.inc.php

Indentation +54 added lines, -54 removed lines

@@ -41,7 +41,7 @@ 
 		$comment_id = $this->save_comment();
 		
 		$comment_meta_id = $this->save_comment_meta($commenter_id, $comment_id, $page_id);
-    $comment_service_id = $this->save_to_comment_service(Request::getPost());
+	$comment_service_id = $this->save_to_comment_service(Request::getPost());
 		
 		$this->send_notifications($page_id);
 		$this->redirect_to_comment($comment_meta_id);
@@ -88,7 +88,7 @@ 
 		if(Request::getPost('website') != '')
 			$cookie_value['website'] = Request::getPost('website');
 
-    setcookie('commenter', json_encode($cookie_value), time() + 31536000, '/', 'jacobemerick.com');
+	setcookie('commenter', json_encode($cookie_value), time() + 31536000, '/', 'jacobemerick.com');
 
 		$commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
 		if($commenter_result !== null)
@@ -163,26 +163,26 @@ 
 			}
 		}
         
-        $site = URLDecode::getSite();
+		$site = URLDecode::getSite();
         
-        if ($site == 'blog') {
-            $subject = "New Comment on Jacob Emerick's 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') {
-            $subject = "New Comment on Waterfalls of the Keweenaw";
-            $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') {
+			$subject = "New Comment on Jacob Emerick's 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') {
+			$subject = "New Comment on Waterfalls of the Keweenaw";
+			$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!";
+		}
 
-    global $container;
+	global $container;
 
 		foreach($email_recipient_array as $email_recipient)
 		{
-      $sent = $container['mail']
-        ->addTo($email_recipient['email'], $email_recipient['name'])
-        ->addBCC($container['config']->admin_email)
-        ->setSubject($subject)
-        ->setPlainMessage($message)
-        ->send();		
+	  $sent = $container['mail']
+		->addTo($email_recipient['email'], $email_recipient['name'])
+		->addBCC($container['config']->admin_email)
+		->setSubject($subject)
+		->setPlainMessage($message)
+		->send();		
 		}
 	}
 
@@ -196,41 +196,41 @@ 
 		exit;
 	}
 
-    private function save_to_comment_service(array $data)
-    {
-        $path = $_SERVER['REQUEST_URI'];
-        $path = explode('/', $path);
-        $path = array_filter($path);
-        $path = array_slice($path, 0, 2);
-        $path = implode('/', $path);
-
-        $body = [
-            'commenter' => [
-                'name' => $data['name'],
-                'email' => $data['email'],
-                'website' => $data['website'],
-            ],
-            'body' => $data['comment'],
-            'should_notify' => (isset($data['notify']) && $data['notify'] == 'check'),
-            'domain' => (URLDecode::getSite() == 'blog' ? 'blog.jacobemerick.com' : 'waterfallsofthekeweenaw.com'),
-            'path' => $path,
-            'url' => $this->full_path,
-            'thread' => 'comments',
-            'ip_address' => $_SERVER['REMOTE_ADDR'],
-            'user_agent' => $_SERVER['HTTP_USER_AGENT'],
-            'referrer' => $_SERVER['HTTP_REFERER'],
-        ];
-
-        global $config;
-        $configuration = new Jacobemerick\CommentService\Configuration();
-        $configuration->setUsername($config->comments->user);
-        $configuration->setPassword($config->comments->password);
-        $configuration->addDefaultHeader('Content-Type', 'application/json');
-        $configuration->setHost($config->comments->host);
-        $configuration->setCurlTimeout($config->comments->timeout);
-
-        $client = new Jacobemerick\CommentService\ApiClient($configuration);
-        $api = new Jacobemerick\CommentService\Api\DefaultApi($client);
-        $response = $api->createComment($body);
-    }
+	private function save_to_comment_service(array $data)
+	{
+		$path = $_SERVER['REQUEST_URI'];
+		$path = explode('/', $path);
+		$path = array_filter($path);
+		$path = array_slice($path, 0, 2);
+		$path = implode('/', $path);
+
+		$body = [
+			'commenter' => [
+				'name' => $data['name'],
+				'email' => $data['email'],
+				'website' => $data['website'],
+			],
+			'body' => $data['comment'],
+			'should_notify' => (isset($data['notify']) && $data['notify'] == 'check'),
+			'domain' => (URLDecode::getSite() == 'blog' ? 'blog.jacobemerick.com' : 'waterfallsofthekeweenaw.com'),
+			'path' => $path,
+			'url' => $this->full_path,
+			'thread' => 'comments',
+			'ip_address' => $_SERVER['REMOTE_ADDR'],
+			'user_agent' => $_SERVER['HTTP_USER_AGENT'],
+			'referrer' => $_SERVER['HTTP_REFERER'],
+		];
+
+		global $config;
+		$configuration = new Jacobemerick\CommentService\Configuration();
+		$configuration->setUsername($config->comments->user);
+		$configuration->setPassword($config->comments->password);
+		$configuration->addDefaultHeader('Content-Type', 'application/json');
+		$configuration->setHost($config->comments->host);
+		$configuration->setCurlTimeout($config->comments->timeout);
+
+		$client = new Jacobemerick\CommentService\ApiClient($configuration);
+		$api = new Jacobemerick\CommentService\Api\DefaultApi($client);
+		$response = $api->createComment($body);
+	}
 }