Merge remote-tracking branch 'upstream/master'

[friendica.git] / index.php

diff --git a/index.php b/index.php
index bd5b3e396eede03224986634504e6cd915d1e59b..40551f3881cf22860f0fd89b797c15513e88c345 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,5 +1,6 @@
 <?php
 
+
 /**
  *
  * Friendica
@@ -31,9 +32,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 
 
-$lang = get_browser_language();
-       
-load_translation_table($lang);
+
 
 /**
  *
@@ -41,9 +40,9 @@ load_translation_table($lang);
  *
  */
 
-require_once("dba.php");
+require_once("include/dba.php");
 
-if(! $install) {
+if(!$install) {
        $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
            unset($db_host, $db_user, $db_pass, $db_data);
 
@@ -54,11 +53,16 @@ if(! $install) {
        load_config('config');
        load_config('system');
 
-       require_once("session.php");
+       require_once("include/session.php");
        load_hooks();
        call_hooks('init_1');
+
+       $maintenance = get_config('system', 'maintenance');
 }
 
+$lang = get_browser_language();
+
+load_translation_table($lang);
 
 /**
  *
@@ -89,7 +93,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
        load_translation_table($lang);
 }
 
-if((x($_GET,'zrl')) && (! $install)) {
+if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
        $_SESSION['my_url'] = $_GET['zrl'];
        $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
        zrl_init($a);
@@ -109,7 +113,7 @@ if((x($_GET,'zrl')) && (! $install)) {
 // header('Link: <' . $a->get_baseurl() . '/amcd>; rel="acct-mgmt";');
 
 if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module === 'login'))
-       require("auth.php");
+       require("include/auth.php");
 
 if(! x($_SESSION,'authenticated'))
        header('X-Account-Management-Status: none');
@@ -135,8 +139,13 @@ if(! x($_SESSION,'sysmsg_info'))
 
 if($install)
        $a->module = 'install';
-else
-       check_config($a);
+elseif($maintenance)
+       $a->module = 'maintenance';
+else {
+       check_url($a);
+       check_db();
+       check_plugins($a);
+}
 
 nav_set_selected('nothing');
 
@@ -237,7 +246,7 @@ if (file_exists($theme_info_file)){
 if(! x($a->page,'content'))
        $a->page['content'] = '';
 
-if(! $install)
+if(!$install && !$maintenance)
        call_hooks('page_content_top',$a->page['content']);
 
 /**
@@ -372,20 +381,14 @@ $a->page['content'] .=  '<div id="pause"></div>';
  *
  */
 
-if($a->module != 'install') {
+if($a->module != 'install' && $a->module != 'maintenance') {
        nav($a);
 }
 
 /**
- * Build the page - now that we have all the components
+ * Add a "toggle mobile" link if we're using a mobile device
  */
 
-if(!$a->theme['stylesheet'])
-       $stylesheet = current_theme_url();
-else
-       $stylesheet = $a->theme['stylesheet'];
-$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
-
 if($a->is_mobile || $a->is_tablet) {
        if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) {
                $link = $a->get_baseurl() . '/toggle_mobile?address=' . curPageURL();
@@ -399,6 +402,16 @@ if($a->is_mobile || $a->is_tablet) {
                         ));
 }
 
+/**
+ * Build the page - now that we have all the components
+ */
+
+if(!$a->theme['stylesheet'])
+       $stylesheet = current_theme_url();
+else
+       $stylesheet = $a->theme['stylesheet'];
+$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet));
+
 $page    = $a->page;
 $profile = $a->profile;