Completed
Push — master ( ec3686...b09171 )
by Jacob
06:23
created
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
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
 }
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
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
 
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
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
 }
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
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(),
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
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
 }
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
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
Please login to merge, or discard this patch.
controller/waterfalls/LogController.class.inc.php 1 patch
Indentation   +202 added lines, -202 removed lines patch added patch discarded remove patch
@@ -1,218 +1,218 @@
 block discarded – undo
1 1
 <?
2 2
 
3 3
 Loader::load('collector', array(
4
-    'image/AlbumCollector',
5
-    'waterfall/LogCollector'));
4
+	'image/AlbumCollector',
5
+	'waterfall/LogCollector'));
6 6
 Loader::load('controller', 'waterfalls/DefaultPageController');
7 7
 
8 8
 final class LogController extends DefaultPageController
9 9
 {
10 10
 
11
-    private static $AUTHOR = 'Jacob Emerick';
12
-    private static $AUTHOR_URL = 'http://home.jacobemerick.com/';
13
-    private static $JOURNAL_DIRECTORY = 'journal';
14
-
15
-    private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
16
-    private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
17
-    private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';
18
-
19
-    private $log;
11
+	private static $AUTHOR = 'Jacob Emerick';
12
+	private static $AUTHOR_URL = 'http://home.jacobemerick.com/';
13
+	private static $JOURNAL_DIRECTORY = 'journal';
14
+
15
+	private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
16
+	private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
17
+	private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-small.jpg" alt="%s" height="375" width="500" />';
18
+
19
+	private $log;
20 20
 
21
-    public function __construct()
22
-    {
23
-        parent::__construct();
24
-        
25
-        $log_path = URLDecode::getPiece(2);
26
-        
27
-        $this->log = LogCollector::getByAlias($log_path);
28
-        if(!$this->log)
29
-            $this->eject();
30
-
31
-        $this->parent_navigation_item = 'journal';
32
-        
33
-        $this->handle_comment_submit(
34
-            self::$WATERFALL_SITE_ID,
35
-            $this->log->alias,
36
-            Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
37
-            $this->log->title);
38
-        
39
-        $this->add_waterfall_js();
40
-    }
41
-
42
-    protected function set_head_data()
43
-    {
44
-        parent::set_head_data();
45
-        
46
-        $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
47
-        $this->set_description($this->log->introduction);
48
-        
49
-        $keyword_array = array();
50
-        $tag_result = LogCollector::getTagListForLog($this->log->id);
51
-        foreach($tag_result as $tag)
52
-        {
53
-            $keyword_array[] = $tag->name;
54
-        }
55
-        
56
-        $this->set_keywords($keyword_array);
57
-    }
58
-
59
-    protected function set_body_data($page_type = 'normal')
60
-    {
61
-        parent::set_body_data($page_type);
62
-        
63
-        $this->set_body('view', 'Log');
64
-
65
-        $body_data = $this->get_formatted_log();
66
-        $body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);
67
-        $body_data['sidebar'] = $this->get_sidebar();
68
-        $body_data['series'] = $this->get_series();
69
-        $body_data['album'] = $this->get_album();
70
-        
71
-        $this->set_body('data', $body_data);
72
-    }
73
-
74
-    private function get_formatted_log()
75
-    {
76
-        $formatted_log = array();
77
-        
78
-        $formatted_log['introduction'] = $this->get_log_introduction($this->log);
79
-        $formatted_log['title'] = $this->log->title;
80
-        $formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
81
-
82
-        $formatted_log['body'] = $this->get_formatted_log_body();
83
-        
84
-        return $formatted_log;
85
-    }
86
-
87
-    private function get_log_introduction($log)
88
-    {
89
-        if ($log->image_description == '') {
90
-            Debugger::logMessage("No description for {$log->image_category}/{$log->image_name}");
91
-        }
92
-        
93
-        return array(
94
-            'title' => $log->title,
95
-            'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
96
-            'date' => $this->get_parsed_date($log->date),
97
-            'publish_date' => $this->get_parsed_date($log->publish_date),
98
-            'introduction' => $log->introduction,
99
-            'image' => sprintf(
100
-                self::$MEDIUM_IMAGE_NODE,
101
-                $log->image_category,
102
-                $log->image_name,
103
-                $log->image_description),
104
-            'author' => self::$AUTHOR,
105
-            'author_url' => self::$AUTHOR_URL,
106
-        );
107
-    }
108
-
109
-    // @todo - link things up
110
-    private function get_formatted_log_body()
111
-    {
112
-        $body = $this->log->body;
113
-        
114
-        $body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
115
-        $body = Content::instance('FixInternalLink', $body)->activate();
116
-        
117
-        return $body;
118
-    }
119
-
120
-    private function get_series()
121
-    {
122
-        $series = array(
123
-            'previous' => array(),
124
-            'next' => array());
125
-        
126
-        $previous_log = LogCollector::getPreviousLog($this->log->id);
127
-        if($previous_log != false)
128
-        {
129
-            $series['previous'] = (object) array(
130
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
131
-                'title' => $previous_log->title,
132
-                'date' => $previous_log->date);
133
-        }
134
-        
135
-        $next_log = LogCollector::getNextLog($this->log->id);
136
-        if($next_log != false)
137
-        {
138
-            $series['next'] = (object) array(
139
-                'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
140
-                'title' => $next_log->title,
141
-                'date' => $next_log->date);
142
-        }
143
-        
144
-        return $series;
145
-    }
146
-
147
-    private function get_sidebar()
148
-    {
149
-        $sidebar = array();
150
-        
151
-        $sidebar['companion_list'] = array();
152
-        $companions = LogCollector::getCompanionListForLog($this->log->id);
153
-        foreach($companions as $companion)
154
-        {
155
-            $sidebar['companion_list'][] = (object) array(
156
-                'title' => $companion->name,
157
-                'path' => "/companion/{$companion->alias}/");
158
-        }
159
-        
160
-        $sidebar['tag_list'] = array();
161
-        $tags = LogCollector::getTagListForLog($this->log->id);
162
-        foreach($tags as $tag)
163
-        {
164
-            $sidebar['tag_list'][] = (object) array(
165
-                'title' => $tag->name,
166
-                'path' => "/journal/tag/{$tag->alias}/");
167
-        }
168
-        
169
-        $sidebar['waterfall_list'] = array();
170
-        $waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
171
-        foreach($waterfalls as $waterfall)
172
-        {
173
-            $sidebar['waterfall_list'][] = (object) array(
174
-                'title' => $waterfall->name,
175
-                'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");
176
-        }
177
-        
178
-        return $sidebar;
179
-    }
180
-
181
-    private function get_album()
182
-    {
183
-        $album = array();
184
-        
185
-        if($this->log->album == 0)
186
-            return $album;
187
-        
188
-        $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
189
-        foreach($photo_list as $photo)
190
-        {
191
-            $photo_array = array();
192
-            $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
193
-            $photo_array['description'] = $photo->description;
21
+	public function __construct()
22
+	{
23
+		parent::__construct();
24
+        
25
+		$log_path = URLDecode::getPiece(2);
26
+        
27
+		$this->log = LogCollector::getByAlias($log_path);
28
+		if(!$this->log)
29
+			$this->eject();
30
+
31
+		$this->parent_navigation_item = 'journal';
32
+        
33
+		$this->handle_comment_submit(
34
+			self::$WATERFALL_SITE_ID,
35
+			$this->log->alias,
36
+			Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/',
37
+			$this->log->title);
38
+        
39
+		$this->add_waterfall_js();
40
+	}
41
+
42
+	protected function set_head_data()
43
+	{
44
+		parent::set_head_data();
45
+        
46
+		$this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE);
47
+		$this->set_description($this->log->introduction);
48
+        
49
+		$keyword_array = array();
50
+		$tag_result = LogCollector::getTagListForLog($this->log->id);
51
+		foreach($tag_result as $tag)
52
+		{
53
+			$keyword_array[] = $tag->name;
54
+		}
55
+        
56
+		$this->set_keywords($keyword_array);
57
+	}
58
+
59
+	protected function set_body_data($page_type = 'normal')
60
+	{
61
+		parent::set_body_data($page_type);
62
+        
63
+		$this->set_body('view', 'Log');
64
+
65
+		$body_data = $this->get_formatted_log();
66
+		$body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, $this->log->alias);
67
+		$body_data['sidebar'] = $this->get_sidebar();
68
+		$body_data['series'] = $this->get_series();
69
+		$body_data['album'] = $this->get_album();
70
+        
71
+		$this->set_body('data', $body_data);
72
+	}
73
+
74
+	private function get_formatted_log()
75
+	{
76
+		$formatted_log = array();
77
+        
78
+		$formatted_log['introduction'] = $this->get_log_introduction($this->log);
79
+		$formatted_log['title'] = $this->log->title;
80
+		$formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/';
81
+
82
+		$formatted_log['body'] = $this->get_formatted_log_body();
83
+        
84
+		return $formatted_log;
85
+	}
86
+
87
+	private function get_log_introduction($log)
88
+	{
89
+		if ($log->image_description == '') {
90
+			Debugger::logMessage("No description for {$log->image_category}/{$log->image_name}");
91
+		}
92
+        
93
+		return array(
94
+			'title' => $log->title,
95
+			'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/',
96
+			'date' => $this->get_parsed_date($log->date),
97
+			'publish_date' => $this->get_parsed_date($log->publish_date),
98
+			'introduction' => $log->introduction,
99
+			'image' => sprintf(
100
+				self::$MEDIUM_IMAGE_NODE,
101
+				$log->image_category,
102
+				$log->image_name,
103
+				$log->image_description),
104
+			'author' => self::$AUTHOR,
105
+			'author_url' => self::$AUTHOR_URL,
106
+		);
107
+	}
108
+
109
+	// @todo - link things up
110
+	private function get_formatted_log_body()
111
+	{
112
+		$body = $this->log->body;
113
+        
114
+		$body = Content::instance('FixPhoto', $body)->activate(false, 'standard');
115
+		$body = Content::instance('FixInternalLink', $body)->activate();
116
+        
117
+		return $body;
118
+	}
119
+
120
+	private function get_series()
121
+	{
122
+		$series = array(
123
+			'previous' => array(),
124
+			'next' => array());
125
+        
126
+		$previous_log = LogCollector::getPreviousLog($this->log->id);
127
+		if($previous_log != false)
128
+		{
129
+			$series['previous'] = (object) array(
130
+				'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/',
131
+				'title' => $previous_log->title,
132
+				'date' => $previous_log->date);
133
+		}
134
+        
135
+		$next_log = LogCollector::getNextLog($this->log->id);
136
+		if($next_log != false)
137
+		{
138
+			$series['next'] = (object) array(
139
+				'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/',
140
+				'title' => $next_log->title,
141
+				'date' => $next_log->date);
142
+		}
143
+        
144
+		return $series;
145
+	}
146
+
147
+	private function get_sidebar()
148
+	{
149
+		$sidebar = array();
150
+        
151
+		$sidebar['companion_list'] = array();
152
+		$companions = LogCollector::getCompanionListForLog($this->log->id);
153
+		foreach($companions as $companion)
154
+		{
155
+			$sidebar['companion_list'][] = (object) array(
156
+				'title' => $companion->name,
157
+				'path' => "/companion/{$companion->alias}/");
158
+		}
159
+        
160
+		$sidebar['tag_list'] = array();
161
+		$tags = LogCollector::getTagListForLog($this->log->id);
162
+		foreach($tags as $tag)
163
+		{
164
+			$sidebar['tag_list'][] = (object) array(
165
+				'title' => $tag->name,
166
+				'path' => "/journal/tag/{$tag->alias}/");
167
+		}
168
+        
169
+		$sidebar['waterfall_list'] = array();
170
+		$waterfalls = LogCollector::getWaterfallListForLog($this->log->id);
171
+		foreach($waterfalls as $waterfall)
172
+		{
173
+			$sidebar['waterfall_list'][] = (object) array(
174
+				'title' => $waterfall->name,
175
+				'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/");
176
+		}
177
+        
178
+		return $sidebar;
179
+	}
180
+
181
+	private function get_album()
182
+	{
183
+		$album = array();
184
+        
185
+		if($this->log->album == 0)
186
+			return $album;
187
+        
188
+		$photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album);
189
+		foreach($photo_list as $photo)
190
+		{
191
+			$photo_array = array();
192
+			$photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
193
+			$photo_array['description'] = $photo->description;
194 194
             
195
-            if($photo->height < $photo->width)
196
-                list($height, $width) = array(75, 100);
197
-            else
198
-                list($height, $width) = array(100, 75);
195
+			if($photo->height < $photo->width)
196
+				list($height, $width) = array(75, 100);
197
+			else
198
+				list($height, $width) = array(100, 75);
199 199
             
200
-            if ($photo->description == '') {
201
-                Debugger::logMessage("No description for {$photo->category}/{$photo->name}");
202
-            }
200
+			if ($photo->description == '') {
201
+				Debugger::logMessage("No description for {$photo->category}/{$photo->name}");
202
+			}
203 203
             
204
-            $photo_array['image_node'] = sprintf(
205
-                self::$THUMB_IMAGE_NODE,
206
-                $photo->category,
207
-                $photo->name,
208
-                $photo->description,
209
-                $height,
210
-                $width);
204
+			$photo_array['image_node'] = sprintf(
205
+				self::$THUMB_IMAGE_NODE,
206
+				$photo->category,
207
+				$photo->name,
208
+				$photo->description,
209
+				$height,
210
+				$width);
211 211
             
212
-            $album[] = (object) $photo_array;
213
-        }
212
+			$album[] = (object) $photo_array;
213
+		}
214 214
         
215
-        return $album;
216
-    }
215
+		return $album;
216
+	}
217 217
 
