jacobemerick / web

collector/comment/CommentCollector.class.inc.php

Indentation +46 added lines, -46 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,12 +80,12 @@ 
 			ORDER BY
 				`date` DESC";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getRecentBlogComments($count)
-	{
-		$query = "
+    public static function getRecentBlogComments($count)
+    {
+        $query = "
 			SELECT
 				`comment_meta`.`id`,
 				`post`.`category`,
@@ -111,8 +111,8 @@ 
 				`comment_meta`.`date` DESC
 			LIMIT {$count}";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
     public static function getRecentWaterfallComments($count = 5)
     {
@@ -159,16 +159,16 @@ 
         return self::run_query($query);
     }
 
-	public static function getCommentsForURL($site, $path, $commenter = 0)
-	{
-		$path = self::escape($path);
+    public static function getCommentsForURL($site, $path, $commenter = 0)
+    {
+        $path = self::escape($path);
 		
-		if($commenter != 0)
-			$trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
-		else
-			$trusted_commenter_clause = "`commenter`.`trusted` = '1'";
+        if($commenter != 0)
+            $trusted_commenter_clause = "(`commenter`.`trusted` = '1' || `commenter`.`id` = '{$commenter}')";
+        else
+            $trusted_commenter_clause = "`commenter`.`trusted` = '1'";
 		
-		$query = "
+        $query = "
 			SELECT
 				`comment_meta`.`id`,
 				`comment_meta`.`reply`,
@@ -194,14 +194,14 @@ 
 			ORDER BY
 				`comment_meta`.`date`";
 		
-		return self::run_query($query);
-	}
+        return self::run_query($query);
+    }
 
-	public static function getCommentCountForURL($site, $path)
-	{
-		$path = self::escape($path);
+    public static function getCommentCountForURL($site, $path)
+    {
+        $path = self::escape($path);
 		
-		$query = "
+        $query = "
 			SELECT
 				COUNT(1) AS `count`
 			FROM
@@ -218,7 +218,7 @@ 
 			ORDER BY
 				`comment_meta`.`date`";
 		
-		return self::get_count($query);
-	}
+        return self::get_count($query);
+    }
 
 }
\ No newline at end of file

collector/Collector.class.inc.php

Indentation +24 added lines, -24 removed lines

@@ -5,29 +5,29 @@
 abstract class Collector
 {
 
-	protected static function run_query($query)
-	{
-		return Database::select($query);
-	}
-
-	protected static function run_row_query($query)
-	{
-		return Database::selectRow($query);
-	}
-
-	protected static function get_count($query)
-	{
-		return Database::selectRow($query)->count;
-	}
-
-	protected static function check_exists($query)
-	{
-		return Database::selectRow($query) !== null;
-	}
-
-	protected static function escape($string)
-	{
-		return Database::escape($string);
-	}
+    protected static function run_query($query)
+    {
+        return Database::select($query);
+    }
+
+    protected static function run_row_query($query)
+    {
+        return Database::selectRow($query);
+    }
+
+    protected static function get_count($query)
+    {
+        return Database::selectRow($query)->count;
+    }
+
+    protected static function check_exists($query)
+    {
+        return Database::selectRow($query) !== null;
+    }
+
+    protected static function escape($string)
+    {
+        return Database::escape($string);
+    }
 
 }

controller/blog/TagController.class.inc.php

Indentation +98 added lines, -98 removed lines

@@ -5,136 +5,136 @@
 final class TagController extends DefaultListController
 {
 
-	private static $TITLE_MAIN = "%s Tag | Jacob Emerick's Blog";
-	private static $DESCRIPTION_MAIN = "Posts tagged with %s on Jacob Emerick's Blog, a website about Upper Peninsula hiking and web development best practices.";
+    private static $TITLE_MAIN = "%s Tag | Jacob Emerick's Blog";
+    private static $DESCRIPTION_MAIN = "Posts tagged with %s on Jacob Emerick's Blog, a website about Upper Peninsula hiking and web development best practices.";
 
-	private static $TITLE_PAGINATED = "%s - Page %d of %d | Jacob Emerick's Blog";
-	private static $DESCRIPTION_PAGINATED = "Page %d of %d with posts tagged with %s on Jacob Emerick's Blog, a website about the hiking and development adventures of a young man.";
+    private static $TITLE_PAGINATED = "%s - Page %d of %d | Jacob Emerick's Blog";
+    private static $DESCRIPTION_PAGINATED = "Page %d of %d with posts tagged with %s on Jacob Emerick's Blog, a website about the hiking and development adventures of a young man.";
 
-	private static $KEYWORD_ARRAY = array(
-		'hiking',
-		'web development',
-		'blog',
-		'Jacob Emerick');
+    private static $KEYWORD_ARRAY = array(
+        'hiking',
+        'web development',
+        'blog',
+        'Jacob Emerick');
 
-	private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts tagged with %s.';
+    private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts tagged with %s.';
 
-	private $tag;
+    private $tag;
 
-	public function __construct()
-	{
-		$tag = URLDecode::getPiece(2);
-		$tag = str_replace('-', ' ', $tag);
+    public function __construct()
+    {
+        $tag = URLDecode::getPiece(2);
+        $tag = str_replace('-', ' ', $tag);
 
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Tag\MysqlTagRepository($container['db_connection_locator']);
         $tag_result = $repository->findTagByTitle($tag);
 
-		if($tag_result === false)
-			$this->eject();
+        if($tag_result === false)
+            $this->eject();
 		
-		$this->tag = $tag_result;
+        $this->tag = $tag_result;
 		
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		if($this->page == 1)
-		{
-			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->tag['tag'])));
-			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag['tag'])));
-		}
-		else
-		{
-			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->tag['tag']), $this->page, $this->total_pages));
-			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->tag['tag'])));
-		}
+        if($this->page == 1)
+        {
+            $this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->tag['tag'])));
+            $this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->tag['tag'])));
+        }
+        else
+        {
+            $this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->tag['tag']), $this->page, $this->total_pages));
+            $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->tag['tag'])));
+        }
 		
