Revert "Fixes #5137 Improving error messages"

This reverts commit 39683c03.

Conflicts:
	html/themes/breezy/dialog.css

html/themes/breezy/dialog.css

@@ -23,10 +23,6 @@ top: 200px;
   }
 }
 
-div.msgdialog .description {
-font-style: italic;
-}
-
 /* Small screens (i.e. phones) */
 @media (max-width: 640px) {
   div.msgdialog {

include/class_msgPool.inc

@@ -398,22 +398,13 @@ class msgPool {
    *
    * \param string $name The entry duplicated
    */
-  public static function duplicated($name, $dn = NULL, $ldapName = '', $description = '')
+  public static function duplicated($name, $dn = NULL)
   {
-    if (empty($name)) {
-      $fieldName = sprintf('<em>%s</em>', $ldapName);
-    } else {
-      $fieldName = sprintf(_('"%s"'), $name);
-    }
     if ($dn == NULL) {
-      $msg = sprintf(_('There is already an entry with this %s attribute in the system!'), $fieldName);
+      return sprintf(_("There is already an entry with this '%s' attribute in the system!"), $name);
     } else {
-      $msg = sprintf(_('The entry "%s" already use this %s attribute!'), $dn, $fieldName);
-    }
-    if (!empty($description)) {
-      $msg .= sprintf('<p class="description">%s</p>', $description);
+      return sprintf(_("The entry '%s' already use this '%s' attribute!"), $dn, $name);
     }
-    return $msg;
   }
 
   /*!
@@ -421,18 +412,9 @@ class msgPool {
    *
    * \param string $name Name of the field
    */
-  public static function required($name, $ldapName = '', $description = '')
+  public static function required($name)
   {
-    if (empty($name)) {
-      $fieldName = sprintf('<em>%s</em>', $ldapName);
-    } else {
-      $fieldName = sprintf(_('"%s"'), $name);
-    }
-    $msg = sprintf(_('The required field %s is empty!'), $fieldName);
-    if (!empty($description)) {
-      $msg .= sprintf('<p class="description">%s</p>', $description);
-    }
-    return $msg;
+    return sprintf(_("The required field '%s' is empty!"), $name);
   }
 
   /*!

include/simpleplugin/attributes/class_SetAttribute.inc

@@ -579,13 +579,7 @@ class OrderedArrayAttribute extends SetAttribute
       $this->attribute->loadPostValue();
       $this->attribute->applyPostValue();
       if ($error = $this->attribute->check()) {
-        $label = $this->getLabel();
-        if (empty($label)) {
-          $label = '<em>'.$this->getLdapName().'</em>';
-        } else {
-          $label = sprintf(_('"%s"'), $label);
-        }
-        msg_dialog::display(sprintf(_('Invalid value for %s'), $label), $error);
+        msg_dialog::display(sprintf(_('Invalid value for %s'), $this->getLabel()), $error);
       } else {
         $this->addPostValue($this->attribute->getValue());
       }

include/simpleplugin/class_Attribute.inc

@@ -431,7 +431,7 @@ class Attribute
     global $config;
     $value = $this->getValue();
     if ($this->isRequired() && !$this->disabled && (($value === "") || ($value === array()))) {
-      return msgPool::required($this->getLabel(), $this->getLdapName(), $this->getDescription());
+      return msgPool::required($this->getLabel());
     } elseif (($this->unique !== FALSE) && !$this->disabled) {
       $value = $this->computeLdapValue();
       if (($value === "") || ($value === array())) {
@@ -527,7 +527,7 @@ class Attribute
             continue;
           }
 
-          return msgPool::duplicated($this->getLabel(), $attrs['dn'], $this->getLdapName(), $this->getDescription());
+          return msgPool::duplicated($this->getLabel(), $attrs['dn']);
         }
       }
     }