X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fmail_fetch%2Foptions.php;h=98ae505cb6dbb5743e581730dce536237d6ffa60;hp=6bd8ce846a74dbfee4d35cc47b432216d0837252;hb=9eb3fcb302b8e0363760bee586f1c43e7050b365;hpb=5e7f6ef6843f2218e1b87532dd0ae69b155834fa

diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 6bd8ce84..98ae505c 100644
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -1,36 +1,73 @@
 <?php
 
-   /**
-    **  mail_fetch/options.php
-    **
-    **  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.
-    **
-    **  $Id$
-    **/
-
-    chdir('..');
-    require_once('../src/validate.php');
-    require_once('../functions/imap.php');
-    require_once('../src/load_prefs.php');
+/**
+ * mail_fetch/options.php
+ *
+ * Copyright (c) 1999-2005 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
+ */
 
-    displayPageHeader( $color, 'None' );
+/** @ignore */
+define('SM_PATH','../../');
+
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'include/load_prefs.php');
+
+/* globals */
+sqgetGlobalVar('username',   $username,   SQ_SESSION);
+sqgetGlobalVar('key',        $key,        SQ_COOKIE);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
+sqgetGlobalVar('delimiter',  $delimiter,  SQ_SESSION);
 
-    //if dosen't select any option
-    if (!isset($mf_action))
+if(!sqgetGlobalVar('mf_cypher', $mf_cypher, SQ_POST)) {
+    $mf_cypher = '';
+}
+if(! sqgetGlobalVar('mf_action', $mf_action, SQ_POST) ) {
+    if (sqgetGlobalVar('mf_action_mod', $mf_action_mod, SQ_POST)) {
+        $mf_action = 'Modify';
+    }
+    elseif (sqgetGlobalVar('mf_action_del', $mf_action_del, SQ_POST)) {
+        $mf_action = 'Delete';
+    }
+    else {
         $mf_action = 'config';
+    }
+}
+
+sqgetGlobalVar('mf_sn',            $mf_sn,            SQ_POST);
+sqgetGlobalVar('mf_server',        $mf_server,        SQ_POST);
+sqgetGlobalVar('mf_port',          $mf_port,          SQ_POST);
+sqgetGlobalVar('mf_alias',         $mf_alias,         SQ_POST);
+sqgetGlobalVar('mf_user',          $mf_user,          SQ_POST);
+sqgetGlobalVar('mf_pass',          $mf_pass,          SQ_POST);
+sqgetGlobalVar('mf_subfolder',     $mf_subfolder,     SQ_POST);
+sqgetGlobalVar('mf_login',         $mf_login,         SQ_POST);
+sqgetGlobalVar('mf_fref',          $mf_fref,          SQ_POST);
+sqgetGlobalVar('mf_lmos',          $mf_lmos,          SQ_POST);
+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( $mf_cypher <> 'on' ) SetPref($data_dir,$username,"mailfetch_cypher",    'on');
+        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:""));
@@ -43,6 +80,7 @@
         //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 )    :""));
@@ -66,15 +104,26 @@
             $mailfetch_server_number--;
             for ($i=$mf_sn;$i<$mailfetch_server_number;$i++) {
                 $tmp=$i+1;
-                setPref($data_dir,$username,"mailfetch_server_$mf_sn", getPref($data_dir, $username, "mailfetch_server_$tmp"));
-                setPref($data_dir,$username,"mailfetch_alias_$mf_sn", getPref($data_dir, $username, "mailfetch_alias_$tmp"));
-                setPref($data_dir,$username,"mailfetch_user_$mf_sn", getPref($data_dir, $username, "mailfetch_user_$tmp"));
-                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", getPref($data_dir, $username, "mailfetch_lmos_$tmp"));
-                setPref($data_dir,$username,"mailfetch_login_$mf_sn", getPref($data_dir, $username, "mailfetch_login_$tmp"));
-                setPref($data_dir,$username,"mailfetch_fref_$mf_sn", getPref($data_dir, $username, "mailfetch_fref_$tmp"));
-                setPref($data_dir,$username,"mailfetch_subfolder_$mf_sn", getPref($data_dir, $username, "mailfetch_subfolder_$tmp"));
+                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);
         }
@@ -89,6 +138,7 @@
     }
     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");
@@ -101,143 +151,244 @@
     }
 
 
