X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Ffunctions.php;h=8db2720fbcc1758ff1133fca5b59ece7faf8b533;hb=46a6490756496e873962e54db2ad1b68921cd3c8;hp=fe442f820a2e90e6fe15d6ef3d511432b4cc9827;hpb=643b013ffaadfb032001ed0dde02176a2c382313;p=readifood.git

diff --git a/lib/functions.php b/lib/functions.php
index fe442f8..8db2720 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -185,13 +185,27 @@
     return $order_ids;
   }
 
-  function get_contact_orders($contact, $state_mask = null) {
+  function get_beneficiary_orders($contact, $state_mask = null) {
     $q = new OrderQuery;
     $q->filterByBeneficiaryId($contact->getId());
     if ($state_mask) $q->filterById(get_order_ids_by_state($state_mask));
     return $q->orderByDate()->find();
   }
 
+  function get_requester_orders($contact, $state_mask = null) {
+    $q = new OrderQuery;
+    $q->filterByRequesterId($contact->getId());
+    if ($state_mask) $q->filterById(get_order_ids_by_state($state_mask));
+    return $q->orderByDate()->find();
+  }
+
+  function get_contact_orders($contact, $state_mask = null) {
+    $q = new OrderQuery;
+    $q->filterByBeneficiaryId($contact->getId())->_or()->filterByRequesterId($contact->getId());
+    if ($state_mask) $q->filterById(get_order_ids_by_state($state_mask));
+    return $q->orderByDate()->find();
+  }
+
   function get_user_by_contact_id($id, $verbose = true) {
     $q = new UserQuery;
     $user = $q->findOneByContactId($id);
@@ -219,7 +233,7 @@
   function get_order_parcel_string($order) {
     global $parcel_sizes, $parcel_contents;
 
-    $parcel_size = "";
+    $parcel_size = null;
     for ($i = 0 ; $i < count($parcel_sizes); $i++) {
       if ($order->getParcel() & (1 << $i)) {
         $parcel_size = $parcel_sizes[$i];
@@ -232,7 +246,11 @@
       if ($order->getParcel() & (1 << $i)) $selected[] = $parcel_contents[$i];
     }
 
-    return implode(": ", array($parcel_size, implode(", ", $selected)));
+    $ret = implode(": ", array($parcel_size, implode(", ", $selected)));
+    $ret = preg_replace('/^: /', '', $ret);
+    $ret = preg_replace('/: $/', '', $ret);
+
+    return $ret;
   }
 
   function get_order_displayname($order) {