From f44ed8d0e1de072ea341c013c967714cd0217fee Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Sat, 12 Apr 2014 15:41:12 -0400
Subject: [PATCH 01/16] Store session variables.

Start a session so we can keep track of user preferences later.
---
 lib/footer.php  | 1 +
 lib/session.php | 5 +++++
 www/index.php   | 1 +
 3 files changed, 7 insertions(+)
 create mode 100644 lib/session.php

diff --git a/lib/footer.php b/lib/footer.php
index 3ccf4a8..da9130d 100644
--- a/lib/footer.php
+++ b/lib/footer.php
@@ -2,3 +2,4 @@
 <div id="popup"></div>
 </body>
 </html>
+<?php session_write_close(); ?>
diff --git a/lib/session.php b/lib/session.php
new file mode 100644
index 0000000..9f415b8
--- /dev/null
+++ b/lib/session.php
@@ -0,0 +1,5 @@
+<?php
+
+  session_start();
+
+?>
diff --git a/www/index.php b/www/index.php
index 4468e05..ae8b5a1 100644
--- a/www/index.php
+++ b/www/index.php
@@ -32,6 +32,7 @@
   $username = $_SERVER['REMOTE_USER'];
   include_once("$lib_root/constants.php");
   include_once("$lib_root/functions.php");
+  include_once("$lib_root/session.php");
   include_once("$lib_root/header.php");
   $q = new UserQuery;
   $user = $q->findOneByUsername($username);
-- 
2.20.1


From 99c95916fa6901a10f864f25f9a05f95d792902e Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Sat, 12 Apr 2014 15:44:41 -0400
Subject: [PATCH 02/16] Track last selected area or city.

Unless a form was just submitted, no default option is set in a select
box, so the first option in alphabetical order is used.  That can be
annoying, for instance, for users who mainly process data in one city
and find another city selected by default in all dropdowns.

On form submission we now track the selected city or area in a session
variable, and retrieve it when showing a form with no default option.
---
 lib/area.php     |  9 ++++++---
 lib/contact.php  |  4 ++++
 lib/donation.php |  4 ++++
 lib/forms.php    |  1 +
 lib/hub.php      |  4 ++++
 lib/order.php    |  4 ++++
 lib/session.php  | 17 +++++++++++++++++
 7 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/lib/area.php b/lib/area.php
index 9b0d5e1..77272f7 100644
--- a/lib/area.php
+++ b/lib/area.php
@@ -1,6 +1,7 @@
 <?php
 
   if ($_POST['area_name']) {
+    set_last_selected("city_id", $_POST['city_id']);
     $id = add_area($_POST['area_name'], $_POST['city_id']);
     if ($id !== false) {
       echo "<p>Added area.</p>\n";
@@ -8,8 +9,10 @@
     }
   }
   else if ($_POST['city_id']) {
-    /* XXX: city_id is actually a string $city_name/$city_id */
-    header(sprintf("Location: http%s://%s/%s/in/city/%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, $_POST['city_id']));
+    set_last_selected("city_id", $_POST['city_id']);
+    $city_id = $_POST['city_id'];
+    $city = get_city_by_id($city_id);
+    header(sprintf("Location: http%s://%s/%s/in/city/%s/%d", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, $city->getName(), $city_id));
     exit;
   }
   else if ($_POST['update_area']) {
@@ -64,7 +67,7 @@
     echo "<p>Show areas in\n";
     echo "<select name=\"city_id\">\n";
     foreach ($candidates as $city) {
-      option("city_id", sprintf("%s/%s", $city->getName(), $city->getId()), get_city_displayname($city));
+      option("city_id", $city->getId(), get_city_displayname($city));
     }
     echo "</select>\n";
     echo "<input type=\"submit\" value=\"Show\">\n";
diff --git a/lib/contact.php b/lib/contact.php
index f376406..8013989 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -1,10 +1,12 @@
 <?php
 
   if (isset($_POST['show_add_contact'])) {
+    set_last_selected("city_id", $_POST['city_id']);
     $city_id = $_POST['city_id'];
     show_new_contact_form($city_id);
   }
   else if (isset($_POST['add_contact'])) {
+    set_last_selected("area_id", $area_id);
     $id = add_contact($displayname);
     if ($id !== false) {
       echo "<p>Added contact.</p>\n";
@@ -32,12 +34,14 @@
     exit;
   }
   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['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']));
diff --git a/lib/donation.php b/lib/donation.php
index 20193fb..4fc7a8d 100644
--- a/lib/donation.php
+++ b/lib/donation.php
@@ -1,10 +1,12 @@
 <?php
 
   if (isset($_POST['show_add_donation'])) {
+    set_last_selected("area_id", $_POST['area_id']);
     $area_id = $_POST['area_id'];
     show_new_donation_form($area_id);
   }
   else if (isset($_POST['add_donation'])) {
+    set_last_selected("area_id", $_POST['area_id']);
     $id = add_donation();
     if ($id !== false) {
       echo "<p>Donation recorded.</p>\n";
@@ -26,6 +28,7 @@
     }
   }
   else if ($_POST['show_in_area']) {
+    set_last_selected("area_id", $_POST['area_id']);
     $q = new AreaQuery;
     $area = $q->findOneById($_POST['area_id']);
     /* XXX: Function to build URL because we need to set a class in links. */
@@ -33,6 +36,7 @@
     exit;
   }
   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']));
diff --git a/lib/forms.php b/lib/forms.php
index c71c11f..5751f78 100644
--- a/lib/forms.php
+++ b/lib/forms.php
@@ -43,6 +43,7 @@
   function option($select, $value, $text, $selected = null) {
     echo "  <option value=\"$value\"";
     if (! isset($selected)) $selected = $_POST[$select];
+    if (! isset($selected)) $selected = get_last_selected($select);
     if ($value == $selected) echo " selected";
     echo ">$text\n";
   }
diff --git a/lib/hub.php b/lib/hub.php
index 3d8e8d5..56caa57 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";
@@ -28,12 +30,14 @@
     }
   }
   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['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']));
diff --git a/lib/order.php b/lib/order.php
index 6c75211..ac3cdfe 100644
--- a/lib/order.php
+++ b/lib/order.php
@@ -1,10 +1,12 @@
 <?php
 
   if (isset($_POST['show_add_order'])) {
+    set_last_selected("area_id", $_POST['area_id']);
     $area_id = $_POST['area_id'];
     show_new_order_form($area_id);
   }
   else if (isset($_POST['add_order'])) {
+    set_last_selected("area_id", $_POST['area_id']);
     $id = add_order();
     if ($id !== false) {
       echo "<p>Order placed.</p>\n";
@@ -26,12 +28,14 @@
     }
   }
   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%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($area->getName()), $_POST['area_id'], get_order_state_query_uri(get_order_state_mask())));
     exit;
   }
   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%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($city->getName()), $_POST['city_id'], get_order_state_query_uri(get_order_state_mask())));
diff --git a/lib/session.php b/lib/session.php
index 9f415b8..da4e986 100644
--- a/lib/session.php
+++ b/lib/session.php
@@ -1,5 +1,22 @@
 <?php
 
+  /* Retrieve the last selected choice in a select field. */
+  function get_last_selected($name) {
+    $key = "last_$name";
+    $ret = $_SESSION[$key];
+    error_log("last selected $name is $ret");
+    return $_SESSION[$key];
+  }
+
+  /* Remember the last selected choice in a select field. */
+  function set_last_selected($name, $value) {
+    if (isset($value)) error_log("setting last selected $name to $value");
+    else error_log("not setting last selected $name null");
+    if (! isset($value)) return;
+    $key = "last_$name";
+    $_SESSION[$key] = $value;
+  }
+
   session_start();
 
 ?>
