X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=includes%2Ferrors.inc;h=1bf3b3bdeb37235af8f69a5ba7f1719b28cbbffd;hb=7561718ee5113232ce917f63085d272884b0929c;hp=1c0f2f97e9108209678d7bd4380afb9c420356f8;hpb=ce2a1cae35df4f60c3b993d79cb9eb65cb2cb82e;p=fa-stable.git
diff --git a/includes/errors.inc b/includes/errors.inc
index 1c0f2f97..1bf3b3bd 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -12,25 +12,87 @@
$messages = array(); // container for system messages
$before_box = ''; // temporary container for output html data before error box
+function get_backtrace($html = false, $skip=0)
+{
+ $str = '';
+ if ($html) $str .= '
// FIX center is unused now
function fmt_errors($center=false) {
- global $messages, $path_to_root;
-
+ global $messages, $path_to_root, $SysPrefs;
+
$msg_class = array(
E_USER_ERROR => 'err_msg',
E_USER_WARNING =>'warn_msg',
@@ -41,6 +103,9 @@ function fmt_errors($center=false) {
// $class = 'no_msg';
if (count($messages)) {
foreach($messages as $cnt=>$msg) {
+ if ($SysPrefs->go_debug && $msg[0]>E_USER_NOTICE)
+ $msg[0] = E_ERROR;
+
if ($msg[0]>$type) continue;
if ($msg[0]<$type) {
@@ -53,11 +118,15 @@ function fmt_errors($center=false) {
$content = ''; // clean other messages
}
}
+
$str = $msg[1];
- 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];
+
+ if ($SysPrefs->go_debug>1 && $type!=E_USER_NOTICE && $type!=E_USER_WARNING)
+ $str .= '
'.$msg[4];
$content .= ($cnt ? '
' : '').$str;
- }
+ }
$class = $msg_class[$type];
$content = "
$content
";
} else
@@ -72,16 +141,34 @@ 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, $SysPrefs, $db_connections;
$warning = $msg==null;
$db_error = db_error_no();
@@ -98,25 +185,30 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
$str .= "error message : " . db_error_msg($db) . "
";
}
- if ($debug == 1)
+ if ($SysPrefs->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 ($SysPrefs->go_debug > 1) display_backtrace();
}
$str .= "
";
- 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 (!$SysPrefs->go_debug)
+ error_log($str);
+ else {
+ 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;
}
function frindly_db_error($db_error)
{
- global $db_duplicate_error_code;
-
- if ($db_error == $db_duplicate_error_code)
+ if ($db_error == DB_DUPLICATE_ERROR)
{
display_error(_("The entered information is a duplicate. Please go back and enter different values."));
return true;
@@ -127,28 +219,26 @@ 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, $SysPrefs;
$db_error = db_error_no();
if ($db_error != 0)
{
- if (!frindly_db_error($db_error)) {
+ if ($SysPrefs->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;
+ return $db_error;
}
-?>
\ No newline at end of file