X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fcontact.php;h=b33c97a1f66d2dcd240726510a6e04a4fb50af45;hb=b967de0fef7828e7cf314104ddd147394efb0060;hp=2dd65ab101cb9bf36d8ffbbab856e08f1704cdd7;hpb=6bd4ad3daf2cc870d96a3fed9ea9caf6798d2b78;p=readifood.git diff --git a/lib/contact.php b/lib/contact.php index 2dd65ab..b33c97a 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']; @@ -191,9 +205,9 @@ echo "\n"; echo "