X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=94329eedc833a150f5cab8f27693fa9d3da1ed5c;hb=789063da399675575f61e150f11dbe534d7db3c5;hp=0916ed8b10e2e4e3ff436d11d265950dbc02b8aa;hpb=953840cf822718cba66a0727b576c674c6e44875;p=friendica.git

diff --git a/index.php b/index.php
old mode 100755
new mode 100644
index 0916ed8b10..94329eedc8
--- a/index.php
+++ b/index.php
@@ -27,7 +27,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 @include(".htconfig.php");
 
-$lang = get_language();
+$lang = get_browser_language();
 	
 load_translation_table($lang);
 
@@ -38,11 +38,10 @@ load_translation_table($lang);
  */
 
 require_once("dba.php");
-$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
-        unset($db_host, $db_user, $db_pass, $db_data);
-
 
 if(! $install) {
+	$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
@@ -93,6 +92,11 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	load_translation_table($lang);
 }
 
+if((x($_GET,'zrl')) && (! $install)) {
+	$_SESSION['my_url'] = $_GET['zrl'];
+	$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
+	zrl_init($a);
+}
 
 /**
  *
@@ -240,6 +244,8 @@ if (file_exists($theme_info_file)){
 if(! x($a->page,'content'))
 	$a->page['content'] = '';
 
+if(! $install)
+	call_hooks('page_content_top',$a->page['content']);
 
 /**
  * Call module functions
@@ -252,6 +258,18 @@ if($a->module_loaded) {
 		$func($a);
 	}
 
+	if(function_exists(str_replace('-','_',current_theme()) . '_init')) {
+		$func = str_replace('-','_',current_theme()) . '_init';
+		$func($a);
+	}
+//	elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/theme.php")) {
+//		require_once("view/theme/".$a->theme_info["extends"]."/theme.php");
+//		if(function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_init')) {
+//			$func = str_replace('-','_',$a->theme_info["extends"]) . '_init';
+//			$func($a);
+//		}
+//	}
+
 	if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
 		&& (function_exists($a->module . '_post'))
 		&& (! x($_POST,'auth-params'))) {
@@ -342,13 +360,13 @@ $profile = $a->profile;
 
 header("Content-type: text/html; charset=utf-8");
 
-$template = 'view/' . current_theme() . '/' 
+$template = 'view/theme/' . current_theme() . '/' 
 	. ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php';
 
 if(file_exists($template))
 	require_once($template);
 else
-	require_once(str_replace(current_theme() . '/', '', $template));
+	require_once(str_replace('theme/' . current_theme() . '/', '', $template));
 
 session_write_close();
 exit;