-- 
2.20.1


From 009c426bb2c9a34e5e7d7527242536da3bea7aaa Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Mon, 14 Apr 2014 09:25:08 -0400
Subject: [PATCH 03/16] Typo.

---
 lib/contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/contact.php b/lib/contact.php
index 8013989..fdbd169 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -6,7 +6,7 @@
     show_new_contact_form($city_id);
   }
   else if (isset($_POST['add_contact'])) {
-    set_last_selected("area_id", $area_id);
+    set_last_selected("area_id", $_POST['area_id']);
     $id = add_contact($displayname);
     if ($id !== false) {
       echo "<p>Added contact.</p>\n";
-- 
2.20.1


From 4adf3d2450a0fbcd4ec1aa5a5c78afb2088847f3 Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Mon, 7 Jul 2014 04:24:48 -0400
Subject: [PATCH 04/16] Use DIRECTORY_SEPARATOR everywhere.

We were using DIRECTORY_SEPARATOR in some cases and explicitly joining
paths with slashes in others.
---
 lib/functions.php |  4 ++--
 www/index.php     | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/functions.php b/lib/functions.php
index ec0b35a..6a39ddd 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -582,7 +582,7 @@
     echo call_user_func_array("get_small_link", func_get_args());
   }
 
-  include_once("$lib_root/admin.php");
-  include_once("$lib_root/forms.php");
+  include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "admin.php")));
+  include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "forms.php")));
 
 ?>
diff --git a/www/index.php b/www/index.php
index ae8b5a1..64b403d 100644
--- a/www/index.php
+++ b/www/index.php
@@ -8,10 +8,10 @@
   $root = join(DIRECTORY_SEPARATOR, array($_SERVER['DOCUMENT_ROOT'], ".."));
   $propel_root = join(DIRECTORY_SEPARATOR, array($root, "propel"));
   $lib_root = join(DIRECTORY_SEPARATOR, array($root, "lib"));
-  require_once "propel/Propel.php";
+  require_once(join(DIRECTORY_SEPARATOR, array("propel", "Propel.php")));
 
   Propel::init("$propel_root/build/conf/$propel_project-conf.php");
-  set_include_path(join(PATH_SEPARATOR, array("$propel_root/build/classes", get_include_path())));
+  set_include_path(join(PATH_SEPARATOR, array(join(DIRECTORY_SEPARATOR, array($propel_root, "build", "classes")), get_include_path())));
 
   $request = preg_replace('!^/branches/[^/]+/!', "", $_SERVER['REQUEST_URI']);
   $request = preg_replace('!^/+!', "", $request);
@@ -30,10 +30,10 @@
 
   $http = (isset($_SERVER['HTTPS'])) ? "https" : "http";
   $username = $_SERVER['REMOTE_USER'];
-  include_once("$lib_root/constants.php");
-  include_once("$lib_root/functions.php");
-  include_once("$lib_root/session.php");
-  include_once("$lib_root/header.php");
+  include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "constants.php")));
+  include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "functions.php")));
+  include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "session.php")));
+  include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "header.php")));
   $q = new UserQuery;
   $user = $q->findOneByUsername($username);
   if (! $q->count()) {
@@ -46,10 +46,10 @@
     $admin_level = $user->getAdmin();
     if ($module) {
       echo "<h3 class=\"printonly\">$charity $module</h3>\n";
-      include_once("$lib_root/$module.php");
+      include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "$module.php")));
     }
 
-    #else include_once("$lib_root/menu.php");
+    #else include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "menu.php")));
    }
-  include_once("$lib_root/footer.php");
+  include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "footer.php")));
 ?>
-- 
2.20.1


From 6cf6109632946bbc8807df54229c3675b335cfba Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Mon, 7 Jul 2014 04:26:40 -0400
Subject: [PATCH 05/16] Use Composer.

Install propel and phing locally using Composer.
---
 .gitignore    | 3 +++
 Makefile      | 9 +++++++--
 composer.json | 7 +++++++
 www/index.php | 2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 composer.json

diff --git a/.gitignore b/.gitignore
index d20bcbf..b778276 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 propel/build/
 propel/schema-transformed.xml
 propel/runtime-conf.xml
+vendor/
+composer.lock
+composer.phar
diff --git a/Makefile b/Makefile
index cfa96a4..f9340e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,7 @@
-all:
-	cd propel && propel-gen
+all: composer.phar
+	php composer.phar install
+	chmod 755 vendor/propel/propel1/generator/bin/phing.php
+	cd propel && ../vendor/propel/propel1/generator/bin/propel-gen
+
+composer.phar:
+	curl -sS https://getcomposer.org/installer | php
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..8a13e95
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,7 @@
+{
+  "name": "readifood/readifood",
+  "description": "Readifood",
+  "require": {
+    "propel/propel1": "1.6.9"
+  }
+}
diff --git a/www/index.php b/www/index.php
index 64b403d..340401d 100644
--- a/www/index.php
+++ b/www/index.php
@@ -8,7 +8,7 @@
   $root = join(DIRECTORY_SEPARATOR, array($_SERVER['DOCUMENT_ROOT'], ".."));
   $propel_root = join(DIRECTORY_SEPARATOR, array($root, "propel"));
   $lib_root = join(DIRECTORY_SEPARATOR, array($root, "lib"));
-  require_once(join(DIRECTORY_SEPARATOR, array("propel", "Propel.php")));
+  require_once(join(DIRECTORY_SEPARATOR, array($root, "vendor", "autoload.php")));
 
   Propel::init("$propel_root/build/conf/$propel_project-conf.php");
   set_include_path(join(PATH_SEPARATOR, array(join(DIRECTORY_SEPARATOR, array($propel_root, "build", "classes")), get_include_path())));
-- 
2.20.1


From f7127ce189cb772fc0623bff047e063c66c81ee1 Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Thu, 12 Mar 2015 12:36:01 -0400
Subject: [PATCH 06/16] Record donation directly from hub list.

Show a new "Record" link next to Collection hubs, opening the donation
form with the hub preselected.
---
 lib/donation.php | 34 ++++++++++++++++++++++++++++++++++
 lib/hub.php      |  9 +++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/lib/donation.php b/lib/donation.php
index 4fc7a8d..b1aba40 100644
--- a/lib/donation.php
+++ b/lib/donation.php
@@ -240,6 +240,31 @@
     end_form();
   }
 
+  function show_hub_donation_form($hub) {
+    if (! check_admin(1)) return;
+
+    $area = get_hub_area($hub);
+    if (! $area) {
+      echo "<p>No such <a href=\"/area\">area</a>!</p>\n";
+      return;
+    }
+
+    $donation = new Donation;
+    $donation->setHubId($hub->getId());
+
+    form();
+    echo "<p>Record a donation:</p>\n";
+
+    echo "<table>\n";
+    show_donation_form($donation, $area->getId());
+
+    echo "<tr>\n";
+    echo "  <td colspan=2>"; submit("add_donation", "Record"); echo "</td></tr>\n";
+    echo "</tr>\n";
+    echo "</table>\n";
+    end_form();
+  }
+
   function show_add_new_donation_form() {
     if (! check_admin(1)) return;
 
@@ -412,6 +437,15 @@
         break;
       }
     }
+    else if ($parameters[0] == "record") {
+      if ($parameters[1] == "to") {
+        if ($parameters[2] == "hub") {
+          if ($parameters[4]) $hub = get_hub_by_id($parameters[4]);
+          if (! $hub) $hub = get_hub_by_name(urldecode($parameters[3]));
+          if ($hub) show_hub_donation_form($hub);
+        }
+      }
+    }
   }
   list($ignored, $id, $args) = parse_parameters($parameters);
   //echo "<p>$name($id) " . print_r($args, true) . "</p>\n";
