Fixed Quote Valid Days in System and GL Setup, Setup tab.

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

diff --git a/includes/errors.inc b/includes/errors.inc
index f55951cf4652c1cc69d4f8f0a2bb0c070fc71626..0e8b2578b1978d0e92f3fa5aca9bba8d93f2a67d 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -12,6 +12,45 @@
 $messages = array(); // container for system messages
 $before_box = ''; // temporary container for output html data before error box
 
+function get_backtrace($html = false, $skip=0)
+{
+       $str = '';
+       if ($html) $str .= '<table border=0>';
+       $trace = debug_backtrace();
+
+       foreach($trace as $trn => $tr) {
+               if ($trn <= $skip) continue;
+               if ($html) $str .= '<tr><td>';
+               $str .= $tr['file'].':'.$tr['line'].': ';
+               if ($html) $str .= '</td><td>';
+               if (isset($tr['type'])) {
+                       if($tr['type'] == '::') {
+                               $str .= $tr['class'].'::';
+                       } else if($tr['type'] == '->') {
+                               $str .= '('.$tr['class'].' Object)'.'->';
+                       }
+               }
+               $str .= $tr['function'].'(';
+               
+               if(is_array($tr['args'])) {
+                       $args = array();
+                       foreach($tr['args'] as $n=>$a) {
+                               if (is_object($tr['args'][$n]))
+                                       $args[$n] = "(".get_class($tr['args'][$n])." Object)";
+                               elseif (is_array($tr['args'][$n]))
+                                       $args[$n] = "(Array[".count($tr['args'][$n])."])";
+                               else
+                                       $args[$n] = "'".$tr['args'][$n]."'";
+                       }
+                       $str .= implode(',',$args);
+               }
+               $str .= ')</td>';
+       }
+
+       if ($html) $str .= '</tr></table>';
+       return $str;
+}
+
 //-----------------------------------------------------------------------------
 //    Error handler - collects all php/user messages for
 //    display in message box.
@@ -21,16 +60,26 @@ function error_handler($errno, $errstr, $file, $line) {
 
        // skip well known warnings we don't care about.
        // Please use restrainedly to not risk loss of important messages
-       $excluded_warnings = array('html_entity_decode', 'htmlspecialchars');
+       $excluded_warnings = array(
+               'html_entity_decode', 'htmlspecialchars',       // nevermind encodings, special chars are processed anyway
+               'should be compatible with that',                       // ignore cpdf/frontreport wrapper warnings
+               'mysql extension is deprecated'                         // ignore strict warning in 5.4
+       );
        foreach($excluded_warnings as $ref) {
                if (strpos($errstr, $ref) !== false) {
                        return true;
                }
        }
-       
+
+       if ($go_debug>1) {
+               $bt = get_backtrace(true, 1);
+       }
+
        // error_reporting==0 when messages are set off with @ 
        if ($errno & error_reporting()) {
-               $messages[] = array($errno, $errstr, $file, $line);
+               // suppress duplicated errors
+               if (!in_array(array($errno, $errstr, $file, $line, @$bt), $messages))
+                       $messages[] = array($errno, $errstr, $file, $line, @$bt);
        }
        else if($errno&~E_NOTICE) { // log all not displayed messages 
                $user = @$_SESSION["wa_current_user"]->loginname;
@@ -44,7 +93,7 @@ function error_handler($errno, $errstr, $file, $line) {
 //     Formats system messages before insert them into message <div>
 // FIX center is unused now
 function fmt_errors($center=false) {
-    global $messages, $path_to_root;
+    global $messages, $path_to_root, $go_debug;
   
   $msg_class = array(
        E_USER_ERROR => 'err_msg',
@@ -56,6 +105,9 @@ function fmt_errors($center=false) {
 //  $class = 'no_msg';
   if (count($messages)) {
        foreach($messages as $cnt=>$msg) {
+               if ($go_debug && $msg[0]>E_USER_NOTICE)
+                       $msg[0] = E_ERROR;
+
                if ($msg[0]>$type) continue;
 
                if ($msg[0]<$type) { 
@@ -68,11 +120,15 @@ function fmt_errors($center=false) {
                                        $content = '';                  // clean other messages
                        }
                }
+               
            $str = $msg[1];
-               if ($msg[0] < E_USER_ERROR && $msg[2] != null)
+               if (!in_array($msg[0], array(E_USER_NOTICE, E_USER_ERROR, E_USER_WARNING)) && $msg[2] != null)
                  $str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
+
+               if ($go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING)
+                 $str .= '<br>'.$msg[4];
                $content .= ($cnt ? '<hr>' : '').$str;
-       }               
+       }
        $class = $msg_class[$type];
     $content = "<div class='$class'>$content</div>";
   } else
@@ -97,12 +153,16 @@ function error_box() {
        Helper to avoid sparse log notices.
 */
 function end_flush() {
-       global $Ajax, $transaction_level;
+       global $Ajax;
 
        if (isset($Ajax))
                $Ajax->run();
-       // flush all output buffers (works also with exit inside any div levels)
-       while(ob_get_level()) ob_end_flush();
+
+        // on some (but not all) php versions zlib extension adds 1 additional level of buffering, 
+        // so flush the last buffer outside the loop to be on safe side 
+       while(ob_get_level() > 1)
+               ob_end_flush();
+       @ob_end_flush();
 
        // if any transaction was aborted unexpectedly rollback changes
        cancel_transaction();
@@ -136,10 +196,14 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
        }
        
        $str .= "<br><br>";
-       if($msg)
-               trigger_error($str, E_USER_ERROR);
-       else    // $msg can be null here only in debug mode, otherwise the error is ignored
-               trigger_error($str, E_USER_WARNING);
+       if ($go_debug)
+               error_log($str);
+       else {
+               if($msg)
+                       trigger_error($str, E_USER_ERROR);
+               else    // $msg can be null here only in debug mode, otherwise the error is ignored
+                       trigger_error($str, E_USER_WARNING);
+       }
        if ($exit)
                exit;
 }