X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=index.php;h=eaa7295e26cd8e565e8097410a749c2bf11c4df4;hb=16eec24a21d612664aae5b49a703d12fb835646a;hp=5dd93523e3a78dd86e99a7df6ba1165f44aedebd;hpb=39405c8056b4a1d55c97fb2963d8776695dbeb30;p=friendica.git

diff --git a/index.php b/index.php
index 5dd93523e3..eaa7295e26 100644
--- a/index.php
+++ b/index.php
@@ -13,8 +13,10 @@
  */
 
 require_once('boot.php');
+require_once('object/BaseObject.php');
 
 $a = new App;
+BaseObject::set_app($a);
 
 /**
  *
@@ -27,7 +29,7 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
 
 @include(".htconfig.php");
 
-$lang = get_language();
+$lang = get_browser_language();
 	
 load_translation_table($lang);
 
@@ -40,8 +42,8 @@ load_translation_table($lang);
 require_once("dba.php");
 
 if(! $install) {
-$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
-        unset($db_host, $db_user, $db_pass, $db_data);
+	$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
@@ -59,8 +61,7 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
 /**
  *
  * Important stuff we always need to do.
- * Initialise authentication and  date and time. 
- * Create the HTML head for the page, even if we may not use it (xml, etc.)
+ *
  * The order of these may be important so use caution if you think they're all
  * intertwingled with no logical order and decide to sort it out. Some of the
  * dependencies have changed, but at least at one time in the recent past - the 
@@ -68,12 +69,6 @@ $db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
  *
  */
 
-require_once("datetime.php");
-
-$a->timezone = (($default_timezone) ? $default_timezone : 'UTC');
-
-date_default_timezone_set($a->timezone);
-
 session_start();
 
 /**
@@ -92,9 +87,10 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 	load_translation_table($lang);
 }
 
-if(x($_GET,'zrl')) {
+if((x($_GET,'zrl')) && (! $install)) {
 	$_SESSION['my_url'] = $_GET['zrl'];
 	$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
+	zrl_init($a);
 }
 
 /**
@@ -124,6 +120,12 @@ if(! x($_SESSION,'authenticated'))
 
 $a->init_pagehead();
 
+/**
+ * Build the page ending -- this is stuff that goes right before
+ * the closing </body> tag
+ */
+
+$a->init_page_end();
 
 
 if(! x($_SESSION,'sysmsg'))
@@ -252,7 +254,10 @@ if(! $install)
 
 if($a->module_loaded) {
 	$a->page['page_title'] = $a->module;
+	$placeholder = '';
+
 	if(function_exists($a->module . '_init')) {
+		call_hooks($a->module . '_mod_init', $placeholder);
 		$func = $a->module . '_init';
 		$func($a);
 	}
@@ -272,18 +277,25 @@ if($a->module_loaded) {
 	if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
 		&& (function_exists($a->module . '_post'))
 		&& (! x($_POST,'auth-params'))) {
+		call_hooks($a->module . '_mod_post', $_POST);
 		$func = $a->module . '_post';
 		$func($a);
 	}
 
 	if((! $a->error) && (function_exists($a->module . '_afterpost'))) {
+		call_hooks($a->module . '_mod_afterpost',$placeholder);
 		$func = $a->module . '_afterpost';
 		$func($a);
 	}
 
 	if((! $a->error) && (function_exists($a->module . '_content'))) {
+		$arr = array('content' => $a->page['content']);
+		call_hooks($a->module . '_mod_content', $arr);
+		$a->page['content'] = $arr['content'];
 		$func = $a->module . '_content';
-		$a->page['content'] .= $func($a);
+		$arr = array('content' => $func($a));
+		call_hooks($a->module . '_mod_aftercontent', $arr);
+		$a->page['content'] .= $arr['content'];
 	}
 
 }