From: tokul <tokul@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Mon, 25 Apr 2005 10:47:14 +0000 (+0000)
Subject: moved functions from setup.php
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=60683821362f6f378b6a57a1435a49949ed6d813;p=squirrelmail.git

moved functions from setup.php
added site configuration support


git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@9390 7612ce4b-ef26-0410-bec9-ea0150e637f0
---

diff --git a/plugins/mail_fetch/README b/plugins/mail_fetch/README
index 9b345951..e246a2fc 100644
--- a/plugins/mail_fetch/README
+++ b/plugins/mail_fetch/README
@@ -88,14 +88,10 @@ Installation
 
 Go back to the main directory, run configure and add the plugin.
 
+Some plugin settings can be adjusted in config/mail_fetch_config.php or
+plugins/mail_fetch/config.php files. 
 
-Translations
-============
-Translation is made in the same manner as SquirrelMail's core.
-You need to take <plugin_name>.po file, fill the template, store it
-in the appropriate locale folder under the plugin and compile the po
-file. Better than this fill the po file and send it back to the author.
-The translation will be included in the next release of the plugin.
+See plugins/mail_fetch/config_sample.php
 
 
 Note for mod_gzip users
diff --git a/plugins/mail_fetch/class.POP3.php b/plugins/mail_fetch/class.POP3.php
index 81ba34d8..ee1fa2c7 100644
--- a/plugins/mail_fetch/class.POP3.php
+++ b/plugins/mail_fetch/class.POP3.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * mail_fetch/class.POP3.php
  *
@@ -20,7 +19,8 @@
 
 /**
  * This is the POP3 class - DOCUMENT ME
- * @package squirrelmail
+ * @package plugins
+ * @subpackage mail_fetch
  */
 class POP3 {
     var $ERROR      = '';       //  Error string.
diff --git a/plugins/mail_fetch/config_sample.php b/plugins/mail_fetch/config_sample.php
new file mode 100644
index 00000000..e5cca2d3
--- /dev/null
+++ b/plugins/mail_fetch/config_sample.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * mail_fetch plugin - Sample configuration file 
+ *
+ * Copyright (c) 2005 The SquirrelMail Project Team
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * @version $Id$
+ * @package plugins
+ * @subpackage mail_fetch
+ */
+
+/**
+ * Controls use of unsubscribed folders in plugin
+ */
+$mail_fetch_allow_unsubscribed = false;
+?>
\ No newline at end of file
diff --git a/plugins/mail_fetch/fetch.php b/plugins/mail_fetch/fetch.php
index e902182c..88de7464 100644
--- a/plugins/mail_fetch/fetch.php
+++ b/plugins/mail_fetch/fetch.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * mail_fetch/fetch.php
  *
diff --git a/plugins/mail_fetch/functions.php b/plugins/mail_fetch/functions.php
index 4e5b1699..6b3d9a2e 100644
--- a/plugins/mail_fetch/functions.php
+++ b/plugins/mail_fetch/functions.php
@@ -1,12 +1,11 @@
 <?php
-
 /**
  * mail_fetch/functions.php
  *
  * Copyright (c) 1999-2005 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- * Functions for the mailfetch plugin.
+ * Functions for the mail_fetch plugin.
  *
  * Original code from LexZEUS <lexzeus@mifinca.com>
  * and josh@superfork.com (extracted from php manual)
@@ -17,6 +16,12 @@
  * @subpackage mail_fetch
  */
 
+/** @ignore */
+if (! defined('SM_PATH')) define('SM_PATH','../../');
+
+/** pop3 class */
+include_once (SM_PATH . 'plugins/mail_fetch/class.POP3.php');
+
 /** declare plugin globals */
 global $mail_fetch_allow_unsubscribed;
 
@@ -27,6 +32,267 @@ global $mail_fetch_allow_unsubscribed;
  */
 $mail_fetch_allow_unsubscribed = false;
 
+/** load site config */
+if (file_exists(SM_PATH . 'config/mail_fetch_config.php')) {
+    include_once(SM_PATH . 'config/mail_fetch_config.php');
+} elseif (file_exists(SM_PATH . 'plugins/mail_fetch/config.php')) {
+    include_once(SM_PATH . 'plugins/mail_fetch/config.php');
+}
+
+// hooked functions
+
+/**
+ * internal function used to load user's preferences
+ * @since 1.5.1
+ * @private
+ */
+function  mail_fetch_load_pref_function() {
+    global $data_dir;
+    global $mailfetch_server_number;
+    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");
+            $mailfetch_lmos_[$i]   = getPref($data_dir, $username, "mailfetch_lmos_$i");
+            $mailfetch_login_[$i]  = getPref($data_dir, $username, "mailfetch_login_$i");
+            $mailfetch_fref_[$i]   = getPref($data_dir, $username, "mailfetch_fref_$i");
+            $mailfetch_uidl_[$i]   = getPref($data_dir, $username, "mailfetch_uidl_$i");
+            if( $mailfetch_cypher   == 'on' ) $mailfetch_pass_[$i] =    decrypt( $mailfetch_pass_[$i] );
+        }
+    }
+}
+
+/**
+ * Internal function used to fetch pop3 mails on login
+ * @since 1.5.1
+ * @private
+ */
+function mail_fetch_login_function() {
+    include_once (SM_PATH . 'include/validate.php');
+    include_once (SM_PATH . 'functions/imap.php');
+    
+    global $data_dir, $imapServerAddress, $imapPort;
+
+    sqgetGlobalVar('username', $username, SQ_SESSION);
+    sqgetGlobalVar('key',      $key,      SQ_COOKIE);
+
+    $mailfetch_newlog = getPref($data_dir, $username, 'mailfetch_newlog');
+
+    $outMsg = '';
+
+    $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number');
+    if (!isset($mailfetch_server_number)) $mailfetch_server_number=0;
+    $mailfetch_cypher = getPref($data_dir, $username, 'mailfetch_cypher');
+    if ($mailfetch_server_number<1) $mailfetch_server_number=0;
+
+    for ($i_loop=0;$i_loop<$mailfetch_server_number;$i_loop++) {
+
+        $mailfetch_login_[$i_loop] = getPref($data_dir, $username, "mailfetch_login_$i_loop");
+        $mailfetch_fref_[$i_loop] = getPref($data_dir, $username, "mailfetch_fref_$i_loop");
+        $mailfetch_pass_[$i_loop] = getPref($data_dir, $username, "mailfetch_pass_$i_loop");
+        if( $mailfetch_cypher == 'on' )
+            $mailfetch_pass_[$i_loop] = decrypt( $mailfetch_pass_[$i_loop] );
+
+        if( $mailfetch_pass_[$i_loop] <> '' &&          // Empty passwords no allowed
+                ( ( $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");
+            $mailfetch_uidl_[$i_loop] = getPref($data_dir, $username, "mailfetch_uidl_$i_loop");
+            $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];
+            $mailfetch_lmos=$mailfetch_lmos_[$i_loop];
+            $mailfetch_login=$mailfetch_login_[$i_loop];
+            $mailfetch_uidl=$mailfetch_uidl_[$i_loop];
+            $mailfetch_subfolder=$mailfetch_subfolder_[$i_loop];
+
+            // $outMsg .= "$mailfetch_alias checked<br />";
+
+            // $outMsg .= "$mailfetch_alias_[$i_loop]<br />";
+
+            $pop3 = new POP3($mailfetch_server, 60);
+
+            if (!$pop3->connect($mailfetch_server,$mailfetch_port)) {
+                $outMsg .= _("Warning, ") . $pop3->ERROR;
+                continue;
+            }
+
+            $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10);
+
+            $Count = $pop3->login($mailfetch_user, $mailfetch_pass);
+            if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
+                $outMsg .= _("Login Failed:") . $pop3->ERROR;
+                continue;
+            }
+
+            //   register_shutdown_function($pop3->quit());
+
+            $msglist = $pop3->uidl();
+
+            $i = 1;
+            for ($j = 1; $j < sizeof($msglist); $j++) {
+                if ($msglist["$j"] == $mailfetch_uidl) {
+                    $i = $j+1;
+                    break;
+                }
+            }
+
+            if ($Count < $i) {
+                $pop3->quit();
+                continue;
+            }
+            if ($Count == 0) {
+                $pop3->quit();
+                continue;
+            }
+
+            // Faster to get them all at once
+            $mailfetch_uidl = $pop3->uidl();
+
+            if (! is_array($mailfetch_uidl) && $mailfetch_lmos == 'on')
+                $outMsg .= _("Server does not support UIDL.");
+
+            for (; $i <= $Count; $i++) {
+                if (!ini_get('safe_mode'))
+                    set_time_limit(20); // 20 seconds per message max
+                $Message = "";
+                $MessArray = $pop3->get($i);
+
+                if ( (!$MessArray) or (gettype($MessArray) != "array")) {
+                    $outMsg .= _("Warning, ") . $pop3->ERROR;
+                    continue 2;
+                }
+
+                while (list($lineNum, $line) = each ($MessArray)) {
+                    $Message .= $line;
+                }
+
+                // check if mail folder is not null and subscribed (There is possible issue with /noselect mail folders)
+                if ($mailfetch_subfolder=='' ||
+                    ! mail_fetch_check_folder($imap_stream,$mailfetch_subfolder)) {
+                    fputs($imap_stream, "A3$i APPEND INBOX {" . strlen($Message) . "}\r\n");
+                } else {
+                    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') {
+                        $pop3->delete($i);
+                    }
+                } else {
+                    echo "$Line";
+                    $outMsg .= _("Error Appending Message!");
+                }
+            }
+
+            $pop3->quit();
+            sqimap_logout($imap_stream);
+            if (is_array($mailfetch_uidl)) {
+                setPref($data_dir,$username,"mailfetch_uidl_$i_loop", array_pop($mailfetch_uidl));
+            }
+        }
+    }
+
+    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');
+    }
+}
+
+/**
+ * Internal function used to detect new logins
+ */
+function mail_fetch_setnew_function() {
+    global $data_dir;
+
+    // FIXME: check if function is already loaded in login_verified hook
+    include_once(SM_PATH . 'functions/prefs.php');
+
+    sqgetGlobalVar('username', $username, SQ_SESSION);
+    setPref( $data_dir, $username, 'mailfetch_newlog', 'on' );
+}
+
+/**
+ * Internal function used to register option block
+ * @since 1.5.1
+ * @private
+ */
+function mailfetch_optpage_register_block_function() {
+    global $optpage_blocks;
+
+    $optpage_blocks[] = array(
+            '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."),
+            'js'   => false
+            );
+}
+
+/**
+ * Internal function used to update mail_fetch settings 
+ * when folders are renamed or deleted.
+ * @since 1.5.1
+ * @private
+ */
+function mail_fetch_folderact_function($args) {
+    global $username, $data_dir;
+
+    if (empty($args) || !is_array($args)) {
+        return;
+    }
+
+    /* Should be 3 ars, 1: old folder, 2: action, 3: new folder */
+    if (count($args) != 3) {
+        return;
+    }
+
+    list($old_folder, $action, $new_folder) = $args;
+
+    $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number');
+
+    for ($i = 0; $i < $mailfetch_server_number; $i++) {
+        $mailfetch_subfolder = getPref($data_dir, $username, 'mailfetch_subfolder_' . $i);
+
+        if ($mailfetch_subfolder != $old_folder) {
+            continue;
+        }
+
+        if ($action == 'delete') {
+            setPref($data_dir, $username, 'mailfetch_subfolder_' . $i, 'INBOX');
+        } elseif ($action == 'rename') {
+            setPref($data_dir, $username, 'mailfetch_subfolder_' . $i, $new_folder);
+        }
+    }
+}
+// end of hooked functions
+
 /**
  * hex2bin - document me
  */
