jacobemerick / web

controller/waterfalls/AboutController.class.inc.php

Indentation +20 added lines, -20 removed lines

@@ -5,29 +5,29 @@
 final class AboutController extends DefaultPageController
 {
 
-    private static $TITLE = 'About the Website | Waterfalls of the Keweenaw';
-    private static $DESCRIPTION = 'A little bit about the website, the area, and the reason why someone would hunt down a hundred and fifty waterfalls in the Upper Peninsula.';
-    private static $KEYWORD_ARRAY = array(
-        'about',
-        'waterfalls',
-        'birthday trip',
-        'Jacob Emerick',
-    );
+	private static $TITLE = 'About the Website | Waterfalls of the Keweenaw';
+	private static $DESCRIPTION = 'A little bit about the website, the area, and the reason why someone would hunt down a hundred and fifty waterfalls in the Upper Peninsula.';
+	private static $KEYWORD_ARRAY = array(
+		'about',
+		'waterfalls',
+		'birthday trip',
+		'Jacob Emerick',
+	);
 
-    protected function set_head_data()
-    {
-        parent::set_head_data();
+	protected function set_head_data()
+	{
+		parent::set_head_data();
         
-        $this->set_title(self::$TITLE);
-        $this->set_description(self::$DESCRIPTION);
-        $this->set_keywords(self::$KEYWORD_ARRAY);
-    }
+		$this->set_title(self::$TITLE);
+		$this->set_description(self::$DESCRIPTION);
+		$this->set_keywords(self::$KEYWORD_ARRAY);
+	}
 
-    protected function set_body_data($page_type = 'normal')
-    {
-        parent::set_body_data($page_type);
+	protected function set_body_data($page_type = 'normal')
+	{
+		parent::set_body_data($page_type);
         
-        $this->set_body('view', 'About');
-    }
+		$this->set_body('view', 'About');
+	}
 
 }

controller/waterfalls/DefaultLogListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -42,7 +42,7 @@ 
 		$companion_result = CompanionCollector::getCompanionList();
 		$companion_list = array();
 		
