Inspection of "Updates badge links, style changes on new reposito..." - jacobemerick/web - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — master (de1ee7)

by Jacob

created 2015-11-28 18:15 UTC

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

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

Please login to merge, or discard this patch.

controller/robot/WaterfallsRobotController.class.inc.php 1 patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -5,9 +5,9 @@
 block discarded – undo
 class WaterfallsRobotController extends RobotController
 {
 
-    protected function set_data()
-    {
-        $this->disallow_for_all_robots('/search/');
-    }
+	protected function set_data()
+	{
+		$this->disallow_for_all_robots('/search/');
+	}
 
 }

Please login to merge, or discard this patch.

controller/site/ContactController.class.inc.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -46,7 +46,7 @@
 block discarded – undo
 				'value' => Request::getPost());
 		}
 		
-        global $config;
+		global $config;
 		$mail = new Mail();
 		$mail->setToAddress($config->admin_email, 'Jacob Emerick');
 		$mail->setSubject('Site Contact');

Please login to merge, or discard this patch.

controller/sitemap/WaterfallSitemapController.class.inc.php 1 patch

Indentation +144 added lines, -144 removed lines patch added patch discarded remove patch

@@ -1,13 +1,13 @@  discard block
 block discarded – undo
 <?
 
 Loader::load('collector', array(
-    'waterfall/CompanionCollector',
-    'waterfall/CountyCollector',
-    'waterfall/LogCollector',
-    'waterfall/LogTagCollector',
-    'waterfall/PeriodCollector',
-    'waterfall/WatercourseCollector',
-    'waterfall/WaterfallCollector',
+	'waterfall/CompanionCollector',
+	'waterfall/CountyCollector',
+	'waterfall/LogCollector',
+	'waterfall/LogTagCollector',
+	'waterfall/PeriodCollector',
+	'waterfall/WatercourseCollector',
+	'waterfall/WaterfallCollector',
 ));
 Loader::load('controller', '/SitemapController');
 Loader::load('utility', 'Content');