-		$keyword_array = self::$KEYWORD_ARRAY;
-		array_unshift($keyword_array, $this->tag['tag']);
-		$this->set_keywords($keyword_array);
-	}
-
-	protected function get_introduction()
-	{
-		$tag = ucwords($this->tag['tag']);
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, $this->tag['tag']);
+        $this->set_keywords($keyword_array);
+    }
+
+    protected function get_introduction()
+    {
+        $tag = ucwords($this->tag['tag']);
 		
-		if($this->page == 1)
-		{
+        if($this->page == 1)
+        {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
         $introduction_result = $repository->findByType('tag', $this->tag['tag']);
 			
-			if($introduction_result !== false)
-			{
-				$introduction = array();
-				$introduction['title'] = $introduction_result['title'];
-				$introduction['content'] = $introduction_result['content'];
-				$introduction['image'] = $this->get_introduction_image($introduction_result['image']);
+            if($introduction_result !== false)
+            {
+                $introduction = array();
+                $introduction['title'] = $introduction_result['title'];
+                $introduction['content'] = $introduction_result['content'];
+                $introduction['image'] = $this->get_introduction_image($introduction_result['image']);
 				
-				return $introduction;
-			}
+                return $introduction;
+            }
 			
-			return array(
-				'title' => "Viewing posts about {$tag}.");
-		}
+            return array(
+                'title' => "Viewing posts about {$tag}.");
+        }
 		
-		return array(
-			'title' => "{$tag} posts, page {$this->page} of {$this->total_pages}.");
-	}
-
-	protected function get_page_number()
-	{
-		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
-
-	protected function get_list_results()
-	{
+        return array(
+            'title' => "{$tag} posts, page {$this->page} of {$this->total_pages}.");
+    }
+
+    protected function get_page_number()
+    {
+        $page = URLDecode::getPiece(3);
+        if(isset($page) && is_numeric($page))
+            return $page;
+        return 1;
+    }
+
+    protected function get_list_results()
+    {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         return $repository->getActivePostsByTag($this->tag['id'], self::$POSTS_PER_PAGE, $this->offset);
-	}
+    }
 
