X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=aeda999825bb3569b34186c08dc59fac678e43d4;hb=e8e93768db29c83412262f2350233566c8838aa6;hp=ca7b4217a7fec420e92e56b030257ba2bac55845;hpb=65b0159282f7c702a17be399c703e9659e1efef5;p=friendica.git

diff --git a/index.php b/index.php
index ca7b4217a7..aeda999825 100644
--- 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
 	 */
@@ -78,11 +72,12 @@ if (!$install) {
 		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) == "")
@@ -178,9 +173,9 @@ $_SESSION['last_updated'] = defaults($_SESSION, 'last_updated', []);
 
 // 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);
@@ -225,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
@@ -299,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;
 }
@@ -311,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']);
 }
 
@@ -332,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);
 	}
 
@@ -371,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);
 	}
 }
@@ -447,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'];
 }