diff --git a/lib/hub.php b/lib/hub.php
index 56caa57..176903d 100644
--- a/lib/hub.php
+++ b/lib/hub.php
@@ -50,8 +50,13 @@
     $role = $hub->getRole();
     $role_string = get_hub_role_string($hub);
     if ($role_string) echo " $role_string";
-    if ($role & $GLOBALS['ROLE_COLLECTION']) printf(" <a class=\"small\" href=\"/donation/to/hub/%s/%d\">Donations</a>", urlencode($hub->getName()), $hub->getId());
-    if ($role & $GLOBALS['ROLE_DISTRIBUTION']) printf(" <a class=\"small\" href=\"/order/to/hub/%s/%d\">Orders</a>", urlencode($hub->getName()), $hub->getId());
+    $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();
     }
-- 
2.20.1


From 0a03172fb7157b21a81907bd7f1c6aef41c52d29 Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Tue, 29 Mar 2016 12:04:50 -0400
Subject: [PATCH 07/16] Pagination for orders.

---
 lib/constants.php |  5 ++++-
 lib/functions.php | 42 ++++++++++++++++++++++++++++++++++++++++++
 lib/order.php     |  4 +++-
 3 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/lib/constants.php b/lib/constants.php
index dcffda2..83d93e5 100644
--- a/lib/constants.php
+++ b/lib/constants.php
@@ -1,6 +1,9 @@
 <?php
 
-/* Area days of week. */
+  /* Pagination. */
+  $default_page_size = 50;
+
+  /* Area days of week. */
   $week = array("Sun", "Mon", "Tues", "Wed", "Thu", "Fri", "Sat");
 
   /* Contact roles. */
diff --git a/lib/functions.php b/lib/functions.php
index 6a39ddd..424d340 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -21,6 +21,48 @@
     return array($name, $id, $args);
   }
 
+  function pagination() {
+    $offset = 0;
+    $per_page = $GLOBALS['default_page_size'];
+
+    parse_str($_SERVER['QUERY_STRING'], $params);
+    if (array_key_exists('page', $params)) if (is_numeric($params['page'])) $offset = $params['page'] - 1;
+    if (array_key_exists('size', $params)) if (is_numeric($params['size'])) $per_page = $params['size'];
+
+    return array($offset, $per_page);
+  }
+
+  function page_link($alt, $n, $cur, $max, $size) {
+    $links = array();
+    if ($n < 1 || $n == $cur || $n > $max) return $alt;
+    $params = array('page' => $n);
+    if ($size != $GLOBALS['default_page_size']) $params['size'] = $size;
+    $url = http_build_query($params);
+    return "<a href=\"?$url\">$alt</a> ";
+  }
+
+  function show_pagination($pager, $n = 5) {
+    if (! $pager->haveToPaginate()) return;
+
+    list($offset, $per_page) = pagination();
+    $offset++;
+
+    $links = array();
+
+    $pages = ceil($pager->getNbResults() / $per_page);
+    $pages++;
+
+    $links[] = page_link('First', 1, $offset, $pages, $per_page);
+    $links[] = page_link('Previous', $offset - 1, $offset, $pages, $per_page);
+    foreach ($pager->getLinks($n) as $link) $links[] = page_link($link, $link, $offset, $pages, $per_page);
+    $links[] = page_link('Next', $offset + 1, $offset, $pages, $per_page);
+    $links[] = page_link('Last', $pages, $offset, $pages, $per_page);
+
+    echo "<p>Page: ";
+    echo implode(' / ', $links);
+    echo "</p>\n";
+  }
+
   function get_city_by_name($name, $postcode_area = null, $verbose = true) {
     $q = new CityQuery;
 
diff --git a/lib/order.php b/lib/order.php
index ac3cdfe..6a242e7 100644
--- a/lib/order.php
+++ b/lib/order.php
@@ -43,6 +43,7 @@
   }
 
   function show_orders($offset, $per_page, $requester_ids = null, $beneficiary_ids = null, $state_mask = null) {
+    list($offset, $per_page) = pagination();
     /* XXX: Use Propel methods. */
     if (isset($state_mask)) $order_ids = get_order_ids_by_state($state_mask);
     $q = new OrderQuery;
@@ -51,11 +52,12 @@
     # XXX: Doesn't work.
     #if (isset($state_mask)) $q->useOrderStateQuery()->addSelectQuery($latest_state, 'latestState')->where("order_id=latestState.order_id")->where("state & $state_mask")->endUse();
     if (isset($state_mask)) $q->filterById($order_ids);
-    $orders = $q->orderByDate()->find();
+    $orders = $q->orderByDate('desc')->paginate($offset, $per_page);
     if (count($orders)) {
       foreach ($orders as $order) {
         echo "<br>\n" . get_order_summary($order) . "<br>\n";
       }
+      show_pagination($orders);
     }
     else echo " none";
   }
-- 
2.20.1


From 018b041d077a8740dde27529a1ffc32f4610b7ef Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Mon, 4 Apr 2016 09:09:29 -0400
Subject: [PATCH 08/16] Fixed pagination of orders.

Pagination starts at page 1 not offset 0.
---
 lib/functions.php | 8 +++-----
 lib/order.php     | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/functions.php b/lib/functions.php
