X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Ffilters%2Fspamoptions.php;h=a31ebaa5540de191898da2eee1a39a366c57c318;hp=8ad5bc50d05cd90572ec0260e53511c8d64fff87;hb=2714d4ff9d44c2f27e413f49062247dc25558877;hpb=10a26cea2cb9d20f002c2d8fab00e5db22b36bd9 diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php index 8ad5bc50..a31ebaa5 100644 --- a/plugins/filters/spamoptions.php +++ b/plugins/filters/spamoptions.php @@ -1,9 +1,6 @@ $Value) { $input = $spam_filters[$Key]['prefname'] . '_set'; - if ( isset( $$input ) ) { - setPref( $data_dir, $username, $spam_filters[$Key]['prefname'], - $$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']); } } } @@ -51,14 +84,19 @@ $filters_spam_folder = getPref($data_dir, $username, 'filters_spam_folder'); $filters_spam_scan = getPref($data_dir, $username, 'filters_spam_scan'); $filters = load_filters(); -echo "
' . _("Spam Filtering") . ' |
---|
[' . _("Edit") . ']' .
- ' - [' . _("Done") . ']
';
- printf( _("Spam is sent to %s"), ($filters_spam_folder?$filters_spam_folder:_("[not set yet]") ) );
- echo '
';
- printf( _("Spam scan is limited to %s"), (($filters_spam_scan == 'new')?_("New Messages Only"):_("All Messages") ) );
+} else {
+ // action is not set or action is not spam
+ echo html_tag( 'p', '', 'center' ) .
+ '[' . _("Edit") . ']' .
+ ' - [' . _("Done") . ']
';
+ printf( _("Spam is sent to %s."), ($filters_spam_folder?''.imap_utf7_decode_local($filters_spam_folder).'':'['._("not set yet").']' ) );
+ echo '
';
+ printf( _("Spam scan is limited to %s."), '' . ( ($filters_spam_scan == 'new')?_("Unread messages only"):_("All Messages") ) . '' );
echo '