Allow searching in notes.

diff --git a/lib/contact.php b/lib/contact.php
index 00096d9..e9c7f4b 100644 (file)
--- 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%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, $_POST['search_by_phone'] ? "phone/" : "", 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,13 +87,14 @@
     else echo " none";
   }
 
-  function search_contacts($search, $phone = false) {
+  function search_contacts($search, $notes = false, $phone = false) {
     list($first_page, $per_page) = pagination();
     $q = new ContactQuery;
     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 " . ($phone ? "telephone " : "") . "'" . htmlspecialchars($search) . "':";
+    echo "<p>Contacts matching " . ($notes ? "notes " : "") . ($phone ? "telephone " : "") . "'" . htmlspecialchars($search) . "':";
     if (count($contacts)) {
       foreach ($contacts as $contact) show_contact_summary($contact);
       show_pagination($contacts);
@@ -205,6 +211,8 @@
     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";
   }
@@ -605,7 +613,13 @@
       }
     }
     else if ($parameters[0] == "search") {
-      if ($parameters[1] == "phone") search_contacts(urldecode($parameters[2]), true);
+      $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]));
     }
   }