Bad link to view dimension

[fa-stable.git] / includes / errors.inc

diff --git a/includes/errors.inc b/includes/errors.inc
index d5f7b4a097be3f038af28e29a87b8c8994d58bcd..1c0f2f97e9108209678d7bd4380afb9c420356f8 100644 (file)
--- a/includes/errors.inc
+++ b/includes/errors.inc
@@ -29,7 +29,7 @@ function error_handler($errno, $errstr, $file, $line) {
 //     Formats system messages before insert them into message <div>
 // FIX center is unused now
 function fmt_errors($center=false) {
-    global $messages;
+    global $messages, $path_to_root;
   
   $msg_class = array(
        E_USER_ERROR => 'err_msg',
@@ -38,8 +38,9 @@ function fmt_errors($center=false) {
 
   $type = E_USER_NOTICE;
   $content = '';
+//  $class = 'no_msg';
   if (count($messages)) {
-       foreach($messages as $msg) {
+       foreach($messages as $cnt=>$msg) {
                if ($msg[0]>$type) continue;
 
                if ($msg[0]<$type) { 
@@ -53,12 +54,15 @@ function fmt_errors($center=false) {
                        }
                }
            $str = $msg[1];
-               $class = $msg_class[$type];
                if ($msg[0] < E_USER_ERROR && $msg[2] != null)
                  $str .= ' '._('in file').': '.$msg[2].' '._('at line ').$msg[3];
-               $content .= "<div class='$class'>$str</div><br>";
+               $content .= ($cnt ? '<hr>' : '').$str;
        }               
-  }
+       $class = $msg_class[$type];
+    $content = "<div class='$class'>$content</div>";
+  } else
+  if ($path_to_root=='.')
+       return '';
   return $content;
 }
 //-----------------------------------------------------------------------------
@@ -78,9 +82,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 = "<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) 
        {
@@ -94,9 +104,10 @@ function display_db_error($msg, $sql_statement=null, $exit=true)
        }
        
        $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;
 }
@@ -122,8 +133,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) 
                {