jacobemerick / web

controller/blog/PostController.class.inc.php

Spacing +14 added lines, -14 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);
 			}
 		}
@@ -95,7 +95,7 @@ 
 		$keyword_array = array();
 		$keywords = $this->tags;
 		
-		foreach($keywords as $keyword)
+		foreach ($keywords as $keyword)
 		{
 			$keyword_array[] = $keyword['tag'];
 		}
@@ -109,16 +109,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;
@@ -146,9 +146,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
 			{
@@ -167,7 +167,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']);
@@ -178,14 +178,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'];
 		}
@@ -196,11 +196,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);

Indentation +155 added lines, -155 removed lines

@@ -6,194 +6,194 @@ 
 final class PostController extends DefaultPageController
 {
 
-	private static $PAGE_DESCRIPTION_LIMIT = 250;
+    private static $PAGE_DESCRIPTION_LIMIT = 250;
 
-	private static $TITLE = "%s | Jacob Emerick's Blog";
-	private static $AUTHOR = 'Jacob Emerick';
-	private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
+    private static $TITLE = "%s | Jacob Emerick's Blog";
+    private static $AUTHOR = 'Jacob Emerick';
+    private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
 
-	private static $POST_LENGTH_SHORT = 100;
-	private static $POST_LENGTH_LONG = 140;
+    private static $POST_LENGTH_SHORT = 100;
+    private static $POST_LENGTH_LONG = 140;
 
-	private $post;
-	private $tags;
-	private $comment_errors = array();
+    private $post;
+    private $tags;
+    private $comment_errors = array();
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 		
         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();
+        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'] . '/',
-			$this->post['title']);
+        $this->handle_comment_submit(
+            self::$BLOG_SITE_ID,
+            $this->post['path'],
+            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']);
-	}
+    }
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		$this->set_title(sprintf(self::$TITLE, $this->post['title']));
-		$this->set_description($this->get_post_description());
-		$this->set_keywords($this->get_post_keywords());
-		$this->set_author(self::$AUTHOR);
+        $this->set_title(sprintf(self::$TITLE, $this->post['title']));
+        $this->set_description($this->get_post_description());
+        $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]);
 
-		if (array_key_exists($this->post['id'], self::$DEPRECATED_BLOGS)) {
-			$log_id = self::$DEPRECATED_BLOGS[$this->post['id']];
-			$log = LogCollector::getById($log_id);
-			if (!empty($log)) {
-				$log_url = Loader::getRootUrl('waterfalls') . "journal/{$log->alias}/";
-				$this->set_canonical($log_url);
-			}
-		}
-	}
-
-	protected function get_introduction() {}
-
-	protected function set_body_data()
-	{
-		parent::set_body_data();
+        if (array_key_exists($this->post['id'], self::$DEPRECATED_BLOGS)) {
+            $log_id = self::$DEPRECATED_BLOGS[$this->post['id']];
+            $log = LogCollector::getById($log_id);
+            if (!empty($log)) {
+                $log_url = Loader::getRootUrl('waterfalls') . "journal/{$log->alias}/";
+                $this->set_canonical($log_url);
+            }
+        }
+    }
+
+    protected function get_introduction() {}
+
+    protected function set_body_data()
+    {
+        parent::set_body_data();
 		
-		$this->set_body('title', $this->post['title']);
-		$this->set_body('view', 'Post');
-		$this->set_body('data', array(
-			'post' => $this->format_post($this->post, false),
-			'series_posts' => $this->get_series_posts(),
-			'related_posts' => $this->get_related_posts(),
-			'author' => self::$AUTHOR,
-			'author_url' => self::$AUTHOR_URL,
-      'comment_array' => $this->get_comment_array(
-          'blog.jacobemerick.com',
-          "{$this->post['category']}/{$this->post['path']}"
-      ),
+        $this->set_body('title', $this->post['title']);
+        $this->set_body('view', 'Post');
+        $this->set_body('data', array(
+            'post' => $this->format_post($this->post, false),
+            'series_posts' => $this->get_series_posts(),
+            'related_posts' => $this->get_related_posts(),
+            'author' => self::$AUTHOR,
+            'author_url' => self::$AUTHOR_URL,
+        'comment_array' => $this->get_comment_array(
+            'blog.jacobemerick.com',
+            "{$this->post['category']}/{$this->post['path']}"
+        ),
     ));
-	}
+    }
 
-	protected function get_post_description()
-	{
-		$description = $this->post['body'];
-		$description = strip_tags($description);
-		$description = Content::instance('SmartTrim', $description)->activate(self::$PAGE_DESCRIPTION_LIMIT);
+    protected function get_post_description()
+    {
+        $description = $this->post['body'];
+        $description = strip_tags($description);
+        $description = Content::instance('SmartTrim', $description)->activate(self::$PAGE_DESCRIPTION_LIMIT);
 		
-		return $description;
-	}
+        return $description;
+    }
 
-	protected function get_post_keywords()
-	{
-		$keyword_array = array();
-		$keywords = $this->tags;
+    protected function get_post_keywords()
+    {
+        $keyword_array = array();
+        $keywords = $this->tags;
 		
-		foreach($keywords as $keyword)
-		{
-			$keyword_array[] = $keyword['tag'];
-		}
+        foreach($keywords as $keyword)
+        {
+            $keyword_array[] = $keyword['tag'];
+        }
 		
-		$keyword_array[] = 'blog';
-		$keyword_array[] = 'Jacob Emerick';
+        $keyword_array[] = 'blog';
+        $keyword_array[] = 'Jacob Emerick';
 		
-		return $keyword_array;
-	}
-
-	private function get_series_posts()
-	{
-		$series_posts = $this->fetch_series_posts();
-		if(count($series_posts) < 1)
-			return array();
+        return $keyword_array;
+    }
+
+    private function get_series_posts()
+    {
+        $series_posts = $this->fetch_series_posts();
+        if(count($series_posts) < 1)
+            return array();
 		
-		$previous_post = new stdclass();
-		$next_post = new stdclass();
+        $previous_post = new stdclass();
+        $next_post = new stdclass();
 		
-		$found_current_post = false;
-		foreach($series_posts as $post_row)
-		{
-			if($post_row['post'] == $this->post['id'])
-			{
-				$found_current_post = true;
-				continue;
-			}
+        $found_current_post = false;
+        foreach($series_posts as $post_row)
+        {
+            if($post_row['post'] == $this->post['id'])
+            {
+                $found_current_post = true;
+                continue;
+            }
 			
-			$post = new stdclass();
+            $post = new stdclass();
 
-      if (
+        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);
-				$title = trim($title);
-				$post->title = $title;
-			} else {
-				$post->title = $post_row['title'];
-			}
-
-			$post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
+        } else if (strpos($post_row['title'], 'Isle Royale') === 0) {
+                $title = $post_row['title'];
+                $title = explode(',', $title);
+                $title = array_pop($title);
+                $title = trim($title);
+                $post->title = $title;
+            } else {
+                $post->title = $post_row['title'];
+            }
+
+            $post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
 			
-			if(!$found_current_post)
-				$previous_post = $post;
-			else
-			{
-				$next_post = $post;
-				break;
-			}
-		}
+            if(!$found_current_post)
+                $previous_post = $post;
+            else
+            {
+                $next_post = $post;
+                break;
+            }
+        }
 		
-		return array(
-			'title' => $post_row['series_title'],
-			'description' => Content::instance('FixInternalLink', $post_row['series_description'])->activate(),
-			'previous' => $previous_post,
-			'next' => $next_post);
-	}
-
-	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;
-	}
-
-	private function get_related_posts()
-	{
-		$tag_array = array();
-		foreach($this->tags as $tag)
-		{
-			$tag_array[] = $tag['id'];
-		}
+        return array(
+            'title' => $post_row['series_title'],
+            'description' => Content::instance('FixInternalLink', $post_row['series_description'])->activate(),
+            'previous' => $previous_post,
+            'next' => $next_post);
+    }
+
+    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;
+    }
+
+    private function get_related_posts()
+    {
+        $tag_array = array();
+        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)
-		{
-			$exclude_post_array[] = $series_post['post'];
-		}
+        $series_posts = $this->fetch_series_posts();
+        $exclude_post_array = array();
+        foreach($series_posts as $series_post)
+        {
+            $exclude_post_array[] = $series_post['post'];
+        }
 
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
@@ -201,18 +201,18 @@ 
 
         $post_array = array();
 		