218 218
 }
219 219
\ No newline at end of file
Please login to merge, or discard this patch.
controller/waterfalls/MapController.class.inc.php 1 patch
Indentation   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -6,62 +6,62 @@
 block discarded – undo
6 6
 final class MapController extends DefaultPageController
7 7
 {
8 8
 
9
-    private static $TITLE = 'Map of Upper Peninsula Waterfalls';
10
-    private static $DESCRIPTION = '';
11
-    private static $KEYWORD_ARRAY = array();
9
+	private static $TITLE = 'Map of Upper Peninsula Waterfalls';
10
+	private static $DESCRIPTION = '';
11
+	private static $KEYWORD_ARRAY = array();
12 12
 
13
-    private static $HIDE_ON_INITIAL_LOAD_LIST = array(
14
-        'Lower Tahquamenon Falls',
15
-        'Rainbow Falls',
16
-        'Sandstone Falls',
17
-        'Upper Tahquamenon Falls',
18
-    );
13
+	private static $HIDE_ON_INITIAL_LOAD_LIST = array(
14
+		'Lower Tahquamenon Falls',
15
+		'Rainbow Falls',
16
+		'Sandstone Falls',
17
+		'Upper Tahquamenon Falls',
18
+	);
19 19
 
20
-    public function __construct()
21
-    {
22
-        parent::__construct();
20
+	public function __construct()
21
+	{
22
+		parent::__construct();
23 23
 
24
-        $this->add_js('https://maps.googleapis.com/maps/api/js?sensor=false');
25
-        $this->add_waterfall_js();
26
-    }
24
+		$this->add_js('https://maps.googleapis.com/maps/api/js?sensor=false');
25
+		$this->add_waterfall_js();
26
+	}
27 27
 
28
-    protected function set_head_data()
29
-    {
30
-        parent::set_head_data();
28
+	protected function set_head_data()
29
+	{
30
+		parent::set_head_data();
31 31
         
32
-        $this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);
33
-        $this->set_description(self::$DESCRIPTION);
34
-        $this->set_keywords(self::$KEYWORD_ARRAY);
35
-    }
32
+		$this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE);
33
+		$this->set_description(self::$DESCRIPTION);
34
+		$this->set_keywords(self::$KEYWORD_ARRAY);
35
+	}
36 36
 
