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/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

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(),

controller/waterfalls/MapController.class.inc.php

Indentation +48 added lines, -48 removed lines

@@ -6,62 +6,62 @@
 final class MapController extends DefaultPageController
 {
 
-    private static $TITLE = 'Map of Upper Peninsula Waterfalls';
-    private static $DESCRIPTION = '';
-    private static $KEYWORD_ARRAY = array();
+	private static $TITLE = 'Map of Upper Peninsula Waterfalls';
+	private static $DESCRIPTION = '';
+	private static $KEYWORD_ARRAY = array();
 
-    private static $HIDE_ON_INITIAL_LOAD_LIST = array(
-        'Lower Tahquamenon Falls',
-        'Rainbow Falls',
-        'Sandstone Falls',
-        'Upper Tahquamenon Falls',
-    );
+	private static $HIDE_ON_INITIAL_LOAD_LIST = array(
+		'Lower Tahquamenon Falls',
+		'Rainbow Falls',
+		'Sandstone Falls',
+		'Upper Tahquamenon Falls',
+	);
 
-    public function __construct()
-    {
-        parent::__construct();
+	public function __construct()
+	{
+		parent::__construct();
 
-        $this->add_js('https://maps.googleapis.com/maps/api/js?sensor=false');
-        $this->add_waterfall_js();
-    }
+		$this->add_js('https://maps.googleapis.com/maps/api/js?sensor=false');
+		$this->add_waterfall_js();
+	}
 
-    protected function set_head_data()
-    {
-        parent::set_head_data();
+	protected function set_head_data()
+	{
+		parent::set_head_data();
         
-        $this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);
-        $this->set_description(self::$DESCRIPTION);
-        $this->set_keywords(self::$KEYWORD_ARRAY);
-    }
+		$this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_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);
         
-        $this->set_head('full_page_map', true);
-        $this->set_body('waterfall_list', $this->fetch_waterfall_list());
-        $this->set_body('view', 'Map');
-    }
+		$this->set_head('full_page_map', true);
+		$this->set_body('waterfall_list', $this->fetch_waterfall_list());
+		$this->set_body('view', 'Map');
+	}
 
-    private function fetch_waterfall_list()
-    {
-        $list = WaterfallCollector::getMapList();
-        array_walk($list, array($this, 'parse_waterfall'));
-        return $list;
-    }
+	private function fetch_waterfall_list()
+	{
+		$list = WaterfallCollector::getMapList();
+		array_walk($list, array($this, 'parse_waterfall'));
+		return $list;
+	}
 
-    private function parse_waterfall(&$waterfall)
-    {
-        $waterfall = (object) array(
-            'name'  => $waterfall->name,
-            'latitude' => $waterfall->latitude,
-            'longitude' => $waterfall->longitude,
-            'link' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
-            'image' => "/photo/{$waterfall->photo_category}/{$waterfall->photo}-size-medium.jpg",
-            'image_alt' => $waterfall->photo_description,
-            'watercourse' => $waterfall->watercourse,
-            'hide_on_initial_load' => (in_array($waterfall->name, self::$HIDE_ON_INITIAL_LOAD_LIST)),
-        );
-    }
+	private function parse_waterfall(&$waterfall)
+	{
+		$waterfall = (object) array(
+			'name'  => $waterfall->name,
+			'latitude' => $waterfall->latitude,
+			'longitude' => $waterfall->longitude,
+			'link' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
+			'image' => "/photo/{$waterfall->photo_category}/{$waterfall->photo}-size-medium.jpg",
+			'image_alt' => $waterfall->photo_description,
+			'watercourse' => $waterfall->watercourse,
+			'hide_on_initial_load' => (in_array($waterfall->name, self::$HIDE_ON_INITIAL_LOAD_LIST)),
+		);
+	}
 
 }

controller/RSSController.class.inc.php

Indentation +4 added lines, -4 removed lines

@@ -57,10 +57,10 @@
 
 	final protected function setWebMaster($webmaster = '')
 	{
-        if ($webmaster == '') {
-            global $config;
-            $webmaster = "{$config->admin_email} (Jacob Emerick)";
-        }
+		if ($webmaster == '') {
+			global $config;
+			$webmaster = "{$config->admin_email} (Jacob Emerick)";
+		}
 		$this->xml->channel->addChild('webMaster', $webmaster);
 	}
 

controller/blog/SearchController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 	{
 		$query = URLDecode::getPiece(2);
 		$query = urldecode($query);
-        $query = str_replace('-', ' ', $query);
+		$query = str_replace('-', ' ', $query);
 		
 		$this->query = $query;
 		

controller/blog/DefaultPageController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 		Loader::load('collector', 'blog/TagCollector');
 		
 		$tag_result = TagCollector::getTagsForPost($post->id);
-        $tag_array = array();
+		$tag_array = array();
 		foreach($tag_result as $tag)
 		{
 			$tag_object = new stdclass();

controller/portfolio/ContactController.class.inc.php

Indentation +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		
 		else
 		{
-            global $config;
+			global $config;
 			$mail = new Mail();
 			$mail->setToAddress($config->admin_email, 'Jacob Emerick');
 			$mail->setSubject('Portfolio Contact');

module/form/CommentSubmitModule.class.inc.php

Indentation +11 added lines, -11 removed lines

@@ -172,24 +172,24 @@
 			}
 		}
         
-        $site = URLDecode::getSite();
+		$site = URLDecode::getSite();
         
-        if ($site == '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') {
-            $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') {
+			$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') {
+			$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!";
+		}
         
 		foreach($email_recipient_array as $email_recipient)
 		{
 			$mail = new Mail();
 			$mail->setToAddress($email_recipient['email'], $email_recipient['name']);
             
-            if ($site == 'blog') {
-                $mail->setSubject("New Comment on Jacob Emerick's Blog");
-            } else if ($site == 'waterfalls') {
-                $mail->setSubject("New Comment on Waterfalls of the Keweenaw");
-            }
+			if ($site == 'blog') {
+				$mail->setSubject("New Comment on Jacob Emerick's Blog");
+			} else if ($site == 'waterfalls') {
+				$mail->setSubject("New Comment on Waterfalls of the Keweenaw");
+			}
             
 			$mail->setMessage($message);
 			$mail->send();