When separate dropdowns for city and area are shown in one form we must
ensure that the correct search criterion is applied. Previously we
checked for an area or city ID parameter but both of those will be
present in the form submission. Instead we check for the name of the
submit button.
header(sprintf("Location: http%s://%s/%s/search/%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($_POST['search_contact'])));
exit;
}
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;
}
$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']));
$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']));
option("area_id", $area->getId(), get_area_displayname($area));
}
echo "</select>\n";
option("area_id", $area->getId(), get_area_displayname($area));
}
echo "</select>\n";
- echo "<input type=\"submit\" value=\"Show\">\n";
+ submit("show_in_area", "Show");
}
function show_contact_cities_form($city_id = null) {
}
function show_contact_cities_form($city_id = null) {
option("city_id", $city->getId(), get_city_displayname($city), $city_id);
}
echo "</select>\n";
option("city_id", $city->getId(), get_city_displayname($city), $city_id);
}
echo "</select>\n";
- echo "<input type=\"submit\" value=\"Show\">\n";
+ submit("show_in_city", "Show");
}
function show_contact_search_form() {
}
function show_contact_search_form() {
echo "<p>No such contact!</p>\n";
}
}
echo "<p>No such contact!</p>\n";
}
}
- else if ($_POST['area_id']) {
+ else if ($_POST['show_in_area']) {
$q = new AreaQuery;
$area = $q->findOneById($_POST['area_id']);
/* XXX: Function to build URL because we need to set a class in links. */
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;
}
$q = new AreaQuery;
$area = $q->findOneById($_POST['area_id']);
/* XXX: Function to build URL because we need to set a class in links. */
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']));
$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']));
option("area_id", $area->getId(), get_area_displayname($area));
}
echo "</select>\n";
option("area_id", $area->getId(), get_area_displayname($area));
}
echo "</select>\n";
- echo "<input type=\"submit\" value=\"Show\">\n";
+ submit("show_in_area", "Show");
}
function show_donation_cities_form($city_id = null) {
}
function show_donation_cities_form($city_id = null) {
option("city_id", $city->getId(), get_city_displayname($city), $city_id);
}
echo "</select>\n";
option("city_id", $city->getId(), get_city_displayname($city), $city_id);
}
echo "</select>\n";
- echo "<input type=\"submit\" value=\"Show\">\n";
+ submit("show_in_city", "Show");
}
function show_donation_forms($city_id) {
}
function show_donation_forms($city_id) {
echo "<p>No such hub!</p>\n";
}
}
echo "<p>No such hub!</p>\n";
}
}
- 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;
}
$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']));
$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']));
option("area_id", $area->getId(), get_area_displayname($area));
}
echo "</select>\n";
option("area_id", $area->getId(), get_area_displayname($area));
}
echo "</select>\n";
- echo "<input type=\"submit\" value=\"Show\">\n";
+ submit("show_in_area", "Show");
}
function show_hub_cities_form($city_id = null) {
}
function show_hub_cities_form($city_id = null) {
option("city_id", $city->getId(), get_city_displayname($city), $city_id);
}
echo "</select>\n";
option("city_id", $city->getId(), get_city_displayname($city), $city_id);
}
echo "</select>\n";
- echo "<input type=\"submit\" value=\"Show\">\n";
+ submit("show_in_city", "Show");
}
function show_hub_forms($city_id) {
}
function show_hub_forms($city_id) {