X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=13456c8dd5155727a82a88f6b381791801c383ce;hb=HEAD;hp=ccc932c079328ccef7ecb7548efac4c3b4c52f38;hpb=508e918941009544a3992b8ac6815671b93880ca;p=readifood.git diff --git a/lib/contact.php b/lib/contact.php index ccc932c..13456c8 100644 --- a/lib/contact.php +++ b/lib/contact.php @@ -1,10 +1,12 @@ Added contact.

\n"; @@ -28,16 +30,23 @@ } } else if ($_POST['search_contact']) { - header(sprintf("Location: http%s://%s/%s/search/%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($_POST['search_contact']))); + $search_options = array(); + if ($_POST['search_by_notes']) array_push($search_options, 'notes'); + if ($_POST['search_by_phone']) array_push($search_options, 'phone'); + if (count($search_options)) $search_param = sprintf("%s/", implode('+', $search_options)); + else $search_param = ''; + header(sprintf("Location: http%s://%s/%s/search/%s%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, $search_param, urlencode($_POST['search_contact']))); exit; } - else if ($_POST['area_id']) { + else if ($_POST['show_in_area']) { + set_last_selected("area_id", $_POST['area_id']); $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']) { + set_last_selected("city_id", $_POST['city_id']); $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'])); @@ -50,9 +59,14 @@ $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(); } @@ -62,27 +76,54 @@ echo ", " . $city->getLink(get_city_displayname($city)); } - function show_contacts($offset, $per_page, $address_ids) { + function show_contacts($address_ids) { + list($first_page, $per_page) = pagination(); $q = new ContactQuery; - $contacts = $q->filterByAddressId($address_ids)->orderByForename()->orderBySurname()->find(); + $contacts = $q->filterByAddressId($address_ids)->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page); if (count($contacts)) { foreach ($contacts as $contact) show_contact_summary($contact); + show_pagination($contacts); } else echo " none"; } - function search_contacts($offset, $per_page, $search) { + function search_contacts($search, $notes = false, $phone = false) { + list($first_page, $per_page) = pagination(); $q = new ContactQuery; - $contacts = $q->filterByDisplayname("%$search%")->find(); - echo "

Contacts matching '" . htmlspecialchars($search) . "':"; + if ($phone) $q->filterByTelephone1("%$search%")->_or()->filterByTelephone2("%$search%"); + else $q->filterByDisplayname("%$search%"); + if ($notes) $q->_or()->filterByNotes("%$search%"); + $contacts = $q->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page); + echo "

Contacts matching " . ($notes ? "notes " : "") . ($phone ? "telephone " : "") . "'" . htmlspecialchars($search) . "':"; if (count($contacts)) { foreach ($contacts as $contact) show_contact_summary($contact); + show_pagination($contacts); } else echo "none"; echo "

\n"; + + $address_ids = array(); + if (! $phone) { + $q = new AddressQuery; + $addresses = $q->filterByLine("%$search%")->find(); + foreach ($addresses as $address) $address_ids[] = $address->getId(); + $q = new AddressQuery; + $addresses = $q->filterByPostcode("%$search%")->find(); + foreach ($addresses as $address) $address_ids[] = $address->getId(); + + $q = new ContactQuery; + $contacts = $q->filterByAddressId($address_ids)->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page); + echo "

Contacts in address '" . htmlspecialchars($search) . "':"; + if (count($contacts)) { + foreach ($contacts as $contact) show_contact_summary($contact); + show_pagination($contacts); + } + else echo "none"; + } + echo "

\n"; } - function show_city_contacts($offset, $per_page, $city_name, $city_id = null) { + function show_city_contacts($city_name, $city_id = null) { if (isset($city_id)) $city = get_city_by_id($city_id); else if ($city_name) $city = get_city_by_name($city_name); if ($city) { @@ -97,12 +138,12 @@ foreach ($addresses as $address) $address_ids[] = $address->getId(); echo "

Contacts in city " . $city->getLink(get_city_displayname($city)) . ":"; - return show_contacts($offset, $per_page, $address_ids); + return show_contacts($address_ids); } else echo "

No such city!

\n"; } - function show_area_contacts($offset, $per_page, $area_name, $area_id = null) { + function show_area_contacts($area_name, $area_id = null) { if (isset($area_id)) $area = get_area_by_id($area_id); else if ($area_name) $area = get_area_by_name($area_name); if ($area) { @@ -112,7 +153,7 @@ foreach ($addresses as $address) $address_ids[] = $address->getId(); echo "