@@ -15,143 +15,143 @@  discard block
 block discarded – undo
 final class WaterfallSitemapController extends SitemapController
 {
 
-    private static $HOME_PAGE_RANK                      = .9;
-
-    private static $WATERFALL_LISTING_RANK              = .3;
-    private static $WATERFALL_COUNTY_LISTING_RANK       = .6;
-    private static $WATERFALL_WATERCOURSE_LISTING_RANK  = .6;
-    private static $WATERFALL_LISTING_SUBPAGES_RANK     = .1;
-    private static $WATERFALL_PAGE_RANK                 = .8;
-
-    private static $MAP_PAGE_RANK                       = .6;
-
-    private static $LOG_LISTING_RANK                    = .3;
-    private static $LOG_COMPANION_LISTING_RANK          = .3;
-    private static $LOG_PERIOD_LISTING_RANK             = .3;
-    private static $LOG_LISTING_SUBPAGES_RANK           = .1;
-    private static $LOG_PAGE_RANK                       = .7;
-
-    private static $ABOUT_PAGE_RANK                     = .6;
-
-
-    private static $HOME_PAGE_CHANGEFREQ                      = 'daily';
-
-    private static $WATERFALL_LISTING_CHANGEFREQ              = 'monthly';
-    private static $WATERFALL_COUNTY_LISTING_CHANGEFREQ       = 'monthly';
-    private static $WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ  = 'monthly';
-    private static $WATERFALL_LISTING_SUBPAGES_CHANGEFREQ     = 'monthly';
-    private static $WATERFALL_PAGE_CHANGEFREQ                 = 'weekly';
-
-    private static $MAP_PAGE_CHANGEFREQ                       = 'monthly';
-
-    private static $LOG_LISTING_CHANGEFREQ                    = 'weekly';
-    private static $LOG_COMPANION_LISTING_CHANGEFREQ          = 'monthly';
-    private static $LOG_PERIOD_LISTING_CHANGEFREQ             = 'monthly';
-    private static $LOG_LISTING_SUBPAGES_CHANGEFREQ           = 'monthly';
-    private static $LOG_PAGE_CHANGEFREQ                       = 'weekly';
-
-    private static $ABOUT_PAGE_CHANGEFREQ                     = 'yearly';
-
-
-    private static $WATERFALLS_PER_LISTING              = 24;
-    private static $WATERFALLS_PER_COUNTY_LISTING       = 12;
-    private static $WATERFALLS_PER_WATERCOURSE_LISTING  = 12;
-
-    private static $LOGS_PER_LISTING                    = 10;
-    private static $LOGS_PER_COMPANION_LISTING          = 10;
-    private static $LOGS_PER_PERIOD_LISTING             = 10;
-
-    protected function set_data()
-    {
-        $this->add_home_pages();
-        $this->add_waterfall_pages();
-        $this->add_map_pages();
-        $this->add_log_pages();
-        $this->add_about_pages();
-    }
-
-    private function add_home_pages()
-    {
-        $this->addURL('', date('Y-m-d'), self::$HOME_PAGE_CHANGEFREQ, self::$HOME_PAGE_RANK);
-    }
-
-    private function add_waterfall_pages()
-    {
-        $this->addURL('falls/', date('Y-m-01'), self::$WATERFALL_LISTING_CHANGEFREQ, self::$WATERFALL_LISTING_RANK);
-        $count = WaterfallCollector::getListCount();
-        $this->add_paginated_pages($count, self::$WATERFALLS_PER_LISTING, 'falls', 'waterfall');
-
-        $county_list = CountyCollector::getCountyList();
-        foreach ($county_list as $county) {
-            $this->addURL("{$county->alias}/", date('Y-m-01'), self::$WATERFALL_COUNTY_LISTING_CHANGEFREQ, self::$WATERFALL_COUNTY_LISTING_RANK);
-            $this->add_paginated_pages($county->count, self::$WATERFALLS_PER_COUNTY_LISTING, $county->alias, 'waterfall');
-        }
-
-        $watercourse_list = WatercourseCollector::getWatercourseList();
-        foreach ($watercourse_list as $watercourse) {
-            $this->addURL("{$watercourse->alias}/", date('Y-m-01'), self::$WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ, self::$WATERFALL_WATERCOURSE_LISTING_RANK);
-            $this->add_paginated_pages($watercourse->count, self::$WATERFALLS_PER_WATERCOURSE_LISTING, $watercourse->alias, 'waterfall');
-        }
-
-        $waterfall_list = WaterfallCollector::getList(500);
-        foreach ($waterfall_list as $waterfall) {
-            $this->addURL("{$waterfall->watercourse_alias}/{$waterfall->waterfall_alias}/", date('Y-m-d', strtotime('last Monday')), self::$WATERFALL_PAGE_CHANGEFREQ, self::$WATERFALL_PAGE_RANK);
-        }
-    }
-
-    private function add_map_pages()
-    {
-        $this->addURL('map/', date('Y-m-01'), self::$MAP_PAGE_CHANGEFREQ, self::$MAP_PAGE_RANK);
-    }
-
-    private function add_log_pages()
-    {
-        $this->addURL('journal/', date('Y-m-d', strtotime('last Monday')), self::$LOG_LISTING_CHANGEFREQ, self::$LOG_LISTING_RANK);
-        $count = LogCollector::getListCount();
-        $this->add_paginated_pages($count, self::$LOGS_PER_LISTING, 'journal', 'log');
-
-        $companion_list = CompanionCollector::getCompanionList();
-        foreach ($companion_list as $companion) {
-            $this->addURL("companion/{$companion->alias}/", date('Y-m-01'), self::$LOG_COMPANION_LISTING_CHANGEFREQ, self::$LOG_COMPANION_LISTING_RANK);
-            $this->add_paginated_pages($companion->count, self::$LOGS_PER_COMPANION_LISTING, "companion/{$companion->alias}", 'log');
-        }
-
-        $period_list = PeriodCollector::getPeriodList();
-        foreach ($period_list as $period) {
-            $this->addURL("period/{$period->alias}/", date('Y-m-01'), self::$LOG_PERIOD_LISTING_CHANGEFREQ, self::$LOG_PERIOD_LISTING_RANK);
-            $this->add_paginated_pages($period->count, self::$LOGS_PER_PERIOD_LISTING, "period/{$period->alias}", 'log');
-        }
-
-        $log_list = LogCollector::getList(500);
-        foreach ($log_list as $log) {
-            $this->addURL("journal/{$log->alias}/", date('Y-m-d', strtotime('last Monday')), self::$LOG_PAGE_CHANGEFREQ, self::$LOG_PAGE_RANK);
-        }
-    }
-
-    private function add_about_pages()
-    {
-        $this->addURL('about/', date('Y-01-01'), self::$ABOUT_PAGE_CHANGEFREQ, self::$ABOUT_PAGE_RANK);
-    }
-
-    private function add_paginated_pages($count, $items_per_page, $base_url, $type)
-    {
-        switch($type) {
-            case 'waterfall':
-                $lastmod = date('Y-m-01');
-                $changefreq = self::$WATERFALL_LISTING_SUBPAGES_CHANGEFREQ;
-                $rank = self::$WATERFALL_LISTING_SUBPAGES_RANK;
-                break;
-            case 'log':
-                $lastmod = date('Y-m-01');
-                $changefreq = self::$LOG_LISTING_SUBPAGES_CHANGEFREQ;
-                $rank = self::$LOG_LISTING_SUBPAGES_RANK;
-                break;
-        }
-
-        for($i = 2; (($i - 1) * $items_per_page) < $count; $i++) {
-            $this->addURL("{$base_url}/{$i}/", $lastmod, $changefreq, $rank);
-        }
-    }
+	private static $HOME_PAGE_RANK                      = .9;
+
+	private static $WATERFALL_LISTING_RANK              = .3;
+	private static $WATERFALL_COUNTY_LISTING_RANK       = .6;
+	private static $WATERFALL_WATERCOURSE_LISTING_RANK  = .6;
+	private static $WATERFALL_LISTING_SUBPAGES_RANK     = .1;
+	private static $WATERFALL_PAGE_RANK                 = .8;
+
+	private static $MAP_PAGE_RANK                       = .6;
+
+	private static $LOG_LISTING_RANK                    = .3;
+	private static $LOG_COMPANION_LISTING_RANK          = .3;
+	private static $LOG_PERIOD_LISTING_RANK             = .3;
+	private static $LOG_LISTING_SUBPAGES_RANK           = .1;
+	private static $LOG_PAGE_RANK                       = .7;
+
+	private static $ABOUT_PAGE_RANK                     = .6;
+
+
+	private static $HOME_PAGE_CHANGEFREQ                      = 'daily';
+
+	private static $WATERFALL_LISTING_CHANGEFREQ              = 'monthly';
+	private static $WATERFALL_COUNTY_LISTING_CHANGEFREQ       = 'monthly';
+	private static $WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ  = 'monthly';
+	private static $WATERFALL_LISTING_SUBPAGES_CHANGEFREQ     = 'monthly';
+	private static $WATERFALL_PAGE_CHANGEFREQ                 = 'weekly';
+
+	private static $MAP_PAGE_CHANGEFREQ                       = 'monthly';
+
+	private static $LOG_LISTING_CHANGEFREQ                    = 'weekly';
+	private static $LOG_COMPANION_LISTING_CHANGEFREQ          = 'monthly';
+	private static $LOG_PERIOD_LISTING_CHANGEFREQ             = 'monthly';
+	private static $LOG_LISTING_SUBPAGES_CHANGEFREQ           = 'monthly';
+	private static $LOG_PAGE_CHANGEFREQ                       = 'weekly';
+
+	private static $ABOUT_PAGE_CHANGEFREQ                     = 'yearly';
+
+
+	private static $WATERFALLS_PER_LISTING              = 24;
+	private static $WATERFALLS_PER_COUNTY_LISTING       = 12;
+	private static $WATERFALLS_PER_WATERCOURSE_LISTING  = 12;
+
+	private static $LOGS_PER_LISTING                    = 10;
+	private static $LOGS_PER_COMPANION_LISTING          = 10;
+	private static $LOGS_PER_PERIOD_LISTING             = 10;
+
+	protected function set_data()
+	{
+		$this->add_home_pages();
+		$this->add_waterfall_pages();
+		$this->add_map_pages();
+		$this->add_log_pages();
+		$this->add_about_pages();
+	}
+
+	private function add_home_pages()
+	{
+		$this->addURL('', date('Y-m-d'), self::$HOME_PAGE_CHANGEFREQ, self::$HOME_PAGE_RANK);
+	}
+
+	private function add_waterfall_pages()
+	{
+		$this->addURL('falls/', date('Y-m-01'), self::$WATERFALL_LISTING_CHANGEFREQ, self::$WATERFALL_LISTING_RANK);
+		$count = WaterfallCollector::getListCount();
+		$this->add_paginated_pages($count, self::$WATERFALLS_PER_LISTING, 'falls', 'waterfall');
+
+		$county_list = CountyCollector::getCountyList();
+		foreach ($county_list as $county) {
+			$this->addURL("{$county->alias}/", date('Y-m-01'), self::$WATERFALL_COUNTY_LISTING_CHANGEFREQ, self::$WATERFALL_COUNTY_LISTING_RANK);
+			$this->add_paginated_pages($county->count, self::$WATERFALLS_PER_COUNTY_LISTING, $county->alias, 'waterfall');
+		}
+
+		$watercourse_list = WatercourseCollector::getWatercourseList();
+		foreach ($watercourse_list as $watercourse) {
+			$this->addURL("{$watercourse->alias}/", date('Y-m-01'), self::$WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ, self::$WATERFALL_WATERCOURSE_LISTING_RANK);
+			$this->add_paginated_pages($watercourse->count, self::$WATERFALLS_PER_WATERCOURSE_LISTING, $watercourse->alias, 'waterfall');
+		}
+
+		$waterfall_list = WaterfallCollector::getList(500);
+		foreach ($waterfall_list as $waterfall) {
+			$this->addURL("{$waterfall->watercourse_alias}/{$waterfall->waterfall_alias}/", date('Y-m-d', strtotime('last Monday')), self::$WATERFALL_PAGE_CHANGEFREQ, self::$WATERFALL_PAGE_RANK);
+		}
+	}
+
+	private function add_map_pages()
+	{
+		$this->addURL('map/', date('Y-m-01'), self::$MAP_PAGE_CHANGEFREQ, self::$MAP_PAGE_RANK);
+	}
+
+	private function add_log_pages()
+	{
+		$this->addURL('journal/', date('Y-m-d', strtotime('last Monday')), self::$LOG_LISTING_CHANGEFREQ, self::$LOG_LISTING_RANK);
+		$count = LogCollector::getListCount();
+		$this->add_paginated_pages($count, self::$LOGS_PER_LISTING, 'journal', 'log');
+
+		$companion_list = CompanionCollector::getCompanionList();
+		foreach ($companion_list as $companion) {
+			$this->addURL("companion/{$companion->alias}/", date('Y-m-01'), self::$LOG_COMPANION_LISTING_CHANGEFREQ, self::$LOG_COMPANION_LISTING_RANK);
+			$this->add_paginated_pages($companion->count, self::$LOGS_PER_COMPANION_LISTING, "companion/{$companion->alias}", 'log');
+		}
+
+		$period_list = PeriodCollector::getPeriodList();
+		foreach ($period_list as $period) {
+			$this->addURL("period/{$period->alias}/", date('Y-m-01'), self::$LOG_PERIOD_LISTING_CHANGEFREQ, self::$LOG_PERIOD_LISTING_RANK);
+			$this->add_paginated_pages($period->count, self::$LOGS_PER_PERIOD_LISTING, "period/{$period->alias}", 'log');
+		}
+
+		$log_list = LogCollector::getList(500);
+		foreach ($log_list as $log) {
+			$this->addURL("journal/{$log->alias}/", date('Y-m-d', strtotime('last Monday')), self::$LOG_PAGE_CHANGEFREQ, self::$LOG_PAGE_RANK);
+		}
+	}
+
+	private function add_about_pages()
+	{
+		$this->addURL('about/', date('Y-01-01'), self::$ABOUT_PAGE_CHANGEFREQ, self::$ABOUT_PAGE_RANK);
+	}
+
+	private function add_paginated_pages($count, $items_per_page, $base_url, $type)
+	{
+		switch($type) {
+			case 'waterfall':
+				$lastmod = date('Y-m-01');
+				$changefreq = self::$WATERFALL_LISTING_SUBPAGES_CHANGEFREQ;
+				$rank = self::$WATERFALL_LISTING_SUBPAGES_RANK;
+				break;
+			case 'log':
+				$lastmod = date('Y-m-01');
+				$changefreq = self::$LOG_LISTING_SUBPAGES_CHANGEFREQ;
+				$rank = self::$LOG_LISTING_SUBPAGES_RANK;
+				break;
+		}
+
+		for($i = 2; (($i - 1) * $items_per_page) < $count; $i++) {
+			$this->addURL("{$base_url}/{$i}/", $lastmod, $changefreq, $rank);
+		}
+	}
 
 }
 