index 424d340..9690d5d 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -22,11 +22,11 @@
   }
 
   function pagination() {
-    $offset = 0;
+    $offset = 1;
     $per_page = $GLOBALS['default_page_size'];
 
     parse_str($_SERVER['QUERY_STRING'], $params);
-    if (array_key_exists('page', $params)) if (is_numeric($params['page'])) $offset = $params['page'] - 1;
+    if (array_key_exists('page', $params)) if (is_numeric($params['page'])) $offset = $params['page'];
     if (array_key_exists('size', $params)) if (is_numeric($params['size'])) $per_page = $params['size'];
 
     return array($offset, $per_page);
@@ -45,13 +45,11 @@
     if (! $pager->haveToPaginate()) return;
 
     list($offset, $per_page) = pagination();
-    $offset++;
-
-    $links = array();
 
     $pages = ceil($pager->getNbResults() / $per_page);
     $pages++;
 
+    $links = array();
     $links[] = page_link('First', 1, $offset, $pages, $per_page);
     $links[] = page_link('Previous', $offset - 1, $offset, $pages, $per_page);
     foreach ($pager->getLinks($n) as $link) $links[] = page_link($link, $link, $offset, $pages, $per_page);
diff --git a/lib/order.php b/lib/order.php
index 6a242e7..622ad18 100644
--- a/lib/order.php
+++ b/lib/order.php
@@ -52,7 +52,7 @@
     # XXX: Doesn't work.
     #if (isset($state_mask)) $q->useOrderStateQuery()->addSelectQuery($latest_state, 'latestState')->where("order_id=latestState.order_id")->where("state & $state_mask")->endUse();
     if (isset($state_mask)) $q->filterById($order_ids);
-    $orders = $q->orderByDate('desc')->paginate($offset, $per_page);
+    $orders = $q->orderByDate('desc')->orderById('desc')->paginate($offset, $per_page);
     if (count($orders)) {
       foreach ($orders as $order) {
         echo "<br>\n" . get_order_summary($order) . "<br>\n";
-- 
2.20.1


From 6cbb29ad097d97f152a4318ddb0bc2498b2f6ca7 Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Mon, 4 Apr 2016 09:19:57 -0400
Subject: [PATCH 09/16] Remove placeholder pagination code.

Pagination was always a planned feature.  Until now, however, it was
never implemented.  Now that it is in place we can remove the
placeholder for the assumed implementation style which was eventually
not used.
---
 lib/functions.php | 18 +++++++++---------
 lib/order.php     | 32 ++++++++++++++++----------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/lib/functions.php b/lib/functions.php
index 9690d5d..2c0fdea 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -22,14 +22,14 @@
   }
 
   function pagination() {
-    $offset = 1;
+    $first_page = 1;
     $per_page = $GLOBALS['default_page_size'];
 
     parse_str($_SERVER['QUERY_STRING'], $params);
-    if (array_key_exists('page', $params)) if (is_numeric($params['page'])) $offset = $params['page'];
+    if (array_key_exists('page', $params)) if (is_numeric($params['page'])) $first_page = $params['page'];
     if (array_key_exists('size', $params)) if (is_numeric($params['size'])) $per_page = $params['size'];
 
-    return array($offset, $per_page);
+    return array($first_page, $per_page);
   }
 
   function page_link($alt, $n, $cur, $max, $size) {
@@ -44,17 +44,17 @@
   function show_pagination($pager, $n = 5) {
     if (! $pager->haveToPaginate()) return;
 
-    list($offset, $per_page) = pagination();
+    list($first_page, $per_page) = pagination();
 
     $pages = ceil($pager->getNbResults() / $per_page);
     $pages++;
 
     $links = array();
-    $links[] = page_link('First', 1, $offset, $pages, $per_page);
-    $links[] = page_link('Previous', $offset - 1, $offset, $pages, $per_page);
-    foreach ($pager->getLinks($n) as $link) $links[] = page_link($link, $link, $offset, $pages, $per_page);
-    $links[] = page_link('Next', $offset + 1, $offset, $pages, $per_page);
-    $links[] = page_link('Last', $pages, $offset, $pages, $per_page);
+    $links[] = page_link('First', 1, $first_page, $pages, $per_page);
+    $links[] = page_link('Previous', $first_page - 1, $first_page, $pages, $per_page);
+    foreach ($pager->getLinks($n) as $link) $links[] = page_link($link, $link, $first_page, $pages, $per_page);
+    $links[] = page_link('Next', $first_page + 1, $first_page, $pages, $per_page);
+    $links[] = page_link('Last', $pages, $first_page, $pages, $per_page);
 
     echo "<p>Page: ";
     echo implode(' / ', $links);
diff --git a/lib/order.php b/lib/order.php
index 622ad18..3e3556f 100644
--- a/lib/order.php
+++ b/lib/order.php
@@ -42,8 +42,8 @@
     exit;
   }
 
-  function show_orders($offset, $per_page, $requester_ids = null, $beneficiary_ids = null, $state_mask = null) {
-    list($offset, $per_page) = pagination();
+  function show_orders($requester_ids = null, $beneficiary_ids = null, $state_mask = null) {
+    list($first_page, $per_page) = pagination();
     /* XXX: Use Propel methods. */
     if (isset($state_mask)) $order_ids = get_order_ids_by_state($state_mask);
     $q = new OrderQuery;
@@ -52,7 +52,7 @@
     # XXX: Doesn't work.
     #if (isset($state_mask)) $q->useOrderStateQuery()->addSelectQuery($latest_state, 'latestState')->where("order_id=latestState.order_id")->where("state & $state_mask")->endUse();
     if (isset($state_mask)) $q->filterById($order_ids);
-    $orders = $q->orderByDate('desc')->orderById('desc')->paginate($offset, $per_page);
+    $orders = $q->orderByDate('desc')->orderById('desc')->paginate($first_page, $per_page);
     if (count($orders)) {
       foreach ($orders as $order) {
         echo "<br>\n" . get_order_summary($order) . "<br>\n";
@@ -62,7 +62,7 @@
     else echo " none";
   }
 
-  function show_city_orders($offset, $per_page, $city_name, $city_id = null, $state_mask = null) {
+  function show_city_orders($city_name, $city_id = null, $state_mask = 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) {
@@ -71,32 +71,32 @@
       foreach ($contacts as $contact) $beneficiary_ids[] = $contact->getId();
 
       echo "<p>Orders in city " . $city->getLink(get_city_displayname($city)) . ":";
-      return show_orders($offset, $per_page, null, $beneficiary_ids, $state_mask);
+      return show_orders(null, $beneficiary_ids, $state_mask);
     }
     else echo "<p>No such city!</p>\n";
   }
 
-  function show_requester_orders($offset, $per_page, $contact_name, $contact_id = null, $state_mask = null) {
+  function show_requester_orders($contact_name, $contact_id = null, $state_mask = null) {
     if (isset($contact_id)) $contact = get_contact_by_id($contact_id);
     else if ($contact_name) $contact = get_contact_by_name($contact_name);
     if ($contact) {
       echo "<p>Orders from referrer " . $contact->getLink() . ":";
-      return show_orders($offset, $per_page, $contact->getId(), null, $state_mask);
+      return show_orders($contact->getId(), null, $state_mask);
     }
     else echo "<p>No such contact!</p>\n";
   }
 
-  function show_beneficiary_orders($offset, $per_page, $contact_name, $contact_id = null, $state_mask = null) {
+  function show_beneficiary_orders($contact_name, $contact_id = null, $state_mask = null) {
     if (isset($contact_id)) $contact = get_contact_by_id($contact_id);
     else if ($contact_name) $contact = get_contact_by_name($contact_name);
     if ($contact) {
       echo "<p>Orders to beneficiary " . $contact->getLink() . ":";
-      return show_orders($offset, $per_page, null, $contact->getId(), $state_mask);
+      return show_orders(null, $contact->getId(), $state_mask);
     }
     else echo "<p>No such contact!</p>\n";
   }
 
-  function show_area_orders($offset, $per_page, $area_name, $area_id = null, $state_mask = null) {
+  function show_area_orders($area_name, $area_id = null, $state_mask = 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) {
@@ -105,7 +105,7 @@
       foreach ($contacts as $contact) $contact_ids[] = $contact->getId();
 
       echo "<p>Orders in area " . $area->getLink() . ":";
-      return show_orders($offset, $per_page, null, $contact_ids, $state_mask);
+      return show_orders(null, $contact_ids, $state_mask);
     }
     else echo "<p>No such area!</p>\n";
   }
@@ -636,7 +636,7 @@
           $area = $q->findOneById($area_id);
           $city = get_area_city($area);
           if ($city) $city_id = $city->getId();
-          show_area_orders(0, 10, $parameters[2], $area_id, $state_mask);
+          show_area_orders($parameters[2], $area_id, $state_mask);
         break;
 
         case "city":
@@ -644,7 +644,7 @@
           $_POST['city_id'] = $city_id;
           $q = new CityQuery;
           $city = $q->findOneById($city_id);
-          show_city_orders(0, 10, $parameters[2], $city_id, $state_mask);
+          show_city_orders($parameters[2], $city_id, $state_mask);
         break;
       }
     }
@@ -655,7 +655,7 @@
           $contact_id = $parameters[3];
           $q = new ContactQuery;
           $contact = $q->findOneById($contact_id);
-          show_requester_orders(0, 10, $parameters[2], $contact_id, $state_mask);
+          show_requester_orders($parameters[2], $contact_id, $state_mask);
         break;
       }
     }
@@ -666,7 +666,7 @@
           $contact_id = $parameters[3];
           $q = new ContactQuery;
           $hub = $q->findOneById($contact_id);
-          show_beneficiary_orders(0, 10, $parameters[2], $contact_id, $state_mask);
+          show_beneficiary_orders($parameters[2], $contact_id, $state_mask);
         break;
       }
     }
@@ -694,7 +694,7 @@
     }
   }
   else if (isset($id)) show_order($id);
