X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=2f23ea791a6e525009f5109652c911742c18096c;hb=abd7b2666c1ba79d44db0e71b369433cf8c8e678;hp=ca7b4217a7fec420e92e56b030257ba2bac55845;hpb=65b0159282f7c702a17be399c703e9659e1efef5;p=friendica.git diff --git a/index.php b/index.php index ca7b4217a7..2f23ea791a 100644 --- a/index.php +++ b/index.php @@ -24,9 +24,7 @@ use Friendica\Module\Login; require_once 'boot.php'; -if (empty($a)) { - $a = new App(__DIR__); -} +$a = new App(__DIR__); BaseObject::setApp($a); // We assume that the index.php is called by a frontend process @@ -53,9 +51,13 @@ if (!$install) { require_once "include/dba.php"; if (!$install) { - dba::connect($db_host, $db_user, $db_pass, $db_data, $install); + $result = dba::connect($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data); + if (!$result) { + System::unavailable(); + } + /** * Load configs from db. Overwrite configs from .htconfig.php */ @@ -78,6 +80,7 @@ if (!$install) { exit(); } + Config::init(); Session::init(); Addon::loadHooks(); Addon::callHooks('init_1'); @@ -225,8 +228,36 @@ if (strlen($a->module)) { */ // Compatibility with the Android Diaspora client - if ($a->module == "stream") { - $a->module = "network"; + if ($a->module == 'stream') { + goaway('network?f=&order=post'); + } + + if ($a->module == 'conversations') { + goaway('message'); + } + + if ($a->module == 'commented') { + goaway('network?f=&order=comment'); + } + + if ($a->module == 'liked') { + goaway('network?f=&order=comment'); + } + + if ($a->module == 'activity') { + goaway('network/?f=&conv=1'); + } + + if (($a->module == 'status_messages') && ($a->cmd == 'status_messages/new')) { + goaway('bookmarklet'); + } + + if (($a->module == 'user') && ($a->cmd == 'user/edit')) { + goaway('settings'); + } + + if (($a->module == 'tag_followings') && ($a->cmd == 'tag_followings/manage')) { + goaway('search'); } // Compatibility with the Firefox App