X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Ferrors.inc;h=bfa213d5514d96ab1ac59e87e22fa8ffcc2619ba;hb=af78fbb535a6fedbc2eb70a26ddc39739be2b986;hp=d5f7b4a097be3f038af28e29a87b8c8994d58bcd;hpb=d9cb8b17823edab3842cc7084598d53eb40fa0ad;p=fa-stable.git
diff --git a/includes/errors.inc b/includes/errors.inc
index d5f7b4a0..bfa213d5 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -17,19 +17,31 @@ $before_box = ''; // temporary container for output html data before error box
// display in message box.
function error_handler($errno, $errstr, $file, $line) {
- global $messages;
+ global $messages, $go_debug;
- // error_reporting==0 when messages are set off with @
- if ($errno & error_reporting()) {
- $messages[] = array($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');
+ foreach($excluded_warnings as $ref) {
+ if (strpos($errstr, $ref) !== false) {
+ 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");
+
return true;
}
//------------------------------------------------------------------------------
// Formats system messages before insert them into message
// FIX center is unused now
function fmt_errors($center=false) {
- global $messages;
+ global $messages, $path_to_root;
$msg_class = array(
E_USER_ERROR => 'err_msg',
@@ -38,8 +50,9 @@ function fmt_errors($center=false) {
$type = E_USER_NOTICE;
$content = '';
+// $class = 'no_msg';
if (count($messages)) {
- foreach($messages as $msg) {
+ foreach($messages as $cnt=>$msg) {
if ($msg[0]>$type) continue;
if ($msg[0]<$type) {
@@ -53,12 +66,15 @@ function fmt_errors($center=false) {
}
}
$str = $msg[1];
- $class = $msg_class[$type];
if ($msg[0] < E_USER_ERROR && $msg[2] != null)
$str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
- $content .= "
$str
";
+ $content .= ($cnt ? '
' : '').$str;
}
- }
+ $class = $msg_class[$type];
+ $content = "
$content
";
+ } else
+ if ($path_to_root=='.')
+ return '';
return $content;
}
//-----------------------------------------------------------------------------
@@ -68,19 +84,31 @@ function error_box() {
global $before_box;
echo "
";
- $before_box = ob_get_clean(); // save html content before error box
+ $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');
+ register_shutdown_function('end_flush');
ob_start('output_html');
echo "
";
}
+/*
+ Helper to avoid sparse log notices.
+*/
+function end_flush () {
+ if (ob_get_level()) ob_end_flush();
+}
function display_db_error($msg, $sql_statement=null, $exit=true)
{
global $db, $debug;
+
+ $warning = $msg==null;
$db_error = db_error_no();
- $str = "
" . _("DATABASE ERROR :") . " $msg";
+// $str = "
" . _("DATABASE ERROR :") . " $msg";
+ if($warning)
+ $str = "
" . _("Debug mode database warning:") . "";
+ else
+ $str = "
" . _("DATABASE ERROR :") . " $msg
";
if ($db_error != 0)
{
@@ -94,9 +122,10 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
}
$str .= "
";
-
- trigger_error($str, E_USER_ERROR);
-
+ 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;
}
@@ -122,8 +151,9 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_
if ($db_error != 0)
{
- if (!frindly_db_error($db_error))
- display_db_error($msg, $sql_statement, false);
+ if (!frindly_db_error($db_error)) {
+ display_db_error($msg, $sql_statement, false);
+ }
if ($rollback_if_error)
{
@@ -132,8 +162,7 @@ function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_
if ($exit_if_error)
{
- echo "
";
- exit;
+ end_page(); exit;
}
}
return $db_error;