X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Ffilters%2Fspamoptions.php;h=16b25835a824fbf49fc3f846c4663bb6787e5bba;hp=5b3a09f3735834b45533162d0d179de3e4435844;hb=fb0bcfdbbcbd1bfb5e8183c4b48b0ef184d21dbb;hpb=0a1dc88e11c9c6b1734eaa35849e3476dc425c6d

diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index 5b3a09f3..16b25835 100644
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -1,74 +1,49 @@
 <?php
+
 /**
- * Message and Spam Filter Plugin
- *
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
- * This plugin filters your inbox into different folders based upon given
- * criteria.  It is most useful for people who are subscibed to mailing lists
- * to help organize their messages.  The argument stands that filtering is
- * not the place of the client, which is why this has been made a plugin for
- * SquirrelMail.  You may be better off using products such as Sieve or
- * Procmail to do your filtering so it happens even when SquirrelMail isn't
- * running.
- *
- * If you need help with this, or see improvements that can be made, please
- * email me directly at the address above.  I definately welcome suggestions
- * and comments.  This plugin, as is the case with all SquirrelMail plugins,
- * is not directly supported by the developers.  Please come to me off the
- * mailing list if you have trouble with it.
- *
- * Also view plugins/README.plugins for more information.
+ * Message and Spam Filter Plugin - Spam Options
  *
+ * @copyright &copy; 1999-2007 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package plugins
  * @subpackage filters
  */
 
 /**
- * Path for SquirrelMail required files.
- * @ignore
+ * Include the SquirrelMail initialization file.
  */
-define('SM_PATH','../../');
+require('../../include/init.php');
 
-/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/page_header.php');
-require_once(SM_PATH . 'functions/imap.php');
-require_once(SM_PATH . 'include/load_prefs.php');
-require_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'plugins/filters/filters.php');
-global $AllowSpamFilters;
+include_once(SM_PATH . 'functions/imap_general.php');
+include_once(SM_PATH . 'functions/imap_messages.php');
+include_once(SM_PATH . 'plugins/filters/filters.php');
 
 /* get globals */
-sqgetGlobalVar('username', $username, SQ_SESSION);
-sqgetGlobalVar('key', $key, SQ_COOKIE);
-sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
 sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
 
 sqgetGlobalVar('action', $action, SQ_GET);
 /* end globals */
 
