X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=de4dc8254821d753b8acc6ef28aaffb388de5752;hb=37d4290c9eae09546c22b257c589c7e66ad3a1f3;hp=8ba1fcdc8e2cdc5f932ff40dff55d8f87b4095be;hpb=e7862268051db4ebdc89d4514b62910da133d19c;p=readifood.git diff --git a/lib/contact.php b/lib/contact.php index 8ba1fcd..de4dc82 100644 --- a/lib/contact.php +++ b/lib/contact.php @@ -50,11 +50,13 @@ $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()); + $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']) { - printf(" Orders", urlencode($contact->getDisplayname()), $contact->getId()); - if (get_contact_area($contact)) printf(" Place", urlencode($contact->getDisplayname()), $contact->getId()); + 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(); @@ -127,15 +129,20 @@ return; } - echo "
\n"; } function show_contact_cities_form($city_id = null) { @@ -147,29 +154,34 @@ return; } - echo "\n"; } function show_contact_search_form() { - echo "\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) { @@ -180,6 +192,27 @@ global $contact_roles, $parcel_sizes, $parcel_contents; if (! $contact) $contact = new Contact; + 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']; + + $orders = get_contact_orders($contact, $state_mask); + + if (count($orders)) { + 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; @@ -472,7 +517,7 @@ else $contact = get_contact_by_name($name); if (! $contact) return; - echo "\n"; + end_form(); } /* /contact/in/area/Cambridge/1 */ @@ -514,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]); @@ -526,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); ?>