jacobemerick / web

module/form/CommentSubmitModule.class.inc.php

Indentation +55 added lines, -55 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,42 +196,42 @@ 
 		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}/#comment-{{id}}",
-            'thread' => 'comments',
-            'reply_to' => ($data['type'] == 'new' ? 0 : $data['type']),
-            '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}/#comment-{{id}}",
+			'thread' => 'comments',
+			'reply_to' => ($data['type'] == 'new' ? 0 : $data['type']),
+			'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);
+	}
 }

controller/blog/PostController.class.inc.php

Indentation +85 added lines, -85 removed lines

@@ -23,9 +23,9 @@ 
 	{
 		parent::__construct();
 		
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-        $this->post = $repository->findPostByPath(URLDecode::getPiece(2));
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+		$this->post = $repository->findPostByPath(URLDecode::getPiece(2));
 
 		if($this->post == null)
 			$this->eject();
@@ -36,9 +36,9 @@ 
 			Loader::getRootUrl('blog') . $this->post['category'] . '/' . $this->post['path'] . '/',
 			$this->post['title']);
 
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
-        $this->tags = $repository->getTagsForPost($this->post['id']);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
+		$this->tags = $repository->getTagsForPost($this->post['id']);
 	}
 
 	protected function set_head_data()
@@ -50,9 +50,9 @@ 
 		$this->set_keywords($this->get_post_keywords());
 		$this->set_author(self::$AUTHOR);
 
-    $photo = Content::instance('FetchFirstPhoto', $this->post['body'])->activate(true);
-    $photo = preg_match('/^<img src="([a-z-:\.\/]+)" [^>]+>$/', $photo, $matches);
-    $this->set_head('thumbnail', $matches[1]);
+	$photo = Content::instance('FetchFirstPhoto', $this->post['body'])->activate(true);
+	$photo = preg_match('/^<img src="([a-z-:\.\/]+)" [^>]+>$/', $photo, $matches);
+	$this->set_head('thumbnail', $matches[1]);
 
 		if (array_key_exists($this->post['id'], self::$DEPRECATED_BLOGS)) {
 			$log_id = self::$DEPRECATED_BLOGS[$this->post['id']];
@@ -79,7 +79,7 @@ 
 			'author' => self::$AUTHOR,
 			'author_url' => self::$AUTHOR_URL,
 			'comment_array' => $this->get_comment_array("{$this->post['category']}/{$this->post['path']}"),
-    ));
+	));
 	}
 
 	protected function get_post_description()
@@ -127,18 +127,18 @@ 
 			
 			$post = new stdclass();
 
