Merge pull request #1 from friendica/2018.05-rc

[friendica.git/.git] / index.php

diff --git a/index.php b/index.php
index af493f2..aeda999 100644 (file)
--- a/index.php
+++ b/index.php
@@ -24,25 +24,15 @@ 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
 // The value is set to "true" by default in boot.php
 $a->backend = false;
 
-/**
- * Load the configuration file which contains our DB credentials.
- * Ignore errors. If the file doesn't exist or is empty, we are running in
- * installation mode.
- */
-
-$install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false : true);
-
-// Only load config if found, don't surpress errors
-if (!$install) {
+// Only load config if found, don't suppress errors
+if (!$a->mode == App::MODE_INSTALL) {
        include ".htconfig.php";
 }
 
@@ -52,10 +42,14 @@ if (!$install) {
 
 require_once "include/dba.php";
 
-if (!$install) {
-       dba::connect($db_host, $db_user, $db_pass, $db_data, $install);
+if (!$a->mode == App::MODE_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
         */
@@ -72,17 +66,18 @@ 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();
        }
 
+       Config::init();
        Session::init();
        Addon::loadHooks();
        Addon::callHooks('init_1');
 
-       $maintenance = Config::get('system', 'maintenance');
+       $a->checkMaintenanceMode();
 }
 
 $lang = L10n::getBrowserLanguage();
@@ -126,7 +121,7 @@ if ((x($_SESSION, 'language')) && ($_SESSION['language'] !== $lang)) {
        L10n::loadTranslationTable($lang);
 }
 
-if ((x($_GET, 'zrl')) && (!$install && !$maintenance)) {
+if ((x($_GET, 'zrl')) && $a->mode == App::MODE_NORMAL) {
        // Only continue when the given profile link seems valid
        // Valid profile links contain a path with "/profile/" and no query parameters
        if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "")
@@ -166,19 +161,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') === false) {
-       $_SESSION['sysmsg'] = [];
-}
-
-if (x($_SESSION, 'sysmsg_info') === false) {
-       $_SESSION['sysmsg_info'] = [];
-}
-
-// Array for informations about last received items
-if (x($_SESSION, 'last_updated') === false) {
-       $_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
@@ -187,9 +173,9 @@ if (x($_SESSION, 'last_updated') === false) {
 
 // in install mode, any url loads install module
 // but we need "view" module for stylesheet
-if ($install && $a->module!="view") {
+if ($a->mode == App::MODE_INSTALL && $a->module!="view") {
        $a->module = 'install';
-} elseif ($maintenance && $a->module!="view") {
+} elseif ($a->mode == App::MODE_MAINTENANCE && $a->module!="view") {
        $a->module = 'maintenance';
 } else {
        check_url($a);
@@ -234,8 +220,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
@@ -308,7 +322,7 @@ if (strlen($a->module)) {
 /**
  * Load current theme info
  */
-$theme_info_file = "view/theme/".current_theme()."/theme.php";
+$theme_info_file = 'view/theme/' . $a->getCurrentTheme() . '/theme.php';
 if (file_exists($theme_info_file)) {
        require_once $theme_info_file;
 }
@@ -320,7 +334,7 @@ if (! x($a->page, 'content')) {
        $a->page['content'] = '';
 }
 
-if (!$install && !$maintenance) {
+if ($a->mode == App::MODE_NORMAL) {
        Addon::callHooks('page_content_top', $a->page['content']);
 }
 
@@ -341,8 +355,8 @@ if ($a->module_loaded) {
                $func($a);
        }
 
-       if (function_exists(str_replace('-', '_', current_theme()) . '_init')) {
-               $func = str_replace('-', '_', current_theme()) . '_init';
+       if (function_exists(str_replace('-', '_', $a->getCurrentTheme()) . '_init')) {
+               $func = str_replace('-', '_', $a->getCurrentTheme()) . '_init';
                $func($a);
        }
 
@@ -380,8 +394,8 @@ if ($a->module_loaded) {
                $a->page['content'] .= $arr['content'];
        }
 
-       if (function_exists(str_replace('-', '_', current_theme()) . '_content_loaded')) {
-               $func = str_replace('-', '_', current_theme()) . '_content_loaded';
+       if (function_exists(str_replace('-', '_', $a->getCurrentTheme()) . '_content_loaded')) {
+               $func = str_replace('-', '_', $a->getCurrentTheme()) . '_content_loaded';
                $func($a);
        }
 }
@@ -456,7 +470,7 @@ if ($a->is_mobile || $a->is_tablet) {
  */
 
 if (!$a->theme['stylesheet']) {
-       $stylesheet = current_theme_url();
+       $stylesheet = $a->getCurrentThemeStylesheetPath();
 } else {
        $stylesheet = $a->theme['stylesheet'];
 }