X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Fmail_fetch%2Foptions.php;h=1b91d718466196ab5b59cbbd12ea5cc71a8da03c;hb=a9e1e670fab4399260e0790e018393c7dcefcecc;hp=59202257c3cfea47987ea9c4bf7f896bd1cbfe17;hpb=3c66c567ff1ec35d730b15368cf9563f1979496e;p=squirrelmail.git
diff --git a/plugins/mail_fetch/options.php b/plugins/mail_fetch/options.php
index 59202257..1b91d718 100644
--- a/plugins/mail_fetch/options.php
+++ b/plugins/mail_fetch/options.php
@@ -3,14 +3,17 @@
/**
* mail_fetch/options.php
*
- * Copyright (c) 1999-2003 The SquirrelMail Project Team
+ * Copyright (c) 1999-2004 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
*/
+/** @ignore */
define('SM_PATH','../../');
require_once(SM_PATH . 'include/validate.php');
@@ -27,10 +30,18 @@ if(!sqgetGlobalVar('mf_cypher', $mf_cypher, SQ_POST)) {
$mf_cypher = '';
}
if(! sqgetGlobalVar('mf_action', $mf_action, SQ_POST) ) {
- $mf_action = 'config';
+ 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_an, SQ_POST);
+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);
@@ -42,6 +53,7 @@ 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' );
@@ -92,16 +104,26 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
$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",(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);
}
@@ -136,7 +158,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
'' . _("Remote POP server settings") . '',
'center', $color[0] )
),
- 'center', '', 'width="95%" cols="1"' ) .
+ 'center', '', 'width="95%"' ) .
html_tag( 'table',
html_tag( 'tr',
html_tag( 'td',
@@ -151,15 +173,15 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
html_tag( 'tr',
html_tag( 'td',
'':'>') .
+ (($mailfetch_cypher=='on')?'checked>':'>') .
_("Encrypt passwords (informative only)") ,
'right' )
) ,
- 'center', '', 'width="95%" cols="1"' );
+ 'center', '', 'width="95%"' );
switch( $mf_action ) {
case 'config':
- echo html_tag( 'table', '', 'center', '', 'width="70%" cols="1" cellpadding="5" cellspacing="1"' ) .
+ echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
html_tag( 'tr',
html_tag( 'td', '' . _("Add Server") . '', 'center', $color[9] )
) .
@@ -175,7 +197,7 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
) .
html_tag( 'tr',
html_tag( 'th', _("Port:"), 'right') .
- html_tag( 'td', '', 'left')
) .
html_tag( 'tr',
html_tag( 'th', _("Alias:"), 'right' ) .
@@ -218,11 +240,11 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
'',
'center', '', 'colspan="2"' )
) .
- '';
+ '';
// Modify Server
echo '
' .
- html_tag( 'table', '', 'center', '', 'width="70%" cols="1" 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] )
) .
@@ -233,23 +255,23 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
echo '' . _("Server Name:") . ' '.
- ' '.
- ' '.
+ ' '.
+ ' '.
'';
} else {
echo _("No-one server in use. Try to add.");
}
echo '';
break;
- case _("Delete"): //erase confirmation about a server
+ 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%" cols="1" cellpadding="5" cellspacing="1"' ) .
+ 'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) .
'
' .
html_tag( 'table',
html_tag( 'tr',
@@ -259,24 +281,24 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
html_tag( 'td',
"" .
'' .
- '
' . _("Selected Server:") . " " . htmlentities($mailfetch_server_[$mf_sn]) . "
" .
+ '
' . _("Selected Server:") . " " . htmlspecialchars($mailfetch_server_[$mf_sn]) . "
" .
_("Confirm delete of selected server?") . '
' .
'' .
'
' ,
'center', $color[9] )
) ,
- 'center', '', 'width="70%" cols="1" cellpadding="5" cellspacing="1"' );
+ 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' );
break; //modify a server
- case _("Modify"):
+ case 'Modify':
echo html_tag( 'table',
html_tag( 'tr',
html_tag( 'td', '' . _("Fetching Servers") . '', 'center', $color[0] )
) ,
- 'center', '', 'width="95%" cols="1" cellpadding="5" cellspacing="1"' ) .
+ 'center', '', 'width="95%" cellpadding="5" cellspacing="1"' ) .
'
' .
- html_tag( 'table', '', 'center', '', 'width="70%" cols="1" cellpadding="5" cellspacing="1"' ) .
+ html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="5" cellspacing="1"' ) .
html_tag( 'tr',
- html_tag( 'td', '' . _("Mofify a Server") . '', 'center', $color[9] )
+ html_tag( 'td', '' . _("Modify Server") . '', 'center', $color[9] )
) .
html_tag( 'tr' ) .
html_tag( 'td', '', 'center', $color[0] ) .
@@ -286,23 +308,28 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
html_tag( 'table' ) .
html_tag( 'tr',
html_tag( 'th', _("Server:"), 'right' ) .
- html_tag( 'td', '', 'left' )
+ html_tag( 'td', '', 'left' )
) .
html_tag( 'tr',
html_tag( 'th', _("Port:"), 'right' ) .
- html_tag( 'td', '', 'left' )
+ html_tag( 'td', '', 'left' )
) .
html_tag( 'tr',
html_tag( 'th', _("Alias:"), 'right' ) .
- html_tag( 'td', '', 'left' )
+ html_tag( 'td', '', 'left' )
) .
html_tag( 'tr',
html_tag( 'th', _("Username:"), 'right' ) .
- html_tag( 'td', '', 'left' )
+ html_tag( 'td', '', 'left' )
) .
html_tag( 'tr',
html_tag( 'th', _("Password:"), 'right' ) .
- html_tag( 'td', '', 'left' )
+ html_tag( 'td', '', 'left' )
) .
html_tag( 'tr' ) .
html_tag( 'th', _("Store in Folder:"), 'right' ) .
@@ -353,14 +380,14 @@ sqgetGlobalVar('submit_mailfetch', $submit_mailfetch, SQ_POST);
html_tag( 'tr',
html_tag( 'td', '' . _("Fetching Servers") . '', 'center', $color[0] )
) ,
- 'center', '', 'width="95%" cols="1"' ) .
+ '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%" cols="1"' );
+ 'center', '', 'width="70%"' );
}
?>