-      if (
-        strpos($post_row['title'], 'Rainy Supe Loop') === 0 ||
-        strpos($post_row['title'], 'Malapais Loop') === 0 ||
-        strpos($post_row['title'], 'Mazatzal Peak Loop') === 0 ||
-        strpos($post_row['title'], 'Dripping Springs Loop') === 0
-      ) {
-        $title = $post_row['title'];
-        $title = explode(':', $title);
-        $title = array_pop($title);
-        $title = trim($title);
-        $post->title = $title;
-      } else if (strpos($post_row['title'], 'Isle Royale') === 0) {
+	  if (
+		strpos($post_row['title'], 'Rainy Supe Loop') === 0 ||
+		strpos($post_row['title'], 'Malapais Loop') === 0 ||
+		strpos($post_row['title'], 'Mazatzal Peak Loop') === 0 ||
+		strpos($post_row['title'], 'Dripping Springs Loop') === 0
+	  ) {
+		$title = $post_row['title'];
+		$title = explode(':', $title);
+		$title = array_pop($title);
+		$title = trim($title);
+		$post->title = $title;
+	  } else if (strpos($post_row['title'], 'Isle Royale') === 0) {
 				$title = $post_row['title'];
 				$title = explode(',', $title);
 				$title = array_pop($title);
@@ -169,12 +169,12 @@ 
 	private $series_posts;
 	private function fetch_series_posts()
 	{
-      if(!isset($this->series_posts)) {
-          global $container;
-          $repository = new Jacobemerick\Web\Domain\Blog\Series\MysqlSeriesRepository($container['db_connection_locator']);
-          $this->series_posts = $repository->getSeriesForPost($this->post['id']);
-      }
-      return $this->series_posts;
+	  if(!isset($this->series_posts)) {
+		  global $container;
+		  $repository = new Jacobemerick\Web\Domain\Blog\Series\MysqlSeriesRepository($container['db_connection_locator']);
+		  $this->series_posts = $repository->getSeriesForPost($this->post['id']);
+	  }
+	  return $this->series_posts;
 	}
 
 	private function get_related_posts()
@@ -192,11 +192,11 @@ 
 			$exclude_post_array[] = $series_post['post'];
 		}
 
-        global $container;
-        $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-        $post_result = $repository->getActivePostsByRelatedTags($this->post['id']);
+		global $container;
+		$repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+		$post_result = $repository->getActivePostsByRelatedTags($this->post['id']);
 
-        $post_array = array();
+		$post_array = array();
 		
 		foreach($post_result as $post_row)
 		{
@@ -213,64 +213,64 @@ 
 		return $post_array;
 	}
 
-    protected function get_comment_array($path)
-    {
-        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);
+	protected function get_comment_array($path)
+	{
+		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);
+		$client = new Jacobemerick\CommentService\ApiClient($configuration);
+		$api = new Jacobemerick\CommentService\Api\DefaultApi($client);
 
-        $start = microtime(true);
-        try {
-            $comment_response = $api->getComments(
-                1,
-                null,
-                'date',
-                'blog.jacobemerick.com',
-                $path
-            );
-        } catch (Exception $e) {
-            global $container;
-            $container['logger']->warning("CommentService | Path | {$e->getMessage()}");
-            return;
-        }
+		$start = microtime(true);
+		try {
+			$comment_response = $api->getComments(
+				1,
+				null,
+				'date',
+				'blog.jacobemerick.com',
+				$path
+			);
+		} catch (Exception $e) {
+			global $container;
+			$container['logger']->warning("CommentService | Path | {$e->getMessage()}");
+			return;
+		}
  
-        $elapsed = microtime(true) - $start;
-        global $container;
-        $container['logger']->info("CommentService | Path | {$elapsed}");
+		$elapsed = microtime(true) - $start;
+		global $container;
+		$container['logger']->info("CommentService | Path | {$elapsed}");
 
-        $array = array();
-        foreach((array) $comment_response as $comment)
-        {
-            $body = $comment->getBody();
-            $body = Content::instance('CleanComment', $body)->activate();
-            $body = strip_tags($body);
+		$array = array();
+		foreach((array) $comment_response as $comment)
+		{
+			$body = $comment->getBody();
+			$body = Content::instance('CleanComment', $body)->activate();
+			$body = strip_tags($body);
 
-            $comment_obj = new stdclass();
-            $comment_obj->id = $comment->getId();
-            $comment_obj->name = $comment->getCommenter()->getName();
-            $comment_obj->url = $comment->getCommenter()->getWebsite();
-            $comment_obj->trusted = true;
-            $comment_obj->date = $comment->getDate()->format('M j, \'y');
-            $comment_obj->body = $body;
+			$comment_obj = new stdclass();
+			$comment_obj->id = $comment->getId();
+			$comment_obj->name = $comment->getCommenter()->getName();
+			$comment_obj->url = $comment->getCommenter()->getWebsite();
+			$comment_obj->trusted = true;
+			$comment_obj->date = $comment->getDate()->format('M j, \'y');
+			$comment_obj->body = $body;
 
-            // todo figure out if reply
-            $array[] = $comment_obj;
-        }
+			// todo figure out if reply
+			$array[] = $comment_obj;
+		}
 
-        // todo figure out commenter obj
-        // todo figure out how to handle errors or whatever
-        return [
-            'comments' => $array,
-            'commenter' => [],
-            'errors' => [],
-            'comment_count' => count($array),
-        ];
-    }
+		// todo figure out commenter obj
+		// todo figure out how to handle errors or whatever
+		return [
+			'comments' => $array,
+			'commenter' => [],
+			'errors' => [],
+			'comment_count' => count($array),
+		];
+	}
 }

Spacing +15 added lines, -15 removed lines

@@ -27,13 +27,13 @@ 
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $this->post = $repository->findPostByPath(URLDecode::getPiece(2));
 
