- Fix disabling password encryption in mail_fetch (#1738001).

[squirrelmail.git] / plugins / mail_fetch / class.mail_fetch.php

diff --git a/plugins/mail_fetch/class.mail_fetch.php b/plugins/mail_fetch/class.mail_fetch.php
index 6e24339427e956b9c3a31f24f573a88b76a4409e..a58884fda2f588e0a8186e0c7742f22db5f007b0 100644 (file)
--- a/plugins/mail_fetch/class.mail_fetch.php
+++ b/plugins/mail_fetch/class.mail_fetch.php
@@ -365,8 +365,10 @@ class mail_fetch {
         if($this->check_response()) {
             $ret = '';
             while($line = fgets($this->conn)) {
-                if (trim($line)=='.') {
+                if ($line == ".\r\n") {
                     break;
+                } elseif ( $line{0} == '.' ) {
+                    $ret .= substr($line,1);
                 } else {
                     $ret.= $line;
                 }
@@ -564,8 +566,8 @@ class mail_fetch {
         }
         fwrite($this->conn,"STLS\r\n");
         if (! $this->check_response()) {
-           $this->command_quit();
-           return false;
+            $this->command_quit();
+            return false;
         }
 
         if (@stream_socket_enable_crypto($this->conn,true,STREAM_CRYPTO_METHOD_TLS_CLIENT)) {