// FIX center is unused now
-function fmt_errors($center=true) {
- global $messages, $msg_colors;
+function fmt_errors($center=false) {
+ global $messages, $path_to_root, $go_debug;
+ $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 ($go_debug && $msg[0]>E_USER_NOTICE)
+ $msg[0] = E_ERROR;
+
if ($msg[0]>$type) continue;
if ($msg[0]<$type) {
@@ -63,24 +117,21 @@ function fmt_errors($center=true) {
$content = ''; // clean other messages
}
}
+
$str = $msg[1];
- $c = $msg_colors[$type];
- 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];
- $content .= "
";
+ if ($go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING)
+ $str .= '
\n";
-
- }
- else
- $str = '';
-
- return $str;
+ $class = $msg_class[$type];
+ $content = "
";
+ } else
+ if ($path_to_root=='.')
+ return '';
+ return $content;
}
//-----------------------------------------------------------------------------
// Error box
element.
@@ -89,19 +140,43 @@ 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');
+ $before_box = ob_get_clean(); // save html content before error box
ob_start('output_html');
echo "
";
}
+/*
+ Helper to avoid sparse log notices.
+*/
+function end_flush() {
+ global $Ajax;
+
+ if (isset($Ajax))
+ $Ajax->run();
+
+ // 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();
+}
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 = "
" . _("DATABASE ERROR :") . " $msg";
+// $str = "
" . _("DATABASE ERROR :") . " $msg";
+ if($warning)
+ $str = "
" . _("Debug mode database warning:") . "";
+ else
+ $str = "
" . _("DATABASE ERROR :") . " $msg
";
if ($db_error != 0)
{
@@ -111,13 +186,17 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
if ($debug == 1)
{
- $str .= "sql that failed was : " . $sql_statement . "
";
+ $cur_prefix = $db_connections[$_SESSION["wa_current_user"]->cur_con]['tbpref'];
+
+ $str .= "sql that failed was : ".str_replace(TB_PREF, $cur_prefix, $sql_statement)."
";
+// if ($go_debug > 1) display_backtrace();
}
$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;
}
@@ -127,7 +206,7 @@ function frindly_db_error($db_error)
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;
}
@@ -137,24 +216,24 @@ function frindly_db_error($db_error)
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 "
";
- exit;
+ end_page(); exit;
}
}
return $db_error;