jacobemerick / web

public/home/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'portfolio';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

public/blog/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'portfolio';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

public/waterfalls/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'portfolio';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

public/lifestream/index.php

Spacing +1 added lines, -1 removed lines

@@ -1,7 +1,7 @@
 <?php
 
 $namespace = 'portfolio';
-require_once __DIR__ . '/../../bootstrap.php';
+require_once __DIR__.'/../../bootstrap.php';
 
 // route
 Loader::loadInstance('router', 'Router');

controller/blog/DefaultPageController.class.inc.php

Spacing +10 added lines, -10 removed lines

@@ -41,7 +41,7 @@ 
 		Loader::load('collector', 'image/PhotoCollector');
 		$photo_result = PhotoCollector::getRow($id);
 		
-		if($photo_result == null)
+		if ($photo_result == null)
 			return;
 		
 		$name = $photo_result->name;
@@ -92,7 +92,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'];
@@ -106,7 +106,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');
@@ -132,9 +132,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();
@@ -151,9 +151,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;
@@ -164,7 +164,7 @@ 
 		$comment_array = CommentCollector::getRecentBlogComments(self::$RECENT_COMMENT_COUNT);
 		
 		$array = array();
-		foreach($comment_array as $comment)
+		foreach ($comment_array as $comment)
 		{
 			$body = $comment->body;
 			$body = strip_tags($body);
@@ -172,7 +172,7 @@ 
 			$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}";
+			$comment_obj->link = Loader::getRootURL()."{$comment->category}/{$comment->path}/#comment-{$comment->id}";
 			$array[] = $comment_obj;
 		}
 
@@ -201,7 +201,7 @@ 
         $comment_response = $api->getComments(1, self::$RECENT_COMMENT_COUNT, '-date', 'blog.jacobemerick.com');
 
         $array = array();
-        foreach($comment_response as $comment)
+        foreach ($comment_response as $comment)
         {
             $body = $comment->getBody();
             $body = strip_tags($body);

bootstrap.php

Spacing +12 added lines, -12 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,16 +70,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")
@@ -107,7 +107,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'
@@ -119,10 +119,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/PageController.class.inc.php

Spacing +20 added lines, -20 removed lines

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

controller/blog/PostController.class.inc.php

Spacing +15 added lines, -15 removed lines

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