X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=2dd65ab101cb9bf36d8ffbbab856e08f1704cdd7;hb=6bd4ad3daf2cc870d96a3fed9ea9caf6798d2b78;hp=a5bceee8f906d0ff57c5aaab45c8f389042799dd;hpb=2cce3a10f172ca1ee7150d80d80d98ecb7527d3b;p=readifood.git

diff --git a/lib/contact.php b/lib/contact.php
index a5bceee..2dd65ab 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -50,11 +50,13 @@
     $role = $contact->getRole();
     $role_string = get_contact_role_string($contact);
     if ($role_string) echo " $role_string";
-    if ($role & $GLOBALS['ROLE_DONOR']) printf(" <a class=\"small\" href=\"/donation/from/contact/%s/%d\">Donations</a>", urlencode($contact->getDisplayname()), $contact->getId());
-    if ($role & $GLOBALS['ROLE_REQUESTER']) printf(" <a class=\"small\" href=\"/order/from/referrer/%s/%d\">Referred</a>", urlencode($contact->getDisplayname()), $contact->getId());
+    $d = urlencode($contact->getDisplayname());
+    $i = $contact->getId();
+    if ($role & $GLOBALS['ROLE_DONOR']) echo " " . get_small_link("Donations", "/donation/from/contact/%s/%d", $d, $i);
+    if ($role & $GLOBALS['ROLE_REQUESTER']) echo " " . get_small_link("Referred", "/order/from/referrer/%s/%d", $d, $i);
     if ($role & $GLOBALS['ROLE_BENEFICIARY']) {
-      printf(" <a class=\"small\" href=\"/order/to/beneficiary/%s/%d\">Orders</a>", urlencode($contact->getDisplayname()), $contact->getId());
-      if (get_contact_area($contact)) printf(" <a class=\"small\" href=\"/order/place/for/beneficiary/%s/%d\">Place</a>", urlencode($contact->getDisplayname()), $contact->getId());
+      echo " " . get_small_link("Orders", "/order/to/beneficiary/%s/%d", $d, $contact->getId());
+      if (get_contact_area($contact)) echo " " . get_small_link("Place", "/order/place/for/beneficiary/%s/%d", $d, $i);
     }
     if (check_admin(1)) {
       echo " " . $contact->getDeleteLink();
@@ -127,7 +129,6 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
     echo "<p>Show contacts in area\n";
     echo "<select name=\"area_id\">\n";
     foreach ($areas as $area) {
@@ -135,7 +136,6 @@
     }
     echo "</select>\n";
     echo "<input type=\"submit\" value=\"Show\">\n";
-    echo "</form>\n";
   }
 
   function show_contact_cities_form($city_id = null) {
@@ -147,7 +147,6 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
     echo "<p>Show contacts in city\n";
     echo "<select name=\"city_id\">\n";
     foreach ($cities as $city) {
@@ -155,21 +154,20 @@
     }
     echo "</select>\n";
     echo "<input type=\"submit\" value=\"Show\">\n";
-    echo "</form>\n";
   }
 
   function show_contact_search_form() {
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
     echo "<p>Search for contacts:";
     input("search_contact");
     echo "<input type=\"submit\" value=\"Search\">\n";
-    echo "</form>\n";
   }
 
   function show_contact_forms($city_id) {
+    form("noprint standout");
     show_contact_areas_form($city_id);
     show_contact_cities_form($city_id);
     show_contact_search_form();
+    end_form();
   }
 
   function show_contact_role_form($role) {
@@ -323,7 +321,7 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form("noprint");
     echo "<p>Add a new contact:</p>\n";
 
     echo "<table>\n";
@@ -333,7 +331,7 @@
     echo "  <td colspan=2>"; submit("add_contact", "Add"); echo "</td></tr>\n";
     echo "</tr>\n";
     echo "</table>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function show_add_new_contact_form() {
@@ -346,7 +344,7 @@
       return;
     }
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form("noprint standout");
     echo "<p>Add a new contact in <select name=\"city_id\">\n";
     foreach ($cities as $city) {
       option("city_id", $city->getId(), get_city_displayname($city));
@@ -354,7 +352,7 @@
     echo "</select>";
     submit("show_add_contact", "Proceed");
     echo "</p>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   function update_contact(&$contact, $area_id, $new = false) {
@@ -494,7 +492,7 @@
     else $contact = get_contact_by_name($name);
     if (! $contact) return;
 
-    echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
+    form();
     show_contact_summary($contact, true);
     echo ": ";
     echo "\n</p>";
@@ -511,7 +509,7 @@
     }
 
     echo "</table>\n";
-    echo "</form>\n";
+    end_form();
   }
 
   /* /contact/in/area/Cambridge/1 */
@@ -536,8 +534,6 @@
           show_city_contacts(0, 10, $parameters[2], $city_id);
         break;
       }
-
-      show_add_new_contact_form($city_id);
     }
     else if ($parameters[0] == "search") {
       search_contacts(0, 10, $parameters[1]);
@@ -553,14 +549,8 @@
     }
   }
   else if (isset($name)) show_contact($name, $id);
-  else {
-    /* XXX: Shown after adding. */
-    show_contact_forms($city_id);
-    show_add_new_contact_form($city_id);
-  }
 
-  if (count($parameters)) {
-    show_contact_forms($city_id);
-  }
+  show_contact_forms($city_id);
+  show_add_new_contact_form($city_id);
 
 ?>