-  else if ($state_mask) show_orders(0, 10, null, null, $state_mask);
+  else if ($state_mask) show_orders(null, null, $state_mask);
 
   show_order_forms($city_id, $state_mask);
   show_add_new_order_form($city_id);
-- 
2.20.1


From 762ae69462813affdcdab3960dede2c7d679baf3 Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Mon, 4 Apr 2016 10:56:46 -0400
Subject: [PATCH 10/16] Paginate all sections.

Add pagination to all sections of the application.
---
 lib/area.php     |  8 +++++---
 lib/city.php     | 14 ++++++++------
 lib/contact.php  | 29 +++++++++++++++++------------
 lib/donation.php | 30 ++++++++++++++++--------------
 lib/hub.php      | 18 ++++++++++--------
 5 files changed, 56 insertions(+), 43 deletions(-)

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);
       }
     }
diff --git a/lib/city.php b/lib/city.php
index dd60e36..94c556e 100644
--- a/lib/city.php
+++ b/lib/city.php
@@ -10,13 +10,14 @@
     }
   }
 
-  function show_cities($offset, $per_page, $name = null) {
+  function show_cities($name = null) {
+    list($first_page, $per_page) = pagination();
     echo "<p>Cities:";
     $q = new CityQuery;
     if (isset($name)) $q->filterByName($name);
-    $p = $q->paginate($offset, $per_page);
-    if (count($p)) {
-      foreach ($p as $city) {
+    $cities = $q->paginate($first_page, $per_page);
+    if (count($cities)) {
+      foreach ($cities as $city) {
         echo "<br>\nCity: " . $city->getStrongLink(get_city_displayname($city));
         $n = $city->getName();
         $i = $city->getId();
@@ -28,6 +29,7 @@
           echo " " . $city->getDeleteLink();
         }
       }
+      show_pagination($cities);
     }
     else echo " none";
     echo "</p>\n";
@@ -147,13 +149,13 @@
       break;
 
       default:
-        show_cities(0, 10, $name);
+        show_cities($name);
         show_new_city_form();
       break;
     }
   }
   else if (isset($name)) show_city($name, $id);
-  else show_cities(0, 10);
+  else show_cities();
 
   if (count($parameters)) echo "<p class=\"noprint standout\">Show all <a href=\"/city\">cities</a></p>\n";
   show_new_city_form();
diff --git a/lib/contact.php b/lib/contact.php
index fdbd169..ee9f3e0 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -71,21 +71,25 @@
     echo ", " . $city->getLink(get_city_displayname($city));
   }
 
-  function show_contacts($offset, $per_page, $address_ids) {
+  function show_contacts($address_ids) {
+    list($first_page, $per_page) = pagination();
     $q = new ContactQuery;
-    $contacts = $q->filterByAddressId($address_ids)->orderByForename()->orderBySurname()->find();
+    $contacts = $q->filterByAddressId($address_ids)->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page);
     if (count($contacts)) {
       foreach ($contacts as $contact) show_contact_summary($contact);
+      show_pagination($contacts);
     }
     else echo " none";
   }
 
-  function search_contacts($offset, $per_page, $search) {
+  function search_contacts($search) {
+    list($first_page, $per_page) = pagination();
     $q = new ContactQuery;
-    $contacts = $q->filterByDisplayname("%$search%")->find();
+    $contacts = $q->filterByDisplayname("%$search%")->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page);
     echo "<p>Contacts matching '" . htmlspecialchars($search) . "':";
     if (count($contacts)) {
       foreach ($contacts as $contact) show_contact_summary($contact);
+      show_pagination($contacts);
     }
     else echo "none";
     echo "</p>\n";
@@ -99,16 +103,17 @@
     foreach ($addresses as $address) $address_ids[] = $address->getId();
 
     $q = new ContactQuery;
-    $contacts = $q->filterByAddressId($address_ids)->find();
+    $contacts = $q->filterByAddressId($address_ids)->orderByForename()->orderBySurname()->orderById('desc')->paginate($first_page, $per_page);
     echo "<p>Contacts in address '" . htmlspecialchars($search) . "':";
     if (count($contacts)) {
       foreach ($contacts as $contact) show_contact_summary($contact);
+      show_pagination($contacts);
     }
     else echo "none";
     echo "</p>\n";
   }
 
-  function show_city_contacts($offset, $per_page, $city_name, $city_id = null) {
+  function show_city_contacts($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) {
@@ -123,12 +128,12 @@
       foreach ($addresses as $address) $address_ids[] = $address->getId();
 
       echo "<p>Contacts in city " . $city->getLink(get_city_displayname($city)) . ":";
-      return show_contacts($offset, $per_page, $address_ids);
+      return show_contacts($address_ids);
     }
     else echo "<p>No such city!</p>\n";
   }
 
-  function show_area_contacts($offset, $per_page, $area_name, $area_id = null) {
+  function show_area_contacts($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) {
@@ -138,7 +143,7 @@
       foreach ($addresses as $address) $address_ids[] = $address->getId();
 
       echo "<p>Contacts in area " . $area->getLink() . ":";
-      return show_contacts($offset, $per_page, $address_ids);
+      return show_contacts($address_ids);
     }
     else echo "<p>No such area!</p>\n";
   }
@@ -580,7 +585,7 @@
           $area = $q->findOneById($area_id);
           $city = get_area_city($area);
           if ($city) $city_id = $city->getId();
-          show_area_contacts(0, 10, $parameters[2], $area_id);
+          show_area_contacts($parameters[2], $area_id);
         break;
 
         case "city":
@@ -588,12 +593,12 @@
           $_POST['city_id'] = $city_id;
           $q = new CityQuery;
           $city = $q->findOneById($city_id);
-          show_city_contacts(0, 10, $parameters[2], $city_id);
+          show_city_contacts($parameters[2], $city_id);
         break;
       }
     }
     else if ($parameters[0] == "search") {
-      search_contacts(0, 10, urldecode($parameters[1]));
+      search_contacts(urldecode($parameters[1]));
     }
   }
   list($name, $id, $args) = parse_parameters($parameters);
diff --git a/lib/donation.php b/lib/donation.php
index b1aba40..a5036f3 100644
--- a/lib/donation.php
+++ b/lib/donation.php
@@ -43,11 +43,12 @@
     exit;
   }
 
-  function show_donations($offset, $per_page, $contact_ids = null, $hub_ids = null) {
+  function show_donations($contact_ids = null, $hub_ids = null) {
+    list($first_page, $per_page) = pagination();
     $q = new DonationQuery;
     if (isset($contact_ids)) $q->filterByContactId($contact_ids);
     if (isset($hub_ids)) $q->filterByHubId($hub_ids);
-    $donations = $q->find();
+    $donations = $q->orderByDate('desc')->orderById('desc')->paginate($first_page, $per_page);
     if (count($donations)) {
       foreach ($donations as $donation) {
         echo "<br>\nDonation " . $donation->getStrongLink($donation->getId()) . ": " . get_donation_displayname($donation);
@@ -72,11 +73,12 @@
           echo " " . $donation->getDeleteLink();
         }
       }
+      show_pagination($donations);
     }
     else echo " none";
   }
 
-  function show_city_donations($offset, $per_page, $city_name, $city_id = null) {
+  function show_city_donations($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) {
@@ -85,32 +87,32 @@
       foreach ($hubs as $hub) $hub_ids[] = $hub->getId();
 
       echo "<p>Donations in city " . $city->getLink(get_city_displayname($city)) . ":";
-      return show_donations($offset, $per_page, null, $hub_ids);
+      return show_donations(null, $hub_ids);
     }
     else echo "<p>No such city!</p>\n";
   }
 