diff --git a/plugins/mail_fetch/index.php b/plugins/mail_fetch/index.php
index c44ad4e8..4907e7fc 100644
--- a/plugins/mail_fetch/index.php
+++ b/plugins/mail_fetch/index.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * index.php -- Displays the main frameset
  *
@@ -13,7 +12,7 @@
  * @subpackage mail_fetch
  **/
 
-header("Location:../../src/login.php\n\n");
+header("Location:../index.php\n\n");
 exit();
 
 ?>
\ No newline at end of file
diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 6ba4ec2b..03bd31d6 100644
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * mail_fetch/options.php
  *
@@ -55,339 +54,335 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
 
 /* end globals */
 
-    displayPageHeader( $color, 'None' );
-
-    switch( $mf_action ) {
-    case 'add':
-        if ($mf_sn<1) $mf_sn=0;
-        if (!isset($mf_server)) return;
-        setPref($data_dir,$username,"mailfetch_server_$mf_sn", (isset($mf_server)?$mf_server:""));
-        setPref($data_dir,$username,"mailfetch_port_$mf_sn", (isset($mf_port)?$mf_port:110));
-        setPref($data_dir,$username,"mailfetch_alias_$mf_sn", (isset($mf_alias)?$mf_alias:""));
-        setPref($data_dir,$username,"mailfetch_user_$mf_sn",(isset($mf_user)?$mf_user:""));
-        setPref($data_dir,$username,"mailfetch_pass_$mf_sn",(isset($mf_pass)?encrypt( $mf_pass )    :""));
-        if( isset($mf_cypher) && $mf_cypher <> 'on' ) SetPref($data_dir,$username,'mailfetch_cypher',    'on');
-        setPref($data_dir,$username,"mailfetch_lmos_$mf_sn",(isset($mf_lmos)?$mf_lmos:""));
-        setPref($data_dir,$username,"mailfetch_login_$mf_sn",(isset($mf_login)?$mf_login:""));
-        setPref($data_dir,$username,"mailfetch_fref_$mf_sn",(isset($mf_fref)?$mf_fref:""));
-        setPref($data_dir,$username,"mailfetch_subfolder_$mf_sn",(isset($mf_subfolder)?$mf_subfolder:""));
-        $mf_sn++;
-        setPref($data_dir,$username,'mailfetch_server_number', $mf_sn);
-        $mf_action = 'config';
-        break;
-    case 'confirm_modify':
-        //modify    a server
-        if (!isset($mf_server)) return;
-        setPref($data_dir,$username,"mailfetch_server_$mf_sn", (isset($mf_server)?$mf_server:""));
-        setPref($data_dir,$username,"mailfetch_port_$mf_sn", (isset($mf_port)?$mf_port:110));
-        setPref($data_dir,$username,"mailfetch_alias_$mf_sn", (isset($mf_alias)?$mf_alias:""));
-        setPref($data_dir,$username,"mailfetch_user_$mf_sn",(isset($mf_user)?$mf_user:""));
-        setPref($data_dir,$username,"mailfetch_pass_$mf_sn",(isset($mf_pass)?encrypt( $mf_pass )    :""));
-        if( $mf_cypher <> 'on' ) setPref($data_dir,$username,"mailfetch_cypher", 'on');
-        setPref($data_dir,$username,"mailfetch_lmos_$mf_sn",(isset($mf_lmos)?$mf_lmos:""));
-        setPref($data_dir,$username,"mailfetch_login_$mf_sn",(isset($mf_login)?$mf_login:""));
-        setPref($data_dir,$username,"mailfetch_fref_$mf_sn",(isset($mf_fref)?$mf_fref:""));
-        setPref($data_dir,$username,"mailfetch_subfolder_$mf_sn",(isset($mf_subfolder)?$mf_subfolder:""));
-        $mf_action = 'config';
-        break;
-    case 'confirm_delete':
-        //delete    a server
-        $mailfetch_server_number    = getPref($data_dir, $username, "mailfetch_server_number");
-        if ($mf_sn+1==$mailfetch_server_number) {
-            //is the last server, whe can only decrase $mailfetch_server_number
-            $mailfetch_server_number--;
-            setPref($data_dir,$username,"mailfetch_server_number", $mailfetch_server_number);
-        } else {
-            //if not the last, all the sequel server come up one step
-            //then whe decrase $mailfetch_server_number
-            $mailfetch_server_number--;
-            for ($i=$mf_sn;$i<$mailfetch_server_number;$i++) {
-                $tmp=$i+1;
-                setPref($data_dir,$username,'mailfetch_server_'.$i,
-                    getPref($data_dir,$username, 'mailfetch_server_'.$tmp));
-                setPref($data_dir,$username,'mailfetch_port_'.$i,
-                    getPref($data_dir,$username, 'mailfetch_port_'.$tmp));
-                setPref($data_dir,$username,'mailfetch_alias_'.$i,
-                    getPref($data_dir,$username, 'mailfetch_alias_'.$tmp));
-                setPref($data_dir,$username,'mailfetch_user_'.$i,
-                    getPref($data_dir,$username, 'mailfetch_user_'.$tmp));
-                setPref($data_dir,$username,'mailfetch_pass_'.$i,
-                    getPref($data_dir,$username, 'mailfetch_pass_'.$tmp));
-                setPref($data_dir,$username,'mailfetch_lmos_'.$i,
-                    getPref($data_dir,$username, 'mailfetch_lmos_'.$tmp));
-                setPref($data_dir,$username,'mailfetch_login_'.$i,
-                    getPref($data_dir,$username, 'mailfetch_login_'.$tmp));
-                setPref($data_dir,$username,'mailfetch_fref_'.$i,
-                    getPref($data_dir,$username, 'mailfetch_fref_'.$tmp));
-                setPref($data_dir,$username,'mailfetch_subfolder_'.$i,
-                    getPref($data_dir,$username, 'mailfetch_subfolder_'.$tmp));
-                setPref($data_dir,$username,'mailfetch_uidl_'.$i,
-                    getPref($data_dir,$username, 'mailfetch_uidl_'.$tmp));
-            }
-            setPref($data_dir,$username,"mailfetch_server_number", $mailfetch_server_number);
-        }
-        $mf_action = 'config';
-        break;
-    }
-
-    $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number', 0);
-    $mailfetch_cypher = getPref( $data_dir, $username, 'mailfetch_cypher' );
-    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");
-        $mailfetch_lmos_[$i] = getPref($data_dir, $username, "mailfetch_lmos_$i");
-        $mailfetch_login_[$i] = getPref($data_dir, $username, "mailfetch_login_$i");
-        $mailfetch_fref_[$i] = getPref($data_dir, $username, "mailfetch_fref_$i");
-        $mailfetch_uidl_[$i] = getPref($data_dir, $username, "mailfetch_uidl_$i");
-        $mailfetch_subfolder_[$i] = getPref($data_dir, $username, "mailfetch_subfolder_$i");
-        if( $mailfetch_cypher == 'on' ) $mailfetch_pass_[$i] = decrypt( $mailfetch_pass_[$i] );
-    }
-
+displayPageHeader( $color, 'None' );
 