Contacts in area " . $area->getLink() . ":"; - return show_contacts($offset, $per_page, $address_ids); + return show_contacts($address_ids); } else echo "

No such area!

\n"; } @@ -124,15 +165,20 @@ return; } - echo "
\n"; + $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"; - echo "

\n"; + submit("show_in_area", "Show"); } function show_contact_cities_form($city_id = null) { @@ -144,39 +190,70 @@ return; } - echo "
\n"; + $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"; - echo "

\n"; + submit("show_in_city", "Show"); } function show_contact_search_form() { - echo "
\n"; echo "

Search for contacts:"; input("search_contact"); + echo ""; + echo "\n"; + echo ""; + echo "\n"; echo "\n"; - echo "

\n"; + 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) { return show_role_form($role, $GLOBALS['contact_roles']); } - function show_contact_form($contact = null) { - global $contact_roles; + function show_contact_form($contact = null, $new = false) { + global $contact_roles, $parcel_sizes, $parcel_contents, $offers; 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 "\n"; + echo " Outstanding orders:\n"; + echo "\n"; + + echo "\n"; + echo " \n"; + foreach ($orders as $order) { + echo " " . get_order_summary($order) . "
\n"; + } + echo " \n"; + echo "\n"; + } + } /* Role. */ echo "\n"; @@ -184,6 +261,14 @@ echo " "; show_contact_role_form($contact->getRole()); echo "\n"; echo "\n"; + /* Date added. */ + if (! $new) { + echo "\n"; + echo " Registered\n"; + echo " " . $contact->getAdded() . "\n"; + echo "\n"; + } + /* Forename. */ echo "\n"; echo " Forename\n"; @@ -219,7 +304,13 @@ /* Postcode. */ echo "\n"; echo " Postcode\n"; - echo " "; input("postcode", $address->getPostcode()); echo "\n"; + $postcode = $address->getPostcode(); + if (validate_postcode($postcode)) { + echo " "; input("postcode", $postcode); echo get_address_map_link($address); echo "\n"; + } + else { + echo " "; input("postcode", $address->getPostcode()); echo " (invalid)\n"; + } echo "\n"; /* Telephone. */ @@ -250,6 +341,67 @@ } echo " \n"; echo "\n"; + + /* Parcel type. */ + echo "\n"; + echo " Family unit\n"; + echo " \n"; + echo "\n"; + + /* Parcel contents. */ + echo "\n"; + echo " Dietary requirements\n"; + echo " "; + for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) { + if (1 << $i == $GLOBALS['PARCEL_TOILETRY']) continue; + echo " getParcel() & (1 << $i)) echo " checked"; + echo ">\n"; + } + echo "\n"; + echo "\n"; + + /* Notes. */ + echo "\n"; + echo " Notes\n"; + echo " "; textarea("notes", $contact->getNotes()); echo "\n"; + echo "\n"; + + /* Offers. */ + $available_offers = get_available_offers($contact); + if (count($available_offers)) { + echo "\n"; + echo " Offers\n"; + echo "\n"; + + $offer_states = Array(); + foreach ($available_offers as $offer) { + $offer_id = $offer->getId(); + $state = get_offer_state($contact, $offer); + $state_id = is_null($state) ? $GLOBALS['OFFER_ELIGIBLE'] : $state->getState(); + $offer_states[$offer_id] = $state_id; + echo "\n"; + echo " " . $offer->getDescription() . "\n"; + echo " \n"; + echo "\n"; + } + hidden("offer_states", urlencode(json_encode($offer_states))); + } + else { + echo "\n"; + echo " No available offers\n"; + echo "\n"; + hidden("offer_states", "{}"); + } } function show_new_contact_form($city_id = null) { @@ -261,17 +413,17 @@ return; } - echo "
\n"; + form("noprint"); echo "

Add a new contact:

\n"; echo "\n"; - show_contact_form($contact); + show_contact_form($contact, true); echo "\n"; echo " \n"; echo "\n"; echo "
"; submit("add_contact", "Add"); echo "
\n"; - echo "
\n"; + end_form(); } function show_add_new_contact_form() { @@ -284,7 +436,7 @@ return; } - echo "
\n"; + form("noprint standout"); echo "

Add a new contact in "; submit("show_add_contact", "Proceed"); echo "

