X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=e7227962f479436a31cfff2054dc79bdcb995920;hb=355c42cb309eb1313097411067ca999b699aa620;hp=9bca1527bfc99f1926d89fdc1280475e0ad2b465;hpb=b1184f3fdeb4dcc6126b7ea8d7ac1a2980c9cbac;p=friendica.git

diff --git a/index.php b/index.php
index 9bca1527bf..e7227962f4 100644
--- a/index.php
+++ b/index.php
@@ -1,10 +1,8 @@
 <?php
 
-error_reporting(E_ERROR | E_WARNING | E_PARSE);
-
 /**
  *
- * Friendika
+ * Friendica
  *
  */
 
@@ -44,18 +42,19 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
         unset($db_host, $db_user, $db_pass, $db_data);
 
 
-/**
- * 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'];
-	}
+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');
 }
-unset($r);
 
 
 /**
@@ -70,22 +69,12 @@ unset($r);
  *
  */
 
-if(! $install) {
-	require_once("session.php");
-	load_hooks();
-	call_hooks('init_1');
-}
-
-
-
 require_once("datetime.php");
 
 $a->timezone = (($default_timezone) ? $default_timezone : 'UTC');
 
 date_default_timezone_set($a->timezone);
 
-$a->init_pagehead();
-
 session_start();
 
 /**
@@ -93,13 +82,21 @@ session_start();
  * We have to do it here because the session was just now opened.
  */
 
-if(x($_POST,'system_language'))
-	$_SESSION['language'] = $_POST['system_language'];
+if(array_key_exists('system_language',$_POST)) {
+	if(strlen($_POST['system_language']))
+		$_SESSION['language'] = $_POST['system_language'];
+	else
+		unset($_SESSION['language']);
+}
 if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	$lang = $_SESSION['language'];
 	load_translation_table($lang);
 }
 
+if(x($_GET,'zrl')) {
+	$_SESSION['my_url'] = $_GET['zrl'];
+	$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
+}
 
 /**
  *
@@ -120,11 +117,21 @@ if((x($_SESSION,'authenticated')) || (x($_POST,'auth-params')) || ($a->module ==
 if(! x($_SESSION,'authenticated'))
 	header('X-Account-Management-Status: none');
 
+
+/*
+ * Create the page head after setting the language
+ * and getting any auth credentials
+ */
+
+$a->init_pagehead();
+
+
+
 if(! x($_SESSION,'sysmsg'))
-	$_SESSION['sysmsg'] = '';
+	$_SESSION['sysmsg'] = array();
 
 if(! x($_SESSION,'sysmsg_info'))
-	$_SESSION['sysmsg_info'] = '';
+	$_SESSION['sysmsg_info'] = array();
 
 /*
  * check_config() is responsible for running update scripts. These automatically 
@@ -138,6 +145,7 @@ if($install)
 else
 	check_config($a);
 
+nav_set_selected('nothing');
 
 $arr = array('app_menu' => $a->apps);
 
@@ -145,7 +153,6 @@ call_hooks('app_menu', $arr);
 
 $a->apps = $arr['app_menu'];
 
-
 /**
  *
  * We have already parsed the server path into $a->argc and $a->argv
@@ -203,17 +210,33 @@ 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);
+		$tpl = get_markup_template("404.tpl");
+		$a->page['content'] = replace_macros($tpl, array(
+			'$message' =>  t('Page not found.' )
+		));
 	}
 }
 
+/**
+ * load current theme info
+ */
+$theme_info_file = "view/theme/".current_theme()."/theme.php";
+if (file_exists($theme_info_file)){
+	require_once($theme_info_file);
+}
 
 
 /* initialise content region */
@@ -221,6 +244,8 @@ if(strlen($a->module)) {
 if(! x($a->page,'content'))
 	$a->page['content'] = '';
 
+if(! $install)
+	call_hooks('page_content_top',$a->page['content']);
 
 /**
  * Call module functions
@@ -265,7 +290,7 @@ if(isset($homebase))
 // now that we've been through the module content, see if the page reported
 // a permission problem and if so, a 403 response would seem to be in order.
 
-if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
+if(stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) {
 	header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
 }
 
@@ -275,7 +300,7 @@ if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
  *
  */
 	
-if(x($_SESSION,'sysmsg')) {
+/*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']="";
@@ -286,7 +311,7 @@ if(x($_SESSION,'sysmsg_info')) {
 		. ((x($a->page,'content')) ? $a->page['content'] : '');
 	$_SESSION['sysmsg_info']="";
 	unset($_SESSION['sysmsg_info']);
-}
+}*/
 
 
 
@@ -309,7 +334,6 @@ $a->page['content'] .=  '<div id="pause"></div>';
  */
 
 if($a->module != 'install') {
-	require_once('nav.php');
 	nav($a);
 }
 
@@ -324,13 +348,13 @@ $profile = $a->profile;
 
 header("Content-type: text/html; charset=utf-8");
 
-$template = 'view/' . $lang . '/' 
+$template = 'view/' . current_theme() . '/' 
 	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
 
 if(file_exists($template))
 	require_once($template);
 else
-	require_once(str_replace($lang . '/', '', $template));
+	require_once(str_replace(current_theme() . '/', '', $template));
 
 session_write_close();
 exit;