Slight cleanup to filter option page display.
[squirrelmail.git] / plugins / filters / options.php
index b53ef1a..0fde042 100644 (file)
@@ -1,37 +1,39 @@
 <?php
-   /*
-    *  Message and Spam Filter Plugin 
-    *  By Luke Ehresman <luke@squirrelmail.org>
-    *     Tyler Akins
-    *     Brent Bice
-    *  (c) 2000 (GNU GPL - see ../../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.
-    *
-    */
-   chdir ("..");
+
+/**
+ * Message and Spam Filter Plugin
+ *
+ * Copyright (c) 1999-2002 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.
+ *
+ * $Id$
+ */
+
+   chdir ('..');
    require_once('../src/validate.php');
-   require_once ("../functions/page_header.php");
-   require_once ("../functions/imap.php");
-   require_once ("../src/load_prefs.php");
+   require_once('../functions/page_header.php');
+   require_once('../functions/imap.php');
+   require_once('../src/load_prefs.php');
 
    global $AllowSpamFilters;
 
-   displayPageHeader($color, "None");   
+   displayPageHeader($color, 'None');
 
    if (isset($filter_submit)) {
       if (!isset($theid)) $theid = 0;
       $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") {
+   } elseif (isset($action) && $action == 'delete') {
       remove_filter($theid);
-   } elseif (isset($action) && $action == "move_up") {
+   } elseif (isset($action) && $action == 'move_up') {
       filter_swap($theid, $theid - 1);
-   } elseif (isset($action) && $action == "move_down") {
+   } elseif (isset($action) && $action == 'move_down') {
       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();
 
-   ?>
-      <br>
-      <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
-         <center><b><?php echo _("Options") ?> - Message Filtering</b></center>
-      </td></tr></table>
-      <br><center>[<a href="options.php?action=add">New</a>] - [<a href="../../src/options.php">Done</a>]</center><br>
-      <table border=0 cellpadding=3 cellspacing=0 align=center>
-         <?php
-            for ($i=0; $i < count($filters); $i++) {
-               if ($i % 2 == 0) $clr = $color[0];
-               else $clr = $color[9];
+   echo '<br>' .
+        '<table width=95% align=center border=0 cellpadding=2 cellspacing=0>'.
+        "<tr><td bgcolor=\"$color[0]\">".
+        '<center><b>' . _("Options") . ' -  ' . _("Message Filtering") . '</b></center>'.
+        '</td></tr></table>'.
+        '<br><center>[<a href="options.php?action=add">' . _("New") .
+        '</a>] - [<a href="../../src/options.php">' . _("Done") . '</a>]</center><br>';
 
-               $fdr = ($folder_prefix)?str_replace($folder_prefix, "", $filters[$i]["folder"]):$filters[$i]["folder"];
+    if (isset($action) && ($action == 'add' || $action == 'edit')) {
+        $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
+        $boxes = sqimap_mailbox_list($imapConnection);
+        sqimap_logout($imapConnection);
+        if ( !isset($theid) ) {
+            $theid = count($filters);
+        }
+        echo '<center>'.
+             '<form action="options.php" method=post>'.
+             '<table cellpadding=2 cellspacing=0 border=0>'.
+             '<tr>'.
+                '<td>' . _("Match:") . '</td>'.
+                '<td>'.
+                    '<select name=filter_where>';
 
-?>
-<tr bgcolor="<?PHP echo $clr ?>"><td><small>
-[<a href="options.php?theid=<?PHP echo $i ?>&action=edit">Edit</a>]
-</small></td><td><small>
-[<a href="options.php?theid=<?PHP echo $i ?>&action=delete">Delete</a>]
-</small></td><td align=center><small>
-[<?PHP if (isset($filters[$i + 1])) {
-?><a href="options.php?theid=<?PHP echo $i ?>&action=move_down">Down</a><?PHP 
-if ($i > 0) echo ' | ';
-}
-if ($i > 0) {
-?><a href="options.php?theid=<?PHP echo $i ?>&action=move_up">Up</a><?PHP 
-} ?>]</small></td><td>
-- If <b><?PHP echo $filters[$i]['where'] ?></b> contains <b><?PHP
-echo $filters[$i]['what'] ?></b> then move to <b><?PHP echo $fdr ?></b>
-</td></tr>
-<?PHP
+        $L = isset($filters[$theid]['where']);
+
+        $sel = (($L && $filters[$theid]['where'] == 'From')?'selected':'');
+        echo "<option value=\"From\" $sel>" . _ ("From") . '</option>';
+
+        $sel = (($L && $filters[$theid]['where'] == 'To')?'selected':'');
+        echo "<option value=\"To\" $sel>" . _ ("To") . '</option>';
 
+        $sel = (($L && $filters[$theid]['where'] == 'Cc')?'selected':'');
+        echo "<option value=\"Cc\" $sel>" . _ ("Cc") . '</option>';
+
+        $sel = (($L && $filters[$theid]['where'] == 'To or Cc')?'selected':'');
+        echo "<option value=\"To or Cc\" $sel>" . _ ("To or Cc") . '</option>';
+
+        $sel = (($L && $filters[$theid]['where'] == 'Subject')?'selected':'');
+        echo "<option value=\"Subject\" $sel>" . _ ("Subject") . '</option>';
+
+        echo         '</select>'.
+                '</td>'.
+            '</tr>'.
+            '<tr>'.
+                '<td align=right>'.
+                    _("Contains:").
+                '</td>'.
+                '<td>'.
+                    '<input type=text size=32 name=filter_what value="';
+        if (isset($filters[$theid]['what'])) {
+            echo $filters[$theid]["what"];
+        }
+        echo '">'.
+                '</td>'.
+            '</tr>'.
+            '<tr>'.
+                '<td>'.
+                    _("Move to:").
+                '</td>'.
+                '<td>'.
+                    '<tt>'.
+                    '<select name=filter_folder>';
+
+        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 (isset($filters[$theid]['folder']) &&
+                    $filters[$theid]['folder'] == $box)
+                echo "<OPTION VALUE=\"$box\" SELECTED>$box2</option>";
+                else
+                echo "<OPTION VALUE=\"$box\">$box2</option>";
             }
-         ?>
-      </table>
-      
-      <table width=80% align=center border=0 cellpadding=2 cellspacing=0">
-        <tr><td>&nbsp</td></tr>
-      </table>
-      
-      <?PHP if ($AllowSpamFilters) { ?>
-      
-      <table width=95% align=center border=0 cellpadding=2 cellspacing=0 bgcolor="<?php echo $color[0] ?>">
-        <tr><th align=center>Spam Filtering</th></tr>
-      </table>
-      <?PHP if (! isset($action) || $action != 'spam') { ?>
-      <p align=center>[<a href="options.php?action=spam">Edit</a>]<br>
-      Spam is sent to <b><?PHP 
-         if ($filters_spam_folder) 
-         {
-            echo $filters_spam_folder;
-         }
-         else
-         {
-            echo '[<i>not set yet</i>]';
-         }
-      ?></b><br>Spam scan is limited to <b><?PHP
-         if ($filters_spam_scan == 'new')
-         {
-            echo 'New Messages Only';
-         }
-         else
-         {
-            echo 'All Messages';
-         }
-      ?></b></p>
-      
-      <table border=0 cellpadding=3 cellspacing=0 align=center bgcolor="<?PHP echo $color[0] ?>">
-        <?PHP
-        
-          $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="';
-                  echo $spam_filters[$Key]['link'];
-                  echo '" target="_blank">';
-              }
-              
-              echo $spam_filters[$Key]['name'];
-              if ($spam_filters[$Key]['link'])
-              {
-                  echo '</a>';
-              }
-              echo "</td></tr>\n";
-          }
-          
-        ?>
-      </table>
-   <?php
-         }
-      }
-      
-      if (isset($action) && ($action == "add" || $action == "edit")) {
-         $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-         $boxes = sqimap_mailbox_list($imapConnection);
-         sqimap_logout($imapConnection);
-         if (!isset($theid))
-            $theid = count($filters);
+        }
+        echo         '</tt>'.
+                    '</select>'.
+                '</td>'.
+            '</tr>'.
+            '</table>'.
+            '<input type=submit name=filter_submit value=' . _("Submit") . '>'.
+            "<input type=hidden name=theid value=$theid>".
+            '</form>'.
+            '</center>';
 
