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']));
return;
}
- echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+ $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";
- echo "</form>\n";
+ submit("show_in_area", "Show");
}
function show_contact_cities_form($city_id = null) {
return;
}
- echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+ $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";
- echo "</form>\n";
+ submit("show_in_city", "Show");
}
function show_contact_search_form() {
- echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
echo "<p>Search for contacts:";
input("search_contact");
echo "<input type=\"submit\" value=\"Search\">\n";
- echo "</form>\n";
}
function show_contact_forms($city_id) {
+ form("noprint standout");
show_contact_areas_form($city_id);
show_contact_cities_form($city_id);
show_contact_search_form();
+ end_form();
}
function show_contact_role_form($role) {
global $contact_roles, $parcel_sizes, $parcel_contents;
if (! $contact) $contact = new Contact;
- else if ($contact->getRole() & $GLOBALS['ROLE_BENEFICIARY']) {
+ else if ($contact->getRole() & ($GLOBALS['ROLE_BENEFICIARY'] | $GLOBALS['ROLE_REQUESTER'])) {
$state_mask = $GLOBALS['STATE_ANY'];
$state_mask &= ~$GLOBALS['STATE_DELIVERED'];
$state_mask &= ~$GLOBALS['STATE_CANCELLED'];
echo "</tr>\n";
echo "<tr>\n";
- echo " <td colspan=2>\n";
+ echo " <td colspan=2 class=\"history\">\n";
foreach ($orders as $order) {
- echo " Order " . $order->getStrongLink($order->getId()) . ": " . get_order_displayname($order) . "<br>\n";
+ echo " " . get_order_summary($order) . "<br>\n";
}
echo " </td>\n";
echo "</tr>\n";
/* Postcode. */
echo "<tr>\n";
echo " <td>Postcode</td>\n";
- echo " <td>"; input("postcode", $address->getPostcode()); echo "</td>\n";
+ echo " <td>"; input("postcode", $address->getPostcode()); echo get_address_map_link($address); echo "</td>\n";
echo "</tr>\n";
/* Telephone. */
/* 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";
}
return;
}
- echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+ form("noprint");
echo "<p>Add a new contact:</p>\n";
echo "<table>\n";
echo " <td colspan=2>"; submit("add_contact", "Add"); echo "</td></tr>\n";
echo "</tr>\n";
echo "</table>\n";
- echo "</form>\n";
+ end_form();
}
function show_add_new_contact_form() {
return;
}
- echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+ form("noprint standout");
echo "<p>Add a new contact in <select name=\"city_id\">\n";
foreach ($cities as $city) {
option("city_id", $city->getId(), get_city_displayname($city));
echo "</select>";
submit("show_add_contact", "Proceed");
echo "</p>\n";
- echo "</form>\n";
+ end_form();
}
function update_contact(&$contact, $area_id, $new = false) {
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 $contact = get_contact_by_name($name);
if (! $contact) return;
- echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+ form();
show_contact_summary($contact, true);
echo ": ";
echo "\n</p>";
}
echo "</table>\n";
- echo "</form>\n";
+ end_form();
}
/* /contact/in/area/Cambridge/1 */
show_city_contacts(0, 10, $parameters[2], $city_id);
break;
}
-
- show_add_new_contact_form($city_id);
}
else if ($parameters[0] == "search") {
search_contacts(0, 10, $parameters[1]);
if (count($args)) {
switch ($args[0]) {
case "delete":
+ confirm_delete_contact($name, $id);
+ break;
+
+ case "confirmdelete":
delete_contact($name, $id);
break;
}
}
else if (isset($name)) show_contact($name, $id);
- else {
- /* XXX: Shown after adding. */
- show_contact_forms($city_id);
- show_add_new_contact_form($city_id);
- }
- if (count($parameters)) {
- show_contact_forms($city_id);
- }
+ show_contact_forms($city_id);
+ show_add_new_contact_form($city_id);
?>
git://git.iain.cx/iain / readifood.git / blobdiff