-	protected function get_list_description()
-	{
-		$start = $this->offset + 1;
-		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
+    protected function get_list_description()
+    {
+        $start = $this->offset + 1;
+        $end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
-		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->tag['tag']);
-	}
-
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/")->activate();
-		return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page - 1) . '/')->activate();
-	}
-
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
-		return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page + 1) . '/')->activate();
-	}
-
-	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count)) {
+        return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->tag['tag']);
+    }
+
+    protected function get_list_next_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/")->activate();
+        return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page - 1) . '/')->activate();
+    }
+
+    protected function get_list_prev_link()
+    {
+        if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+            return;
+        return Content::instance('URLSafe', "/tag/{$this->tag['tag']}/" . ($this->page + 1) . '/')->activate();
+    }
+
+    private $total_post_count;
+    protected function get_total_post_count()
+    {
+        if(!isset($this->total_post_count)) {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $this->total_post_count = $repository->getActivePostsCountByTag($this->tag['id']);
     }
 
-		return $this->total_post_count;
-	}
+        return $this->total_post_count;
+    }
 
 }

controller/blog/PostController.class.inc.php

Indentation +146 added lines, -146 removed lines

@@ -6,191 +6,191 @@ 
 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);
-			}
-		}
-	}
+        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 get_introduction() {}
 
-	protected function set_body_data()
-	{
-		parent::set_body_data();
+    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("{$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("{$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;
-	}
+        return $keyword_array;
+    }
 
-	private function get_series_posts()
-	{
-		$series_posts = $this->fetch_series_posts();
-		if(count($series_posts) < 1)
-			return 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'];
-			}
+        } 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']}/";
+            $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);
-	}
+        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 $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'];
-		}
+    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']);
@@ -198,20 +198,20 @@ 
 
         $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;
+    }
 
     protected function get_comment_array($path)
     {

controller/blog/DefaultListController.class.inc.php

Indentation +49 added lines, -49 removed lines

@@ -5,64 +5,64 @@
 abstract class DefaultListController extends DefaultPageController
 {
 
-	protected static $POSTS_PER_PAGE = 10;
+    protected static $POSTS_PER_PAGE = 10;
 
-	protected $page;
-	protected $offset;
+    protected $page;
+    protected $offset;
 
-	public function __construct()
-	{
-		parent::__construct();
+    public function __construct()
+    {
+        parent::__construct();
 		
-		$this->page = $this->get_page_number();
-		$this->total_pages = ceil($this->get_total_post_count() / self::$POSTS_PER_PAGE);
-		$this->offset = ($this->page - 1) * self::$POSTS_PER_PAGE;
-	}
+        $this->page = $this->get_page_number();
+        $this->total_pages = ceil($this->get_total_post_count() / self::$POSTS_PER_PAGE);
+        $this->offset = ($this->page - 1) * self::$POSTS_PER_PAGE;
+    }
 
-	abstract protected function get_page_number();
-	abstract protected function get_list_results();
-	abstract protected function get_list_description();
-	abstract protected function get_list_next_link();
-	abstract protected function get_list_prev_link();
-	abstract protected function get_total_post_count();
+    abstract protected function get_page_number();
+    abstract protected function get_list_results();
+    abstract protected function get_list_description();
+    abstract protected function get_list_next_link();
+    abstract protected function get_list_prev_link();
+    abstract protected function get_total_post_count();
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		$this->set_head('next_link', $this->get_list_next_link());
-		$this->set_head('previous_link', $this->get_list_prev_link());
-	}
+        $this->set_head('next_link', $this->get_list_next_link());
+        $this->set_head('previous_link', $this->get_list_prev_link());
+    }
 
