jacobemerick / web

controller/site/ContactController.class.inc.php

Indentation +10 added lines, -10 removed lines

@@ -46,16 +46,16 @@
 				'value' => Request::getPost());
 		}
 
-    global $container;
-    $sent = $container['mail']
-      ->addTo($container['config']->admin_email)
-      ->setSubject('Site Contact')
-      ->setPlainMessage(
-        'Name: ' . Request::getPost('name') . "\n" .
-        'Email: ' . Request::getPost('email') . "\n" .
-        'Message: ' . Request::getPost('message')
-      )
-      ->send();
+	global $container;
+	$sent = $container['mail']
+	  ->addTo($container['config']->admin_email)
+	  ->setSubject('Site Contact')
+	  ->setPlainMessage(
+		'Name: ' . Request::getPost('name') . "\n" .
+		'Email: ' . Request::getPost('email') . "\n" .
+		'Message: ' . Request::getPost('message')
+	  )
+	  ->send();
 
 		return array(
 			'success_message' => "Thank you for your message, " . Request::getPost('name') . "! I'll get back to you as soon as possible.");

controller/portfolio/ContactController.class.inc.php

Indentation +10 added lines, -10 removed lines

@@ -44,16 +44,16 @@
 				'value' => Request::getPost());
 		}
 
-    global $container;
-    $sent = $container['mail']
-      ->addTo($container['config']->admin_email)
-      ->setSubject('Portfolio Contact')
-      ->setPlainMessage(
-        'Name: ' . Request::getPost('name') . "\n" .
-        'Email: ' . Request::getPost('email') . "\n" .
-        'Message: ' . Request::getPost('message')
-      )
-      ->send();
+	global $container;
+	$sent = $container['mail']
+	  ->addTo($container['config']->admin_email)
+	  ->setSubject('Portfolio Contact')
+	  ->setPlainMessage(
+		'Name: ' . Request::getPost('name') . "\n" .
+		'Email: ' . Request::getPost('email') . "\n" .
+		'Message: ' . Request::getPost('message')
+	  )
+	  ->send();
 
 			return array(
 				'success_message' => "Thank you for your message, ".Request::getPost('name')."! I'll get back to you as soon as possible.");

controller/waterfalls/ContactController.class.inc.php

Indentation +10 added lines, -10 removed lines

@@ -58,16 +58,16 @@
 				'values' => $values);
 		}
 
-    global $container;
-    $sent = $container['mail']
-      ->addTo($container['config']->admin_email)
-      ->setSubject('Waterfall Site Contact')
-      ->setPlainMessage(
-        "Name: {$values->name}\n" .
-        "Email: {$values->email}\n" .
-        "Message: {$values->message}"
-      )
-      ->send();
+	global $container;
+	$sent = $container['mail']
+	  ->addTo($container['config']->admin_email)
+	  ->setSubject('Waterfall Site Contact')
+	  ->setPlainMessage(
+		"Name: {$values->name}\n" .
+		"Email: {$values->email}\n" .
+		"Message: {$values->message}"
+	  )
+	  ->send();
 
 		return (object) array('display' => 'success');
 	}

controller/home/ContactController.class.inc.php

Indentation +10 added lines, -10 removed lines

@@ -60,16 +60,16 @@
 				'values' => $values);
 		}
 
-    global $container;
-    $sent = $container['mail']
-      ->addTo($container['config']->admin_email)
-      ->setSubject('Home Page Contact')
-      ->setPlainMessage(
-        "Name: {$values->name}\n" .
-        "Email: {$values->email}\n" .
-        "Message: {$values->message}"
-      )
-      ->send();		
+	global $container;
+	$sent = $container['mail']
+	  ->addTo($container['config']->admin_email)
+	  ->setSubject('Home Page Contact')
+	  ->setPlainMessage(
+		"Name: {$values->name}\n" .
+		"Email: {$values->email}\n" .
+		"Message: {$values->message}"
+	  )
+	  ->send();		
 
 		return (object) array('display' => 'success');
 	}