-    echo '<BR><form method=post action="'.$PHP_SELF.'">' .
-            "<TABLE WIDTH=95% COLS=1 ALIGN=CENTER><TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" . _("Remote POP server settings") . '</b></TD></TR></TABLE>' .
-            '<TABLE WIDTH=95% COLS=1 ALIGN=CENTER><TR><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." ) .
-            '</TD></TR><TR><TD>' .
-            _("If you leave password empty, it will be required when you fetch mail.") .
-            '</TD></TR>' .
-            '<tr><td align=right><input type=checkbox name=mf_cypher ' .
-            (($mailfetch_cypher=='on')?'checked >':'>') .
-            _("Encrypt passwords (informative only)") . ' </td><tr>' .
-            '</TABLE></td></tr>';
+    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 required 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 '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
-            "  <TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Add Server") . '</b></TD></TR>' .
-            "  <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>" .
-            "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mailfetch_server_number\">" .
-            '<INPUT TYPE="hidden" NAME="mf_action" VALUE="add"><table>' .
-            '<tr><th align=right>' . _("Server:") . '</th><td><input type=text name=mf_server value="" size=40></td></tr>' .
-            '<tr><th align=right>' . _("Alias:") . '</th><td><input type=text name=mf_alias value="" size=20></td></tr>' .
-            '<tr><th align=right>' . _("Username:") . '</th><td><input type=text name=mf_user value="" size=20></td></tr>' .
-            '<tr><th align=right>' . _("Password:") . '</th><td><input type=password name=mf_pass value="" size=20></td></tr>' .
-            '<tr><th align=right>' . _("Store in Folder:") . '</th><td>';
+        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=\"$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>';
-        $boxes = sqimap_mailbox_list($imapConnection);
-        for ($i = 0; $i < count($boxes); $i++) {
-            if (!in_array('noselect', $boxes[$i]['flags'])) {
-                $box = $boxes[$i]['unformatted'];
-                $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
-                if ( strtolower( $box2 ) == 'inbox' ) {
-                    $box2 = _("INBOX");
-                }
-                echo "<OPTION VALUE=\"$box\">$box2</option>\n";
-            }
-        }        
-        echo '</SELECT></td></tr>' .
-            '<tr><th align=right>&nbsp;</th><td><input type=checkbox name=mf_lmos checked>' . _("Leave Mail on Server") . '</td></tr>' .
-            '<tr><th align=right>&nbsp;</th><td><input type=checkbox name=mf_login>' . _("Check mail during login") . '</td></tr>' .
-            '<tr><th align=right>&nbsp;</th><td><input type=checkbox name=mf_fref>' . _("Check mail during folder refresh") . '</td></tr>' .
-            '<tr><td align=center colspan=2><input type=submit name=submit_mailfetch value="' . _("Add Server") . '"></td></tr>' .
-            '</table></form></td></tr></TABLE>';
+        echo '<select name="mf_subfolder">';
+
+        $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 during login"), 'left' )
+                ) .
+                html_tag( 'tr',
+                    html_tag( 'th', '&nbsp;', 'right' ) .
+                    html_tag( 'td', '<input type="checkbox" name="mf_fref" />' . _("Check mail during 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>';
 
         // Modify Server
-        echo '<font size=-5><BR></font>' .
-            '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
-            "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Modify Server") . '</b></TD></TR>' .
-            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>";
+        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">';
+            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\">" .
-                    (($mailfetch_alias_[$i]=='')?$mailfetch_server_[$i]:$mailfetch_alias_[$i]) . "</OPTION>>";
+                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 value="' . _("Modify") . '">'.
-                 '&nbsp;&nbsp;<INPUT TYPE=submit name=mf_action value="' . _("Delete") . '">'.
+            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-one server in use. Try to add.");
         }
-        echo '</TD></TR></TABLE>';
+        echo '</td></tr></table>';
         break;
-    case _("Delete"):                                     //erase confirmation about a server
-        echo '<TABLE WIDTH=95% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
-            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" . _("Fetching Servers") . '</b></TD></TR>' .
-            '</TABLE>' .
-            '<BR>' .
-            '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
-            "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Confirm Deletion of a Server") . '</b></TD></TR>' .
-            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>" .
-            "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mf_sn\">" .
-            '<INPUT TYPE="hidden" NAME="mf_action" VALUE="confirm_delete">' .
-            '<br>' . _("Selected Server:") . "<b>$mailfetch_server_[$mf_sn]</b><br>" .
-            _("Confirm delete of selected server?") . '<br><br>' .
-            '<input type=submit name=submit_mailfetch value="' . _("Confirm Delete") . '">' .
-            '<br></form></TD></TR></TABLE>';
+    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 '<TABLE WIDTH=95% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
-            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" . _("Fetching Servers") . '</b></TD></TR>' .
-            '</TABLE>' .
-            '<BR>' .
-            '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=5 cellspacing=1>' .
-            "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Mofify a Server") . '</b></TD></TR>' .
-            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER>" .
-            "<INPUT TYPE=\"hidden\" NAME=\"mf_sn\" VALUE=\"$mf_sn\">" .
-            '<INPUT TYPE="hidden" NAME="mf_action" VALUE="confirm_modify">' .
-            '<table>' .
-            '<tr><th align=right>' . _("Server:") . '</th>' .
-            "<td><input type=text name=mf_server value=\"$mailfetch_server_[$mf_sn]\" size=40></td></tr>" .
-            '<tr><th align=right>' . _("Alias:") . '</th>' .
-            "<td><input type=text name=mf_alias value=\"$mailfetch_alias_[$mf_sn]\" size=40></td></tr>" .
-            '<tr><th align=right>' . _("Username:") . '</th>' .
-            "<td><input type=text name=mf_user value=\"$mailfetch_user_[$mf_sn]\" size=20></td></tr>" .
-            '<tr><th align=right>' . _("Password:") . '</th>' .
-            "<td><input type=password name=mf_pass value=\"$mailfetch_pass_[$mf_sn]\" size=20></td></tr>" .
-            '<tr><th align=right>' . _("Store in Folder:") . '</th><td>';
+    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] ) .
+
+            "<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>";
-        $boxes = sqimap_mailbox_list($imapConnection);
-        for ($i = 0; $i < count($boxes); $i++) {
-            if (!in_array('noselect', $boxes[$i]['flags'])) {
-                $box = $boxes[$i]['unformatted'];
-                $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
-                if ( strtolower( $box2 ) == 'inbox' ) {
-                    $box2 = _("INBOX");
-                }
-                echo '<OPTION ' .
-                     (strcmp($mailfetch_subfolder_[$mf_sn],$box)==0?'SELECTED':'') .
-                     " VALUE=\"$box\">$box2</option>\n";
-            }
-        }                
-        echo '</SELECT></td></tr>' .
-            '<tr><th align=right>&nbsp;</th>' .
-            '<td><input type=checkbox name=mf_lmos ' . (($mailfetch_lmos_[$mf_sn] == 'on')?'checked':'') .
-            '>' . _("Leave Mail on Server") . '</td></tr>' .
-            '<tr><th align=right>&nbsp;</TH><td><input type=checkbox name=mf_login ' . ( ($mailfetch_login_[$mf_sn] == 'on')?'checked':'') .
-            '>' . _("Check mail during login") . '</td></tr>' .
-            '<tr><th align=right>&nbsp;</TH><td><input type=checkbox name=mf_fref ' . ( ($mailfetch_fref_[$mf_sn] == 'on')?'checked':'') .
-            '>' . _("Check mail during folder refresh") . '</td></tr>' .
-            '<tr><td align=center colspan=2><input type=submit name=submit_mailfetch value="' . _("Modify Server") . '"></td></tr>' .
-            '</table></form></TD></TR></TABLE>';
+        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 during 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 during 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><TABLE WIDTH=95% COLS=1 ALIGN=CENTER>' .
-            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" . _("Fetching Servers") . '</b></TD></TR>' .
-            '</TABLE><BR>' .
-            '<TABLE WIDTH=70% COLS=1 ALIGN=CENTER>' .
-            "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER><b>" . _("Undefined Function") . '</b></TD></TR>' .
-            "<TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>" .
-            _("Hey! Wath do You are looking for?") . '</b></TD></TR></TABLE>';
+        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>' . _("Hey! Wath do You are looking for?") . '</b>', 'center', $color[0] )
+            ) ,
+        'center', '', 'width="70%"' );
     }
 
     ?>
-</body></html>
+</body></html>
\ No newline at end of file