Please login to merge, or discard this patch.

controller/waterfalls/AboutController.class.inc.php 1 patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -5,29 +5,29 @@
 block discarded – undo
 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');
+	}
 
 }

Please login to merge, or discard this patch.

controller/waterfalls/ContactController.class.inc.php 1 patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -58,7 +58,7 @@
 block discarded – undo
 				'values' => $values);
 		}
 		
-        global $config;
+		global $config;
 		$mail = Loader::loadNew('utility', 'Mail');
 		$mail->setToAddress($config->admin_email, 'Jacob Emerick');
 		$mail->setSubject('Waterfall Site Contact');

Please login to merge, or discard this patch.

controller/waterfalls/DefaultListController.class.inc.php 1 patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -95,9 +95,9 @@  discard block
 block discarded – undo
 	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 @@  discard block
 block discarded – undo
 	{
 		$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(),

Please login to merge, or discard this patch.

controller/waterfalls/DefaultPageController.class.inc.php 1 patch

Indentation +36 added lines, -36 removed lines patch added patch discarded remove patch

@@ -10,7 +10,7 @@  discard block
 block discarded – undo
 
 	protected static $WATERFALL_SITE_ID = 5;
 
-    protected $parent_navigation_item = '';
+	protected $parent_navigation_item = '';
 
 	protected function set_head_data()
 	{
@@ -19,46 +19,46 @@  discard block
 block discarded – undo
 		$this->add_css('waterfall');
 	}
 
-    protected function add_waterfall_js()
-    {
-        $this->add_js('jquery-1.10.2.min');
-        $this->add_js('imagelightbox.min');
-        $this->add_js('waterfall-overlay');
-        $this->add_js('waterfall-map');
-    }
+	protected function add_waterfall_js()
+	{
+		$this->add_js('jquery-1.10.2.min');
+		$this->add_js('imagelightbox.min');
+		$this->add_js('waterfall-overlay');
+		$this->add_js('waterfall-map');
+	}
 
 	protected function set_body_data($page_type = 'normal')
 	{
 		$this->set_body('activity_array', $this->get_recent_activity());
 
-        $this->set_body('main_navigation', array(
-                (object) array(
-                    'uri' => '/falls/',
-                    'anchor' => 'Falls',
-                    'is_active' => $this->parent_navigation_item === 'falls',
-                ),
-                (object) array(
-                    'uri' => '/map/',
-                    'anchor' => 'Map',
-                    'is_active' => $this->parent_navigation_item === 'map',
-                ),
-                (object) array(
-                    'uri' => '/journal/',
-                    'anchor' => 'Journal',
-                    'is_active' => $this->parent_navigation_item === 'journal',
-                ),
-                (object) array(
-                    'uri' => '/about/',
-                    'anchor' => 'About',
-                    'is_active' => $this->parent_navigation_item === 'about',
-                )
-        ));
+		$this->set_body('main_navigation', array(
+				(object) array(
+					'uri' => '/falls/',
+					'anchor' => 'Falls',
+					'is_active' => $this->parent_navigation_item === 'falls',
+				),
+				(object) array(
+					'uri' => '/map/',
+					'anchor' => 'Map',
+					'is_active' => $this->parent_navigation_item === 'map',
+				),
+				(object) array(
+					'uri' => '/journal/',
+					'anchor' => 'Journal',
+					'is_active' => $this->parent_navigation_item === 'journal',
+				),
+				(object) array(
+					'uri' => '/about/',
+					'anchor' => 'About',
+					'is_active' => $this->parent_navigation_item === 'about',
+				)
+		));
 
-        if ($page_type == 'wide') {
-            $this->set_body_view('WidePage');
-        } else {
-            $this->set_body_view('Page');
-        }
-    }
+		if ($page_type == 'wide') {
+			$this->set_body_view('WidePage');
+		} else {
+			$this->set_body_view('Page');
+		}
+	}
 
 }

