X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fhub.php;h=e5a551aab9685d4c0a4bff7f4e150dbdf402f208;hb=ea0e53db8b5a264b6e231038815d2c350076d02a;hp=48b45ae992ff64808ef3b55691abfcd275869a61;hpb=6fdbfe32798452ec1c0fdbda57edabb892518409;p=readifood.git

diff --git a/lib/hub.php b/lib/hub.php
index 48b45ae..e5a551a 100644
--- a/lib/hub.php
+++ b/lib/hub.php
@@ -1,10 +1,12 @@
 <?php
 
   if (isset($_POST['show_add_hub'])) {
+    set_last_selected("city_id", $_POST['city_id']);
     $city_id = $_POST['city_id'];
     show_new_hub_form($city_id);
   }
   else if (isset($_POST['add_hub'])) {
+    set_last_selected("area_id", $_POST['area_id']);
     $id = add_hub($displayname);
     if ($id !== false) {
       echo "<p>Added hub.</p>\n";
@@ -27,36 +29,55 @@
       echo "<p>No such hub!</p>\n";
     }
   }
-  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']));
     exit;
   }
 
-  function show_hubs($offset, $per_page, $address_ids) {
+  function show_hub_summary(&$hub, $editing = false) {
+    if ($editing) echo "<p>Hub: <span class=\"strong\">" . htmlspecialchars($hub->getName()) . "</span>";
+    else echo "<br>\nHub " . $hub->getStrongLink();
+    $role = $hub->getRole();
+    $role_string = get_hub_role_string($hub);
+    if ($role_string) echo " $role_string";
+    $d = urlencode($hub->getName());
+    $i = $hub->getId();
+    if ($role & $GLOBALS['ROLE_COLLECTION']) {
+      printf(" <a class=\"small\" href=\"/donation/to/hub/%s/%d\">Donations</a>", $d, $i);
+      echo " " . get_small_link("Record", "/donation/record/to/hub/%s/%d", $d, $i);
+    }
+    if ($role & $GLOBALS['ROLE_DISTRIBUTION']) printf(" <a class=\"small\" href=\"/order/to/hub/%s/%d\">Orders</a>", $d, $i);
+    if (check_admin(1)) {
+      echo " " . $hub->getDeleteLink();
+    }
+    $area = get_hub_area($hub);
+    if ($area) echo " in " . $area->getLink();
+    $city = get_hub_city($hub);
+    if ($city) echo ", " . $city->getLink(get_city_displayname($city));
+  }
+
+  function show_hubs($address_ids) {
+    list($first_page, $per_page) = pagination();
     $q = new HubQuery;
-    $hubs = $q->filterByAddressId($address_ids)->find();
+    $hubs = $q->filterByAddressId($address_ids)->orderByDisplayname()->orderById()->paginate($first_page, $per_page);
     if (count($hubs)) {
-      foreach ($hubs as $hub) {
-        echo "<br>\nhub " . $hub->getLink();
-        if (check_admin(1)) {
-          echo " " . $hub->getDeleteLink();
-        }
-        $area = get_hub_area($hub);
-        echo " in " . $area->getLink();
-      }
+      foreach ($hubs as $hub) show_hub_summary($hub);
+      show_pagination($hubs);
     }
     else echo " none";
   }
 
-  function show_city_hubs($offset, $per_page, $city_name, $city_id = null) {
+  function show_city_hubs($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) {
@@ -70,13 +91,13 @@
       $address_ids = array();
       foreach ($addresses as $address) $address_ids[] = $address->getId();
 
-      echo "<p>hubs in city " . $city->getLink(get_city_displayname($city)) . ":";
-      return show_hubs($offset, $per_page, $address_ids);
+      echo "<p>Hubs in city " . $city->getLink(get_city_displayname($city)) . ":";
+      return show_hubs($address_ids);
     }
     else echo "<p>No such city!</p>\n";
   }
 
-  function show_area_hubs($offset, $per_page, $area_name, $area_id = null) {
+  function show_area_hubs($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) {
@@ -86,7 +107,7 @@
       foreach ($addresses as $address) $address_ids[] = $address->getId();
 
       echo "<p>Hubs in area " . $area->getLink() . ":";
-      return show_hubs($offset, $per_page, $address_ids);
+      return show_hubs($address_ids);
     }
     else echo "<p>No such area!</p>\n";
   }
@@ -98,15 +119,20 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    $candidates = array();
+    foreach ($areas as $area) {
+      if (! count(get_area_hubs($area->getId()))) continue;
+      $candidates[] = $area;
+    }
+    if (! count($candidates)) return;
+
     echo "<p>Show hubs in area\n";
     echo "<select name=\"area_id\">\n";
-    foreach ($areas as $area) {
+    foreach ($candidates as $area) {
       option("area_id", $area->getId(), get_area_displayname($area));
     }
     echo "</select>\n";
-    echo "<input type=\"submit\" value=\"Show\">\n";
-    echo "</form>\n";
+    submit("show_in_area", "Show");
   }
 
   function show_hub_cities_form($city_id = null) {
@@ -118,25 +144,42 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    $candidates = array();
+    foreach ($cities as $city) {
+      if (! count(get_city_hubs($city->getId()))) continue;
+      $candidates[] = $city;
+    }
+    if (! count($candidates)) return;
+
     echo "<p>Show hubs in city\n";
     echo "<select name=\"city_id\">\n";
-    foreach ($cities as $city) {
+    foreach ($candidates as $city) {
       option("city_id", $city->getId(), get_city_displayname($city), $city_id);
     }
     echo "</select>\n";
-    echo "<input type=\"submit\" value=\"Show\">\n";
-    echo "</form>\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) {
+    return show_role_form($role, $GLOBALS['hub_roles']);
   }
 
   function show_hub_form($hub = null, $area_id = null) {
     if (! $hub) $hub = new Hub;
 
+    /* Role. */
+    echo "<tr>\n";
+    echo "  <td>Role</td>\n";
+    echo "  <td>"; show_hub_role_form($hub->getRole()); echo "</td>\n";
+    echo "</tr>\n";
+
     /* Display name. */
     echo "<tr>\n";
     echo "  <td>Hub name</td>\n";
@@ -154,7 +197,13 @@
     /* Postcode. */
     echo "<tr>\n";
     echo "  <td>Postcode</td>\n";
-    echo "  <td>"; input("postcode", $address->getPostcode()); echo "</td>\n";
+    $postcode = $address->getPostcode();
+    if (validate_postcode($postcode)) {
+      echo "  <td>"; input("postcode", $postcode); echo get_address_map_link($address); echo "</td>\n";
+    }
+    else {
+      echo "  <td>"; input("postcode", $address->getPostcode()); echo " (invalid)</td>\n";
+    }
     echo "</tr>\n";
 
     /* Telephone. */
@@ -195,7 +244,7 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form("noprint");
     echo "<p>Add a new hub:</p>\n";
 
     echo "<table>\n";
@@ -205,7 +254,7 @@
     echo "  <td colspan=2>"; submit("add_hub", "Add"); echo "</td></tr>\n";
     echo "</tr>\n";
     echo "</table>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function show_add_new_hub_form() {
@@ -218,7 +267,7 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form("noprint standout");
     echo "<p>Add a new hub in <select name=\"city_id\">\n";
     foreach ($cities as $city) {
       option("city_id", $city->getId(), get_city_displayname($city));
@@ -226,10 +275,17 @@
     echo "</select>";
     submit("show_add_hub", "Proceed");
     echo "</p>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function update_hub(&$hub, $area_id, $new = false) {
+    global $hub_roles;
+
+    $role = 0;
+    for ($i = 0; $i < count($hub_roles); $i++) {
+      if ($_POST['role_' . $i] == "on") $role |= (1 << $i);
+    }
+
     $displayname = $_POST['displayname'];
 
     if (! $displayname) {
@@ -239,7 +295,11 @@
 
     /* Get address. */
     $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();
@@ -264,6 +324,7 @@
     $telephone2 = $_POST['telephone2'];
     $email = $_POST['email'];
 
+    $hub->setRole($role);
     $hub->setDisplayname($displayname);
     $hub->setTelephone1($telephone1);
     $hub->setTelephone2($telephone2);
@@ -302,6 +363,17 @@
     return $hub->getId();
   }
 
+  function confirm_delete_hub($name, $id = null) {
+    if (! check_admin(1, "delete a hub")) return;
+
+    if (isset($id)) $hub = get_hub_by_id($id);
+    else $hub = get_hub_by_name($name);
+    if (! $hub) return false;
+
+    echo "<h3>Confirm deletion</h3>\n";
+    echo "<p>You must confirm deletion of hub " . $hub->getDisplayname() . ": " . $hub->getDeleteLink(true) . "</p>\n";
+  }
+
   function delete_hub($name, $id = null, &$city_id = null) {
     if (! check_admin(1, "delete a hub")) return;
 
@@ -329,13 +401,8 @@
     else $hub = get_hub_by_name($name);
     if (! $hub) return;
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
-    echo "<p>Hub: <span class=\"strong\">" . $hub->getDisplayname() . "</span>";
-    if (check_admin(1)) {
-      echo " " . $hub->getDeleteLink();
-    }
-    $city = get_hub_city($hub);
-    if ($city) echo " in " . $city->getLink(get_city_displayname($city));
+    form();
+    show_hub_summary($hub, true);
     echo ": ";
     echo "\n</p>";
 
@@ -351,7 +418,7 @@
     }
 
     echo "</table>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   /* /hub/in/area/Cambridge/1 */
@@ -365,7 +432,7 @@
           $area = $q->findOneById($area_id);
           $city = get_area_city($area);
           if ($city) $city_id = $city->getId();
-          show_area_hubs(0, 10, $parameters[2], $area_id);
+          show_area_hubs($parameters[2], $area_id);
         break;
 
         case "city":
@@ -373,11 +440,9 @@
           $_POST['city_id'] = $city_id;
           $q = new CityQuery;
           $city = $q->findOneById($city_id);
-          show_city_hubs(0, 10, $parameters[2], $city_id);
+          show_city_hubs($parameters[2], $city_id);
         break;
       }
-
-      show_new_hub_form($city_id);
     }
   }
   list($name, $id, $args) = parse_parameters($parameters);
@@ -385,19 +450,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);
 
 ?>