-  function show_contact_donations($offset, $per_page, $contact_name, $contact_id = null) {
+  function show_contact_donations($contact_name, $contact_id = null) {
     if (isset($contact_id)) $contact = get_contact_by_id($contact_id);
     else if ($contact_name) $contact = get_contact_by_name($contact_name);
     if ($contact) {
       echo "<p>Donations from contact " . $contact->getLink() . ":";
-      return show_donations($offset, $per_page, $contact->getId());
+      return show_donations($contact->getId());
     }
     else echo "<p>No such contact!</p>\n";
   }
 
-  function show_hub_donations($offset, $per_page, $hub_name, $hub_id = null) {
+  function show_hub_donations($hub_name, $hub_id = null) {
     if (isset($hub_id)) $hub = get_hub_by_id($hub_id);
     else if ($hub_name) $hub = get_hub_by_name($hub_name);
     if ($hub) {
       echo "<p>Donations to hub " . $hub->getLink() . ":";
-      return show_donations($offset, $per_page, null, $hub->getId());
+      return show_donations(null, $hub->getId());
     }
     else echo "<p>No such hub!</p>\n";
   }
 
-  function show_area_donations($offset, $per_page, $area_name, $area_id = null) {
+  function show_area_donations($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) {
@@ -119,7 +121,7 @@
       foreach ($hubs as $hub) $hub_ids[] = $hub->getId();
 
       echo "<p>Donations in area " . $area->getLink() . ":";
-      return show_donations($offset, $per_page, null, $hub_ids);
+      return show_donations(null, $hub_ids);
     }
     else echo "<p>No such area!</p>\n";
   }
@@ -403,7 +405,7 @@
           $area = $q->findOneById($area_id);
           $city = get_area_city($area);
           if ($city) $city_id = $city->getId();
-          show_area_donations(0, 10, $parameters[2], $area_id);
+          show_area_donations($parameters[2], $area_id);
         break;
 
         case "city":
@@ -411,7 +413,7 @@
           $_POST['city_id'] = $city_id;
           $q = new CityQuery;
           $city = $q->findOneById($city_id);
-          show_city_donations(0, 10, $parameters[2], $city_id);
+          show_city_donations($parameters[2], $city_id);
         break;
       }
     }
@@ -422,7 +424,7 @@
           $contact_id = $parameters[3];
           $q = new ContactQuery;
           $contact = $q->findOneById($contact_id);
-          show_contact_donations(0, 10, $parameters[2], $contact_id);
+          show_contact_donations($parameters[2], $contact_id);
         break;
       }
     }
@@ -433,7 +435,7 @@
           $hub_id = $parameters[3];
           $q = new HubQuery;
           $hub = $q->findOneById($hub_id);
-          show_hub_donations(0, 10, $parameters[2], $hub_id);
+          show_hub_donations($parameters[2], $hub_id);
         break;
       }
     }
diff --git a/lib/hub.php b/lib/hub.php
index 176903d..e5a551a 100644
--- a/lib/hub.php
+++ b/lib/hub.php
@@ -66,16 +66,18 @@
     if ($city) echo ", " . $city->getLink(get_city_displayname($city));
   }
 
-  function show_hubs($offset, $per_page, $address_ids) {
+  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) 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) {
@@ -90,12 +92,12 @@
       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);
+      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) {
@@ -105,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";
   }
@@ -430,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":
@@ -438,7 +440,7 @@
           $_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;
       }
     }
-- 
2.20.1


From 6eac4c1286d9beeb7d1f1ef9cd26686511da533e Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Mon, 4 Apr 2016 11:11:29 -0400
Subject: [PATCH 11/16] Clarify pagination links.

We were showing an extra page link in paginated results.
We now show ... if there are more pages whose links are not shown.
---
 lib/functions.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/functions.php b/lib/functions.php
index 2c0fdea..34b23c7 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -47,12 +47,18 @@
     list($first_page, $per_page) = pagination();
 
     $pages = ceil($pager->getNbResults() / $per_page);
-    $pages++;
+
+    /* Highlight the fact we skipped some pages. */
+    $linked_pages = $pager->getLinks($n);
+    $first_link = $linked_pages[0];
+    $last_link = end($linked_pages);
 
     $links = array();
     $links[] = page_link('First', 1, $first_page, $pages, $per_page);
     $links[] = page_link('Previous', $first_page - 1, $first_page, $pages, $per_page);
-    foreach ($pager->getLinks($n) as $link) $links[] = page_link($link, $link, $first_page, $pages, $per_page);
+    if ($first_link > 1) $links[] = page_link('...', $first_page, $pages, $per_page);
+    foreach ($linked_pages as $link) $links[] = page_link($link, $link, $first_page, $pages, $per_page);
+    if ($last_link < $pages) $links[] = page_link('...', $first_page, $pages, $per_page);
     $links[] = page_link('Next', $first_page + 1, $first_page, $pages, $per_page);
     $links[] = page_link('Last', $pages, $first_page, $pages, $per_page);
 
-- 
2.20.1


From 1a748a92f1782578b896c7dbfecb353587c49fe8 Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Mon, 4 Apr 2016 11:13:16 -0400
Subject: [PATCH 12/16] Fixed parsing parameters in rewrite.

A rewritten URL which was passed a query parameter would be parsed
incorrectly.

For instance /contact/search/smith?page=2 would be treated as a search
for a contact whose name was 'smith?page=2' rather than the second page
of a search for the 'smith' contact.
---
 www/index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/index.php b/www/index.php
index 340401d..e181d08 100644
--- a/www/index.php
+++ b/www/index.php
@@ -13,7 +13,7 @@
   Propel::init("$propel_root/build/conf/$propel_project-conf.php");
   set_include_path(join(PATH_SEPARATOR, array(join(DIRECTORY_SEPARATOR, array($propel_root, "build", "classes")), get_include_path())));
 
-  $request = preg_replace('!^/branches/[^/]+/!', "", $_SERVER['REQUEST_URI']);
+  $request = preg_replace('!^/branches/[^/]+/!', "", $_SERVER['SCRIPT_URL']);
   $request = preg_replace('!^/+!', "", $request);
   $request = preg_replace('!/+$!', "", $request);
 
-- 
2.20.1


From 5f06d69fa871be3fceb974753134db509eb0d80a Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Thu, 7 Apr 2016 11:30:24 -0400
Subject: [PATCH 13/16] More efficient order querying when mask is set.

Use a join against the area and city instead of first finding all
contacts in the desired location.
---
 lib/order.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/lib/order.php b/lib/order.php
index 3e3556f..2476ef1 100644
--- a/lib/order.php
+++ b/lib/order.php
@@ -42,7 +42,7 @@
     exit;
   }
 
