X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Ffilters%2Fspamoptions.php;h=b4b3bab32037a00fa388ebebed8ceddd096c5e40;hb=57f170c8a33fd7d45768c71b27f0b3e9dbee0aa9;hp=e4769cae0751f9059d801027ccdc727a0f15ee9e;hpb=ae48f7575bd114608a6dbf18152cf7d63e03695b;p=squirrelmail.git
diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index e4769cae..b4b3bab3 100644
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -1,61 +1,56 @@
$Value) {
$input = $spam_filters[$Key]['prefname'] . '_set';
- if ( isset( $_POST[$input] ) ) {
- setPref( $data_dir, $username, $spam_filters[$Key]['prefname'],
- $_POST[$input]);
+ if ( sqgetGlobalVar($input,$input_key,SQ_POST) ) {
+ setPref( $data_dir, $username, $spam_filters[$Key]['prefname'],$input_key);
} else {
removePref($data_dir, $username, $spam_filters[$Key]['prefname']);
}
@@ -73,17 +68,17 @@ echo html_tag( 'table',
'center', $color[0], 'width="95%" border="0" cellpadding="2" cellspacing="0"' );
if ($SpamFilters_YourHop == ' ') {
- echo '
' .
+ echo '
' .
html_tag( 'div', '' .
- _("WARNING! Tell your admin to set the SpamFilters_YourHop variable") .
+ sprintf(_("WARNING! Tell the administrator to set the %s variable."), '"SpamFilters_YourHop"') .
'' ,
'center' ) .
- '
';
+ '
';
}
if (isset($action) && $action == 'spam') {
- $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+ $imapConnection = sqimap_login($username, false, $imapServerAddress, $imapPort, 0, $imap_stream_options);
$boxes = sqimap_mailbox_list($imapConnection);
sqimap_logout($imapConnection);
$numboxes = count($boxes);
@@ -96,25 +91,18 @@ if (isset($action) && $action == 'spam') {
}
}
- echo '