X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=25aab5883a817b4499cad0e846f4edf1bfef12e1;hb=47051a8cfc285b2324230d620c7ddb41cd61c00c;hp=166fd9784b98ca8a5d84f5c443dcea8fc17b8afc;hpb=8549c1776033e924ea50328bd2434529d85b5669;p=readifood.git
diff --git a/lib/contact.php b/lib/contact.php
index 166fd97..25aab58 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -31,32 +31,40 @@
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']));
exit;
}
- function show_contact_summary(&$contact) {
- echo "
\nContact " . $contact->getLink();
+ function show_contact_summary(&$contact, $editing = false) {
+ if ($editing) echo "
Contact: " . htmlspecialchars($contact->getDisplayname()) . "";
+ else echo "
\nContact " . $contact->getStrongLink();
$role = $contact->getRole();
$role_string = get_contact_role_string($contact);
if ($role_string) echo " $role_string";
- if ($role & $GLOBALS['ROLE_DONOR']) printf(" Donations", urlencode($contact->getDisplayname()), $contact->getId());
- if ($role & $GLOBALS['ROLE_REQUESTER']) printf(" Referred", urlencode($contact->getDisplayname()), $contact->getId());
- if ($role & $GLOBALS['ROLE_BENEFICIARY']) printf(" Orders", urlencode($contact->getDisplayname()), $contact->getId());
+ $d = urlencode($contact->getDisplayname());
+ $i = $contact->getId();
+ if ($role & $GLOBALS['ROLE_DONOR']) echo " " . get_small_link("Donations", "/donation/from/contact/%s/%d", $d, $i);
+ if ($role & $GLOBALS['ROLE_REQUESTER']) echo " " . get_small_link("Referred", "/order/from/referrer/%s/%d", $d, $i);
+ if ($role & $GLOBALS['ROLE_BENEFICIARY']) {
+ echo " " . get_small_link("Orders", "/order/to/beneficiary/%s/%d", $d, $contact->getId());
+ if (get_contact_area($contact)) echo " " . get_small_link("Place", "/order/place/for/beneficiary/%s/%d", $d, $i);
+ }
if (check_admin(1)) {
echo " " . $contact->getDeleteLink();
}
$area = get_contact_area($contact);
echo " in " . $area->getLink();
+ $city = get_contact_city($contact);
+ echo ", " . $city->getLink(get_city_displayname($city));
}
function show_contacts($offset, $per_page, $address_ids) {
@@ -121,15 +129,20 @@
return;
}
- echo "
You must confirm deletion of contact " . $contact->getDisplayname() . ": " . $contact->getDeleteLink(true) . "
\n"; + } + function delete_contact($name, $id = null, &$city_id = null) { if (! check_admin(1, "delete a contact")) return; @@ -421,19 +517,8 @@ else $contact = get_contact_by_name($name); if (! $contact) return; - echo "\n"; + end_form(); } /* /contact/in/area/Cambridge/1 */ @@ -474,8 +559,6 @@ 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]); @@ -486,19 +569,17 @@ 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); ?>