-    echo '<br /><form method="post" action="'.$PHP_SELF.'">' .
-            html_tag( 'table',
-                html_tag( 'tr',
-                    html_tag( 'td',
-                        '<b>' . _("Remote POP server settings") . '</b>',
-                    'center', $color[0] )
-                ),
-            'center', '', 'width="95%"' ) .
-            html_tag( 'table',
-                html_tag( 'tr',
-                    html_tag( 'td',
-                        _("You should be aware that the encryption used to store your password is not perfectly secure. However, if you are using pop, there is inherently no encryption anyway. Additionally, the encryption that we do to save it on the server can be undone by a hacker reading the source to this file.") ,
-                    'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'td',
-                        _("If you leave password empty, it will be asked when you fetch mail.") ,
-                    'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'td',
-                        '<input type="checkbox" name="mf_cypher" ' .
-                        (($mailfetch_cypher=='on')?'checked="checked" />':' />') .
-                        _("Encrypt passwords (informative only)") ,
-                    'right' )
-                ) ,
-            'center', '', 'width="95%"' );
-
-    switch( $mf_action ) {
-    case 'config':
-        echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
-                    html_tag( 'tr',
-                        html_tag( 'td', '<b>' . _("Add Server") . '</b>', 'center', $color[9] )
-                    ) .
-                    html_tag( 'tr' ) .
-                        html_tag( 'td', '', 'center', $color[0] ) .
+switch( $mf_action ) {
+ case 'add':
+     if ($mf_sn<1) $mf_sn=0;
+     if (!isset($mf_server)) return;
+     setPref($data_dir,$username,"mailfetch_server_$mf_sn", (isset($mf_server)?$mf_server:""));
+     setPref($data_dir,$username,"mailfetch_port_$mf_sn", (isset($mf_port)?$mf_port:110));
+     setPref($data_dir,$username,"mailfetch_alias_$mf_sn", (isset($mf_alias)?$mf_alias:""));
+     setPref($data_dir,$username,"mailfetch_user_$mf_sn",(isset($mf_user)?$mf_user:""));
+     setPref($data_dir,$username,"mailfetch_pass_$mf_sn",(isset($mf_pass)?encrypt( $mf_pass )    :""));
+     if( isset($mf_cypher) && $mf_cypher <> 'on' ) SetPref($data_dir,$username,'mailfetch_cypher',    'on');
+     setPref($data_dir,$username,"mailfetch_lmos_$mf_sn",(isset($mf_lmos)?$mf_lmos:""));
+     setPref($data_dir,$username,"mailfetch_login_$mf_sn",(isset($mf_login)?$mf_login:""));
+     setPref($data_dir,$username,"mailfetch_fref_$mf_sn",(isset($mf_fref)?$mf_fref:""));
+     setPref($data_dir,$username,"mailfetch_subfolder_$mf_sn",(isset($mf_subfolder)?$mf_subfolder:""));
+     $mf_sn++;
+     setPref($data_dir,$username,'mailfetch_server_number', $mf_sn);
+     $mf_action = 'config';
+     break;
+ case 'confirm_modify':
+     //modify    a server
+     if (!isset($mf_server)) return;
+     setPref($data_dir,$username,"mailfetch_server_$mf_sn", (isset($mf_server)?$mf_server:""));
+     setPref($data_dir,$username,"mailfetch_port_$mf_sn", (isset($mf_port)?$mf_port:110));
+     setPref($data_dir,$username,"mailfetch_alias_$mf_sn", (isset($mf_alias)?$mf_alias:""));
+     setPref($data_dir,$username,"mailfetch_user_$mf_sn",(isset($mf_user)?$mf_user:""));
+     setPref($data_dir,$username,"mailfetch_pass_$mf_sn",(isset($mf_pass)?encrypt( $mf_pass )    :""));
+     if( $mf_cypher <> 'on' ) setPref($data_dir,$username,"mailfetch_cypher", 'on');
+     setPref($data_dir,$username,"mailfetch_lmos_$mf_sn",(isset($mf_lmos)?$mf_lmos:""));
+     setPref($data_dir,$username,"mailfetch_login_$mf_sn",(isset($mf_login)?$mf_login:""));
+     setPref($data_dir,$username,"mailfetch_fref_$mf_sn",(isset($mf_fref)?$mf_fref:""));
+     setPref($data_dir,$username,"mailfetch_subfolder_$mf_sn",(isset($mf_subfolder)?$mf_subfolder:""));
+     $mf_action = 'config';
+     break;
+ case 'confirm_delete':
+     //delete    a server
+     $mailfetch_server_number    = getPref($data_dir, $username, "mailfetch_server_number");
+     if ($mf_sn+1==$mailfetch_server_number) {
+         //is the last server, whe can only decrase $mailfetch_server_number
+         $mailfetch_server_number--;
+         setPref($data_dir,$username,"mailfetch_server_number", $mailfetch_server_number);
+     } else {
+         //if not the last, all the sequel server come up one step
+         //then whe decrase $mailfetch_server_number
+         $mailfetch_server_number--;
+         for ($i=$mf_sn;$i<$mailfetch_server_number;$i++) {
+             $tmp=$i+1;
+             setPref($data_dir,$username,'mailfetch_server_'.$i,
+                     getPref($data_dir,$username, 'mailfetch_server_'.$tmp));
+             setPref($data_dir,$username,'mailfetch_port_'.$i,
+                     getPref($data_dir,$username, 'mailfetch_port_'.$tmp));
+             setPref($data_dir,$username,'mailfetch_alias_'.$i,
+                     getPref($data_dir,$username, 'mailfetch_alias_'.$tmp));
+             setPref($data_dir,$username,'mailfetch_user_'.$i,
+                     getPref($data_dir,$username, 'mailfetch_user_'.$tmp));
+             setPref($data_dir,$username,'mailfetch_pass_'.$i,
+                     getPref($data_dir,$username, 'mailfetch_pass_'.$tmp));
+             setPref($data_dir,$username,'mailfetch_lmos_'.$i,
+                     getPref($data_dir,$username, 'mailfetch_lmos_'.$tmp));
+             setPref($data_dir,$username,'mailfetch_login_'.$i,
+                     getPref($data_dir,$username, 'mailfetch_login_'.$tmp));
+             setPref($data_dir,$username,'mailfetch_fref_'.$i,
+                     getPref($data_dir,$username, 'mailfetch_fref_'.$tmp));
+             setPref($data_dir,$username,'mailfetch_subfolder_'.$i,
+                     getPref($data_dir,$username, 'mailfetch_subfolder_'.$tmp));
+             setPref($data_dir,$username,'mailfetch_uidl_'.$i,
+                     getPref($data_dir,$username, 'mailfetch_uidl_'.$tmp));
+         }
+         setPref($data_dir,$username,"mailfetch_server_number", $mailfetch_server_number);
+     }
+     $mf_action = 'config';
+     break;
+}
 
-            "<input type=\"hidden\" name=\"mf_sn\" value=\"$mailfetch_server_number\" />" .
-            '<input type="hidden" name="mf_action" value="add" />' .
-            html_tag( 'table' ) .
-                html_tag( 'tr',
-                    html_tag( 'th', _("Server:"), 'right' ) .
-                    html_tag( 'td', '<input type="text" name="mf_server" value="" size="40" />', 'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', _("Port:"), 'right') .
-                    html_tag( 'td', '<input type="text" name="mf_port" value="110" size="20" />', 'left')
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', _("Alias:"), 'right' ) .
-                    html_tag( 'td', '<input type="text" name="mf_alias" value="" size="20" />', 'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', _("Username:"), 'right' ) .
-                    html_tag( 'td', '<input type="text" name="mf_user" value="" size="20" />', 'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', _("Password:"), 'right' ) .
-                    html_tag( 'td', '<input type="password" name="mf_pass" value="" size="20" />', 'left' )
-                ) .
-                html_tag( 'tr' ) .
-                    html_tag( 'th', _("Store in Folder:"), 'right' ) .
-                    html_tag( 'td', '', 'left' );
-        $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
-        $boxes = sqimap_mailbox_list($imapConnection);
-        echo '<select name="mf_subfolder">';
+$mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number', 0);
+$mailfetch_cypher = getPref( $data_dir, $username, 'mailfetch_cypher' );
+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");
+    $mailfetch_lmos_[$i] = getPref($data_dir, $username, "mailfetch_lmos_$i");
+    $mailfetch_login_[$i] = getPref($data_dir, $username, "mailfetch_login_$i");
+    $mailfetch_fref_[$i] = getPref($data_dir, $username, "mailfetch_fref_$i");
+    $mailfetch_uidl_[$i] = getPref($data_dir, $username, "mailfetch_uidl_$i");
+    $mailfetch_subfolder_[$i] = getPref($data_dir, $username, "mailfetch_subfolder_$i");
+    if( $mailfetch_cypher == 'on' ) $mailfetch_pass_[$i] = decrypt( $mailfetch_pass_[$i] );
+}
 