module/form/CommentSubmitModule.class.inc.php

Indentation +15 added lines, -15 removed lines

@@ -167,26 +167,26 @@
 			}
 		}
         
-        $site = URLDecode::getSite();
+		$site = URLDecode::getSite();
         
-        if ($site == 'blog') {
-            $subject = "New Comment on Jacob Emerick's Blog";
-            $message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
-        } else if ($site == 'waterfalls') {
-            $subject = "New Comment on Waterfalls of the Keweenaw";
-            $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
-        }
+		if ($site == 'blog') {
+			$subject = "New Comment on Jacob Emerick's Blog";
+			$message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
+		} else if ($site == 'waterfalls') {
+			$subject = "New Comment on Waterfalls of the Keweenaw";
+			$message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to jacob@jacobemerick.com if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!";
+		}
 
-    global $container;
+	global $container;
 
 		foreach($email_recipient_array as $email_recipient)
 		{
-      $sent = $container['mail']
-        ->addTo($email_recipient['email'], $email_recipient['name'])
-        ->addBCC($container['config']->admin_email)
-        ->setSubject($subject)
-        ->setPlainMessage($message)
-        ->send();		
+	  $sent = $container['mail']
+		->addTo($email_recipient['email'], $email_recipient['name'])
+		->addBCC($container['config']->admin_email)
+		->setSubject($subject)
+		->setPlainMessage($message)
+		->send();		
 		}
 	}
 

public/index.php

Indentation +24 added lines, -24 removed lines

@@ -22,28 +22,28 @@
 
 // sets up shutdown function to display profiler
 register_shutdown_function(function () use ($container) {
-    if (
-        !isset($_COOKIE['debugger']) ||
-        $_COOKIE['debugger'] != 'display'
-    ) {
-        return;
-    }
-
-    $dbProfiles = $container['db_connection_locator']
-        ->getRead()
-        ->getProfiler()
-        ->getProfiles();
-    $dbProfiles = array_filter($dbProfiles, function ($profile) {
-        return $profile['function'] == 'perform';
-    });
-    $dbProfiles = array_map(function ($profile) {
-        return [
-            'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
-            'parameters' => $profile['bind_values'],
-            'time' => $profile['duration'],
-        ];
-    }, $dbProfiles);
-    $container['profiler']->setProfiledQueries($dbProfiles);
-    $container['profiler']->setDisplay(new Particletree\Pqp\Display());
-    $container['profiler']->display($container['db_connection_locator']->getRead());
+	if (
+		!isset($_COOKIE['debugger']) ||
+		$_COOKIE['debugger'] != 'display'
+	) {
+		return;
+	}
+
+	$dbProfiles = $container['db_connection_locator']
+		->getRead()
+		->getProfiler()
+		->getProfiles();
+	$dbProfiles = array_filter($dbProfiles, function ($profile) {
+		return $profile['function'] == 'perform';
+	});
+	$dbProfiles = array_map(function ($profile) {
+		return [
+			'sql' => trim(preg_replace('/\s+/', ' ', $profile['statement'])),
+			'parameters' => $profile['bind_values'],
+			'time' => $profile['duration'],
+		];
+	}, $dbProfiles);
+	$container['profiler']->setProfiledQueries($dbProfiles);
+	$container['profiler']->setDisplay(new Particletree\Pqp\Display());
+	$container['profiler']->display($container['db_connection_locator']->getRead());
 });

bootstrap.php

Indentation +37 added lines, -37 removed lines

@@ -10,7 +10,7 @@ 
 
 $handle = @fopen($config_path, 'r');
 if ($handle === false) {
-    throw new RuntimeException("Could not load config");
+	throw new RuntimeException("Could not load config");
 }
 $config = fread($handle, filesize($config_path));
 fclose($handle);