37
-    protected function set_body_data($page_type = 'wide')
38
-    {
39
-        parent::set_body_data($page_type);
37
+	protected function set_body_data($page_type = 'wide')
38
+	{
39
+		parent::set_body_data($page_type);
40 40
         
41
-        $this->set_head('full_page_map', true);
42
-        $this->set_body('waterfall_list', $this->fetch_waterfall_list());
43
-        $this->set_body('view', 'Map');
44
-    }
41
+		$this->set_head('full_page_map', true);
42
+		$this->set_body('waterfall_list', $this->fetch_waterfall_list());
43
+		$this->set_body('view', 'Map');
44
+	}
45 45
 
46
-    private function fetch_waterfall_list()
47
-    {
48
-        $list = WaterfallCollector::getMapList();
49
-        array_walk($list, array($this, 'parse_waterfall'));
50
-        return $list;
51
-    }
46
+	private function fetch_waterfall_list()
47
+	{
48
+		$list = WaterfallCollector::getMapList();
49
+		array_walk($list, array($this, 'parse_waterfall'));
50
+		return $list;
51
+	}
52 52
 
53
-    private function parse_waterfall(&$waterfall)
54
-    {
55
-        $waterfall = (object) array(
56
-            'name'  => $waterfall->name,
57
-            'latitude' => $waterfall->latitude,
58
-            'longitude' => $waterfall->longitude,
59
-            'link' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
60
-            'image' => "/photo/{$waterfall->photo_category}/{$waterfall->photo}-size-medium.jpg",
61
-            'image_alt' => $waterfall->photo_description,
62
-            'watercourse' => $waterfall->watercourse,
63
-            'hide_on_initial_load' => (in_array($waterfall->name, self::$HIDE_ON_INITIAL_LOAD_LIST)),
64
-        );
65
-    }
53
+	private function parse_waterfall(&$waterfall)
54
+	{
55
+		$waterfall = (object) array(
56
+			'name'  => $waterfall->name,
57
+			'latitude' => $waterfall->latitude,
58
+			'longitude' => $waterfall->longitude,
59
+			'link' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
60
+			'image' => "/photo/{$waterfall->photo_category}/{$waterfall->photo}-size-medium.jpg",
61
+			'image_alt' => $waterfall->photo_description,
62
+			'watercourse' => $waterfall->watercourse,
63
+			'hide_on_initial_load' => (in_array($waterfall->name, self::$HIDE_ON_INITIAL_LOAD_LIST)),
64
+		);
65
+	}
66 66
 
