diaspora probe/scrape changes

[friendica.git] / index.php

diff --git a/index.php b/index.php
index cc17119b62c6c48f92e5b6dc57b483595261d7cf..80e8ca3b027de00de8c45540f790af8bfa0e0021 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
+
 /**
  *
  * Friendika
@@ -27,14 +27,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 @include(".htconfig.php");
 
-/**
- *
- * Get the language setting directly from system variables, bypassing get_config()
- * as database may not yet be configured.
- *
- */
-
-$lang = ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
+$lang = get_language();
        
 load_translation_table($lang);
 
@@ -49,6 +42,21 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
         unset($db_host, $db_user, $db_pass, $db_data);
 
 
+if(! $install) {
+
+       /**
+        * Load configs from db. Overwrite configs from .htconfig.php
+        */
+
+       load_config('config');
+       load_config('system');
+
+       require_once("session.php");
+       load_hooks();
+       call_hooks('init_1');
+}
+
+
 /**
  *
  * Important stuff we always need to do.
@@ -61,14 +69,6 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
  *
  */
 
-if(! $install) {
-       require_once("session.php");
-       load_hooks();
-       call_hooks('init_1');
-}
-
-
-
 require_once("datetime.php");
 
 $a->timezone = (($default_timezone) ? $default_timezone : 'UTC');
@@ -79,6 +79,19 @@ $a->init_pagehead();
 
 session_start();
 
+/**
+ * Language was set earlier, but we can over-ride it in the session.
+ * We have to do it here because the session was just now opened.
+ */
+
+if(x($_POST,'system_language'))
+       $_SESSION['language'] = $_POST['system_language'];
+if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
+       $lang = $_SESSION['language'];
+       load_translation_table($lang);
+}
+
+
 /**
  *
  * For Mozilla auth manager - still needs sorting, and this might conflict with LRDD header.
@@ -101,6 +114,9 @@ if(! x($_SESSION,'authenticated'))
 if(! x($_SESSION,'sysmsg'))
        $_SESSION['sysmsg'] = '';
 
+if(! x($_SESSION,'sysmsg_info'))
+       $_SESSION['sysmsg_info'] = '';
+
 /*
  * 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
@@ -178,12 +194,18 @@ if(strlen($a->module)) {
         */
 
        if(! $a->module_loaded) {
+
+               // Stupid browser tried to pre-fetch our ACL img template. Don't log the event or return anything - just quietly exit.
+               if((x($_SERVER,'QUERY_STRING')) && strpos($_SERVER['QUERY_STRING'],'{0}') !== false) {
+                       killme();
+               }
+
                if((x($_SERVER,'QUERY_STRING')) && ($_SERVER['QUERY_STRING'] === 'q=internal_error.html') && isset($dreamhost_error_hack)) {
                        logger('index.php: dreamhost_error_hack invoked. Original URI =' . $_SERVER['REQUEST_URI']);
                        goaway($a->get_baseurl() . $_SERVER['REQUEST_URI']);
                }
 
-               logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
+               logger('index.php: page not found: ' . $_SERVER['REQUEST_URI'] . ' ADDRESS: ' . $_SERVER['REMOTE_ADDR'] . ' QUERY: ' . $_SERVER['QUERY_STRING'], LOGGER_DEBUG);
                header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
                notice( t('Page not found.' ) . EOL);
        }
@@ -253,8 +275,16 @@ if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
 if(x($_SESSION,'sysmsg')) {
        $a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n"
                . ((x($a->page,'content')) ? $a->page['content'] : '');
+       $_SESSION['sysmsg']="";
        unset($_SESSION['sysmsg']);
 }
+if(x($_SESSION,'sysmsg_info')) {
+       $a->page['content'] = "<div id=\"sysmsg_info\" class=\"info-message\">{$_SESSION['sysmsg_info']}</div>\r\n"
+               . ((x($a->page,'content')) ? $a->page['content'] : '');
+       $_SESSION['sysmsg_info']="";
+       unset($_SESSION['sysmsg_info']);
+}
+
 
 
 call_hooks('page_end', $a->page['content']);