@@ -18,7 +18,7 @@ 
 $config = json_decode($config);
 $last_json_error = json_last_error();
 if ($last_json_error !== JSON_ERROR_NONE) {
-    throw new RuntimeException("Could not parse config - JSON error detected");
+	throw new RuntimeException("Could not parse config - JSON error detected");
 }
 $container['config'] = $config;
 
@@ -26,64 +26,64 @@ 
 // timezones are fun
 date_default_timezone_set('America/Phoenix'); // todo - belongs in configuration
 $container['default_timezone'] = function ($c) {
-    return new DateTimeZone('America/Phoenix');
+	return new DateTimeZone('America/Phoenix');
 };
 
 
 // configure the db connections holder
 $db_connections = new Aura\Sql\ConnectionLocator();
 $db_connections->setDefault(function () use ($config) {
-    $connection = $config->database->slave;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $config->database->slave;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setWrite('master', function () use ($config) {
-    $connection = $config->database->master;
-    return new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
+	$connection = $config->database->master;
+	return new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
 });
 $db_connections->setRead('slave', function () use ($config) {
-    $connection = $config->database->slave;
-    $pdo = new Aura\Sql\ExtendedPdo(
-        "mysql:host={$connection->host}",
-        $connection->user,
-        $connection->password
-    );
-
-    $profiler = new Aura\Sql\Profiler();
-    $profiler->setActive(true);
-    $pdo->setProfiler($profiler);
-
-    return $pdo;
+	$connection = $config->database->slave;
+	$pdo = new Aura\Sql\ExtendedPdo(
+		"mysql:host={$connection->host}",
+		$connection->user,
+		$connection->password
+	);
+
+	$profiler = new Aura\Sql\Profiler();
+	$profiler->setActive(true);
+	$pdo->setProfiler($profiler);
+
+	return $pdo;
 });
 $container['db_connection_locator'] = $db_connections;
 
 
 // setup mail handler
 $container['mail'] = $container->factory(function ($c) {
-    return (new Jacobemerick\Archangel\Archangel())->setLogger($c['logger']);
+	return (new Jacobemerick\Archangel\Archangel())->setLogger($c['logger']);
 });
 
 
 // setup the logger
 $container['setup_logger'] = $container->protect(function ($name) use ($container) {
-    $logger = new Monolog\Logger($name);
+	$logger = new Monolog\Logger($name);
 
-    $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")
-    );
-    $logger->pushHandler($streamHandler);
+	$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")
+	);
+	$logger->pushHandler($streamHandler);
 
-    Monolog\ErrorHandler::register($logger);
-    $container['logger'] = $logger;
+	Monolog\ErrorHandler::register($logger);
+	$container['logger'] = $logger;
 });
 
 

controller/Error404Controller.class.inc.php

Indentation +31 added lines, -31 removed lines