-  function show_orders($requester_ids = null, $beneficiary_ids = null, $state_mask = null) {
+  function show_orders($city_id = null, $area_id = null, $requester_ids = null, $beneficiary_ids = null, $state_mask = null) {
     list($first_page, $per_page) = pagination();
     /* XXX: Use Propel methods. */
     if (isset($state_mask)) $order_ids = get_order_ids_by_state($state_mask);
@@ -51,6 +51,15 @@
     if (isset($beneficiary_ids)) $q->filterByBeneficiaryId($beneficiary_ids);
     # XXX: Doesn't work.
     #if (isset($state_mask)) $q->useOrderStateQuery()->addSelectQuery($latest_state, 'latestState')->where("order_id=latestState.order_id")->where("state & $state_mask")->endUse();
+    if (isset($city_id) || isset($area_id)) {
+      $q->joinWith('Order.Beneficiary');
+      $q->joinWith('Beneficiary.Address');
+      if (isset($area_id)) $q->where('Address.AreaId=?', $area_id);
+      if (isset($city_id)) {
+        $q->joinWith('Address.Area');
+        $q->where('Area.CityId=?', $city_id);
+      }
+    }
     if (isset($state_mask)) $q->filterById($order_ids);
     $orders = $q->orderByDate('desc')->orderById('desc')->paginate($first_page, $per_page);
     if (count($orders)) {
@@ -66,12 +75,8 @@
     if (isset($city_id)) $city = get_city_by_id($city_id);
     else if ($city_name) $city = get_city_by_name($city_name);
     if ($city) {
-      $contacts = get_city_contacts($city->getId(), $GLOBALS['ROLE_BENEFICIARY']);
-      $beneficiary_ids = array();
-      foreach ($contacts as $contact) $beneficiary_ids[] = $contact->getId();
-
       echo "<p>Orders in city " . $city->getLink(get_city_displayname($city)) . ":";
-      return show_orders(null, $beneficiary_ids, $state_mask);
+      return show_orders($city->getId(), null, null, null, $state_mask);
     }
     else echo "<p>No such city!</p>\n";
   }
@@ -81,7 +86,7 @@
     else if ($contact_name) $contact = get_contact_by_name($contact_name);
     if ($contact) {
       echo "<p>Orders from referrer " . $contact->getLink() . ":";
-      return show_orders($contact->getId(), null, $state_mask);
+      return show_orders(null, null, $contact->getId(), null, $state_mask);
     }
     else echo "<p>No such contact!</p>\n";
   }
@@ -91,7 +96,7 @@
     else if ($contact_name) $contact = get_contact_by_name($contact_name);
     if ($contact) {
       echo "<p>Orders to beneficiary " . $contact->getLink() . ":";
-      return show_orders(null, $contact->getId(), $state_mask);
+      return show_orders(null, null, null, $contact->getId(), $state_mask);
     }
     else echo "<p>No such contact!</p>\n";
   }
@@ -100,12 +105,8 @@
     if (isset($area_id)) $area = get_area_by_id($area_id);
     else if ($area_name) $area = get_area_by_name($area_name);
     if ($area) {
-      $contacts = get_area_contacts($area->getId(), $GLOBALS['ROLE_BENEFICIARY']);
-      $contact_ids = array();
-      foreach ($contacts as $contact) $contact_ids[] = $contact->getId();
-
       echo "<p>Orders in area " . $area->getLink() . ":";
-      return show_orders(null, $contact_ids, $state_mask);
+      return show_orders(null, $area->getId(), null, null, $state_mask);
     }
     else echo "<p>No such area!</p>\n";
   }
@@ -694,7 +695,7 @@
     }
   }
   else if (isset($id)) show_order($id);
-  else if ($state_mask) show_orders(null, null, $state_mask);
+  else if ($state_mask) show_orders(null, null, null, null, $state_mask);
 
   show_order_forms($city_id, $state_mask);
   show_add_new_order_form($city_id);
-- 
2.20.1


From 7fffb0960436ff0cc2b1fb3642f7400e015244db Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Thu, 7 Apr 2016 11:47:21 -0400
Subject: [PATCH 14/16] Sometimes SCRIPT_URL isn't available.

If not running in a virtualhost context, Apache may expose REDIRECT_URL
instead.
---
 www/index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/index.php b/www/index.php
index e181d08..f8434a9 100644
--- a/www/index.php
+++ b/www/index.php
@@ -13,7 +13,8 @@
   Propel::init("$propel_root/build/conf/$propel_project-conf.php");
   set_include_path(join(PATH_SEPARATOR, array(join(DIRECTORY_SEPARATOR, array($propel_root, "build", "classes")), get_include_path())));
 
-  $request = preg_replace('!^/branches/[^/]+/!', "", $_SERVER['SCRIPT_URL']);
+  $script_url = array_key_exists('SCRIPT_URL', $_SERVER) ? $_SERVER['SCRIPT_URL'] : $_SERVER['REDIRECT_URL'];
+  $request = preg_replace('!^/branches/[^/]+/!', "", $script_url);
   $request = preg_replace('!^/+!', "", $request);
   $request = preg_replace('!/+$!', "", $request);
 
-- 
2.20.1


From c307cb023104c29d4f0521b9fd641e20eb1ade82 Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Fri, 8 Apr 2016 07:58:55 -0400
Subject: [PATCH 15/16] Split check_report_dates() into shared function
 check_dates().

---
 lib/functions.php | 30 ++++++++++++++++++++++++++++++
 lib/report.php    | 25 +------------------------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/lib/functions.php b/lib/functions.php
index 34b23c7..7f937dd 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -628,6 +628,36 @@
     echo call_user_func_array("get_small_link", func_get_args());
   }
 
+  function check_dates($description, $from, $to, $mandatory_from = true, $mandatory_to = true) {
+    $Description = ucfirst($description);
+    if ($from || $mandatory_from) {
+      list($y, $m, $d) = explode('-', $from);
+      if (! checkdate($m, $d, $y)) {
+        echo "<p>Invalid $description start date!</p>\n";
+        return false;
+      }
+      $start = mktime(0, 0, 0, $m, $d, $y);
+    }
+    else $start = 0;
+
+    if ($to || $mandatory_to) {
+      list($y, $m, $d) = explode('-', $to);
+      if (! checkdate($m, $d, $y)) {
+        echo "<p>Invalid $description end date!</p>\n";
+        return false;
+      }
+      $end = mktime(0, 0, 0, $m, $d, $y);
+    }
+    else $end = PHP_INT_MAX;
+
+    if ($end < $start) {
+      echo "<p>$Description end date is earlier than start date!</p>\n";
+      return false;
+    }
+
+    return true;
+  }
+
   include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "admin.php")));
   include_once(join(DIRECTORY_SEPARATOR, array($lib_root, "forms.php")));
 
diff --git a/lib/report.php b/lib/report.php
index 999bbc5..aa9e6e5 100644
--- a/lib/report.php
+++ b/lib/report.php
@@ -37,29 +37,6 @@
     end_form();
   }
 
-  function check_report_dates($from, $to) {
-    list($y, $m, $d) = explode('-', $from);
-    if (! checkdate($m, $d, $y)) {
-      echo "<p>Invalid report start date!</p>\n";
-      return false;
-    }
-    $start = mktime(0, 0, 0, $m, $d, $y);
-
-    list($y, $m, $d) = explode('-', $to);
-    if (! checkdate($m, $d, $y)) {
-      echo "<p>Invalid report end date!</p>\n";
-      return false;
-    }
-    $end = mktime(0, 0, 0, $m, $d, $y);
-
-    if ($end < $start) {
-      echo "<p>Report end date is earlier than start date!</p>\n";
-      return false;
-    }
-
-    return true;
-  }
-
   function show_order_report($from, &$order_state_ids) {
     echo "<h3>Orders by week</h3>\n";
 
@@ -219,7 +196,7 @@
   }
 
   function show_reports($from, $to) {
-    if (! check_report_dates($from, $to)) return;
+    if (! check_dates('report', $from, $to)) return;
 
     echo "<p>Showing reports for the period <strong>$from</strong> to <strong>$to</strong>.</p>\n";
 
-- 
2.20.1


From 6a5bca8bea9c16060c3c90bbbb1cbbfe86562666 Mon Sep 17 00:00:00 2001
From: Iain Patterson <me@iain.cx>
Date: Fri, 8 Apr 2016 08:01:17 -0400
Subject: [PATCH 16/16] Allow date range in order view.

Restrict to orders for delivery between specified dates.
---
 lib/order.php | 64 ++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 46 insertions(+), 18 deletions(-)

diff --git a/lib/order.php b/lib/order.php
index 2476ef1..2a126d2 100644
--- a/lib/order.php
+++ b/lib/order.php
@@ -31,18 +31,18 @@
     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%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($area->getName()), $_POST['area_id'], get_order_state_query_uri(get_order_state_mask())));