Please login to merge, or discard this patch.

controller/waterfalls/HomeController.class.inc.php 1 patch

Indentation +62 added lines, -62 removed lines patch added patch discarded remove patch

@@ -1,84 +1,84 @@
 block discarded – undo
 <?
 
 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

Please login to merge, or discard this patch.

		@@ -95,9 +95,9 @@ discard block
		block discarded – undo
95	95	abstract protected function get_initial_meta();
96	96	abstract protected function get_subsequent_meta();
97	97
98		- final protected function set_body_data($page_type = 'normal')
99		- {
100		- parent::set_body_data($page_type);
	98	+ final protected function set_body_data($page_type = 'normal')
	99	+ {
	100	+ parent::set_body_data($page_type);
101	101
102	102	$this->set_body('view', $this->get_list_view());
103	103	$this->set_body('data', $this->get_list_body_data());
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107	{
108	108	$body_data_array = array();
109	109
110		- $body_data_array['introduction'] = $this->get_introduction();
	110	+ $body_data_array['introduction'] = $this->get_introduction();
111	111	$body_data_array['items'] = array_map(array($this, 'format_item'), $this->get_items());
112	112	$body_data_array['navigation'] = array(
113	113	'description' => $this->get_list_description(),

		@@ -47,7 +47,7 @@
		block discarded – undo
47	47
48	48	else
49	49	{
50		- global $config;
	50	+ global $config;
51	51	$mail = new Mail();
52	52	$mail->setToAddress($config->admin_email, 'Jacob Emerick');
53	53	$mail->setSubject('Portfolio Contact');

		@@ -5,9 +5,9 @@
		block discarded – undo
5	5	class WaterfallsRobotController extends RobotController
6	6	{
7	7
8		- protected function set_data()
9		- {
10		- $this->disallow_for_all_robots('/search/');
11		- }
	8	+ protected function set_data()
	9	+ {
	10	+ $this->disallow_for_all_robots('/search/');
	11	+ }
12	12
13	13	}

		@@ -46,7 +46,7 @@
		block discarded – undo
46	46	'value' => Request::getPost());
47	47	}
48	48
49		- global $config;
	49	+ global $config;
50	50	$mail = new Mail();
51	51	$mail->setToAddress($config->admin_email, 'Jacob Emerick');
52	52	$mail->setSubject('Site Contact');

		@@ -1,13 +1,13 @@ discard block
		block discarded – undo
1	1	<?
2	2
3	3	Loader::load('collector', array(
4		- 'waterfall/CompanionCollector',
5		- 'waterfall/CountyCollector',
6		- 'waterfall/LogCollector',
7		- 'waterfall/LogTagCollector',
8		- 'waterfall/PeriodCollector',
9		- 'waterfall/WatercourseCollector',
10		- 'waterfall/WaterfallCollector',
	4	+ 'waterfall/CompanionCollector',
	5	+ 'waterfall/CountyCollector',
	6	+ 'waterfall/LogCollector',
	7	+ 'waterfall/LogTagCollector',
	8	+ 'waterfall/PeriodCollector',
	9	+ 'waterfall/WatercourseCollector',
	10	+ 'waterfall/WaterfallCollector',
11	11	));
12	12	Loader::load('controller', '/SitemapController');
13	13	Loader::load('utility', 'Content');
		@@ -15,143 +15,143 @@ discard block
		block discarded – undo
15	15	final class WaterfallSitemapController extends SitemapController
16	16	{
17	17
18		- private static $HOME_PAGE_RANK = .9;
19		-
20		- private static $WATERFALL_LISTING_RANK = .3;
21		- private static $WATERFALL_COUNTY_LISTING_RANK = .6;
22		- private static $WATERFALL_WATERCOURSE_LISTING_RANK = .6;
23		- private static $WATERFALL_LISTING_SUBPAGES_RANK = .1;
24		- private static $WATERFALL_PAGE_RANK = .8;
25		-
26		- private static $MAP_PAGE_RANK = .6;
27		-
28		- private static $LOG_LISTING_RANK = .3;
29		- private static $LOG_COMPANION_LISTING_RANK = .3;
30		- private static $LOG_PERIOD_LISTING_RANK = .3;
31		- private static $LOG_LISTING_SUBPAGES_RANK = .1;
32		- private static $LOG_PAGE_RANK = .7;
33		-
34		- private static $ABOUT_PAGE_RANK = .6;
35		-
36		-
37		- private static $HOME_PAGE_CHANGEFREQ = 'daily';
38		-
39		- private static $WATERFALL_LISTING_CHANGEFREQ = 'monthly';
40		- private static $WATERFALL_COUNTY_LISTING_CHANGEFREQ = 'monthly';
41		- private static $WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ = 'monthly';
42		- private static $WATERFALL_LISTING_SUBPAGES_CHANGEFREQ = 'monthly';
43		- private static $WATERFALL_PAGE_CHANGEFREQ = 'weekly';
44		-
45		- private static $MAP_PAGE_CHANGEFREQ = 'monthly';
46		-
47		- private static $LOG_LISTING_CHANGEFREQ = 'weekly';
48		- private static $LOG_COMPANION_LISTING_CHANGEFREQ = 'monthly';
49		- private static $LOG_PERIOD_LISTING_CHANGEFREQ = 'monthly';
50		- private static $LOG_LISTING_SUBPAGES_CHANGEFREQ = 'monthly';
51		- private static $LOG_PAGE_CHANGEFREQ = 'weekly';
52		-
53		- private static $ABOUT_PAGE_CHANGEFREQ = 'yearly';
54		-
55		-
56		- private static $WATERFALLS_PER_LISTING = 24;
57		- private static $WATERFALLS_PER_COUNTY_LISTING = 12;
58		- private static $WATERFALLS_PER_WATERCOURSE_LISTING = 12;
59		-
60		- private static $LOGS_PER_LISTING = 10;
61		- private static $LOGS_PER_COMPANION_LISTING = 10;
62		- private static $LOGS_PER_PERIOD_LISTING = 10;
63		-
64		- protected function set_data()
65		- {
66		- $this->add_home_pages();
67		- $this->add_waterfall_pages();
68		- $this->add_map_pages();
69		- $this->add_log_pages();
70		- $this->add_about_pages();
71		- }
72		-
73		- private function add_home_pages()
74		- {
75		- $this->addURL('', date('Y-m-d'), self::$HOME_PAGE_CHANGEFREQ, self::$HOME_PAGE_RANK);
76		- }
77		-
78		- private function add_waterfall_pages()
79		- {
80		- $this->addURL('falls/', date('Y-m-01'), self::$WATERFALL_LISTING_CHANGEFREQ, self::$WATERFALL_LISTING_RANK);
81		- $count = WaterfallCollector::getListCount();
82		- $this->add_paginated_pages($count, self::$WATERFALLS_PER_LISTING, 'falls', 'waterfall');
83		-
84		- $county_list = CountyCollector::getCountyList();
85		- foreach ($county_list as $county) {
86		- $this->addURL("{$county->alias}/", date('Y-m-01'), self::$WATERFALL_COUNTY_LISTING_CHANGEFREQ, self::$WATERFALL_COUNTY_LISTING_RANK);
87		- $this->add_paginated_pages($county->count, self::$WATERFALLS_PER_COUNTY_LISTING, $county->alias, 'waterfall');
88		- }
89		-
90		- $watercourse_list = WatercourseCollector::getWatercourseList();
91		- foreach ($watercourse_list as $watercourse) {
92		- $this->addURL("{$watercourse->alias}/", date('Y-m-01'), self::$WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ, self::$WATERFALL_WATERCOURSE_LISTING_RANK);
93		- $this->add_paginated_pages($watercourse->count, self::$WATERFALLS_PER_WATERCOURSE_LISTING, $watercourse->alias, 'waterfall');
94		- }
95		-
96		- $waterfall_list = WaterfallCollector::getList(500);
97		- foreach ($waterfall_list as $waterfall) {
98		- $this->addURL("{$waterfall->watercourse_alias}/{$waterfall->waterfall_alias}/", date('Y-m-d', strtotime('last Monday')), self::$WATERFALL_PAGE_CHANGEFREQ, self::$WATERFALL_PAGE_RANK);
99		- }
100		- }
101		-
102		- private function add_map_pages()
103		- {
104		- $this->addURL('map/', date('Y-m-01'), self::$MAP_PAGE_CHANGEFREQ, self::$MAP_PAGE_RANK);
105		- }
106		-
107		- private function add_log_pages()
108		- {
109		- $this->addURL('journal/', date('Y-m-d', strtotime('last Monday')), self::$LOG_LISTING_CHANGEFREQ, self::$LOG_LISTING_RANK);
110		- $count = LogCollector::getListCount();
111		- $this->add_paginated_pages($count, self::$LOGS_PER_LISTING, 'journal', 'log');
112		-
113		- $companion_list = CompanionCollector::getCompanionList();
114		- foreach ($companion_list as $companion) {
115		- $this->addURL("companion/{$companion->alias}/", date('Y-m-01'), self::$LOG_COMPANION_LISTING_CHANGEFREQ, self::$LOG_COMPANION_LISTING_RANK);
116		- $this->add_paginated_pages($companion->count, self::$LOGS_PER_COMPANION_LISTING, "companion/{$companion->alias}", 'log');
117		- }
118		-
119		- $period_list = PeriodCollector::getPeriodList();
120		- foreach ($period_list as $period) {
121		- $this->addURL("period/{$period->alias}/", date('Y-m-01'), self::$LOG_PERIOD_LISTING_CHANGEFREQ, self::$LOG_PERIOD_LISTING_RANK);
122		- $this->add_paginated_pages($period->count, self::$LOGS_PER_PERIOD_LISTING, "period/{$period->alias}", 'log');
123		- }
124		-
125		- $log_list = LogCollector::getList(500);
126		- foreach ($log_list as $log) {
127		- $this->addURL("journal/{$log->alias}/", date('Y-m-d', strtotime('last Monday')), self::$LOG_PAGE_CHANGEFREQ, self::$LOG_PAGE_RANK);
128		- }
129		- }
130		-
131		- private function add_about_pages()
132		- {
133		- $this->addURL('about/', date('Y-01-01'), self::$ABOUT_PAGE_CHANGEFREQ, self::$ABOUT_PAGE_RANK);
134		- }
135		-
136		- private function add_paginated_pages($count, $items_per_page, $base_url, $type)
137		- {
138		- switch($type) {
139		- case 'waterfall':
140		- $lastmod = date('Y-m-01');
141		- $changefreq = self::$WATERFALL_LISTING_SUBPAGES_CHANGEFREQ;
142		- $rank = self::$WATERFALL_LISTING_SUBPAGES_RANK;
143		- break;
144		- case 'log':
145		- $lastmod = date('Y-m-01');
146		- $changefreq = self::$LOG_LISTING_SUBPAGES_CHANGEFREQ;
147		- $rank = self::$LOG_LISTING_SUBPAGES_RANK;
148		- break;
149		- }
150		-
151		- for($i = 2; (($i - 1) * $items_per_page) < $count; $i++) {
152		- $this->addURL("{$base_url}/{$i}/", $lastmod, $changefreq, $rank);
153		- }
154		- }
	18	+ private static $HOME_PAGE_RANK = .9;
	19	+
	20	+ private static $WATERFALL_LISTING_RANK = .3;
	21	+ private static $WATERFALL_COUNTY_LISTING_RANK = .6;
	22	+ private static $WATERFALL_WATERCOURSE_LISTING_RANK = .6;
	23	+ private static $WATERFALL_LISTING_SUBPAGES_RANK = .1;
	24	+ private static $WATERFALL_PAGE_RANK = .8;
	25	+
	26	+ private static $MAP_PAGE_RANK = .6;
	27	+
	28	+ private static $LOG_LISTING_RANK = .3;
	29	+ private static $LOG_COMPANION_LISTING_RANK = .3;
	30	+ private static $LOG_PERIOD_LISTING_RANK = .3;
	31	+ private static $LOG_LISTING_SUBPAGES_RANK = .1;
	32	+ private static $LOG_PAGE_RANK = .7;
	33	+
	34	+ private static $ABOUT_PAGE_RANK = .6;
	35	+
	36	+
	37	+ private static $HOME_PAGE_CHANGEFREQ = 'daily';
	38	+
	39	+ private static $WATERFALL_LISTING_CHANGEFREQ = 'monthly';
	40	+ private static $WATERFALL_COUNTY_LISTING_CHANGEFREQ = 'monthly';
	41	+ private static $WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ = 'monthly';
	42	+ private static $WATERFALL_LISTING_SUBPAGES_CHANGEFREQ = 'monthly';
	43	+ private static $WATERFALL_PAGE_CHANGEFREQ = 'weekly';
	44	+
	45	+ private static $MAP_PAGE_CHANGEFREQ = 'monthly';
	46	+
	47	+ private static $LOG_LISTING_CHANGEFREQ = 'weekly';
	48	+ private static $LOG_COMPANION_LISTING_CHANGEFREQ = 'monthly';
	49	+ private static $LOG_PERIOD_LISTING_CHANGEFREQ = 'monthly';
	50	+ private static $LOG_LISTING_SUBPAGES_CHANGEFREQ = 'monthly';
	51	+ private static $LOG_PAGE_CHANGEFREQ = 'weekly';
	52	+
	53	+ private static $ABOUT_PAGE_CHANGEFREQ = 'yearly';
	54	+
	55	+
	56	+ private static $WATERFALLS_PER_LISTING = 24;
	57	+ private static $WATERFALLS_PER_COUNTY_LISTING = 12;
	58	+ private static $WATERFALLS_PER_WATERCOURSE_LISTING = 12;
	59	+
	60	+ private static $LOGS_PER_LISTING = 10;
	61	+ private static $LOGS_PER_COMPANION_LISTING = 10;
	62	+ private static $LOGS_PER_PERIOD_LISTING = 10;
	63	+
	64	+ protected function set_data()
	65	+ {
	66	+ $this->add_home_pages();
	67	+ $this->add_waterfall_pages();
	68	+ $this->add_map_pages();
	69	+ $this->add_log_pages();
	70	+ $this->add_about_pages();
	71	+ }
	72	+
	73	+ private function add_home_pages()
	74	+ {
	75	+ $this->addURL('', date('Y-m-d'), self::$HOME_PAGE_CHANGEFREQ, self::$HOME_PAGE_RANK);
	76	+ }
	77	+
	78	+ private function add_waterfall_pages()
	79	+ {
	80	+ $this->addURL('falls/', date('Y-m-01'), self::$WATERFALL_LISTING_CHANGEFREQ, self::$WATERFALL_LISTING_RANK);
	81	+ $count = WaterfallCollector::getListCount();
	82	+ $this->add_paginated_pages($count, self::$WATERFALLS_PER_LISTING, 'falls', 'waterfall');
	83	+
	84	+ $county_list = CountyCollector::getCountyList();
	85	+ foreach ($county_list as $county) {
	86	+ $this->addURL("{$county->alias}/", date('Y-m-01'), self::$WATERFALL_COUNTY_LISTING_CHANGEFREQ, self::$WATERFALL_COUNTY_LISTING_RANK);
	87	+ $this->add_paginated_pages($county->count, self::$WATERFALLS_PER_COUNTY_LISTING, $county->alias, 'waterfall');
	88	+ }
	89	+
	90	+ $watercourse_list = WatercourseCollector::getWatercourseList();
	91	+ foreach ($watercourse_list as $watercourse) {
	92	+ $this->addURL("{$watercourse->alias}/", date('Y-m-01'), self::$WATERFALL_WATERCOURSE_LISTING_CHANGEFREQ, self::$WATERFALL_WATERCOURSE_LISTING_RANK);
	93	+ $this->add_paginated_pages($watercourse->count, self::$WATERFALLS_PER_WATERCOURSE_LISTING, $watercourse->alias, 'waterfall');
	94	+ }
	95	+
	96	+ $waterfall_list = WaterfallCollector::getList(500);
	97	+ foreach ($waterfall_list as $waterfall) {
	98	+ $this->addURL("{$waterfall->watercourse_alias}/{$waterfall->waterfall_alias}/", date('Y-m-d', strtotime('last Monday')), self::$WATERFALL_PAGE_CHANGEFREQ, self::$WATERFALL_PAGE_RANK);
	99	+ }
	100	+ }
	101	+
	102	+ private function add_map_pages()
	103	+ {
	104	+ $this->addURL('map/', date('Y-m-01'), self::$MAP_PAGE_CHANGEFREQ, self::$MAP_PAGE_RANK);
	105	+ }
	106	+
	107	+ private function add_log_pages()
	108	+ {
	109	+ $this->addURL('journal/', date('Y-m-d', strtotime('last Monday')), self::$LOG_LISTING_CHANGEFREQ, self::$LOG_LISTING_RANK);
	110	+ $count = LogCollector::getListCount();
	111	+ $this->add_paginated_pages($count, self::$LOGS_PER_LISTING, 'journal', 'log');
	112	+
	113	+ $companion_list = CompanionCollector::getCompanionList();
	114	+ foreach ($companion_list as $companion) {
	115	+ $this->addURL("companion/{$companion->alias}/", date('Y-m-01'), self::$LOG_COMPANION_LISTING_CHANGEFREQ, self::$LOG_COMPANION_LISTING_RANK);
	116	+ $this->add_paginated_pages($companion->count, self::$LOGS_PER_COMPANION_LISTING, "companion/{$companion->alias}", 'log');
	117	+ }
	118	+
	119	+ $period_list = PeriodCollector::getPeriodList();
	120	+ foreach ($period_list as $period) {
	121	+ $this->addURL("period/{$period->alias}/", date('Y-m-01'), self::$LOG_PERIOD_LISTING_CHANGEFREQ, self::$LOG_PERIOD_LISTING_RANK);
	122	+ $this->add_paginated_pages($period->count, self::$LOGS_PER_PERIOD_LISTING, "period/{$period->alias}", 'log');
	123	+ }
	124	+
	125	+ $log_list = LogCollector::getList(500);
	126	+ foreach ($log_list as $log) {
	127	+ $this->addURL("journal/{$log->alias}/", date('Y-m-d', strtotime('last Monday')), self::$LOG_PAGE_CHANGEFREQ, self::$LOG_PAGE_RANK);
	128	+ }
	129	+ }
	130	+
	131	+ private function add_about_pages()
	132	+ {
	133	+ $this->addURL('about/', date('Y-01-01'), self::$ABOUT_PAGE_CHANGEFREQ, self::$ABOUT_PAGE_RANK);
	134	+ }
	135	+
	136	+ private function add_paginated_pages($count, $items_per_page, $base_url, $type)
	137	+ {
	138	+ switch($type) {
	139	+ case 'waterfall':
	140	+ $lastmod = date('Y-m-01');
	141	+ $changefreq = self::$WATERFALL_LISTING_SUBPAGES_CHANGEFREQ;
	142	+ $rank = self::$WATERFALL_LISTING_SUBPAGES_RANK;
	143	+ break;
	144	+ case 'log':
	145	+ $lastmod = date('Y-m-01');
	146	+ $changefreq = self::$LOG_LISTING_SUBPAGES_CHANGEFREQ;
	147	+ $rank = self::$LOG_LISTING_SUBPAGES_RANK;
	148	+ break;
	149	+ }
	150	+
	151	+ for($i = 2; (($i - 1) * $items_per_page) < $count; $i++) {
	152	+ $this->addURL("{$base_url}/{$i}/", $lastmod, $changefreq, $rank);
	153	+ }
	154	+ }
155	155
156	156	}
157	157

		@@ -5,29 +5,29 @@
		block discarded – undo
5	5	final class AboutController extends DefaultPageController
6	6	{
7	7
8		- private static $TITLE = 'About the Website \| Waterfalls of the Keweenaw';
9		- 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.';
10		- private static $KEYWORD_ARRAY = array(
11		- 'about',
12		- 'waterfalls',
13		- 'birthday trip',
14		- 'Jacob Emerick',
15		- );
	8	+ private static $TITLE = 'About the Website \| Waterfalls of the Keweenaw';
	9	+ 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.';
	10	+ private static $KEYWORD_ARRAY = array(
	11	+ 'about',
	12	+ 'waterfalls',
	13	+ 'birthday trip',
	14	+ 'Jacob Emerick',
	15	+ );
16	16
17		- protected function set_head_data()
18		- {
19		- parent::set_head_data();
	17	+ protected function set_head_data()
	18	+ {
	19	+ parent::set_head_data();
20	20
21		- $this->set_title(self::$TITLE);
22		- $this->set_description(self::$DESCRIPTION);
23		- $this->set_keywords(self::$KEYWORD_ARRAY);
24		- }
	21	+ $this->set_title(self::$TITLE);
	22	+ $this->set_description(self::$DESCRIPTION);
	23	+ $this->set_keywords(self::$KEYWORD_ARRAY);
	24	+ }
25	25
26		- protected function set_body_data($page_type = 'normal')
27		- {
28		- parent::set_body_data($page_type);
	26	+ protected function set_body_data($page_type = 'normal')
	27	+ {
	28	+ parent::set_body_data($page_type);
29	29
30		- $this->set_body('view', 'About');
31		- }
	30	+ $this->set_body('view', 'About');
	31	+ }
32	32
33	33	}

		@@ -58,7 +58,7 @@
		block discarded – undo
58	58	'values' => $values);
59	59	}
60	60
61		- global $config;
	61	+ global $config;
62	62	$mail = Loader::loadNew('utility', 'Mail');
63	63	$mail->setToAddress($config->admin_email, 'Jacob Emerick');
64	64	$mail->setSubject('Waterfall Site Contact');

		@@ -10,7 +10,7 @@ discard block
		block discarded – undo
10	10
11	11	protected static $WATERFALL_SITE_ID = 5;
12	12
13		- protected $parent_navigation_item = '';
	13	+ protected $parent_navigation_item = '';
14	14
15	15	protected function set_head_data()
16	16	{
		@@ -19,46 +19,46 @@ discard block
		block discarded – undo
19	19	$this->add_css('waterfall');
20	20	}
21	21
22		- protected function add_waterfall_js()
23		- {
24		- $this->add_js('jquery-1.10.2.min');
25		- $this->add_js('imagelightbox.min');
26		- $this->add_js('waterfall-overlay');
27		- $this->add_js('waterfall-map');
28		- }
	22	+ protected function add_waterfall_js()
	23	+ {
	24	+ $this->add_js('jquery-1.10.2.min');
	25	+ $this->add_js('imagelightbox.min');
	26	+ $this->add_js('waterfall-overlay');
	27	+ $this->add_js('waterfall-map');
	28	+ }
29	29
30	30	protected function set_body_data($page_type = 'normal')
31	31	{
32	32	$this->set_body('activity_array', $this->get_recent_activity());
33	33
34		- $this->set_body('main_navigation', array(
35		- (object) array(
36		- 'uri' => '/falls/',
37		- 'anchor' => 'Falls',
38		- 'is_active' => $this->parent_navigation_item === 'falls',
39		- ),
40		- (object) array(
41		- 'uri' => '/map/',
42		- 'anchor' => 'Map',
43		- 'is_active' => $this->parent_navigation_item === 'map',
44		- ),
45		- (object) array(
46		- 'uri' => '/journal/',
47		- 'anchor' => 'Journal',
48		- 'is_active' => $this->parent_navigation_item === 'journal',
49		- ),
50		- (object) array(
51		- 'uri' => '/about/',
52		- 'anchor' => 'About',
53		- 'is_active' => $this->parent_navigation_item === 'about',
54		- )
55		- ));
	34	+ $this->set_body('main_navigation', array(
	35	+ (object) array(
	36	+ 'uri' => '/falls/',
	37	+ 'anchor' => 'Falls',
	38	+ 'is_active' => $this->parent_navigation_item === 'falls',
	39	+ ),
	40	+ (object) array(
	41	+ 'uri' => '/map/',
	42	+ 'anchor' => 'Map',
	43	+ 'is_active' => $this->parent_navigation_item === 'map',
	44	+ ),
	45	+ (object) array(
	46	+ 'uri' => '/journal/',
	47	+ 'anchor' => 'Journal',
	48	+ 'is_active' => $this->parent_navigation_item === 'journal',
	49	+ ),
	50	+ (object) array(
	51	+ 'uri' => '/about/',
	52	+ 'anchor' => 'About',
	53	+ 'is_active' => $this->parent_navigation_item === 'about',
	54	+ )
	55	+ ));
56	56
57		- if ($page_type == 'wide') {
58		- $this->set_body_view('WidePage');
59		- } else {
60		- $this->set_body_view('Page');
61		- }
62		- }
	57	+ if ($page_type == 'wide') {
	58	+ $this->set_body_view('WidePage');
	59	+ } else {
	60	+ $this->set_body_view('Page');
	61	+ }
	62	+ }