-	protected function set_body_data()
-	{
-		parent::set_body_data();
+    protected function set_body_data()
+    {
+        parent::set_body_data();
 		
-		$this->set_body('view', 'Listing');
-		$this->set_body('data', $this->get_list_body_data());
-	}
+        $this->set_body('view', 'Listing');
+        $this->set_body('data', $this->get_list_body_data());
+    }
 
-	final private function get_list_body_data()
-	{
-		return array(
-			'posts' => $this->get_list_posts(),
-			'show_top_navigation' => ($this->page !== 1),
-			'navigation' => array(
-				'description' => $this->get_list_description(),
-				'next' => $this->get_list_next_link(),
-				'prev' => $this->get_list_prev_link()));
-	}
+    final private function get_list_body_data()
+    {
+        return array(
+            'posts' => $this->get_list_posts(),
+            'show_top_navigation' => ($this->page !== 1),
+            'navigation' => array(
+                'description' => $this->get_list_description(),
+                'next' => $this->get_list_next_link(),
+                'prev' => $this->get_list_prev_link()));
+    }
 
-	final private function get_list_posts()
-	{
-		$post_array = array();
-		foreach($this->get_list_results() as $post)
-		{
-			$post_array[] = $this->format_post($post, true);
-		}
-		if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
-			$this->eject();
-		return $post_array;
-	}
+    final private function get_list_posts()
+    {
+        $post_array = array();
+        foreach($this->get_list_results() as $post)
+        {
+            $post_array[] = $this->format_post($post, true);
+        }
+        if(count($post_array) < 1 && URLDecode::getPiece(1) !== 'search')
+            $this->eject();
+        return $post_array;
+    }
 
 }
\ No newline at end of file

controller/blog/SearchController.class.inc.php

Indentation +118 added lines, -118 removed lines

@@ -6,134 +6,134 @@
 final class SearchController extends DefaultListController
 {
 
-	private static $TITLE_MAIN = "%s Search | Jacob Emerick's Blog";
-	private static $DESCRIPTION_MAIN = "Posts containing the phrase %s on Jacob Emerick's Blog.";
-
-	private static $TITLE_PAGINATED = "%s Search - Page %d of %d | Jacob Emerick's Blog";
-	private static $DESCRIPTION_PAGINATED = "Page %d of %d with posts containing the phrase %s on Jacob Emerick's Blog.";
-
-	private static $KEYWORD_ARRAY = array(
-		'hiking',
-		'web development',
-		'blog',
-		'Jacob Emerick');
-
-	private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts containing the phrase %s.';
-	private static $SEARCH_WEIGHTS = array(
-		array(
-			'field' => 'title',
-			'weight' => 8),
-		array(
-			'field' => 'body',
-			'weight' => 4));
-
-	private $query;
-
-	public function __construct()
-	{
-		$query = URLDecode::getPiece(2);
-		$query = urldecode($query);
+    private static $TITLE_MAIN = "%s Search | Jacob Emerick's Blog";
+    private static $DESCRIPTION_MAIN = "Posts containing the phrase %s on Jacob Emerick's Blog.";
+
+    private static $TITLE_PAGINATED = "%s Search - Page %d of %d | Jacob Emerick's Blog";
+    private static $DESCRIPTION_PAGINATED = "Page %d of %d with posts containing the phrase %s on Jacob Emerick's Blog.";
+
+    private static $KEYWORD_ARRAY = array(
+        'hiking',
+        'web development',
+        'blog',
+        'Jacob Emerick');
+
+    private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d posts containing the phrase %s.';
+    private static $SEARCH_WEIGHTS = array(
+        array(
+            'field' => 'title',
+            'weight' => 8),
+        array(
+            'field' => 'body',
+            'weight' => 4));
+
+    private $query;
+
+    public function __construct()
+    {
+        $query = URLDecode::getPiece(2);
+        $query = urldecode($query);
         $query = str_replace('-', ' ', $query);
 		
-		$this->query = $query;
+        $this->query = $query;
 		
-		parent::__construct();
-	}
+        parent::__construct();
+    }
 
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		if($this->page == 1)
-		{
-			$this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
-			$this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
-		}
-		else
-		{
-			$this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->query), $this->page, $this->total_pages));
-			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->query)));
-		}
+        if($this->page == 1)
+        {
+            $this->set_title(sprintf(self::$TITLE_MAIN, ucwords($this->query)));
+            $this->set_description(sprintf(self::$DESCRIPTION_MAIN, ucwords($this->query)));
+        }
+        else
+        {
+            $this->set_title(sprintf(self::$TITLE_PAGINATED, ucwords($this->query), $this->page, $this->total_pages));
+            $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages, ucwords($this->query)));
+        }
 		