\n"; - echo "
\n"; + end_form(); } function update_contact(&$contact, $area_id, $new = false) { - global $contact_roles; + global $contact_roles, $parcel_sizes, $parcel_contents; $role = 0; for ($i = 0; $i < count($contact_roles); $i++) { @@ -329,8 +481,13 @@ } /* Get address. */ + $area_id = $_POST['area_id']; $line = $_POST['address']; - $postcode = $_POST['postcode']; + $postcode = trim($_POST['postcode']); + if ($postcode) { + $postcode = format_postcode($_POST['postcode'], true); + if (! $postcode) return false; + } $q = new AddressQuery; /* XXX: Finding by area properly? */ $address = $q->filterByAreaId($area_id)->filterByLine($line)->filterByPostcode($postcode)->findOneOrCreate(); @@ -354,6 +511,11 @@ $telephone1 = $_POST['telephone1']; $telephone2 = $_POST['telephone2']; $email = $_POST['email']; + $parcel = $_POST['parcel_size']; + for ($i = count($parcel_sizes); $i < count($parcel_contents); $i++) { + if ($_POST['parcel_' . $i] == "on") $parcel |= (1 << $i); + } + $notes = $_POST['notes']; $contact->setRole($role); $contact->setForename($forename); @@ -363,6 +525,8 @@ $contact->setTelephone1($telephone1); $contact->setTelephone2($telephone2); $contact->setEmail($email); + $contact->setParcel($parcel); + $contact->setNotes($notes); $contact->setAddressId($address->getId()); try { @@ -374,6 +538,39 @@ return false; } + if ($_POST['offer_states']) { + try { + $offer_states = json_decode(urldecode($_POST['offer_states'])); + } + catch (Exception $e) { + echo "

Error getting offer states JSON.

\n"; + return false; + } + + $now = time(); + foreach ($offer_states as $offer_id => $state_id) { + $new_state_id = strval($_POST["offer$offer_id"]); + if ($new_state_id == "") continue; + if ($new_state_id == strval($state_id)) continue; + + $offer_state = new OfferState; + $offer_state->setUpdated($now); + $offer_state->setOfferId($offer_id); + $offer_state->setUserId($GLOBALS['user_id']); + $offer_state->setContactId($contact->getId()); + $offer_state->setState($new_state_id); + + try { + $offer_state->save(); + } + catch (Exception $e) { + echo "

Error updating offer.

\n"; + echo "

" . $e->getMessage() . "

\n"; + return false; + } + } + } + return true; } @@ -394,9 +591,21 @@ $contact = new Contact; if (! update_contact($contact, $area_id, true)) return false; + $name = $contact->getDisplayname(); return $contact->getId(); } + function confirm_delete_contact($name, $id = null, &$city_id = null) { + if (! check_admin(1, "delete a contact")) return; + + if (isset($id)) $contact = get_contact_by_id($id); + else $contact = get_contact_by_name($name); + if (! $contact) return false; + + echo "

Confirm deletion

\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; @@ -424,7 +633,7 @@ else $contact = get_contact_by_name($name); if (! $contact) return; - echo "
\n"; + form(); show_contact_summary($contact, true); echo ": "; echo "\n

"; @@ -441,7 +650,7 @@ } echo "\n"; - echo "
\n"; + end_form(); } /* /contact/in/area/Cambridge/1 */ @@ -455,7 +664,7 @@ $area = $q->findOneById($area_id); $city = get_area_city($area); if ($city) $city_id = $city->getId(); - show_area_contacts(0, 10, $parameters[2], $area_id); + show_area_contacts($parameters[2], $area_id); break; case "city": @@ -463,14 +672,19 @@ $_POST['city_id'] = $city_id; $q = new CityQuery; $city = $q->findOneById($city_id); - show_city_contacts(0, 10, $parameters[2], $city_id); + show_city_contacts($parameters[2], $city_id); break; } - - show_add_new_contact_form($city_id); } else if ($parameters[0] == "search") { - search_contacts(0, 10, $parameters[1]); + $available_search_options = array('notes', 'phone'); + $search_options = explode('+', $parameters[1]); + if (count(array_intersect($available_search_options, $search_options)) == count($search_options)) { + $notes = in_array("notes", $search_options); + $phone = in_array("phone", $search_options); + search_contacts(urldecode($parameters[2]), $notes, $phone); + } + else search_contacts(urldecode($parameters[1])); } } list($name, $id, $args) = parse_parameters($parameters); @@ -478,19 +692,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); ?>