From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 12 Jul 2005 08:36:33 +0000 (+0000)
Subject: Fixed IE Post ...
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f0926baf47e42c6ebe0fa3a8a0375c5686b41db8;p=gosa.git

Fixed IE Post ...


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

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 6f5fc7e1c..9eb98f676 100644
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -632,6 +632,10 @@ class mailAccount extends plugin
     $id= $method->uattrib;
     $method->fixAttributesOnStore($this);
 
+    if(empty($this->attrs['gosaSpamMailbox'])){
+      unset($this->attrs['gosaSpamMailbox']);
+    }
+
     /* Save data to LDAP */
     $ldap->cd($this->dn);
     $ldap->modify($this->attrs);
@@ -725,6 +729,10 @@ class mailAccount extends plugin
       $message[]= _("You need to set the maximum mail size in order to reject anything.");
     }
 
+    if((preg_match("/S/", $this->gosaMailDeliveryMode))&&(empty($this->gosaSpamMailbox))) {
+      $message[]= _("You specified Spam settings, but there is no Folder specified.");
+    }
+
     return ($message);
   }