remove javascript to set selectect nav item. enanche img template prefetch ignoring

[friendica.git] / index.php

diff --git a/index.php b/index.php
index a58e4730fa42fe77744b18c548af26f7b5f141a3..51c87cae6e6feff8b7f4abee66c6a4a61a76f635 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,7 +1,5 @@
 <?php
 
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
 /**
  *
  * Friendika
@@ -50,15 +48,8 @@ if(! $install) {
         * Load configs from db. Overwrite configs from .htconfig.php
         */
 
-       $r = q("SELECT * FROM `config` WHERE `cat` IN ('system', 'config')");
-       foreach ($r as $c) {
-               if ($c['cat']=='config') {
-                       $a->config[$c['k']] = $c['v'];
-               } else {
-                       $a->config[$c['cat']][$c['k']] = $c['v'];
-               }
-       }
-       unset($r);
+       load_config('config');
+       load_config('system');
 
        require_once("session.php");
        load_hooks();
@@ -203,12 +194,18 @@ if(strlen($a->module)) {
         */
 
        if(! $a->module_loaded) {
+
+               // Stupid browser tried to pre-fetch our Javascript img template. Don't log the event or return anything - just quietly exit.
+               if((x($_SERVER,'QUERY_STRING')) && preg_match('/{[0-9]}/',$_SERVER['QUERY_STRING']) !== 0) {
+                       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);
        }
@@ -309,7 +306,6 @@ $a->page['content'] .=  '<div id="pause"></div>';
  */
 
 if($a->module != 'install') {
-       require_once('nav.php');
        nav($a);
 }