Keep on going... filters plugin rg=0 compat.

[squirrelmail.git] / plugins / filters / options.php

diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 747890f8a825c150a3a785fb59afdd769be50ac6..f402a1f1eeae142bf9564ebabe78e2d677c82359 100644 (file)
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -39,8 +39,32 @@ require_once(SM_PATH . 'plugins/filters/filters.php');
 
    displayPageHeader($color, 'None');
 
-   if (isset($filter_submit)) {
-      if (!isset($theid)) $theid = 0;
+   $username = $_SESSION['username'];
+   $key = $_COOKIE['key'];
+   $onetimepad = $_SESSION['onetimepad'];
+   $delimiter = $_SESSION['delimiter'];
+   if(isset($_GET['theid'])) {
+       $theid = $_GET['theid'];
+   }
+   if(isset($_POST['theid'])) {
+       $theid = $_POST['theid'];
+   }
+   if(isset($_GET['action'])) {
+       $action = $_GET['action'];
+   }
+
+   if (isset($_POST['filter_submit'])) {
+      if(isset($_GET['theid'])) {
+          $theid = $_GET['theid'];
+      } elseif (isset($_POST['theid'])) {
+          $theid = $_POST['theid'];
+      } else {
+          $theid = 0;
+      }
+      $filter_what   = $_POST['filter_what'];
+      $filter_where  = $_POST['filter_where'];
+      $filter_folder = $_POST['filter_folder'];
+
       $filter_what = ereg_replace(",", " ", $filter_what);
       $filter_what = str_replace("\\\\", "\\", $filter_what);
       $filter_what = str_replace("\\\"", "\"", $filter_what);
@@ -60,9 +84,9 @@ require_once(SM_PATH . 'plugins/filters/filters.php');
       filter_swap($theid, $theid - 1);
    } elseif (isset($action) && $action == 'move_down') {
       filter_swap($theid, $theid + 1);
-   } elseif (isset($user_submit)) {
-       echo "<br><center><b>"._("Saved Scan type")."</b></center>\n";
-       setPref($data_dir, $username, 'filters_user_scan', $filters_user_scan_set);
+   } elseif (isset($_POST['user_submit'])) {
+       setPref($data_dir, $username, 'filters_user_scan', $_POST['filters_user_scan_set']);
+       echo '<br><center><b>'._("Saved Scan type")."</b></center>\n";
    }
 
    $filters = load_filters();
@@ -105,6 +129,9 @@ require_once(SM_PATH . 'plugins/filters/filters.php');
         'center' ) . '<br>';
 
     if (isset($action) && ($action == 'add' || $action == 'edit')) {
+        $username = $_SESSION['username'];
+        $key = $_COOKIE['key'];
+
         $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
         $boxes = sqimap_mailbox_list($imapConnection);
         sqimap_logout($imapConnection);