@@ -75,19 +75,19 @@ discard block |
||
75 | 75 | if($this->requires_trailing_slash() && substr($redirect_uri, -1) != '/') |
76 | 76 | $redirect_uri .= '/'; |
77 | 77 | |
78 | - if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
|
79 | - $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
|
80 | - $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
|
81 | - } |
|
78 | + if (URLDecode::getHost() == 'waterfalls.jacobemerick.com') { |
|
79 | + $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
|
80 | + $redirect_uri = $protocol . '://' . (!Loader::isLive() ? 'dev' : 'www') . '.waterfallsofthekeweenaw.com' . $redirect_uri; |
|
81 | + } |
|
82 | 82 | |
83 | 83 | if($redirect_uri == URLDecode::getURI()) |
84 | 84 | return; |
85 | 85 | |
86 | 86 | $controller_check = $redirect_uri; |
87 | 87 | if(substr($redirect_uri, 0, 4) == 'http') { |
88 | - $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
|
88 | + $protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http'; |
|
89 | 89 | $controller_check = preg_replace('@^' . $protocol . '://([a-z\.]+)@', '', $redirect_uri); |
90 | - } |
|
90 | + } |
|
91 | 91 | |
92 | 92 | $controller = $this->get_controller($controller_check); |
93 | 93 | if($controller == '/Error404Controller') |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | { |
139 | 139 | return ( |
140 | 140 | URLDecode::getExtension() != 'json' && |
141 | - strstr(URLDecode::getURI(), '#') === false); |
|
141 | + strstr(URLDecode::getURI(), '#') === false); |
|
142 | 142 | } |
143 | 143 | |
144 | 144 | } |