X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=25aab5883a817b4499cad0e846f4edf1bfef12e1;hb=47051a8cfc285b2324230d620c7ddb41cd61c00c;hp=2dd65ab101cb9bf36d8ffbbab856e08f1704cdd7;hpb=6bd4ad3daf2cc870d96a3fed9ea9caf6798d2b78;p=readifood.git diff --git a/lib/contact.php b/lib/contact.php index 2dd65ab..25aab58 100644 --- a/lib/contact.php +++ b/lib/contact.php @@ -31,13 +31,13 @@ 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'])); @@ -129,13 +129,20 @@ 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"; - echo "\n"; + submit("show_in_area", "Show"); } function show_contact_cities_form($city_id = null) { @@ -147,13 +154,20 @@ 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"; - echo "\n"; + submit("show_in_city", "Show"); } function show_contact_search_form() { @@ -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 "
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; }