New files from unstable branch

[fa-stable.git] / includes / errors.inc

diff --git a/includes/errors.inc b/includes/errors.inc
index f2cfe1c0fc1b113c6fee2e58706969c0b2484b27..f55951cf4652c1cc69d4f8f0a2bb0c070fc71626 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -17,7 +17,7 @@ $before_box = ''; // temporary container for output html data before error box
 //    display in message box.
 
 function error_handler($errno, $errstr, $file, $line) {
-    global $messages, $go_debug;
+    global $messages, $go_debug, $SysPrefs;
 
        // skip well known warnings we don't care about.
        // Please use restrainedly to not risk loss of important messages
@@ -27,13 +27,16 @@ function error_handler($errno, $errstr, $file, $line) {
                        return true;
                }
        }
-
+       
        // error_reporting==0 when messages are set off with @ 
-       if ($errno & error_reporting())
-                       $messages[] = array($errno, $errstr, $file, $line);
-       else if($errno&~E_NOTICE)// log all not displayed messages 
-               error_log(user_company() . ':' . $_SESSION["wa_current_user"]->loginname.':'
-                        . basename($file) .":$line: $errstr");
+       if ($errno & error_reporting()) {
+               $messages[] = array($errno, $errstr, $file, $line);
+       }
+       else if($errno&~E_NOTICE) { // log all not displayed messages 
+               $user = @$_SESSION["wa_current_user"]->loginname;
+               $context = isset($SysPrefs) && !$SysPrefs->db_ok ? '[before upgrade]' : '';
+               error_log(user_company() . ":$user:". basename($file) .":$line:$context $errstr");
+       }
        
     return true;
 }
@@ -93,18 +96,21 @@ function error_box() {
 /*
        Helper to avoid sparse log notices.
 */
-function end_flush () {
-       global $Ajax;
+function end_flush() {
+       global $Ajax, $transaction_level;
 
        if (isset($Ajax))
                $Ajax->run();
        // flush all output buffers (works also with exit inside any div levels)
        while(ob_get_level()) ob_end_flush();
+
+       // if any transaction was aborted unexpectedly rollback changes
+       cancel_transaction();
 }
 
 function display_db_error($msg, $sql_statement=null, $exit=true)
 {
-       global $db, $debug;
+       global $db, $debug, $go_debug, $db_connections;
 
        $warning = $msg==null;
        $db_error = db_error_no();
@@ -123,7 +129,10 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
        
        if ($debug == 1) 
        {
-               $str .= "sql that failed was : " . $sql_statement . "<br>";
+               $cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref'];
+
+               $str .= "sql that failed was : ".str_replace(TB_PREF, $cur_prefix, $sql_statement)."<br>";
+//             if ($go_debug > 1) display_backtrace();
        }
        
        $str .= "<br><br>";
@@ -162,7 +171,7 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_
                
                if ($rollback_if_error) 
                {
-                 $rollback_result = db_query("rollback","could not rollback");                 
+                 $rollback_result = db_query("rollback");
                }
                
                if ($exit_if_error)