X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Ferrors.inc;h=1a39f1637ce3bffef74fbc61c28e42582ad843f8;hb=4098636a10a25952a38e1b0c8f6e80dff44ae4e7;hp=8972a9eb4b2fbe0de4fe348528acfd8153ffb2b8;hpb=a5242af68e65661edb7175412444dce536a7f311;p=fa-stable.git
diff --git a/includes/errors.inc b/includes/errors.inc
index 8972a9eb..1a39f163 100644
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -12,11 +12,6 @@
$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.
@@ -33,14 +28,19 @@ function error_handler($errno, $errstr, $file, $line) {
//------------------------------------------------------------------------------
// Formats system messages before insert them into message
// 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) {
@@ -54,23 +54,17 @@ function fmt_errors($center=true) {
}
}
$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 .= "
"
- .$str." |
";
- }
-
- $str = "
\n";
-
- }
- else
- $str = '';
-
- return $str;
+ $content .= ($cnt ? '
' : '').$str;
+ }
+ $class = $msg_class[$type];
+ } else
+ if ($path_to_root=='.')
+ return '';
+
+ $content = "
$content
";
+ return $content;
}
//-----------------------------------------------------------------------------
// Error box
element.
@@ -89,9 +83,15 @@ function error_box() {
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)
{
@@ -105,9 +105,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;
}
@@ -133,8 +134,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)
{