-		$keyword_array = self::$KEYWORD_ARRAY;
-		array_unshift($keyword_array, $this->query);
-		$this->set_keywords($keyword_array);
-	}
-
-	protected function get_introduction()
-	{
-		if($this->total_pages > 1)
-			return array(
-				'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
-		else if($this->total_pages == 1)
-			return array(
-				'title' => "Posts from search '{$this->query}'.");
-		else
-			return array(
-				'title' => "Sorry, '{$this->query}' didn't return any posts.");
-	}
-
-	protected function get_page_number()
-	{
-		$page = URLDecode::getPiece(3);
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
-
-	private $search_result;
-	private function get_search_result()
-	{
-		if(!isset($this->search_result))
-		{
+        $keyword_array = self::$KEYWORD_ARRAY;
+        array_unshift($keyword_array, $this->query);
+        $this->set_keywords($keyword_array);
+    }
+
+    protected function get_introduction()
+    {
+        if($this->total_pages > 1)
+            return array(
+                'title' => "Posts from search '{$this->query}', page {$this->page} of {$this->total_pages}.");
+        else if($this->total_pages == 1)
+            return array(
+                'title' => "Posts from search '{$this->query}'.");
+        else
+            return array(
+                'title' => "Sorry, '{$this->query}' didn't return any posts.");
+    }
+
+    protected function get_page_number()
+    {
+        $page = URLDecode::getPiece(3);
+        if(isset($page) && is_numeric($page))
+            return $page;
+        return 1;
+    }
+
+    private $search_result;
+    private function get_search_result()
+    {
+        if(!isset($this->search_result))
+        {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         $posts = $repository->getActivePosts();
 			
-			$this->search_result = Search::instance()
-				->setQuery($this->query)
-				->setResult($posts)
-				->setWeight(self::$SEARCH_WEIGHTS)
-				->perform();
-		}
-		return $this->search_result;
-	}
-
-	protected function get_list_results()
-	{
-		return array_slice($this->get_search_result(), $this->offset, self::$POSTS_PER_PAGE);
-	}
-
-	protected function get_list_description()
-	{
-		$start = $this->offset + 1;
-		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
+            $this->search_result = Search::instance()
+                ->setQuery($this->query)
+                ->setResult($posts)
+                ->setWeight(self::$SEARCH_WEIGHTS)
+                ->perform();
+        }
+        return $this->search_result;
+    }
+
+    protected function get_list_results()
+    {
+        return array_slice($this->get_search_result(), $this->offset, self::$POSTS_PER_PAGE);
+    }
+
+    protected function get_list_description()
+    {
+        $start = $this->offset + 1;
+        $end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
-		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->query);
-	}
-
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
-		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
-	}
-
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
-		return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
-	}
-
-	private $total_post_count;
-	protected function get_total_post_count()
-	{
-		if(!isset($this->total_post_count))
-			$this->total_post_count = count($this->get_search_result());
-		return $this->total_post_count;
-	}
+        return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count(), $this->query);
+    }
+
+    protected function get_list_next_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return Content::instance('URLSafe', "/search/{$this->query}/")->activate();
+        return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page - 1) . '/')->activate();
+    }
+
+    protected function get_list_prev_link()
+    {
+        if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+            return;
+        return Content::instance('URLSafe', "/search/{$this->query}/" . ($this->page + 1) . '/')->activate();
+    }
+
+    private $total_post_count;
+    protected function get_total_post_count()
+    {
+        if(!isset($this->total_post_count))
+            $this->total_post_count = count($this->get_search_result());
+        return $this->total_post_count;
+    }
 
 }

