@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | protected function get_page_number() |
39 | 39 | { |
40 | 40 | $page = URLDecode::getPiece(2); |
41 | - if(isset($page) && is_numeric($page)) |
|
41 | + if (isset($page) && is_numeric($page)) |
|
42 | 42 | return $page; |
43 | 43 | return 1; |
44 | 44 | } |
@@ -58,24 +58,24 @@ discard block |
||
58 | 58 | |
59 | 59 | protected function get_list_next_link() |
60 | 60 | { |
61 | - if($this->page == 1) |
|
61 | + if ($this->page == 1) |
|
62 | 62 | return; |
63 | - if($this->page == 2) |
|
63 | + if ($this->page == 2) |
|
64 | 64 | return Loader::getRootUrl('lifestream'); |
65 | - return Loader::getRootUrl('lifestream') . 'page/' . ($this->page - 1) . '/'; |
|
65 | + return Loader::getRootUrl('lifestream').'page/'.($this->page - 1).'/'; |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | protected function get_list_prev_link() |
69 | 69 | { |
70 | - if(($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) |
|
70 | + if (($this->page * self::$POSTS_PER_PAGE) >= $this->get_total_post_count()) |
|
71 | 71 | return; |
72 | - return Loader::getRootUrl('lifestream') . 'page/' . ($this->page + 1) . '/'; |
|
72 | + return Loader::getRootUrl('lifestream').'page/'.($this->page + 1).'/'; |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | private $total_post_count; |
76 | 76 | protected function get_total_post_count() |
77 | 77 | { |
78 | - if(!isset($this->total_post_count)) |
|
78 | + if (!isset($this->total_post_count)) |
|
79 | 79 | $this->total_post_count = $this->activityRepository->getActivitiesCount(); |
80 | 80 | return $this->total_post_count; |
81 | 81 | } |
@@ -28,17 +28,17 @@ discard block |
||
28 | 28 | |
29 | 29 | private function get_form_results() |
30 | 30 | { |
31 | - if(!Request::hasPost()) |
|
31 | + if (!Request::hasPost()) |
|
32 | 32 | return array(); |
33 | 33 | |
34 | - if(!Validate::checkRequest('post', 'name', 'string')) |
|
34 | + if (!Validate::checkRequest('post', 'name', 'string')) |
|
35 | 35 | $error_message['name'] = 'Please enter a value for your name.'; |
36 | - if(!Validate::checkRequest('post', 'email', 'string')) |
|
36 | + if (!Validate::checkRequest('post', 'email', 'string')) |
|
37 | 37 | $error_message['email'] = 'Please enter a valid email address.'; |
38 | - if(!Validate::checkRequest('post', 'message', 'string')) |
|
38 | + if (!Validate::checkRequest('post', 'message', 'string')) |
|
39 | 39 | $error_message['message'] = 'Please enter a message.'; |
40 | 40 | |
41 | - if(!empty($error_message)) |
|
41 | + if (!empty($error_message)) |
|
42 | 42 | { |
43 | 43 | return array( |
44 | 44 | 'error_message' => $error_message, |
@@ -50,14 +50,14 @@ discard block |
||
50 | 50 | ->addTo($container['config']->admin_email) |
51 | 51 | ->setSubject('Site Contact') |
52 | 52 | ->setPlainMessage( |
53 | - 'Name: ' . Request::getPost('name') . "\n" . |
|
54 | - 'Email: ' . Request::getPost('email') . "\n" . |
|
55 | - 'Message: ' . Request::getPost('message') |
|
53 | + 'Name: '.Request::getPost('name')."\n". |
|
54 | + 'Email: '.Request::getPost('email')."\n". |
|
55 | + 'Message: '.Request::getPost('message') |
|
56 | 56 | ) |
57 | 57 | ->send(); |
58 | 58 | |
59 | 59 | return array( |
60 | - 'success_message' => "Thank you for your message, " . Request::getPost('name') . "! I'll get back to you as soon as possible."); |
|
60 | + 'success_message' => "Thank you for your message, ".Request::getPost('name')."! I'll get back to you as soon as possible."); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | } |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | $post_result = $activityRepository->getActivities(5); |
65 | 65 | |
66 | 66 | $post_array = array(); |
67 | - foreach($post_result as $row) { |
|
67 | + foreach ($post_result as $row) { |
|
68 | 68 | array_push($post_array, $this->expand_post($row)); |
69 | 69 | } |
70 | 70 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | ]; |
81 | 81 | |
82 | 82 | if ($format != 'short') { |
83 | - $post['url'] = Loader::getRootUrl('lifestream') . "{$raw_post['type']}/{$raw_post['id']}/"; |
|
83 | + $post['url'] = Loader::getRootUrl('lifestream')."{$raw_post['type']}/{$raw_post['id']}/"; |
|
84 | 84 | |
85 | 85 | $metadata = json_decode($raw_post['metadata'], true); |
86 | 86 | $post = array_merge($post, $metadata); |
@@ -100,12 +100,12 @@ discard block |
||
100 | 100 | $headers = $this->headers; |
101 | 101 | Header::$headers(); |
102 | 102 | Loader::load('view', '/Head', $this->data_array['head']); |
103 | - foreach($this->body_view_array as $view) |
|
103 | + foreach ($this->body_view_array as $view) |
|
104 | 104 | { |
105 | - if(substr($view, 0, 1) == '/') |
|
105 | + if (substr($view, 0, 1) == '/') |
|
106 | 106 | Loader::load('view', $view, $this->data_array['body']); |
107 | 107 | else |
108 | - Loader::load('view', URLDecode::getSite() . '/' . $view, $this->data_array['body']); |
|
108 | + Loader::load('view', URLDecode::getSite().'/'.$view, $this->data_array['body']); |
|
109 | 109 | } |
110 | 110 | |
111 | 111 | if (URLDecode::getSite() == 'waterfalls') { |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | Loader::load('view', '/Foot', array('tracking_code' => self::$TRACKING_CODE)); |
115 | 115 | } |
116 | 116 | |
117 | - if($view == '/404' || $view == '/503') |
|
117 | + if ($view == '/404' || $view == '/503') |
|
118 | 118 | exit; |
119 | 119 | } |
120 | 120 | |
@@ -170,14 +170,14 @@ discard block |
||
170 | 170 | |
171 | 171 | private function load_assets() |
172 | 172 | { |
173 | - $css_array = array_map(function ($stylesheet) { |
|
173 | + $css_array = array_map(function($stylesheet) { |
|
174 | 174 | $path = "/css/{$stylesheet[0]}.css"; |
175 | 175 | if ($stylesheet[1] > 1) { |
176 | 176 | $path .= "?v={$stylesheet[1]}"; |
177 | 177 | } |
178 | 178 | return $path; |
179 | 179 | }, $this->css_array); |
180 | - $js_array = array_map(function ($script) { |
|
180 | + $js_array = array_map(function($script) { |
|
181 | 181 | if (substr($script, 0, 4) == 'http') { |
182 | 182 | return $script; |
183 | 183 | } |
@@ -195,26 +195,26 @@ discard block |
||
195 | 195 | |
196 | 196 | protected function eject() |
197 | 197 | { |
198 | - if(get_class($this) !== 'Error404Controller') |
|
198 | + if (get_class($this) !== 'Error404Controller') |
|
199 | 199 | Loader::loadNew('controller', '/Error404Controller')->activate(); |
200 | 200 | } |
201 | 201 | |
202 | 202 | protected function unavailable() |
203 | 203 | { |
204 | - if(get_class($this) !== 'Error503Controller') |
|
204 | + if (get_class($this) !== 'Error503Controller') |
|
205 | 205 | Loader::loadNew('controller', '/Error503Controller')->activate(); |
206 | 206 | } |
207 | 207 | |
208 | 208 | protected function redirect($uri, $method = 301) |
209 | 209 | { |
210 | - switch($method) |
|
210 | + switch ($method) |
|
211 | 211 | { |
212 | 212 | case 301 : |
213 | - if(get_class($this) !== 'Error301Controller') |
|
213 | + if (get_class($this) !== 'Error301Controller') |
|
214 | 214 | Loader::loadNew('controller', '/Error301Controller', array($uri))->activate(); |
215 | 215 | break; |
216 | 216 | case 303 : |
217 | - if(get_class($this) !== 'Error303Controller') |
|
217 | + if (get_class($this) !== 'Error303Controller') |
|
218 | 218 | Loader::loadNew('controller', '/Error303Controller', array($uri))->activate(); |
219 | 219 | break; |
220 | 220 | } |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | private $comment_errors; |
235 | 235 | protected function handle_comment_submit($site_id, $path, $redirect_url, $page_title) |
236 | 236 | { |
237 | - if(Request::hasPost() && Request::getPost('submit') == 'Submit Comment') |
|
237 | + if (Request::hasPost() && Request::getPost('submit') == 'Submit Comment') |
|
238 | 238 | { |
239 | 239 | $parameters = array($site_id, $path, $redirect_url, $page_title); |
240 | 240 | $this->comment_errors = Loader::loadNew('module', 'form/CommentSubmitModule', $parameters)->activate(); |
@@ -252,7 +252,7 @@ discard block |
||
252 | 252 | $comment_array = array(); |
253 | 253 | $comment_result = CommentCollector::getCommentsForURL($site, $path, $commenter->id); |
254 | 254 | |
255 | - foreach($comment_result as $comment) |
|
255 | + foreach ($comment_result as $comment) |
|
256 | 256 | { |
257 | 257 | $comment_object = new stdclass(); |
258 | 258 | $comment_object->id = $comment->id; |
@@ -262,12 +262,12 @@ discard block |
||
262 | 262 | $comment_object->url = $comment->url; |
263 | 263 | $comment_object->trusted = $comment->trusted; |
264 | 264 | |
265 | - if($comment->reply == 0 && Request::getPost('type') == $comment->id) |
|
265 | + if ($comment->reply == 0 && Request::getPost('type') == $comment->id) |
|
266 | 266 | $comment_object->errors = $this->comment_errors; |
267 | 267 | else |
268 | 268 | $comment_object->errors = array(); |
269 | 269 | |
270 | - if($comment->reply == 0) |
|
270 | + if ($comment->reply == 0) |
|
271 | 271 | { |
272 | 272 | $comment_object->replies = array(); |
273 | 273 | $comment_array[$comment->id] = $comment_object; |
@@ -298,21 +298,21 @@ discard block |
||
298 | 298 | $commenter->website = ''; |
299 | 299 | |
300 | 300 | $commenter_cookie = Cookie::instance('Commenter'); |
301 | - if(!$commenter_cookie->exists()) |
|
301 | + if (!$commenter_cookie->exists()) |
|
302 | 302 | return $commenter; |
303 | 303 | |
304 | 304 | $commenter_cookie_value = $commenter_cookie->getValue(); |
305 | 305 | $commenter_cookie_value = json_decode($commenter_cookie_value); |
306 | 306 | |
307 | - if($commenter_cookie_value === NULL) |
|
307 | + if ($commenter_cookie_value === NULL) |
|
308 | 308 | return $commenter; |
309 | 309 | |
310 | - if(!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) |
|
310 | + if (!isset($commenter_cookie_value->name) || !isset($commenter_cookie_value->email)) |
|
311 | 311 | return $commenter; |
312 | 312 | |
313 | 313 | $commenter_object = CommentCollector::getCommenterByFields($commenter_cookie_value->name, $commenter_cookie_value->email, (isset($commenter_cookie_value->website) ? $commenter_cookie_value->website : '')); |
314 | 314 | |
315 | - if($commenter_object === NULL) |
|
315 | + if ($commenter_object === NULL) |
|
316 | 316 | return $commenter; |
317 | 317 | |
318 | 318 | $commenter->id = $commenter_object->id; |
@@ -29,7 +29,7 @@ |
||
29 | 29 | { |
30 | 30 | parent::set_head_data(); |
31 | 31 | |
32 | - $this->set_title(self::$TITLE . ' | ' . self::$WEBSITE_TITLE); |
|
32 | + $this->set_title(self::$TITLE.' | '.self::$WEBSITE_TITLE); |
|
33 | 33 | $this->set_description(self::$DESCRIPTION); |
34 | 34 | $this->set_keywords(self::$KEYWORD_ARRAY); |
35 | 35 | } |
@@ -20,14 +20,14 @@ discard block |
||
20 | 20 | $this->offset = ($this->page - 1) * $this->get_item_count_per_page(); |
21 | 21 | |
22 | 22 | $items = $this->get_items(); |
23 | - if(count($items) < 1) |
|
23 | + if (count($items) < 1) |
|
24 | 24 | $this->eject(); |
25 | 25 | } |
26 | 26 | |
27 | 27 | final protected function get_page_number() |
28 | 28 | { |
29 | 29 | $page = $this->get_page_number_piece(); |
30 | - if(isset($page) && is_numeric($page)) |
|
30 | + if (isset($page) && is_numeric($page)) |
|
31 | 31 | return $page; |
32 | 32 | return 1; |
33 | 33 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | |
42 | 42 | final private function get_introduction() |
43 | 43 | { |
44 | - if($this->page == 1) |
|
44 | + if ($this->page == 1) |
|
45 | 45 | return $this->get_initial_introduction(); |
46 | 46 | |
47 | 47 | return $this->get_subsequent_introduction(); |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | private $items; |
54 | 54 | protected function get_items() |
55 | 55 | { |
56 | - if(!isset($this->items)) |
|
56 | + if (!isset($this->items)) |
|
57 | 57 | { |
58 | 58 | $total = $this->get_item_count_per_page(); |
59 | 59 | $offset = ($this->page - 1) * $this->get_item_count_per_page(); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | private $item_count; |
69 | 69 | final private function get_item_count() |
70 | 70 | { |
71 | - if(!isset($this->item_count)) |
|
71 | + if (!isset($this->item_count)) |
|
72 | 72 | $this->item_count = $this->get_item_count_result(); |
73 | 73 | return $this->item_count; |
74 | 74 | } |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | $this->set_head('next_link', $this->get_list_next_link()); |
83 | 83 | $this->set_head('previous_link', $this->get_list_prev_link()); |
84 | 84 | |
85 | - if($this->page == 1) |
|
85 | + if ($this->page == 1) |
|
86 | 86 | $meta_array = $this->get_initial_meta(); |
87 | 87 | else |
88 | 88 | $meta_array = $this->get_subsequent_meta(); |
@@ -119,18 +119,18 @@ discard block |
||
119 | 119 | |
120 | 120 | final private function get_list_prev_link() |
121 | 121 | { |
122 | - if($this->page == 1) |
|
122 | + if ($this->page == 1) |
|
123 | 123 | return; |
124 | - if($this->page == 2) |
|
124 | + if ($this->page == 2) |
|
125 | 125 | return $this->get_list_link_root(); |
126 | - return $this->get_list_link_root() . ($this->page - 1) . '/'; |
|
126 | + return $this->get_list_link_root().($this->page - 1).'/'; |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | final private function get_list_next_link() |
130 | 130 | { |
131 | - if(($this->page * $this->get_item_count_per_page()) >= $this->get_item_count()) |
|
131 | + if (($this->page * $this->get_item_count_per_page()) >= $this->get_item_count()) |
|
132 | 132 | return; |
133 | - return $this->get_list_link_root() . ($this->page + 1) . '/'; |
|
133 | + return $this->get_list_link_root().($this->page + 1).'/'; |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | abstract protected function get_list_link_root(); |
@@ -139,30 +139,30 @@ discard block |
||
139 | 139 | { |
140 | 140 | $link_array = array(); |
141 | 141 | |
142 | - if($this->get_item_count_per_page() >= $this->get_item_count()) |
|
142 | + if ($this->get_item_count_per_page() >= $this->get_item_count()) |
|
143 | 143 | return $link_array; |
144 | 144 | |
145 | 145 | $link = new stdclass(); |
146 | 146 | $link->anchor = '« previous'; |
147 | - if($this->get_list_prev_link() !== null) |
|
147 | + if ($this->get_list_prev_link() !== null) |
|
148 | 148 | $link->uri = $this->get_list_prev_link(); |
149 | 149 | else |
150 | 150 | $link->class = 'inactive'; |
151 | 151 | $link_array[] = $link; |
152 | 152 | |
153 | - for($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++) |
|
153 | + for ($i = 1; $i <= ceil($this->get_item_count() / $this->get_item_count_per_page()); $i++) |
|
154 | 154 | { |
155 | 155 | $link = new stdclass(); |
156 | 156 | $link->anchor = $i; |
157 | 157 | |
158 | - if($i == $this->page) |
|
158 | + if ($i == $this->page) |
|
159 | 159 | $link->class = 'current'; |
160 | 160 | else |
161 | 161 | { |
162 | - if($i == 1) |
|
162 | + if ($i == 1) |
|
163 | 163 | $link->uri = $this->get_list_link_root(); |
164 | 164 | else |
165 | - $link->uri = $this->get_list_link_root() . $i . '/'; |
|
165 | + $link->uri = $this->get_list_link_root().$i.'/'; |
|
166 | 166 | } |
167 | 167 | |
168 | 168 | $link_array[] = $link; |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | |
171 | 171 | $link = new stdclass(); |
172 | 172 | $link->anchor = 'next »'; |
173 | - if($this->get_list_next_link() !== null) |
|
173 | + if ($this->get_list_next_link() !== null) |
|
174 | 174 | $link->uri = $this->get_list_next_link(); |
175 | 175 | else |
176 | 176 | $link->class = 'inactive'; |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | |
193 | 193 | final protected function get_image_element($category, $path, $description, $size = 'small') |
194 | 194 | { |
195 | - switch($size) |
|
195 | + switch ($size) |
|
196 | 196 | { |
197 | 197 | case 'medium' : |
198 | 198 | $height = 375; |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $log_path = URLDecode::getPiece(2); |
26 | 26 | |
27 | 27 | $this->log = LogCollector::getByAlias($log_path); |
28 | - if(!$this->log) |
|
28 | + if (!$this->log) |
|
29 | 29 | $this->eject(); |
30 | 30 | |
31 | 31 | $this->parent_navigation_item = 'journal'; |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $this->handle_comment_submit( |
34 | 34 | self::$WATERFALL_SITE_ID, |
35 | 35 | $this->log->alias, |
36 | - Loader::getRootUrl('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/', |
|
36 | + Loader::getRootUrl('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$this->log->alias.'/', |
|
37 | 37 | $this->log->title); |
38 | 38 | |
39 | 39 | $this->add_waterfall_js(); |
@@ -43,12 +43,12 @@ discard block |
||
43 | 43 | { |
44 | 44 | parent::set_head_data(); |
45 | 45 | |
46 | - $this->set_title("{$this->log->title} | " . self::$WEBSITE_TITLE); |
|
46 | + $this->set_title("{$this->log->title} | ".self::$WEBSITE_TITLE); |
|
47 | 47 | $this->set_description($this->log->introduction); |
48 | 48 | |
49 | 49 | $keyword_array = array(); |
50 | 50 | $tag_result = LogCollector::getTagListForLog($this->log->id); |
51 | - foreach($tag_result as $tag) |
|
51 | + foreach ($tag_result as $tag) |
|
52 | 52 | { |
53 | 53 | $keyword_array[] = $tag->name; |
54 | 54 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | $formatted_log['introduction'] = $this->get_log_introduction($this->log); |
79 | 79 | $formatted_log['title'] = $this->log->title; |
80 | - $formatted_log['url'] = Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $this->log->alias . '/'; |
|
80 | + $formatted_log['url'] = Loader::getRootURL('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$this->log->alias.'/'; |
|
81 | 81 | |
82 | 82 | $formatted_log['body'] = $this->get_formatted_log_body(); |
83 | 83 | |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | { |
89 | 89 | return array( |
90 | 90 | 'title' => $log->title, |
91 | - 'url' => Loader::getRootURL('waterfalls') . self::$JOURNAL_DIRECTORY . '/' . $log->alias . '/', |
|
91 | + 'url' => Loader::getRootURL('waterfalls').self::$JOURNAL_DIRECTORY.'/'.$log->alias.'/', |
|
92 | 92 | 'date' => $this->get_parsed_date($log->date), |
93 | 93 | 'publish_date' => $this->get_parsed_date($log->publish_date), |
94 | 94 | 'introduction' => $log->introduction, |
@@ -120,19 +120,19 @@ discard block |
||
120 | 120 | 'next' => array()); |
121 | 121 | |
122 | 122 | $previous_log = LogCollector::getPreviousLog($this->log->id); |
123 | - if($previous_log != false) |
|
123 | + if ($previous_log != false) |
|
124 | 124 | { |
125 | 125 | $series['previous'] = (object) array( |
126 | - 'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $previous_log->alias . '/', |
|
126 | + 'path' => '/'.self::$JOURNAL_DIRECTORY.'/'.$previous_log->alias.'/', |
|
127 | 127 | 'title' => $previous_log->title, |
128 | 128 | 'date' => $previous_log->date); |
129 | 129 | } |
130 | 130 | |
131 | 131 | $next_log = LogCollector::getNextLog($this->log->id); |
132 | - if($next_log != false) |
|
132 | + if ($next_log != false) |
|
133 | 133 | { |
134 | 134 | $series['next'] = (object) array( |
135 | - 'path' => '/' . self::$JOURNAL_DIRECTORY . '/' . $next_log->alias . '/', |
|
135 | + 'path' => '/'.self::$JOURNAL_DIRECTORY.'/'.$next_log->alias.'/', |
|
136 | 136 | 'title' => $next_log->title, |
137 | 137 | 'date' => $next_log->date); |
138 | 138 | } |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | $sidebar['companion_list'] = array(); |
148 | 148 | $companions = LogCollector::getCompanionListForLog($this->log->id); |
149 | - foreach($companions as $companion) |
|
149 | + foreach ($companions as $companion) |
|
150 | 150 | { |
151 | 151 | $sidebar['companion_list'][] = (object) array( |
152 | 152 | 'title' => $companion->name, |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | |
156 | 156 | $sidebar['tag_list'] = array(); |
157 | 157 | $tags = LogCollector::getTagListForLog($this->log->id); |
158 | - foreach($tags as $tag) |
|
158 | + foreach ($tags as $tag) |
|
159 | 159 | { |
160 | 160 | $sidebar['tag_list'][] = (object) array( |
161 | 161 | 'title' => $tag->name, |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | |
165 | 165 | $sidebar['waterfall_list'] = array(); |
166 | 166 | $waterfalls = LogCollector::getWaterfallListForLog($this->log->id); |
167 | - foreach($waterfalls as $waterfall) |
|
167 | + foreach ($waterfalls as $waterfall) |
|
168 | 168 | { |
169 | 169 | $sidebar['waterfall_list'][] = (object) array( |
170 | 170 | 'title' => $waterfall->name, |
@@ -178,17 +178,17 @@ discard block |
||
178 | 178 | { |
179 | 179 | $album = array(); |
180 | 180 | |
181 | - if($this->log->album == 0) |
|
181 | + if ($this->log->album == 0) |
|
182 | 182 | return $album; |
183 | 183 | |
184 | 184 | $photo_list = AlbumCollector::getPhotoListForAlbum($this->log->album); |
185 | - foreach($photo_list as $photo) |
|
185 | + foreach ($photo_list as $photo) |
|
186 | 186 | { |
187 | 187 | $photo_array = array(); |
188 | 188 | $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name); |
189 | 189 | $photo_array['description'] = $photo->description; |
190 | 190 | |
191 | - if($photo->height < $photo->width) |
|
191 | + if ($photo->height < $photo->width) |
|
192 | 192 | list($height, $width) = array(75, 100); |
193 | 193 | else |
194 | 194 | list($height, $width) = array(100, 75); |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $this->handle_comment_submit( |
34 | 34 | self::$WATERFALL_SITE_ID, |
35 | 35 | "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}", |
36 | - Loader::getRootUrl('waterfalls') . "{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/", |
|
36 | + Loader::getRootUrl('waterfalls')."{$this->waterfall->watercourse_alias}/{$this->waterfall->alias}/", |
|
37 | 37 | $this->waterfall->name); |
38 | 38 | |
39 | 39 | $this->add_waterfall_js(); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | { |
44 | 44 | parent::set_head_data(); |
45 | 45 | |
46 | - $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | " . self::$WEBSITE_TITLE); |
|
46 | + $this->set_title("{$this->waterfall->name} on {$this->waterfall->watercourse} | ".self::$WEBSITE_TITLE); |
|
47 | 47 | $this->set_description($this->waterfall->description); |
48 | 48 | $this->set_keywords((array) $this->waterfall->name); |
49 | 49 | } |
@@ -112,17 +112,17 @@ discard block |
||
112 | 112 | { |
113 | 113 | $album = array(); |
114 | 114 | |
115 | - if($this->waterfall->album == 0) |
|
115 | + if ($this->waterfall->album == 0) |
|
116 | 116 | return $album; |
117 | 117 | |
118 | 118 | $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album); |
119 | - foreach($photo_list as $photo) |
|
119 | + foreach ($photo_list as $photo) |
|
120 | 120 | { |
121 | 121 | $photo_array = array(); |
122 | 122 | $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name); |
123 | 123 | $photo_array['description'] = $photo->description; |
124 | 124 | |
125 | - if($photo->height < $photo->width) |
|
125 | + if ($photo->height < $photo->width) |
|
126 | 126 | list($height, $width) = array(75, 100); |
127 | 127 | else |
128 | 128 | list($height, $width) = array(100, 75); |
@@ -147,14 +147,14 @@ discard block |
||
147 | 147 | $sidebar_data['name'] = $waterfall->name; |
148 | 148 | $sidebar_data['watercourse'] = $waterfall->watercourse; |
149 | 149 | $sidebar_data['main_watercourse'] = $this->get_main_watercourse($waterfall->watercourse_alias); |
150 | - $sidebar_data['rating_display'] = ($waterfall->rating / 2) . '/5'; |
|
150 | + $sidebar_data['rating_display'] = ($waterfall->rating / 2).'/5'; |
|
151 | 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 ( |
|
157 | + $sidebar_data['county'] = (object) array( |
|
158 | 158 | 'name' => $waterfall->county, |
159 | 159 | 'alias' => $waterfall->county_alias, |
160 | 160 | 'title' => $waterfall->county_title, |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $path = URLDecode::getPiece(1); |
29 | 29 | $this->county = CountyCollector::getByAlias($path); |
30 | 30 | |
31 | - if(!$this->county) |
|
31 | + if (!$this->county) |
|
32 | 32 | $this->eject(); |
33 | 33 | |
34 | 34 | parent::__construct(); |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | { |
39 | 39 | $meta_array = array(); |
40 | 40 | |
41 | - $meta_array['title'] = "{$this->county->name} Waterfalls | " . self::$WEBSITE_TITLE; |
|
41 | + $meta_array['title'] = "{$this->county->name} Waterfalls | ".self::$WEBSITE_TITLE; |
|
42 | 42 | $meta_array['description'] = $this->county->description; |
43 | 43 | $meta_array['keywords'] = $this->get_keyword_array(); |
44 | 44 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | { |
50 | 50 | $meta_array = array(); |
51 | 51 | |
52 | - $meta_array['title'] = sprintf(self::$DEFAULT_TITLE . ' | ' . self::$WEBSITE_TITLE, $this->county->name, $this->page, $this->page_count); |
|
52 | + $meta_array['title'] = sprintf(self::$DEFAULT_TITLE.' | '.self::$WEBSITE_TITLE, $this->county->name, $this->page, $this->page_count); |
|
53 | 53 | $meta_array['description'] = sprintf(self::$DEFAULT_DESCRIPTION, $this->page, $this->page_count, $this->county->name); |
54 | 54 | $meta_array['keywords'] = $this->get_keyword_array(); |
55 | 55 |
@@ -33,16 +33,16 @@ discard block |
||
33 | 33 | |
34 | 34 | private function process_form() |
35 | 35 | { |
36 | - if(!Request::hasPost() || Request::getPost('submit') != 'Send Message!') |
|
36 | + if (!Request::hasPost() || Request::getPost('submit') != 'Send Message!') |
|
37 | 37 | return (object) array('display' => 'normal'); |
38 | 38 | |
39 | 39 | Loader::load('utility', 'Validate'); |
40 | 40 | $error_result = array(); |
41 | - if(!Validate::checkRequest('post', 'name', 'string')) |
|
41 | + if (!Validate::checkRequest('post', 'name', 'string')) |
|
42 | 42 | $error_result['name'] = 'please enter your name'; |
43 | - if(!Validate::checkRequest('post', 'email', 'string')) |
|
43 | + if (!Validate::checkRequest('post', 'email', 'string')) |
|
44 | 44 | $error_result['email'] = 'please enter a valid email'; |
45 | - if(!Validate::checkRequest('post', 'message', 'string')) |
|
45 | + if (!Validate::checkRequest('post', 'message', 'string')) |
|
46 | 46 | $error_result['message'] = 'please write a message'; |
47 | 47 | |
48 | 48 | $values = (object) array( |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | 'email' => Request::getPost('email'), |
51 | 51 | 'message' => Request::getPost('message')); |
52 | 52 | |
53 | - if(count($error_result) > 0) |
|
53 | + if (count($error_result) > 0) |
|
54 | 54 | { |
55 | 55 | return (object) array( |
56 | 56 | 'display' => 'error', |
@@ -63,8 +63,8 @@ discard block |
||
63 | 63 | ->addTo($container['config']->admin_email) |
64 | 64 | ->setSubject('Waterfall Site Contact') |
65 | 65 | ->setPlainMessage( |
66 | - "Name: {$values->name}\n" . |
|
67 | - "Email: {$values->email}\n" . |
|
66 | + "Name: {$values->name}\n". |
|
67 | + "Email: {$values->email}\n". |
|
68 | 68 | "Message: {$values->message}" |
69 | 69 | ) |
70 | 70 | ->send(); |