X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=44599d68e94b146465af18a657ecb7660981e757;hb=8ad6b8809a8d452ee36de62b73c32cba849ee036;hp=f258a52397541f9dc22622fc238474417afef01e;hpb=f42f7a1c854a54fc9b1972067f7e2e5fc2f11f4b;p=quix0rs-gnu-social.git diff --git a/index.php b/index.php index f258a52397..44599d68e9 100644 --- a/index.php +++ b/index.php @@ -141,6 +141,11 @@ function handleError($error) set_exception_handler('handleError'); +// quick check for fancy URL auto-detection support in installer. +if (preg_replace("/\?.+$/", "", $_SERVER['REQUEST_URI']) === preg_replace("/^\/$/", "", (dirname($_SERVER['REQUEST_URI']))) . '/check-fancy') { + die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs."); +} + require_once INSTALLDIR . '/lib/common.php'; /** @@ -216,12 +221,6 @@ function isLoginAction($action) function main() { - $_SERVER['REDIRECT_URL'] = preg_replace("/\?.+$/", "", $_SERVER['REQUEST_URI']); - - // quick check for fancy URL auto-detection support in installer. - if (isset($_SERVER['REDIRECT_URL']) && (preg_replace("/^\/$/", "", (dirname($_SERVER['REQUEST_URI']))) . '/check-fancy') === $_SERVER['REDIRECT_URL']) { - die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs."); - } global $user, $action; if (!_have_config()) { @@ -266,7 +265,7 @@ function main() $site_ssl = common_config('site', 'ssl'); // If the request is HTTP and it should be HTTPS... - if ($site_ssl != 'never' && !StatusNet::isHTTPS() && common_is_sensitive($args['action'])) { + if ($site_ssl != 'never' && !GNUsocial::isHTTPS() && common_is_sensitive($args['action'])) { common_redirect(common_local_url($args['action'], $args)); }