Merge remote-tracking branch 'friendika/master'

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 51c87cae6e6feff8b7f4abee66c6a4a61a76f635..3d8648528cf7609f5e847fc5572d10c736ddaea1 100644 (file)
--- a/index.php
+++ b/index.php
@@ -84,8 +84,12 @@ 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);
@@ -112,10 +116,10 @@ if(! x($_SESSION,'authenticated'))
        header('X-Account-Management-Status: none');
 
 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 
@@ -136,7 +140,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 +210,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 */
@@ -262,7 +275,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.'));
 }
 
@@ -272,7 +285,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']="";
@@ -283,7 +296,7 @@ if(x($_SESSION,'sysmsg_info')) {
                . ((x($a->page,'content')) ? $a->page['content'] : '');
        $_SESSION['sysmsg_info']="";
        unset($_SESSION['sysmsg_info']);
-}
+}*/