-		if($this->post == null)
+		if ($this->post == null)
 			$this->eject();
 		
 		$this->handle_comment_submit(
 			self::$BLOG_SITE_ID,
 			$this->post['path'],
-			Loader::getRootUrl('blog') . $this->post['category'] . '/' . $this->post['path'] . '/',
+			Loader::getRootUrl('blog').$this->post['category'].'/'.$this->post['path'].'/',
 			$this->post['title']);
 
         global $container;
@@ -58,7 +58,7 @@ 
 			$log_id = self::$DEPRECATED_BLOGS[$this->post['id']];
 			$log = LogCollector::getById($log_id);
 			if (!empty($log)) {
-				$log_url = Loader::getRootUrl('waterfalls') . "journal/{$log->alias}/";
+				$log_url = Loader::getRootUrl('waterfalls')."journal/{$log->alias}/";
 				$this->set_canonical($log_url);
 			}
 		}
@@ -96,7 +96,7 @@ 
 		$keyword_array = array();
 		$keywords = $this->tags;
 		
-		foreach($keywords as $keyword)
+		foreach ($keywords as $keyword)
 		{
 			$keyword_array[] = $keyword['tag'];
 		}
@@ -110,16 +110,16 @@ 
 	private function get_series_posts()
 	{
 		$series_posts = $this->fetch_series_posts();
-		if(count($series_posts) < 1)
+		if (count($series_posts) < 1)
 			return array();
 		
 		$previous_post = new stdclass();
 		$next_post = new stdclass();
 		
 		$found_current_post = false;
-		foreach($series_posts as $post_row)
+		foreach ($series_posts as $post_row)
 		{
-			if($post_row['post'] == $this->post['id'])
+			if ($post_row['post'] == $this->post['id'])
 			{
 				$found_current_post = true;
 				continue;
@@ -148,9 +148,9 @@ 
 				$post->title = $post_row['title'];
 			}
 
-			$post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
+			$post->url = Loader::getRootUrl('blog')."{$post_row['category']}/{$post_row['path']}/";
 			
-			if(!$found_current_post)
+			if (!$found_current_post)
 				$previous_post = $post;
 			else
 			{
@@ -169,7 +169,7 @@ 
 	private $series_posts;
 	private function fetch_series_posts()
 	{
-      if(!isset($this->series_posts)) {
+      if (!isset($this->series_posts)) {
           global $container;
           $repository = new Jacobemerick\Web\Domain\Blog\Series\MysqlSeriesRepository($container['db_connection_locator']);
           $this->series_posts = $repository->getSeriesForPost($this->post['id']);
@@ -180,14 +180,14 @@ 
 	private function get_related_posts()
 	{
 		$tag_array = array();
-		foreach($this->tags as $tag)
+		foreach ($this->tags as $tag)
 		{
 			$tag_array[] = $tag['id'];
 		}
 		
 		$series_posts = $this->fetch_series_posts();
 		$exclude_post_array = array();
-		foreach($series_posts as $series_post)
+		foreach ($series_posts as $series_post)
 		{
 			$exclude_post_array[] = $series_post['post'];
 		}
@@ -198,11 +198,11 @@ 
 
         $post_array = array();
 		
-		foreach($post_result as $post_row)
+		foreach ($post_result as $post_row)
 		{
 			$post = new stdclass();
 			$post->title = $post_row['title'];
-			$post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
+			$post->url = Loader::getRootUrl('blog')."{$post_row['category']}/{$post_row['path']}/";
 			$post->category = ucwords(str_replace('-', ' ', $post_row['category']));
 			$post->thumb = Content::instance('FetchFirstPhoto', $post_row['body'])->activate();
 			$post->body = Content::instance('SmartTrim', $post_row['body'])->activate(($post->thumb !== '') ? self::$POST_LENGTH_SHORT : self::$POST_LENGTH_LONG);
@@ -246,7 +246,7 @@ 
         $container['logger']->info("CommentService | Path | {$elapsed}");
 
         $array = array();
-        foreach((array) $comment_response as $comment)
+        foreach ((array) $comment_response as $comment)
         {
             $body = $comment->getBody();
             $body = Content::instance('CleanComment', $body)->activate();