X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=536d23ad8a50008181d48e2a2b98ab3423eadb3d;hb=96a7ff2ca1ad19cd6c8e064da2184f4e2f4dce26;hp=ed7f281ffbc56f31bab76d7edc7e1e0713646da3;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git diff --git a/includes/errors.inc b/includes/errors.inc index ed7f281f..536d23ad 100644 --- a/includes/errors.inc +++ b/includes/errors.inc @@ -1,25 +1,96 @@ array('bg'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'), + E_USER_WARNING => array('bg'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'), + E_USER_NOTICE => array('bg'=>'#ccffcc', 'txt'=>'#007700', 'bd'=>'#33cc00')); + +//----------------------------------------------------------------------------- +// Error handler - collects all php/user messages for +// display in message box. + +function error_handler($errno, $errstr, $file, $line) { + global $messages; + + // error_reporting==0 when messages are set off with @ + if ($errno & error_reporting()) + $messages[] = array($errno, $errstr, $file, $line); + + return true; +} +//------------------------------------------------------------------------------ +// Formats system messages before insert them into message
+// FIX center is unused now +function fmt_errors($center=true) { + global $messages, $msg_colors; + + $type = E_USER_NOTICE; + + if (count($messages)) { + $content = ''; + foreach($messages as $msg) { + if ($msg[0]>$type) continue; + if ($msg[0]<$type && $type>E_USER_ERROR) { + $content = ''; // clean notices when we have errors + $type = E_USER_ERROR; // php or user errors + } + $str = $msg[1]; + $c = $msg_colors[$type]; + if ($msg[0]" + .$str.""; + } + + $str = "
" + . $content . "

\n"; + + } + else + $str = ''; + + return $str; +} +//----------------------------------------------------------------------------- +// Error box
element. +// +function error_box() { + global $before_box; + + echo "
"; + $before_box = ob_get_clean(); // save html content before error box +// Necessary restart instead of get_contents/clean calls due to a bug in php 4.3.2 + register_shutdown_function('ob_end_flush'); + ob_start('output_html'); + echo "
"; +} + function display_db_error($msg, $sql_statement=null, $exit=true) { global $db, $debug; $db_error = db_error_no(); - echo "" . _("DATABASE ERROR :") . " $msg
"; + $str = "" . _("DATABASE ERROR :") . " $msg
"; if ($db_error != 0) { - echo "error code : " . $db_error . "
"; - echo "error message : " . db_error_msg($db) . "
"; + $str .= "error code : " . $db_error . "
"; + $str .= "error message : " . db_error_msg($db) . "
"; } if ($debug == 1) { - echo "sql that failed was : " . $sql_statement . "
"; + $str .= "sql that failed was : " . $sql_statement . "
"; } - echo "

"; - + $str .= "

"; + + trigger_error($str, E_USER_ERROR); + if ($exit) exit; } @@ -30,8 +101,7 @@ function frindly_db_error($db_error) if ($db_error == $db_duplicate_error_code) { - display_error(_("The entered information is a duplicate. Please go back and enter different values.") - . "
" . _("Back") . "", true); + display_error(_("The entered information is a duplicate. Please go back and enter different values.")); return true; }