Fixed five-ten filters and made Options page edit forms always at top of page

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

diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php
index 5273b3538e3c76570b6dbd94f9647c42f3db2bd6..52f5dfae5622dbd02b255b76100b426eb8b43c1d 100644 (file)
--- a/plugins/filters/filters.php
+++ b/plugins/filters/filters.php
@@ -488,28 +488,28 @@
         $filters['FiveTen Others']['comment'] =
     _("FREE - Five-Ten-sg.com - Other misc. servers.");
 
-      $filters['FiveTen Others']['prefname'] = 'filters_spam_fiveten_ss';
-      $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com Single Stage Servers';
-      $filters['FiveTen Others']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
-      $filters['FiveTen Others']['dns'] = 'blackholes.five-ten-sg.com';
-      $filters['FiveTen Others']['result'] = '127.0.0.6';
-      $filters['FiveTen Others']['comment'] =
+      $filters['FiveTen Single Stage']['prefname'] = 'filters_spam_fiveten_ss';
+      $filters['FiveTen Single Stage']['name'] = 'Five-Ten-sg.com Single Stage Servers';
+      $filters['FiveTen Single Stage']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
+      $filters['FiveTen Single Stage']['dns'] = 'blackholes.five-ten-sg.com';
+      $filters['FiveTen Single Stage']['result'] = '127.0.0.6';
+      $filters['FiveTen Single Stage']['comment'] =
    _("FREE - Five-Ten-sg.com - Single Stage servers.");
       
-      $filters['FiveTen Others']['prefname'] = 'filters_spam_fiveten_supp';
-      $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com SPAM Support Servers';
-      $filters['FiveTen Others']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
-      $filters['FiveTen Others']['dns'] = 'blackholes.five-ten-sg.com';
-      $filters['FiveTen Others']['result'] = '127.0.0.7';
-      $filters['FiveTen Others']['comment'] =
+      $filters['FiveTen SPAM Support']['prefname'] = 'filters_spam_fiveten_supp';
+      $filters['FiveTen SPAM Support']['name'] = 'Five-Ten-sg.com SPAM Support Servers';
+      $filters['FiveTen SPAM Support']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
+      $filters['FiveTen SPAM Support']['dns'] = 'blackholes.five-ten-sg.com';
+      $filters['FiveTen SPAM Support']['result'] = '127.0.0.7';
+      $filters['FiveTen SPAM Support']['comment'] =
    _("FREE - Five-Ten-sg.com - SPAM Support servers.");
       
-      $filters['FiveTen Others']['prefname'] = 'filters_spam_fiveten_wf';
-      $filters['FiveTen Others']['name'] = 'Five-Ten-sg.com Web Form IPs';
-      $filters['FiveTen Others']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
-      $filters['FiveTen Others']['dns'] = 'blackholes.five-ten-sg.com';
-      $filters['FiveTen Others']['result'] = '127.0.0.8';
-      $filters['FiveTen Others']['comment'] =
+      $filters['FiveTen Web forms']['prefname'] = 'filters_spam_fiveten_wf';
+      $filters['FiveTen Web forms']['name'] = 'Five-Ten-sg.com Web Form IPs';
+      $filters['FiveTen Web forms']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
+      $filters['FiveTen Web forms']['dns'] = 'blackholes.five-ten-sg.com';
+      $filters['FiveTen Web forms']['result'] = '127.0.0.8';
+      $filters['FiveTen Web forms']['comment'] =
    _("FREE - Five-Ten-sg.com - Web Form IPs.");
       
         $filters['Dorkslayers']['prefname'] = 'filters_spam_dorks';

diff --git a/plugins/filters/options.php b/plugins/filters/options.php
index 9d658a5c01d0577b6acc1e53201c1396aa306478..421975b3bdb8e8e50bbe87ee2b4e0ede3eb09df9 100644 (file)
--- a/plugins/filters/options.php
+++ b/plugins/filters/options.php
@@ -67,88 +67,6 @@
    }
    $filters = load_filters();
 
-   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>' .
-        '<table border=0 cellpadding=3 cellspacing=0 align=center>';
-
-    for ($i=0; $i < count($filters); $i++) {
-
-        $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 (isset($filters[$i + 1])) {
-            echo "<a href=\"options.php?theid=$i&action=move_down\">" . _("Down") . '</a>';
-            if ($i > 0) {
-                echo ' | ';
-            }
-        }
-        if ($i > 0) {
-            echo "<a href=\"options.php?theid=$i&action=move_up\">" . _("Up") . '</a>';
-        }
-        echo ']</small></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>';
-
-
-    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>';
-        }
-    }
-
     if (isset($action) && ($action == 'add' || $action == 'edit')) {
         $imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
         $boxes = sqimap_mailbox_list($imapConnection);
@@ -309,4 +227,87 @@
 
         sqimap_logout($imapConnection);
     }
+
+   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>' .
+        '<table border=0 cellpadding=3 cellspacing=0 align=center>';
+
+    for ($i=0; $i < count($filters); $i++) {
+
+        $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 (isset($filters[$i + 1])) {
+            echo "<a href=\"options.php?theid=$i&action=move_down\">" . _("Down") . '</a>';
+            if ($i > 0) {
+                echo ' | ';
+            }
+        }
+        if ($i > 0) {
+            echo "<a href=\"options.php?theid=$i&action=move_up\">" . _("Up") . '</a>';
+        }
+        echo ']</small></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>';
+
+
+    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>';
+        }
+    }
+
 ?>