X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=e9c7f4b1b4604b1a285f61be6565155426295adb;hb=refs%2Ftags%2F2022-10-31;hp=ee9f3e06c77e347f296802436276185e69714cf3;hpb=762ae69462813affdcdab3960dede2c7d679baf3;p=readifood.git

diff --git a/lib/contact.php b/lib/contact.php
index ee9f3e0..e9c7f4b 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -30,7 +30,12 @@
     }
   }
   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'])));
+    $search_options = array();
+    if ($_POST['search_by_notes']) array_push($search_options, 'notes');
+    if ($_POST['search_by_phone']) array_push($search_options, 'phone');
+    if (count($search_options)) $search_param = sprintf("%s/", implode('+', $search_options));
+    else $search_param = '';
+    header(sprintf("Location: http%s://%s/%s/search/%s%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, $search_param, urlencode($_POST['search_contact'])));
     exit;
   }
   else if ($_POST['show_in_area']) {
@@ -82,11 +87,14 @@
     else echo " none";
   }
 
-  function search_contacts($search) {
+  function search_contacts($search, $notes = false, $phone = false) {
     list($first_page, $per_page) = pagination();
     $q = new ContactQuery;
-    $contacts = $q->filterByDisplayname("%$search%")->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page);
-    echo "<p>Contacts matching '" . htmlspecialchars($search) . "':";
+    if ($phone) $q->filterByTelephone1("%$search%")->_or()->filterByTelephone2("%$search%");
+    else $q->filterByDisplayname("%$search%");
+    if ($notes) $q->_or()->filterByNotes("%$search%");
+    $contacts = $q->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page);
+    echo "<p>Contacts matching " . ($notes ? "notes " : "") . ($phone ? "telephone " : "") . "'" . htmlspecialchars($search) . "':";
     if (count($contacts)) {
       foreach ($contacts as $contact) show_contact_summary($contact);
       show_pagination($contacts);
@@ -95,21 +103,23 @@
     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)->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);
+      $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";
     }
-    else echo "none";
     echo "</p>\n";
   }
 
@@ -199,7 +209,12 @@
   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=\"checkbox\" id=\"search_by_notes\" name=\"search_by_notes\">";
+    echo "<label for=\"search_by_notes\">by notes</label>\n";
     echo "<input type=\"submit\" value=\"Search\">\n";
+    echo "</p>\n";
   }
 
   function show_contact_forms($city_id) {
@@ -598,7 +613,14 @@
       }
     }
     else if ($parameters[0] == "search") {
-      search_contacts(urldecode($parameters[1]));
+      $available_search_options = array('notes', 'phone');
+      $search_options = explode('+', $parameters[1]);
+      if (count(array_intersect($available_search_options, $search_options)) == count($search_options)) {
+        $notes = in_array("notes", $search_options);
+        $phone = in_array("phone", $search_options);
+        search_contacts(urldecode($parameters[2]), $notes, $phone);
+      }
+      else search_contacts(urldecode($parameters[1]));
     }
   }
   list($name, $id, $args) = parse_parameters($parameters);