-		foreach($companion_result as $companion_row)
+		foreach ($companion_result as $companion_row)
 		{
 			$companion = new stdclass();
 			$companion->name = $companion_row->name;
@@ -55,7 +55,7 @@ 
 		$period_result = PeriodCollector::getPeriodList();
 		$period_list = array();
 		
-		foreach($period_result as $period_row)
+		foreach ($period_result as $period_row)
 		{
 			$period = new stdclass();
 			$period->name = $period_row->name;

controller/waterfalls/SearchListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 	protected function get_page_number()
 	{
 		$page = URLDecode::getPiece(2);
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 

controller/waterfalls/HomeController.class.inc.php

Indentation +62 added lines, -62 removed lines

@@ -1,84 +1,84 @@
 <?
 
 Loader::load('collector', array(
-    'comment/CommentCollector',
-    'image/PhotoCollector',
-    'waterfall/LogCollector',
+	'comment/CommentCollector',
+	'image/PhotoCollector',
+	'waterfall/LogCollector',
 ));
 Loader::load('controller', 'waterfalls/DefaultPageController');
 
 final class HomeController extends DefaultPageController
 {
 
-    private static $TITLE = 'Waterfalls of the Keweenaw | Stories and Tips from Jacob Emerick';
-    private static $DESCRIPTION = 'Stories, maps, and details about many of the waterfalls in the Upper Peninsula of Michigan, compiled by Jacob Emerick.';
-    private static $KEYWORD_ARRAY = array(
-        'waterfalls',
-        'keweenaw',
-        'upper peninsula',
-        'jacob emerick',
-    );
+	private static $TITLE = 'Waterfalls of the Keweenaw | Stories and Tips from Jacob Emerick';
+	private static $DESCRIPTION = 'Stories, maps, and details about many of the waterfalls in the Upper Peninsula of Michigan, compiled by Jacob Emerick.';
+	private static $KEYWORD_ARRAY = array(
+		'waterfalls',
+		'keweenaw',
+		'upper peninsula',
+		'jacob emerick',
+	);
 
-    private static $BANNER_IMAGE = 2661;
+	private static $BANNER_IMAGE = 2661;
 
-    protected function set_head_data()
-    {
-        parent::set_head_data();
+	protected function set_head_data()
+	{
+		parent::set_head_data();
         
-        $this->set_title(self::$TITLE);
-        $this->set_description(self::$DESCRIPTION);
-        $this->set_keywords(self::$KEYWORD_ARRAY);
-    }
+		$this->set_title(self::$TITLE);
+		$this->set_description(self::$DESCRIPTION);
+		$this->set_keywords(self::$KEYWORD_ARRAY);
+	}
 
-    protected function set_body_data($page_type = 'wide')
-    {
-        parent::set_body_data($page_type);
+	protected function set_body_data($page_type = 'wide')
+	{
+		parent::set_body_data($page_type);
         
-        $photo = PhotoCollector::getRow(self::$BANNER_IMAGE);
-        $photo_obj = (object) array(
-            'file'         => "/photo/{$photo->category}/{$photo->name}-size-full.jpg",
-            'description'  => $photo->description,
-        );
-        $this->set_body('photo', $photo_obj);
+		$photo = PhotoCollector::getRow(self::$BANNER_IMAGE);
+		$photo_obj = (object) array(
+			'file'         => "/photo/{$photo->category}/{$photo->name}-size-full.jpg",
+			'description'  => $photo->description,
+		);
+		$this->set_body('photo', $photo_obj);
         
-        $recent_log_container;
-        $recent_logs = LogCollector::getRecentList(4);
-        foreach ($recent_logs as $log) {
-            $recent_log_container[] = (object) array(
-                'photo'  => (object) array(
-                    'file'         => "/photo/{$log->photo_category}/{$log->photo}-size-thumb.jpg",
-                    'description'  => $log->photo_description,
-                ),
-                'title'  => $log->title,
-                'link'   => "/journal/{$log->alias}/",
-                'date'   => date('F j, Y', strtotime($log->publish_date)),
-            );
-        }
-        $this->set_body('logs', $recent_log_container);
+		$recent_log_container;
+		$recent_logs = LogCollector::getRecentList(4);
+		foreach ($recent_logs as $log) {
+			$recent_log_container[] = (object) array(
+				'photo'  => (object) array(
+					'file'         => "/photo/{$log->photo_category}/{$log->photo}-size-thumb.jpg",
+					'description'  => $log->photo_description,
+				),
+				'title'  => $log->title,
+				'link'   => "/journal/{$log->alias}/",
+				'date'   => date('F j, Y', strtotime($log->publish_date)),
+			);
+		}
+		$this->set_body('logs', $recent_log_container);
         
-        $recent_comments = CommentCollector::getRecentWaterfallComments();
+		$recent_comments = CommentCollector::getRecentWaterfallComments();
         
-        $recent_comment_container = array();
-        foreach($recent_comments as $comment) {
-            $body = $comment->body;
-            $body = strip_tags($body);
+		$recent_comment_container = array();
+		foreach($recent_comments as $comment) {
+			$body = $comment->body;
+			$body = strip_tags($body);
             
-            $comment_obj = new stdclass();
-            $comment_obj->description = Content::instance('SmartTrim', $body)->activate(50);
-            $comment_obj->commenter = $comment->name;
-            if (!empty($comment->log_path)) {
-                $comment_obj->link = Loader::getRootURL() . "{$comment->log_path}/#comment-{$comment->id}";
-                $comment_obj->location = $comment->log_title;
-            } else {
-                $comment_obj->link = Loader::getRootURL() . "{$comment->waterfall_path}/#comment-{$comment->id}";
-                $comment_obj->location = $comment->waterfall_title;
-            }
+			$comment_obj = new stdclass();
+			$comment_obj->description = Content::instance('SmartTrim', $body)->activate(50);
+			$comment_obj->commenter = $comment->name;
+			if (!empty($comment->log_path)) {
+				$comment_obj->link = Loader::getRootURL() . "{$comment->log_path}/#comment-{$comment->id}";
+				$comment_obj->location = $comment->log_title;
+			} else {
+				$comment_obj->link = Loader::getRootURL() . "{$comment->waterfall_path}/#comment-{$comment->id}";
+				$comment_obj->location = $comment->waterfall_title;
+			}
             
-            $recent_comment_container[] = $comment_obj;
-        }
-        $this->set_body('comments', $recent_comment_container);
+			$recent_comment_container[] = $comment_obj;
+		}
+		$this->set_body('comments', $recent_comment_container);
         
-        $this->set_body('view', 'Home');
-    }
+		$this->set_body('view', 'Home');
+	}
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
         $recent_comments = CommentCollector::getRecentWaterfallComments();
         
         $recent_comment_container = array();
-        foreach($recent_comments as $comment) {
+        foreach ($recent_comments as $comment) {
             $body = $comment->body;
             $body = strip_tags($body);
             

controller/waterfalls/DefaultWaterfallListController.class.inc.php

Spacing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
 		$county_result = CountyCollector::getCountyList();
 		$county_list = array();
 		
-		foreach($county_result as $county_row)
+		foreach ($county_result as $county_row)
 		{
 			$county = new stdclass();
 			$county->name = $county_row->name;
@@ -54,7 +54,7 @@ 
 		$watercourse_result = WatercourseCollector::getWatercourseList();
 		$watercourse_list = array();
 		
-		foreach($watercourse_result as $watercourse_row)
+		foreach ($watercourse_result as $watercourse_row)
 		{
 			$watercourse = new stdclass();
 			$watercourse->name = $watercourse_row->name;

controller/waterfalls/ContactController.class.inc.php

Spacing +5 added lines, -5 removed lines

@@ -33,16 +33,16 @@ 
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
+		if (!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
 			return (object) array('display' => 'normal');
 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
+		if (!Validate::checkRequest('post', 'name', 'string'))
 			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
+		if (!Validate::checkRequest('post', 'email', 'string'))
 			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
+		if (!Validate::checkRequest('post', 'message', 'string'))
 			$error_result['message'] = 'please write a message';
 		
 		$values = (object) array(
@@ -50,7 +50,7 @@ 
 			'email' => Request::getPost('email'),
 			'message' => Request::getPost('message'));
 		
-		if(count($error_result) > 0)
+		if (count($error_result) > 0)
 		{
 			return (object) array(
 				'display' => 'error',

Braces +12 added lines, -8 removed lines

@@ -33,17 +33,21 @@
 
 	private function process_form()
 	{
-		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!')
-			return (object) array('display' => 'normal');
+		if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') {

+					return (object) array('display' => 'normal');

+		}

 		
 		Loader::load('utility', 'Validate');
 		$error_result = array();
-		if(!Validate::checkRequest('post', 'name', 'string'))
-			$error_result['name'] = 'please enter your name';
-		if(!Validate::checkRequest('post', 'email', 'string'))
-			$error_result['email'] = 'please enter a valid email';
-		if(!Validate::checkRequest('post', 'message', 'string'))
-			$error_result['message'] = 'please write a message';
+		if(!Validate::checkRequest('post', 'name', 'string')) {

+					$error_result['name'] = 'please enter your name';

+		}

+		if(!Validate::checkRequest('post', 'email', 'string')) {

+					$error_result['email'] = 'please enter a valid email';

+		}

+		if(!Validate::checkRequest('post', 'message', 'string')) {

+					$error_result['message'] = 'please write a message';

+		}

 		
 		$values = (object) array(
 			'name' => Request::getPost('name'),

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 	public function __construct()
 	{
-        global $config;
+		global $config;
 		$this->headers['From'] = self::$FROM;
 		$this->headers['Reply-To'] = "Jacob <{$config->admin_email}>";
 		$this->headers['Bcc'] = "Jacob <{$config->admin_email}>";

controller/waterfalls/LogTagListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		$alias = URLDecode::getPiece(3);
 		$this->tag = LogTagCollector::getTag($alias);
 		
-		if(!$this->tag)
+		if (!$this->tag)
 			$this->eject();
 		
 		parent::__construct();

Braces +3 added lines, -2 removed lines

@@ -27,8 +27,9 @@
 		$alias = URLDecode::getPiece(3);
 		$this->tag = LogTagCollector::getTag($alias);
 		
-		if(!$this->tag)
-			$this->eject();
+		if(!$this->tag) {

+					$this->eject();

+		}

 		
 		parent::__construct();
 	}

controller/waterfalls/WatercourseListController.class.inc.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 		$path = URLDecode::getPiece(1);
 		$this->watercourse = WatercourseCollector::getByAlias($path);
 		
-		if(!$this->watercourse)
+		if (!$this->watercourse)
 			$this->eject();
 	
 		parent::__construct();

Braces +3 added lines, -2 removed lines

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

+					$this->eject();

+		}

 	
 		parent::__construct();
 	}

controller/waterfalls/DefaultListController.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -95,9 +95,9 @@ 
 	abstract protected function get_initial_meta();
 	abstract protected function get_subsequent_meta();
 
-    final protected function set_body_data($page_type = 'normal')
-    {
-        parent::set_body_data($page_type);
+	final protected function set_body_data($page_type = 'normal')
+	{
+		parent::set_body_data($page_type);
 		
 		$this->set_body('view', $this->get_list_view());
 		$this->set_body('data', $this->get_list_body_data());
@@ -107,7 +107,7 @@ 
 	{
 		$body_data_array = array();
 		
-        $body_data_array['introduction'] = $this->get_introduction();
+		$body_data_array['introduction'] = $this->get_introduction();
 		$body_data_array['items'] = array_map(array($this, 'format_item'), $this->get_items());
 		$body_data_array['navigation'] = array(
 				'description' => $this->get_list_description(),

Spacing +16 added lines, -16 removed lines

@@ -20,14 +20,14 @@ 
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();
 		
 		$items = $this->get_items();
-		if(count($items) < 1)
+		if (count($items) < 1)
 			$this->eject();
 	}
 
 	final protected function get_page_number()
 	{
 		$page = $this->get_page_number_piece();
-		if(isset($page) && is_numeric($page))
+		if (isset($page) && is_numeric($page))
 			return $page;
 		return 1;
 	}
@@ -41,7 +41,7 @@ 
 
 	final private function get_introduction()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return $this->get_initial_introduction();
 		
 		return $this->get_subsequent_introduction();
@@ -53,7 +53,7 @@ 
 	private $items;
 	protected function get_items()
 	{
-		if(!isset($this->items))
+		if (!isset($this->items))
 		{
 			$total = $this->get_item_count_per_page();
 			$offset = ($this->page - 1) * $this->get_item_count_per_page();
@@ -68,7 +68,7 @@ 
 	private $item_count;
 	final private function get_item_count()
 	{
-		if(!isset($this->item_count))
+		if (!isset($this->item_count))
 			$this->item_count = $this->get_item_count_result();
 		return $this->item_count;
 	}
@@ -82,7 +82,7 @@ 
 		$this->set_head('next_link', $this->get_list_next_link());
 		$this->set_head('previous_link', $this->get_list_prev_link());
 		
-		if($this->page == 1)
+		if ($this->page == 1)
 			$meta_array = $this->get_initial_meta();
 		else
 			$meta_array = $this->get_subsequent_meta();
@@ -119,16 +119,16 @@ 
 
 	final private function get_list_prev_link()
 	{
-		if($this->page == 1)
+		if ($this->page == 1)
 			return;
-		if($this->page == 2)
+		if ($this->page == 2)
 			return $this->get_list_link_root();
 		return $this->get_list_link_root() . ($this->page - 1) . '/';
 	}
 
 	final private function get_list_next_link()
 	{
-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
+		if (($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
 			return;
 		return $this->get_list_link_root() . ($this->page + 1) . '/';
 	}
@@ -139,27 +139,27 @@ 
 	{
 		$link_array = array();
 		
-		if($this->get_item_count_per_page() >= $this->get_item_count())
+		if ($this->get_item_count_per_page() >= $this->get_item_count())
 			return $link_array;
 		
 		$link = new stdclass();
 		$link->anchor = '&laquo; previous';
-		if($this->get_list_prev_link() !== null)
+		if ($this->get_list_prev_link() !== null)
 			$link->uri = $this->get_list_prev_link();
 		else
 			$link->class = 'inactive';
 		$link_array[] = $link;
 		
-		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
+		for ($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
 		{
 			$link = new stdclass();
 			$link->anchor = $i;
 			
-			if($i == $this->page)
+			if ($i == $this->page)
 				$link->class = 'current';
 			else
 			{
-				if($i == 1)
+				if ($i == 1)
 					$link->uri = $this->get_list_link_root();
 				else
 					$link->uri = $this->get_list_link_root() . $i . '/';
@@ -170,7 +170,7 @@ 
 		
 		$link = new stdclass();
 		$link->anchor = 'next &raquo;';
-		if($this->get_list_next_link() !== null)
+		if ($this->get_list_next_link() !== null)
 			$link->uri = $this->get_list_next_link();
 		else
 			$link->class = 'inactive';
@@ -192,7 +192,7 @@ 
 
 	final protected function get_image_element($category, $path, $description, $size = 'small')
 	{
-		switch($size)
+		switch ($size)
 		{
 			case 'medium' :
 				$height = 375;

Braces +47 added lines, -35 removed lines

@@ -20,15 +20,17 @@ 
 		$this->offset = ($this->page - 1) * $this->get_item_count_per_page();
 		
 		$items = $this->get_items();
-		if(count($items) < 1)
-			$this->eject();
+		if(count($items) < 1) {

+					$this->eject();

+		}

 	}
 
 	final protected function get_page_number()
 	{
 		$page = $this->get_page_number_piece();
-		if(isset($page) && is_numeric($page))
-			return $page;
+		if(isset($page) && is_numeric($page)) {

+					return $page;

+		}

 		return 1;
 	}
 
@@ -41,8 +43,9 @@ 
 
 	final private function get_introduction()
 	{
-		if($this->page == 1)
-			return $this->get_initial_introduction();
+		if($this->page == 1) {

+					return $this->get_initial_introduction();

+		}

 		
 		return $this->get_subsequent_introduction();
 	}
@@ -68,8 +71,9 @@ 
 	private $item_count;
 	final private function get_item_count()
 	{
-		if(!isset($this->item_count))
-			$this->item_count = $this->get_item_count_result();
+		if(!isset($this->item_count)) {

+					$this->item_count = $this->get_item_count_result();

+		}

 		return $this->item_count;
 	}
 
@@ -82,10 +86,11 @@ 
 		$this->set_head('next_link', $this->get_list_next_link());
 		$this->set_head('previous_link', $this->get_list_prev_link());
 		
-		if($this->page == 1)
-			$meta_array = $this->get_initial_meta();
-		else
-			$meta_array = $this->get_subsequent_meta();
+		if($this->page == 1) {

+					$meta_array = $this->get_initial_meta();

+		} else {

+					$meta_array = $this->get_subsequent_meta();

+		}

 		
 		$this->set_title($meta_array['title']);
 		$this->set_description($meta_array['description']);
@@ -119,17 +124,20 @@ 
 
 	final private function get_list_prev_link()
 	{
-		if($this->page == 1)
-			return;
-		if($this->page == 2)
-			return $this->get_list_link_root();
+		if($this->page == 1) {

+					return;

+		}

+		if($this->page == 2) {

+					return $this->get_list_link_root();

+		}

 		return $this->get_list_link_root() . ($this->page - 1) . '/';
 	}
 
 	final private function get_list_next_link()
 	{
-		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count())
-			return;
+		if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count()) {

+					return;

+		}

 		return $this->get_list_link_root() . ($this->page + 1) . '/';
 	}
 
@@ -139,15 +147,17 @@ 
 	{
 		$link_array = array();
 		
-		if($this->get_item_count_per_page() >= $this->get_item_count())
-			return $link_array;
+		if($this->get_item_count_per_page() >= $this->get_item_count()) {

+					return $link_array;

+		}

 		
 		$link = new stdclass();
 		$link->anchor = '&laquo; previous';
-		if($this->get_list_prev_link() !== null)
-			$link->uri = $this->get_list_prev_link();
-		else
-			$link->class = 'inactive';
+		if($this->get_list_prev_link() !== null) {

+					$link->uri = $this->get_list_prev_link();

+		} else {

+					$link->class = 'inactive';

+		}

 		$link_array[] = $link;
 		
 		for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++)
@@ -155,14 +165,15 @@ 
 			$link = new stdclass();
 			$link->anchor = $i;
 			
-			if($i == $this->page)
-				$link->class = 'current';
-			else
+			if($i == $this->page) {

+							$link->class = 'current';

+			} else
 			{
-				if($i == 1)
-					$link->uri = $this->get_list_link_root();
-				else
-					$link->uri = $this->get_list_link_root() . $i . '/';
+				if($i == 1) {

+									$link->uri = $this->get_list_link_root();

+				} else {

+									$link->uri = $this->get_list_link_root() . $i . '/';

+				}

 			}
 			
 			$link_array[] = $link;
@@ -170,10 +181,11 @@ 
 		
 		$link = new stdclass();
 		$link->anchor = 'next &raquo;';
-		if($this->get_list_next_link() !== null)
-			$link->uri = $this->get_list_next_link();
-		else
-			$link->class = 'inactive';
+		if($this->get_list_next_link() !== null) {

+					$link->uri = $this->get_list_next_link();

+		} else {

+					$link->class = 'inactive';

+		}

 		$link_array[] = $link;
 		
 		return $link_array;