Correctly filter city or area.

[readifood.git] / lib / donation.php

diff --git a/lib/donation.php b/lib/donation.php
index 16b0197..afcd01b 100644 (file)
--- a/lib/donation.php
+++ b/lib/donation.php
@@ -25,14 +25,14 @@
       echo "<p>No such contact!</p>\n";
     }
   }
-  else if ($_POST['area_id']) {
+  else if ($_POST['show_in_area']) {
     $q = new AreaQuery;
     $area = $q->findOneById($_POST['area_id']);
     /* XXX: Function to build URL because we need to set a class in links. */
     header(sprintf("Location: http%s://%s/%s/in/area/%s/%d", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($area->getName()), $_POST['area_id']));
     exit;
   }
-  else if ($_POST['city_id']) {
+  else if ($_POST['show_in_city']) {
     $q = new CityQuery;
     $city = $q->findOneById($_POST['city_id']);
     header(sprintf("Location: http%s://%s/%s/in/city/%s/%d", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($city->getName()), $_POST['city_id']));
@@ -127,15 +127,21 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form("noprint standout");
+    $candidates = array();
+    foreach ($areas as $area) {
+      if (! count(get_area_hubs($area->getId()))) continue;
+      $candidates[] = $area;
+    }
+    if (! count($candidates)) return;
+
     echo "<p>Show donations in area\n";
     echo "<select name=\"area_id\">\n";
-    foreach ($areas as $area) {
+    foreach ($candidates as $area) {
       option("area_id", $area->getId(), get_area_displayname($area));
     }
     echo "</select>\n";
-    echo "<input type=\"submit\" value=\"Show\">\n";
-    echo "</form>\n";
+    submit("show_in_area", "Show");
   }
 
   function show_donation_cities_form($city_id = null) {
@@ -147,20 +153,27 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    $candidates = array();
+    foreach ($cities as $city) {
+      if (! count(get_city_hubs($city->getId()))) continue;
+      $candidates[] = $city;
+    }
+    if (! count($candidates)) return;
+
     echo "<p>Show donations in city\n";
     echo "<select name=\"city_id\">\n";
-    foreach ($cities as $city) {
+    foreach ($candidates as $city) {
       option("city_id", $city->getId(), get_city_displayname($city), $city_id);
     }
     echo "</select>\n";
-    echo "<input type=\"submit\" value=\"Show\">\n";
-    echo "</form>\n";
+    submit("show_in_city", "Show");
   }
 
   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 +223,7 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form();
     echo "<p>Record a donation:</p>\n";
 
     echo "<table>\n";
@@ -220,7 +233,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 +246,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 +254,7 @@
     echo "</select>";
     submit("show_add_donation", "Proceed");
     echo "</p>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function update_donation(&$donation, $new = false) {
@@ -296,6 +309,16 @@
     return $donation->getId();
   }
 
+  function confirm_delete_donation($id = null) {
+    if (! check_admin(1, "delete a donation")) return;
+
+    if (isset($id)) $donation = get_donation_by_id($id);
+    if (! $donation) return false;
+
+    echo "<h3>Confirm deletion</h3>\n";
+    echo "<p>You must confirm deletion of donation $id: " . $donation->getDeleteLink(true) . "</p>\n";
+  }
+
   function delete_donation($id = null) {
     if (! check_admin(1, "delete a donation")) return;
 
@@ -318,7 +341,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 +361,7 @@
     }
 
     echo "</table>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   if (count($parameters)) {
@@ -392,20 +415,17 @@
   if (count($args)) {
     switch ($args[0]) {
       case "delete":
+        confirm_delete_donation($id);
+      break;
+
+      case "confirmdelete":
         delete_donation($id);
       break;
     }
   }
   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);
 
 ?>