Correctly filter city or area.

[readifood.git] / lib / hub.php

diff --git a/lib/hub.php b/lib/hub.php
index a3a1121..12f27cf 100644 (file)
--- a/lib/hub.php
+++ b/lib/hub.php
@@ -27,13 +27,13 @@
       echo "<p>No such hub!</p>\n";
     }
   }
-  else if ($_POST['area_id']) {
+  else if ($_POST['show_in_area']) {
     $q = new AreaQuery;
     $area = $q->findOneById($_POST['area_id']);
     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']));
@@ -108,15 +108,20 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    $candidates = array();
+    foreach ($areas as $area) {
+      if (! count(get_area_hubs($area->getId()))) continue;
+      $candidates[] = $area;
+    }
+    if (! count($candidates)) return;
+
     echo "<p>Show hubs 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_hub_cities_form($city_id = null) {
@@ -128,20 +133,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 hubs 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_hub_forms($city_id) {
+    form("noprint standout");
     show_hub_areas_form($city_id);
     show_hub_cities_form($city_id);
+    end_form();
   }
 
   function show_hub_role_form($role) {
@@ -174,7 +186,7 @@
     /* Postcode. */
     echo "<tr>\n";
     echo "  <td>Postcode</td>\n";
-    echo "  <td>"; input("postcode", $address->getPostcode()); echo "</td>\n";
+    echo "  <td>"; input("postcode", $address->getPostcode()); echo get_address_map_link($address); echo "</td>\n";
     echo "</tr>\n";
 
     /* Telephone. */
@@ -215,7 +227,7 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form("noprint");
     echo "<p>Add a new hub:</p>\n";
 
     echo "<table>\n";
@@ -225,7 +237,7 @@
     echo "  <td colspan=2>"; submit("add_hub", "Add"); echo "</td></tr>\n";
     echo "</tr>\n";
     echo "</table>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function show_add_new_hub_form() {
@@ -238,7 +250,7 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form("noprint standout");
     echo "<p>Add a new hub in <select name=\"city_id\">\n";
     foreach ($cities as $city) {
       option("city_id", $city->getId(), get_city_displayname($city));
@@ -246,7 +258,7 @@
     echo "</select>";
     submit("show_add_hub", "Proceed");
     echo "</p>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function update_hub(&$hub, $area_id, $new = false) {
@@ -330,6 +342,17 @@
     return $hub->getId();
   }
 
+  function confirm_delete_hub($name, $id = null) {
+    if (! check_admin(1, "delete a hub")) return;
+
+    if (isset($id)) $hub = get_hub_by_id($id);
+    else $hub = get_hub_by_name($name);
+    if (! $hub) return false;
+
+    echo "<h3>Confirm deletion</h3>\n";
+    echo "<p>You must confirm deletion of hub " . $hub->getDisplayname() . ": " . $hub->getDeleteLink(true) . "</p>\n";
+  }
+
   function delete_hub($name, $id = null, &$city_id = null) {
     if (! check_admin(1, "delete a hub")) return;
 
@@ -357,7 +380,7 @@
     else $hub = get_hub_by_name($name);
     if (! $hub) return;
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form();
     show_hub_summary($hub, true);
     echo ": ";
     echo "\n</p>";
@@ -374,7 +397,7 @@
     }
 
     echo "</table>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   /* /hub/in/area/Cambridge/1 */
@@ -399,8 +422,6 @@
           show_city_hubs(0, 10, $parameters[2], $city_id);
         break;
       }
-
-      show_new_hub_form($city_id);
     }
   }
   list($name, $id, $args) = parse_parameters($parameters);
@@ -408,19 +429,17 @@
   if (count($args)) {
     switch ($args[0]) {
       case "delete":
+        confirm_delete_hub($name, $id);
+      break;
+
+      case "confirmdelete":
         delete_hub($name, $id);
       break;
     }
   }
   else if (isset($name)) show_hub($name, $id);
-  else {
-    /* XXX: Shown after adding. */
-    show_hub_forms($city_id);
-    show_add_new_hub_form($city_id);
-  }
 
-  if (count($parameters)) {
-    show_hub_forms($city_id);
-  }
+  show_hub_forms($city_id);
+  show_add_new_hub_form($city_id);
 
 ?>