X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Ffilters%2Fspamoptions.php;h=1ff4b48760adf013c9628b0541dcf50ffac9271a;hb=22387c8d44f3ab104db6e19180d3775a45762359;hp=730086cf6bc788496d49cbcb4862a7ec4e4f6aca;hpb=99aaff8b9e275cf29a0771a740f67bb8fb9f5f75;p=squirrelmail.git
diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index 730086cf..1ff4b487 100644
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -1,73 +1,50 @@
$Value) {
@@ -93,7 +70,7 @@ echo html_tag( 'table',
if ($SpamFilters_YourHop == ' ') {
echo '
' .
html_tag( 'div', '' .
- sprintf(_("WARNING! Tell your admin to set the %s variable"),'SpamFilters_YourHop') .
+ sprintf(_("WARNING! Tell the administrator to set the %s variable."), '"SpamFilters_YourHop"') .
'' ,
'center' ) .
'
';
@@ -101,7 +78,7 @@ if ($SpamFilters_YourHop == ' ') {
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);
@@ -115,10 +92,10 @@ if (isset($action) && $action == 'spam') {
}
echo '