-displayPageHeader($color, 'None');
+displayPageHeader($color);
 
 if (sqgetGlobalVar('spam_submit',$spam_submit,SQ_POST)) {
     $spam_filters = load_spam_filters();
 
-    // setting spam folder    
+    // setting spam folder
     sqgetGlobalVar('filters_spam_folder_set',$filters_spam_folder_set,SQ_POST);
     if (isset($filters_spam_folder_set)) {
         setPref($data_dir, $username, 'filters_spam_folder', $filters_spam_folder_set);
     } else {
-	echo _("You must select spam folder.");
+        echo _("You must select a spam folder.");
     }
 
     // setting scan type
     sqgetGlobalVar('filters_spam_scan_set',$filters_spam_scan_set,SQ_POST);
     if (isset($filters_spam_scan_set)) {
-	setPref($data_dir, $username, 'filters_spam_scan', $filters_spam_scan_set);
+        setPref($data_dir, $username, 'filters_spam_scan', $filters_spam_scan_set);
     } else {
-	echo _("You must select scan type.");
+        echo _("You must select a scan type.");
     }
 
     foreach ($spam_filters as $Key => $Value) {
@@ -94,7 +69,7 @@ echo html_tag( 'table',
 if ($SpamFilters_YourHop == ' ') {
     echo '<br />' .
         html_tag( 'div', '<b>' .
-            sprintf(_("WARNING! Tell your admin to set the %s variable"),'SpamFilters_YourHop') .
+            sprintf(_("WARNING! Tell the administrator to set the %s variable."), '&quot;SpamFilters_YourHop&quot;') .
             '</b>' ,
         'center' ) .
         '<br />';
@@ -102,7 +77,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);
     $boxes = sqimap_mailbox_list($imapConnection);
     sqimap_logout($imapConnection);
     $numboxes = count($boxes);
@@ -116,10 +91,10 @@ if (isset($action) && $action == 'spam') {
     }
 
     echo '<form method="post" action="spamoptions.php">'.
-        '<center>'.
+        '<div style="text-align: center;">'.
         html_tag( 'table', '', '', '', 'width="85%" border="0" cellpadding="2" cellspacing="0"' ) .
             html_tag( 'tr' ) .
-                html_tag( 'th', _("Move spam to:"), 'right', '', 'nowrap' ) .
+                html_tag( 'th', _("Move spam to:"), 'right', '', 'style="white-space: nowrap;"' ) .
                 html_tag( 'td', '', 'left' ) .
                     '<select name="filters_spam_folder_set">';
 
@@ -137,26 +112,26 @@ if (isset($action) && $action == 'spam') {
             'left' )
         ) .
         html_tag( 'tr' ) .
-            html_tag( 'th', _("What to Scan:"), 'right', '', 'nowrap' ) .
+            html_tag( 'th', _("What to Scan:"), 'right', '', 'style="white-space: nowrap;"' ) .
             html_tag( 'td' ) .
             '<select name="filters_spam_scan_set">'.
             '<option value=""';
     if ($filters_spam_scan == '') {
-        echo ' selected';
+        echo ' selected="selected"';
     }
     echo '>' . _("All messages") . '</option>'.
             '<option value="new"';
     if ($filters_spam_scan == 'new') {
-        echo ' selected';
+        echo ' selected="selected"';
     }
-    echo '>' . _("Only unread messages") . '</option>' .
+    echo '>' . _("Unread messages only") . '</option>' .
             '</select>'.
         '</td>'.
     '</tr>'.
     html_tag( 'tr',
           html_tag( 'td', '&nbsp;' ) .
           html_tag( 'td',
-              _("The more messages you scan, the longer it takes. I would suggest that you scan only new messages.  If you make a change to your filters, I would set it to scan all messages, then go view my INBOX, then come back and set it to scan only new messages. That way, your new spam filters will be applied and you'll scan even the spam you read with the new filters.") ,
+              _("The more messages scanned, the longer it takes. It's recommended to scan unread messages only. If a change to the filters is made, it's recommended to set it to scan all messages, then go view the INBOX, then come back and set it to scan unread messages only. That way, the new spam filters will be applied and even the spam you didn't catch with the old filters will be scanned.") ,
           'left' )
       );
 
@@ -164,13 +139,13 @@ if (isset($action) && $action == 'spam') {
 
     foreach ($spam_filters as $Key => $Value) {
         echo html_tag( 'tr' ) .
-                   html_tag( 'th', $Key, 'right', '', 'nowrap' ) ."\n" .
+                   html_tag( 'th', $Key, 'right', '', 'style="white-space: nowrap;"' ) ."\n" .
                    html_tag( 'td' ) .
             '<input type="checkbox" name="' .
             $spam_filters[$Key]['prefname'] .
             '_set"';
         if ($spam_filters[$Key]['enabled']) {
-            echo ' checked';
+            echo ' checked="checked"';
         }
         echo ' /> - ';
         if ($spam_filters[$Key]['link']) {
@@ -193,16 +168,16 @@ if (isset($action) && $action == 'spam') {
         html_tag( 'td', '<input type="submit" name="spam_submit" value="' . _("Save") . '" />', 'center', '', 'colspan="2"' )
     ) . "\n" .
         '</table>'.
-        '</center>'.
+        '</div>'.
         '</form>';
 } else {
     // action is not set or action is not spam
     echo html_tag( 'p', '', 'center' ) .
          '[<a href="spamoptions.php?action=spam">' . _("Edit") . '</a>]' .
-         ' - [<a href="../../src/options.php">' . _("Done") . '</a>]</center><br /><br />';
-    printf( _("Spam is sent to %s"), ($filters_spam_folder?'<b>'.imap_utf7_decode_local($filters_spam_folder).'</b>':'[<i>'._("not set yet").'</i>]' ) );
-    echo '<br>';
-    printf( _("Spam scan is limited to <b>%s</b>"), (($filters_spam_scan == 'new')?_("New Messages Only"):_("All Messages") ) );
+         ' - [<a href="../../src/options.php">' . _("Done") . '</a>]</div><br /><br />';
+    printf( _("Spam is sent to %s."), ($filters_spam_folder?'<b>'.htmlspecialchars(imap_utf7_decode_local($filters_spam_folder)).'</b>':'[<i>'._("not set yet").'</i>]' ) );
+    echo '<br />';
+    printf( _("Spam scan is limited to %s."), '<b>' . ( ($filters_spam_scan == 'new')?_("Unread messages only"):_("All messages") ) . '</b>' );
     echo '</p>'.
         '<table border="0" cellpadding="3" cellspacing="0" align="center" bgcolor="' . $color[0] . "\">\n";
 
@@ -218,7 +193,7 @@ if (isset($action) && $action == 'spam') {
             echo _("OFF");
         }
 
-        echo '</th>' . 
+        echo '</th>' .
                html_tag( 'td', '&nbsp;-&nbsp;', 'left' ) .
                html_tag( 'td', '', 'left' );