X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=inline;f=plugins%2Fmail_fetch%2Fsetup.php;h=88ee5c1e50792e4c5bf7b79c0aedb9e2fe8e0250;hb=d790ef41e1b29244bfa8f4ca5e5556ead6018f89;hp=1c27171951184c7d28629ee7ee9a0c503bc927d4;hpb=92219031d9ad648536aeda878a336c6bd9b4c3a1;p=squirrelmail.git

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index 1c271719..88ee5c1e 100644
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -3,20 +3,24 @@
    /**
     **  mail_fetch/setup.php
     **
-    **  Copyright (c) 1999-2002 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
     **/
 
-    define('SM_PATH','../../');
+    /**  */
     require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
 
+    /**
+     * Initialize the plugin
+     */
     function squirrelmail_plugin_init_mail_fetch() {
         global $squirrelmail_plugin_hooks;
-        global $mailbox, $imap_stream, $imapConnection;
 
         $squirrelmail_plugin_hooks['menuline']['mail_fetch'] = 'mail_fetch_link';
         $squirrelmail_plugin_hooks['loading_prefs']['mail_fetch'] = 'mail_fetch_load_pref';
@@ -35,19 +39,22 @@
 
     function mail_fetch_load_pref() {
 
-        global $username,$data_dir;
+        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;
 
+        sqgetGlobalVar('username', $username, SQ_SESSION);
+
         if( stristr( $PHP_SELF, 'mail_fetch' ) ) {
             $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number', 0);
             $mailfetch_cypher = getPref($data_dir, $username, 'mailfetch_cypher', 'on' );
             if ($mailfetch_server_number<1) $mailfetch_server_number=0;
             for ($i=0;$i<$mailfetch_server_number;$i++) {
                 $mailfetch_server_[$i] = getPref($data_dir, $username, "mailfetch_server_$i");
+                $mailfetch_port_[$i] = getPref($data_dir, $username, "mailfetch_port_$i");
                 $mailfetch_alias_[$i]  = getPref($data_dir, $username, "mailfetch_alias_$i");
                 $mailfetch_user_[$i]   = getPref($data_dir, $username, "mailfetch_user_$i");
                 $mailfetch_pass_[$i]   = getPref($data_dir, $username, "mailfetch_pass_$i");
@@ -62,13 +69,15 @@
 
     function mail_fetch_login() {
 
-        require_once ('../include/validate.php');
-        require_once ('../functions/imap.php');
-        require_once ('../plugins/mail_fetch/class.POP3.php');
-        require_once ('../plugins/mail_fetch/functions.php');
-        require_once ('../functions/i18n.php');
+        require_once (SM_PATH . 'include/validate.php');
+        require_once (SM_PATH . 'functions/imap.php');
+        require_once (SM_PATH . 'plugins/mail_fetch/class.POP3.php');
+        require_once (SM_PATH . 'plugins/mail_fetch/functions.php');
+
+        global $data_dir, $imapServerAddress, $imapPort;
 
-        global $username, $data_dir, $key,$imapServerAddress,$imapPort;
+        sqgetGlobalVar('username', $username, SQ_SESSION);
+        sqgetGlobalVar('key',      $key,      SQ_COOKIE);
 
         $mailfetch_newlog = getPref($data_dir, $username, 'mailfetch_newlog');
 
@@ -91,6 +100,7 @@
                 ( ( $mailfetch_login_[$i_loop] == 'on' &&  $mailfetch_newlog == 'on' ) || $mailfetch_fref_[$i_loop] == 'on' ) ) {
 
                 $mailfetch_server_[$i_loop] = getPref($data_dir, $username, "mailfetch_server_$i_loop");
+                $mailfetch_port_[$i_loop] = getPref($data_dir, $username , "mailfetch_port_$i_loop");
                 $mailfetch_alias_[$i_loop] = getPref($data_dir, $username, "mailfetch_alias_$i_loop");
                 $mailfetch_user_[$i_loop] = getPref($data_dir, $username, "mailfetch_user_$i_loop");
                 $mailfetch_lmos_[$i_loop] = getPref($data_dir, $username, "mailfetch_lmos_$i_loop");
@@ -98,6 +108,7 @@
                 $mailfetch_subfolder_[$i_loop] = getPref($data_dir, $username, "mailfetch_subfolder_$i_loop");
 
                 $mailfetch_server=$mailfetch_server_[$i_loop];
+                $mailfetch_port=$mailfetch_port_[$i_loop];
                 $mailfetch_user=$mailfetch_user_[$i_loop];
                 $mailfetch_alias=$mailfetch_alias_[$i_loop];
                 $mailfetch_pass=$mailfetch_pass_[$i_loop];
@@ -106,13 +117,13 @@
                 $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);
 
-                if (!$pop3->connect($mailfetch_server)) {
+                if (!$pop3->connect($mailfetch_server,$mailfetch_port)) {
                     $outMsg .= _("Warning, ") . $pop3->ERROR;
                     continue;
                 }
@@ -144,8 +155,6 @@
                 if ($Count == 0) {
                     $pop3->quit();
                     continue;
-                } else {
-                    $newmsgcount = $Count - $i + 1;
                 }
 
                 // Faster to get them all at once
@@ -155,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);
 
@@ -169,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') {
@@ -195,35 +206,33 @@
         }
         }
 
-        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()    {
 
-        global $data_dir,$username;
+        global $data_dir;
         require_once(SM_PATH . 'functions/prefs.php');
 
-        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
       );
    }
 
-?>
+?>
\ No newline at end of file