X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=de4dc8254821d753b8acc6ef28aaffb388de5752;hb=37d4290c9eae09546c22b257c589c7e66ad3a1f3;hp=874c9180add5f4a289818b5ce09ac5bf3d682124;hpb=4d4c971953ee3da8282ff748c15241f85d984dab;p=readifood.git diff --git a/lib/contact.php b/lib/contact.php index 874c918..de4dc82 100644 --- a/lib/contact.php +++ b/lib/contact.php @@ -129,9 +129,16 @@ return; } + $candidates = array(); + foreach ($areas as $area) { + if (! count(get_area_contacts($area->getId()))) continue; + $candidates[] = $area; + } + if (! count($candidates)) return; + echo "
Show contacts in area\n"; echo "\n"; @@ -147,9 +154,16 @@ return; } + $candidates = array(); + foreach ($cities as $city) { + if (! count(get_city_contacts($city->getId()))) continue; + $candidates[] = $city; + } + if (! count($candidates)) return; + echo "
Show contacts in city\n"; echo "\n"; @@ -178,7 +192,7 @@ 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']; @@ -249,7 +263,7 @@ /* Postcode. */ 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; @@ -544,6 +569,10 @@ if (count($args)) { switch ($args[0]) { case "delete": + confirm_delete_contact($name, $id); + break; + + case "confirmdelete": delete_contact($name, $id); break; }