From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 14 Mar 2008 08:40:15 +0000 (+0000)
Subject: msgPool
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ce79fb131eecbd062da0482d65749bfb5a6d0610;p=gosa.git

msgPool


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9800 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc b/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc
index e5681b942..ebc0f86e7 100644
--- a/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc
+++ b/gosa-plugins/mail/admin/systems/services/imap/class_goImapServer.inc
@@ -107,25 +107,24 @@ class goImapServer extends goService {
   { 
     $message = plugin::check();
     if(empty($this->goImapName)){
-      $message[] =_("Please specify a server identifier.");
+      $message[] = msgPool::required(_("Server identifier"));
     }  
     if(empty($this->goImapConnect)){
-      $message[] =_("Please specify a connect url.");
+      $message[] = msgPool::required(_("Connect URL"));
     }  
     if(empty($this->goImapAdmin)){
-      $message[] =_("Please specify an admin user.");
+      $message[] = msgPool::required(_("Admin user"));
     }  
     if(empty($this->goImapPassword)){
-      $message[] =_("Please specify a password for the admin user.");
+      $message[] = msgPool::required(_("Password"));
     } 
 
     /* Check connect string */
     if (!preg_match('/^\{[^:]+:[0-9]+.*\}$/', $this->goImapConnect)){
-      $message[]= sprintf(_("The imap connect string needs to be in the form '%s'."),
-          '{server-name:port/options}');
+      $message[]= msgPool::invalid(_("Connect URL"),"","{server-name:port/options}");
     }
     if (!preg_match('/^[0-9]+$/', $this->goImapSievePort)){
-      $message[]= _("The sieve port needs to be numeric.");
+      $message[]= msgPool::invalid(_("Sieve port"),$this->goImapSievePort,"/[0-9]/");
     }
  
     return ($message);