+    header(sprintf("Location: http%s://%s/%s/in/area/%s/%d%s%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($area->getName()), $_POST['area_id'], get_order_state_query_uri(get_order_state_mask(), get_order_date_query_uri($_POST['from'], $_POST['to']))));
     exit;
   }
   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%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($city->getName()), $_POST['city_id'], get_order_state_query_uri(get_order_state_mask())));
+    header(sprintf("Location: http%s://%s/%s/in/city/%s/%d%s%s", ($_SERVER['HTTPS']) ? "s" : "", $_SERVER['HTTP_HOST'], $module, urlencode($city->getName()), $_POST['city_id'], get_order_state_query_uri(get_order_state_mask()), get_order_date_query_uri($_POST['from'], $_POST['to'])));
     exit;
   }
 
-  function show_orders($city_id = null, $area_id = null, $requester_ids = null, $beneficiary_ids = null, $state_mask = null) {
+  function show_orders($city_id = null, $area_id = null, $requester_ids = null, $beneficiary_ids = null, $state_mask = null, $from = null, $to = null) {
     list($first_page, $per_page) = pagination();
     /* XXX: Use Propel methods. */
     if (isset($state_mask)) $order_ids = get_order_ids_by_state($state_mask);
@@ -61,6 +61,8 @@
       }
     }
     if (isset($state_mask)) $q->filterById($order_ids);
+    if (isset($from)) $q->where('Order.Date >= ?', $from);
+    if (isset($to)) $q->where('Order.Date <= ?', $to);
     $orders = $q->orderByDate('desc')->orderById('desc')->paginate($first_page, $per_page);
     if (count($orders)) {
       foreach ($orders as $order) {
@@ -71,42 +73,42 @@
     else echo " none";
   }
 
-  function show_city_orders($city_name, $city_id = null, $state_mask = null) {
+  function show_city_orders($city_name, $city_id = null, $state_mask = null, $from = null, $to = 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) {
       echo "<p>Orders in city " . $city->getLink(get_city_displayname($city)) . ":";
-      return show_orders($city->getId(), null, null, null, $state_mask);
+      return show_orders($city->getId(), null, null, null, $state_mask, $from, $to);
     }
     else echo "<p>No such city!</p>\n";
   }
 
-  function show_requester_orders($contact_name, $contact_id = null, $state_mask = null) {
+  function show_requester_orders($contact_name, $contact_id = null, $state_mask = null, $from = null, $to = null) {
     if (isset($contact_id)) $contact = get_contact_by_id($contact_id);
     else if ($contact_name) $contact = get_contact_by_name($contact_name);
     if ($contact) {
       echo "<p>Orders from referrer " . $contact->getLink() . ":";
-      return show_orders(null, null, $contact->getId(), null, $state_mask);
+      return show_orders(null, null, $contact->getId(), null, $state_mask, $from, $to);
     }
     else echo "<p>No such contact!</p>\n";
   }
 
-  function show_beneficiary_orders($contact_name, $contact_id = null, $state_mask = null) {
+  function show_beneficiary_orders($contact_name, $contact_id = null, $state_mask = null, $from = null, $to = null) {
     if (isset($contact_id)) $contact = get_contact_by_id($contact_id);
     else if ($contact_name) $contact = get_contact_by_name($contact_name);
     if ($contact) {
       echo "<p>Orders to beneficiary " . $contact->getLink() . ":";
-      return show_orders(null, null, null, $contact->getId(), $state_mask);
+      return show_orders(null, null, null, $contact->getId(), $state_mask, $from, $to);
     }
     else echo "<p>No such contact!</p>\n";
   }
 
-  function show_area_orders($area_name, $area_id = null, $state_mask = null) {
+  function show_area_orders($area_name, $area_id = null, $state_mask = null, $from = null, $to = 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) {
       echo "<p>Orders in area " . $area->getLink() . ":";
-      return show_orders(null, $area->getId(), null, null, $state_mask);
+      return show_orders(null, $area->getId(), null, null, $state_mask, $from, $to);
     }
     else echo "<p>No such area!</p>\n";
   }
@@ -167,6 +169,16 @@
     return "/state/" . get_order_state_query_string($mask);
   }
 
+  function get_order_date_query_uri($from, $to) {
+    $uri = "";
+    if ($from) $uri .= "/from/$from";
+    if ($to) $uri .= "/to/$to";
+
+    if (! $uri) return "";
+
+    return "/dated$uri";
+  }
+
   function show_order_areas_form($city_id = null) {
     $areas = get_city_areas($city_id);
     if (! count($areas)) {
@@ -215,9 +227,13 @@
     echo "<input type=\"submit\" name=\"show_in_city\" value=\"Show\">\n";
   }
 
-  function show_order_forms($city_id, $state_mask) {
+  function show_order_forms($city_id, $state_mask, $from = null, $to = null) {
     form("noprint standout");
     show_order_state_form($state_mask);
+    echo "<p>Restrict to orders for delivery between ";
+    datepicker("from", $from, true, null, false, "to");
+    echo " and ";
+    datepicker("to", $to, true, "from", false);
     show_order_areas_form($city_id);
     show_order_cities_form($city_id);
     end_form();
@@ -626,6 +642,18 @@
       }
     }
 
+    for ($i = 1; $i < count($parameters); $i++) {
+      if ($parameters[$i] == "dated") {
+        for ($j = $i + 1; $j < count($parameters) - 1; $j++) {
+          if ($parameters[$j] == "from") $from = $parameters[$j + 1];
+          if ($parameters[$j] == "to") $to = $parameters[$j + 1];
+        }
+
+        if ($from || $to) check_dates('order', $from, $to, false, false);
+        break;
+      }
+    }
+
     if ($parameters[0] == "in") {
       /* /order/in/area/Romsey+Town/1 */
       switch ($parameters[1]) {
@@ -637,7 +665,7 @@
           $area = $q->findOneById($area_id);
           $city = get_area_city($area);
           if ($city) $city_id = $city->getId();
-          show_area_orders($parameters[2], $area_id, $state_mask);
+          show_area_orders($parameters[2], $area_id, $state_mask, $from, $to);
         break;
 
         case "city":
@@ -645,7 +673,7 @@
           $_POST['city_id'] = $city_id;
           $q = new CityQuery;
           $city = $q->findOneById($city_id);
-          show_city_orders($parameters[2], $city_id, $state_mask);
+          show_city_orders($parameters[2], $city_id, $state_mask, $from, $to);
         break;
       }
     }
@@ -656,7 +684,7 @@
           $contact_id = $parameters[3];
           $q = new ContactQuery;
           $contact = $q->findOneById($contact_id);
-          show_requester_orders($parameters[2], $contact_id, $state_mask);
+          show_requester_orders($parameters[2], $contact_id, $state_mask, $from, $to);
         break;
       }
     }
@@ -667,7 +695,7 @@
           $contact_id = $parameters[3];
           $q = new ContactQuery;
           $hub = $q->findOneById($contact_id);
-          show_beneficiary_orders($parameters[2], $contact_id, $state_mask);
+          show_beneficiary_orders($parameters[2], $contact_id, $state_mask, $from, $to);
         break;
       }
     }
@@ -695,9 +723,9 @@
     }
   }
   else if (isset($id)) show_order($id);
-  else if ($state_mask) show_orders(null, null, null, null, $state_mask);
+  else if ($state_mask) show_orders(null, null, null, null, $state_mask, $from, $to);
 
-  show_order_forms($city_id, $state_mask);
+  show_order_forms($city_id, $state_mask, $from, $to);
   show_add_new_order_form($city_id);
 
 
-- 
2.20.1