Correctly filter city or area.

[readifood.git] / lib / hub.php

diff --git a/lib/hub.php b/lib/hub.php
index 51aec9a..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']));
@@ -121,7 +121,7 @@
       option("area_id", $area->getId(), get_area_displayname($area));
     }
     echo "</select>\n";
-    echo "<input type=\"submit\" value=\"Show\">\n";
+    submit("show_in_area", "Show");
   }
 
   function show_hub_cities_form($city_id = null) {
@@ -146,7 +146,7 @@
       option("city_id", $city->getId(), get_city_displayname($city), $city_id);
     }
     echo "</select>\n";
-    echo "<input type=\"submit\" value=\"Show\">\n";
+    submit("show_in_city", "Show");
   }
 
   function show_hub_forms($city_id) {
@@ -342,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;
 
@@ -418,6 +429,10 @@
   if (count($args)) {
     switch ($args[0]) {
       case "delete":
+        confirm_delete_hub($name, $id);
+      break;
+
+      case "confirmdelete":
         delete_hub($name, $id);
       break;
     }