Fix encoding of base

[gosa.git] / gosa-core / include / utils / class_msgPool.inc

diff --git a/gosa-core/include/utils/class_msgPool.inc b/gosa-core/include/utils/class_msgPool.inc
index b736208f048ba506493aeeaf57593485046277dc..5309dfa54687a5d4011496613074ca8443b05300 100644 (file)
--- a/gosa-core/include/utils/class_msgPool.inc
+++ b/gosa-core/include/utils/class_msgPool.inc
@@ -44,15 +44,15 @@ class msgPool
     }
     if (count($name) == 1){
       if($type == ""){
-        return (_("This object will be deleted:")."<br>".msgPool::buildList($name)."<br><br>");
+        return (_("This object will be deleted:")."<br>".msgPool::buildList($name));
       }else{
-        return (sprintf(_("This '%s' object will be deleted:"),$type). "<br>".msgPool::buildList($name)."<br><br>");
+        return (sprintf(_("This '%s' object will be deleted:"),$type). "<br>".msgPool::buildList($name));
       }
     }
     if($type == ""){
-      return (sprintf(_("These objects will be deleted: %s"), "<br>".msgPool::buildList($name)."<br><br>"));
+      return (sprintf(_("These objects will be deleted: %s"), "<br>".msgPool::buildList($name)));
     }else{
-      return (sprintf(_("These '%s' objects will be deleted: %s"),$type, "<br>".msgPool::buildList($name)."<br><br>"));
+      return (sprintf(_("These '%s' objects will be deleted: %s"),$type, "<br>".msgPool::buildList($name)));
     }
   }
 
@@ -234,7 +234,7 @@ class msgPool
     if ($min == ""){
       return (sprintf(_("Value for '%s' is too large!"), $name));
     } else {
-      return (sprintf(_("'%s' must be smaller than %d!"), $name, $min));
+      return (sprintf(_("'%s' must be smaller than %s!"), $name, $min));
     }
   }
 
@@ -359,14 +359,15 @@ class msgPool
 
   public static function buildList($data)
   {
-    $objects= "";
+    $objects= "<ul>";
     foreach ($data as $key => $value){
       if (is_numeric($key)){
-        $objects.= "<br>\n<i>$value</i>";
+        $objects.= "<li>\n<i>$value</i></li>";
       } else {
-        $objects.= "<br>\n$value (<i>$key</i>)";
+        $objects.= "<li>\n$value (<i>$key</i>)</li>";
       }
     }
+    $objects.= "</ul>";
     return($objects);
   }
 
@@ -445,6 +446,14 @@ class msgPool
   }
 
 
+  public static function mysqlerror($error,  $plugin= "")
+  {
+    /* Assign headline depending on type */
+    $headline= _("MySQL operation failed!");
+    return $headline."<br><br><i>"._("Error").":</i> ".$error;
+  }
+
+
   public static function ldaperror($error, $dn= "", $type= 0, $plugin= "")
   {
     /* Assign headline depending on type */
@@ -491,12 +500,12 @@ class msgPool
       return sprintf(_("This '%s' is still in use by this object: %s"), $type, "<br><br>".$objects);
     }
     if (count($objects) == 1){
-      return sprintf(_("This '%s' is still in use by this object: %s"), $type, "<br><br>".msgPool::buildList($objects));
+      return sprintf(_("This '%s' is still in use by this object: %s"), $type, "<br>".msgPool::buildList($objects));
     }
     if (count($objects) == 0){
       return sprintf(_("This '%s' is still in use."), $type);
     }
-    return sprintf(_("This '%s' is still in use by these objects: %s"), $type, "<br><br>".msgPool::buildList($objects));
+    return sprintf(_("This '%s' is still in use by these objects: %s"), $type, "<br>".msgPool::buildList($objects));
   }