Include file order /error binding fixed once again.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 91582330aeda992d247a0048614f5e64d5e803ee..d7095099182f626831b6326c5b2716a22a22a701 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+23-May-2008 Janusz Dobrowolski
+! Include file order / error handling order fixed once again.
+$ /includes/main.inc
+  /includes/session.inc
+  
 23-May-2008 Joe Hunt
 ! Moved menu-system from header.inc/footer.inc to renderer.php for relevant theme. Fixed frontaccounting.php to get the
   correct renderer.php.
@@ -28,6 +33,13 @@ $ frontaccounting.php
   /themes/default/renderer.php
   /themes/cool/renderer.php
   /themes/aqua/renderer.php
+
+22-May-2008 Janusz Dobrowolski
+! Error handler switching moved to session.inc for early error catching
+$ /includes/main.inc
+  /includes/session.inc
+! Cosmetic cleanup
+  /js/utils.js
   
 18-May-2008 Janusz Dobrowolski
 # Added explicit ob_end_flush() on shutdown needed for php5

diff --git a/includes/main.inc b/includes/main.inc
index be80677f5389f9b9948cca7ceae69a8bbcb1ddcb..a4472e8ecc40f806d0c5cb1797af0c8278892a92 100644 (file)
--- a/includes/main.inc
+++ b/includes/main.inc
@@ -35,7 +35,7 @@
 
        include($path_to_root . "/includes/page/footer.inc");
 
-               $Ajax->run();
+       $Ajax->run();
        page_footer($no_menu, $is_index);
     }
 

diff --git a/includes/session.inc b/includes/session.inc
index b7efb1899c524d1e4f15562dd4ca851c5efb891e..026ad125a321fcd3ecf40392aa8b4c3cb4803038 100644 (file)
--- a/includes/session.inc
+++ b/includes/session.inc
@@ -41,9 +41,10 @@
        include_once($path_to_root . "/includes/lang/language.php");
        include_once($path_to_root . "/config_db.php");
        include_once($path_to_root . "/config.php");
+       include_once($path_to_root . "/includes/ajax.inc");
+       $Ajax =& new Ajax();
 
-
-    include_once($path_to_root . "/includes/main.inc");
+       include_once($path_to_root . "/includes/main.inc");
 
     //----------------------------------------------------------------------------------------
 
@@ -111,11 +112,11 @@
         if (!isset($_POST["user_name_entry_field"]) or $_POST["user_name_entry_field"] == "") 
         {
                include($path_to_root . "/access/login.php");
+               $Ajax->redirect($path_to_root . "/access/login.php");
             exit;
         }
        }
-       include_once("ajax.inc");
-       $Ajax =& new Ajax();
+       include_once($path_to_root . "/includes/ui/ui_msgs.inc");
        // intercept all output to destroy it in case of ajax call
        register_shutdown_function('ob_end_flush');
        ob_start('output_html',0);