From 0c044e75fc5bee0b6407622ccd6bf332c16b206e Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 1 Sep 2006 11:47:03 +0000
Subject: [PATCH] Added "Couldn't connect to sieve" fix

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4570 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 plugins/personal/mail/class_mailAccount.inc | 24 ++++++++++++---------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index 570d6227c..541a31d4d 100644
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -733,16 +733,20 @@ class mailAccount extends plugin
         $method->setQuota($this->folder_prefix.$this->$id, $this->gosaMailQuota);
         $method->disconnect();
 
-        /* Write sieve information only if not in C mode */
-        if (!is_integer(strpos($this->gosaMailDeliveryMode, "C"))){
-          $method->configureFilter($this->$id,
-              $this->gosaMailDeliveryMode,
-              $this->mail,
-              $this->gosaMailAlternateAddress,
-              $this->gosaMailMaxSize,
-              $this->gosaSpamMailbox,
-              $this->gosaSpamSortLevel,
-              $this->gosaVacationMessage);
+        /* Ensure that this is an existing account */
+        if($this->initially_was_account){
+
+          /* Write sieve information only if not in C mode */
+          if (!is_integer(strpos($this->gosaMailDeliveryMode, "C"))){
+            $method->configureFilter($this->$id,
+                $this->gosaMailDeliveryMode,
+                $this->mail,
+                $this->gosaMailAlternateAddress,
+                $this->gosaMailMaxSize,
+                $this->gosaSpamMailbox,
+                $this->gosaSpamSortLevel,
+                $this->gosaVacationMessage);
+          }
         }
       }
     }
-- 
2.30.2