X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Fcontact.php;h=3dd0fc3f5b1501151fcac5b73459e4f0b6c7c70f;hb=7910a9551304a4789ba1fde0c85eeaf5bb21003b;hp=ccfcd48a349afcbb0f5c21488bb18985669808f3;hpb=b0b9828b27e140f88fb0b7867388376b329959cc;p=readifood.git

diff --git a/lib/contact.php b/lib/contact.php
index ccfcd48..3dd0fc3 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -44,8 +44,9 @@
     exit;
   }
 
-  function show_contact_summary(&$contact) {
-    echo "<br>\nContact " . $contact->getLink();
+  function show_contact_summary(&$contact, $editing = false) {
+    if ($editing) echo "<p>Contact: <span class=\"strong\">" . htmlspecialchars($contact->getDisplayname()) . "</span>";
+    else echo "<br>\nContact " . $contact->getStrongLink();
     $role = $contact->getRole();
     $role_string = get_contact_role_string($contact);
     if ($role_string) echo " $role_string";
@@ -57,6 +58,8 @@
     }
     $area = get_contact_area($contact);
     echo " in " . $area->getLink();
+    $city = get_contact_city($contact);
+    echo ", " . $city->getLink(get_city_displayname($city));
   }
 
   function show_contacts($offset, $per_page, $address_ids) {
@@ -167,17 +170,11 @@
   }
 
   function show_contact_role_form($role) {
-    global $roles;
-
-    for ($i = 0; $i < count($roles); $i++) {
-      echo " <input type=\"checkbox\" name=\"role_$i\"";
-      if ($role & (1 << $i)) echo " checked";
-      echo ">$roles[$i]\n";
-    }
+    return show_role_form($role, $GLOBALS['contact_roles']);
   }
 
   function show_contact_form($contact = null) {
-    global $roles;
+    global $contact_roles;
 
     if (! $contact) $contact = new Contact;
 
@@ -253,6 +250,12 @@
     }
     echo "  </select></td>\n";
     echo "</tr>\n";
+
+    /* Notes. */
+    echo "<tr>\n";
+    echo "  <td>Notes</td>\n";
+    echo "  <td><textarea name=\"notes\">" . $contact->getNotes() . "</textarea></td>\n";
+    echo "</tr>\n";
   }
 
   function show_new_contact_form($city_id = null) {
@@ -299,10 +302,10 @@
   }
 
   function update_contact(&$contact, $area_id, $new = false) {
-    global $roles;
+    global $contact_roles;
 
     $role = 0;
-    for ($i = 0; $i < count($roles); $i++) {
+    for ($i = 0; $i < count($contact_roles); $i++) {
       if ($_POST['role_' . $i] == "on") $role |= (1 << $i);
     }
 
@@ -357,6 +360,7 @@
     $telephone1 = $_POST['telephone1'];
     $telephone2 = $_POST['telephone2'];
     $email = $_POST['email'];
+    $notes = $_POST['notes'];
 
     $contact->setRole($role);
     $contact->setForename($forename);
@@ -366,6 +370,7 @@
     $contact->setTelephone1($telephone1);
     $contact->setTelephone2($telephone2);
     $contact->setEmail($email);
+    $contact->setNotes($notes);
     $contact->setAddressId($address->getId());
 
     try {
@@ -428,18 +433,7 @@
     if (! $contact) return;
 
     echo "<form method=\"POST\" action=\"" . $_SERVER['REQUEST_URI'] . "\">\n";
-    echo "<p>Contact: <span class=\"strong\">" . $contact->getDisplayname() . "</span>";
-    $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());
-    if ($role & $GLOBALS['ROLE_BENEFICIARY']) printf(" <a class=\"small\" href=\"/order/to/beneficiary/%s/%d\">Orders</a>", urlencode($contact->getDisplayname()), $contact->getId());
-    if (check_admin(1)) {
-      echo " " . $contact->getDeleteLink();
-    }
-    $city = get_contact_city($contact);
-    if ($city) echo " in " . $city->getLink(get_city_displayname($city));
+    show_contact_summary($contact, true);
     echo ": ";
     echo "\n</p>";