X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=1d0aabb8bb375ea0592ba138e2b3a0ca72a9e5c7;hb=3d0994bccaae80ea10fb07ff55560ccaf20056ae;hp=1566399fa2f351e8381796397d0f697b5b4e617f;hpb=f79aec36feaa4760201a7e88d5b31513a3c458ba;p=quix0rs-gnu-social.git

diff --git a/index.php b/index.php
index 1566399fa2..1d0aabb8bb 100644
--- a/index.php
+++ b/index.php
@@ -41,8 +41,8 @@ $_startTime = microtime(true);
 $_perfCounters = array();
 
 define('INSTALLDIR', dirname(__FILE__));
-define('STATUSNET', true);
-define('LACONICA', true); // compatibility
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 $user = null;
 $action = null;
@@ -201,29 +201,9 @@ function setupRW()
     return;
 }
 
-function checkMirror($action_obj, $args)
-{
-    global $config;
-
-    if (common_config('db', 'mirror') && $action_obj->isReadOnly($args)) {
-        if (is_array(common_config('db', 'mirror'))) {
-            // "load balancing", ha ha
-            $arr = common_config('db', 'mirror');
-            $k = array_rand($arr);
-            $mirror = $arr[$k];
-        } else {
-            $mirror = common_config('db', 'mirror');
-        }
-
-        // everyone else uses the mirror
-
-        $config['db']['database'] = $mirror;
-    }
-}
-
 function isLoginAction($action)
 {
-    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch', 'rsd', 'hostmeta');
+    static $loginActions =  array('login', 'recoverpassword', 'api', 'doc', 'register', 'publicxrds', 'otp', 'opensearch', 'rsd');
 
     $login = null;
 
@@ -262,8 +242,6 @@ function main()
     }
     global $user, $action;
 
-    Snapshot::check();
-
     if (!_have_config()) {
         $msg = sprintf(
             // TRANS: Error message displayed when there is no StatusNet configuration file.
@@ -308,18 +286,16 @@ function main()
     // If the request is HTTP and it should be HTTPS...
     if ($site_ssl != 'never' && !StatusNet::isHTTPS() && common_is_sensitive($args['action'])) {
         common_redirect(common_local_url($args['action'], $args));
-        return;
     }
 
     $args = array_merge($args, $_REQUEST);
 
     Event::handle('ArgsInitialize', array(&$args));
 
-    $action = $args['action'];
+    $action = basename($args['action']);
 
     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"
@@ -346,7 +322,6 @@ function main()
         common_set_returnto(common_local_url($action, $rargs));
 
         common_redirect(common_local_url('login'));
-        return;
     }
 
     $action_class = ucfirst($action).'Action';
@@ -356,14 +331,8 @@ function main()
         $cac = new ClientErrorAction(_('Unknown action'), 404);
         $cac->showPage();
     } else {
-        $action_obj = new $action_class();
-
-        checkMirror($action_obj, $args);
-
         try {
-            if ($action_obj->prepare($args)) {
-                $action_obj->handle($args);
-            }
+            call_user_func("$action_class::run", $args);
         } catch (ClientException $cex) {
             $cac = new ClientErrorAction($cex->getMessage(), $cex->getCode());
             $cac->showPage();