-        $selected = 0;
-        if ( isset($mf_subfolder) )
-          $selected = array(strtolower($mf_subfolder));
-        echo sqimap_mailbox_option_list($imapConnection, $selected);
-        echo '</select></td></tr>' .
-                html_tag( 'tr',
-                    html_tag( 'th', '&nbsp;', 'right' ) .
-                    html_tag( 'td', '<input type="checkbox" name="mf_lmos" checked="checked" />' . _("Leave Mail on Server"), 'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', '&nbsp;', 'right' ) .
-                    html_tag( 'td', '<input type="checkbox" name="mf_login" />' . _("Check mail at login"), 'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', '&nbsp;', 'right' ) .
-                    html_tag( 'td', '<input type="checkbox" name="mf_fref" />' . _("Check mail at folder refresh"), 'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'td',
-                        '<input type="submit" name="submit_mailfetch" value="' . _("Add Server") . '" />',
-                    'center', '', 'colspan="2"' )
-                ) .
-            '</table></td></tr></table></form>';
+echo '<br /><form method="post" action="'.$PHP_SELF.'">' .
+    html_tag( 'table',
+        html_tag( 'tr',
+            html_tag('td',
+                     '<b>' . _("Remote POP server settings") . '</b>',
+                     'center', $color[0] )
+                  ),
+              'center', '', 'width="95%"' ) .
+    html_tag( 'table',
+        html_tag( 'tr',
+            html_tag( 'td',
+                      _("You should be aware that the encryption used to store your password is not perfectly secure. However, if you are using pop, there is inherently no encryption anyway. Additionally, the encryption that we do to save it on the server can be undone by a hacker reading the source to this file.") ,
+                      'left' )
+                  ) .
+        html_tag( 'tr',
+            html_tag( 'td',
+                      _("If you leave password empty, it will be asked when you fetch mail.") ,
+                      'left' )
+                  ) .
+        html_tag( 'tr',
+            html_tag( 'td',
+                      '<input type="checkbox" name="mf_cypher" ' .
+                      (($mailfetch_cypher=='on')?'checked="checked" />':' />') .
+                      _("Encrypt passwords (informative only)") ,
+                      'right' )
+                  ) ,
+              'center', '', 'width="95%"' );
 