-		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->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);
+        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->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);
 			
-			$post_array[] = $post;
-		}
+            $post_array[] = $post;
+        }
 		
-		return $post_array;
-	}
+        return $post_array;
+    }
 }

Braces +30 added lines, -26 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('collector', 'waterfall/LogCollector');
 Loader::load('controller', 'blog/DefaultPageController');
 
-final class PostController extends DefaultPageController
-{
+final class PostController extends DefaultPageController

+{

 
 	private static $PAGE_DESCRIPTION_LIMIT = 250;
 
@@ -19,16 +19,17 @@ 
 	private $tags;
 	private $comment_errors = array();
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		parent::__construct();
 		
         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();
+		if($this->post == null) {

+					$this->eject();

+		}

 		
 		$this->handle_comment_submit(
 			self::$BLOG_SITE_ID,
@@ -41,8 +42,8 @@ 
         $this->tags = $repository->getTagsForPost($this->post['id']);
 	}
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		parent::set_head_data();
 		
 		$this->set_title(sprintf(self::$TITLE, $this->post['title']));
@@ -64,10 +65,12 @@ 
 		}
 	}
 
-	protected function get_introduction() {}
+	protected function get_introduction()

+	{

+}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		parent::set_body_data();
 		
 		$this->set_body('title', $this->post['title']);
@@ -85,8 +88,8 @@ 
     ));
 	}
 
