X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Farea.php;h=b2ac8c843b5e3a03d7c27dccec06800f81b46ad1;hb=4cd13bda037940724f018b8bfc62413156c52b75;hp=5785ed2947c0e2a7b006c1784af801a5eb94078c;hpb=6fdbfe32798452ec1c0fdbda57edabb892518409;p=readifood.git

diff --git a/lib/area.php b/lib/area.php
index 5785ed2..b2ac8c8 100644
--- a/lib/area.php
+++ b/lib/area.php
@@ -9,7 +9,7 @@
   }
   else if ($_POST['city_id']) {
     /* XXX: city_id is actually a string $city_name/$city_id */
-    header(sprintf("Location: http%s://%s/%s/in/%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, $_POST['city_id']));
+    header(sprintf("Location: http%s://%s/%s/in/city/%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, $_POST['city_id']));
     exit;
   }
   else if ($_POST['update_area']) {
@@ -27,10 +27,12 @@
 
         if (count($areas)) {
           foreach ($areas as $area) {
-            echo "<br>\nArea: " . $area->getStrongLink();
-            printf(" <a class=\"small\" href=\"/contact/in/area/%s/%d\">Contacts</a>", urlencode($area->getName()), $area->getId());
-            printf(" <a class=\"small\" href=\"/donation/in/area/%s/%d\">Donations</a>", urlencode($area->getName()), $area->getId());
-            printf(" <a class=\"small\" href=\"/order/in/area/%s/%d\">Orders</a>", urlencode($area->getName()), $area->getId());
+            echo "<br>\nArea: " . $area->getStrongLink() . "\n";
+            $n = urlencode($area->getName());
+            $i = $area->getId();
+            echo " " . get_small_link("Contacts", "/contact/in/area/%s/%d", $n, $i);
+            echo " " . get_small_link("Donations", "/donation/in/area/%s/%d", $n, $i);
+            echo " " . get_small_link("Orders", "/order/in/area/%s/%d", $n, $i);
             if (check_admin(1)) {
               echo " " . $area->getDeleteLink();
             }
@@ -211,9 +213,11 @@
 
     echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
     echo "<p>Area: <span class=\"strong\">" . $area->getName() . "</span>";
-    printf(" <a class=\"small\" href=\"/contact/in/area/%s/%d\">Contacts</a>", urlencode($area->getName()), $area->getId());
-    printf(" <a class=\"small\" href=\"/donation/in/area/%s/%d\">Donations</a>", urlencode($area->getName()), $area->getId());
-    printf(" <a class=\"small\" href=\"/order/in/area/%s/%d\">Orders</a>", urlencode($area->getName()), $area->getId());
+    $n = $area->getName();
+    $i = $area->getId();
+    echo " " . get_small_link("Contacts", "/contact/in/area/%s/%d", $n, $i);
+    echo " " . get_small_link("Donations", "/donation/in/area/%s/%d", $n, $i);
+    echo " " . get_small_link("Orders", "/order/in/area/%s/%d", $n, $i);
     if (check_admin(1)) {
       echo " " . $area->getDeleteLink();
     }
@@ -236,9 +240,11 @@
   /* /area/in/Cambridge/1 */
   if (count($parameters)) {
     if ($parameters[0] == "in") {
-      $city_id = $parameters[2];
-      show_areas(0, 10, $parameters[1], $city_id);
-      show_new_area_form($city_id);
+      if ($parameters[1] == "city") {
+        $city_id = $parameters[3];
+        show_areas(0, 10, $parameters[2], $city_id);
+        show_new_area_form($city_id);
+      }
     }
   }
   list($name, $id, $args) = parse_parameters($parameters);