Happy 2014

[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..e15d58a42a36cd6ed3152299be130e2417666d06 100644 (file)
--- a/plugins/mail_fetch/class.mail_fetch.php
+++ b/plugins/mail_fetch/class.mail_fetch.php
@@ -5,7 +5,7 @@
  * Class depends on PHP pcre extension and fsockopen() function. Some features
  * might require PHP 4.3.0 with OpenSSL or PHP 5.1.0+. Class checks those extra 
  * dependencies internally, if used function needs it.
- * @copyright © 2006 The SquirrelMail Project Team
+ * @copyright 2006-2014 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
@@ -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)) {