Okay... *this* is the one with debugging code, the last was some minor display correc...

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

diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index 7e59501e9b84a0a6dc90d3cbe0a9db9bb284c5a6..c5e67b05ac7716af42d4e7cf1b1b317a704bd3e2 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-2001 The Squirrelmail Development Team
+    **  Copyright (c) 1999-2002 The SquirrelMail Project Team
     **  Licensed under the GNU GPL. For full terms see the file COPYING.
     **
     **  Setup of the mailfetch plugin.
@@ -11,11 +11,10 @@
     **  $Id$
     **/
 
-    require_once( '../plugins/mail_fetch/functions.php' );
+    require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
 
     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';
@@ -34,12 +33,16 @@
 
     function mail_fetch_load_pref() {
 
-        global $username,$data_dir;
+        global $data_dir;
         global $mailfetch_server_number;
         global $mailfetch_cypher;
         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'];
 
         if( stristr( $PHP_SELF, 'mail_fetch' ) ) {
             $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number', 0);
@@ -47,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");
@@ -61,13 +65,17 @@
 
     function mail_fetch_login() {
 
-        require_once ('../src/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 $username, $data_dir, $key,$imapServerAddress,$imapPort;
+        global $data_dir, $imapServerAddress, $imapPort;
+        if ( !check_php_version(4,1) ) {
+            global $_SESSION, $_COOKIE;
+        }
+        $username = $_SESSION['username'];
+        $key = $_COOKIE['key'];
 
         $mailfetch_newlog = getPref($data_dir, $username, 'mailfetch_newlog');
 
@@ -90,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");
@@ -97,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];
@@ -111,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;
                 }
@@ -204,10 +214,14 @@
 
     function mail_fetch_setnew()    {
 
-        global $data_dir,$username;
-        // require_once ('../src/load_prefs.php');
-        // require_once ('../src/validate.php');
-        require_once('../functions/prefs.php');
+        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.