-        // Modify Server
-        echo '<font size="-5"><br /></font>' .
-            html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
-                html_tag( 'tr',
-                    html_tag( 'td', '<b>' . _("Modify Server") . '</b>', 'center', $color[9] )
-                ) .
-                html_tag( 'tr' ) .
-                    html_tag( 'td', '', 'center', $color[0] );
-        if ($mailfetch_server_number>0) {
-            echo "<form action=\"$PHP_SELF\" method=\"post\" target=\"_self\">";
-            echo '<b>' . _("Server Name:") . '</b> <select name="mf_sn">';
-            for ($i=0;$i<$mailfetch_server_number;$i++) {
-                echo "<option value=\"$i\">" .
-                    htmlspecialchars( (($mailfetch_alias_[$i]=='')?$mailfetch_server_[$i]:$mailfetch_alias_[$i])) . "</option>";
-            }
-            echo '</select>'.
-                 '&nbsp;&nbsp;<input type="submit" name="mf_action_mod" value="' . _("Modify") . '" />'.
-                 '&nbsp;&nbsp;<input type="submit" name="mf_action_del" value="' . _("Delete") . '" />'.
-                 '</form>';
-        } else {
-            echo _("No servers known.");
-        }
-        echo '</td></tr></table>';
-        break;
-    case 'Delete':                                     //erase confirmation about a server
-        echo html_tag( 'table',
-                    html_tag( 'tr',
-                        html_tag( 'td', '<b>' . _("Fetching Servers") . '</b>', 'center', $color[0] )
-                    ) ,
-                'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) .
-            '<br />' .
-            html_tag( 'table',
-                html_tag( 'tr',
-                    html_tag( 'td', '<b>' . _("Confirm Deletion of a Server") . '</b>', 'center', $color[9] )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'td',
-                        "<input type=\"hidden\" name=\"mf_sn\" value=\"$mf_sn\" />" .
-                        '<input type="hidden" name="mf_action" value="confirm_delete" />' .
-                        '<br />' . _("Selected Server:") . " <b>" . htmlspecialchars($mailfetch_server_[$mf_sn]) . "</b><br />" .
-                        _("Confirm delete of selected server?") . '<br /><br />' .
-                        '<input type="submit" name="submit_mailfetch" value="' . _("Confirm Delete") . '" />' .
-                        '<br /></form>' ,
-                    'center', $color[9] )
-                ) ,
-            'center', '', 'width="70%" cellpadding="5" cellspacing="1"' );
-        break;                                  //modify a server
-    case 'Modify':
-        echo html_tag( 'table',
-                    html_tag( 'tr',
-                        html_tag( 'td', '<b>' . _("Fetching Servers") . '</b>', 'center', $color[0] )
-                    ) ,
-                'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) .
-            '<br />' .
-            html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
-                html_tag( 'tr',
-                    html_tag( 'td', '<b>' . _("Modify Server") . '</b>', 'center', $color[9] )
-                ) .
-                html_tag( 'tr' ) .
-                    html_tag( 'td', '', 'center', $color[0] ) .
+switch( $mf_action ) {
+ case 'config':
+     echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
+         html_tag( 'tr',
+                   html_tag( 'td', '<b>' . _("Add Server") . '</b>', 'center', $color[9] )
+                   ) .
+         html_tag( 'tr' ) .
+         html_tag( 'td', '', 'center', $color[0] ) .
 
-            "<input type=\"hidden\" name=\"mf_sn\" value=\"$mf_sn\" />" .
-            '<input type="hidden" name="mf_action" value="confirm_modify" />' .
-            html_tag( 'table' ) .
-                html_tag( 'tr',
-                    html_tag( 'th', _("Server:"), 'right' ) .
-                    html_tag( 'td', '<input type="text" name="mf_server" value="' .
-                        htmlspecialchars($mailfetch_server_[$mf_sn]) . '" size="40" />', 'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', _("Port:"), 'right' ) .
-                    html_tag( 'td', '<input type="text" name="mf_port" value="' .
-                        htmlspecialchars($mailfetch_port_[$mf_sn]) . '" size="40" />', 'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', _("Alias:"), 'right' ) .
-                    html_tag( 'td', '<input type="text" name="mf_alias" value="' .
-                        htmlspecialchars($mailfetch_alias_[$mf_sn]) . '" size="40" />', 'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', _("Username:"), 'right' ) .
-                    html_tag( 'td', '<input type="text" name="mf_user" value="' .
-                        htmlspecialchars($mailfetch_user_[$mf_sn]) . '" size="20" />', 'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', _("Password:"), 'right' ) .
-                    html_tag( 'td', '<input type="password" name="mf_pass" value="' .
-                        htmlspecialchars($mailfetch_pass_[$mf_sn]) . '" size="20" />', 'left' )
-                ) .
-                html_tag( 'tr' ) .
-                    html_tag( 'th', _("Store in Folder:"), 'right' ) .
-                    html_tag( 'td', '', 'left' );
+         "<input type=\"hidden\" name=\"mf_sn\" value=\"$mailfetch_server_number\" />" .
+         '<input type="hidden" name="mf_action" value="add" />' .
+         html_tag( 'table' ) .
+         html_tag( 'tr',
+             html_tag( 'th', _("Server:"), 'right' ) .
+             html_tag( 'td', '<input type="text" name="mf_server" value="" size="40" />', 'left' )
+                   ) .
+         html_tag( 'tr',
+             html_tag( 'th', _("Port:"), 'right') .
+             html_tag( 'td', '<input type="text" name="mf_port" value="110" size="20" />', 'left')
+                   ) .
+         html_tag( 'tr',
+             html_tag( 'th', _("Alias:"), 'right' ) .
+             html_tag( 'td', '<input type="text" name="mf_alias" value="" size="20" />', 'left' )
+                   ) .
+         html_tag( 'tr',
+             html_tag( 'th', _("Username:"), 'right' ) .
+             html_tag( 'td', '<input type="text" name="mf_user" value="" size="20" />', 'left' )
+                   ) .
+         html_tag( 'tr',
+             html_tag( 'th', _("Password:"), 'right' ) .
+             html_tag( 'td', '<input type="password" name="mf_pass" value="" size="20" />', 'left' )
+                   ) .
+         html_tag( 'tr' ) .
+             html_tag( 'th', _("Store in Folder:"), 'right' ) .
+             html_tag( 'td', '', 'left' );
+     $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
+     $boxes = sqimap_mailbox_list($imapConnection);
+     echo '<select name="mf_subfolder">';
 
-        $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
-        $boxes = sqimap_mailbox_list($imapConnection);
-        echo '<select name="mf_subfolder">';
-        $selected = 0;
-        if ( isset($mailfetch_subfolder_[$mf_sn]) ) {
-            $selected = array(strtolower($mailfetch_subfolder_[$mf_sn]));
-        }
-        echo sqimap_mailbox_option_list($imapConnection, $selected) .
-             '</select></td></tr>' .
+     $selected = 0;
+     if ( isset($mf_subfolder) )
+         $selected = array(strtolower($mf_subfolder));
+     echo sqimap_mailbox_option_list($imapConnection, $selected);
+     echo '</select></td></tr>' .
+         html_tag( 'tr',
+             html_tag( 'th', '&nbsp;', 'right' ) .
+             html_tag( 'td', '<input type="checkbox" name="mf_lmos" checked="checked" />' . _("Leave Mail on Server"), 'left' )
+                   ) .
+         html_tag( 'tr',
+             html_tag( 'th', '&nbsp;', 'right' ) .
+             html_tag( 'td', '<input type="checkbox" name="mf_login" />' . _("Check mail at login"), 'left' )
+                   ) .
+         html_tag( 'tr',
+             html_tag( 'th', '&nbsp;', 'right' ) .
+             html_tag( 'td', '<input type="checkbox" name="mf_fref" />' . _("Check mail at folder refresh"), 'left' )
+                   ) .
+         html_tag( 'tr',
+             html_tag( 'td',
+                       '<input type="submit" name="submit_mailfetch" value="' . _("Add Server") . '" />',
+                       'center', '', 'colspan="2"' )
+                   ) .
+         '</table></td></tr></table></form>';
 
-                html_tag( 'tr',
-                    html_tag( 'th', '&nbsp;', 'right' ) .
-                    html_tag( 'td',
-                        '<input type="checkbox" name="mf_lmos" ' . (($mailfetch_lmos_[$mf_sn] == 'on')?'checked="checked"':'') .
-                        ' />' . _("Leave Mail on Server") ,
-                    'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', '&nbsp;', 'right' ) .
-                    html_tag( 'td',
-                        '<input type="checkbox" name="mf_login" ' . ( ($mailfetch_login_[$mf_sn] == 'on')?'checked="checked"':'') .
-                        ' />' . _("Check mail at login"),
-                    'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'th', '&nbsp;', 'right' ) .
-                    html_tag( 'td',
-                        '<input type="checkbox" name="mf_fref" ' . ( ($mailfetch_fref_[$mf_sn] == 'on')?'checked="checked"':'') .
-                        ' />' . _("Check mail at folder refresh") ,
-                    'left' )
-                ) .
-                html_tag( 'tr',
-                    html_tag( 'td',
-                        '<input type="submit" name="submit_mailfetch" value="' . _("Modify Server") . '" />',
-                    'center', '', 'colspan="2"' )
-                ) .
+     // Modify Server
+     echo '<font size="-5"><br /></font>' .
+         html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
+             html_tag( 'tr',
+                 html_tag( 'td', '<b>' . _("Modify Server") . '</b>', 'center', $color[9] )
+                       ) .
+         html_tag( 'tr' ) .
+             html_tag( 'td', '', 'center', $color[0] );
+     if ($mailfetch_server_number>0) {
+         echo "<form action=\"$PHP_SELF\" method=\"post\" target=\"_self\">";
+         echo '<b>' . _("Server Name:") . '</b> <select name="mf_sn">';
+         for ($i=0;$i<$mailfetch_server_number;$i++) {
+             echo "<option value=\"$i\">" .
+                 htmlspecialchars( (($mailfetch_alias_[$i]=='')?$mailfetch_server_[$i]:$mailfetch_alias_[$i])) . "</option>";
+         }
+         echo '</select>'.
+             '&nbsp;&nbsp;<input type="submit" name="mf_action_mod" value="' . _("Modify") . '" />'.
+             '&nbsp;&nbsp;<input type="submit" name="mf_action_del" value="' . _("Delete") . '" />'.
+             '</form>';
+     } else {
+         echo _("No servers known.");
+     }
+     echo '</td></tr></table>';
+     break;
+ case 'Delete':                                     //erase confirmation about a server
+     echo html_tag( 'table',
+              html_tag( 'tr',
+                  html_tag( 'td', '<b>' . _("Fetching Servers") . '</b>', 'center', $color[0] )
+                        ) ,
+                    'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) .
+         '<br />' .
+         html_tag( 'table',
+             html_tag( 'tr',
+                 html_tag( 'td', '<b>' . _("Confirm Deletion of a Server") . '</b>', 'center', $color[9] )
+                       ) .
+             html_tag( 'tr',
+                 html_tag( 'td',
+                     "<input type=\"hidden\" name=\"mf_sn\" value=\"$mf_sn\" />" .
+                     '<input type="hidden" name="mf_action" value="confirm_delete" />' .
+                     '<br />' . _("Selected Server:") . " <b>" . htmlspecialchars($mailfetch_server_[$mf_sn]) . "</b><br />" .
+                     _("Confirm delete of selected server?") . '<br /><br />' .
+                     '<input type="submit" name="submit_mailfetch" value="' . _("Confirm Delete") . '" />' .
+                     '<br /></form>' ,
+                           'center', $color[9] )
+                       ) ,
+                   'center', '', 'width="70%" cellpadding="5" cellspacing="1"' );
+     break;                                  //modify a server
+ case 'Modify':
+     echo html_tag( 'table',
+              html_tag( 'tr',
+                  html_tag( 'td', '<b>' . _("Fetching Servers") . '</b>', 'center', $color[0] )
+                        ) ,
+                    'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) .
+         '<br />' .
+         html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
+             html_tag( 'tr',
+                 html_tag( 'td', '<b>' . _("Modify Server") . '</b>', 'center', $color[9] )
+                       ) .
+             html_tag( 'tr' ) .
+                 html_tag( 'td', '', 'center', $color[0] ) .
 
-            '</table></form></td></tr></table>';
-        break;
-    default:                                    //unsupported action
-        echo '</form>' .
-        html_tag( 'table',
-            html_tag( 'tr',
-                html_tag( 'td', '<b>' . _("Fetching Servers") . '</b>', 'center', $color[0] )
-            ) ,
-        'center', '', 'width="95%"' ) .
-        '<br />' .
-        html_tag( 'table',
-            html_tag( 'tr',
-                html_tag( 'td', '<b>' . _("Undefined Function") . '</b>', 'center', $color[9] ) .
-                html_tag( 'td', '<b>' . _("The function you requested is unknown.") . '</b>', 'center', $color[0] )
-            ) ,
-        'center', '', 'width="70%"' );
-    }
+         "<input type=\"hidden\" name=\"mf_sn\" value=\"$mf_sn\" />" .
+         '<input type="hidden" name="mf_action" value="confirm_modify" />' .
+         html_tag( 'table' ) .
+             html_tag( 'tr',
+                 html_tag( 'th', _("Server:"), 'right' ) .
+                 html_tag( 'td', '<input type="text" name="mf_server" value="' .
+                           htmlspecialchars($mailfetch_server_[$mf_sn]) . '" size="40" />', 'left' )
+                       ) .
+             html_tag( 'tr',
+                 html_tag( 'th', _("Port:"), 'right' ) .
+                 html_tag( 'td', '<input type="text" name="mf_port" value="' .
+                           htmlspecialchars($mailfetch_port_[$mf_sn]) . '" size="40" />', 'left' )
+                       ) .
+             html_tag( 'tr',
+                 html_tag( 'th', _("Alias:"), 'right' ) .
+                 html_tag( 'td', '<input type="text" name="mf_alias" value="' .
+                           htmlspecialchars($mailfetch_alias_[$mf_sn]) . '" size="40" />', 'left' )
+                       ) .
+             html_tag( 'tr',
+                 html_tag( 'th', _("Username:"), 'right' ) .
+                 html_tag( 'td', '<input type="text" name="mf_user" value="' .
+                           htmlspecialchars($mailfetch_user_[$mf_sn]) . '" size="20" />', 'left' )
+                       ) .
+             html_tag( 'tr',
+                 html_tag( 'th', _("Password:"), 'right' ) .
+                 html_tag( 'td', '<input type="password" name="mf_pass" value="' .
+                           htmlspecialchars($mailfetch_pass_[$mf_sn]) . '" size="20" />', 'left' )
+                       ) .
+             html_tag( 'tr' ) .
+                 html_tag( 'th', _("Store in Folder:"), 'right' ) .
+                 html_tag( 'td', '', 'left' );
 
+     $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
+     $boxes = sqimap_mailbox_list($imapConnection);
+     echo '<select name="mf_subfolder">';
+     $selected = 0;
+     if ( isset($mailfetch_subfolder_[$mf_sn]) ) {
+         $selected = array(strtolower($mailfetch_subfolder_[$mf_sn]));
+     }
+     echo sqimap_mailbox_option_list($imapConnection, $selected) .
+         '</select></td></tr>' .
+         html_tag( 'tr',
+             html_tag( 'th', '&nbsp;', 'right' ) .
+             html_tag( 'td',
+                       '<input type="checkbox" name="mf_lmos" ' . (($mailfetch_lmos_[$mf_sn] == 'on')?'checked="checked"':'') .
+                       ' />' . _("Leave Mail on Server") ,
+                       'left' )
+                   ) .
+         html_tag( 'tr',
+             html_tag( 'th', '&nbsp;', 'right' ) .
+             html_tag( 'td',
+                       '<input type="checkbox" name="mf_login" ' . ( ($mailfetch_login_[$mf_sn] == 'on')?'checked="checked"':'') .
+                       ' />' . _("Check mail at login"),
+                       'left' )
+                   ) .
+         html_tag( 'tr',
+             html_tag( 'th', '&nbsp;', 'right' ) .
+             html_tag( 'td',
+                       '<input type="checkbox" name="mf_fref" ' . ( ($mailfetch_fref_[$mf_sn] == 'on')?'checked="checked"':'') .
+                       ' />' . _("Check mail at folder refresh") ,
+                       'left' )
+                   ) .
+         html_tag( 'tr',
+             html_tag( 'td',
+                       '<input type="submit" name="submit_mailfetch" value="' . _("Modify Server") . '" />',
+                       'center', '', 'colspan="2"' )
+                   ) .
+         '</table></form></td></tr></table>';
+     break;
+ default:  //unsupported action
+     echo '</form>' .
+         html_tag( 'table',
+             html_tag( 'tr',
+                 html_tag( 'td', '<b>' . _("Fetching Servers") . '</b>', 'center', $color[0] )
+                       ) ,
+                   'center', '', 'width="95%"' ) .
+         '<br />' .
+         html_tag( 'table',
+             html_tag( 'tr',
+                 html_tag( 'td', '<b>' . _("Undefined Function") . '</b>', 'center', $color[9] ) .
+                 html_tag( 'td', '<b>' . _("The function you requested is unknown.") . '</b>', 'center', $color[0] )
+                       ) ,
+                   'center', '', 'width="70%"' );
+}
 ?>
 </body></html>
\ No newline at end of file
diff --git a/plugins/mail_fetch/setup.php b/plugins/mail_fetch/setup.php
index e059787f..b1b7e40f 100644
--- a/plugins/mail_fetch/setup.php
+++ b/plugins/mail_fetch/setup.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * mail_fetch/setup.php
  *
@@ -13,8 +12,8 @@
  * @subpackage mail_fetch
  */
 
-/**  */
-require_once(SM_PATH . 'plugins/mail_fetch/functions.php' );
+/** @ignore */
+if (! defined('SM_PATH')) define('SM_PATH','../../');
 
 /**
  * Initialize the plugin
@@ -30,241 +29,58 @@ function squirrelmail_plugin_init_mail_fetch() {
     $squirrelmail_plugin_hooks['rename_or_delete_folder']['mail_fetch'] = 'mail_fetch_folderact';
 }
 
+/**
+ * display link in menu line
+ * @private
+ */
 function mail_fetch_link() {
-
     displayInternalLink('plugins/mail_fetch/fetch.php', _("Fetch"), '');
     echo '&nbsp;&nbsp;';
-
 }
 
+/**
+ * load preferences
+ * @private
+ */
 function mail_fetch_load_pref() {
-
-    global $data_dir;
-    global $mailfetch_server_number;
-    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");
-            $mailfetch_lmos_[$i]   = getPref($data_dir, $username, "mailfetch_lmos_$i");
-            $mailfetch_login_[$i]  = getPref($data_dir, $username, "mailfetch_login_$i");
-            $mailfetch_fref_[$i]   = getPref($data_dir, $username, "mailfetch_fref_$i");
-            $mailfetch_uidl_[$i]   = getPref($data_dir, $username, "mailfetch_uidl_$i");
-            if( $mailfetch_cypher   == 'on' ) $mailfetch_pass_[$i] =    decrypt( $mailfetch_pass_[$i] );
-        }
-    }
+    include_once(SM_PATH . 'plugins/mail_fetch/functions.php');
+    mail_fetch_load_pref_function();
 }
 
+/**
+ * Fetch pop3 mails on login.
+ * @private
+ */
 function mail_fetch_login() {
-
-    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;
-
-    sqgetGlobalVar('username', $username, SQ_SESSION);
-    sqgetGlobalVar('key',      $key,      SQ_COOKIE);
-
-    $mailfetch_newlog = getPref($data_dir, $username, 'mailfetch_newlog');
-
-    $outMsg = '';
-
-    $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number');
-    if (!isset($mailfetch_server_number)) $mailfetch_server_number=0;
-    $mailfetch_cypher = getPref($data_dir, $username, 'mailfetch_cypher');
-    if ($mailfetch_server_number<1) $mailfetch_server_number=0;
-
-    for ($i_loop=0;$i_loop<$mailfetch_server_number;$i_loop++) {
-
-        $mailfetch_login_[$i_loop] = getPref($data_dir, $username, "mailfetch_login_$i_loop");
-        $mailfetch_fref_[$i_loop] = getPref($data_dir, $username, "mailfetch_fref_$i_loop");
-        $mailfetch_pass_[$i_loop] = getPref($data_dir, $username, "mailfetch_pass_$i_loop");
-        if( $mailfetch_cypher == 'on' )
-            $mailfetch_pass_[$i_loop] = decrypt( $mailfetch_pass_[$i_loop] );
-
-        if( $mailfetch_pass_[$i_loop] <> '' &&          // Empty passwords no allowed
-                ( ( $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");
-            $mailfetch_uidl_[$i_loop] = getPref($data_dir, $username, "mailfetch_uidl_$i_loop");
-            $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];
-            $mailfetch_lmos=$mailfetch_lmos_[$i_loop];
-            $mailfetch_login=$mailfetch_login_[$i_loop];
-            $mailfetch_uidl=$mailfetch_uidl_[$i_loop];
-            $mailfetch_subfolder=$mailfetch_subfolder_[$i_loop];
-
-            // $outMsg .= "$mailfetch_alias checked<br />";
-
-            // $outMsg .= "$mailfetch_alias_[$i_loop]<br />";
-
-            $pop3 = new POP3($mailfetch_server, 60);
-
-            if (!$pop3->connect($mailfetch_server,$mailfetch_port)) {
-                $outMsg .= _("Warning, ") . $pop3->ERROR;
-                continue;
-            }
-
-            $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 10);
-
-            $Count = $pop3->login($mailfetch_user, $mailfetch_pass);
-            if (($Count == false || $Count == -1) && $pop3->ERROR != '') {
-                $outMsg .= _("Login Failed:") . $pop3->ERROR;
-                continue;
-            }
-
-            //   register_shutdown_function($pop3->quit());
-
-            $msglist = $pop3->uidl();
-
-            $i = 1;
-            for ($j = 1; $j < sizeof($msglist); $j++) {
-                if ($msglist["$j"] == $mailfetch_uidl) {
-                    $i = $j+1;
-                    break;
-                }
-            }
-
-            if ($Count < $i) {
-                $pop3->quit();
-                continue;
-            }
-            if ($Count == 0) {
-                $pop3->quit();
-                continue;
-            }
-
-            // Faster to get them all at once
-            $mailfetch_uidl = $pop3->uidl();
-
-            if (! is_array($mailfetch_uidl) && $mailfetch_lmos == 'on')
-                $outMsg .= _("Server does not support UIDL.");
-
-            for (; $i <= $Count; $i++) {
-                if (!ini_get('safe_mode'))
-                    set_time_limit(20); // 20 seconds per message max
-                $Message = "";
-                $MessArray = $pop3->get($i);
-
-                if ( (!$MessArray) or (gettype($MessArray) != "array")) {
-                    $outMsg .= _("Warning, ") . $pop3->ERROR;
-                    continue 2;
-                }
-
-                while (list($lineNum, $line) = each ($MessArray)) {
-                    $Message .= $line;
-                }
-
-                // check if mail folder is not null and subscribed (There is possible issue with /noselect mail folders)
-                if ($mailfetch_subfolder=='' ||
-                    ! mail_fetch_check_folder($imap_stream,$mailfetch_subfolder)) {
-                    fputs($imap_stream, "A3$i APPEND INBOX {" . strlen($Message) . "}\r\n");
-                } else {
-                    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') {
-                        $pop3->delete($i);
-                    }
-                } else {
-                    echo "$Line";
-                    $outMsg .= _("Error Appending Message!");
-                }
-            }
-
-            $pop3->quit();
-            sqimap_logout($imap_stream);
-            if (is_array($mailfetch_uidl)) {
-                setPref($data_dir,$username,"mailfetch_uidl_$i_loop", array_pop($mailfetch_uidl));
-            }
-        }
-    }
-
-    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');
-    }
+    include_once (SM_PATH . 'plugins/mail_fetch/functions.php');
+    mail_fetch_login_function();
 }
 
