Minor cleanup

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

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index c84b3994c6e9b1c07854fa63c9428e96662be8e0..ec985446111c1343b451f2f9a1aef3eb5798dda2 100644 (file)
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -3,7 +3,7 @@
    /**
     **  mail_fetch/setup.php
     **
-    **  Copyright (c) 1999-2003 The SquirrelMail Project Team
+    **  Copyright (c) 1999-2004 The SquirrelMail Project Team
     **  Licensed under the GNU GPL. For full terms see the file COPYING.
     **
     **  Setup of the mailfetch plugin.
@@ -117,9 +117,9 @@
                 $mailfetch_uidl=$mailfetch_uidl_[$i_loop];
                 $mailfetch_subfolder=$mailfetch_subfolder_[$i_loop];
 
-                // $outMsg .= "$mailfetch_alias checked<br>";
+                // $outMsg .= "$mailfetch_alias checked<br />";
 
-                // $outMsg .= "$mailfetch_alias_[$i_loop]<br>";
+                // $outMsg .= "$mailfetch_alias_[$i_loop]<br />";
 
                 $pop3 = new POP3($mailfetch_server, 60);
 
@@ -181,13 +181,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') {
@@ -208,7 +209,7 @@
         }
 
         if( trim( $outMsg ) <> '' ) {
-            echo '<br><font size="1">' . _("Mail Fetch Result:") . "<br>$outMsg</font>";
+            echo '<br /><font size="1">' . _("Mail Fetch Result:") . "<br />$outMsg</font>";
         }
         if( $mailfetch_newlog == 'on' ) {
             setPref($data_dir, $username, 'mailfetch_newlog', 'off');
@@ -229,9 +230,9 @@
       global $optpage_blocks;
 
       $optpage_blocks[] = array(
-         'name' => _("Simple POP3 Fetch Mail"),
+         'name' => _("POP3 Fetch Mail"),
          'url'  => '../plugins/mail_fetch/options.php',
-         'desc' => _("This configures settings for downloading email from a pop3 mailbox to your account on this server."),
+         'desc' => _("This configures settings for downloading email from a POP3 mailbox to your account on this server."),
          'js'   => false
       );
    }