jacobemerick / web

controller/home/DefaultPageController.class.inc.php

Braces +6 added lines, -6 removed lines

@@ -2,17 +2,17 @@
 
 Loader::load('controller', '/PageController');
 
-abstract class DefaultPageController extends PageController
-{
+abstract class DefaultPageController extends PageController

+{

 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->add_css('normalize');
 		$this->add_css('home');
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('activity_array', $this->get_recent_activity());
 	}
 

controller/home/HomeController.class.inc.php

Braces +8 added lines, -8 removed lines

@@ -5,8 +5,8 @@ 
 Loader::load('controller', 'home/DefaultPageController');
 Loader::load('utility', 'Content');
 
-final class HomeController extends DefaultPageController
-{
+final class HomeController extends DefaultPageController

+{

 
 	private static $TITLE = "Jacob Emerick's Home | Web Developer, Hiker, Innovator";
 	private static $DESCRIPTION = 'Home page for Jacob Emerick, with links to his blog, waterfall site, and other side projects';
@@ -24,8 +24,8 @@ 
 	private static $POST_LENGTH_SHORT = 160;
 	private static $POST_LENGTH_LONG = 240;
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title(self::$TITLE);
 		$this->set_description(self::$DESCRIPTION);
 		$this->set_keywords(self::$KEYWORD_ARRAY);
@@ -33,16 +33,16 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body('post_array', $this->get_recent_posts());
 		$this->set_body_view('Home');
 		
 		parent::set_body_data();
 	}
 
-	private function get_recent_posts()
-	{
+	private function get_recent_posts()

+	{

     global $container;
     $postRepository = new MysqlPostRepository($container['db_connection_locator']);
     $recentPosts = $postRepository->getActivePosts(3);

controller/home/AboutController.class.inc.php

Braces +6 added lines, -6 removed lines

@@ -2,8 +2,8 @@ 
 
 Loader::load('controller', 'home/DefaultPageController');
 
-final class AboutController extends DefaultPageController
-{
+final class AboutController extends DefaultPageController

+{

 
 	private static $TITLE = 'About | Jacob Emerick';
 	private static $DESCRIPTION = 'Some basic information about Jacob Emerick and his past, web development, and hiking adventures';
@@ -17,8 +17,8 @@ 
 		'web developer',
 		'hiker');
 
-	protected function set_head_data()
-	{
+	protected function set_head_data()

+	{

 		$this->set_title(self::$TITLE);
 		$this->set_description(self::$DESCRIPTION);
 		$this->set_keywords(self::$KEYWORD_ARRAY);
@@ -26,8 +26,8 @@ 
 		parent::set_head_data();
 	}
 
-	protected function set_body_data()
-	{
+	protected function set_body_data()

+	{

 		$this->set_body_view('About');
 		
 		parent::set_body_data();

controller/waterfalls/LogController.class.inc.php

Braces +31 added lines, -28 removed lines

@@ -5,8 +5,8 @@ 
     'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
-final class LogController extends DefaultPageController
-{
+final class LogController extends DefaultPageController

+{

 
     private static $AUTHOR = 'Jacob Emerick';
     private static $AUTHOR_URL = 'https://home.jacobemerick.com/';
@@ -18,15 +18,16 @@ 
 
     private $log;
 
-    public function __construct()
-    {
+    public function __construct()

+    {

         parent::__construct();
         
         $log_path = URLDecode::getPiece(2);
         
         $this->log = LogCollector::getByAlias($log_path);
-        if(!$this->log)
-            $this->eject();
+        if(!$this->log) {

+                    $this->eject();

+        }

 
         $this->parent_navigation_item = 'journal';
         
@@ -39,8 +40,8 @@ 
         $this->add_waterfall_js();
     }
 
-    protected function set_head_data()
-    {
+    protected function set_head_data()

+    {

         parent::set_head_data();
         
         $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
@@ -56,8 +57,8 @@ 
         $this->set_keywords($keyword_array);
     }
 
-    protected function set_body_data($page_type = 'normal')
-    {
+    protected function set_body_data($page_type = 'normal')

+    {

         parent::set_body_data($page_type);
         
         $this->set_body('view', 'Log');
@@ -71,8 +72,8 @@ 
         $this->set_body('data', $body_data);
     }
 
-    private function get_formatted_log()
-    {
+    private function get_formatted_log()

+    {

         $formatted_log = array();
         
         $formatted_log['introduction'] = $this->get_log_introduction($this->log);
@@ -84,8 +85,8 @@ 
         return $formatted_log;
     }
 
-    private function get_log_introduction($log)
-    {
+    private function get_log_introduction($log)

+    {

         return array(
             'title' => $log->title,
             'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
@@ -103,8 +104,8 @@ 
     }
 
     // @todo - link things up
-    private function get_formatted_log_body()
-    {
+    private function get_formatted_log_body()

+    {

         $body = $this->log->body;
         
         $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
@@ -113,8 +114,8 @@ 
         return $body;
     }
 
-    private function get_series()
-    {
+    private function get_series()

+    {

         $series = array(
             'previous' => array(),
             'next' => array());
@@ -140,8 +141,8 @@ 
         return $series;
     }
 
-    private function get_sidebar()
-    {
+    private function get_sidebar()

+    {

         $sidebar = array();
         
         $sidebar['companion_list'] = array();
@@ -174,12 +175,13 @@ 
         return $sidebar;
     }
 
-    private function get_album()
-    {
+    private function get_album()

+    {

         $album = array();
         
-        if($this->log->album == 0)
-            return $album;
+        if($this->log->album == 0) {

+                    return $album;

+        }

         
         $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
         foreach($photo_list as $photo)
@@ -188,10 +190,11 @@ 
             $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,

controller/waterfalls/DefaultWaterfallListController.class.inc.php

Braces +10 added lines, -10 removed lines

@@ -7,23 +7,23 @@ 
 	'waterfall/WaterfallCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
-abstract class DefaultWaterfallListController extends DefaultListController
-{
+abstract class DefaultWaterfallListController extends DefaultListController

+{

 
 	protected static $ITEM_COUNT_PER_PAGE = 24;
 
-	final protected function get_list_view()
-	{
+	final protected function get_list_view()

+	{

 		return 'FallListing';
 	}
 
-	protected function get_item_count_per_page()
-	{
+	protected function get_item_count_per_page()

+	{

 		return self::$ITEM_COUNT_PER_PAGE;
 	}
 
-	final protected function format_item($item)
-	{
+	final protected function format_item($item)

+	{

 		$item_array = array();
 		
 		$item_array['name'] = $item->name;
@@ -36,8 +36,8 @@ 
 		return $item_array;
 	}
 
-	final protected function get_sidebar()
-	{
+	final protected function get_sidebar()

+	{

 		$county_result = CountyCollector::getCountyList();
 		$county_list = array();
 		

controller/waterfalls/LogListController.class.inc.php

Braces +20 added lines, -20 removed lines

@@ -5,8 +5,8 @@ 
 	'waterfall/LogCollector'));
 Loader::load('controller', 'waterfalls/DefaultLogListController');
 
-final class LogListController extends DefaultLogListController
-{
+final class LogListController extends DefaultLogListController

+{

 
 	private static $PRIMARY_TITLE = 'Journal from Waterfall Hikes';
 	private static $PRIMARY_DESCRIPTION = 'Stories written by Jacob Emerick about his epic waterfall adventures in the general Keweenaw, Ontonagon, and Marquette areas.';
@@ -28,8 +28,8 @@ 
 	private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d total journal entries';
 	private static $LINK_ROOT = '/journal/';
 
-	protected function get_initial_meta()
-	{
+	protected function get_initial_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
@@ -39,8 +39,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_subsequent_meta()
-	{
+	protected function get_subsequent_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page);
@@ -50,8 +50,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction()

+	{

 		$introduction = array();
 		
 		$introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
@@ -63,34 +63,34 @@ 
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction()

+	{

 		return array(
 			'title' => sprintf(self::$SECONDARY_INTRODUCTION_HEADER, $this->page, $this->page_count));
 	}
 
-	protected function get_page_number_piece()
-	{
+	protected function get_page_number_piece()

+	{

 		return URLDecode::getPiece(2);
 	}
 
-	protected function get_item_result($total, $offset)
-	{
+	protected function get_item_result($total, $offset)

+	{

 		return LogCollector::getList($total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result()

+	{

 		return LogCollector::getListCount();
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern()

+	{

 		return self::$NAVIGATION_DESCRIPTION;
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root()

+	{

 		return self::$LINK_ROOT;
 	}
 

controller/waterfalls/WatercourseListController.class.inc.php

Braces +29 added lines, -28 removed lines

@@ -3,8 +3,8 @@ 
 Loader::load('collector', 'waterfall/WaterfallCollector');
 Loader::load('controller', 'waterfalls/DefaultWaterfallListController');
 
-final class WatercourseListController extends DefaultWaterfallListController
-{
+final class WatercourseListController extends DefaultWaterfallListController

+{

 
 	private static $DEFAULT_TITLE = 'Hiking with %s, Page %d of %d';
 	private static $DEFAULT_DESCRIPTION = 'Page %d of %d of legendary hiking stories with %s written by Jacob Emerick, all about his adventures hunting waterfalls in the Upper Peninsula of Michigan';
@@ -24,19 +24,20 @@ 
 
 	private $watercourse;
 
-	public function __construct()
-	{
+	public function __construct()

+	{

 		$path = URLDecode::getPiece(1);
 		$this->watercourse = WatercourseCollector::getByAlias($path);
 		
-		if(!$this->watercourse)
-			$this->eject();
+		if(!$this->watercourse) {

+					$this->eject();

+		}

 	
 		parent::__construct();
 	}
 
-	protected function get_initial_meta()
-	{
+	protected function get_initial_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = "{$this->watercourse->name} | " . self::$WEBSITE_TITLE;
@@ -46,8 +47,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_subsequent_meta()
-	{
+	protected function get_subsequent_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->watercourse->name, $this->page, $this->page_count);
@@ -57,15 +58,15 @@ 
 		return $meta_array;
 	}
 
-	private function get_keyword_array()
-	{
+	private function get_keyword_array()

+	{

 		$keyword_array = self::$KEYWORD_ARRAY;
 		array_unshift($keyword_array, strtolower($this->watercourse->name));
 		return $keyword_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction()

+	{

 		$introduction = array();
 		
 		$introduction['title'] = $this->watercourse->header;
@@ -75,39 +76,39 @@ 
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction()

+	{

 		return array(
 			'title' => sprintf(self::$DEFAULT_HEADER, $this->page, $this->watercourse->name));
 	}
 
-	protected function get_item_count_per_page()
-	{
+	protected function get_item_count_per_page()

+	{

 		return self::$ITEM_COUNT_PER_PAGE;
 	}
 
-	protected function get_page_number_piece()
-	{
+	protected function get_page_number_piece()

+	{

 		return URLDecode::getPiece(2);
 	}
 
-	protected function get_item_result($total, $offset)
-	{
+	protected function get_item_result($total, $offset)

+	{

 		return WatercourseCollector::getLogListForWatercourse($this->watercourse->id, $total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result()

+	{

 		return WatercourseCollector::getLogCountForWatercourse($this->watercourse->id);
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern()

+	{

 		return str_replace('%COUNTY%', $this->watercourse->name, self::$NAVIGATION_DESCRIPTION);
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root()

+	{

 		return sprintf(self::$LINK_ROOT, $this->watercourse->alias);
 	}
 

controller/waterfalls/DefaultLogListController.class.inc.php

Braces +10 added lines, -10 removed lines

@@ -7,23 +7,23 @@ 
 	'waterfall/PeriodCollector'));
 Loader::load('controller', 'waterfalls/DefaultListController');
 
-abstract class DefaultLogListController extends DefaultListController
-{
+abstract class DefaultLogListController extends DefaultListController

+{

 
 	private static $ITEM_COUNT_PER_PAGE = 10;
 
-	final protected function get_list_view()
-	{
+	final protected function get_list_view()

+	{

 		return 'LogListing';
 	}
 
-	final protected function get_item_count_per_page()
-	{
+	final protected function get_item_count_per_page()

+	{

 		return self::$ITEM_COUNT_PER_PAGE;
 	}
 
-	final protected function format_item($item)
-	{
+	final protected function format_item($item)

+	{

 		$item_array = array();
 		
 		$item_array['title'] = $item->title;
@@ -37,8 +37,8 @@ 
 		return $item_array;
 	}
 
-	final protected function get_sidebar()
-	{
+	final protected function get_sidebar()

+	{

 		$companion_result = CompanionCollector::getCompanionList();
 		$companion_list = array();
 		

controller/waterfalls/WaterfallListController.class.inc.php

Braces +20 added lines, -20 removed lines

@@ -5,8 +5,8 @@ 
 	'waterfall/WaterfallCollector'));
 Loader::load('controller', 'waterfalls/DefaultWaterfallListController');
 
-final class WaterfallListController extends DefaultWaterfallListController
-{
+final class WaterfallListController extends DefaultWaterfallListController

+{

 
 	private static $PRIMARY_TITLE = 'Full Listing of Falls';
 	private static $PRIMARY_DESCRIPTION = 'List of waterfalls found in the general Keweenaw Area, complete with photos, descriptions, directions, and maps.';
@@ -28,8 +28,8 @@ 
 	private static $NAVIGATION_DESCRIPTION = 'displaying %d ~ %d of %d total waterfalls';
 	private static $LINK_ROOT = '/falls/';
 
-	protected function get_initial_meta()
-	{
+	protected function get_initial_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = self::$PRIMARY_TITLE . ' | ' . self::$WEBSITE_TITLE;
@@ -39,8 +39,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_subsequent_meta()
-	{
+	protected function get_subsequent_meta()

+	{

 		$meta_array = array();
 		
 		$meta_array['title'] = sprintf(self::$SECONDARY_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->page, $this->page_count);
@@ -50,8 +50,8 @@ 
 		return $meta_array;
 	}
 
-	protected function get_initial_introduction()
-	{
+	protected function get_initial_introduction()

+	{

 		$introduction = array();
 		
 		$introduction['title'] = self::$PRIMARY_INTRODUCTION_HEADER;
@@ -63,34 +63,34 @@ 
 		return $introduction;
 	}
 
-	protected function get_subsequent_introduction()
-	{
+	protected function get_subsequent_introduction()

+	{

 		return array(
 			'title' => sprintf(self::$SECONDARY_INTRODUCTION_HEADER, $this->page, $this->page_count));
 	}
 
-	protected function get_page_number_piece()
-	{
+	protected function get_page_number_piece()

+	{

 		return URLDecode::getPiece(2);
 	}
 
-	protected function get_item_result($total, $offset)
-	{
+	protected function get_item_result($total, $offset)

+	{

 		return WaterfallCollector::getList($total, $offset);
 	}
 
-	protected function get_item_count_result()
-	{
+	protected function get_item_count_result()

+	{

 		return WaterfallCollector::getListCount();
 	}
 
-	protected function get_list_description_pattern()
-	{
+	protected function get_list_description_pattern()

+	{

 		return self::$NAVIGATION_DESCRIPTION;
 	}
 
-	protected function get_list_link_root()
-	{
+	protected function get_list_link_root()

+	{

 		return self::$LINK_ROOT;
 	}