// 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;
}
//------------------------------------------------------------------------------
$type = E_USER_NOTICE;
$content = '';
- $class = 'no_msg';
+// $class = 'no_msg';
if (count($messages)) {
foreach($messages as $cnt=>$msg) {
if ($msg[0]>$type) continue;
$content .= ($cnt ? '<hr>' : '').$str;
}
$class = $msg_class[$type];
+ $content = "<div class='$class'>$content</div>";
} else
- if ($path_to_root=='.')
- return '';
-
- $content = "<div class='$class'>$content</div>";
+ if ($path_to_root=='.')
+ return '';
return $content;
}
//-----------------------------------------------------------------------------
global $before_box;
echo "<div id='msgbox'>";
- $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 "</div>";
}
+/*
+ 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 = "<span class='errortext'><b>" . _("DATABASE ERROR :") . "</b> $msg</span><br>";
+// $str = "<span class='errortext'><b>" . _("DATABASE ERROR :") . "</b> $msg</span><br>";
+ if($warning)
+ $str = "<b>" . _("Debug mode database warning:") . "</b><br>";
+ else
+ $str = "<b>" . _("DATABASE ERROR :") . "</b> $msg<br>";
if ($db_error != 0)
{
}
$str .= "<br><br>";
-
- 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;
}
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)
{
if ($exit_if_error)
{
- echo "<br><br>";
- exit;
+ end_page(); exit;
}
}
return $db_error;