Merge pull request #486 from cvogeley/master

[friendica.git] / index.php

diff --git a/index.php b/index.php
index a409f47b41bf2dff1a48b406793a878587d677cd..eaa7295e26cd8e565e8097410a749c2bf11c4df4 100644 (file)
--- 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);
 
@@ -59,8 +61,7 @@ if(! $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 @@ if(! $install) {
  *
  */
 
-require_once("datetime.php");
-
-$a->timezone = (($default_timezone) ? $default_timezone : 'UTC');
-
-date_default_timezone_set($a->timezone);
-
 session_start();
 
 /**
@@ -125,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'))
@@ -253,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);
        }
@@ -273,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'];
        }
 
 }