controller/blog/DefaultPageController.class.inc.php

Indentation +139 added lines, -139 removed lines

@@ -8,81 +8,81 @@ 
 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->comment_count = $this->get_comments_for_post($post);
-		$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_comments_for_post($post)
-	{
-		$count = CommentCollector::getCommentCountForURL(self::$BLOG_SITE_ID, $post['path']);
+        $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->comment_count = $this->get_comments_for_post($post);
+        $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_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) {
@@ -91,7 +91,7 @@ 
         $container['console']->log("{$count}, {$count_from_service} in service");
     }
     return $count;
-	}
+    }
 
     final private function get_comments_for_post_from_service($post)
     {
@@ -127,106 +127,106 @@ 
         return count($comment_response);
     }
 
-	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']);
 
         $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;
-	}
-
-	final private function get_comments()
-	{
-		$comment_array = CommentCollector::getRecentBlogComments(self::$RECENT_COMMENT_COUNT);
+        foreach($tag_result as $tag)
+        {
+            if($tag['count'] > $maximum)
+                $maximum = $tag['count'];
+        }
+        return $maximum;
+    }
+
+    final private function get_comments()
+    {
+        $comment_array = CommentCollector::getRecentBlogComments(self::$RECENT_COMMENT_COUNT);
 		
-		$array = array();
-		foreach($comment_array as $comment)
-		{
-			$body = $comment->body;
-			$body = strip_tags($body);
+        $array = array();
+        foreach($comment_array as $comment)
+        {
+            $body = $comment->body;
+            $body = strip_tags($body);
 			
-			$comment_obj = new stdclass();
-			$comment_obj->description = Content::instance('SmartTrim', $body)->activate(30);
-			$comment_obj->commenter = $comment->name;
-			$comment_obj->link = Loader::getRootURL() . "{$comment->category}/{$comment->path}/#comment-{$comment->id}";
-			$array[] = $comment_obj;
-		}
+            $comment_obj = new stdclass();
+            $comment_obj->description = Content::instance('SmartTrim', $body)->activate(30);
+            $comment_obj->commenter = $comment->name;
+            $comment_obj->link = Loader::getRootURL() . "{$comment->category}/{$comment->path}/#comment-{$comment->id}";
+            $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]);
+        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;
     }
