X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=c68e8836fdb97bf1e37d772f889b7f97d7512181;hb=1f890f03c885ce0761be80e69e678cce5f9ee46a;hp=82be959455933141957f2eb12bc9f5a4a2ff987b;hpb=c0f65f6ea76ffa035cbf2c4126bedaae9d8752c8;p=quix0rs-gnu-social.git

diff --git a/index.php b/index.php
index 82be959455..c68e8836fd 100644
--- a/index.php
+++ b/index.php
@@ -37,6 +37,9 @@
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  */
 
+// Comment in if you have xdebug installed and need a detailed backtrace:
+//xdebug_start_trace();
+
 $_startTime = microtime(true);
 $_perfCounters = array();
 
@@ -141,6 +144,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,30 +224,6 @@ function isLoginAction($action)
 
 function main()
 {
-    // fake HTTP redirects using lighttpd's 404 redirects
-    if (strpos($_SERVER['SERVER_SOFTWARE'], 'lighttpd') !== false) {
-        $_lighty_url = $_SERVER['REQUEST_URI'];
-        $_lighty_url = @parse_url($_lighty_url);
-
-        if ($_lighty_url['path'] != '/index.php' && $_lighty_url['path'] != '/') {
-            $_lighty_path = preg_replace('/^'.preg_quote(common_config('site', 'path')).'\//', '', substr($_lighty_url['path'], 1));
-            $_SERVER['QUERY_STRING'] = 'p='.$_lighty_path;
-            if (isset($_lighty_url['query']) && $_lighty_url['query'] != '') {
-                $_SERVER['QUERY_STRING'] .= '&'.$_lighty_url['query'];
-                parse_str($_lighty_url['query'], $_lighty_query);
-                foreach ($_lighty_query as $key => $val) {
-                    $_GET[$key] = $_REQUEST[$key] = $val;
-                }
-            }
-            $_GET['p'] = $_REQUEST['p'] = $_lighty_path;
-        }
-    }
-    $_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()) {
@@ -284,9 +268,8 @@ 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));
-        return;
     }
 
     $args = array_merge($args, $_REQUEST);
@@ -297,7 +280,6 @@ function main()
 
     if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {
         common_redirect(common_local_url('public'));
-        return;
     }
 
     // If the site is private, and they're not on one of the "public"
@@ -324,7 +306,6 @@ function main()
         common_set_returnto(common_local_url($action, $rargs));
 
         common_redirect(common_local_url('login'));
-        return;
     }
 
     $action_class = ucfirst($action).'Action';
@@ -336,14 +317,14 @@ function main()
     } else {
         try {
             call_user_func("$action_class::run", $args);
-        } catch (ClientException $cex) {
-            $cac = new ClientErrorAction($cex->getMessage(), $cex->getCode());
+        } catch (ClientException $e) {
+            $cac = new ClientErrorAction($e->getMessage(), $e->getCode());
             $cac->showPage();
-        } catch (ServerException $sex) { // snort snort guffaw
-            $sac = new ServerErrorAction($sex->getMessage(), $sex->getCode(), $sex);
+        } catch (ServerException $e) { // snort snort guffaw
+            $sac = new ServerErrorAction($e->getMessage(), $e->getCode(), $e);
             $sac->showPage();
-        } catch (Exception $ex) {
-            $sac = new ServerErrorAction($ex->getMessage(), 500, $ex);
+        } catch (Exception $e) {
+            $sac = new ServerErrorAction($e->getMessage(), 500, $e);
             $sac->showPage();
         }
     }