-	protected function get_post_description()
-	{
+	protected function get_post_description()

+	{

 		$description = $this->post['body'];
 		$description = strip_tags($description);
 		$description = Content::instance('SmartTrim', $description)->activate(self::$PAGE_DESCRIPTION_LIMIT);
@@ -94,8 +97,8 @@ 
 		return $description;
 	}
 
-	protected function get_post_keywords()
-	{
+	protected function get_post_keywords()

+	{

 		$keyword_array = array();
 		$keywords = $this->tags;
 		
@@ -110,11 +113,12 @@ 
 		return $keyword_array;
 	}
 
-	private function get_series_posts()
-	{
+	private function get_series_posts()

+	{

 		$series_posts = $this->fetch_series_posts();
-		if(count($series_posts) < 1)
-			return array();
+		if(count($series_posts) < 1) {

+					return array();

+		}

 		
 		$previous_post = new stdclass();
 		$next_post = new stdclass();
@@ -153,9 +157,9 @@ 
 
 			$post->url = Loader::getRootUrl('blog') . "{$post_row['category']}/{$post_row['path']}/";
 			
-			if(!$found_current_post)
-				$previous_post = $post;
-			else
+			if(!$found_current_post) {

+							$previous_post = $post;

+			} else
 			{
 				$next_post = $post;
 				break;
@@ -170,8 +174,8 @@ 
 	}
 
 	private $series_posts;
-	private function fetch_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']);
@@ -180,8 +184,8 @@ 
       return $this->series_posts;
 	}
 
-	private function get_related_posts()
-	{
+	private function get_related_posts()

+	{

 		$tag_array = array();
 		foreach($this->tags as $tag)
 		{

controller/PageController.class.inc.php

Doc Comments +31 added lines

@@ -113,6 +113,9 @@ 
 			exit;
 	}
 
+	/**
+	 * @param string $method
+	 */
 	protected function set_header_method($method)
 	{
 		$this->headers = $method;
@@ -123,6 +126,9 @@ 
 		$this->set_head('title', $value);
 	}
 
+	/**
+	 * @param string $value
+	 */
 	protected function set_author($value)
 	{
 		$this->set_head('author', $value);
@@ -138,26 +144,41 @@ 
 		$this->set_head('keywords', implode(', ', $array));
 	}
 	
+	/**
+	 * @param string $url
+	 */
 	protected function set_canonical($url)
 	{
 		$this->set_head('canonical', $url);
 	}
 
+	/**
+	 * @param string $set
+	 */
 	protected function set_head($set, $value)
 	{
 		$this->data_array['head'][$set] = $value;
 	}
 
+	/**
+	 * @param string $set
+	 */
 	protected function set_body($set, $value)
 	{
 		$this->data_array['body'][$set] = $value;
 	}
 
+	/**
+	 * @param string $file
+	 */
 	protected function add_css($file, $version = 1)
 	{
 		$this->css_array[] = [$file, $version];
 	}
 
+	/**
+	 * @param string $file
+	 */
 	protected function add_js($file)
 	{
 		$this->js_array[] = $file;
@@ -183,6 +204,9 @@ 
 		$this->set_head('js_link_array', $js_array);
 	}
 
+	/**
+	 * @param string $view
+	 */
 	protected function set_body_view($view)
 	{
 		$this->body_view_array[] = $view;
@@ -227,6 +251,10 @@ 
 	}
 
 	private $comment_errors;
+
+	/**
+	 * @param string $redirect_url
+	 */
 	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
 	{
 		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
@@ -238,6 +266,9 @@ 
 		return;
 	}
 
+    /**
+     * @param string $site
+     */
     protected function get_comment_array($site, $path)
     {
         global $container;

Indentation +174 added lines, -174 removed lines

@@ -5,52 +5,52 @@ 
 abstract class PageController
 {
 
-	private static $TRACKING_CODE = 'UA-11745070-1';
+    private static $TRACKING_CODE = 'UA-11745070-1';
 	
-	protected static $DEPRECATED_BLOGS = array(
-		10 => 63,
-		55 => 67,
-	);
-
-	private $headers;
-	private $css_array = array();
-	private $font_css_array = array();
-	private $js_array = array();
-
-	private $data_array = array();
-	private $body_view_array = array();
-
-	protected function set_head_data() {}
-	protected function set_body_data() {}
-	protected function set_data() {}
-
-	public function __construct()
-	{
-		$this->set_header_method('sendHTML');
+    protected static $DEPRECATED_BLOGS = array(
+        10 => 63,
+        55 => 67,
+    );
+
+    private $headers;
+    private $css_array = array();
+    private $font_css_array = array();
+    private $js_array = array();
+
+    private $data_array = array();
+    private $body_view_array = array();
+
+    protected function set_head_data() {}
+    protected function set_body_data() {}
+    protected function set_data() {}
+
+    public function __construct()
+    {
+        $this->set_header_method('sendHTML');
 		
-		$this->set_head('google_verification', 'sgAISiuoWfK54KXnOfm2oU4vQdad8eyNCQX7LkZ1OxM');
-		$this->set_head('bing_verification', 'AF1A4CEA30A7589590E9294C4B512607');
+        $this->set_head('google_verification', 'sgAISiuoWfK54KXnOfm2oU4vQdad8eyNCQX7LkZ1OxM');
+        $this->set_head('bing_verification', 'AF1A4CEA30A7589590E9294C4B512607');
 		
-		$this->set_body('domain_container', $this->get_domain_container());
-		$this->set_body('footer', array(
-			'link' => Loader::getRootUrl('site'),
-			'anchor' => 'jacobemerick.com',
-			'date' => date('Y')));
-	}
-
-	protected function get_domain_container()
-	{
-		$domain_container = new stdclass();
+        $this->set_body('domain_container', $this->get_domain_container());
+        $this->set_body('footer', array(
+            'link' => Loader::getRootUrl('site'),
+            'anchor' => 'jacobemerick.com',
+            'date' => date('Y')));
+    }
+
+    protected function get_domain_container()
+    {
+        $domain_container = new stdclass();
 		
-		$domain_container->blog = Loader::getRootUrl('blog');
-		$domain_container->home = Loader::getRootUrl('home');
-		$domain_container->lifestream = Loader::getRootUrl('lifestream');
-		$domain_container->map = Loader::getRootUrl('map');
-		$domain_container->portfolio = Loader::getRootUrl('portfolio');
-		$domain_container->waterfalls = Loader::getRootUrl('waterfalls');
+        $domain_container->blog = Loader::getRootUrl('blog');
+        $domain_container->home = Loader::getRootUrl('home');
+        $domain_container->lifestream = Loader::getRootUrl('lifestream');
+        $domain_container->map = Loader::getRootUrl('map');
+        $domain_container->portfolio = Loader::getRootUrl('portfolio');
+        $domain_container->waterfalls = Loader::getRootUrl('waterfalls');
 		
-		return $domain_container;
-	}
+        return $domain_container;
+    }
 
     protected function get_recent_activity()
     {
@@ -84,24 +84,24 @@ 
         return (object) $post;
     }
 
-	public function activate()
-	{
-		$this->set_head_data();
-		$this->set_body_data();
-		$this->set_data();
+    public function activate()
+    {
+        $this->set_head_data();
+        $this->set_body_data();
+        $this->set_data();
 		
-		$this->load_assets();
+        $this->load_assets();
 		
-		$headers = $this->headers;
-		Header::$headers();
-		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']);
-		}
+        $headers = $this->headers;
+        Header::$headers();
+        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 (URLDecode::getSite() == 'waterfalls') {
             Loader::load('view', '/WaterfallFoot');
@@ -109,134 +109,134 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
-			exit;
-	}
-
-	protected function set_header_method($method)
-	{
-		$this->headers = $method;
-	}
-
-	protected function set_title($value)
-	{
-		$this->set_head('title', $value);
-	}
-
-	protected function set_author($value)
-	{
-		$this->set_head('author', $value);
-	}
-
-	protected function set_description($value)
-	{
-		$this->set_head('description', $value);
-	}
-
-	protected function set_keywords($array)
-	{
-		$this->set_head('keywords', implode(', ', $array));
-	}
+        if($view == '/404' || $view == '/503')
+            exit;
+    }
+
+    protected function set_header_method($method)
+    {
+        $this->headers = $method;
+    }
+
+    protected function set_title($value)
+    {
+        $this->set_head('title', $value);
+    }
+
+    protected function set_author($value)
+    {
+        $this->set_head('author', $value);
+    }
+
+    protected function set_description($value)
+    {
+        $this->set_head('description', $value);
+    }
+
+    protected function set_keywords($array)
+    {
+        $this->set_head('keywords', implode(', ', $array));
+    }
 	
-	protected function set_canonical($url)
-	{
-		$this->set_head('canonical', $url);
-	}
-
-	protected function set_head($set, $value)
-	{
-		$this->data_array['head'][$set] = $value;
-	}
-
-	protected function set_body($set, $value)
-	{
-		$this->data_array['body'][$set] = $value;
-	}
-
-	protected function add_css($file, $version = 1)
-	{
-		$this->css_array[] = [$file, $version];
-	}
-
-	protected function add_js($file)
-	{
-		$this->js_array[] = $file;
-	}
-
-	private function load_assets()
-	{
+    protected function set_canonical($url)
+    {
+        $this->set_head('canonical', $url);
+    }
+
+    protected function set_head($set, $value)
+    {
+        $this->data_array['head'][$set] = $value;
+    }
+
+    protected function set_body($set, $value)
+    {
+        $this->data_array['body'][$set] = $value;
+    }
+
+    protected function add_css($file, $version = 1)
+    {
+        $this->css_array[] = [$file, $version];
+    }
+
+    protected function add_js($file)
+    {
+        $this->js_array[] = $file;
+    }
+
+    private function load_assets()
+    {
     $css_array = array_map(function ($stylesheet) {
-      $path = "/css/{$stylesheet[0]}.css";
-      if ($stylesheet[1] > 1) {
+        $path = "/css/{$stylesheet[0]}.css";
+        if ($stylesheet[1] > 1) {
         $path .= "?v={$stylesheet[1]}";
-      }
-      return $path;
+        }
+        return $path;
     }, $this->css_array);
     $js_array = array_map(function ($script) {
-      if (substr($script, 0, 4) == 'http') {
+        if (substr($script, 0, 4) == 'http') {
         return $script;
-      }
-      return "/js/{$script}.min.js";
+        }
+        return "/js/{$script}.min.js";
     }, $this->js_array);
 		
-		$this->set_head('css_link_array', $css_array);
-		$this->set_head('js_link_array', $js_array);
-	}
-
-	protected function set_body_view($view)
-	{
-		$this->body_view_array[] = $view;
-	}
-
-	protected function eject()
-	{
-		if(get_class($this) !== 'Error404Controller')
-			Loader::loadNew('controller', '/Error404Controller')->activate();
-	}
-
-	protected function unavailable()
-	{
-		if(get_class($this) !== 'Error503Controller')
-			Loader::loadNew('controller', '/Error503Controller')->activate();
-	}
-
-	protected function redirect($uri, $method = 301)
-	{
-		switch($method)
-		{
-			case 301 :
-				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();
-				break;
-		}
-	}
-
-	final protected function get_parsed_date($date)
-	{
-		$parsed_date = new stdclass();
+        $this->set_head('css_link_array', $css_array);
+        $this->set_head('js_link_array', $js_array);
+    }
+
+    protected function set_body_view($view)
+    {
+        $this->body_view_array[] = $view;
+    }
+
+    protected function eject()
+    {
+        if(get_class($this) !== 'Error404Controller')
+            Loader::loadNew('controller', '/Error404Controller')->activate();
+    }
+
+    protected function unavailable()
+    {
+        if(get_class($this) !== 'Error503Controller')
+            Loader::loadNew('controller', '/Error503Controller')->activate();
+    }
+
+    protected function redirect($uri, $method = 301)
+    {
+        switch($method)
+        {
+            case 301 :
+                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();
+                break;
+        }
+    }
+
+    final protected function get_parsed_date($date)
+    {
+        $parsed_date = new stdclass();
 		
-		$parsed_date->stamp = date('c', strtotime($date));
-		$parsed_date->friendly = date('F j, Y', strtotime($date));
-		$parsed_date->elapsed = Content::instance('ElapsedTime', $date)->activate();
+        $parsed_date->stamp = date('c', strtotime($date));
+        $parsed_date->friendly = date('F j, Y', strtotime($date));
+        $parsed_date->elapsed = Content::instance('ElapsedTime', $date)->activate();
 		
-		return $parsed_date;
-	}
-
-	private $comment_errors;
-	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
-	{
-		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();
-		}
+        return $parsed_date;
+    }
+
+    private $comment_errors;
+    protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
+    {
+        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();
+        }
 		
-		return;
-	}
+        return;
+    }
 
     protected function get_comment_array($site, $path)
     {

Spacing +15 added lines, -15 removed lines

@@ -59,7 +59,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));
         }
 
@@ -75,7 +75,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);
@@ -95,12 +95,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') {
@@ -109,7 +109,7 @@ 
             Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE));
         }
 		
