<?php
if (isset($_POST['show_add_contact'])) {
+ set_last_selected("city_id", $_POST['city_id']);
$city_id = $_POST['city_id'];
show_new_contact_form($city_id);
}
else if (isset($_POST['add_contact'])) {
+ set_last_selected("area_id", $area_id);
$id = add_contact($displayname);
if ($id !== false) {
echo "<p>Added contact.</p>\n";
exit;
}
else if ($_POST['show_in_area']) {
+ set_last_selected("area_id", $_POST['area_id']);
$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['show_in_city']) {
+ set_last_selected("city_id", $_POST['city_id']);
$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']));
/* Postcode. */
echo "<tr>\n";
echo " <td>Postcode</td>\n";
- echo " <td>"; input("postcode", $address->getPostcode()); echo get_address_map_link($address); 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";
/* 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();
$contact = new Contact;
if (! update_contact($contact, $area_id, true)) return false;
+ $name = $contact->getDisplayname();
return $contact->getId();
}