Replacing tabs with spaces, trimming white space at EOL and newline at EOF

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

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index cfe8c60671fc79e33b004fb5c03c9849df39a4f0..88ee5c1e50792e4c5bf7b79c0aedb9e2fe8e0250 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.
@@ -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);
 
@@ -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);
 
@@ -155,8 +155,6 @@
                 if ($Count == 0) {
                     $pop3->quit();
                     continue;
-                } else {
-                    $newmsgcount = $Count - $i + 1;
                 }
 
                 // Faster to get them all at once
@@ -166,7 +164,8 @@
                     $outMsg .= _("Server does not support UIDL.");
 
                 for (; $i <= $Count; $i++) {
-                    set_time_limit(20); // 20 seconds per message max
+                    if (!ini_get('safe_mode'))
+                        set_time_limit(20); // 20 seconds per message max
                     $Message = "";
                     $MessArray = $pop3->get($i);
 
@@ -180,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') {
@@ -207,7 +207,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');
@@ -228,11 +228,11 @@
       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
       );
    }
 
-?>
+?>
\ No newline at end of file