X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;ds=inline;f=lib%2Fhub.php;h=3d8e8d58661e91df352b1230710b6b66f77d154d;hb=refs%2Ftags%2Fuat-2013-11-07;hp=a3a1121e810f637ebb1a113cb9cea0972f999149;hpb=8549c1776033e924ea50328bd2434529d85b5669;p=readifood.git diff --git a/lib/hub.php b/lib/hub.php index a3a1121..3d8e8d5 100644 --- a/lib/hub.php +++ b/lib/hub.php @@ -27,13 +27,13 @@ echo "
No such hub!
\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; } - 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'])); @@ -108,15 +108,20 @@ return; } - echo "\n"; + submit("show_in_area", "Show"); } function show_hub_cities_form($city_id = null) { @@ -128,20 +133,27 @@ return; } - echo "\n"; + submit("show_in_city", "Show"); } function show_hub_forms($city_id) { + form("noprint standout"); show_hub_areas_form($city_id); show_hub_cities_form($city_id); + end_form(); } function show_hub_role_form($role) { @@ -174,7 +186,13 @@ /* Postcode. */ echo "You must confirm deletion of hub " . $hub->getDisplayname() . ": " . $hub->getDeleteLink(true) . "
\n"; + } + function delete_hub($name, $id = null, &$city_id = null) { if (! check_admin(1, "delete a hub")) return; @@ -357,7 +390,7 @@ else $hub = get_hub_by_name($name); if (! $hub) return; - echo "\n"; + end_form(); } /* /hub/in/area/Cambridge/1 */ @@ -399,8 +432,6 @@ show_city_hubs(0, 10, $parameters[2], $city_id); break; } - - show_new_hub_form($city_id); } } list($name, $id, $args) = parse_parameters($parameters); @@ -408,19 +439,17 @@ if (count($args)) { switch ($args[0]) { case "delete": + confirm_delete_hub($name, $id); + break; + + case "confirmdelete": delete_hub($name, $id); break; } } else if (isset($name)) show_hub($name, $id); - else { - /* XXX: Shown after adding. */ - show_hub_forms($city_id); - show_add_new_hub_form($city_id); - } - if (count($parameters)) { - show_hub_forms($city_id); - } + show_hub_forms($city_id); + show_add_new_hub_form($city_id); ?>