@@ -8,77 +8,77 @@ |
||
| 8 | 8 | class MysqlTwitterRepository implements TwitterRepositoryInterface |
| 9 | 9 | { |
| 10 | 10 | |
| 11 | - /** @var ConnectionLocator */ |
|
| 12 | - protected $connections; |
|
| 11 | + /** @var ConnectionLocator */ |
|
| 12 | + protected $connections; |
|
| 13 | 13 | |
| 14 | - /** |
|
| 15 | - * @param ConnectonLocator $connections |
|
| 16 | - */ |
|
| 17 | - public function __construct(ConnectionLocator $connections) |
|
| 18 | - { |
|
| 19 | - $this->connections = $connections; |
|
| 20 | - } |
|
| 14 | + /** |
|
| 15 | + * @param ConnectonLocator $connections |
|
| 16 | + */ |
|
| 17 | + public function __construct(ConnectionLocator $connections) |
|
| 18 | + { |
|
| 19 | + $this->connections = $connections; |
|
| 20 | + } |
|
| 21 | 21 | |
| 22 | - /** |
|
| 23 | - * @param integer $id |
|
| 24 | - * |
|
| 25 | - * @return array|false |
|
| 26 | - */ |
|
| 27 | - public function getTwitterById($id) |
|
| 28 | - { |
|
| 29 | - $query = " |
|
| 22 | + /** |
|
| 23 | + * @param integer $id |
|
| 24 | + * |
|
| 25 | + * @return array|false |
|
| 26 | + */ |
|
| 27 | + public function getTwitterById($id) |
|
| 28 | + { |
|
| 29 | + $query = " |
|
| 30 | 30 | SELECT * |
| 31 | 31 | FROM `jpemeric_stream`.`twitter` |
| 32 | 32 | WHERE `id` = :id |
| 33 | 33 | LIMIT 1"; |
| 34 | - $bindings = [ |
|
| 35 | - 'id' => $id, |
|
| 36 | - ]; |
|
| 34 | + $bindings = [ |
|
| 35 | + 'id' => $id, |
|
| 36 | + ]; |
|
| 37 | 37 | |
| 38 | - return $this |
|
| 39 | - ->connections |
|
| 40 | - ->getRead() |
|
| 41 | - ->fetchOne($query, $bindings); |
|
| 42 | - } |
|
| 38 | + return $this |
|
| 39 | + ->connections |
|
| 40 | + ->getRead() |
|
| 41 | + ->fetchOne($query, $bindings); |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * @param DateTimeInterface $date |
|
| 46 | - * @param string $text |
|
| 47 | - * |
|
| 48 | - * @return array|false |
|
| 49 | - */ |
|
| 50 | - public function getTwitterByFields(DateTimeInterface $date, $text) |
|
| 51 | - { |
|
| 52 | - $query = " |
|
| 44 | + /** |
|
| 45 | + * @param DateTimeInterface $date |
|
| 46 | + * @param string $text |
|
| 47 | + * |
|
| 48 | + * @return array|false |
|
| 49 | + */ |
|
| 50 | + public function getTwitterByFields(DateTimeInterface $date, $text) |
|
| 51 | + { |
|
| 52 | + $query = " |
|
| 53 | 53 | SELECT * |
| 54 | 54 | FROM `jpemeric_stream`.`twitter` |
| 55 | 55 | WHERE `date` = :date AND `text` = :text |
| 56 | 56 | LIMIT 1"; |
| 57 | - $bindings = [ |
|
| 58 | - 'date' => $date->format('Y-m-d H:i:s'), |
|
| 59 | - 'text' => $text, |
|
| 60 | - ]; |
|
| 57 | + $bindings = [ |
|
| 58 | + 'date' => $date->format('Y-m-d H:i:s'), |
|
| 59 | + 'text' => $text, |
|
| 60 | + ]; |
|
| 61 | 61 | |
| 62 | - return $this |
|
| 63 | - ->connections |
|
| 64 | - ->getRead() |
|
| 65 | - ->fetchOne($query, $bindings); |
|
| 66 | - } |
|
| 62 | + return $this |
|
| 63 | + ->connections |
|
| 64 | + ->getRead() |
|
| 65 | + ->fetchOne($query, $bindings); |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - /** |
|
| 69 | - * @return array|false |
|
| 70 | - */ |
|
| 71 | - public function getUnmappedTwitters() |
|
| 72 | - { |
|
| 73 | - $query = " |
|
| 68 | + /** |
|
| 69 | + * @return array|false |
|
| 70 | + */ |
|
| 71 | + public function getUnmappedTwitters() |
|
| 72 | + { |
|
| 73 | + $query = " |
|
| 74 | 74 | SELECT `id`, `date` |
| 75 | 75 | FROM `jpemeric_stream`.`twitter` |
| 76 | 76 | LEFT JOIN `jpemeric_stream`.`post` |
| 77 | 77 | ON `post`.`type_id` = `twitter`.`id` AND `post`.`id` IS NULL"; |
| 78 | 78 | |
| 79 | - return $this |
|
| 80 | - ->connections |
|
| 81 | - ->getRead() |
|
| 82 | - ->fetchAll($query); |
|
| 83 | - } |
|
| 79 | + return $this |
|
| 80 | + ->connections |
|
| 81 | + ->getRead() |
|
| 82 | + ->fetchAll($query); |
|
| 83 | + } |
|
| 84 | 84 | } |
@@ -6,7 +6,7 @@ |
||
| 6 | 6 | |
| 7 | 7 | interface TwitterRepositoryInterface |
| 8 | 8 | { |
| 9 | - public function getTwitterById($id); |
|
| 10 | - public function getTwitterByFields(DateTimeInterface $date, $text); |
|
| 11 | - public function getUnmappedTwitters(); |
|
| 9 | + public function getTwitterById($id); |
|
| 10 | + public function getTwitterByFields(DateTimeInterface $date, $text); |
|
| 11 | + public function getUnmappedTwitters(); |
|
| 12 | 12 | } |
@@ -4,7 +4,7 @@ |
||
| 4 | 4 | |
| 5 | 5 | interface YouTubeRepositoryInterface |
| 6 | 6 | { |
| 7 | - public function getYouTubeById($id); |
|
| 8 | - public function getYouTubeByVideoId($videoId); |
|
| 9 | - public function getUnmappedYouTubes(); |
|
| 7 | + public function getYouTubeById($id); |
|
| 8 | + public function getYouTubeByVideoId($videoId); |
|
| 9 | + public function getUnmappedYouTubes(); |
|
| 10 | 10 | } |
@@ -20,9 +20,9 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | public function activate() |
| 22 | 22 | { |
| 23 | - foreach(self::$CRON_ARRAY as $cron => $frequency) |
|
| 23 | + foreach (self::$CRON_ARRAY as $cron => $frequency) |
|
| 24 | 24 | { |
| 25 | - if(!$this->time_to_run($frequency)) |
|
| 25 | + if (!$this->time_to_run($frequency)) |
|
| 26 | 26 | continue; |
| 27 | 27 | |
| 28 | 28 | Loader::load('utility', "cron/{$cron}"); |
@@ -46,19 +46,19 @@ discard block |
||
| 46 | 46 | $operator = explode(' ', $frequency); |
| 47 | 47 | list($time['minute'], $time['hour'], $time['day'], $time['month'], $time['weekday']) = $operator; |
| 48 | 48 | |
| 49 | - foreach($time as $key => $value) |
|
| 49 | + foreach ($time as $key => $value) |
|
| 50 | 50 | { |
| 51 | - if($value == '*') |
|
| 51 | + if ($value == '*') |
|
| 52 | 52 | continue; |
| 53 | - if(stristr($value, '/')) |
|
| 53 | + if (stristr($value, '/')) |
|
| 54 | 54 | { |
| 55 | 55 | $value = substr($value, 2); |
| 56 | - if($cur[$key] % $value == 0) |
|
| 56 | + if ($cur[$key] % $value == 0) |
|
| 57 | 57 | continue; |
| 58 | 58 | else |
| 59 | 59 | return; |
| 60 | 60 | } |
| 61 | - if($cur[$key] == $value) |
|
| 61 | + if ($cur[$key] == $value) |
|
| 62 | 62 | continue; |
| 63 | 63 | return; |
| 64 | 64 | } |
@@ -22,8 +22,9 @@ discard block |
||
| 22 | 22 | { |
| 23 | 23 | foreach(self::$CRON_ARRAY as $cron => $frequency) |
| 24 | 24 | { |
| 25 | - if(!$this->time_to_run($frequency)) |
|
| 26 | - continue; |
|
| 25 | + if(!$this->time_to_run($frequency)) {
|
|
| 26 | + continue; |
|
| 27 | + } |
|
| 27 | 28 | |
| 28 | 29 | Loader::load('utility', "cron/{$cron}"); |
| 29 | 30 | $reflection = new ReflectionClass($cron); |
@@ -48,18 +49,21 @@ discard block |
||
| 48 | 49 | |
| 49 | 50 | foreach($time as $key => $value) |
| 50 | 51 | { |
| 51 | - if($value == '*') |
|
| 52 | - continue; |
|
| 52 | + if($value == '*') {
|
|
| 53 | + continue; |
|
| 54 | + } |
|
| 53 | 55 | if(stristr($value, '/')) |
| 54 | 56 | { |
| 55 | 57 | $value = substr($value, 2); |
| 56 | - if($cur[$key] % $value == 0) |
|
| 57 | - continue; |
|
| 58 | - else |
|
| 59 | - return; |
|
| 58 | + if($cur[$key] % $value == 0) {
|
|
| 59 | + continue; |
|
| 60 | + } else {
|
|
| 61 | + return; |
|
| 62 | + } |
|
| 60 | 63 | } |
| 61 | - if($cur[$key] == $value) |
|
| 62 | - continue; |
|
| 64 | + if($cur[$key] == $value) {
|
|
| 65 | + continue; |
|
| 66 | + } |
|
| 63 | 67 | return; |
| 64 | 68 | } |
| 65 | 69 | return true; |
@@ -32,37 +32,37 @@ |
||
| 32 | 32 | |
| 33 | 33 | private function get_sites() |
| 34 | 34 | { |
| 35 | - return [ |
|
| 36 | - [ |
|
| 37 | - 'url' => 'http://home.jacobemerick.com/', |
|
| 38 | - 'title' => "Jacob Emerick's Home", |
|
| 39 | - 'name' => 'Home' |
|
| 40 | - ], |
|
| 41 | - [ |
|
| 42 | - 'url' => 'http://blog.jacobemerick.com/', |
|
| 43 | - 'title' => "Jacob Emerick's Blog", |
|
| 44 | - 'name' => 'Blog' |
|
| 45 | - ], |
|
| 46 | - [ |
|
| 47 | - 'url' => 'http://lifestream.jacobemerick.com/', |
|
| 48 | - 'title' => "Jacob Emerick's Lifestream", |
|
| 49 | - 'name' => 'Lifestream' |
|
| 50 | - ], |
|
| 51 | - [ |
|
| 52 | - 'url' => 'http://map.jacobemerick.com/', |
|
| 53 | - 'title' => "Jacob Emerick's Hiking Map", |
|
| 54 | - 'name' => 'Map' |
|
| 55 | - ], |
|
| 56 | - [ |
|
| 57 | - 'url' => 'http://portfolio.jacobemerick.com/', |
|
| 58 | - 'title' => "Jacob Emerick's Portfolio", |
|
| 59 | - 'name' => 'Portfolio', |
|
| 60 | - ], |
|
| 61 | - [ |
|
| 62 | - 'url' => 'http://www.waterfallsofthekeweenaw.com/', |
|
| 63 | - 'title' => 'Waterfalls of the Keweenaw', |
|
| 64 | - 'name' => 'Waterfalls' |
|
| 65 | - ] |
|
| 35 | + return [ |
|
| 36 | + [ |
|
| 37 | + 'url' => 'http://home.jacobemerick.com/', |
|
| 38 | + 'title' => "Jacob Emerick's Home", |
|
| 39 | + 'name' => 'Home' |
|
| 40 | + ], |
|
| 41 | + [ |
|
| 42 | + 'url' => 'http://blog.jacobemerick.com/', |
|
| 43 | + 'title' => "Jacob Emerick's Blog", |
|
| 44 | + 'name' => 'Blog' |
|
| 45 | + ], |
|
| 46 | + [ |
|
| 47 | + 'url' => 'http://lifestream.jacobemerick.com/', |
|
| 48 | + 'title' => "Jacob Emerick's Lifestream", |
|
| 49 | + 'name' => 'Lifestream' |
|
| 50 | + ], |
|
| 51 | + [ |
|
| 52 | + 'url' => 'http://map.jacobemerick.com/', |
|
| 53 | + 'title' => "Jacob Emerick's Hiking Map", |
|
| 54 | + 'name' => 'Map' |
|
| 55 | + ], |
|
| 56 | + [ |
|
| 57 | + 'url' => 'http://portfolio.jacobemerick.com/', |
|
| 58 | + 'title' => "Jacob Emerick's Portfolio", |
|
| 59 | + 'name' => 'Portfolio', |
|
| 60 | + ], |
|
| 61 | + [ |
|
| 62 | + 'url' => 'http://www.waterfallsofthekeweenaw.com/', |
|
| 63 | + 'title' => 'Waterfalls of the Keweenaw', |
|
| 64 | + 'name' => 'Waterfalls' |
|
| 65 | + ] |
|
| 66 | 66 | ]; |
| 67 | 67 | } |
| 68 | 68 | |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | protected static $WATERFALL_SITE_ID = 5; |
| 12 | 12 | |
| 13 | - protected $parent_navigation_item = ''; |
|
| 13 | + protected $parent_navigation_item = ''; |
|
| 14 | 14 | |
| 15 | 15 | protected function set_head_data() |
| 16 | 16 | { |
@@ -19,45 +19,45 @@ discard block |
||
| 19 | 19 | $this->add_css('waterfalls'); |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | - protected function add_waterfall_js() |
|
| 23 | - { |
|
| 24 | - $this->add_js('jquery'); |
|
| 25 | - $this->add_js('imagelightbox'); |
|
| 26 | - $this->add_js('waterfalls'); |
|
| 27 | - } |
|
| 22 | + protected function add_waterfall_js() |
|
| 23 | + { |
|
| 24 | + $this->add_js('jquery'); |
|
| 25 | + $this->add_js('imagelightbox'); |
|
| 26 | + $this->add_js('waterfalls'); |
|
| 27 | + } |
|
| 28 | 28 | |
| 29 | 29 | protected function set_body_data($page_type = 'normal') |
| 30 | 30 | { |
| 31 | 31 | $this->set_body('activity_array', $this->get_recent_activity()); |
| 32 | 32 | |
| 33 | - $this->set_body('main_navigation', array( |
|
| 34 | - (object) array( |
|
| 35 | - 'uri' => '/falls/', |
|
| 36 | - 'anchor' => 'Falls', |
|
| 37 | - 'is_active' => $this->parent_navigation_item === 'falls', |
|
| 38 | - ), |
|
| 39 | - (object) array( |
|
| 40 | - 'uri' => '/map/', |
|
| 41 | - 'anchor' => 'Map', |
|
| 42 | - 'is_active' => $this->parent_navigation_item === 'map', |
|
| 43 | - ), |
|
| 44 | - (object) array( |
|
| 45 | - 'uri' => '/journal/', |
|
| 46 | - 'anchor' => 'Journal', |
|
| 47 | - 'is_active' => $this->parent_navigation_item === 'journal', |
|
| 48 | - ), |
|
| 49 | - (object) array( |
|
| 50 | - 'uri' => '/about/', |
|
| 51 | - 'anchor' => 'About', |
|
| 52 | - 'is_active' => $this->parent_navigation_item === 'about', |
|
| 53 | - ) |
|
| 54 | - )); |
|
| 55 | - |
|
| 56 | - if ($page_type == 'wide') { |
|
| 57 | - $this->set_body_view('WidePage'); |
|
| 58 | - } else { |
|
| 59 | - $this->set_body_view('Page'); |
|
| 60 | - } |
|
| 61 | - } |
|
| 33 | + $this->set_body('main_navigation', array( |
|
| 34 | + (object) array( |
|
| 35 | + 'uri' => '/falls/', |
|
| 36 | + 'anchor' => 'Falls', |
|
| 37 | + 'is_active' => $this->parent_navigation_item === 'falls', |
|
| 38 | + ), |
|
| 39 | + (object) array( |
|
| 40 | + 'uri' => '/map/', |
|
| 41 | + 'anchor' => 'Map', |
|
| 42 | + 'is_active' => $this->parent_navigation_item === 'map', |
|
| 43 | + ), |
|
| 44 | + (object) array( |
|
| 45 | + 'uri' => '/journal/', |
|
| 46 | + 'anchor' => 'Journal', |
|
| 47 | + 'is_active' => $this->parent_navigation_item === 'journal', |
|
| 48 | + ), |
|
| 49 | + (object) array( |
|
| 50 | + 'uri' => '/about/', |
|
| 51 | + 'anchor' => 'About', |
|
| 52 | + 'is_active' => $this->parent_navigation_item === 'about', |
|
| 53 | + ) |
|
| 54 | + )); |
|
| 55 | + |
|
| 56 | + if ($page_type == 'wide') { |
|
| 57 | + $this->set_body_view('WidePage'); |
|
| 58 | + } else { |
|
| 59 | + $this->set_body_view('Page'); |
|
| 60 | + } |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | 63 | } |
@@ -12,9 +12,9 @@ |
||
| 12 | 12 | |
| 13 | 13 | $portfolio_result = PortfolioCollector::getImageById($id); |
| 14 | 14 | |
| 15 | - $image_path = "portfolio/{$portfolio_result->name}"; |
|
| 16 | - $image_path = Loader::getImagePath('image', $image_path); |
|
| 17 | - $image_size = getimagesize($image_path); |
|
| 15 | + $image_path = "portfolio/{$portfolio_result->name}"; |
|
| 16 | + $image_path = Loader::getImagePath('image', $image_path); |
|
| 17 | + $image_size = getimagesize($image_path); |
|
| 18 | 18 | |
| 19 | 19 | $main_image = new stdclass(); |
| 20 | 20 | $main_image->id = $portfolio_result->id; |
@@ -80,9 +80,9 @@ discard block |
||
| 80 | 80 | if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
| 81 | 81 | $redirect_uri .= '/'; |
| 82 | 82 | |
| 83 | - if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
|
| 84 | - $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
|
| 85 | - } |
|
| 83 | + if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
|
| 84 | + $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
|
| 85 | + } |
|
| 86 | 86 | |
| 87 | 87 | if($redirect_uri == URLDecode::getURI()) |
| 88 | 88 | return; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | URLDecode::getExtension() != 'json' && |
| 148 | 148 | URLDecode::getExtension() != 'jpg' && |
| 149 | 149 | URLDecode::getExtension() != 'png' && |
| 150 | - strstr(URLDecode::getURI(), '#') === false); |
|
| 150 | + strstr(URLDecode::getURI(), '#') === false); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | } |
@@ -18,10 +18,10 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | private static function get_router_name() |
| 20 | 20 | { |
| 21 | - if(Request::isAJAX()) |
|
| 21 | + if (Request::isAJAX()) |
|
| 22 | 22 | return 'AJAXRouter'; |
| 23 | 23 | |
| 24 | - switch(URLDecode::getSite()) |
|
| 24 | + switch (URLDecode::getSite()) |
|
| 25 | 25 | { |
| 26 | 26 | case 'ajax' : |
| 27 | 27 | return 'AjaxRouter'; |
@@ -66,36 +66,36 @@ discard block |
||
| 66 | 66 | |
| 67 | 67 | final protected function check_for_redirect($redirect_uri) |
| 68 | 68 | { |
| 69 | - foreach($this->get_redirect_array() as $check) |
|
| 69 | + foreach ($this->get_redirect_array() as $check) |
|
| 70 | 70 | { |
| 71 | 71 | $redirect_uri = preg_replace($check->pattern, $check->replace, $redirect_uri); |
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | $redirect_uri = $this->check_for_special_redirect($redirect_uri); |
| 75 | 75 | |
| 76 | - if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
|
| 76 | + if ($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
|
| 77 | 77 | $redirect_uri .= '/'; |
| 78 | 78 | |
| 79 | 79 | if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
| 80 | 80 | $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | - if($redirect_uri == URLDecode::getURI()) |
|
| 83 | + if ($redirect_uri == URLDecode::getURI()) |
|
| 84 | 84 | return; |
| 85 | 85 | |
| 86 | 86 | $controller_check = $redirect_uri; |
| 87 | - if(substr($redirect_uri, 0, 4) == 'http') |
|
| 87 | + if (substr($redirect_uri, 0, 4) == 'http') |
|
| 88 | 88 | $controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri); |
| 89 | 89 | |
| 90 | 90 | $controller = $this->get_controller($controller_check); |
| 91 | - if($controller == '/Error404Controller') |
|
| 91 | + if ($controller == '/Error404Controller') |
|
| 92 | 92 | { |
| 93 | 93 | Loader::loadNew('controller', '/Error404Controller') |
| 94 | 94 | ->activate(); |
| 95 | 95 | exit; |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - if(substr($redirect_uri, 0, 4) != 'http') |
|
| 98 | + if (substr($redirect_uri, 0, 4) != 'http') |
|
| 99 | 99 | { |
| 100 | 100 | $redirect_uri = substr($redirect_uri, 1); |
| 101 | 101 | $redirect_uri = URLDecode::getBase() . $redirect_uri; |
@@ -112,12 +112,12 @@ discard block |
||
| 112 | 112 | |
| 113 | 113 | final private function get_controller($uri) |
| 114 | 114 | { |
| 115 | - foreach($this->get_direct_array() as $check) |
|
| 115 | + foreach ($this->get_direct_array() as $check) |
|
| 116 | 116 | { |
| 117 | - if($uri == $check->match) |
|
| 117 | + if ($uri == $check->match) |
|
| 118 | 118 | return "{$this->get_primary_folder()}/{$check->controller}"; |
| 119 | 119 | |
| 120 | - if(preg_match("@^{$check->match}$@", $uri)) |
|
| 120 | + if (preg_match("@^{$check->match}$@", $uri)) |
|
| 121 | 121 | return "{$this->get_primary_folder()}/{$check->controller}"; |
| 122 | 122 | } |
| 123 | 123 | |
@@ -126,7 +126,7 @@ discard block |
||
| 126 | 126 | |
| 127 | 127 | final private function get_primary_folder() |
| 128 | 128 | { |
| 129 | - if(Request::isAjax()) |
|
| 129 | + if (Request::isAjax()) |
|
| 130 | 130 | return 'ajax'; |
| 131 | 131 | |
| 132 | 132 | return URLDecode::getSite(); |
@@ -18,8 +18,9 @@ discard block |
||
| 18 | 18 | |
| 19 | 19 | private static function get_router_name() |
| 20 | 20 | { |
| 21 | - if(Request::isAJAX()) |
|
| 22 | - return 'AJAXRouter'; |
|
| 21 | + if(Request::isAJAX()) {
|
|
| 22 | + return 'AJAXRouter'; |
|
| 23 | + } |
|
| 23 | 24 | |
| 24 | 25 | switch(URLDecode::getSite()) |
| 25 | 26 | { |
@@ -73,19 +74,22 @@ discard block |
||
| 73 | 74 | |
| 74 | 75 | $redirect_uri = $this->check_for_special_redirect($redirect_uri); |
| 75 | 76 | |
| 76 | - if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
|
| 77 | - $redirect_uri .= '/'; |
|
| 77 | + if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') {
|
|
| 78 | + $redirect_uri .= '/'; |
|
| 79 | + } |
|
| 78 | 80 | |
| 79 | 81 | if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
| 80 | 82 | $redirect_uri = 'http://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
| 81 | 83 | } |
| 82 | 84 | |
| 83 | - if($redirect_uri == URLDecode::getURI()) |
|
| 84 | - return; |
|
| 85 | + if($redirect_uri == URLDecode::getURI()) {
|
|
| 86 | + return; |
|
| 87 | + } |
|
| 85 | 88 | |
| 86 | 89 | $controller_check = $redirect_uri; |
| 87 | - if(substr($redirect_uri, 0, 4) == 'http') |
|
| 88 | - $controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri); |
|
| 90 | + if(substr($redirect_uri, 0, 4) == 'http') {
|
|
| 91 | + $controller_check = preg_replace('@^http://([a-z\.]+)@', '', $redirect_uri);
|
|
| 92 | + } |
|
| 89 | 93 | |
| 90 | 94 | $controller = $this->get_controller($controller_check); |
| 91 | 95 | if($controller == '/Error404Controller') |
@@ -114,11 +118,13 @@ discard block |
||
| 114 | 118 | { |
| 115 | 119 | foreach($this->get_direct_array() as $check) |
| 116 | 120 | { |
| 117 | - if($uri == $check->match) |
|
| 118 | - return "{$this->get_primary_folder()}/{$check->controller}"; |
|
| 121 | + if($uri == $check->match) {
|
|
| 122 | + return "{$this->get_primary_folder()}/{$check->controller}";
|
|
| 123 | + } |
|
| 119 | 124 | |
| 120 | - if(preg_match("@^{$check->match}$@", $uri)) |
|
| 121 | - return "{$this->get_primary_folder()}/{$check->controller}"; |
|
| 125 | + if(preg_match("@^{$check->match}$@", $uri)) {
|
|
| 126 | + return "{$this->get_primary_folder()}/{$check->controller}";
|
|
| 127 | + } |
|
| 122 | 128 | } |
| 123 | 129 | |
| 124 | 130 | return '/Error404Controller'; |
@@ -126,8 +132,9 @@ discard block |
||
| 126 | 132 | |
| 127 | 133 | final private function get_primary_folder() |
| 128 | 134 | { |
| 129 | - if(Request::isAjax()) |
|
| 130 | - return 'ajax'; |
|
| 135 | + if(Request::isAjax()) {
|
|
| 136 | + return 'ajax'; |
|
| 137 | + } |
|
| 131 | 138 | |
| 132 | 139 | return URLDecode::getSite(); |
| 133 | 140 | } |
@@ -12,8 +12,8 @@ |
||
| 12 | 12 | $formatter = new LineFormatter('[%datetime%] %channel%.%level_name%: %message%'); |
| 13 | 13 | |
| 14 | 14 | $handler = new StreamHandler( |
| 15 | - __DIR__ . '/../../logs/site.log', |
|
| 16 | - Logger::DEBUG |
|
| 15 | + __DIR__ . '/../../logs/site.log', |
|
| 16 | + Logger::DEBUG |
|
| 17 | 17 | ); |
| 18 | 18 | $handler->setFormatter($formatter); |
| 19 | 19 | |