Merge pull request #415 from 23n/patch-2

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 3db8170ef4fe4d8cfd507e0f7e04bd11227a36c0..c9b7f34d72ac14719dad0db5d567f08a085df060 100644 (file)
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 
 /**
  *
- * Friendika
+ * Friendica
  *
  */
 
@@ -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
@@ -60,8 +59,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 
@@ -69,14 +67,6 @@ if(! $install) {
  *
  */
 
-require_once("datetime.php");
-
-$a->timezone = (($default_timezone) ? $default_timezone : 'UTC');
-
-date_default_timezone_set($a->timezone);
-
-$a->init_pagehead();
-
 session_start();
 
 /**
@@ -84,13 +74,22 @@ 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')) && (! $install)) {
+       $_SESSION['my_url'] = $_GET['zrl'];
+       $a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
+       zrl_init($a);
+}
 
 /**
  *
@@ -111,6 +110,22 @@ 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();
+
+/**
+ * Build the page ending -- this is stuff that goes right before
+ * the closing </body> tag
+ */
+
+$a->init_page_end();
+
+
 if(! x($_SESSION,'sysmsg'))
        $_SESSION['sysmsg'] = array();
 
@@ -129,6 +144,7 @@ if($install)
 else
        check_config($a);
 
+nav_set_selected('nothing');
 
 $arr = array('app_menu' => $a->apps);
 
@@ -136,7 +152,6 @@ call_hooks('app_menu', $arr);
 
 $a->apps = $arr['app_menu'];
 
-
 /**
  *
  * We have already parsed the server path into $a->argc and $a->argv
@@ -207,10 +222,20 @@ if(strlen($a->module)) {
 
                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 */
@@ -218,6 +243,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
@@ -225,26 +252,48 @@ if(! x($a->page,'content'))
 
 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);
        }
 
+       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'))) {
+               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'];
        }
 
 }
@@ -320,13 +369,13 @@ $profile = $a->profile;
 
 header("Content-type: text/html; charset=utf-8");
 
-$template = 'view/' . $lang . '/' 
+$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($lang . '/', '', $template));
+       require_once(str_replace('theme/' . current_theme() . '/', '', $template));
 
 session_write_close();
 exit;