67 67
 }
Please login to merge, or discard this patch.
controller/waterfalls/WaterfallController.class.inc.php 1 patch
Indentation   +193 added lines, -193 removed lines patch added patch discarded remove patch
@@ -1,231 +1,231 @@
 block discarded – undo
1 1
 <?
2 2
 
3 3
 Loader::load('collector', array(
4
-    'image/AlbumCollector',
5
-    'waterfall/WatercourseCollector',
6
-    'waterfall/WaterfallCollector',
7
-    'waterfall/LogCollector'));
4
+	'image/AlbumCollector',
5
+	'waterfall/WatercourseCollector',
6
+	'waterfall/WaterfallCollector',
7
+	'waterfall/LogCollector'));
8 8
 Loader::load('controller', 'waterfalls/DefaultPageController');
9 9
 
10 10
 final class WaterfallController extends DefaultPageController
11 11
 {
12 12
 
13
-    private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';
14
-
15
-    private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
16
-    private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
17
-    private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-medium.jpg" alt="%s" height="375" width="500" />';
18
-
19
-    private $waterfall;
20
-
21
-    public function __construct()
22
-    {
23
-        parent::__construct();
24
-
25
-        $path_watercourse = URLDecode::getPiece(1);
26
-        $path_fall = URLDecode::getPiece(2);
27
-
28
-        $this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);
29
-        if (!$this->waterfall) {
30
-              $this->eject();
31
-        }
32
-        
33
-        $this->handle_comment_submit(
34
-            self::$WATERFALL_SITE_ID,
35
-            "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}",
36
-            Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
37
-            $this->waterfall->name);
38
-        
39
-        $this->add_waterfall_js();
40
-    }
41
-
42
-    protected function set_head_data()
43
-    {
44
-        parent::set_head_data();
45
-
46
-        $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
47
-        $this->set_description($this->waterfall->description);
48
-        $this->set_keywords((array) $this->waterfall->name);
49
-    }
50
-
51
-    protected function set_body_data($page_type = 'normal')
52
-    {
53
-        parent::set_body_data($page_type);
54
-
55
-        $body_data = $this->format_waterfall_data($this->waterfall);
56
-        $body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}");
57
-
58
-        $this->set_body('data', $body_data);
59
-
60
-        $this->set_body('view', 'Fall');
61
-    }
62
-
63
-    private function format_waterfall_data($waterfall)
64
-    {
65
-        $waterfall_data = array();
66
-        $waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);
67
-        $waterfall_data['name'] = $waterfall->name;
68
-        $waterfall_data['watercourse'] = $waterfall->watercourse;
69
-        $waterfall_data['path'] = "/{$waterfall->watercourse_alias}/{$waterfall->alias}/";
70
-        $waterfall_data['tagline'] = $waterfall->introduction;
71
-        $waterfall_data['main_photo'] = sprintf(self::$STANDARD_IMAGE_NODE, $waterfall->photo_category, $waterfall->photo, $waterfall->photo_description);
72
-        $waterfall_data['album'] = $this->get_album();
73
-        $waterfall_data['body'] = $this->format_waterfall_content($waterfall->body);
74
-        $waterfall_data['directions'] = $this->format_waterfall_content($waterfall->directions);
75
-        $waterfall_data['sidebar'] = $this->get_sidebar($waterfall);
76
-
77
-        return $waterfall_data;
78
-    }
79
-
80
-    private function get_waterfall_introduction($waterfall)
81
-    {
82
-        return array(
83
-            'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
84
-            'name' => $waterfall->name,
85
-            'watercourse' => $waterfall->watercourse,
86
-            'tagline' => $waterfall->introduction,
87
-        );
88
-    }
89
-
90
-    private function get_main_watercourse($alias)
91
-    {
92
-        $watercourse = WatercourseCollector::getByAlias($alias);
93
-        if ($watercourse->parent != 0) {
94
-            $watercourse = WatercourseCollector::getById($watercourse->parent);
95
-        }
96
-        
97
-        return (object) array(
98
-            'name' => $watercourse->name,
99
-            'title' => $watercourse->name,
100
-            'alias' => $watercourse->alias,
101
-        );
102
-    }
103
-
104
-    private function format_waterfall_content($content)
105
-    {
106
-        $content = Content::instance('FixInternalLink', $content)->activate();
107
-        
108
-        return $content;
109
-    }
110
-
111
-    private function get_album()
112
-    {
113
-        $album = array();
114
-        
115
-        if($this->waterfall->album == 0)
116
-            return $album;
117
-        
118
-        $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
119
-        foreach($photo_list as $photo)
120
-        {
121
-            $photo_array = array();
122
-            $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
123
-            $photo_array['description'] = $photo->description;
13
+	private static $STANDARD_IMAGE_NODE = '<img src="/photo/%s/%s-size-standard.jpg" alt="%s" height="600" width="800" />';
14
+
15
+	private static $FULL_IMAGE_LINK = '/photo/%s/%s-size-standard.jpg';
16
+	private static $THUMB_IMAGE_NODE = '<img src="/photo/%s/%s-size-thumb.jpg" alt="%s" height="%s" width="%s" />';
17
+	private static $MEDIUM_IMAGE_NODE = '<img src="/photo/%s/%s-size-medium.jpg" alt="%s" height="375" width="500" />';
18
+
19
+	private $waterfall;
20
+
21
+	public function __construct()
22
+	{
23
+		parent::__construct();
24
+
25
+		$path_watercourse = URLDecode::getPiece(1);
26
+		$path_fall = URLDecode::getPiece(2);
27
+
28
+		$this->waterfall = WaterfallCollector::getByAlias($path_watercourse, $path_fall);
29
+		if (!$this->waterfall) {
30
+			  $this->eject();
31
+		}
32
+        
33
+		$this->handle_comment_submit(
34
+			self::$WATERFALL_SITE_ID,
35
+			"{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}",
36
+			Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/",
37
+			$this->waterfall->name);
38
+        
39
+		$this->add_waterfall_js();
40
+	}
41
+
42
+	protected function set_head_data()
43
+	{
44
+		parent::set_head_data();
45
+
46
+		$this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE);
47
+		$this->set_description($this->waterfall->description);
48
+		$this->set_keywords((array) $this->waterfall->name);
49
+	}
50
+
51
+	protected function set_body_data($page_type = 'normal')
52
+	{
53
+		parent::set_body_data($page_type);
54
+
55
+		$body_data = $this->format_waterfall_data($this->waterfall);
56
+		$body_data['comment_array'] = $this->get_comment_array(self::$WATERFALL_SITE_ID, "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}");
57
+
58
+		$this->set_body('data', $body_data);
59
+
60
+		$this->set_body('view', 'Fall');
61
+	}
62
+
63
+	private function format_waterfall_data($waterfall)
64
+	{
65
+		$waterfall_data = array();
66
+		$waterfall_data['introduction'] = $this->get_waterfall_introduction($waterfall);
67
+		$waterfall_data['name'] = $waterfall->name;
68
+		$waterfall_data['watercourse'] = $waterfall->watercourse;
69
+		$waterfall_data['path'] = "/{$waterfall->watercourse_alias}/{$waterfall->alias}/";
70
+		$waterfall_data['tagline'] = $waterfall->introduction;
71
+		$waterfall_data['main_photo'] = sprintf(self::$STANDARD_IMAGE_NODE, $waterfall->photo_category, $waterfall->photo, $waterfall->photo_description);
72
+		$waterfall_data['album'] = $this->get_album();
73
+		$waterfall_data['body'] = $this->format_waterfall_content($waterfall->body);
74
+		$waterfall_data['directions'] = $this->format_waterfall_content($waterfall->directions);
75
+		$waterfall_data['sidebar'] = $this->get_sidebar($waterfall);
76
+
77
+		return $waterfall_data;
78
+	}
79
+
80
+	private function get_waterfall_introduction($waterfall)
81
+	{
82
+		return array(
83
+			'path' => "/{$waterfall->watercourse_alias}/{$waterfall->alias}/",
84
+			'name' => $waterfall->name,
85
+			'watercourse' => $waterfall->watercourse,
86
+			'tagline' => $waterfall->introduction,
87
+		);
88
+	}
89
+
90
+	private function get_main_watercourse($alias)
91
+	{
92
+		$watercourse = WatercourseCollector::getByAlias($alias);
93
+		if ($watercourse->parent != 0) {
94
+			$watercourse = WatercourseCollector::getById($watercourse->parent);
95
+		}
96
+        
97
+		return (object) array(
98
+			'name' => $watercourse->name,
99
+			'title' => $watercourse->name,
100
+			'alias' => $watercourse->alias,
101
+		);
102
+	}
103
+
104
+	private function format_waterfall_content($content)
105
+	{
106
+		$content = Content::instance('FixInternalLink', $content)->activate();
107
+        
108
+		return $content;
109
+	}
110
+
111
+	private function get_album()
112
+	{
113
+		$album = array();
114
+        
115
+		if($this->waterfall->album == 0)
116
+			return $album;
117
+        
118
+		$photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album);
119
+		foreach($photo_list as $photo)
120
+		{
121
+			$photo_array = array();
122
+			$photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name);
123
+			$photo_array['description'] = $photo->description;
124 124
             
125
-            if($photo->height < $photo->width)
126
-                list($height, $width) = array(75, 100);
127
-            else
128
-                list($height, $width) = array(100, 75);
125
+			if($photo->height < $photo->width)
126
+				list($height, $width) = array(75, 100);
127
+			else
128
+				list($height, $width) = array(100, 75);
129 129
             
130
-            $photo_array['image_node'] = sprintf(
131
-                self::$THUMB_IMAGE_NODE,
132
-                $photo->category,
133
-                $photo->name,
134
-                $photo->description,
135
-                $height,
136
-                $width);
130
+			$photo_array['image_node'] = sprintf(
131
+				self::$THUMB_IMAGE_NODE,
132
+				$photo->category,
133
+				$photo->name,
134
+				$photo->description,
135
+				$height,
136
+				$width);
137 137
             
138
-            $album[] = (object) $photo_array;
139
-        }
138
+			$album[] = (object) $photo_array;
139
+		}
140 140
         
