X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;ds=inline;f=lib%2Fcontact.php;h=f3764064943e1601fbd5e65634093c33933ae828;hb=refs%2Ftags%2Flive-2014-03-13;hp=25aab5883a817b4499cad0e846f4edf1bfef12e1;hpb=47051a8cfc285b2324230d620c7ddb41cd61c00c;p=readifood.git
diff --git a/lib/contact.php b/lib/contact.php
index 25aab58..f376406 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -85,6 +85,23 @@
}
else echo "none";
echo "
\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();
+
+ $q = new ContactQuery;
+ $contacts = $q->filterByAddressId($address_ids)->find();
+ echo "Contacts in address '" . htmlspecialchars($search) . "':";
+ if (count($contacts)) {
+ foreach ($contacts as $contact) show_contact_summary($contact);
+ }
+ else echo "none";
+ echo "
\n";
}
function show_city_contacts($offset, $per_page, $city_name, $city_id = null) {
@@ -263,7 +280,13 @@
/* Postcode. */
echo "\n";
echo " Postcode | \n";
- echo " "; input("postcode", $address->getPostcode()); echo get_address_map_link($address); echo " | \n";
+ $postcode = $address->getPostcode();
+ if (validate_postcode($postcode)) {
+ echo " "; input("postcode", $postcode); echo get_address_map_link($address); echo " | \n";
+ }
+ else {
+ echo " "; input("postcode", $address->getPostcode()); echo " (invalid) | \n";
+ }
echo "
\n";
/* Telephone. */
@@ -312,9 +335,9 @@
echo " ";
for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
if (1 << $i == $GLOBALS['PARCEL_TOILETRY']) continue;
- echo " getParcel() & (1 << $i)) echo " checked";
- echo ">$parcel_contents[$i]\n";
+ echo ">\n";
}
echo " | \n";
echo "\n";
@@ -405,7 +428,11 @@
/* Get address. */
$area_id = $_POST['area_id'];
$line = $_POST['address'];
- $postcode = $_POST['postcode'];
+ $postcode = trim($_POST['postcode']);
+ if ($postcode) {
+ $postcode = format_postcode($_POST['postcode'], true);
+ if (! $postcode) return false;
+ }
$q = new AddressQuery;
/* XXX: Finding by area properly? */
$address = $q->filterByAreaId($area_id)->filterByLine($line)->filterByPostcode($postcode)->findOneOrCreate();
@@ -476,6 +503,7 @@
$contact = new Contact;
if (! update_contact($contact, $area_id, true)) return false;
+ $name = $contact->getDisplayname();
return $contact->getId();
}
@@ -561,7 +589,7 @@
}
}
else if ($parameters[0] == "search") {
- search_contacts(0, 10, $parameters[1]);
+ search_contacts(0, 10, urldecode($parameters[1]));
}
}
list($name, $id, $args) = parse_parameters($parameters);