"XXS-yourself" fixes

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

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index 7842e5b429f610ca31285a6aaa00d0b5f6f6e708..5b1dc73945c646816fc58ee8027017144dc7db46 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-2002 The SquirrelMail Project Team
+    **  Copyright (c) 1999-2003 The SquirrelMail Project Team
     **  Licensed under the GNU GPL. For full terms see the file COPYING.
     **
     **  Setup of the mailfetch plugin.
@@ -50,6 +50,7 @@
             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");
@@ -97,6 +98,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");
@@ -104,6 +106,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];
@@ -118,7 +121,7 @@
 
                 $pop3 = new POP3($mailfetch_server, 60);
 
-                if (!$pop3->connect($mailfetch_server)) {
+                if (!$pop3->connect($mailfetch_server,$mailfetch_port)) {
                     $outMsg .= _("Warning, ") . $pop3->ERROR;
                     continue;
                 }