141
-        return $album;
142
-    }
141
+		return $album;
142
+	}
143 143
 
144 144
 	private function get_sidebar($waterfall)
145 145
 	{
146 146
 		$sidebar_data = array();
147 147
 		$sidebar_data['name'] = $waterfall->name;
148 148
 		$sidebar_data['watercourse'] = $waterfall->watercourse;
149
-        $sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
149
+		$sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias);
150 150
 		$sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5';
151
-        $sidebar_data['rating'] = $waterfall->rating;
151
+		$sidebar_data['rating'] = $waterfall->rating;
152 152
 		$sidebar_data['height'] = Content::instance('ImperialUnit', $waterfall->height)->activate('inches');
153 153
 		$sidebar_data['width'] = Content::instance('ImperialUnit', $waterfall->width)->activate('inches');
154 154
 		$sidebar_data['drop_height'] = Content::instance('ImperialUnit', $waterfall->drop_height)->activate('inches');
155 155
 		$sidebar_data['drop_count'] = $waterfall->drop_count;
156 156
 		
157
-        $sidebar_data['county'] = (object) array (
158
-            'name' => $waterfall->county,
159
-            'alias' => $waterfall->county_alias,
160
-            'title' => $waterfall->county_title,
161
-        );
157
+		$sidebar_data['county'] = (object) array (
158
+			'name' => $waterfall->county,
159
+			'alias' => $waterfall->county_alias,
160
+			'title' => $waterfall->county_title,
161
+		);
162 162
         
