X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Ffilters%2Fspamoptions.php;h=2cc694b44a36175c600c71532d1bbeb29f199cbf;hp=bd6a9e99d919fafa1aa34a271e93abfb3f12b9cb;hb=41100fce5421f43c40c4db946fe01b4f31e34913;hpb=28087939f5a1af0849822e7d3d771be68bbd7889

diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index bd6a9e99..2cc694b4 100644
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -24,160 +24,206 @@
  * $Id$
  */
 
-   chdir ('..');
-   require_once('../src/validate.php');
-   require_once('../functions/page_header.php');
-   require_once('../functions/imap.php');
-   require_once('../src/load_prefs.php');
-
-   global $AllowSpamFilters;
-
-   displayPageHeader($color, 'None');
-
-   if (isset($spam_submit)) {
-      $spam_filters = load_spam_filters();
-      setPref($data_dir, $username, 'filters_spam_folder', $filters_spam_folder_set);
-      setPref($data_dir, $username, 'filters_spam_scan', $filters_spam_scan_set);
-      foreach ($spam_filters as $Key => $Value) {
-          $input = $spam_filters[$Key]['prefname'] . '_set';
-          setPref($data_dir, $username, $spam_filters[$Key]['prefname'],
-              $$input);
-      }
-   }
-
-   $filters_spam_folder = getPref($data_dir, $username, 'filters_spam_folder');
-   $filters_spam_scan = getPref($data_dir, $username, 'filters_spam_scan');
-   $filters = load_filters();
-
-   echo "<table width=95% align=center border=0 cellpadding=2 cellspacing=0 bgcolor=\"$color[0]\">".
-           '<tr><th align=center>' . _("Spam Filtering") . '</th></tr>'.
-       '</table>';
-
-    if ($SpamFilters_YourHop == ' ') {
-       echo '<BR><center><b>' . _("WARNING! Tell your admin to set the SpamFilters_YourHop variable") . '</b></center><BR>';
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../../');
+
+/* 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;
+
+$username = $_SESSION['username'];
+$key = $_COOKIE['key'];
+$onetimepad = $_SESSION['onetimepad'];
+$delimiter = $_SESSION['delimiter'];
+
+if (isset($_GET['action'])) {
+    $action = $_GET['action'];
+}
+
+displayPageHeader($color, 'None');
+
+if (isset($_POST['spam_submit'])) {
+    $spam_filters = load_spam_filters();
+    setPref($data_dir, $username, 'filters_spam_folder', $_POST['filters_spam_folder_set']);
+    setPref($data_dir, $username, 'filters_spam_scan', $_POST['filters_spam_scan_set']);
+    foreach ($spam_filters as $Key => $Value) {
+        $input = $spam_filters[$Key]['prefname'] . '_set';
+        if ( isset( $_POST[$input] ) ) {
+            setPref( $data_dir, $username, $spam_filters[$Key]['prefname'],
+                     $_POST[$input]);
+        } else {
+            removePref($data_dir, $username, $spam_filters[$Key]['prefname']);
+        }
+    }
+}
+
+$filters_spam_folder = getPref($data_dir, $username, 'filters_spam_folder');
+$filters_spam_scan = getPref($data_dir, $username, 'filters_spam_scan');
+$filters = load_filters();
+
+echo html_tag( 'table',
+            html_tag( 'tr',
+                html_tag( 'th', _("Spam Filtering"), 'center' )
+            ) ,
+        'center', $color[0], 'width="95%" border="0" cellpadding="2" cellspacing="0"' );
+
+if ($SpamFilters_YourHop == ' ') {
+    echo '<br>' .
+        html_tag( 'div', '<b>' .
+            _("WARNING! Tell your admin to set the SpamFilters_YourHop variable") .
+            '</b>' ,
+        'center' ) .
+        '<br>';
+}
+
+
+if (isset($action) && $action == 'spam') {
+    $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+    $boxes = sqimap_mailbox_list($imapConnection);
+    sqimap_logout($imapConnection);
+    for ($i = 0; $i < count($boxes) && $filters_spam_folder == ''; $i++) {
+        if ((isset($boxes[$i]['flags'][0]) && $boxes[$i]['flags'][0] != 'noselect') &&
+            (isset($boxes[$i]['flags'][1]) && $boxes[$i]['flags'][1] != 'noselect') &&
+            (isset($boxes[$i]['flags'][2]) && $boxes[$i]['flags'][2] != 'noselect')) {
+            $filters_spam_folder = $boxes[$i]['unformatted'];
+        }
     }
 
+    echo '<form method=post action="spamoptions.php">'.
+        '<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( 'td', '', 'left' ) .
+                    '<select name="filters_spam_folder_set">';
+
+    for ($i = 0; $i < count($boxes); $i++) {
+        if (! in_array('noselect', $boxes[$i]['flags'])) {
+            $box = $boxes[$i]['unformatted'];
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['formatted']);
+            if ($filters_spam_folder == $box) {
+                echo "<OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
+            } else {
+                echo "<OPTION VALUE=\"$box\">$box2</OPTION>\n";
+            }
+        }
+    }
+    echo    '</select>'.
+        '</td>'.
+        '</tr>'.
+        html_tag( 'tr',
+            html_tag( 'td', '&nbsp;' ) .
+            html_tag( 'td',
+                _("Moving spam directly to the trash may not be a good idea at first, since messages from friends and mailing lists might accidentally be marked as spam. Whatever folder you set this to, make sure that it gets cleaned out periodically, so that you don't have an excessively large mailbox hanging around.") ,
+            'left' )
+        ) .
+        html_tag( 'tr' ) .
+            html_tag( 'th', _("What to Scan:"), 'right', '', 'nowrap' ) .
+            html_tag( 'td' ) .
+            '<select name="filters_spam_scan_set">'.
+            '<option value=""';
+    if ($filters_spam_scan == '') {
+        echo ' SELECTED';
+    }
+    echo '>' . _("All messages") . '</option>'.
+            '<option value="new"';
+    if ($filters_spam_scan == 'new') {
+        echo ' SELECTED';
+    }
+    echo '>' . _("Only unread messages") . '</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.") ,
+          'left' )
+      );
+
+    $spam_filters = load_spam_filters();
+
+    foreach ($spam_filters as $Key => $Value) {
+        echo html_tag( 'tr' ) .
+                   html_tag( 'th', $Key, 'right', '', 'nowrap' ) ."\n" .
+                   html_tag( 'td' ) .
+            '<input type=checkbox name="' .
+            $spam_filters[$Key]['prefname'] .
+            '_set"';
+        if ($spam_filters[$Key]['enabled']) {
+            echo ' CHECKED';
+        }
+        echo '> - ';
+        if ($spam_filters[$Key]['link']) {
+            echo '<a href="' .
+                 $spam_filters[$Key]['link'] .
+                 '" target="_blank">';
+        }
+        echo $spam_filters[$Key]['name'];
+        if ($spam_filters[$Key]['link']) {
+            echo '</a>';
+        }
+        echo '</td></tr>' .
+        html_tag( 'tr',
+            html_tag( 'td', '&nbsp;' ) .
+            html_tag( 'td', $spam_filters[$Key]['comment'], 'left' )
+        ) . "\n";
 
-   if (isset($action) && $action == 'spam') {
-       $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-       $boxes = sqimap_mailbox_list($imapConnection);
-       sqimap_logout($imapConnection);
-       for ($i = 0; $i < count($boxes) && $filters_spam_folder == ''; $i++) {
-           if ($boxes[$i]['flags'][0] != 'noselect' &&
-               $boxes[$i]['flags'][1] != 'noselect' &&
-               $boxes[$i]['flags'][2] != 'noselect') {
-               $filters_spam_folder = $boxes[$i]['unformatted'];
-           }
-       }
-
-       echo '<form method=post action="spamoptions.php">'.
-           '<center>'.
-           '<table width=85% cellpadding=2 cellspacing=0 border=0>'.
-               '<tr>'.
-               '<th align=right nowrap>' . _("Move spam to:") . '</th>'.
-               '<td><select name="filters_spam_folder_set">';
-
-       for ($i = 0; $i < count($boxes); $i++) {
-           if (! in_array('noselect', $boxes[$i]['flags'])) {
-               $box = $boxes[$i]['unformatted'];
-               $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['formatted']);
-               if ($filters_spam_folder == $box)
-               echo "<OPTION VALUE=\"$box\" SELECTED>$box2</OPTION>\n";
-               else
-               echo "<OPTION VALUE=\"$box\">$box2</OPTION>\n";
-           }
-       }
-       echo    '</select>'.
-           '</td>'.
-           '</tr>'.
-           '<tr><td></td><td>' .
-           _("Moving spam directly to the trash may not be a good idea at first, since messages from friends and mailing lists might accidentally be marked as spam. Whatever folder you set this to, make sure that it gets cleaned out periodically, so that you don't have an excessively large mailbox hanging around.") .
-           '</td></tr>'.
-           '<tr>'.
-               '<th align=right nowrap>' . _("What to Scan:") . '</th>'.
-               '<td><select name="filters_spam_scan_set">'.
-               '<option value=""';
-       if ($filters_spam_scan == '')
-           echo ' SELECTED';
-       echo '>' . _("All messages") . '</option>'.
-               '<option value="new"';
-       if ($filters_spam_scan == 'new')
-           echo ' SELECTED';
-       echo '>' . _("Only unread messages") . '</option>' .
-               '</select>'.
-           '</td>'.
-       '</tr>'.
-       '<tr>'.
-           '<td></td><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.").
-           '</td></tr>';
-
-       $spam_filters = load_spam_filters();
-
-       foreach ($spam_filters as $Key => $Value) {
-           echo "<tr><th align=right nowrap>$Key</th>\n" .
-               '<td><input type=checkbox name="' .
-               $spam_filters[$Key]['prefname'] .
-               '_set"';
-           if ($spam_filters[$Key]['enabled'])
-           echo ' CHECKED';
-           echo '> - ';
-           if ($spam_filters[$Key]['link']) {
-           echo '<a href="' .
-                   $spam_filters[$Key]['link'] .
-                   '" target="_blank">';
-           }
-           echo $spam_filters[$Key]['name'];
-           if ($spam_filters[$Key]['link']) {
-           echo '</a>';
-           }
-           echo '</td></tr><tr><td></td><td>' .
-               $spam_filters[$Key]['comment'] .
-               "</td></tr>\n";
-       }
-       echo '<tr><td colspan=2 align=center><input type=submit name="spam_submit" value="' . _("Save") . '"></td></tr>'.
-           '</table>'.
-           '</center>'.
-           '</form>';
-
-   }
-
-   if (! isset($action) || $action != 'spam') {
-
-       echo '<p align=center>[<a href="spamoptions.php?action=spam">' . _("Edit") . '</a>]' .
-   ' - [<a href="../../src/options.php">' . _("Done") . '</a>]</center><br><br>';
-       printf( _("Spam is sent to <b>%s</b>"), ($filters_spam_folder?$filters_spam_folder:_("[<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") ) );
-       echo '</p>'.
-           "<table border=0 cellpadding=3 cellspacing=0 align=center bgcolor=\"$color[0]\">";
-
-       $spam_filters = load_spam_filters();
-
-       foreach ($spam_filters as $Key => $Value) {
-           echo '<tr><th align=center>';
-
-           if ($spam_filters[$Key]['enabled']) {
-               echo _("ON");
-           } else {
-               echo _("OFF");
-           }
-
-           echo '</th><td>&nbsp;-&nbsp;</td><td>';
-
-           if ($spam_filters[$Key]['link']) {
-           echo '<a href="' .
-               $spam_filters[$Key]['link'] .
-               '" target="_blank">';
-           }
-
-           echo $spam_filters[$Key]['name'];
-           if ($spam_filters[$Key]['link']) {
-           echo '</a>';
-           }
-           echo "</td></tr>\n";
-       }
-       echo '</table>';
-   }
+    }
+    echo html_tag( 'tr',
+        html_tag( 'td', '<input type=submit name="spam_submit" value="' . _("Save") . '">', 'center', '', 'colspan="2"' )
+    ) . "\n" .
+        '</table>'.
+        '</center>'.
+        '</form>';
+
+}
+
+if (! isset($_GET['action']) || $_GET['action'] != '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 <b>%s</b>"), ($filters_spam_folder?$filters_spam_folder:_("[<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") ) );
+    echo '</p>'.
+        "<table border=0 cellpadding=3 cellspacing=0 align=center bgcolor=\"$color[0]\">";
+
+    $spam_filters = load_spam_filters();
+
+    foreach ($spam_filters as $Key => $Value) {
+        echo html_tag( 'tr' ) .
+                    html_tag( 'th', '', 'center' );
+
+        if ($spam_filters[$Key]['enabled']) {
+            echo _("ON");
+        } else {
+            echo _("OFF");
+        }
+
+        echo '</th>' . 
+               html_tag( 'td', '&nbsp;-&nbsp;', 'left' ) .
+               html_tag( 'td', '', 'left' );
+
+        if ($spam_filters[$Key]['link']) {
+        echo '<a href="' .
+            $spam_filters[$Key]['link'] .
+            '" target="_blank">';
+        }
+
+        echo $spam_filters[$Key]['name'];
+        if ($spam_filters[$Key]['link']) {
+        echo '</a>';
+        }
+        echo "</td></tr>\n";
+    }
+    echo '</table>';
+}
 
 ?>