@@ -25,37 +25,37 @@
 
 	private function get_sites()
 	{
-    return [
-      [
-        'url' => 'https://home.jacobemerick.com/',
-        'title' => "Jacob Emerick's Home",
-        'name' => 'Home'
-      ],
-      [
-        'url' => 'https://blog.jacobemerick.com/',
-        'title' => "Jacob Emerick's Blog",
-        'name' => 'Blog'
-      ],
-      [
-        'url' => 'https://lifestream.jacobemerick.com/',
-        'title' => "Jacob Emerick's Lifestream",
-        'name' => 'Lifestream'
-      ],
-      [
-        'url' => 'https://map.jacobemerick.com/',
-        'title' => "Jacob Emerick's Hiking Map",
-        'name' => 'Map'
-      ],
-      [
-        'url' => 'https://portfolio.jacobemerick.com/',
-        'title' => "Jacob Emerick's Portfolio",
-        'name' => 'Portfolio',
-      ],
-      [
-        'url' => 'https://www.waterfallsofthekeweenaw.com/',
-        'title' => 'Waterfalls of the Keweenaw',
-        'name' => 'Waterfalls'
-      ]
+	return [
+	  [
+		'url' => 'https://home.jacobemerick.com/',
+		'title' => "Jacob Emerick's Home",
+		'name' => 'Home'
+	  ],
+	  [
+		'url' => 'https://blog.jacobemerick.com/',
+		'title' => "Jacob Emerick's Blog",
+		'name' => 'Blog'
+	  ],
+	  [
+		'url' => 'https://lifestream.jacobemerick.com/',
+		'title' => "Jacob Emerick's Lifestream",
+		'name' => 'Lifestream'
+	  ],
+	  [
+		'url' => 'https://map.jacobemerick.com/',
+		'title' => "Jacob Emerick's Hiking Map",
+		'name' => 'Map'
+	  ],
+	  [
+		'url' => 'https://portfolio.jacobemerick.com/',
+		'title' => "Jacob Emerick's Portfolio",
+		'name' => 'Portfolio',
+	  ],
+	  [
+		'url' => 'https://www.waterfallsofthekeweenaw.com/',
+		'title' => 'Waterfalls of the Keweenaw',
+		'name' => 'Waterfalls'
+	  ]
   ];
 	}
 

controller/waterfalls/LogController.class.inc.php

Indentation +196 added lines, -196 removed lines

@@ -1,210 +1,210 @@
 <?
 
 Loader::load('collector', array(
-    'image/AlbumCollector',
-    'waterfall/LogCollector'));
+	'image/AlbumCollector',
+	'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
 final class LogController extends DefaultPageController
 {
 
-    private static $AUTHOR = 'Jacob Emerick';
-    private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
-    private static $JOURNAL_DIRECTORY = 'journal';
-
-    private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
-    private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
-    private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';
-
-    private $log;
-
-    public function __construct()
-    {
-        parent::__construct();
-        
-        $log_path = URLDecode::getPiece(2);
-        
-        $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
-            $this->eject();
-
-        $this->parent_navigation_item = 'journal';
-        
-        $this->handle_comment_submit(
-            self::$WATERFALL_SITE_ID,
-            $this->log->alias,
-            Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
-            $this->log->title);
-        
-        $this->add_waterfall_js();
-    }
-
-    protected function set_head_data()
-    {
-        parent::set_head_data();
-        
-        $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
-        $this->set_description($this->log->introduction);
-        
-        $keyword_array = array();
-        $tag_result = LogCollector::getTagListForLog($this->log->id);
-        foreach($tag_result as $tag)
-        {
-            $keyword_array[] = $tag->name;
-        }
-        
-        $this->set_keywords($keyword_array);
-    }
-
-    protected function set_body_data($page_type = 'normal')
-    {
-        parent::set_body_data($page_type);
-        
-        $this->set_body('view', 'Log');
-
-        $body_data = $this->get_formatted_log();
-        $body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);
-        $body_data['sidebar'] = $this->get_sidebar();
-        $body_data['series'] = $this->get_series();
-        $body_data['album'] = $this->get_album();
-        
-        $this->set_body('data', $body_data);
-    }
-
-    private function get_formatted_log()
-    {
-        $formatted_log = array();
-        
-        $formatted_log['introduction'] = $this->get_log_introduction($this->log);
-        $formatted_log['title'] = $this->log->title;
-        $formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
-
-        $formatted_log['body'] = $this->get_formatted_log_body();
-        
-        return $formatted_log;
-    }
-
-    private function get_log_introduction($log)
-    {
-        return array(
-            'title' => $log->title,
-            'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
-            'date' => $this->get_parsed_date($log->date),
-            'publish_date' => $this->get_parsed_date($log->publish_date),
-            'introduction' => $log->introduction,
-            'image' => sprintf(
-                self::$MEDIUM_IMAGE_NODE,
-                $log->image_category,
-                $log->image_name,
-                $log->image_description),
-            'author' => self::$AUTHOR,
-            'author_url' => self::$AUTHOR_URL,
-        );
-    }
-
-    // @todo - link things up
-    private function get_formatted_log_body()
-    {
-        $body = $this->log->body;
-        
-        $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
-        $body = Content::instance('FixInternalLink', $body)->activate();
-        
-        return $body;
-    }
-
-    private function get_series()
-    {
-        $series = array(
-            'previous' => array(),
-            'next' => array());
-        
-        $previous_log = LogCollector::getPreviousLog($this->log->id);
-        if($previous_log != false)
-        {
-            $series['previous'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
-                'title' => $previous_log->title,
-                'date' => $previous_log->date);
-        }
-        
-        $next_log = LogCollector::getNextLog($this->log->id);
-        if($next_log != false)
-        {
-            $series['next'] = (object) array(
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
-                'title' => $next_log->title,
-                'date' => $next_log->date);
-        }
-        
-        return $series;
-    }
-
-    private function get_sidebar()
-    {
-        $sidebar = array();
-        
-        $sidebar['companion_list'] = array();
-        $companions = LogCollector::getCompanionListForLog($this->log->id);
-        foreach($companions as $companion)
-        {
-            $sidebar['companion_list'][] = (object) array(
-                'title' => $companion->name,
-                'path' => "/companion/{$companion->alias}/");
-        }
-        
-        $sidebar['tag_list'] = array();
-        $tags = LogCollector::getTagListForLog($this->log->id);
-        foreach($tags as $tag)
-        {
-            $sidebar['tag_list'][] = (object) array(
-                'title' => $tag->name,
-                'path' => "/journal/tag/{$tag->alias}/");
-        }
-        
-        $sidebar['waterfall_list'] = array();
-        $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
-        foreach($waterfalls as $waterfall)
-        {
-            $sidebar['waterfall_list'][] = (object) array(
-                'title' => $waterfall->name,
-                'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");
-        }
-        
-        return $sidebar;
-    }
-
-    private function get_album()
-    {
-        $album = array();
-        
-        if($this->log->album == 0)
-            return $album;
-        
-        $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
-        foreach($photo_list as $photo)
-        {
-            $photo_array = array();
-            $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
-            $photo_array['description'] = $photo->description;
+	private static $AUTHOR = 'Jacob Emerick';
+	private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
+	private static $JOURNAL_DIRECTORY = 'journal';
+
+	private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
+	private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
+	private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';
+
+	private $log;
+
+	public function __construct()
+	{
+		parent::__construct();
+        
+		$log_path = URLDecode::getPiece(2);
+        
+		$this->log = LogCollector::getByAlias($log_path);
+		if(!$this->log)
+			$this->eject();
+
+		$this->parent_navigation_item = 'journal';
+        
+		$this->handle_comment_submit(
+			self::$WATERFALL_SITE_ID,
+			$this->log->alias,
+			Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
+			$this->log->title);
+        
+		$this->add_waterfall_js();
+	}
+
+	protected function set_head_data()
+	{
+		parent::set_head_data();
+        
+		$this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
+		$this->set_description($this->log->introduction);
+        
+		$keyword_array = array();
+		$tag_result = LogCollector::getTagListForLog($this->log->id);
+		foreach($tag_result as $tag)
+		{
+			$keyword_array[] = $tag->name;
+		}
+        
+		$this->set_keywords($keyword_array);
+	}
+
+	protected function set_body_data($page_type = 'normal')
+	{
+		parent::set_body_data($page_type);
+        
+		$this->set_body('view', 'Log');
+
+		$body_data = $this->get_formatted_log();
+		$body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);
+		$body_data['sidebar'] = $this->get_sidebar();
+		$body_data['series'] = $this->get_series();
+		$body_data['album'] = $this->get_album();
+        
+		$this->set_body('data', $body_data);
+	}
+
+	private function get_formatted_log()
+	{
+		$formatted_log = array();
+        
+		$formatted_log['introduction'] = $this->get_log_introduction($this->log);
+		$formatted_log['title'] = $this->log->title;
+		$formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
+
+		$formatted_log['body'] = $this->get_formatted_log_body();
+        
+		return $formatted_log;
+	}
+
+	private function get_log_introduction($log)
+	{
+		return array(
+			'title' => $log->title,
+			'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
+			'date' => $this->get_parsed_date($log->date),
+			'publish_date' => $this->get_parsed_date($log->publish_date),
+			'introduction' => $log->introduction,
+			'image' => sprintf(
+				self::$MEDIUM_IMAGE_NODE,
+				$log->image_category,
+				$log->image_name,
+				$log->image_description),
+			'author' => self::$AUTHOR,
+			'author_url' => self::$AUTHOR_URL,
+		);
+	}
+
+	// @todo - link things up
+	private function get_formatted_log_body()
+	{
+		$body = $this->log->body;
+        
+		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
+		$body = Content::instance('FixInternalLink', $body)->activate();
+        
+		return $body;
+	}
+
+	private function get_series()
+	{
+		$series = array(
+			'previous' => array(),
+			'next' => array());
+        
+		$previous_log = LogCollector::getPreviousLog($this->log->id);
+		if($previous_log != false)
+		{
+			$series['previous'] = (object) array(
+				'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
+				'title' => $previous_log->title,
+				'date' => $previous_log->date);
+		}
+        
+		$next_log = LogCollector::getNextLog($this->log->id);
+		if($next_log != false)
+		{
+			$series['next'] = (object) array(
+				'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
+				'title' => $next_log->title,
+				'date' => $next_log->date);
+		}
+        
+		return $series;
+	}
+
+	private function get_sidebar()
+	{
+		$sidebar = array();
+        
+		$sidebar['companion_list'] = array();
+		$companions = LogCollector::getCompanionListForLog($this->log->id);
+		foreach($companions as $companion)
+		{
+			$sidebar['companion_list'][] = (object) array(
+				'title' => $companion->name,
+				'path' => "/companion/{$companion->alias}/");
+		}
+        
+		$sidebar['tag_list'] = array();
+		$tags = LogCollector::getTagListForLog($this->log->id);
+		foreach($tags as $tag)
+		{
+			$sidebar['tag_list'][] = (object) array(
+				'title' => $tag->name,
+				'path' => "/journal/tag/{$tag->alias}/");
+		}
+        
+		$sidebar['waterfall_list'] = array();
+		$waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
+		foreach($waterfalls as $waterfall)
+		{
+			$sidebar['waterfall_list'][] = (object) array(
+				'title' => $waterfall->name,
+				'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");
+		}
+        
+		return $sidebar;
+	}
+
+	private function get_album()
+	{
+		$album = array();
+        
+		if($this->log->album == 0)
+			return $album;
+        
+		$photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
+		foreach($photo_list as $photo)
+		{
+			$photo_array = array();
+			$photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
+			$photo_array['description'] = $photo->description;
             
-            if($photo->height < $photo->width)
-                list($height, $width) = array(75, 100);
-            else
-                list($height, $width) = array(100, 75);
+			if($photo->height < $photo->width)
+				list($height, $width) = array(75, 100);
+			else
+				list($height, $width) = array(100, 75);
             
-            $photo_array['image_node'] = sprintf(
-                self::$THUMB_IMAGE_NODE,
-                $photo->category,
-                $photo->name,
-                $photo->description,
-                $height,
-                $width);
+			$photo_array['image_node'] = sprintf(
+				self::$THUMB_IMAGE_NODE,
+				$photo->category,
+				$photo->name,
+				$photo->description,
+				$height,
+				$width);
             
-            $album[] = (object) $photo_array;
-        }
+			$album[] = (object) $photo_array;
+		}
         
-        return $album;
-    }
+		return $album;
+	}
 
 }