X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=25aab5883a817b4499cad0e846f4edf1bfef12e1;hb=8d1046edac05814d1a7ddd4d55aa356a46d06685;hp=d5975b9c87fcbfc556aec8087ef604fe0389e763;hpb=5443dbf64833b4cfddcc07d43657dcff371550c4;p=readifood.git

diff --git a/lib/contact.php b/lib/contact.php
index d5975b9..25aab58 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -31,13 +31,13 @@
     header(sprintf("Location: http%s://%s/%s/search/%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($_POST['search_contact'])));
     exit;
   }
-  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']));
@@ -129,13 +129,20 @@
       return;
     }
 
+    $candidates = array();
+    foreach ($areas as $area) {
+      if (! count(get_area_contacts($area->getId()))) continue;
+      $candidates[] = $area;
+    }
+    if (! count($candidates)) return;
+
     echo "<p>Show contacts 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";
+    submit("show_in_area", "Show");
   }
 
   function show_contact_cities_form($city_id = null) {
@@ -147,13 +154,20 @@
       return;
     }
 
+    $candidates = array();
+    foreach ($cities as $city) {
+      if (! count(get_city_contacts($city->getId()))) continue;
+      $candidates[] = $city;
+    }
+    if (! count($candidates)) return;
+
     echo "<p>Show contacts 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";
+    submit("show_in_city", "Show");
   }
 
   function show_contact_search_form() {
@@ -249,7 +263,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. */
@@ -308,7 +322,7 @@
     /* Notes. */
     echo "<tr>\n";
     echo "  <td>Notes</td>\n";
-    echo "  <td><textarea name=\"notes\">" . $contact->getNotes() . "</textarea></td>\n";
+    echo "  <td>"; textarea("notes", $contact->getNotes()); echo "</td>\n";
     echo "</tr>\n";
   }
 
@@ -465,6 +479,17 @@
     return $contact->getId();
   }
 
+  function confirm_delete_contact($name, $id = null, &$city_id = null) {
+    if (! check_admin(1, "delete a contact")) return;
+
+    if (isset($id)) $contact = get_contact_by_id($id);
+    else $contact = get_contact_by_name($name);
+    if (! $contact) return false;
+
+    echo "<h3>Confirm deletion</h3>\n";
+    echo "<p>You must confirm deletion of contact " . $contact->getDisplayname() . ": " . $contact->getDeleteLink(true) . "</p>\n";
+  }
+
   function delete_contact($name, $id = null, &$city_id = null) {
     if (! check_admin(1, "delete a contact")) return;
 
@@ -544,6 +569,10 @@
   if (count($args)) {
     switch ($args[0]) {
       case "delete":
+        confirm_delete_contact($name, $id);
+      break;
+
+      case "confirmdelete":
         delete_contact($name, $id);
       break;
     }