reuploading files

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

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index e099ce1a9a96a70b2dbd3d9b15ef254fb13aed43..88ee5c1e50792e4c5bf7b79c0aedb9e2fe8e0250 100644 (file)
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -12,7 +12,7 @@
     * @package plugins
     * @subpackage mail_fetch
     **/
-    
+
     /**  */
     require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
 
@@ -41,7 +41,7 @@
 
         global $data_dir;
         global $mailfetch_server_number;
-        global $mailfetch_cypher;
+        global $mailfetch_cypher, $mailfetch_port_;
         global $mailfetch_server_,$mailfetch_alias_,$mailfetch_user_,$mailfetch_pass_;
         global $mailfetch_lmos_, $mailfetch_uidl_, $mailfetch_login_, $mailfetch_fref_;
         global $PHP_SELF;
@@ -75,7 +75,7 @@
         require_once (SM_PATH . 'plugins/mail_fetch/functions.php');
 
         global $data_dir, $imapServerAddress, $imapPort;
-        
+
         sqgetGlobalVar('username', $username, SQ_SESSION);
         sqgetGlobalVar('key',      $key,      SQ_COOKIE);
 
@@ -155,8 +155,6 @@
                 if ($Count == 0) {
                     $pop3->quit();
                     continue;
-                } else {
-                    $newmsgcount = $Count - $i + 1;
                 }
 
                 // Faster to get them all at once
@@ -181,13 +179,14 @@
                     }
 
                     if ($mailfetch_subfolder=="") {
-                        fputs($imap_stream, "A3$i APPEND INBOX {" . (strlen($Message) - 1) . "}\r\n");
+                        fputs($imap_stream, "A3$i APPEND INBOX {" . strlen($Message) . "}\r\n");
                     } else {
-                        fputs($imap_stream, "A3$i APPEND $mailfetch_subfolder {" . (strlen($Message) - 1) . "}\r\n");
+                        fputs($imap_stream, "A3$i APPEND $mailfetch_subfolder {" . strlen($Message) . "}\r\n");
                     }
                     $Line = fgets($imap_stream, 1024);
                     if (substr($Line, 0, 1) == '+') {
                         fputs($imap_stream, $Message);
+                        fputs($imap_stream, "\r\n");
                         sqimap_read_data($imap_stream, "A3$i", false, $response, $message);
 
                         if ($mailfetch_lmos != 'on') {