From 9d8b45588b0d5b7ebc952345d29735e194c4fe60 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 6 Aug 2014 12:48:20 +0000
Subject: [PATCH] Try to catch exceptions from Sieve retriveRuels, and call
 emailadminWizard

---
 mail/inc/class.mail_ui.inc.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 8d748652c0..789dd469a0 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -2294,9 +2294,13 @@ class mail_ui
 		if ($vacation)
 		{
 			$sieveServer = $this->mail_bo->icServer;
-		
-			$sieveServer->retrieveRules();
-			$vacation = $sieveServer->getVacation();
+			try
+			{
+				$sieveServer->retrieveRules();
+				$vacation = $sieveServer->getVacation();
+			} catch (PEAR_Exception $ex) {
+				$this->callWizard($ex->getMessage());
+			}
 		}
 		//error_log(__METHOD__.__LINE__.' Server:'.self::$icServerID.' Vacation retrieved:'.array2string($vacation));
 		return $vacation;