From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 5 Dec 2008 09:45:19 +0000 (+0000)
Subject: Updated sieve login. Optimized error message and tls check
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6fb4c790323c48da8062e7da2cba3bf9bc5cbb47;p=gosa.git

Updated sieve login. Optimized error message and tls check


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

diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieve.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieve.inc
index 7eaccfa6a..cfd468638 100644
--- a/gosa-plugins/mail/personal/mail/sieve/class_sieve.inc
+++ b/gosa-plugins/mail/personal/mail/sieve/class_sieve.inc
@@ -487,7 +487,7 @@ class sieve
 
 	/* Check if a TLS bases connection is required 
      */
-	if(preg_match("/^tls$/",$this->options)){
+	if($this->options == "tls"){
 
 		/* Check if PHP supports TLS encryption for sockets 
          */
@@ -518,7 +518,7 @@ class sieve
                $this->line=fgets($this->fp,1024);
 
              if(sieve::status($this->line) == F_NO){
-               $this->error_raw = "Failed to authenticate!";
+               $this->error_raw = $this->line;
                return false;
              }
              $this->loggedin=true;