X-Git-Url: http://git.iain.cx/?p=readifood.git;a=blobdiff_plain;f=lib%2Fdonation.php;h=e9c75dabe59b244bc41b93f04eba379658853468;hp=16b01970caa951ca4ceb460828b50e2995291780;hb=6bd4ad3daf2cc870d96a3fed9ea9caf6798d2b78;hpb=4cd13bda037940724f018b8bfc62413156c52b75

diff --git a/lib/donation.php b/lib/donation.php
index 16b0197..e9c75da 100644
--- a/lib/donation.php
+++ b/lib/donation.php
@@ -127,7 +127,6 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
     echo "<p>Show donations in area\n";
     echo "<select name=\"area_id\">\n";
     foreach ($areas as $area) {
@@ -135,7 +134,6 @@
     }
     echo "</select>\n";
     echo "<input type=\"submit\" value=\"Show\">\n";
-    echo "</form>\n";
   }
 
   function show_donation_cities_form($city_id = null) {
@@ -147,7 +145,6 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
     echo "<p>Show donations in city\n";
     echo "<select name=\"city_id\">\n";
     foreach ($cities as $city) {
@@ -155,12 +152,13 @@
     }
     echo "</select>\n";
     echo "<input type=\"submit\" value=\"Show\">\n";
-    echo "</form>\n";
   }
 
   function show_donation_forms($city_id) {
+    form("noprint standout");
     show_donation_areas_form($city_id);
     show_donation_cities_form($city_id);
+    end_form();
   }
 
   function show_donation_form($donation = null, $area_id = null) {
@@ -210,7 +208,7 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form();
     echo "<p>Record a donation:</p>\n";
 
     echo "<table>\n";
@@ -220,7 +218,7 @@
     echo "  <td colspan=2>"; submit("add_donation", "Record"); echo "</td></tr>\n";
     echo "</tr>\n";
     echo "</table>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function show_add_new_donation_form() {
@@ -233,7 +231,7 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form("noprint standout");
     echo "<p>Record a donation in <select name=\"area_id\">\n";
     foreach ($areas as $area) {
       option("area_id", $area->getId(), get_area_displayname($area));
@@ -241,7 +239,7 @@
     echo "</select>";
     submit("show_add_donation", "Proceed");
     echo "</p>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function update_donation(&$donation, $new = false) {
@@ -318,7 +316,7 @@
     if (isset($id)) $donation = get_donation_by_id($id);
     if (! $donation) return;
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form();
     echo "<p>Donation <span class=\"strong\">" . $donation->getId() . "</span>";
     if (check_admin(1)) {
       echo " " . $donation->getDeleteLink();
@@ -338,7 +336,7 @@
     }
 
     echo "</table>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   if (count($parameters)) {
@@ -397,15 +395,8 @@
     }
   }
   else if (isset($id)) show_donation($id);
-  else {
-    /* XXX: Shown after adding. */
-    show_donation_forms($city_id);
-    show_add_new_donation_form($city_id);
-  }
-
-  if (count($parameters)) {
-    show_donation_forms($city_id);
-  }
 
+  show_donation_forms($city_id);
+  show_add_new_donation_form($city_id);
 
 ?>