X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Fmail_fetch%2Foptions.php;h=98ae505cb6dbb5743e581730dce536237d6ffa60;hb=ffa25c5cddb5467f7dab3d5cbc2c40f25090b64d;hp=bcf103ec5d32d57835f9a00c6053df8f9537f8bb;hpb=4cf438432a1f2bfdba752e075ec6458ec3e290ba;p=squirrelmail.git
diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index bcf103ec..98ae505c 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_$i", getPref($data_dir, $username, "mailfetch_server_$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",(isset($mf_pass)?encrypt( $mf_pass ) :""));
- // if( $mf_cypher <> 'on' ) setPref($data_dir,$username,"mailfetch_cypher", 'on');
- 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_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,18 +151,18 @@
}
- echo '