jacobemerick /
web
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | protected function get_page_number() |
| 28 | 28 | {
|
| 29 | 29 | $page = URLDecode::getPiece(2); |
| 30 | - if(isset($page) && is_numeric($page)) |
|
| 30 | + if (isset($page) && is_numeric($page)) |
|
| 31 | 31 | return $page; |
| 32 | 32 | return 1; |
| 33 | 33 | } |
@@ -27,8 +27,9 @@ |
||
| 27 | 27 | protected function get_page_number() |
| 28 | 28 | {
|
| 29 | 29 | $page = URLDecode::getPiece(2); |
| 30 | - if(isset($page) && is_numeric($page)) |
|
| 31 | - return $page; |
|
| 30 | + if(isset($page) && is_numeric($page)) {
|
|
| 31 | + return $page; |
|
| 32 | + } |
|
| 32 | 33 | return 1; |
| 33 | 34 | } |
| 34 | 35 | |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | $path = URLDecode::getPiece(1); |
| 30 | 30 | $this->watercourse = WatercourseCollector::getByAlias($path); |
| 31 | 31 | |
| 32 | - if(!$this->watercourse) |
|
| 32 | + if (!$this->watercourse) |
|
| 33 | 33 | $this->eject(); |
| 34 | 34 | |
| 35 | 35 | parent::__construct(); |
@@ -29,8 +29,9 @@ |
||
| 29 | 29 | $path = URLDecode::getPiece(1); |
| 30 | 30 | $this->watercourse = WatercourseCollector::getByAlias($path); |
| 31 | 31 | |
| 32 | - if(!$this->watercourse) |
|
| 33 | - $this->eject(); |
|
| 32 | + if(!$this->watercourse) {
|
|
| 33 | + $this->eject(); |
|
| 34 | + } |
|
| 34 | 35 | |
| 35 | 36 | parent::__construct(); |
| 36 | 37 | } |
@@ -1,231 +1,231 @@ |
||
| 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 |
@@ -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); |
@@ -154,7 +154,7 @@ discard block |
||
| 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, |
@@ -112,8 +112,9 @@ discard block |
||
| 112 | 112 | {
|
| 113 | 113 | $album = array(); |
| 114 | 114 | |
| 115 | - if($this->waterfall->album == 0) |
|
| 116 | - return $album; |
|
| 115 | + if($this->waterfall->album == 0) {
|
|
| 116 | + return $album; |
|
| 117 | + } |
|
| 117 | 118 | |
| 118 | 119 | $photo_list = AlbumCollector::getPhotoListForAlbum($this->waterfall->album); |
| 119 | 120 | foreach($photo_list as $photo) |
@@ -122,10 +123,11 @@ discard block |
||
| 122 | 123 | $photo_array['full_link'] = sprintf(self::$FULL_IMAGE_LINK, $photo->category, $photo->name); |
| 123 | 124 | $photo_array['description'] = $photo->description; |
| 124 | 125 | |
| 125 | - if($photo->height < $photo->width) |
|
| 126 | - list($height, $width) = array(75, 100); |
|
| 127 | - else |
|
| 128 | - list($height, $width) = array(100, 75); |
|
| 126 | + if($photo->height < $photo->width) {
|
|
| 127 | + list($height, $width) = array(75, 100); |
|
| 128 | + } else {
|
|
| 129 | + list($height, $width) = array(100, 75); |
|
| 130 | + } |
|
| 129 | 131 | |
| 130 | 132 | $photo_array['image_node'] = sprintf( |
| 131 | 133 | self::$THUMB_IMAGE_NODE, |
@@ -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(); |
@@ -26,15 +26,15 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | public function activate() |
| 28 | 28 | {
|
| 29 | - if(!Request::hasPost()) |
|
| 29 | + if (!Request::hasPost()) |
|
| 30 | 30 | return false; |
| 31 | - if(!Request::getPost('submit') == 'Submit Comment')
|
|
| 31 | + if (!Request::getPost('submit') == 'Submit Comment')
|
|
| 32 | 32 | return false; |
| 33 | 33 | |
| 34 | 34 | $errors = $this->fetch_errors(); |
| 35 | - if(count($errors) > 0) |
|
| 35 | + if (count($errors) > 0) |
|
| 36 | 36 | return $errors; |
| 37 | - if(Request::getPost('catch') !== '')
|
|
| 37 | + if (Request::getPost('catch') !== '')
|
|
| 38 | 38 | return false; |
| 39 | 39 | |
| 40 | 40 | $page_id = $this->save_comment_page(); |
@@ -50,17 +50,17 @@ discard block |
||
| 50 | 50 | private function fetch_errors() |
| 51 | 51 | {
|
| 52 | 52 | $errors = array(); |
| 53 | - if(!Validate::checkRequest('post', 'name', 'name'))
|
|
| 53 | + if (!Validate::checkRequest('post', 'name', 'name'))
|
|
| 54 | 54 | $errors['name'] = 'You must include a valid name'; |
| 55 | - if(!Validate::checkRequest('post', 'email', 'email'))
|
|
| 55 | + if (!Validate::checkRequest('post', 'email', 'email'))
|
|
| 56 | 56 | $errors['email'] = 'You must include a valid email'; |
| 57 | - if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
|
|
| 57 | + if (Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
|
|
| 58 | 58 | $errors['website'] = 'Please enter a valid website'; |
| 59 | - if(!Validate::checkRequest('post', 'comment', 'string'))
|
|
| 59 | + if (!Validate::checkRequest('post', 'comment', 'string'))
|
|
| 60 | 60 | $errors['comment'] = 'You must enter a comment'; |
| 61 | - if(Request::getPost('notify') && Request::getPost('notify') != 'check')
|
|
| 61 | + if (Request::getPost('notify') && Request::getPost('notify') != 'check')
|
|
| 62 | 62 | $errors['notify'] = 'You entered an invalid notify request'; |
| 63 | - if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
|
|
| 63 | + if (Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
|
|
| 64 | 64 | $errors['reply'] = 'You entered an invalid reply request'; |
| 65 | 65 | |
| 66 | 66 | return $errors; |
@@ -69,7 +69,7 @@ discard block |
||
| 69 | 69 | private function save_comment_page() |
| 70 | 70 | {
|
| 71 | 71 | $page_result = CommentCollector::getCommentPageByURL($this->path, $this->site); |
| 72 | - if($page_result !== null) |
|
| 72 | + if ($page_result !== null) |
|
| 73 | 73 | return $page_result->id; |
| 74 | 74 | |
| 75 | 75 | $query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";
|
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | 'name' => Request::getPost('name'),
|
| 86 | 86 | 'email' => Request::getPost('email'));
|
| 87 | 87 | |
| 88 | - if(Request::getPost('website') != '')
|
|
| 88 | + if (Request::getPost('website') != '')
|
|
| 89 | 89 | $cookie_value['website'] = Request::getPost('website');
|
| 90 | 90 | |
| 91 | 91 | $cookie_value = json_encode($cookie_value); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | ->save(); |
| 96 | 96 | |
| 97 | 97 | $commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
|
| 98 | - if($commenter_result !== null) |
|
| 98 | + if ($commenter_result !== null) |
|
| 99 | 99 | return $commenter_result->id; |
| 100 | 100 | |
| 101 | 101 | $query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";
|
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | private function save_comment() |
| 113 | 113 | {
|
| 114 | 114 | $comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));
|
| 115 | - if($comment_result !== null) |
|
| 115 | + if ($comment_result !== null) |
|
| 116 | 116 | return $comment_result->id; |
| 117 | 117 | |
| 118 | 118 | $query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";
|
@@ -133,7 +133,7 @@ discard block |
||
| 133 | 133 | $query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
|
| 134 | 134 | |
| 135 | 135 | $reply = Database::escape(Request::getPost('type'));
|
| 136 | - if($reply == 'new') |
|
| 136 | + if ($reply == 'new') |
|
| 137 | 137 | $reply = 0; |
| 138 | 138 | // else check to make sure value is legit |
| 139 | 139 | |
@@ -157,13 +157,13 @@ discard block |
||
| 157 | 157 | |
| 158 | 158 | $commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
|
| 159 | 159 | |
| 160 | - if($commenter_result->trusted == 1) |
|
| 160 | + if ($commenter_result->trusted == 1) |
|
| 161 | 161 | {
|
| 162 | 162 | $notification_result = CommentCollector::getNotificationForPage($page); |
| 163 | 163 | |
| 164 | - foreach($notification_result as $notification_row) |
|
| 164 | + foreach ($notification_result as $notification_row) |
|
| 165 | 165 | {
|
| 166 | - if($notification_row->email == Request::getPost('email'))
|
|
| 166 | + if ($notification_row->email == Request::getPost('email'))
|
|
| 167 | 167 | continue; |
| 168 | 168 | |
| 169 | 169 | $email_recipient_array[$notification_row->email] = array( |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 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 | 181 | } |
| 182 | 182 | |
| 183 | - foreach($email_recipient_array as $email_recipient) |
|
| 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']); |
@@ -26,16 +26,20 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | public function activate() |
| 28 | 28 | {
|
| 29 | - if(!Request::hasPost()) |
|
| 30 | - return false; |
|
| 31 | - if(!Request::getPost('submit') == 'Submit Comment')
|
|
| 32 | - return false; |
|
| 29 | + if(!Request::hasPost()) {
|
|
| 30 | + return false; |
|
| 31 | + } |
|
| 32 | + if(!Request::getPost('submit') == 'Submit Comment') {
|
|
| 33 | + return false; |
|
| 34 | + } |
|
| 33 | 35 | |
| 34 | 36 | $errors = $this->fetch_errors(); |
| 35 | - if(count($errors) > 0) |
|
| 36 | - return $errors; |
|
| 37 | - if(Request::getPost('catch') !== '')
|
|
| 38 | - return false; |
|
| 37 | + if(count($errors) > 0) {
|
|
| 38 | + return $errors; |
|
| 39 | + } |
|
| 40 | + if(Request::getPost('catch') !== '') {
|
|
| 41 | + return false; |
|
| 42 | + } |
|
| 39 | 43 | |
| 40 | 44 | $page_id = $this->save_comment_page(); |
| 41 | 45 | $commenter_id = $this->save_commenter(); |
@@ -50,18 +54,24 @@ discard block |
||
| 50 | 54 | private function fetch_errors() |
| 51 | 55 | {
|
| 52 | 56 | $errors = array(); |
| 53 | - if(!Validate::checkRequest('post', 'name', 'name'))
|
|
| 54 | - $errors['name'] = 'You must include a valid name'; |
|
| 55 | - if(!Validate::checkRequest('post', 'email', 'email'))
|
|
| 56 | - $errors['email'] = 'You must include a valid email'; |
|
| 57 | - if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url'))
|
|
| 58 | - $errors['website'] = 'Please enter a valid website'; |
|
| 59 | - if(!Validate::checkRequest('post', 'comment', 'string'))
|
|
| 60 | - $errors['comment'] = 'You must enter a comment'; |
|
| 61 | - if(Request::getPost('notify') && Request::getPost('notify') != 'check')
|
|
| 62 | - $errors['notify'] = 'You entered an invalid notify request'; |
|
| 63 | - if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer'))
|
|
| 64 | - $errors['reply'] = 'You entered an invalid reply request'; |
|
| 57 | + if(!Validate::checkRequest('post', 'name', 'name')) {
|
|
| 58 | + $errors['name'] = 'You must include a valid name'; |
|
| 59 | + } |
|
| 60 | + if(!Validate::checkRequest('post', 'email', 'email')) {
|
|
| 61 | + $errors['email'] = 'You must include a valid email'; |
|
| 62 | + } |
|
| 63 | + if(Request::getPost('website') && !Validate::checkRequest('post', 'website', 'url')) {
|
|
| 64 | + $errors['website'] = 'Please enter a valid website'; |
|
| 65 | + } |
|
| 66 | + if(!Validate::checkRequest('post', 'comment', 'string')) {
|
|
| 67 | + $errors['comment'] = 'You must enter a comment'; |
|
| 68 | + } |
|
| 69 | + if(Request::getPost('notify') && Request::getPost('notify') != 'check') {
|
|
| 70 | + $errors['notify'] = 'You entered an invalid notify request'; |
|
| 71 | + } |
|
| 72 | + if(Request::getPost('reply') && !Validate::checkRequest('post', 'reply', 'integer')) {
|
|
| 73 | + $errors['reply'] = 'You entered an invalid reply request'; |
|
| 74 | + } |
|
| 65 | 75 | |
| 66 | 76 | return $errors; |
| 67 | 77 | } |
@@ -69,8 +79,9 @@ discard block |
||
| 69 | 79 | private function save_comment_page() |
| 70 | 80 | {
|
| 71 | 81 | $page_result = CommentCollector::getCommentPageByURL($this->path, $this->site); |
| 72 | - if($page_result !== null) |
|
| 73 | - return $page_result->id; |
|
| 82 | + if($page_result !== null) {
|
|
| 83 | + return $page_result->id; |
|
| 84 | + } |
|
| 74 | 85 | |
| 75 | 86 | $query = "INSERT INTO `jpemeric_comment`.`comment_page` (`site`, `path`) VALUES ('%d', '%s')";
|
| 76 | 87 | $query = sprintf($query, $this->site, $this->path); |
@@ -85,8 +96,9 @@ discard block |
||
| 85 | 96 | 'name' => Request::getPost('name'),
|
| 86 | 97 | 'email' => Request::getPost('email'));
|
| 87 | 98 | |
| 88 | - if(Request::getPost('website') != '')
|
|
| 89 | - $cookie_value['website'] = Request::getPost('website');
|
|
| 99 | + if(Request::getPost('website') != '') {
|
|
| 100 | + $cookie_value['website'] = Request::getPost('website');
|
|
| 101 | + } |
|
| 90 | 102 | |
| 91 | 103 | $cookie_value = json_encode($cookie_value); |
| 92 | 104 | |
@@ -95,8 +107,9 @@ discard block |
||
| 95 | 107 | ->save(); |
| 96 | 108 | |
| 97 | 109 | $commenter_result = CommentCollector::getCommenterByFields(Request::getPost('name'), Request::getPost('email'), Request::getPost('website'));
|
| 98 | - if($commenter_result !== null) |
|
| 99 | - return $commenter_result->id; |
|
| 110 | + if($commenter_result !== null) {
|
|
| 111 | + return $commenter_result->id; |
|
| 112 | + } |
|
| 100 | 113 | |
| 101 | 114 | $query = "INSERT INTO `jpemeric_comment`.`commenter` (`name`,`email`,`url`) VALUES ('%s','%s','%s')";
|
| 102 | 115 | |
@@ -112,8 +125,9 @@ discard block |
||
| 112 | 125 | private function save_comment() |
| 113 | 126 | {
|
| 114 | 127 | $comment_result = CommentCollector::getCommentByBody(Request::getPost('comment'));
|
| 115 | - if($comment_result !== null) |
|
| 116 | - return $comment_result->id; |
|
| 128 | + if($comment_result !== null) {
|
|
| 129 | + return $comment_result->id; |
|
| 130 | + } |
|
| 117 | 131 | |
| 118 | 132 | $query = "INSERT INTO `jpemeric_comment`.`comment` (`body`, `body_format`) VALUES ('%s', '%s')";
|
| 119 | 133 | |
@@ -133,8 +147,9 @@ discard block |
||
| 133 | 147 | $query = "INSERT INTO `jpemeric_comment`.`comment_meta` (`commenter`,`comment`,`reply`,`notify`,`comment_page`,`date`,`display`) VALUES ('%d','%d','%d','%d','%d','%s','%d')";
|
| 134 | 148 | |
| 135 | 149 | $reply = Database::escape(Request::getPost('type'));
|
| 136 | - if($reply == 'new') |
|
| 137 | - $reply = 0; |
|
| 150 | + if($reply == 'new') {
|
|
| 151 | + $reply = 0; |
|
| 152 | + } |
|
| 138 | 153 | // else check to make sure value is legit |
| 139 | 154 | |
| 140 | 155 | $notify = (Request::getPost('notify') == 'check') ? 1 : 0;
|
@@ -163,8 +178,9 @@ discard block |
||
| 163 | 178 | |
| 164 | 179 | foreach($notification_result as $notification_row) |
| 165 | 180 | {
|
| 166 | - if($notification_row->email == Request::getPost('email'))
|
|
| 167 | - continue; |
|
| 181 | + if($notification_row->email == Request::getPost('email')) {
|
|
| 182 | + continue; |
|
| 183 | + } |
|
| 168 | 184 | |
| 169 | 185 | $email_recipient_array[$notification_row->email] = array( |
| 170 | 186 | 'email' => $notification_row->email, |
@@ -45,11 +45,11 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | protected function check_for_special_redirect($uri) |
| 47 | 47 | {
|
| 48 | - if(preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
|
|
| 48 | + if (preg_match('@^/post_([0-9]{4}-[0-9]{2}-[0-9]{2})_([a-z0-9-]+)(/?)$@', $uri, $matches))
|
|
| 49 | 49 | {
|
| 50 | 50 | Loader::load('collector', 'blog/PostCollector');
|
| 51 | 51 | $post = PostCollector::getPostByURI($matches[2]); |
| 52 | - if(!$post) |
|
| 52 | + if (!$post) |
|
| 53 | 53 | {
|
| 54 | 54 | Loader::loadNew('controller', '/Error404Controller')
|
| 55 | 55 | ->activate(); |
@@ -61,21 +61,21 @@ discard block |
||
| 61 | 61 | else |
| 62 | 62 | {
|
| 63 | 63 | $post_uri = URLDecode::getPiece(1); |
| 64 | - if($post_uri !== null) |
|
| 64 | + if ($post_uri !== null) |
|
| 65 | 65 | {
|
| 66 | 66 | Loader::load('collector', 'blog/PostCollector');
|
| 67 | 67 | $post = PostCollector::getPostByURI($post_uri); |
| 68 | 68 | |
| 69 | - if($post != false) |
|
| 69 | + if ($post != false) |
|
| 70 | 70 | {
|
| 71 | 71 | Loader::load('utility', 'Content');
|
| 72 | 72 | $uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
|
| 73 | 73 | } |
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | - if($uri == '/search/') |
|
| 76 | + if ($uri == '/search/') |
|
| 77 | 77 | {
|
| 78 | - if(Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
|
|
| 78 | + if (Request::getGet('submit') == 'Submit Search' && Request::getGet('search'))
|
|
| 79 | 79 | {
|
| 80 | 80 | $uri .= Request::getGet('search');
|
| 81 | 81 | $uri .= '/'; |
@@ -57,8 +57,7 @@ |
||
| 57 | 57 | |
| 58 | 58 | Loader::load('utility', 'Content');
|
| 59 | 59 | $uri = Content::instance('URLSafe', "/{$post->category}/{$post->title_url}/")->activate();
|
| 60 | - } |
|
| 61 | - else |
|
| 60 | + } else |
|
| 62 | 61 | {
|
| 63 | 62 | $post_uri = URLDecode::getPiece(1); |
| 64 | 63 | if($post_uri !== null) |
@@ -27,12 +27,12 @@ |
||
| 27 | 27 | |
| 28 | 28 | protected function check_for_special_redirect($uri) |
| 29 | 29 | {
|
| 30 | - if(preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))
|
|
| 30 | + if (preg_match('@^/piece/([a-z0-9-]+)(/?)$@', $uri, $matches))
|
|
| 31 | 31 | {
|
| 32 | 32 | Loader::load('collector', 'portfolio/PortfolioCollector');
|
| 33 | 33 | $piece = PortfolioCollector::getPieceByURI($matches[1]); |
| 34 | 34 | |
| 35 | - if($piece === null) |
|
| 35 | + if ($piece === null) |
|
| 36 | 36 | {
|
| 37 | 37 | Loader::loadNew('controller', '/Error404Controller')
|
| 38 | 38 | ->activate(); |
@@ -96,9 +96,9 @@ discard block |
||
| 96 | 96 | if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
| 97 | 97 | $redirect_uri .= '/'; |
| 98 | 98 | |
| 99 | - if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
|
|
| 100 | - $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
|
| 101 | - } |
|
| 99 | + if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
|
|
| 100 | + $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | 103 | if($redirect_uri == URLDecode::getURI()) |
| 104 | 104 | return; |
@@ -129,8 +129,8 @@ discard block |
||
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | $image = new ImageOld($file); |
| 132 | - if(!$image->isValid()) {
|
|
| 133 | - Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 132 | + if(!$image->isValid()) {
|
|
| 133 | + Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 134 | 134 | exit(); |
| 135 | 135 | } |
| 136 | 136 | } |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | URLDecode::getExtension() != 'jpg' && |
| 202 | 202 | URLDecode::getExtension() != 'png' && |
| 203 | 203 | URLDecode::getExtension() != 'ico' && |
| 204 | - strstr(URLDecode::getURI(), '#') === false); |
|
| 204 | + strstr(URLDecode::getURI(), '#') === false); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | } |
@@ -19,26 +19,26 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | private static function get_router_name() |
| 21 | 21 | {
|
| 22 | - if(Request::isAJAX()) |
|
| 22 | + if (Request::isAJAX()) |
|
| 23 | 23 | return 'AJAXRouter'; |
| 24 | - if(URLDecode::getURI() == '/robots.txt') |
|
| 24 | + if (URLDecode::getURI() == '/robots.txt') |
|
| 25 | 25 | return 'RobotRouter'; |
| 26 | - if(URLDecode::getURI() == '/sitemap.xml') |
|
| 26 | + if (URLDecode::getURI() == '/sitemap.xml') |
|
| 27 | 27 | return 'SitemapRouter'; |
| 28 | - if(URLDecode::getURI() == '/rss/') |
|
| 28 | + if (URLDecode::getURI() == '/rss/') |
|
| 29 | 29 | return 'RSSRouter'; |
| 30 | - if(URLDecode::getExtension() == 'css') |
|
| 30 | + if (URLDecode::getExtension() == 'css') |
|
| 31 | 31 | return 'StyleRouter'; |
| 32 | - if(URLDecode::getExtension() == 'js') |
|
| 32 | + if (URLDecode::getExtension() == 'js') |
|
| 33 | 33 | return 'ScriptRouter'; |
| 34 | - if(URLDecode::getExtension() == 'ico') |
|
| 34 | + if (URLDecode::getExtension() == 'ico') |
|
| 35 | 35 | return 'ImageRouter'; |
| 36 | - if(URLDecode::getExtension() == 'jpg') |
|
| 36 | + if (URLDecode::getExtension() == 'jpg') |
|
| 37 | 37 | return 'ImageRouter'; |
| 38 | - if(URLDecode::getExtension() == 'png') |
|
| 38 | + if (URLDecode::getExtension() == 'png') |
|
| 39 | 39 | return 'ImageRouter'; |
| 40 | 40 | |
| 41 | - switch(URLDecode::getSite()) |
|
| 41 | + switch (URLDecode::getSite()) |
|
| 42 | 42 | {
|
| 43 | 43 | case 'ajax' : |
| 44 | 44 | return 'AjaxRouter'; |
@@ -86,37 +86,37 @@ discard block |
||
| 86 | 86 | |
| 87 | 87 | final protected function check_for_redirect($redirect_uri) |
| 88 | 88 | {
|
| 89 | - foreach($this->get_redirect_array() as $check) |
|
| 89 | + foreach ($this->get_redirect_array() as $check) |
|
| 90 | 90 | {
|
| 91 | 91 | $redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri); |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | $redirect_uri = $this->check_for_special_redirect($redirect_uri); |
| 95 | 95 | |
| 96 | - if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
|
| 96 | + if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
|
| 97 | 97 | $redirect_uri .= '/'; |
| 98 | 98 | |
| 99 | 99 | if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
|
| 100 | 100 | $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - if($redirect_uri == URLDecode::getURI()) |
|
| 103 | + if ($redirect_uri == URLDecode::getURI()) |
|
| 104 | 104 | return; |
| 105 | 105 | |
| 106 | 106 | $controller_check = $redirect_uri; |
| 107 | - if(substr($redirect_uri, 0, 4) == 'http') |
|
| 107 | + if (substr($redirect_uri, 0, 4) == 'http') |
|
| 108 | 108 | $controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
|
| 109 | 109 | |
| 110 | 110 | $controller = $this->get_controller($controller_check); |
| 111 | - if($controller == '/Error404Controller') |
|
| 111 | + if ($controller == '/Error404Controller') |
|
| 112 | 112 | {
|
| 113 | 113 | Loader::loadNew('controller', '/Error404Controller')
|
| 114 | 114 | ->activate(); |
| 115 | 115 | exit; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - if($this->get_primary_folder() == 'images') {
|
|
| 119 | - $file = $controller_check;//URLDecode::getURI(); |
|
| 118 | + if ($this->get_primary_folder() == 'images') {
|
|
| 119 | + $file = $controller_check; //URLDecode::getURI(); |
|
| 120 | 120 | |
| 121 | 121 | if ( |
| 122 | 122 | URLDecode::getSite() == 'images' || |
@@ -129,13 +129,13 @@ discard block |
||
| 129 | 129 | } |
| 130 | 130 | |
| 131 | 131 | $image = new ImageOld($file); |
| 132 | - if(!$image->isValid()) {
|
|
| 132 | + if (!$image->isValid()) {
|
|
| 133 | 133 | Loader::loadNew('controller', '/Error404Controller')->activate();
|
| 134 | 134 | exit(); |
| 135 | 135 | } |
| 136 | 136 | } |
| 137 | 137 | |
| 138 | - if(substr($redirect_uri, 0, 4) != 'http') |
|
| 138 | + if (substr($redirect_uri, 0, 4) != 'http') |
|
| 139 | 139 | {
|
| 140 | 140 | $redirect_uri = substr($redirect_uri, 1); |
| 141 | 141 | $redirect_uri = URLDecode::getBase() . $redirect_uri; |
@@ -152,12 +152,12 @@ discard block |
||
| 152 | 152 | |
| 153 | 153 | final private function get_controller($uri) |
| 154 | 154 | {
|
| 155 | - foreach($this->get_direct_array() as $check) |
|
| 155 | + foreach ($this->get_direct_array() as $check) |
|
| 156 | 156 | {
|
| 157 | - if($uri == $check->match) |
|
| 157 | + if ($uri == $check->match) |
|
| 158 | 158 | return "{$this->get_primary_folder()}/{$check->controller}";
|
| 159 | 159 | |
| 160 | - if(preg_match("@^{$check->match}$@", $uri))
|
|
| 160 | + if (preg_match("@^{$check->match}$@", $uri))
|
|
| 161 | 161 | return "{$this->get_primary_folder()}/{$check->controller}";
|
| 162 | 162 | } |
| 163 | 163 | |
@@ -166,19 +166,19 @@ discard block |
||
| 166 | 166 | |
| 167 | 167 | final private function get_primary_folder() |
| 168 | 168 | {
|
| 169 | - if(Request::isAjax()) |
|
| 169 | + if (Request::isAjax()) |
|
| 170 | 170 | return 'ajax'; |
| 171 | - if(URLDecode::getURI() == '/robots.txt') |
|
| 171 | + if (URLDecode::getURI() == '/robots.txt') |
|
| 172 | 172 | return 'robot'; |
| 173 | - if(URLDecode::getURI() == '/sitemap.xml') |
|
| 173 | + if (URLDecode::getURI() == '/sitemap.xml') |
|
| 174 | 174 | return 'sitemap'; |
| 175 | - if(URLDecode::getURI() == '/rss/') |
|
| 175 | + if (URLDecode::getURI() == '/rss/') |
|
| 176 | 176 | return 'rss'; |
| 177 | - if(URLDecode::getExtension() == 'css') |
|
| 177 | + if (URLDecode::getExtension() == 'css') |
|
| 178 | 178 | return 'styles'; |
| 179 | - if(URLDecode::getExtension() == 'js') |
|
| 179 | + if (URLDecode::getExtension() == 'js') |
|
| 180 | 180 | return 'scripts'; |
| 181 | - if( |
|
| 181 | + if ( |
|
| 182 | 182 | URLDecode::getExtension() == 'jpg' || |
| 183 | 183 | URLDecode::getExtension() == 'ico' || |
| 184 | 184 | URLDecode::getExtension() == 'png') |
@@ -19,24 +19,33 @@ discard block |
||
| 19 | 19 | |
| 20 | 20 | private static function get_router_name() |
| 21 | 21 | {
|
| 22 | - if(Request::isAJAX()) |
|
| 23 | - return 'AJAXRouter'; |
|
| 24 | - if(URLDecode::getURI() == '/robots.txt') |
|
| 25 | - return 'RobotRouter'; |
|
| 26 | - if(URLDecode::getURI() == '/sitemap.xml') |
|
| 27 | - return 'SitemapRouter'; |
|
| 28 | - if(URLDecode::getURI() == '/rss/') |
|
| 29 | - return 'RSSRouter'; |
|
| 30 | - if(URLDecode::getExtension() == 'css') |
|
| 31 | - return 'StyleRouter'; |
|
| 32 | - if(URLDecode::getExtension() == 'js') |
|
| 33 | - return 'ScriptRouter'; |
|
| 34 | - if(URLDecode::getExtension() == 'ico') |
|
| 35 | - return 'ImageRouter'; |
|
| 36 | - if(URLDecode::getExtension() == 'jpg') |
|
| 37 | - return 'ImageRouter'; |
|
| 38 | - if(URLDecode::getExtension() == 'png') |
|
| 39 | - return 'ImageRouter'; |
|
| 22 | + if(Request::isAJAX()) {
|
|
| 23 | + return 'AJAXRouter'; |
|
| 24 | + } |
|
| 25 | + if(URLDecode::getURI() == '/robots.txt') {
|
|
| 26 | + return 'RobotRouter'; |
|
| 27 | + } |
|
| 28 | + if(URLDecode::getURI() == '/sitemap.xml') {
|
|
| 29 | + return 'SitemapRouter'; |
|
| 30 | + } |
|
| 31 | + if(URLDecode::getURI() == '/rss/') {
|
|
| 32 | + return 'RSSRouter'; |
|
| 33 | + } |
|
| 34 | + if(URLDecode::getExtension() == 'css') {
|
|
| 35 | + return 'StyleRouter'; |
|
| 36 | + } |
|
| 37 | + if(URLDecode::getExtension() == 'js') {
|
|
| 38 | + return 'ScriptRouter'; |
|
| 39 | + } |
|
| 40 | + if(URLDecode::getExtension() == 'ico') {
|
|
| 41 | + return 'ImageRouter'; |
|
| 42 | + } |
|
| 43 | + if(URLDecode::getExtension() == 'jpg') {
|
|
| 44 | + return 'ImageRouter'; |
|
| 45 | + } |
|
| 46 | + if(URLDecode::getExtension() == 'png') {
|
|
| 47 | + return 'ImageRouter'; |
|
| 48 | + } |
|
| 40 | 49 | |
| 41 | 50 | switch(URLDecode::getSite()) |
| 42 | 51 | {
|
@@ -93,19 +102,22 @@ discard block |
||
| 93 | 102 | |
| 94 | 103 | $redirect_uri = $this->check_for_special_redirect($redirect_uri); |
| 95 | 104 | |
| 96 | - if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
|
| 97 | - $redirect_uri .= '/'; |
|
| 105 | + if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {
|
|
| 106 | + $redirect_uri .= '/'; |
|
| 107 | + } |
|
| 98 | 108 | |
| 99 | 109 | if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') {
|
| 100 | 110 | $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
| 101 | 111 | } |
| 102 | 112 | |
| 103 | - if($redirect_uri == URLDecode::getURI()) |
|
| 104 | - return; |
|
| 113 | + if($redirect_uri == URLDecode::getURI()) {
|
|
| 114 | + return; |
|
| 115 | + } |
|
| 105 | 116 | |
| 106 | 117 | $controller_check = $redirect_uri; |
| 107 | - if(substr($redirect_uri, 0, 4) == 'http') |
|
| 108 | - $controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
|
|
| 118 | + if(substr($redirect_uri, 0, 4) == 'http') {
|
|
| 119 | + $controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
|
|
| 120 | + } |
|
| 109 | 121 | |
| 110 | 122 | $controller = $this->get_controller($controller_check); |
| 111 | 123 | if($controller == '/Error404Controller') |
@@ -154,11 +166,13 @@ discard block |
||
| 154 | 166 | {
|
| 155 | 167 | foreach($this->get_direct_array() as $check) |
| 156 | 168 | {
|
| 157 | - if($uri == $check->match) |
|
| 158 | - return "{$this->get_primary_folder()}/{$check->controller}";
|
|
| 169 | + if($uri == $check->match) {
|
|
| 170 | + return "{$this->get_primary_folder()}/{$check->controller}";
|
|
| 171 | + } |
|
| 159 | 172 | |
| 160 | - if(preg_match("@^{$check->match}$@", $uri))
|
|
| 161 | - return "{$this->get_primary_folder()}/{$check->controller}";
|
|
| 173 | + if(preg_match("@^{$check->match}$@", $uri)) {
|
|
| 174 | + return "{$this->get_primary_folder()}/{$check->controller}";
|
|
| 175 | + } |
|
| 162 | 176 | } |
| 163 | 177 | |
| 164 | 178 | return '/Error404Controller'; |
@@ -166,23 +180,30 @@ discard block |
||
| 166 | 180 | |
| 167 | 181 | final private function get_primary_folder() |
| 168 | 182 | {
|
| 169 | - if(Request::isAjax()) |
|
| 170 | - return 'ajax'; |
|
| 171 | - if(URLDecode::getURI() == '/robots.txt') |
|
| 172 | - return 'robot'; |
|
| 173 | - if(URLDecode::getURI() == '/sitemap.xml') |
|
| 174 | - return 'sitemap'; |
|
| 175 | - if(URLDecode::getURI() == '/rss/') |
|
| 176 | - return 'rss'; |
|
| 177 | - if(URLDecode::getExtension() == 'css') |
|
| 178 | - return 'styles'; |
|
| 179 | - if(URLDecode::getExtension() == 'js') |
|
| 180 | - return 'scripts'; |
|
| 183 | + if(Request::isAjax()) {
|
|
| 184 | + return 'ajax'; |
|
| 185 | + } |
|
| 186 | + if(URLDecode::getURI() == '/robots.txt') {
|
|
| 187 | + return 'robot'; |
|
| 188 | + } |
|
| 189 | + if(URLDecode::getURI() == '/sitemap.xml') {
|
|
| 190 | + return 'sitemap'; |
|
| 191 | + } |
|
| 192 | + if(URLDecode::getURI() == '/rss/') {
|
|
| 193 | + return 'rss'; |
|
| 194 | + } |
|
| 195 | + if(URLDecode::getExtension() == 'css') {
|
|
| 196 | + return 'styles'; |
|
| 197 | + } |
|
| 198 | + if(URLDecode::getExtension() == 'js') {
|
|
| 199 | + return 'scripts'; |
|
| 200 | + } |
|
| 181 | 201 | if( |
| 182 | 202 | URLDecode::getExtension() == 'jpg' || |
| 183 | 203 | URLDecode::getExtension() == 'ico' || |
| 184 | - URLDecode::getExtension() == 'png') |
|
| 185 | - return 'images'; |
|
| 204 | + URLDecode::getExtension() == 'png') {
|
|
| 205 | + return 'images'; |
|
| 206 | + } |
|
| 186 | 207 | |
| 187 | 208 | return URLDecode::getSite(); |
| 188 | 209 | } |
@@ -16,9 +16,9 @@ |
||
| 16 | 16 | protected function get_direct_array() |
| 17 | 17 | {
|
| 18 | 18 | $site = URLDecode::getSite(); |
| 19 | - if ($site == 'waterfalls') {
|
|
| 20 | - $site = 'waterfall'; |
|
| 21 | - } |
|
| 19 | + if ($site == 'waterfalls') {
|
|
| 20 | + $site = 'waterfall'; |
|
| 21 | + } |
|
| 22 | 22 | $site = ucwords($site); |
| 23 | 23 | |
| 24 | 24 | return array( |
@@ -1,8 +1,8 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | 3 | Loader::load('collector', array(
|
| 4 | - 'waterfall/LogCollector', |
|
| 5 | - 'waterfall/WaterfallCollector')); |
|
| 4 | + 'waterfall/LogCollector', |
|
| 5 | + 'waterfall/WaterfallCollector')); |
|
| 6 | 6 | Loader::load('router', 'Router');
|
| 7 | 7 | |
| 8 | 8 | class WaterfallRouter extends Router |
@@ -26,15 +26,15 @@ discard block |
||
| 26 | 26 | (object) array( |
| 27 | 27 | 'pattern' => '@^/falls/results(/?)$@', |
| 28 | 28 | 'replace' => '/falls/'), |
| 29 | - (object) array( |
|
| 30 | - 'pattern' => '@^/log(/?)$@', |
|
| 31 | - 'replace' => '/journal/'), |
|
| 32 | - (object) array( |
|
| 33 | - 'pattern' => '@^/log/(\d+)(/?)$@', |
|
| 34 | - 'replace' => '/journal/$1'), |
|
| 35 | - (object) array( |
|
| 36 | - 'pattern' => '@^/map/([^/]+)(/?)$@', |
|
| 37 | - 'replace' => '/map/'), |
|
| 29 | + (object) array( |
|
| 30 | + 'pattern' => '@^/log(/?)$@', |
|
| 31 | + 'replace' => '/journal/'), |
|
| 32 | + (object) array( |
|
| 33 | + 'pattern' => '@^/log/(\d+)(/?)$@', |
|
| 34 | + 'replace' => '/journal/$1'), |
|
| 35 | + (object) array( |
|
| 36 | + 'pattern' => '@^/map/([^/]+)(/?)$@', |
|
| 37 | + 'replace' => '/map/'), |
|
| 38 | 38 | (object) array( |
| 39 | 39 | 'pattern' => '@^/about/([a-z]*)(/?)$@', |
| 40 | 40 | 'replace' => '/about/'), |
@@ -73,57 +73,57 @@ discard block |
||
| 73 | 73 | |
| 74 | 74 | protected function check_for_special_redirect($uri) |
| 75 | 75 | {
|
| 76 | - if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
|
|
| 77 | - $alias = $matches[1]; |
|
| 78 | - $alias = str_replace("'", '', $alias);
|
|
| 79 | - $alias .= '-falls'; |
|
| 80 | - $result = WaterfallCollector::getByOldAlias($alias); |
|
| 81 | - if ($result !== null) {
|
|
| 82 | - return "/{$result->watercourse_alias}/{$result->alias}/";
|
|
| 83 | - } else {
|
|
| 84 | - Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 85 | - } |
|
| 86 | - } |
|
| 76 | + if (preg_match('@^/falls/([a-z\'-]+)(/?)$@', $uri, $matches)) {
|
|
| 77 | + $alias = $matches[1]; |
|
| 78 | + $alias = str_replace("'", '', $alias);
|
|
| 79 | + $alias .= '-falls'; |
|
| 80 | + $result = WaterfallCollector::getByOldAlias($alias); |
|
| 81 | + if ($result !== null) {
|
|
| 82 | + return "/{$result->watercourse_alias}/{$result->alias}/";
|
|
| 83 | + } else {
|
|
| 84 | + Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 85 | + } |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {
|
|
| 89 | - $alias = $matches[1]; |
|
| 90 | - $alias = explode('-', $alias);
|
|
| 91 | - array_pop($alias); |
|
| 92 | - $alias = implode('-', $alias);
|
|
| 93 | - $alias = str_replace("'", '', $alias);
|
|
| 94 | - $alias .= '-falls'; |
|
| 95 | - $result = WaterfallCollector::getByOldAlias($alias); |
|
| 96 | - if ($result !== null) {
|
|
| 97 | - return "/{$result->watercourse_alias}/{$result->alias}/";
|
|
| 98 | - } else {
|
|
| 99 | - Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 100 | - } |
|
| 101 | - } |
|
| 88 | + if (preg_match('@^/photos/([a-z\'-]+)-([^/]+)(/?)$@', $uri, $matches)) {
|
|
| 89 | + $alias = $matches[1]; |
|
| 90 | + $alias = explode('-', $alias);
|
|
| 91 | + array_pop($alias); |
|
| 92 | + $alias = implode('-', $alias);
|
|
| 93 | + $alias = str_replace("'", '', $alias);
|
|
| 94 | + $alias .= '-falls'; |
|
| 95 | + $result = WaterfallCollector::getByOldAlias($alias); |
|
| 96 | + if ($result !== null) {
|
|
| 97 | + return "/{$result->watercourse_alias}/{$result->alias}/";
|
|
| 98 | + } else {
|
|
| 99 | + Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 100 | + } |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | - if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {
|
|
| 104 | - $date = $matches[1]; |
|
| 105 | - $date = explode('-', $date);
|
|
| 106 | - $date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);
|
|
| 107 | - $date = date('Y-m-d', $date);
|
|
| 108 | - $result = LogCollector::getByDate($date); |
|
| 109 | - if ($result !== null) {
|
|
| 110 | - return "/journal/{$result->alias}/";
|
|
| 111 | - } else {
|
|
| 112 | - Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 113 | - } |
|
| 114 | - } |
|
| 103 | + if (preg_match('@/log/([a-z]+-\d{2}-\d{4})(/?)$@', $uri, $matches)) {
|
|
| 104 | + $date = $matches[1]; |
|
| 105 | + $date = explode('-', $date);
|
|
| 106 | + $date = mktime(0, 0, 0, date('n', strtotime($date[0])), $date[1], $date[2]);
|
|
| 107 | + $date = date('Y-m-d', $date);
|
|
| 108 | + $result = LogCollector::getByDate($date); |
|
| 109 | + if ($result !== null) {
|
|
| 110 | + return "/journal/{$result->alias}/";
|
|
| 111 | + } else {
|
|
| 112 | + Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 113 | + } |
|
| 114 | + } |
|
| 115 | 115 | |
| 116 | - if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {
|
|
| 117 | - $alias = $matches[1]; |
|
| 118 | - $alias = str_replace("'", '', $alias);
|
|
| 119 | - $alias .= '-falls'; |
|
| 120 | - $result = WaterfallCollector::getByOldAlias($alias); |
|
| 121 | - if ($result !== null) {
|
|
| 122 | - return "/map/#{$result->watercourse_alias}/{$result->alias}";
|
|
| 123 | - } else {
|
|
| 124 | - Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 125 | - } |
|
| 126 | - } |
|
| 116 | + if (preg_match('@/map/([a-z\'-]+)(/?)$@', $uri, $matches)) {
|
|
| 117 | + $alias = $matches[1]; |
|
| 118 | + $alias = str_replace("'", '', $alias);
|
|
| 119 | + $alias .= '-falls'; |
|
| 120 | + $result = WaterfallCollector::getByOldAlias($alias); |
|
| 121 | + if ($result !== null) {
|
|
| 122 | + return "/map/#{$result->watercourse_alias}/{$result->alias}";
|
|
| 123 | + } else {
|
|
| 124 | + Loader::loadNew('controller', '/Error404Controller')->activate();
|
|
| 125 | + } |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | 128 | return $uri; |
| 129 | 129 | } |
@@ -164,9 +164,9 @@ discard block |
||
| 164 | 164 | (object) array( |
| 165 | 165 | 'match' => '/map/', |
| 166 | 166 | 'controller' => 'MapController'), |
| 167 | - (object) array( |
|
| 168 | - 'match' => '/map/#[a-z-/]+', |
|
| 169 | - 'controller' => 'MapController'), |
|
| 167 | + (object) array( |
|
| 168 | + 'match' => '/map/#[a-z-/]+', |
|
| 169 | + 'controller' => 'MapController'), |
|
| 170 | 170 | (object) array( |
| 171 | 171 | 'match' => '/journal/', |
| 172 | 172 | 'controller' => 'LogListController'), |