-		return $array;
-	}
 
     final private function get_comments_from_service()
     {

controller/blog/AboutController.class.inc.php

Indentation +33 added lines, -33 removed lines

@@ -5,47 +5,47 @@
 final class AboutController extends DefaultPageController
 {
 
-	private static $TITLE = 'About the Blog | Jacob Emerick';
-	private static $DESCRIPTION = "A little bit about the awesomeness on Jacob Emerick's Blog, diving into the topics covered, technology used, and methodology of writing new posts.";
-
-	private static $KEYWORD_ARRAY = array(
-		'about',
-		'technologies',
-		'background',
-		'blog',
-		'Jacob Emerick');
-
-	protected function set_head_data()
-	{
-		$this->set_title(self::$TITLE);
-		$this->set_description(self::$DESCRIPTION);
-		$this->set_keywords(self::$KEYWORD_ARRAY);
+    private static $TITLE = 'About the Blog | Jacob Emerick';
+    private static $DESCRIPTION = "A little bit about the awesomeness on Jacob Emerick's Blog, diving into the topics covered, technology used, and methodology of writing new posts.";
+
+    private static $KEYWORD_ARRAY = array(
+        'about',
+        'technologies',
+        'background',
+        'blog',
+        'Jacob Emerick');
+
+    protected function set_head_data()
+    {
+        $this->set_title(self::$TITLE);
+        $this->set_description(self::$DESCRIPTION);
+        $this->set_keywords(self::$KEYWORD_ARRAY);
 		
-		parent::set_head_data();
-	}
+        parent::set_head_data();
+    }
 
-	protected function set_body_data()
-	{
-		$this->set_body('view', 'About');
+    protected function set_body_data()
+    {
+        $this->set_body('view', 'About');
 		
-		parent::set_body_data();
-	}
+        parent::set_body_data();
+    }
 
-	protected function get_introduction()
-	{
+    protected function get_introduction()
+    {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
         $introduction_result = $repository->findByType('about');
 		
-		if($introduction_result !== null)
-		{
-			$introduction = array();
-			$introduction['title'] = $introduction_result['title'];
-			$introduction['content'] = $introduction_result['content'];
-			$introduction['image'] = $this->get_introduction_image($introduction_result['image']);
+        if($introduction_result !== null)
+        {
+            $introduction = array();
+            $introduction['title'] = $introduction_result['title'];
+            $introduction['content'] = $introduction_result['content'];
+            $introduction['image'] = $this->get_introduction_image($introduction_result['image']);
 			
-			return $introduction;
-		}
-	}
+            return $introduction;
+        }
+    }
 
 }

controller/blog/HomeController.class.inc.php

Indentation +95 added lines, -95 removed lines

@@ -5,115 +5,115 @@
 final class HomeController extends DefaultListController
 {
 
-	private static $TITLE_MAIN = "Jacob Emerick's Blog | Posts on Hiking, Web Development, and more";
-	private static $TITLE_PAGINATED = "Page %d of %d in Jacob Emerick's Blog";
-
-	private static $DESCRIPTION_MAIN = "Jacob Emerick's Blog - a collection of posts about hiking the Upper Peninsula, learning to be a web developer, and other experiences of a young man.";
-	private static $DESCRIPTION_PAGINATED = "Page %d of %d of posts about hiking in the Upper Peninsula, learning to be a web developer, and more on Jacob Emerick's Blog.";
-
-	private static $KEYWORD_ARRAY = array(
-		'blog',
-		'Jacob Emerick',
-		'hiking',
-		'Huron Mountains',
-		'Peshekee Highlands',
-		'Keweenaw',
-		'Michigan',
-		'Upper Peninsula',
-		'leadership',
-		'web development',
-		'php programming',
-		'data handling',
-		'optimization');
-
-	private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d total posts.';
-
-	protected function set_head_data()
-	{
-		parent::set_head_data();
+    private static $TITLE_MAIN = "Jacob Emerick's Blog | Posts on Hiking, Web Development, and more";
+    private static $TITLE_PAGINATED = "Page %d of %d in Jacob Emerick's Blog";
+
+    private static $DESCRIPTION_MAIN = "Jacob Emerick's Blog - a collection of posts about hiking the Upper Peninsula, learning to be a web developer, and other experiences of a young man.";
+    private static $DESCRIPTION_PAGINATED = "Page %d of %d of posts about hiking in the Upper Peninsula, learning to be a web developer, and more on Jacob Emerick's Blog.";
+
+    private static $KEYWORD_ARRAY = array(
+        'blog',
+        'Jacob Emerick',
+        'hiking',
+        'Huron Mountains',
+        'Peshekee Highlands',
+        'Keweenaw',
+        'Michigan',
+        'Upper Peninsula',
+        'leadership',
+        'web development',
+        'php programming',
+        'data handling',
+        'optimization');
+
+    private static $LIST_DESCRIPTION = 'Viewing %d - %d of %d total posts.';
+
+    protected function set_head_data()
+    {
+        parent::set_head_data();
 		
-		if($this->page == 1)
-			$this->set_title(self::$TITLE_MAIN);
-		else
-			$this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
+        if($this->page == 1)
+            $this->set_title(self::$TITLE_MAIN);
+        else
+            $this->set_title(sprintf(self::$TITLE_PAGINATED, $this->page, $this->total_pages));
 		
-		if($this->page == 1)
-			$this->set_description(self::$DESCRIPTION_MAIN);
-		else
-			$this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
+        if($this->page == 1)
+            $this->set_description(self::$DESCRIPTION_MAIN);
+        else
+            $this->set_description(sprintf(self::$DESCRIPTION_PAGINATED, $this->page, $this->total_pages));
 		
-		$this->set_keywords(self::$KEYWORD_ARRAY);
-	}
+        $this->set_keywords(self::$KEYWORD_ARRAY);
+    }
 
-	protected function get_introduction()
-	{
-		if($this->page == 1)
-		{
+    protected function get_introduction()
+    {
+        if($this->page == 1)
+        {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Introduction\MysqlIntroductionRepository($container['db_connection_locator']);
         $introduction_result = $repository->findByType('home');
 			
-			$introduction = array();
-			$introduction['title'] = $introduction_result['title'];
-			$introduction['content'] = $introduction_result['content'];
-			$introduction['image'] = $this->get_introduction_image($introduction_result['image']);
+            $introduction = array();
+            $introduction['title'] = $introduction_result['title'];
+            $introduction['content'] = $introduction_result['content'];
+            $introduction['image'] = $this->get_introduction_image($introduction_result['image']);
 			
-			return $introduction;
-		}
+            return $introduction;
+        }
 		
-		return array(
-			'title' => "All of Jacob Emerick's posts, page {$this->page} of {$this->total_pages}.");
-	}
-
-	protected function get_page_number()
-	{
-		$page = URLDecode::getPiece(1);
-		if(isset($page) && is_numeric($page))
-			return $page;
-		return 1;
-	}
-
-	protected function get_list_results()
-	{
+        return array(
+            'title' => "All of Jacob Emerick's posts, page {$this->page} of {$this->total_pages}.");
+    }
+
+    protected function get_page_number()
+    {
+        $page = URLDecode::getPiece(1);
+        if(isset($page) && is_numeric($page))
+            return $page;
+        return 1;
+    }
+
+    protected function get_list_results()
+    {
         global $container;
         $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
         return $repository->getActivePosts(self::$POSTS_PER_PAGE, $this->offset);
-	}
+    }
 
-	protected function get_list_description()
-	{
-		$start = $this->offset + 1;
-		$end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
+    protected function get_list_description()
+    {
+        $start = $this->offset + 1;
+        $end = min($this->offset + self::$POSTS_PER_PAGE, $this->get_total_post_count());
 		
-		return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count());
-	}
-
-	protected function get_list_next_link()
-	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return '/';
-		return '/' . ($this->page - 1) . '/';
-	}
-
-	protected function get_list_prev_link()
-	{
-		if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
-			return;
-		return '/' . ($this->page + 1) . '/';
-	}
-
-	private $total_post_count;
-	protected function get_total_post_count()
-	{
-      if(!isset($this->total_post_count)) {
-          global $container;
-          $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
-          $this->total_post_count = $repository->getActivePostsCount();
-      }
-
-		return $this->total_post_count;
-	}
+        return sprintf(self::$LIST_DESCRIPTION, $start, $end, $this->get_total_post_count());
+    }
+
+    protected function get_list_next_link()
+    {
+        if($this->page == 1)
+            return;
+        if($this->page == 2)
+            return '/';
+        return '/' . ($this->page - 1) . '/';
+    }
+
+    protected function get_list_prev_link()
+    {
+        if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count())
+            return;
+        return '/' . ($this->page + 1) . '/';
+    }
+
+    private $total_post_count;
+    protected function get_total_post_count()
+    {
+        if(!isset($this->total_post_count)) {
+            global $container;
+            $repository = new Jacobemerick\Web\Domain\Blog\Post\MysqlPostRepository($container['db_connection_locator']);
+            $this->total_post_count = $repository->getActivePostsCount();
+        }
+
+        return $this->total_post_count;
+    }
 
 }