@@ -95,9 +95,9 @@ discard block |
||
| 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 |
||
| 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(), |
@@ -6,62 +6,62 @@ |
||
| 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 | } |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | { |
| 35 | 35 | $query = URLDecode::getPiece(2); |
| 36 | 36 | $query = urldecode($query); |
| 37 | - $query = str_replace('-', ' ', $query); |
|
| 37 | + $query = str_replace('-', ' ', $query); |
|
| 38 | 38 | |
| 39 | 39 | $this->query = $query; |
| 40 | 40 | |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | |
| 48 | 48 | else |
| 49 | 49 | { |
| 50 | - global $config; |
|
| 50 | + global $config; |
|
| 51 | 51 | $mail = new Mail(); |
| 52 | 52 | $mail->setToAddress($config->admin_email, 'Jacob Emerick'); |
| 53 | 53 | $mail->setSubject('Portfolio Contact'); |
@@ -172,24 +172,24 @@ |
||
| 172 | 172 | } |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - $site = URLDecode::getSite(); |
|
| 175 | + $site = URLDecode::getSite(); |
|
| 176 | 176 | |
| 177 | - if ($site == 'blog') { |
|
| 178 | - $message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to [email protected] if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!"; |
|
| 179 | - } else if ($site == 'waterfalls') { |
|
| 180 | - $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to [email protected] if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!"; |
|
| 181 | - } |
|
| 177 | + if ($site == 'blog') { |
|
| 178 | + $message = "Hello!\nThere has been a new comment on the post '{$this->page_title}' at Jacob Emerick's Blog. You have chosen to be notified of it - please reply to [email protected] if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!"; |
|
| 179 | + } else if ($site == 'waterfalls') { |
|
| 180 | + $message = "Hello!\nThere has been a new comment on the page '{$this->page_title}' at Waterfalls of the Keweenaw. You have chosen to be notified of it - please reply to [email protected] if you would like to be removed from these notifications.\n\nOn " . date('F j, Y g:i a') . ", " . Request::getPost('name') . " commented...\n" . Request::getPost('comment') . "\n\nVisit {$this->full_path}#comments to see and reply to all the comments on this post.\nThank you!"; |
|
| 181 | + } |
|
| 182 | 182 | |
| 183 | 183 | foreach($email_recipient_array as $email_recipient) |
| 184 | 184 | { |
| 185 | 185 | $mail = new Mail(); |
| 186 | 186 | $mail->setToAddress($email_recipient['email'], $email_recipient['name']); |
| 187 | 187 | |
| 188 | - if ($site == 'blog') { |
|
| 189 | - $mail->setSubject("New Comment on Jacob Emerick's Blog"); |
|
| 190 | - } else if ($site == 'waterfalls') { |
|
| 191 | - $mail->setSubject("New Comment on Waterfalls of the Keweenaw"); |
|
| 192 | - } |
|
| 188 | + if ($site == 'blog') { |
|
| 189 | + $mail->setSubject("New Comment on Jacob Emerick's Blog"); |
|
| 190 | + } else if ($site == 'waterfalls') { |
|
| 191 | + $mail->setSubject("New Comment on Waterfalls of the Keweenaw"); |
|
| 192 | + } |
|
| 193 | 193 | |
| 194 | 194 | $mail->setMessage($message); |
| 195 | 195 | $mail->send(); |
@@ -16,17 +16,17 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | private function __construct($write_params, $read_params) |
| 18 | 18 | { |
| 19 | - $this->write_connection = $this->connect( |
|
| 20 | - $write_params->host, |
|
| 21 | - $write_params->user, |
|
| 22 | - $write_params->password |
|
| 23 | - ); |
|
| 24 | - |
|
| 25 | - $this->read_connection = $this->connect( |
|
| 26 | - $read_params->host, |
|
| 27 | - $read_params->user, |
|
| 28 | - $read_params->password |
|
| 29 | - ); |
|
| 19 | + $this->write_connection = $this->connect( |
|
| 20 | + $write_params->host, |
|
| 21 | + $write_params->user, |
|
| 22 | + $write_params->password |
|
| 23 | + ); |
|
| 24 | + |
|
| 25 | + $this->read_connection = $this->connect( |
|
| 26 | + $read_params->host, |
|
| 27 | + $read_params->user, |
|
| 28 | + $read_params->password |
|
| 29 | + ); |
|
| 30 | 30 | |
| 31 | 31 | return $this; |
| 32 | 32 | } |
@@ -45,12 +45,12 @@ discard block |
||
| 45 | 45 | public static function instance() |
| 46 | 46 | { |
| 47 | 47 | if(!isset(self::$instance)) { |
| 48 | - global $config; |
|
| 49 | - self::$instance = new Database( |
|
| 50 | - $config->database->master, |
|
| 51 | - $config->database->slave |
|
| 52 | - ); |
|
| 53 | - } |
|
| 48 | + global $config; |
|
| 49 | + self::$instance = new Database( |
|
| 50 | + $config->database->master, |
|
| 51 | + $config->database->slave |
|
| 52 | + ); |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | 55 | return self::$instance; |
| 56 | 56 | } |
@@ -22,10 +22,10 @@ |
||
| 22 | 22 | |
| 23 | 23 | protected function getDomain() |
| 24 | 24 | { |
| 25 | - $site = URLDecode::getSite(); |
|
| 26 | - if ($site == 'waterfalls' && Loader::isLive()) { |
|
| 27 | - return 'waterfallsofthekeweenaw.com'; |
|
| 28 | - } |
|
| 25 | + $site = URLDecode::getSite(); |
|
| 26 | + if ($site == 'waterfalls' && Loader::isLive()) { |
|
| 27 | + return 'waterfallsofthekeweenaw.com'; |
|
| 28 | + } |
|
| 29 | 29 | return self::$COOKIE_DOMAIN; |
| 30 | 30 | } |
| 31 | 31 | |
@@ -179,16 +179,16 @@ |
||
| 179 | 179 | return self::instance()->is_live; |
| 180 | 180 | } |
| 181 | 181 | |
| 182 | - public static function getRootURL($site = '') |
|
| 183 | - { |
|
| 184 | - if (strlen($site) > 0) { |
|
| 185 | - if ($site == 'waterfalls' && self::instance()->is_live) { |
|
| 186 | - return 'http://www.waterfallsofthekeweenaw.com/'; |
|
| 187 | - } else { |
|
| 188 | - return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/'; |
|
| 189 | - } |
|
| 190 | - } |
|
| 191 | - return '/'; |
|
| 192 | - } |
|
| 182 | + public static function getRootURL($site = '') |
|
| 183 | + { |
|
| 184 | + if (strlen($site) > 0) { |
|
| 185 | + if ($site == 'waterfalls' && self::instance()->is_live) { |
|
| 186 | + return 'http://www.waterfallsofthekeweenaw.com/'; |
|
| 187 | + } else { |
|
| 188 | + return 'http://' . (self::instance()->is_live ? '' : 'dev.') . $site . '.jacobemerick.com/'; |
|
| 189 | + } |
|
| 190 | + } |
|
| 191 | + return '/'; |
|
| 192 | + } |
|
| 193 | 193 | |
| 194 | 194 | } |
@@ -72,38 +72,38 @@ |
||
| 72 | 72 | |
| 73 | 73 | break; |
| 74 | 74 | case 'falls' : |
| 75 | - $pieces = explode('/', $uri); |
|
| 76 | - if (count($pieces) == 1) { |
|
| 77 | - Loader::load('collector', 'waterfall/WatercourseCollector'); |
|
| 78 | - list ($watercourse_alias) = $pieces; |
|
| 79 | - $watercourse = WatercourseCollector::getByAlias($watercourse_alias); |
|
| 75 | + $pieces = explode('/', $uri); |
|
| 76 | + if (count($pieces) == 1) { |
|
| 77 | + Loader::load('collector', 'waterfall/WatercourseCollector'); |
|
| 78 | + list ($watercourse_alias) = $pieces; |
|
| 79 | + $watercourse = WatercourseCollector::getByAlias($watercourse_alias); |
|
| 80 | 80 | |
| 81 | - if ($watercourse == null) { |
|
| 82 | - return; |
|
| 83 | - } |
|
| 81 | + if ($watercourse == null) { |
|
| 82 | + return; |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/'; |
|
| 86 | - $link .= "{$watercourse->alias}/"; |
|
| 85 | + $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/'; |
|
| 86 | + $link .= "{$watercourse->alias}/"; |
|
| 87 | 87 | |
| 88 | - if ($anchor == '') { |
|
| 89 | - $anchor = $watercourse->name; |
|
| 90 | - } |
|
| 91 | - } else if (count($pieces) == 2) { |
|
| 92 | - Loader::load('collector', 'waterfall/WaterfallCollector'); |
|
| 93 | - list ($watercourse_alias, $waterfall_alias) = $pieces; |
|
| 94 | - $waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias); |
|
| 88 | + if ($anchor == '') { |
|
| 89 | + $anchor = $watercourse->name; |
|
| 90 | + } |
|
| 91 | + } else if (count($pieces) == 2) { |
|
| 92 | + Loader::load('collector', 'waterfall/WaterfallCollector'); |
|
| 93 | + list ($watercourse_alias, $waterfall_alias) = $pieces; |
|
| 94 | + $waterfall = WaterfallCollector::getByAlias($watercourse_alias, $waterfall_alias); |
|
| 95 | 95 | |
| 96 | - if ($waterfall == null) { |
|
| 97 | - return; |
|
| 98 | - } |
|
| 96 | + if ($waterfall == null) { |
|
| 97 | + return; |
|
| 98 | + } |
|
| 99 | 99 | |
| 100 | - $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/'; |
|
| 101 | - $link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/"; |
|
| 100 | + $link .= ($is_absolute) ? Loader::getRootURL('waterfalls') : '/'; |
|
| 101 | + $link .= "{$waterfall->watercourse_alias}/{$waterfall->alias}/"; |
|
| 102 | 102 | |
| 103 | - if ($anchor == '') { |
|
| 104 | - $anchor = $waterfall->name; |
|
| 105 | - } |
|
| 106 | - } |
|
| 103 | + if ($anchor == '') { |
|
| 104 | + $anchor = $waterfall->name; |
|
| 105 | + } |
|
| 106 | + } |
|
| 107 | 107 | break; |
| 108 | 108 | default : |
| 109 | 109 | break; |