2mbit.com rbl is obsolate. It is replaced with ahbl.org rbl. Fix for bug.no.829887

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

diff --git a/plugins/filters/spamoptions.php b/plugins/filters/spamoptions.php
index 21719494eab6f8db952dd31cdb5c31467c6ce18c..7f6491c79fb0df3dffd4c84a067c7add332cbd2a 100644 (file)
--- a/plugins/filters/spamoptions.php
+++ b/plugins/filters/spamoptions.php
@@ -22,9 +22,11 @@
  * Also view plugins/README.plugins for more information.
  *
  * $Id$
+ * @package plugins
+ * @subpackage filters
  */
 
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
 define('SM_PATH','../../');
 
 /* SquirrelMail required files. */
@@ -36,14 +38,14 @@ 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'];
+/* get globals */
+sqgetGlobalVar('username', $username, SQ_SESSION);
+sqgetGlobalVar('key', $key, SQ_COOKIE);
+sqgetGlobalVar('onetimepad', $onetimepad, SQ_SESSION);
+sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION);
 
-if (isset($_GET['action'])) {
-    $action = $_GET['action'];
-}
+sqgetGlobalVar('action', $action, SQ_GET);
+/* end globals */
 
 displayPageHeader($color, 'None');
 
@@ -176,7 +178,7 @@ if (isset($action) && $action == 'spam') {
         '</table>'.
         '</center>'.
         '</form>';
-
+    echo '</body></html>';
 }
 
 if (! isset($_GET['action']) || $_GET['action'] != 'spam') {
@@ -219,6 +221,7 @@ if (! isset($_GET['action']) || $_GET['action'] != 'spam') {
         echo "</td></tr>\n";
     }
     echo '</table>';
+    echo '</body></html>';
 }
 
-?>
+?>
\ No newline at end of file