X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fmail_fetch%2Fsetup.php;h=ec985446111c1343b451f2f9a1aef3eb5798dda2;hp=5b1dc73945c646816fc58ee8027017144dc7db46;hb=206188fdfb7a77c117c9dcbe12d6fb29e2660674;hpb=76911253eb850bacde3d86c8cb7b4af072e67ebe

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index 5b1dc739..ec985446 100644
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -3,16 +3,22 @@
    /**
     **  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.
     **
     **  $Id$
+    * @package plugins
+    * @subpackage mail_fetch
     **/
-
+    
+    /**  */
     require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
 
+    /**
+     * Initialize the plugin
+     */
     function squirrelmail_plugin_init_mail_fetch() {
         global $squirrelmail_plugin_hooks;
 
@@ -39,10 +45,8 @@
         global $mailfetch_server_,$mailfetch_alias_,$mailfetch_user_,$mailfetch_pass_;
         global $mailfetch_lmos_, $mailfetch_uidl_, $mailfetch_login_, $mailfetch_fref_;
         global $PHP_SELF;
-        if ( !check_php_version(4,1) ) {
-            global $_SESSION;
-        }
-        $username = $_SESSION['username'];
+
+        sqgetGlobalVar('username', $username, SQ_SESSION);
 
         if( stristr( $PHP_SELF, 'mail_fetch' ) ) {
             $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number', 0);
@@ -71,11 +75,9 @@
         require_once (SM_PATH . 'plugins/mail_fetch/functions.php');
 
         global $data_dir, $imapServerAddress, $imapPort;
-        if ( !check_php_version(4,1) ) {
-            global $_SESSION, $_COOKIE;
-        }
-        $username = $_SESSION['username'];
-        $key = $_COOKIE['key'];
+        
+        sqgetGlobalVar('username', $username, SQ_SESSION);
+        sqgetGlobalVar('key',      $key,      SQ_COOKIE);
 
         $mailfetch_newlog = getPref($data_dir, $username, 'mailfetch_newlog');
 
@@ -115,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);
 
@@ -164,7 +166,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);
 
@@ -178,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') {
@@ -204,12 +208,12 @@
         }
         }
 
-        if( trim( $outMsg ) <> '' )
-            echo '<br><font size=1>' . _("Mail Fetch Result:") . "<br>$outMsg</font>";
-
-        if( $mailfetch_newlog == 'on' )
-            setPref($data_dir,$username,"mailfetch_newlog", 'off');
-
+        if( trim( $outMsg ) <> '' ) {
+            echo '<br /><font size="1">' . _("Mail Fetch Result:") . "<br />$outMsg</font>";
+        }
+        if( $mailfetch_newlog == 'on' ) {
+            setPref($data_dir, $username, 'mailfetch_newlog', 'off');
+        }
     }
 
     function mail_fetch_setnew()    {
@@ -217,26 +221,18 @@
         global $data_dir;
         require_once(SM_PATH . 'functions/prefs.php');
 
-        if (isset($_SESSION['username'])) {
-            $username = $_SESSION['username'];
-        } else {
-           $username = '';
-        }
-
-        if( $username <> '' ) {
-            // Creates the pref file if it does not exist.
-            setPref( $data_dir, $username, 'mailfetch_newlog', 'on' );
-        }
+        sqgetGlobalVar('username', $username, SQ_SESSION);
 
+        setPref( $data_dir, $username, 'mailfetch_newlog', 'on' );
     }
 
     function mailfetch_optpage_register_block() {
       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
       );
    }