-         ?>
-            <center>
-            <form action="options.php" method=post>
-            <br><table cellpadding=2 cellspacing=0 border=0>
-               <tr>
-                  <td>
-                    &nbsp;
-                  </td>
-                  <td>
-                     <select name=filter_where>
-                        <?php
-                          if (! isset($filters[$theid]['where'])) $L = false;
-                          else $L = true;
-                           if ($L && $filters[$theid]["where"] == "From") echo "<option value=\"From\" selected> From\n";
-                           else                                     echo "<option value=\"From\"> From\n";
+    }
 
-                           if ($L && $filters[$theid]["where"] == "To")   echo "<option value=\"To\" selected> To\n";
-                           else                                     echo "<option value=\"To\"> To\n";
+       echo '<table border=0 cellpadding=3 cellspacing=0 align=center>';
 
-                           if ($L && $filters[$theid]["where"] == "Cc")   echo "<option value=\"Cc\" selected> Cc\n";
-                           else                                     echo "<option value=\"Cc\"> Cc\n";
+    for ($i=0; $i < count($filters); $i++) {
 
-                           if ($L && $filters[$theid]["where"] == "To or Cc")   echo "<option value=\"To or Cc\" selected> To or Cc\n";
-                           else                                     echo "<option value=\"To or Cc\"> To or Cc\n";
+        $clr = (($i % 2)?$color[0]:$color[9]);
+        $fdr = ($folder_prefix)?str_replace($folder_prefix, "", $filters[$i]["folder"]):$filters[$i]["folder"];
+        echo "<tr bgcolor=\"$clr\"><td><small>".
+            "[<a href=\"options.php?theid=$i&action=edit\">" . _("Edit") . '</a>]'.
+            '</small></td><td><small>'.
+            "[<a href=\"options.php?theid=$i&action=delete\">" . _("Delete") . '</a>]'.
+            '</small></td><td align=center><small>[';
 
-                           if ($L && $filters[$theid]["where"] == "Subject")   echo "<option value=\"Subject\" selected> Subject\n";
-                           else                                     echo "<option value=\"Subject\"> Subject\n";
-                        ?>
-                     </select>
-                  </td>
-               </tr>
-               <tr>
-                  <td align=right>
-                     Contains:
-                  </td>
-                  <td>
-                     <input type=text size=32 name=filter_what value="<?php
-if (isset($filters[$theid]['what'])) echo $filters[$theid]["what"]; ?>">
-                  </td>
-               </tr>
-               <tr>
-                  <td>
-                     Move to:
-                  </td>
-                  <td>
-                     <tt>
-                     <select name=filter_folder>
-      <?php
-      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 (isset($filters[$theid]['folder']) && 
-               $filters[$theid]["folder"] == $box)
-               echo "         <OPTION VALUE=\"$box\" SELECTED>$box2\n";
-            else
-               echo "         <OPTION VALUE=\"$box\">$box2\n";
-         }       
-      }
-      ?>
-                     </tt>
-                     </select>
-                  </td>
-               </tr>
-            </table>   
-            <input type=submit name=filter_submit value=Submit>
-            <input type=hidden name=theid value=<?php echo $theid ?>>
-            </form>
-            </center>
-         <?php
-      }
-      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'];
-            }       
-         }
-         
-         ?><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">
-         <?PHP
-            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";
-               }       
+        if (isset($filters[$i + 1])) {
+            echo "<a href=\"options.php?theid=$i&action=move_down\">" . _("Down") . '</a>';
+            if ($i > 0) {
+                echo '&nbsp;|&nbsp;';
             }
-         ?>
-               </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=''<?PHP
-                   if ($filters_spam_scan == '') echo ' SELECTED';
-               ?>>All messages</option>
-               <option value='new'<?PHP
-                   if ($filters_spam_scan == 'new') echo ' SELECTED';
-               ?>>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>
-         <?PHP
-           $spam_filters = load_spam_filters();
-           
-           foreach ($spam_filters as $Key => $Value)
-           {
-               echo "<tr><th align=right nowrap>$Key</th>\n";
-               echo '<td><input type=checkbox name="';
-               echo $spam_filters[$Key]['prefname'];
-               echo '_set"';
-               if ($spam_filters[$Key]['enabled'])
-                   echo ' CHECKED';
-               echo '> - ';
-               if ($spam_filters[$Key]['link'])
-               {
-                   echo '<a href="';
-                   echo $spam_filters[$Key]['link'];
-                   echo '" target="_blank">';
-               }
-               echo $spam_filters[$Key]['name'];
-               if ($spam_filters[$Key]['link'])
-               {
-                   echo '</a>';
-               }
-               echo '</td></tr><tr><td></td><td>';
-               echo $spam_filters[$Key]['comment'];
-               echo "</td></tr>\n";
-           }
-         ?>
-           <tr><td colspan=2 align=center><input type=submit name="spam_submit" value="Save"></td></tr>
-           </table>
-           </center>
-           </form>
-         <?PHP
-         
-         sqimap_logout($imapConnection);
-      }
+        }
+        if ($i > 0) {
+            echo "<a href=\"options.php?theid=$i&action=move_up\">" . _("Up") . '</a>';
+        }
+        echo ']</small></td><td>-</td><td>';
+        printf( _("If <b>%s</b> contains <b>%s</b> then move to <b>%s</b>"), _($filters[$i]['where']), $filters[$i]['what'], $fdr );
+        echo '</td></tr>';
+
+    }
+    echo '</table>'.
+        '<table width=80% align=center border=0 cellpadding=2 cellspacing=0">'.
+            '<tr><td>&nbsp</td></tr>'.
+        '</table>';
+
 ?>