X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=plugins%2Ffilters%2Fspamoptions.php;h=b4b3bab32037a00fa388ebebed8ceddd096c5e40;hb=57f170c8a33fd7d45768c71b27f0b3e9dbee0aa9;hp=39cbb4e51d139a67b664f5ba59adb040105ee7a4;hpb=b2d8bc6ca1ffbf4269c91bbe6cd73471388d935e;p=squirrelmail.git
diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index 39cbb4e5..b4b3bab3 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 '