X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Farea.php;fp=lib%2Farea.php;h=fbf739d0aae041bdb9c478dff41044b3167c476e;hb=762ae69462813affdcdab3960dede2c7d679baf3;hp=77272f76e9ba375d5d076471f17c9c87da834e59;hpb=6cbb29ad097d97f152a4318ddb0bc2498b2f6ca7;p=readifood.git

diff --git a/lib/area.php b/lib/area.php
index 77272f7..fbf739d 100644
--- a/lib/area.php
+++ b/lib/area.php
@@ -19,14 +19,15 @@
     update_area_delivery_days($parameters[0]);
   }
 
-  function show_areas($offset, $per_page, $city_name = null, $city_id = null) {
+  function show_areas($city_name = null, $city_id = null) {
+    list($first_page, $per_page) = pagination();
     if (isset($city_name) || isset($city_id)) {
       if (isset($city_id)) $city = get_city_by_id($city_id);
       else if ($city_name) $city = get_city_by_name($city_name);
       if ($city) {
         echo "<p>Areas in " . $city->getLink(get_city_displayname($city)) . ":";
         $q = new AreaQuery;
-        $areas = $q->filterByCityId($city_id)->find();
+        $areas = $q->filterByCityId($city_id)->orderByName()->orderById()->paginate($first_page, $per_page);
 
         if (count($areas)) {
           foreach ($areas as $area) {
@@ -40,6 +41,7 @@
               echo " " . $area->getDeleteLink();
             }
           }
+          show_pagination($areas);
         }
         else echo " none";
         echo "</p>\n";
@@ -245,7 +247,7 @@
     if ($parameters[0] == "in") {
       if ($parameters[1] == "city") {
         $city_id = $parameters[3];
-        show_areas(0, 10, $parameters[2], $city_id);
+        show_areas($parameters[2], $city_id);
         show_new_area_form($city_id);
       }
     }