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

msgPool


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

diff --git a/gosa-plugins/kolab/admin/systems/services/kolab/class_servKolab.inc b/gosa-plugins/kolab/admin/systems/services/kolab/class_servKolab.inc
index 02a546cfb..69c1ee891 100644
--- a/gosa-plugins/kolab/admin/systems/services/kolab/class_servKolab.inc
+++ b/gosa-plugins/kolab/admin/systems/services/kolab/class_servKolab.inc
@@ -260,28 +260,23 @@ class servkolab extends goService {
     $message= plugin::check();
 
     if(($this->kolabFreeBusyFuture==""))    {
-      $message[] = _("Future days in Free/Busy settings must be set.");
+      $message[] = msgPool::required(_("Future days"));
     }elseif(!tests::is_uid($this->kolabFreeBusyFuture) || $this->kolabFreeBusyFuture < 0){
-      $message[] = _("Future days in Free/Busy settings must be a positive value.");
+      $message[] = msgPool::invalid(_("Future days"),$this->kolabFreeBusyFuture,"/[0-9]/");
     }
 
     if(!is_int((int)($this->cyrus_quotawarn))) {
-      $message[] = _("The given Quota settings value must be a number.");
-    }elseif(!(($this->cyrus_quotawarn<=100)&&($this->cyrus_quotawarn>=0))){
+      $message[] = msgPool::required(_("Quota"));
+    }elseif($this->cyrus_quotawarn>100){
       $message[] = _("Please choose a value between 1 and 100 for Quota settings.");
-    }elseif(strcasecmp($this->cyrus_quotawarn,(int)$this->cyrus_quotawarn)){
-      $message[] = _("Future days must be a value.");
+    }elseif($this->cyrus_quotawarn < 1){
+      $message[] = msgPool::toosmall(_("Quota"),1);
     }
 
     if(empty($this->postfix_mynetworks)) { 
-      $message[] = _("No SMTP privileged networks set.");
+      $message[] = msgPool::required(_("Privileged networks"));
     }
 
-    /*if(empty($this->postfix_relayhost)) {
-      $message[] = _("No SMTP smarthost/relayhost set.");
-      }
-     */
-
     return ($message);
   }