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']));
}
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();
+
+ $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);
+ }
+ else echo "none";
+ echo "</p>\n";
}
function show_city_contacts($offset, $per_page, $city_name, $city_id = null) {
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) {
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() {
/* Postcode. */
echo "<tr>\n";
echo " <td>Postcode</td>\n";
- echo " <td>"; input("postcode", $address->getPostcode()); echo "</td>\n";
+ $postcode = $address->getPostcode();
+ if (validate_postcode($postcode)) {
+ echo " <td>"; input("postcode", $postcode); echo get_address_map_link($address); echo "</td>\n";
+ }
+ else {
+ echo " <td>"; input("postcode", $address->getPostcode()); echo " (invalid)</td>\n";
+ }
echo "</tr>\n";
/* Telephone. */
echo " <td>";
for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) {
if (1 << $i == $GLOBALS['PARCEL_TOILETRY']) continue;
- echo " <input type=\"checkbox\" name=\"parcel_$i\"";
+ echo " <input type=\"checkbox\" id=\"parcel_$i\" name=\"parcel_$i\"";
if ($contact->getParcel() & (1 << $i)) echo " checked";
- echo ">$parcel_contents[$i]\n";
+ echo "><label for=\"parcel_$i\">$parcel_contents[$i]</label>\n";
}
echo "</td>\n";
echo "</tr>\n";
/* 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";
}
/* 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();
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;
}
}
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);
if (count($args)) {
switch ($args[0]) {
case "delete":
+ confirm_delete_contact($name, $id);
+ break;
+
+ case "confirmdelete":
delete_contact($name, $id);
break;
}