From: Pierre Habouzit <madcoder@debian.org>
Date: Thu, 11 Sep 2003 12:39:39 +0000 (+0000)
Subject: instructions misplacing
X-Git-Tag: procmail~29
X-Git-Url: http://git.polytechnique.org/?p=old-projects.git;a=commitdiff_plain;h=98b878f3cd8da2904e0e1066ce55b0720b1ac4b3

instructions misplacing
---

diff --git a/philter/philter/include/form_emails.inc.php b/philter/philter/include/form_emails.inc.php
index 323d406..5bcf90c 100644
--- a/philter/philter/include/form_emails.inc.php
+++ b/philter/philter/include/form_emails.inc.php
@@ -9,17 +9,6 @@ if(count($_POST)) {                             // a FORM has been submitted
     if(isset($_POST['emails']))                 //      FORM emails
         if(!$mail_pool->handle_form())
             echo "<p style=\"color:red;\">".$philter->error()."</p>\n";
-
-    if(!empty($_POST['order']['action']))       //      FORM order
-        if($_POST['order']['action']=='submit') {
-            foreach($filter->rules as $id=>$rule)
-                if(isset($_POST['order'][$id]))
-                    $filter->rules[$id]->move_to($_POST['order'][$id], $filter->uid, $id);
-            uasort($filter->rules, 'rule_cmp');
-        } elseif($_POST['order']['action']=='delete' && !empty($_POST['order']['select'])) {
-            $filter->delete_rule($_POST['order']['select']);
-            $_POST['order']['select'] = min(count($filter->rules),$_POST['order']['select']);
-        }
 }
 ?>
 <div class="rubrique"><?php i18n('global_title'); ?></div>
diff --git a/philter/philter/include/form_filter.inc.php b/philter/philter/include/form_filter.inc.php
index e81acad..49aac89 100644
--- a/philter/philter/include/form_filter.inc.php
+++ b/philter/philter/include/form_filter.inc.php
@@ -1,7 +1,19 @@
 <?php
-if(!empty($_POST['rule']))
-    if(!$filter->handle_form())
-        echo "<p style=\"color:red;\">".$philter->error()."</p>\n";
+if(count($_POST)) {                             // a FORM has been submitted
+    if(!empty($_POST['order']['action']))       //      FORM order
+        if($_POST['order']['action']=='submit') {
+            foreach($filter->rules as $id=>$rule)
+                if(isset($_POST['order'][$id]))
+                    $filter->rules[$id]->move_to($_POST['order'][$id], $filter->uid, $id);
+            uasort($filter->rules, 'rule_cmp');
+        } elseif($_POST['order']['action']=='delete' && !empty($_POST['order']['select'])) {
+            $filter->delete_rule($_POST['order']['select']);
+            $_POST['order']['select'] = min(count($filter->rules),$_POST['order']['select']);
+        }
+    if(!empty($_POST['rule']))
+        if(!$filter->handle_form())
+            echo "<p style=\"color:red;\">".$philter->error()."</p>\n";
+}
 
 require("include/js_factory.inc.php");
 ?>