$messages = array(); // container for system messages
$before_box = ''; // temporary container for output html data before error box
-$msg_colors = array(
- E_USER_ERROR => array('bg'=>'#ffcccc', 'txt'=>'#dd2200', 'bd'=>'#cc3300'),
- E_USER_WARNING => array('bg'=>'#ffff00', 'txt'=>'#ff5500', 'bd'=>'#ff9900'),
- 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;
+ global $messages, $go_debug, $SysPrefs;
- // 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:" . ( $SysPrefs->db_ok ? '':'[before upgrade]')
+ . " $errstr");
+
return true;
}
//------------------------------------------------------------------------------
// Formats system messages before insert them into message <div>
// FIX center is unused now
-function fmt_errors($center=true) {
- global $messages, $msg_colors;
+function fmt_errors($center=false) {
+ global $messages, $path_to_root;
+ $msg_class = array(
+ E_USER_ERROR => 'err_msg',
+ E_USER_WARNING =>'warn_msg',
+ E_USER_NOTICE => 'note_msg');
+
$type = E_USER_NOTICE;
-
+ $content = '';
+// $class = 'no_msg';
if (count($messages)) {
- $content = '';
- foreach($messages as $msg) {
+ foreach($messages as $cnt=>$msg) {
if ($msg[0]>$type) continue;
if ($msg[0]<$type) {
}
}
$str = $msg[1];
- $c = $msg_colors[$type];
if ($msg[0] < E_USER_ERROR && $msg[2] != null)
$str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
-
- $content .= "<tr><td " . ($center?"align='center' ":"").
- " width='100%' bgcolor='{$c['bg']}'><font color='{$c['txt']}'>"
- .$str."</font></td></tr>";
- }
-
- $str = "<center><table border='1' cellpadding='3' cellspacing='0' style='border-collapse: collapse' bordercolor='{$c['bd']}' width='98%'>"
- . $content . "</table></center><br>\n";
-
- }
- else
- $str = '';
-
- return $str;
+ $content .= ($cnt ? '<hr>' : '').$str;
+ }
+ $class = $msg_class[$type];
+ $content = "<div class='$class'>$content</div>";
+ } else
+ if ($path_to_root=='.')
+ return '';
+ return $content;
}
//-----------------------------------------------------------------------------
// Error box <div> element.
global $before_box;
echo "<div id='msgbox'>";
- $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');
+ $before_box = ob_get_clean(); // save html content before error box
ob_start('output_html');
echo "</div>";
}
+/*
+ Helper to avoid sparse log notices.
+*/
+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();
- $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)
{
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>";
-
- 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;
}
global $db_duplicate_error_code;
if ($db_error == $db_duplicate_error_code)
- {
+ {
display_error(_("The entered information is a duplicate. Please go back and enter different values."));
return true;
}
function check_db_error($msg, $sql_statement, $exit_if_error=true, $rollback_if_error=true)
{
- global $db;
+ global $db, $go_debug;
$db_error = db_error_no();
if ($db_error != 0)
{
- if (!frindly_db_error($db_error))
- display_db_error($msg, $sql_statement, false);
+ if ($go_debug || !frindly_db_error($db_error)) {
+ display_db_error($msg, $sql_statement, false);
+ }
if ($rollback_if_error)
{
- $rollback_result = db_query("rollback","could not rollback");
+ $rollback_result = db_query("rollback");
}
if ($exit_if_error)
{
- echo "<br><br>";
- exit;
+ end_page(); exit;
}
}
return $db_error;
projects / fa-stable.git / blobdiff