X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fdonation.php;h=a5036f312a4bd1e58d3a43c72ca2a185d3929b21;hb=f01f7f07701d082995cd4919d51449a2db2ed9bc;hp=b1aba401ec5273a2c4765546feb966fa13d419bf;hpb=ec6ab548e836540dfabe20aab309667c43d2e35f;p=readifood.git
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 "
\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 "
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 "
No such city!
\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 "Donations from contact " . $contact->getLink() . ":"; - return show_donations($offset, $per_page, $contact->getId()); + return show_donations($contact->getId()); } else echo "
No such contact!
\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 "Donations to hub " . $hub->getLink() . ":"; - return show_donations($offset, $per_page, null, $hub->getId()); + return show_donations(null, $hub->getId()); } else echo "
No such hub!
\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 "Donations in area " . $area->getLink() . ":"; - return show_donations($offset, $per_page, null, $hub_ids); + return show_donations(null, $hub_ids); } else echo "
No such area!
\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; } }