jacobemerick / web

bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -5,13 +5,13 @@ 
 ini_set('display_errors', 0);
 
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__.'/vendor/autoload.php';
 
 $container = new Pimple\Container();
 
 
 // load the config for the application
-$config_path = __DIR__ . '/config.json';
+$config_path = __DIR__.'/config.json';
 
 $handle = @fopen($config_path, 'r');
 if ($handle === false) {
@@ -29,14 +29,14 @@ 
 
 // timezones are fun
 date_default_timezone_set('America/Phoenix'); // todo - belongs in configuration
-$container['default_timezone'] = function ($c) {
+$container['default_timezone'] = function($c) {
     return new DateTimeZone('America/Phoenix');
 };
 
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
-$db_connections->setDefault(function () use ($config) {
+$db_connections->setDefault(function() use ($config) {
     $connection = $config->database->slave;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -44,7 +44,7 @@ 
         $connection->password
     );
 });
-$db_connections->setWrite('master', function () use ($config) {
+$db_connections->setWrite('master', function() use ($config) {
     $connection = $config->database->master;
     return new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -52,7 +52,7 @@ 
         $connection->password
     );
 });
-$db_connections->setRead('slave', function () use ($config) {
+$db_connections->setRead('slave', function() use ($config) {
     $connection = $config->database->slave;
     $pdo = new Aura\Sql\ExtendedPdo(
         "mysql:host={$connection->host}",
@@ -70,7 +70,7 @@ 
 
 
 // configure the comment service connection
-$container['comment_service_api'] = function () use ($config) {
+$container['comment_service_api'] = function() use ($config) {
     $configuration = (new Jacobemerick\CommentService\Configuration())
         ->setUsername($config->comments->user)
         ->setPassword($config->comments->password)
@@ -84,16 +84,16 @@ 
 
 
 // setup mail handler
-$container['mail'] = $container->factory(function ($c) {
+$container['mail'] = $container->factory(function($c) {
     return (new Jacobemerick\Archangel\Archangel())->setLogger($c['logger']);
 });
 
 
 // setup the logger
-$container['setup_logger'] = $container->protect(function ($name) use ($container) {
+$container['setup_logger'] = $container->protect(function($name) use ($container) {
     $logger = new Monolog\Logger($name);
 
-    $logPath = __DIR__ . "/logs/{$name}.log";
+    $logPath = __DIR__."/logs/{$name}.log";
     $streamHandler = new Monolog\Handler\StreamHandler($logPath, Monolog\Logger::INFO);
     $streamHandler->setFormatter(
         new Monolog\Formatter\LineFormatter("[%datetime%] %channel%.%level_name%: %message%\n")
@@ -121,7 +121,7 @@ 
 
 
 // sets up shutdown function to display profiler
-register_shutdown_function(function () use ($container) {
+register_shutdown_function(function() use ($container) {
     if (
         !isset($_COOKIE['debugger']) ||
         $_COOKIE['debugger'] != 'display'
@@ -133,10 +133,10 @@ 
         ->getRead()
         ->getProfiler()
         ->getProfiles();
-    $dbProfiles = array_filter($dbProfiles, function ($profile) {
+    $dbProfiles = array_filter($dbProfiles, function($profile) {
         return $profile['function'] == 'perform';
     });
-    $dbProfiles = array_map(function ($profile) {
+    $dbProfiles = array_map(function($profile) {
         return [
             'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
             'parameters' => $profile['bind_values'],

controller/blog/DefaultPageController.class.inc.php

Indentation +130 added lines, -130 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');
-	}
+        $this->add_css('normalize');
+        $this->add_css('blog');
+    }
 
-	protected function get_introduction()
-	{
-		return;
-	}
+    protected function get_introduction()
+    {
+        return;
+    }
 
-	protected function get_introduction_image($id)
-	{
-		Loader::load('collector', 'image/PhotoCollector');
-		$photo_result = PhotoCollector::getRow($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;
-		$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);
-	}
+        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());
+    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']);
+        $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;
-	}
+        return $post_object;
+    }
 
-	final private function get_comments_for_post($post)
-	{
-		$count = CommentCollector::getCommentCountForURL(self::$BLOG_SITE_ID, $post['path']);
+    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;
-	}
+        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'];
+    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;
-	}
+        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 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();
 		
-		$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()
-	{
-		$comment_array = CommentCollector::getRecentBlogComments(self::$RECENT_COMMENT_COUNT);
+    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()
     {