163 163
 		$sidebar_data['nearest_town'] = $waterfall->nearest_town;
164 164
 		$sidebar_data['latitude'] = round($waterfall->latitude, 5);
165 165
 		$sidebar_data['longitude'] = round($waterfall->longitude, 5);
166 166
 		$sidebar_data['elevation'] = Content::instance('ImperialUnit', $waterfall->elevation)->activate('feet');
167 167
         
168
-        $sidebar_data['map'] = $this->get_map_piece($waterfall);
168
+		$sidebar_data['map'] = $this->get_map_piece($waterfall);
169 169
         
170
-        $sidebar_data['journal_list'] = $this->get_journal_list($waterfall->id);
170
+		$sidebar_data['journal_list'] = $this->get_journal_list($waterfall->id);
171 171
         
172
-        $sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);
172
+		$sidebar_data['nearby_list'] = $this->get_nearby_list($waterfall->id);
173 173
 		
174 174
 		return $sidebar_data;
175 175
 	}
176 176
 
177
-    private function get_journal_list($waterfall)
178
-    {
179
-        $list = array();
180
-        $log_result = LogCollector::getLogListForWaterfall($waterfall);
181
-        foreach ($log_result as $log_row) {
182
-            $list[] = (object) array(
183
-                'date' => date('F j, Y', strtotime($log_row->date)),
184
-                'title' => $log_row->title,
185
-                'url' => "/journal/{$log_row->alias}/",
186
-            );
187
-        }
188
-        
189
-        return $list;
190
-    }
191
-
192
-    private function get_map_piece($waterfall)
193
-    {
194
-        $map_holder = array();
195
-        
196
-        $url = 'http://maps.googleapis.com/maps/api/staticmap';
197
-        $url .= "?center={$waterfall->latitude},{$waterfall->longitude}";
198
-        $url .= "&zoom=8";
199
-        $url .= "&maptype=terrain";
200
-        $url .= "&size=230x200";
201
-        $url .= "&markers=color:red|size:small|{$waterfall->latitude},{$waterfall->longitude}";
202
-        $url .= "&sensor=false";
203
-        $url .= "&key=AIzaSyA3eWALjUTSIa44KsbOUYRpG0oMd3aNo00";
204
-        
205
-        $image = "<img src=\"{$url}\" height=\"200\" width=\"230\" alt=\"{$waterfall->name} Location\" />";
206
-        $map_holder['image'] = $image;
207
-        
208
-        $map_holder['uri'] = '/map/';
209
-        $map_holder['title'] = "View {$waterfall->name} on a larger map";
210
-        
211
-        return (object) $map_holder;
212
-    }
213
-
214
-    private function get_nearby_list($waterfall)
215
-    {
216
-        $nearby_list = array();
217
-        
218
-        $result = WaterfallCollector::getNearbyList($waterfall);
219
-        foreach ($result as $row) {
220
-            $nearby_list[] = (object) array(
221
-                'url' => "/{$row->watercourse_alias}/{$row->alias}/",
222
-                'anchor' => $row->name,
223
-                'title' => "{$row->name} of {$row->watercourse}",
224
-                'distance' => Content::instance('ImperialUnit', $row->distance)->activate(false),
225
-            );
226
-        }
227
-        
228
-        return $nearby_list;
229
-    }
177
+	private function get_journal_list($waterfall)
178
+	{
179
+		$list = array();
180
+		$log_result = LogCollector::getLogListForWaterfall($waterfall);
181
+		foreach ($log_result as $log_row) {
182
+			$list[] = (object) array(
183
+				'date' => date('F j, Y', strtotime($log_row->date)),
184
+				'title' => $log_row->title,
185
+				'url' => "/journal/{$log_row->alias}/",
186
+			);
187
+		}
188
+        
189
+		return $list;
190
+	}
191
+
192
+	private function get_map_piece($waterfall)
193
+	{
194
+		$map_holder = array();
195
+        
196
+		$url = 'http://maps.googleapis.com/maps/api/staticmap';
197
+		$url .= "?center={$waterfall->latitude},{$waterfall->longitude}";
198
+		$url .= "&zoom=8";
199
+		$url .= "&maptype=terrain";
200
+		$url .= "&size=230x200";
201
+		$url .= "&markers=color:red|size:small|{$waterfall->latitude},{$waterfall->longitude}";
202
+		$url .= "&sensor=false";
203
+		$url .= "&key=AIzaSyA3eWALjUTSIa44KsbOUYRpG0oMd3aNo00";
204
+        
205
+		$image = "<img src=\"{$url}\" height=\"200\" width=\"230\" alt=\"{$waterfall->name} Location\" />";
206
+		$map_holder['image'] = $image;
207
+        
208
+		$map_holder['uri'] = '/map/';
209
+		$map_holder['title'] = "View {$waterfall->name} on a larger map";
210
+        
211
+		return (object) $map_holder;
212
+	}
213
+
214
+	private function get_nearby_list($waterfall)
215
+	{
216
+		$nearby_list = array();
217
+        
218
+		$result = WaterfallCollector::getNearbyList($waterfall);
219
+		foreach ($result as $row) {
220
+			$nearby_list[] = (object) array(
221
+				'url' => "/{$row->watercourse_alias}/{$row->alias}/",
222
+				'anchor' => $row->name,
223
+				'title' => "{$row->name} of {$row->watercourse}",
224
+				'distance' => Content::instance('ImperialUnit', $row->distance)->activate(false),
225
+			);
226
+		}
227
+        
228
+		return $nearby_list;
229
+	}
230 230
 
231 231
 }
232 232
\ No newline at end of file
Please login to merge, or discard this patch.