Split up Message and SPAM filters options pages

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1816 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 421975b3bdb8e8e50bbe87ee2b4e0ede3eb09df9..540e3c7d78bff64d6f8689ecde64433a5c092b6b 100644 (file)
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -44,15 +44,6 @@
       $filters[$theid]["where"] = $filter_where;
       $filters[$theid]["what"] = $filter_what;
       $filters[$theid]["folder"] = $filter_folder;
-   } elseif (isset($spam_submit) && $AllowSpamFilters) {
-      $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);
-      }
    } elseif (isset($action) && $action == 'delete') {
       remove_filter($theid);
    } elseif (isset($action) && $action == 'move_up') {
@@ -61,10 +52,6 @@
       filter_swap($theid, $theid + 1);
    }
 
-   if ($AllowSpamFilters) {
-      $filters_spam_folder = getPref($data_dir, $username, 'filters_spam_folder');
-      $filters_spam_scan = getPref($data_dir, $username, 'filters_spam_scan');
-   }
    $filters = load_filters();
 
     if (isset($action) && ($action == 'add' || $action == 'edit')) {
@@ -143,89 +130,6 @@
             '</form>'.
             '</center>';
 
-    } else if (isset($action) && $action == 'spam' && $AllowSpamFilters) {
-        $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="options.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>';
-
-        sqimap_logout($imapConnection);
     }
 
    echo '<br>' .
@@ -266,48 +170,4 @@
             '<tr><td>&nbsp</td></tr>'.
         '</table>';
 
-
-    if ($AllowSpamFilters) {
-
-        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 (! isset($action) || $action != 'spam') {
-
-            echo '<p align=center>[<a href="options.php?action=spam">' . _("Edit") . '</a>]<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>';
-        }
-    }
-
 ?>

diff --git a/plugins/filters/setup.php b/plugins/filters/setup.php
index 5169dba936ad64800e46c0b881926aa8231f3f79..aee73927645d2b28cec5aa6369b18bef6c7df8fb 100644 (file)
--- a/plugins/filters/setup.php
+++ b/plugins/filters/setup.php
@@ -73,6 +73,7 @@
 
    function squirrelmail_plugin_optpage_register_block() {
       global $optpage_blocks;
+      global $AllowSpamFilters;
 
       $optpage_blocks[] = array(
          'name' => _("Message Filters"),
@@ -80,5 +81,14 @@
          'desc' => _("Filtering enables messages with different criteria to be automatically filtered into different folders for easier organization."),
          'js'   => false
       );
+
+      if ($AllowSpamFilters) {
+         $optpage_blocks[] = array(
+            'name' => _("SPAM Filters"),
+            'url'  => '../plugins/filters/spamoptions.php',
+            'desc' => _("SPAM filters allow you to select from various DNS based blacklists to detect junk email in your INBOX and move it to another folder (like Trash)."),
+            'js'   => false
+         );
+      }
    }
 ?>