X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Farea.php;h=77272f76e9ba375d5d076471f17c9c87da834e59;hb=f02dbb704b8c6f04529bf9cae3b99d379f998567;hp=9670a86c6bb8c3672a0985b8f625f01772da9c50;hpb=87843f0ab772989647ce3116f2508b781f56f0b6;p=readifood.git

diff --git a/lib/area.php b/lib/area.php
index 9670a86..77272f7 100644
--- a/lib/area.php
+++ b/lib/area.php
@@ -1,6 +1,7 @@
 <?php
 
   if ($_POST['area_name']) {
+    set_last_selected("city_id", $_POST['city_id']);
     $id = add_area($_POST['area_name'], $_POST['city_id']);
     if ($id !== false) {
       echo "<p>Added area.</p>\n";
@@ -8,8 +9,10 @@
     }
   }
   else if ($_POST['city_id']) {
-    /* XXX: city_id is actually a string $city_name/$city_id */
-    header(sprintf("Location: http%s://%s/%s/in/%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, $_POST['city_id']));
+    set_last_selected("city_id", $_POST['city_id']);
+    $city_id = $_POST['city_id'];
+    $city = get_city_by_id($city_id);
+    header(sprintf("Location: http%s://%s/%s/in/city/%s/%d", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, $city->getName(), $city_id));
     exit;
   }
   else if ($_POST['update_area']) {
@@ -27,10 +30,12 @@
 
         if (count($areas)) {
           foreach ($areas as $area) {
-            echo "<br>\nArea: " . $area->getStrongLink();
-            printf(" <a class=\"small\" href=\"/contact/in/area/%s/%d\">Contacts</a>", urlencode($area->getName()), $area->getId());
-            printf(" <a class=\"small\" href=\"/donation/in/area/%s/%d\">Donations</a>", urlencode($area->getName()), $area->getId());
-            printf(" <a class=\"small\" href=\"/order/in/area/%s/%d\">Orders</a>", urlencode($area->getName()), $area->getId());
+            echo "<br>\nArea: " . $area->getStrongLink() . "\n";
+            $n = urlencode($area->getName());
+            $i = $area->getId();
+            echo " " . get_small_link("Contacts", "/contact/in/area/%s/%d", $n, $i);
+            echo " " . get_small_link("Donations", "/donation/in/area/%s/%d", $n, $i);
+            echo " " . get_small_link("Orders", "/order/in/area/%s/%d", $n, $i);
             if (check_admin(1)) {
               echo " " . $area->getDeleteLink();
             }
@@ -51,15 +56,22 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SCRIPT['REQUEST_URI'] . "\">\n";
+    $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) {
-      option("city_id", sprintf("%s/%s", $city->getName(), $city->getId()), get_city_displayname($city));
+    foreach ($candidates as $city) {
+      option("city_id", $city->getId(), get_city_displayname($city));
     }
     echo "</select>\n";
     echo "<input type=\"submit\" value=\"Show\">\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function show_new_area_form($city_id = null) {
@@ -72,7 +84,7 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form("noprint standout");
     echo "<p>Add a new area <input name=\"area_name\">\n";
     echo "in <select name=\"city_id\">\n";
 
@@ -81,7 +93,7 @@
     }
     echo "</select>\n";
     echo "<input type=\"submit\" value=\"Add\">\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function add_area($name, $city_id) {
@@ -117,32 +129,14 @@
     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:";
     if (check_admin(1)) {
       for ($i = 0; $i < count($week); $i++) {
-        echo " <input type=\"checkbox\" name=\"day_$i\"";
+        echo " <input type=\"checkbox\" id=\"day_$i\" name=\"day_$i\"";
         if ($days & (1 << $i)) echo " checked";
-        echo ">$week[$i]\n";
+        echo "><label for=\"day_$i\">$week[$i]</label>\n";
       }
     }
     else {
@@ -182,8 +176,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);
@@ -209,11 +214,13 @@
     $area = get_area_by_name($name);
     if (! $area) return;
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form();
     echo "<p>Area: <span class=\"strong\">" . $area->getName() . "</span>";
-    printf(" <a class=\"small\" href=\"/contact/in/area/%s/%d\">Contacts</a>", urlencode($area->getName()), $area->getId());
-    printf(" <a class=\"small\" href=\"/donation/in/area/%s/%d\">Donations</a>", urlencode($area->getName()), $area->getId());
-    printf(" <a class=\"small\" href=\"/order/in/area/%s/%d\">Orders</a>", urlencode($area->getName()), $area->getId());
+    $n = $area->getName();
+    $i = $area->getId();
+    echo " " . get_small_link("Contacts", "/contact/in/area/%s/%d", $n, $i);
+    echo " " . get_small_link("Donations", "/donation/in/area/%s/%d", $n, $i);
+    echo " " . get_small_link("Orders", "/order/in/area/%s/%d", $n, $i);
     if (check_admin(1)) {
       echo " " . $area->getDeleteLink();
     }
@@ -230,7 +237,7 @@
       echo "<input type=\"submit\" name=\"update_area\" value=\"Update\">\n";
     }
     echo "</p>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   /* /area/in/Cambridge/1 */
@@ -248,6 +255,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;
     }