-		if($view == '/404' || $view == '/503')
+		if ($view == '/404' || $view == '/503')
 			exit;
 	}
 
@@ -165,14 +165,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;
       }
@@ -190,26 +190,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;
 		}
@@ -229,7 +229,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();
@@ -261,7 +261,7 @@ 
         $container['logger']->info("CommentService | Path | {$elapsed}");
 
         $array = array();
-        foreach((array) $comment_response as $comment)
+        foreach ((array) $comment_response as $comment)
         {
             $body = Content::instance('CleanComment', $comment['body'])->activate();
             $body = strip_tags($body);

Braces +77 added lines, -65 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('utility', 'Header');
 
-abstract class PageController
-{
+abstract class PageController

+{

 
 	private static $TRACKING_CODE = 'UA-11745070-1';
 	
@@ -20,12 +20,18 @@ 
 	private $data_array = array();
 	private $body_view_array = array();
 
-	protected function set_head_data() {}
-	protected function set_body_data() {}
-	protected function set_data() {}
+	protected function set_head_data()

+	{

+}
+	protected function set_body_data()

+	{

+}
+	protected function set_data()

+	{

+}
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		$this->set_header_method('sendHTML');
 		
 		$this->set_head('google_verification', 'sgAISiuoWfK54KXnOfm2oU4vQdad8eyNCQX7LkZ1OxM');
@@ -38,8 +44,8 @@ 
 			'date' => date('Y')));
 	}
 
