Frio: add template for admin/users

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 2f07fa9af98b6fc3ad2c2590582a9af9ff3598ee..2f23ea791a6e525009f5109652c911742c18096c 100644 (file)
--- a/index.php
+++ b/index.php
@@ -12,10 +12,11 @@ use Friendica\App;
 use Friendica\BaseObject;
 use Friendica\Content\Nav;
 use Friendica\Core\Addon;
-use Friendica\Core\System;
-use Friendica\Core\Theme;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Session;
+use Friendica\Core\System;
+use Friendica\Core\Theme;
 use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\Profile;
@@ -23,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
@@ -52,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
         */
@@ -71,13 +74,14 @@ if (!$install) {
        if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http")
                && (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL)
                && (substr(System::baseUrl(), 0, 8) == "https://")
-       ) {
+               && ($_SERVER['REQUEST_METHOD'] == 'GET')) {
                header("HTTP/1.1 302 Moved Temporarily");
                header("Location: " . System::baseUrl() . "/" . $a->query_string);
                exit();
        }
 
-       require_once 'include/session.php';
+       Config::init();
+       Session::init();
        Addon::loadHooks();
        Addon::callHooks('init_1');
 
@@ -165,19 +169,10 @@ if (! x($_SESSION, 'authenticated')) {
 $a->page['htmlhead'] = '';
 $a->page['end'] = '';
 
+$_SESSION['sysmsg']       = defaults($_SESSION, 'sysmsg'      , []);
+$_SESSION['sysmsg_info']  = defaults($_SESSION, 'sysmsg_info' , []);
+$_SESSION['last_updated'] = defaults($_SESSION, 'last_updated', []);
 
-if (! x($_SESSION, 'sysmsg')) {
-       $_SESSION['sysmsg'] = [];
-}
-
-if (! x($_SESSION, 'sysmsg_info')) {
-       $_SESSION['sysmsg_info'] = [];
-}
-
-// Array for informations about last received items
-if (! x($_SESSION, 'last_updated')) {
-       $_SESSION['last_updated'] = [];
-}
 /*
  * check_config() is responsible for running update scripts. These automatically
  * update the DB schema whenever we push a new one out. It also checks to see if
@@ -233,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
@@ -474,7 +497,7 @@ if (isset($_GET["mode"]) && (($_GET["mode"] == "raw") || ($_GET["mode"] == "mini
        /// @TODO one day, kill those error-surpressing @ stuff, or PHP should ban it
        @$doc->loadHTML($content);
 
-       $xpath = new DomXPath($doc);
+       $xpath = new DOMXPath($doc);
 
        $list = $xpath->query("//*[contains(@id,'tread-wrapper-')]");  /* */