X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Fmail_fetch%2Foptions.php;h=1b91d718466196ab5b59cbbd12ea5cc71a8da03c;hp=3fb9af4e1ad2fc24bb9d6bc62bd064248028cdb2;hb=a9e1e670fab4399260e0790e018393c7dcefcecc;hpb=15e6162eacc97158393bc75aed3afeb7b19c24a6
diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 3fb9af4e..1b91d718 100644
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -1,36 +1,73 @@
'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,151 +151,243 @@
}
- echo '
';
// Modify Server
echo '
' .
- '' .
- "" . _("Modify Server") . ' |
' .
- "";
+ html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
+ html_tag( 'tr',
+ html_tag( 'td', '' . _("Modify Server") . '', 'center', $color[9] )
+ ) .
+ html_tag( 'tr' ) .
+ html_tag( 'td', '', 'center', $color[0] );
if ($mailfetch_server_number>0) {
- echo "';
} else {
echo _("No-one server in use. Try to add.");
}
- echo ' |
';
+ echo '';
break;
- case _("Delete"): //erase confirmation about a server
- echo '' .
- "" . _("Fetching Servers") . ' |
' .
- '
' .
- '
' .
- '';
+ case 'Delete': //erase confirmation about a server
+ echo html_tag( 'table',
+ html_tag( 'tr',
+ html_tag( 'td', '' . _("Fetching Servers") . '', 'center', $color[0] )
+ ) ,
+ 'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) .
+ '
' .
+ html_tag( 'table',
+ html_tag( 'tr',
+ html_tag( 'td', '' . _("Confirm Deletion of a Server") . '', 'center', $color[9] )
+ ) .
+ html_tag( 'tr',
+ html_tag( 'td',
+ "" .
+ '' .
+ '
' . _("Selected Server:") . " " . htmlspecialchars($mailfetch_server_[$mf_sn]) . "
" .
+ _("Confirm delete of selected server?") . '
' .
+ '' .
+ '
' ,
+ 'center', $color[9] )
+ ) ,
+ 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' );
break; //modify a server
- case _("Modify"):
- echo '' .
- "" . _("Fetching Servers") . ' |
' .
- '
' .
- '
' .
- '' .
- "" . _("Mofify a Server") . ' |
' .
- "" .
+ case 'Modify':
+ echo html_tag( 'table',
+ html_tag( 'tr',
+ html_tag( 'td', '' . _("Fetching Servers") . '', 'center', $color[0] )
+ ) ,
+ 'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) .
+ ' ' .
+ html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
+ html_tag( 'tr',
+ html_tag( 'td', '' . _("Modify Server") . '', 'center', $color[9] )
+ ) .
+ html_tag( 'tr' ) .
+ html_tag( 'td', '', 'center', $color[0] ) .
+
"" .
'' .
- '' .
- '' . _("Server:") . ' | ' .
- " | " .
- '' . _("Alias:") . ' | ' .
- " | " .
- '' . _("Username:") . ' | ' .
- " | " .
- '' . _("Password:") . ' | ' .
- " | " .
- '' . _("Store in Folder:") . ' | ';
+ html_tag( 'table' ) .
+ html_tag( 'tr',
+ html_tag( 'th', _("Server:"), 'right' ) .
+ html_tag( 'td', '', 'left' )
+ ) .
+ html_tag( 'tr',
+ html_tag( 'th', _("Port:"), 'right' ) .
+ html_tag( 'td', '', 'left' )
+ ) .
+ html_tag( 'tr',
+ html_tag( 'th', _("Alias:"), 'right' ) .
+ html_tag( 'td', '', 'left' )
+ ) .
+ html_tag( 'tr',
+ html_tag( 'th', _("Username:"), 'right' ) .
+ html_tag( 'td', '', 'left' )
+ ) .
+ html_tag( 'tr',
+ html_tag( 'th', _("Password:"), 'right' ) .
+ html_tag( 'td', '', '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 " | ' .
- ' | ' .
- '' . _("Leave Mail on Server") . ' | ' .
- ' | ' . _("Check mail during login") . ' | ' .
- ' | ' . _("Check mail during folder refresh") . ' | ' .
- ' | ' .
- ' |
';
+ echo '' .
+
+ html_tag( 'tr',
+ html_tag( 'th', ' ', 'right' ) .
+ html_tag( 'td',
+ '' . _("Leave Mail on Server") ,
+ 'left' )
+ ) .
+ html_tag( 'tr',
+ html_tag( 'th', ' ', 'right' ) .
+ html_tag( 'td',
+ '' . _("Check mail during login"),
+ 'left' )
+ ) .
+ html_tag( 'tr',
+ html_tag( 'th', ' ', 'right' ) .
+ html_tag( 'td',
+ '' . _("Check mail during folder refresh") ,
+ 'left' )
+ ) .
+ html_tag( 'tr',
+ html_tag( 'td',
+ '',
+ 'center', '', 'colspan="2"' )
+ ) .
+
+ '';
break;
default: //unsupported action
- echo '' .
- "" . _("Fetching Servers") . ' |
' .
- '
' .
- '' .
- "" . _("Undefined Function") . ' |
' .
- "" .
- _("Hey! Wath do You are looking for?") . ' |
';
+ echo '' .
+ html_tag( 'table',
+ html_tag( 'tr',
+ html_tag( 'td', '' . _("Fetching Servers") . '', 'center', $color[0] )
+ ) ,
+ 'center', '', 'width="95%"' ) .
+ '
' .
+ html_tag( 'table',
+ html_tag( 'tr',
+ html_tag( 'td', '' . _("Undefined Function") . '', 'center', $color[9] ) .
+ html_tag( 'td', '' . _("Hey! Wath do You are looking for?") . '', 'center', $color[0] )
+ ) ,
+ 'center', '', 'width="70%"' );
}
?>