63	63
64	64	}

		@@ -1,84 +1,84 @@
		block discarded – undo
1	1	<?
2	2
3	3	Loader::load('collector', array(
4		- 'comment/CommentCollector',
5		- 'image/PhotoCollector',
6		- 'waterfall/LogCollector',
	4	+ 'comment/CommentCollector',
	5	+ 'image/PhotoCollector',
	6	+ 'waterfall/LogCollector',
7	7	));
8	8	Loader::load('controller', 'waterfalls/DefaultPageController');
9	9
10	10	final class HomeController extends DefaultPageController
11	11	{
12	12
13		- private static $TITLE = 'Waterfalls of the Keweenaw \| Stories and Tips from Jacob Emerick';
14		- private static $DESCRIPTION = 'Stories, maps, and details about many of the waterfalls in the Upper Peninsula of Michigan, compiled by Jacob Emerick.';
15		- private static $KEYWORD_ARRAY = array(
16		- 'waterfalls',
17		- 'keweenaw',
18		- 'upper peninsula',
19		- 'jacob emerick',
20		- );
	13	+ private static $TITLE = 'Waterfalls of the Keweenaw \| Stories and Tips from Jacob Emerick';
	14	+ private static $DESCRIPTION = 'Stories, maps, and details about many of the waterfalls in the Upper Peninsula of Michigan, compiled by Jacob Emerick.';
	15	+ private static $KEYWORD_ARRAY = array(
	16	+ 'waterfalls',
	17	+ 'keweenaw',
	18	+ 'upper peninsula',
	19	+ 'jacob emerick',
	20	+ );
21	21
22		- private static $BANNER_IMAGE = 2661;
	22	+ private static $BANNER_IMAGE = 2661;
23	23
24		- protected function set_head_data()
25		- {
26		- parent::set_head_data();
	24	+ protected function set_head_data()
	25	+ {
	26	+ parent::set_head_data();
27	27
28		- $this->set_title(self::$TITLE);
29		- $this->set_description(self::$DESCRIPTION);
30		- $this->set_keywords(self::$KEYWORD_ARRAY);
31		- }
	28	+ $this->set_title(self::$TITLE);
	29	+ $this->set_description(self::$DESCRIPTION);
	30	+ $this->set_keywords(self::$KEYWORD_ARRAY);
	31	+ }
32	32
33		- protected function set_body_data($page_type = 'wide')
34		- {
35		- parent::set_body_data($page_type);
	33	+ protected function set_body_data($page_type = 'wide')
	34	+ {
	35	+ parent::set_body_data($page_type);
36	36
37		- $photo = PhotoCollector::getRow(self::$BANNER_IMAGE);
38		- $photo_obj = (object) array(
39		- 'file' => "/photo/{$photo->category}/{$photo->name}-size-full.jpg",
40		- 'description' => $photo->description,
41		- );
42		- $this->set_body('photo', $photo_obj);
	37	+ $photo = PhotoCollector::getRow(self::$BANNER_IMAGE);
	38	+ $photo_obj = (object) array(
	39	+ 'file' => "/photo/{$photo->category}/{$photo->name}-size-full.jpg",
	40	+ 'description' => $photo->description,
	41	+ );
	42	+ $this->set_body('photo', $photo_obj);
43	43
44		- $recent_log_container;
45		- $recent_logs = LogCollector::getRecentList(4);
46		- foreach ($recent_logs as $log) {
47		- $recent_log_container[] = (object) array(
48		- 'photo' => (object) array(
49		- 'file' => "/photo/{$log->photo_category}/{$log->photo}-size-thumb.jpg",
50		- 'description' => $log->photo_description,
51		- ),
52		- 'title' => $log->title,
53		- 'link' => "/journal/{$log->alias}/",
54		- 'date' => date('F j, Y', strtotime($log->publish_date)),
55		- );
56		- }
57		- $this->set_body('logs', $recent_log_container);
	44	+ $recent_log_container;
	45	+ $recent_logs = LogCollector::getRecentList(4);
	46	+ foreach ($recent_logs as $log) {
	47	+ $recent_log_container[] = (object) array(
	48	+ 'photo' => (object) array(
	49	+ 'file' => "/photo/{$log->photo_category}/{$log->photo}-size-thumb.jpg",
	50	+ 'description' => $log->photo_description,
	51	+ ),
	52	+ 'title' => $log->title,
	53	+ 'link' => "/journal/{$log->alias}/",
	54	+ 'date' => date('F j, Y', strtotime($log->publish_date)),
	55	+ );
	56	+ }
	57	+ $this->set_body('logs', $recent_log_container);
58	58
59		- $recent_comments = CommentCollector::getRecentWaterfallComments();
	59	+ $recent_comments = CommentCollector::getRecentWaterfallComments();
60	60
61		- $recent_comment_container = array();
62		- foreach($recent_comments as $comment) {
63		- $body = $comment->body;
64		- $body = strip_tags($body);
	61	+ $recent_comment_container = array();
	62	+ foreach($recent_comments as $comment) {
	63	+ $body = $comment->body;
	64	+ $body = strip_tags($body);
65	65
66		- $comment_obj = new stdclass();
67		- $comment_obj->description = Content::instance('SmartTrim', $body)->activate(50);
68		- $comment_obj->commenter = $comment->name;
69		- if (!empty($comment->log_path)) {
70		- $comment_obj->link = Loader::getRootURL() . "{$comment->log_path}/#comment-{$comment->id}";
71		- $comment_obj->location = $comment->log_title;
72		- } else {
73		- $comment_obj->link = Loader::getRootURL() . "{$comment->waterfall_path}/#comment-{$comment->id}";
74		- $comment_obj->location = $comment->waterfall_title;
75		- }
	66	+ $comment_obj = new stdclass();
	67	+ $comment_obj->description = Content::instance('SmartTrim', $body)->activate(50);
	68	+ $comment_obj->commenter = $comment->name;
	69	+ if (!empty($comment->log_path)) {
	70	+ $comment_obj->link = Loader::getRootURL() . "{$comment->log_path}/#comment-{$comment->id}";
	71	+ $comment_obj->location = $comment->log_title;
	72	+ } else {
	73	+ $comment_obj->link = Loader::getRootURL() . "{$comment->waterfall_path}/#comment-{$comment->id}";
	74	+ $comment_obj->location = $comment->waterfall_title;
	75	+ }
76	76
77		- $recent_comment_container[] = $comment_obj;
78		- }
79		- $this->set_body('comments', $recent_comment_container);
	77	+ $recent_comment_container[] = $comment_obj;
	78	+ }
	79	+ $this->set_body('comments', $recent_comment_container);
80	80
81		- $this->set_body('view', 'Home');
82		- }
	81	+ $this->set_body('view', 'Home');
	82	+ }
83	83
84	84	}
85	85	\ No newline at end of file

jacobemerick / web

Branch — master (de1ee7)

Category

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +144 added lines, -144 removed lines patch added patch discarded remove patch

Indentation +20 added lines, -20 removed lines patch added patch discarded remove patch

Indentation +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +36 added lines, -36 removed lines patch added patch discarded remove patch

Indentation +62 added lines, -62 removed lines patch added patch discarded remove patch