-	protected function get_domain_container()
-	{
+	protected function get_domain_container()

+	{

 		$domain_container = new stdclass();
 		
 		$domain_container->blog = Loader::getRootUrl('blog');
@@ -52,8 +58,8 @@ 
 		return $domain_container;
 	}
 
-    protected function get_recent_activity()
-    {
+    protected function get_recent_activity()

+    {

         global $container;
         $activityRepository = new Jacobemerick\Web\Domain\Stream\Activity\MysqlActivityRepository($container['db_connection_locator']);
         $post_result = $activityRepository->getActivities(5);
@@ -66,8 +72,8 @@ 
         return $post_array;
     }
 
-    protected function expand_post($raw_post, $format = 'short')
-    {
+    protected function expand_post($raw_post, $format = 'short')

+    {

         $post = [
             'type' => $raw_post['type'],
             'title' => ($format == 'short') ? $raw_post['message'] : $raw_post['message_long'],
@@ -84,8 +90,8 @@ 
         return (object) $post;
     }
 
-	public function activate()
-	{
+	public function activate()

+	{

 		$this->set_head_data();
 		$this->set_body_data();
 		$this->set_data();
@@ -97,10 +103,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') {
@@ -109,62 +116,63 @@ 
             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)
-	{
+	protected function set_header_method($method)

+	{

 		$this->headers = $method;
 	}
 
-	protected function set_title($value)
-	{
+	protected function set_title($value)

+	{

 		$this->set_head('title', $value);
 	}
 
-	protected function set_author($value)
-	{
+	protected function set_author($value)

+	{

 		$this->set_head('author', $value);
 	}
 
-	protected function set_description($value)
-	{
+	protected function set_description($value)

+	{

 		$this->set_head('description', $value);
 	}
 
-	protected function set_keywords($array)
-	{
+	protected function set_keywords($array)

+	{

 		$this->set_head('keywords', implode(', ', $array));
 	}
 	
-	protected function set_canonical($url)
-	{
+	protected function set_canonical($url)

+	{

 		$this->set_head('canonical', $url);
 	}
 
-	protected function set_head($set, $value)
-	{
+	protected function set_head($set, $value)

+	{

 		$this->data_array['head'][$set] = $value;
 	}
 
-	protected function set_body($set, $value)
-	{
+	protected function set_body($set, $value)

+	{

 		$this->data_array['body'][$set] = $value;
 	}
 
-	protected function add_css($file, $version = 1)
-	{
+	protected function add_css($file, $version = 1)

+	{

 		$this->css_array[] = [$file, $version];
 	}
 
-	protected function add_js($file)
-	{
+	protected function add_js($file)

+	{

 		$this->js_array[] = $file;
 	}
 
-	private function load_assets()
-	{
+	private function load_assets()

+	{

     $css_array = array_map(function ($stylesheet) {
       $path = "/css/{$stylesheet[0]}.css";
       if ($stylesheet[1] > 1) {
@@ -183,40 +191,44 @@ 
 		$this->set_head('js_link_array', $js_array);
 	}
 
-	protected function set_body_view($view)
-	{
+	protected function set_body_view($view)

+	{

 		$this->body_view_array[] = $view;
 	}
 
-	protected function eject()
-	{
-		if(get_class($this) !== 'Error404Controller')
-			Loader::loadNew('controller', '/Error404Controller')->activate();
+	protected function eject()

+	{

+		if(get_class($this) !== 'Error404Controller') {

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

+		}

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

+	{

+		if(get_class($this) !== 'Error503Controller') {

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

+		}

 	}
 
-	protected function redirect($uri, $method = 301)
-	{
+	protected function redirect($uri, $method = 301)

+	{

 		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;
 		}
 	}
 
-	final protected function get_parsed_date($date)
-	{
+	final protected function get_parsed_date($date)

+	{

 		$parsed_date = new stdclass();
 		
 		$parsed_date->stamp = date('c', strtotime($date));
@@ -227,8 +239,8 @@ 
 	}
 
 	private $comment_errors;
-	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)
-	{
+	protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title)

+	{

 		if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment')
 		{
 			$parameters = array($site_id, $path, $redirect_url, $page_title);
@@ -238,8 +250,8 @@ 
 		return;
 	}
 
-    protected function get_comment_array($site, $path)
-    {
+    protected function get_comment_array($site, $path)

+    {

         global $container;
         $repository = new Jacobemerick\Web\Domain\Comment\Comment\ServiceCommentRepository($container['comment_service_api']);
         $start = microtime(true);

collector/comment/CommentCollector.class.inc.php

Indentation +25 added lines, -25 removed lines

@@ -5,13 +5,13 @@ 
 final class CommentCollector extends Collector
 {
 
-	public static function getCommenterByFields($name, $email, $website)
-	{
-		$name = self::escape($name);
-		$email = self::escape($email);
-		$website = self::escape($website);
+    public static function getCommenterByFields($name, $email, $website)
+    {
+        $name = self::escape($name);
+        $email = self::escape($email);
+        $website = self::escape($website);
 		
-		$query = "
+        $query = "
 			SELECT
 				*
 			FROM
@@ -22,14 +22,14 @@ 
 				`url` = '{$website}'
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getCommentByBody($body)
-	{
-		$body = self::escape($body);
+    public static function getCommentByBody($body)
+    {
+        $body = self::escape($body);
 		
-		$query = "
+        $query = "
 			SELECT
 				*
 			FROM
@@ -38,14 +38,14 @@ 
 				`body` = '{$body}'
 			LIMIT 1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getCommentPageByURL($path, $site)
-	{
-		$path = self::escape($path);
+    public static function getCommentPageByURL($path, $site)
+    {
+        $path = self::escape($path);
 		
-		$query = "
+        $query = "
 			SELECT
 				*
 			FROM
@@ -56,12 +56,12 @@ 
 			LIMIT
 				1";
 		
-		return self::run_row_query($query);
-	}
+        return self::run_row_query($query);
+    }
 
-	public static function getNotificationForPage($comment_page)
-	{
-		$query = "
+    public static function getNotificationForPage($comment_page)
+    {
+        $query = "
 			SELECT
 				`name`,
 				`email`
@@ -80,6 +80,6 @@ 
 			ORDER BY
 				`date` DESC";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 }

Braces +10 added lines, -10 removed lines

@@ -2,11 +2,11 @@ 
 
 Loader::load('collector', 'Collector');
 
-final class CommentCollector extends Collector
-{
+final class CommentCollector extends Collector

+{

 
-	public static function getCommenterByFields($name, $email, $website)
-	{
+	public static function getCommenterByFields($name, $email, $website)

+	{

 		$name = self::escape($name);
 		$email = self::escape($email);
 		$website = self::escape($website);
@@ -25,8 +25,8 @@ 
 		return self::run_row_query($query);
 	}
 
-	public static function getCommentByBody($body)
-	{
+	public static function getCommentByBody($body)

+	{

 		$body = self::escape($body);
 		
 		$query = "
@@ -41,8 +41,8 @@ 
 		return self::run_row_query($query);
 	}
 
-	public static function getCommentPageByURL($path, $site)
-	{
+	public static function getCommentPageByURL($path, $site)

+	{

 		$path = self::escape($path);
 		
 		$query = "
@@ -59,8 +59,8 @@ 
 		return self::run_row_query($query);
 	}
 
-	public static function getNotificationForPage($comment_page)
-	{
+	public static function getNotificationForPage($comment_page)

+	{

 		$query = "
 			SELECT
 				`name`,

controller/blog/DefaultPageController.class.inc.php

Indentation +113 added lines, -113 removed lines

@@ -6,150 +6,150 @@
 abstract class DefaultPageController extends PageController
 {
 
-	private static $RECENT_COMMENT_COUNT = 10;
-	private static $MINIMUM_TAG_COUNT = 10;
-	protected static $LENGTH_OF_TRIMMED_POST = 300;
+    private static $RECENT_COMMENT_COUNT = 10;
+    private static $MINIMUM_TAG_COUNT = 10;
+    protected static $LENGTH_OF_TRIMMED_POST = 300;
 
-	protected static $BLOG_SITE_ID = 2;
+    protected static $BLOG_SITE_ID = 2;
 
-	private static $INTRODUCTION_IMAGE_PATTERN = '<img src="/photo/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" />';
+    private static $INTRODUCTION_IMAGE_PATTERN = '<img src="/photo/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" />';
 
-	protected function set_head_data()
-	{
+    protected function set_head_data()
+    {
     $this->set_head('rss_link', [
-      'title' => 'Jacob Emerick Blog Feed',
-      'url' => '/rss.xml'
+        'title' => 'Jacob Emerick Blog Feed',
+        'url' => '/rss.xml'
     ]);
     $this->set_head('rss_comment_link', [
-      'title' => 'Jacob Emerick Blog Comment Feed',
-      'url' => '/rss-comments.xml'
+        'title' => 'Jacob Emerick Blog Comment Feed',
+        'url' => '/rss-comments.xml'
     ]);
 		
-		$this->add_css('normalize');
-		$this->add_css('blog');
-	}
-
-	protected function get_introduction()
-	{
-		return;
-	}
-
-	protected function get_introduction_image($id)
-	{
-		Loader::load('collector', 'image/PhotoCollector');
-		$photo_result = PhotoCollector::getRow($id);
+        $this->add_css('normalize');
+        $this->add_css('blog');
+    }
+
+    protected function get_introduction()
+    {
+        return;
+    }
+
+    protected function get_introduction_image($id)
+    {
+        Loader::load('collector', 'image/PhotoCollector');
+        $photo_result = PhotoCollector::getRow($id);
 		
-		if($photo_result == null)
-			return;
+        if($photo_result == null)
+            return;
 		
-		$name = $photo_result->name;
-		$category = $photo_result->category;
-		$size = 'medium';
-		$height = 375;
-		$width = 500;
-		$description = $photo_result->description;
+        $name = $photo_result->name;
+        $category = $photo_result->category;
+        $size = 'medium';
+        $height = 375;
+        $width = 500;
+        $description = $photo_result->description;
 		
-		return sprintf(self::$INTRODUCTION_IMAGE_PATTERN, $category, $name, $size, $height, $width, $description);
-	}
-
-	protected function set_body_data()
-	{
-		$this->set_body('introduction', $this->get_introduction());
-		$this->set_body('right_side', $this->get_right_side());
-		$this->set_body('activity_array', $this->get_recent_activity());
+        return sprintf(self::$INTRODUCTION_IMAGE_PATTERN, $category, $name, $size, $height, $width, $description);
+    }
+
+    protected function set_body_data()
+    {
+        $this->set_body('introduction', $this->get_introduction());
+        $this->set_body('right_side', $this->get_right_side());
+        $this->set_body('activity_array', $this->get_recent_activity());
 		
-		$this->set_body_view('Page');
-	}
+        $this->set_body_view('Page');
+    }
 
-	final protected function format_post($post, $trim = false)
-	{
-		$post_object = new stdclass();
+    final protected function format_post($post, $trim = false)
+    {
+        $post_object = new stdclass();
 		
-		$post_object->title = $post['title'];
-		$post_object->path = "/{$post['category']}/{$post['path']}/";
-		$post_object->category = ucwords(str_replace('-', ' ', $post['category']));
-		$post_object->category_link = "/{$post['category']}/";
-		$post_object->tags = $this->get_tags_for_post($post);
-		$post_object->image = Content::instance('FetchFirstPhoto', $post['body'])->activate(false, 'small');
-		$post_object->body = $this->get_body_for_post($post, $trim);
-		$post_object->date = $this->get_parsed_date($post['date']);
-
-		return $post_object;
-	}
-
-	final private function get_tags_for_post($post)
-	{
+        $post_object->title = $post['title'];
+        $post_object->path = "/{$post['category']}/{$post['path']}/";
+        $post_object->category = ucwords(str_replace('-', ' ', $post['category']));
+        $post_object->category_link = "/{$post['category']}/";
+        $post_object->tags = $this->get_tags_for_post($post);
+        $post_object->image = Content::instance('FetchFirstPhoto', $post['body'])->activate(false, 'small');
+        $post_object->body = $this->get_body_for_post($post, $trim);
+        $post_object->date = $this->get_parsed_date($post['date']);
+
+        return $post_object;
+    }
+
+    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']);
 
         $tag_array = array();
-		foreach($tag_result as $tag)
-		{
-			$tag_object = new stdclass();
-			$tag_object->name = $tag['tag'];
-			$tag_object->link = Content::instance('URLSafe', "/tag/{$tag['tag']}/")->activate();
-			$tag_array[] = $tag_object;
-		}
-		return $tag_array;
-	}
-
-	final private function get_body_for_post($post, $trim)
-	{
-		$body = $post['body'];
+        foreach($tag_result as $tag)
+        {
+            $tag_object = new stdclass();
+            $tag_object->name = $tag['tag'];
+            $tag_object->link = Content::instance('URLSafe', "/tag/{$tag['tag']}/")->activate();
+            $tag_array[] = $tag_object;
+        }
+        return $tag_array;
+    }
+
+    final private function get_body_for_post($post, $trim)
+    {
+        $body = $post['body'];
 		
-		if($trim)
-			$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
+        if($trim)
+            $body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
 		
-		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
-		$body = Content::instance('MarkupCode', $body)->activate();
+        $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
+        $body = Content::instance('MarkupCode', $body)->activate();
 		
-		return $body;
-	}
-
-	final protected function get_right_side()
-	{
-		$side_array = array();
-		$side_array['tags'] = $this->get_tag_cloud();
-		$side_array['comments'] = $this->get_comments();
-		return $side_array;
-	}
-
-	final private function get_tag_cloud()
-	{
+        return $body;
+    }
+
+    final protected function get_right_side()
+    {
+        $side_array = array();
+        $side_array['tags'] = $this->get_tag_cloud();
+        $side_array['comments'] = $this->get_comments();
+        return $side_array;
+    }
+
+    final private function get_tag_cloud()
+    {
         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);
+        $maximum_tag_count = $this->get_maximum_tag_count($tag_result);
 		
-		$cloud_array = array();
-		foreach($tag_result as $tag)
-		{
-			if($tag['count'] < self::$MINIMUM_TAG_COUNT)
-				continue;
+        $cloud_array = array();
+        foreach($tag_result as $tag)
+        {
+            if($tag['count'] < self::$MINIMUM_TAG_COUNT)
+                continue;
 			
-			$tag_object = new stdclass();
-			$tag_object->name = $tag['tag'];
-			$tag_object->link = Content::instance('URLSafe', "/tag/{$tag['tag']}/")->activate();
-			$tag_object->scalar = floor(($tag['count'] - 1) * (9 / ($maximum_tag_count - self::$MINIMUM_TAG_COUNT)));
-			$cloud_array[] = $tag_object;
-		}
+            $tag_object = new stdclass();
+            $tag_object->name = $tag['tag'];
+            $tag_object->link = Content::instance('URLSafe', "/tag/{$tag['tag']}/")->activate();
+            $tag_object->scalar = floor(($tag['count'] - 1) * (9 / ($maximum_tag_count - self::$MINIMUM_TAG_COUNT)));
+            $cloud_array[] = $tag_object;
+        }
 		
-		return $cloud_array;
-	}
+        return $cloud_array;
+    }
 
-	final private function get_maximum_tag_count($tag_result)
-	{
-		$maximum = 1;
+    final private function get_maximum_tag_count($tag_result)
+    {
+        $maximum = 1;
 		
-		foreach($tag_result as $tag)
-		{
-			if($tag['count'] > $maximum)
-				$maximum = $tag['count'];
-		}
-		return $maximum;
-	}
+        foreach($tag_result as $tag)
+        {
+            if($tag['count'] > $maximum)
+                $maximum = $tag['count'];
+        }
+        return $maximum;
+    }
 
     final private function get_comments()
     {

Spacing +8 added lines, -8 removed lines

@@ -39,7 +39,7 @@ 
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::getRow($id);
 		
-		if($photo_result == null)
+		if ($photo_result == null)
 			return;
 		
 		$name = $photo_result->name;
@@ -84,7 +84,7 @@ 
         $tag_result = $repository->getTagsForPost($post['id']);
 
         $tag_array = array();
-		foreach($tag_result as $tag)
+		foreach ($tag_result as $tag)
 		{
 			$tag_object = new stdclass();
 			$tag_object->name = $tag['tag'];
@@ -98,7 +98,7 @@ 
 	{
 		$body = $post['body'];
 		
-		if($trim)
+		if ($trim)
 			$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
 		
 		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
@@ -124,9 +124,9 @@ 
 		$maximum_tag_count = $this->get_maximum_tag_count($tag_result);
 		
 		$cloud_array = array();
-		foreach($tag_result as $tag)
+		foreach ($tag_result as $tag)
 		{
-			if($tag['count'] < self::$MINIMUM_TAG_COUNT)
+			if ($tag['count'] < self::$MINIMUM_TAG_COUNT)
 				continue;
 			
 			$tag_object = new stdclass();
@@ -143,9 +143,9 @@ 
 	{
 		$maximum = 1;
 		
-		foreach($tag_result as $tag)
+		foreach ($tag_result as $tag)
 		{
-			if($tag['count'] > $maximum)
+			if ($tag['count'] > $maximum)
 				$maximum = $tag['count'];
 		}
 		return $maximum;
@@ -174,7 +174,7 @@ 
         $container['logger']->info("CommentService | Sidebar | {$elapsed}");
 
         $array = array();
-        foreach($comment_response as $comment)
+        foreach ($comment_response as $comment)
         {
             $body = Content::instance('CleanComment', $comment['body'])->activate();
             $body = strip_tags($body);

Braces +36 added lines, -32 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('controller', '/PageController');
 Loader::load('utility', 'Content');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController

+{

 
 	private static $RECENT_COMMENT_COUNT = 10;
 	private static $MINIMUM_TAG_COUNT = 10;
@@ -14,8 +14,8 @@ 
 
 	private static $INTRODUCTION_IMAGE_PATTERN = '<img src="/photo/%s/%s-size-%s.jpg" height="%d" width="%d" alt="%s" />';
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

     $this->set_head('rss_link', [
       'title' => 'Jacob Emerick Blog Feed',
       'url' => '/rss.xml'
@@ -29,18 +29,19 @@ 
 		$this->add_css('blog');
 	}
 
-	protected function get_introduction()
-	{
+	protected function get_introduction()

+	{

 		return;
 	}
 
-	protected function get_introduction_image($id)
-	{
+	protected function get_introduction_image($id)

+	{

 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::getRow($id);
 		
-		if($photo_result == null)
-			return;
+		if($photo_result == null) {

+					return;

+		}

 		
 		$name = $photo_result->name;
 		$category = $photo_result->category;
@@ -52,8 +53,8 @@ 
 		return sprintf(self::$INTRODUCTION_IMAGE_PATTERN, $category, $name, $size, $height, $width, $description);
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('introduction', $this->get_introduction());
 		$this->set_body('right_side', $this->get_right_side());
 		$this->set_body('activity_array', $this->get_recent_activity());
@@ -61,8 +62,8 @@ 
 		$this->set_body_view('Page');
 	}
 
-	final protected function format_post($post, $trim = false)
-	{
+	final protected function format_post($post, $trim = false)

+	{

 		$post_object = new stdclass();
 		
 		$post_object->title = $post['title'];
@@ -77,8 +78,8 @@ 
 		return $post_object;
 	}
 
-	final private function get_tags_for_post($post)
-	{
+	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']);
@@ -94,12 +95,13 @@ 
 		return $tag_array;
 	}
 
-	final private function get_body_for_post($post, $trim)
-	{
+	final private function get_body_for_post($post, $trim)

+	{

 		$body = $post['body'];
 		
-		if($trim)
-			$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);
+		if($trim) {

+					$body = Content::instance('SmartTrim', $body)->activate(self::$LENGTH_OF_TRIMMED_POST);

+		}

 		
 		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
 		$body = Content::instance('MarkupCode', $body)->activate();
@@ -107,16 +109,16 @@ 
 		return $body;
 	}
 
-	final protected function get_right_side()
-	{
+	final protected function get_right_side()

+	{

 		$side_array = array();
 		$side_array['tags'] = $this->get_tag_cloud();
 		$side_array['comments'] = $this->get_comments();
 		return $side_array;
 	}
 
-	final private function get_tag_cloud()
-	{
+	final private function get_tag_cloud()

+	{

         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->getTagCloud();
@@ -126,8 +128,9 @@ 
 		$cloud_array = array();
 		foreach($tag_result as $tag)
 		{
-			if($tag['count'] < self::$MINIMUM_TAG_COUNT)
-				continue;
+			if($tag['count'] < self::$MINIMUM_TAG_COUNT) {

+							continue;

+			}

 			
 			$tag_object = new stdclass();
 			$tag_object->name = $tag['tag'];
@@ -139,20 +142,21 @@ 
 		return $cloud_array;
 	}
 
-	final private function get_maximum_tag_count($tag_result)
-	{
+	final private function get_maximum_tag_count($tag_result)

+	{

 		$maximum = 1;
 		
 		foreach($tag_result as $tag)
 		{
-			if($tag['count'] > $maximum)
-				$maximum = $tag['count'];
+			if($tag['count'] > $maximum) {

+							$maximum = $tag['count'];

+			}

 		}
 		return $maximum;
 	}
 
-    final private function get_comments()
-    {
+    final private function get_comments()

+    {

         global $container;
         $repository = new Jacobemerick\Web\Domain\Comment\Comment\ServiceCommentRepository($container['comment_service_api']);
         $start = microtime(true);

controller/waterfalls/DefaultWaterfallListController.class.inc.php

Indentation +49 added lines, -49 removed lines

@@ -1,71 +1,71 @@
 <?
 
 Loader::load('collector', array(
-	'waterfall/CountyCollector',
-	'waterfall/WatercourseCollector',
-	'waterfall/WaterfallCollector'));
+    'waterfall/CountyCollector',
+    'waterfall/WatercourseCollector',
+    'waterfall/WaterfallCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
 abstract class DefaultWaterfallListController extends DefaultListController
 {
 
-	protected static $ITEM_COUNT_PER_PAGE = 24;
+    protected static $ITEM_COUNT_PER_PAGE = 24;
 
-	final protected function get_list_view()
-	{
-		return 'FallListing';
-	}
+    final protected function get_list_view()
+    {
+        return 'FallListing';
+    }
 
-	protected function get_item_count_per_page()
-	{
-		return self::$ITEM_COUNT_PER_PAGE;
-	}
+    protected function get_item_count_per_page()
+    {
+        return self::$ITEM_COUNT_PER_PAGE;
+    }
 
-	final protected function format_item($item)
-	{
-		$item_array = array();
+    final protected function format_item($item)
+    {
+        $item_array = array();
 		
-		$item_array['name'] = $item->name;
-		$item_array['watercourse'] = $item->watercourse;
-		$item_array['county'] = $item->county;
-		$item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description, 'medium');
-		$item_array['path'] = "/{$item->watercourse_alias}/{$item->waterfall_alias}/";
-		$item_array['comment_count'] = 0; // todo this
+        $item_array['name'] = $item->name;
+        $item_array['watercourse'] = $item->watercourse;
+        $item_array['county'] = $item->county;
+        $item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description, 'medium');
+        $item_array['path'] = "/{$item->watercourse_alias}/{$item->waterfall_alias}/";
+        $item_array['comment_count'] = 0; // todo this
 		
-		return $item_array;
-	}
+        return $item_array;
+    }
 
-	final protected function get_sidebar()
-	{
-		$county_result = CountyCollector::getCountyList();
-		$county_list = array();
+    final protected function get_sidebar()
+    {
+        $county_result = CountyCollector::getCountyList();
+        $county_list = array();
 		
-		foreach($county_result as $county_row)
-		{
-			$county = new stdclass();
-			$county->name = $county_row->name;
-			$county->uri = "/{$county_row->alias}/";
-			$county->count = $county_row->count;
+        foreach($county_result as $county_row)
+        {
+            $county = new stdclass();
+            $county->name = $county_row->name;
+            $county->uri = "/{$county_row->alias}/";
+            $county->count = $county_row->count;
 			
-			$county_list[] = $county;
-		}
+            $county_list[] = $county;
+        }
 		
-		$watercourse_result = WatercourseCollector::getWatercourseList();
-		$watercourse_list = array();
+        $watercourse_result = WatercourseCollector::getWatercourseList();
+        $watercourse_list = array();
 		
-		foreach($watercourse_result as $watercourse_row)
-		{
-			$watercourse = new stdclass();
-			$watercourse->name = $watercourse_row->name;
-			$watercourse->uri = "/{$watercourse_row->alias}/";
-			$watercourse->count = $watercourse_row->count;
+        foreach($watercourse_result as $watercourse_row)
+        {
+            $watercourse = new stdclass();
+            $watercourse->name = $watercourse_row->name;
+            $watercourse->uri = "/{$watercourse_row->alias}/";
+            $watercourse->count = $watercourse_row->count;
 			
-			$watercourse_list[] = $watercourse;
-		}
+            $watercourse_list[] = $watercourse;
+        }
 		
-		return array(
-			'county_list' => $county_list,
-			'watercourse_list' => $watercourse_list);
-	}
+        return array(
+            'county_list' => $county_list,
+            'watercourse_list' => $watercourse_list);
+    }
 
 }

controller/waterfalls/HomeController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         $container['logger']->info("CommentService | Sidebar | {$elapsed}");
 
         $array = array();
-        foreach($comment_response as $comment)
+        foreach ($comment_response as $comment)
         {
             $body = Content::instance('CleanComment', $comment['body'])->activate();
             $body = strip_tags($body);

Braces +8 added lines, -8 removed lines

@@ -6,8 +6,8 @@ 
 ));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
-final class HomeController extends DefaultPageController
-{
+final class HomeController extends DefaultPageController

+{

 
     private static $TITLE = 'Waterfalls of the Keweenaw | Stories and Tips from Jacob Emerick';
     private static $DESCRIPTION = 'Stories, maps, and details about many of the waterfalls in the Upper Peninsula of Michigan, compiled by Jacob Emerick.';
@@ -20,8 +20,8 @@ 
 
     private static $BANNER_IMAGE = 2661;
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         parent::set_head_data();
         
         $this->set_title(self::$TITLE);
@@ -29,8 +29,8 @@ 
         $this->set_keywords(self::$KEYWORD_ARRAY);
     }
 
-    protected function set_body_data($page_type = 'wide')
-    {
+    protected function set_body_data($page_type = 'wide')

+    {

         parent::set_body_data($page_type);
         
         $photo = PhotoCollector::getRow(self::$BANNER_IMAGE);
@@ -59,8 +59,8 @@ 
         $this->set_body('view', 'Home');
     }
 
-    protected function get_comments()
-    {
+    protected function get_comments()

+    {

         global $container;
         $repository = new Jacobemerick\Web\Domain\Comment\Comment\ServiceCommentRepository($container['comment_service_api']);
         $start = microtime(true);

controller/waterfalls/DefaultLogListController.class.inc.php

Indentation +50 added lines, -50 removed lines

@@ -1,72 +1,72 @@
 <?
 
 Loader::load('collector', array(
-	'waterfall/CompanionCollector',
-	'waterfall/LogCollector',
-	'waterfall/PeriodCollector'));
+    'waterfall/CompanionCollector',
+    'waterfall/LogCollector',
+    'waterfall/PeriodCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
 abstract class DefaultLogListController extends DefaultListController
 {
 
-	private static $ITEM_COUNT_PER_PAGE = 10;
+    private static $ITEM_COUNT_PER_PAGE = 10;
 
-	final protected function get_list_view()
-	{
-		return 'LogListing';
-	}
+    final protected function get_list_view()
+    {
+        return 'LogListing';
+    }
 
-	final protected function get_item_count_per_page()
-	{
-		return self::$ITEM_COUNT_PER_PAGE;
-	}
+    final protected function get_item_count_per_page()
+    {
+        return self::$ITEM_COUNT_PER_PAGE;
+    }
 
-	final protected function format_item($item)
-	{
-		$item_array = array();
+    final protected function format_item($item)
+    {
+        $item_array = array();
 		
-		$item_array['title'] = $item->title;
-		$item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description);
-		$item_array['waterfall_list'] = LogCollector::getWaterfallListForLog($item->id);
-		$item_array['introduction'] = $item->introduction;
-		$item_array['path'] = "/journal/{$item->alias}/";
-		$item_array['comment_count'] = 0; // todo - this
-		$item_array['date'] = $this->get_parsed_date($item->date);
+        $item_array['title'] = $item->title;
+        $item_array['image'] = $this->get_image_element($item->photo_category, $item->photo, $item->photo_description);
+        $item_array['waterfall_list'] = LogCollector::getWaterfallListForLog($item->id);
+        $item_array['introduction'] = $item->introduction;
+        $item_array['path'] = "/journal/{$item->alias}/";
+        $item_array['comment_count'] = 0; // todo - this
+        $item_array['date'] = $this->get_parsed_date($item->date);
 		
-		return $item_array;
-	}
+        return $item_array;
+    }
 
-	final protected function get_sidebar()
-	{
-		$companion_result = CompanionCollector::getCompanionList();
-		$companion_list = array();
+    final protected function get_sidebar()
+    {
+        $companion_result = CompanionCollector::getCompanionList();
+        $companion_list = array();
 		
-		foreach($companion_result as $companion_row)
-		{
-			$companion = new stdclass();
-			$companion->name = $companion_row->name;
-			$companion->uri = "/companion/{$companion_row->alias}/";
-			$companion->count = $companion_row->count;
+        foreach($companion_result as $companion_row)
+        {
+            $companion = new stdclass();
+            $companion->name = $companion_row->name;
+            $companion->uri = "/companion/{$companion_row->alias}/";
+            $companion->count = $companion_row->count;
 			
-			$companion_list[] = $companion;
-		}
+            $companion_list[] = $companion;
+        }
 		
-		$period_result = PeriodCollector::getPeriodList();
-		$period_list = array();
+        $period_result = PeriodCollector::getPeriodList();
+        $period_list = array();
 		
-		foreach($period_result as $period_row)
-		{
-			$period = new stdclass();
-			$period->name = $period_row->name;
-			$period->uri = "/period/{$period_row->alias}/";
-			$period->count = $period_row->count;
+        foreach($period_result as $period_row)
+        {
+            $period = new stdclass();
+            $period->name = $period_row->name;
+            $period->uri = "/period/{$period_row->alias}/";
+            $period->count = $period_row->count;
 			
-			$period_list[] = $period;
-		}
+            $period_list[] = $period;
+        }
 		
-		return array(
-			'companion_list' => $companion_list,
-			'period_list' => $period_list);
-	}
+        return array(
+            'companion_list' => $companion_list,
+            'period_list' => $period_list);
+    }
 
 }