X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Farea.php;h=8872a43308975cd3746d48931e909b5a2bd4f35c;hb=446bce55325fc63d0583b838111d387764be498f;hp=51f57d39ad9d38ad4abdec426be6196a4d13ed0f;hpb=6bd4ad3daf2cc870d96a3fed9ea9caf6798d2b78;p=readifood.git

diff --git a/lib/area.php b/lib/area.php
index 51f57d3..8872a43 100644
--- a/lib/area.php
+++ b/lib/area.php
@@ -53,10 +53,17 @@
       return;
     }
 
+    $candidates = array();
+    foreach ($cities as $city) {
+      if (! count(get_city_areas($city->getId()))) continue;
+      $candidates[] = $city;
+    }
+    if (! count($candidates)) return;
+
     form("noprint standout");
     echo "<p>Show areas in\n";
     echo "<select name=\"city_id\">\n";
-    foreach ($cities as $city) {
+    foreach ($candidates as $city) {
       option("city_id", sprintf("%s/%s", $city->getName(), $city->getId()), get_city_displayname($city));
     }
     echo "</select>\n";
@@ -119,24 +126,6 @@
     return $area->getId();
   }
 
-  function delete_city($name) {
-    if (! check_admin(1, "delete a city")) return;
-
-    $city = get_city_by_name($name);
-    if (! $city) return false;
-
-    try {
-      $city->delete();
-    }
-    catch (Exception $e) {
-      echo "<p>Error deleting $name!</p>\n";
-      /* XXX: Why? Check for addresses in use... */
-      return false;
-    }
-
-    return true;
-  }
-
   function show_area_delivery_days_form($days) {
     global $week;
     echo "Delivery days:";
@@ -184,8 +173,19 @@
     return true;
   }
 
+  function confirm_delete_area($name, $id = null, &$city_id = null) {
+    if (! check_admin(1, "delete an area")) return;
+
+    if (isset($id)) $area = get_area_by_id($id);
+    else $area = get_area_by_name($name);
+    if (! $area) return false;
+
+    echo "<h3>Confirm deletion</h3>\n";
+    echo "<p>You must confirm deletion of area " . $area->getName() . ": " . $area->getDeleteLink(true) . "</p>\n";
+  }
+
   function delete_area($name, $id = null, &$city_id = null) {
-    if (! check_admin(1, "delete a area")) return;
+    if (! check_admin(1, "delete an area")) return;
 
     if (isset($id)) $area = get_area_by_id($id);
     else $area = get_area_by_name($name);
@@ -252,6 +252,10 @@
   if (count($args)) {
     switch ($args[0]) {
       case "delete":
+        confirm_delete_area($name, $id, $city_id);
+      break;
+
+      case "confirmdelete":
         delete_area($name, $id, $city_id);
       break;
     }