more robust feed error handling, at the expense of performance.

[friendica.git] / index.php

diff --git a/index.php b/index.php
index 52ea58374e8fa4d0d55b2258831349c304e4bdf3..0de0afd48d01867e7c1649bccf9c06d73ac297e9 100644 (file)
--- a/index.php
+++ b/index.php
@@ -26,6 +26,7 @@ $a->init_pagehead();
 
 session_start();
 
+
 if((x($_SESSION,'authenticated')) || (x($_POST['auth-params'])))
        require("auth.php");
 
@@ -41,23 +42,10 @@ if(strlen($a->module)) {
        }
        else {
                header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . t('Not Found'));
-               notice( t('Page not found' ) . EOL);
+               notice( t('Page not found.' ) . EOL);
        }
 }
 
-// invoke module functions
-// Important: Modules normally do not emit content, unless you need it for debugging.
-// The module_init, module_post, and module_afterpost functions process URL parameters and POST processing.
-// The module_content function returns content text to this file where it is included on the page.
-// Modules emitting XML/Atom, etc. should do so idirectly and promptly exit before the HTML page can be rendered.
-// "Most" HTML resides in the view directory as text templates with macro substitution. 
-// They look like HTML with PHP variables but only a couple pass through the PHP processor - those with .php extensions.
-// The macro substitution is defined per page for the .tpl files. 
-// Information transfer between functions can be accomplished via the App session '$a' and its related variables.
-// x() queries both a variable's existence and that it is "non-zero" or "non-empty" depending on how it is called. 
-// q() is the SQL query form. All string (%s) variables MUST be passed through dbesc(). 
-// All int values MUST be cast to integer using intval(); 
-
 if($a->module_loaded) {
        $a->page['page_title'] = $a->module;
        if(function_exists($a->module . '_init')) {
@@ -84,6 +72,10 @@ if($a->module_loaded) {
 
 }
 
+if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
+       header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
+}
+
 // report anything important happening
        
 if(x($_SESSION,'sysmsg')) {
@@ -92,26 +84,28 @@ if(x($_SESSION,'sysmsg')) {
        unset($_SESSION['sysmsg']);
 }
 
-if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
-       header($_SERVER["SERVER_PROTOCOL"] . ' 403 ' . t('Permission denied.'));
-}
-
-
 // Feel free to comment out this line on production sites.
 $a->page['content'] .= $debug_text;
-
+$a->page['content'] .= '<div id="pause"><img src="" alt="" /></div>';
 // build page
 
+
 // Navigation (menu) template
 if($a->module != 'install')
        require_once("nav.php");
 
+$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array(
+       '$stylesheet' => $a->get_baseurl() . '/view/theme/'
+               . ((x($_SESSION,'theme')) ? $_SESSION['theme'] : 'default')
+               . '/style.css'
+       ));
+
 $page    = $a->page;
 $profile = $a->profile;
 
 header("Content-type: text/html; charset=utf-8");
+
 $template = "view/" 
-       . ((x($a->page,'theme')) ? $a->page['theme'] . '/' : "" ) 
        . ((x($a->page,'template')) ? $a->page['template'] : 'default' ) 
        . ".php";