X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=971a9c2a0fe3e912504bb63f920cb43ddae78397;hb=0c52a01e4ac4334a614da358b8fb1b479db481a4;hp=80139892fd7e271edd12730f3003d4dbd4b943cf;hpb=99c95916fa6901a10f864f25f9a05f95d792902e;p=readifood.git

diff --git a/lib/contact.php b/lib/contact.php
index 8013989..971a9c2 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -6,7 +6,7 @@
     show_new_contact_form($city_id);
   }
   else if (isset($_POST['add_contact'])) {
-    set_last_selected("area_id", $area_id);
+    set_last_selected("area_id", $_POST['area_id']);
     $id = add_contact($displayname);
     if ($id !== false) {
       echo "<p>Added contact.</p>\n";
@@ -30,7 +30,7 @@
     }
   }
   else if ($_POST['search_contact']) {
-    header(sprintf("Location: http%s://%s/%s/search/%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($_POST['search_contact'])));
+    header(sprintf("Location: http%s://%s/%s/search/%s%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, $_POST['search_by_phone'] ? "phone/" : "", urlencode($_POST['search_contact'])));
     exit;
   }
   else if ($_POST['show_in_area']) {
@@ -71,44 +71,53 @@
     echo ", " . $city->getLink(get_city_displayname($city));
   }
 
-  function show_contacts($offset, $per_page, $address_ids) {
+  function show_contacts($address_ids) {
+    list($first_page, $per_page) = pagination();
     $q = new ContactQuery;
-    $contacts = $q->filterByAddressId($address_ids)->orderByForename()->orderBySurname()->find();
+    $contacts = $q->filterByAddressId($address_ids)->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page);
     if (count($contacts)) {
       foreach ($contacts as $contact) show_contact_summary($contact);
+      show_pagination($contacts);
     }
     else echo " none";
   }
 
-  function search_contacts($offset, $per_page, $search) {
+  function search_contacts($search, $phone = false) {
+    list($first_page, $per_page) = pagination();
     $q = new ContactQuery;
-    $contacts = $q->filterByDisplayname("%$search%")->find();
-    echo "<p>Contacts matching '" . htmlspecialchars($search) . "':";
+    if ($phone) $q->filterByTelephone1("%$search%")->_or()->filterByTelephone2("%$search%");
+    else $q->filterByDisplayname("%$search%");
+    $contacts = $q->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page);
+    echo "<p>Contacts matching " . ($phone ? "telephone " : "") . "'" . htmlspecialchars($search) . "':";
     if (count($contacts)) {
       foreach ($contacts as $contact) show_contact_summary($contact);
+      show_pagination($contacts);
     }
     else echo "none";
     echo "</p>\n";
 
     $address_ids = array();
-    $q = new AddressQuery;
-    $addresses = $q->filterByLine("%$search%")->find();
-    foreach ($addresses as $address) $address_ids[] = $address->getId();
-    $q = new AddressQuery;
-    $addresses = $q->filterByPostcode("%$search%")->find();
-    foreach ($addresses as $address) $address_ids[] = $address->getId();
+    if (! $phone) {
+      $q = new AddressQuery;
+      $addresses = $q->filterByLine("%$search%")->find();
+      foreach ($addresses as $address) $address_ids[] = $address->getId();
+      $q = new AddressQuery;
+      $addresses = $q->filterByPostcode("%$search%")->find();
+      foreach ($addresses as $address) $address_ids[] = $address->getId();
 
-    $q = new ContactQuery;
-    $contacts = $q->filterByAddressId($address_ids)->find();
-    echo "<p>Contacts in address '" . htmlspecialchars($search) . "':";
-    if (count($contacts)) {
-      foreach ($contacts as $contact) show_contact_summary($contact);
+      $q = new ContactQuery;
+      $contacts = $q->filterByAddressId($address_ids)->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page);
+      echo "<p>Contacts in address '" . htmlspecialchars($search) . "':";
+      if (count($contacts)) {
+        foreach ($contacts as $contact) show_contact_summary($contact);
+        show_pagination($contacts);
+      }
     }
     else echo "none";
     echo "</p>\n";
   }
 
-  function show_city_contacts($offset, $per_page, $city_name, $city_id = null) {
+  function show_city_contacts($city_name, $city_id = null) {
     if (isset($city_id)) $city = get_city_by_id($city_id);
     else if ($city_name) $city = get_city_by_name($city_name);
     if ($city) {
@@ -123,12 +132,12 @@
       foreach ($addresses as $address) $address_ids[] = $address->getId();
 
       echo "<p>Contacts in city " . $city->getLink(get_city_displayname($city)) . ":";
-      return show_contacts($offset, $per_page, $address_ids);
+      return show_contacts($address_ids);
     }
     else echo "<p>No such city!</p>\n";
   }
 
-  function show_area_contacts($offset, $per_page, $area_name, $area_id = null) {
+  function show_area_contacts($area_name, $area_id = null) {
     if (isset($area_id)) $area = get_area_by_id($area_id);
     else if ($area_name) $area = get_area_by_name($area_name);
     if ($area) {
@@ -138,7 +147,7 @@
       foreach ($addresses as $address) $address_ids[] = $address->getId();
 
       echo "<p>Contacts in area " . $area->getLink() . ":";
-      return show_contacts($offset, $per_page, $address_ids);
+      return show_contacts($address_ids);
     }
     else echo "<p>No such area!</p>\n";
   }
@@ -194,7 +203,10 @@
   function show_contact_search_form() {
     echo "<p>Search for contacts:";
     input("search_contact");
+    echo "<input type=\"checkbox\" id=\"search_by_phone\" name=\"search_by_phone\">";
+    echo "<label for=\"search_by_phone\">by telephone</label>\n";
     echo "<input type=\"submit\" value=\"Search\">\n";
+    echo "</p>\n";
   }
 
   function show_contact_forms($city_id) {
@@ -580,7 +592,7 @@
           $area = $q->findOneById($area_id);
           $city = get_area_city($area);
           if ($city) $city_id = $city->getId();
-          show_area_contacts(0, 10, $parameters[2], $area_id);
+          show_area_contacts($parameters[2], $area_id);
         break;
 
         case "city":
@@ -588,12 +600,13 @@
           $_POST['city_id'] = $city_id;
           $q = new CityQuery;
           $city = $q->findOneById($city_id);
-          show_city_contacts(0, 10, $parameters[2], $city_id);
+          show_city_contacts($parameters[2], $city_id);
         break;
       }
     }
     else if ($parameters[0] == "search") {
-      search_contacts(0, 10, urldecode($parameters[1]));
+      if ($parameters[1] == "phone") search_contacts(urldecode($parameters[2]), true);
+      else search_contacts(urldecode($parameters[1]));
     }
   }
   list($name, $id, $args) = parse_parameters($parameters);