X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Ffilters%2Fspamoptions.php;h=1ff4b48760adf013c9628b0541dcf50ffac9271a;hb=70d55dbcdcf6e8251985fc3290d9de5b0d27f67b;hp=da7209b4cfbb743ebd753f0064b48e9a9030de5e;hpb=5b4ba967c2353d583ae6f010a3bf51a86febc057;p=squirrelmail.git
diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index da7209b4..1ff4b487 100644
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -1,66 +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']);
}
@@ -78,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);
@@ -101,11 +91,11 @@ if (isset($action) && $action == 'spam') {
}
}
- echo '