<?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", $_POST['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']));
echo ", " . $city->getLink(get_city_displayname($city));
}
- function show_contacts($offset, $per_page, $address_ids) {
+ function show_contacts($address_ids) {
+ list($first_page, $per_page) = pagination();
$q = new ContactQuery;
- $contacts = $q->filterByAddressId($address_ids)->orderByForename()->orderBySurname()->find();
+ $contacts = $q->filterByAddressId($address_ids)->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page);
if (count($contacts)) {
foreach ($contacts as $contact) show_contact_summary($contact);
+ show_pagination($contacts);
}
else echo " none";
}
- function search_contacts($offset, $per_page, $search) {
+ function search_contacts($search) {
+ list($first_page, $per_page) = pagination();
$q = new ContactQuery;
- $contacts = $q->filterByDisplayname("%$search%")->find();
+ $contacts = $q->filterByDisplayname("%$search%")->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page);
echo "<p>Contacts matching '" . htmlspecialchars($search) . "':";
if (count($contacts)) {
foreach ($contacts as $contact) show_contact_summary($contact);
+ show_pagination($contacts);
}
else echo "none";
echo "</p>\n";
foreach ($addresses as $address) $address_ids[] = $address->getId();
$q = new ContactQuery;
- $contacts = $q->filterByAddressId($address_ids)->find();
+ $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";
echo "</p>\n";
}
- function show_city_contacts($offset, $per_page, $city_name, $city_id = null) {
+ function show_city_contacts($city_name, $city_id = null) {
if (isset($city_id)) $city = get_city_by_id($city_id);
else if ($city_name) $city = get_city_by_name($city_name);
if ($city) {
foreach ($addresses as $address) $address_ids[] = $address->getId();
echo "<p>Contacts in city " . $city->getLink(get_city_displayname($city)) . ":";
- return show_contacts($offset, $per_page, $address_ids);
+ return show_contacts($address_ids);
}
else echo "<p>No such city!</p>\n";
}
- function show_area_contacts($offset, $per_page, $area_name, $area_id = null) {
+ function show_area_contacts($area_name, $area_id = null) {
if (isset($area_id)) $area = get_area_by_id($area_id);
else if ($area_name) $area = get_area_by_name($area_name);
if ($area) {
foreach ($addresses as $address) $address_ids[] = $address->getId();
echo "<p>Contacts in area " . $area->getLink() . ":";
- return show_contacts($offset, $per_page, $address_ids);
+ return show_contacts($address_ids);
}
else echo "<p>No such area!</p>\n";
}
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";
$contact = new Contact;
if (! update_contact($contact, $area_id, true)) return false;
+ $name = $contact->getDisplayname();
return $contact->getId();
}
$area = $q->findOneById($area_id);
$city = get_area_city($area);
if ($city) $city_id = $city->getId();
- show_area_contacts(0, 10, $parameters[2], $area_id);
+ show_area_contacts($parameters[2], $area_id);
break;
case "city":
$_POST['city_id'] = $city_id;
$q = new CityQuery;
$city = $q->findOneById($city_id);
- show_city_contacts(0, 10, $parameters[2], $city_id);
+ show_city_contacts($parameters[2], $city_id);
break;
}
}
else if ($parameters[0] == "search") {
- search_contacts(0, 10, urldecode($parameters[1]));
+ search_contacts(urldecode($parameters[1]));
}
}
list($name, $id, $args) = parse_parameters($parameters);