X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=aeda999825bb3569b34186c08dc59fac678e43d4;hb=24ef818d0d9b1e7a1d807abb540aec4216e24e32;hp=4c3065a9583404bef6380681bfdf3a4a827343c7;hpb=afced187bc41ad421a748a26d500db44968fb0df;p=friendica.git diff --git a/index.php b/index.php index 4c3065a958..aeda999825 100644 --- a/index.php +++ b/index.php @@ -31,17 +31,9 @@ BaseObject::setApp($a); // 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('config/.htconfig.php') && filesize('config/.htconfig.php')) ? false : true); - -// Only load config if found, don't surpress errors -if (!$install) { - include "config/.htconfig.php"; +// Only load config if found, don't suppress errors +if (!$a->mode == App::MODE_INSTALL) { + include ".htconfig.php"; } /** @@ -50,7 +42,7 @@ if (!$install) { require_once "include/dba.php"; -if (!$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); @@ -85,7 +77,7 @@ if (!$install) { Addon::loadHooks(); Addon::callHooks('init_1'); - $maintenance = Config::get('system', 'maintenance'); + $a->checkMaintenanceMode(); } $lang = L10n::getBrowserLanguage(); @@ -129,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) == "") @@ -181,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); @@ -330,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; } @@ -342,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']); } @@ -363,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); } @@ -402,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); } } @@ -478,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']; }