+/**
+ * Adds preference that is used to detect new logins
+ * @private
+ */
 function mail_fetch_setnew() {
-
-    global $data_dir;
-    require_once(SM_PATH . 'functions/prefs.php');
-
-    sqgetGlobalVar('username', $username, SQ_SESSION);
-
-    setPref( $data_dir, $username, 'mailfetch_newlog', 'on' );
+    include_once (SM_PATH . 'plugins/mail_fetch/functions.php');
+    mail_fetch_setnew_function();
 }
 
+/**
+ * Add plugin option block
+ * @private
+ */
 function mailfetch_optpage_register_block() {
-    global $optpage_blocks;
-
-    $optpage_blocks[] = array(
-            '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."),
-            'js'   => false
-            );
+    include_once (SM_PATH . 'plugins/mail_fetch/functions.php');
+    mailfetch_optpage_register_block_function();
 }
 
+/**
+ * Update mail_fetch settings when folders are renamed or deleted.
+ * @since 1.5.1 and 1.4.5
+ * @private
+ */
 function mail_fetch_folderact($args) {
-    global $username, $data_dir;
-
-    if (empty($args) || !is_array($args)) {
-        return;
-    }
-
-    /* Should be 3 ars, 1: old folder, 2: action, 3: new folder */
-    if (count($args) != 3) {
-        return;
-    }
-
-    list($old_folder, $action, $new_folder) = $args;
-
-    $mailfetch_server_number = getPref($data_dir, $username, 'mailfetch_server_number');
-
-    for ($i = 0; $i < $mailfetch_server_number; $i++) {
-        $mailfetch_subfolder = getPref($data_dir, $username, 'mailfetch_subfolder_' . $i);
-
-        if ($mailfetch_subfolder != $old_folder) {
-            continue;
-        }
-
-        if ($action == 'delete') {
-            setPref($data_dir, $username, 'mailfetch_subfolder_' . $i, 'INBOX');
-        } elseif ($action == 'rename') {
-            setPref($data_dir, $username, 'mailfetch_subfolder_' . $i, $new_folder);
-        }
-    }
+    include_once (SM_PATH . 'plugins/mail_fetch/functions.php');
+    mail_fetch_folderact_function($args);
 }
 ?>
\ No newline at end of file