From 0bf6497e023b0e904f63a09456319b22ca9f68f8 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 31 Oct 2009 13:53:38 -0700
Subject: [PATCH] 1) Added support for the email attribute on the Ldap_User
 object (references the ldap mail attribute) 2) Added support for the
 avatar_url method. 3) Added a config parameter to the IdentityProvider to
 specifiy the configuration.  This allows the ldap installer to instantiate
 the ldap Identity provider to use in the install and uninstall methods.

---
 modules/ldap/helpers/ldap_installer.php       |  9 ++--
 .../drivers/IdentityProvider/Ldap.php         | 50 ++++++++++++-------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/modules/ldap/helpers/ldap_installer.php b/modules/ldap/helpers/ldap_installer.php
index cc227960..c68ac6b6 100644
--- a/modules/ldap/helpers/ldap_installer.php
+++ b/modules/ldap/helpers/ldap_installer.php
@@ -21,19 +21,18 @@ class ldap_installer {
   static function install() {
     module::set_version("ldap", 1);
     $root = item::root();
-    foreach (identity::groups() as $group) {
+    $ldap_provider = new IdentityProvider("ldap");
+    foreach ($ldap_provider->groups() as $group) {
       module::event("group_created", $group);
       access::allow($group, "view", $root);
       access::allow($group, "view_full", $root);
     }
-    // Let the admin own everything
-    $admin = identity::admin_user();
-    Database::instance()->query("UPDATE {items} SET owner_id = {$admin->id}");
   }
 
   static function uninstall() {
     // Delete all groups so that we give other modules an opportunity to clean up
-    foreach (identity::groups() as $group) {
+    $ldap_provider = new IdentityProvider("ldap");
+    foreach ($ldap_provider->groups() as $group) {
       module::event("group_deleted", $group);
     }
   }
diff --git a/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php b/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php
index 1342b231..e118d1fc 100644
--- a/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php
+++ b/modules/ldap/libraries/drivers/IdentityProvider/Ldap.php
@@ -45,6 +45,7 @@ class IdentityProvider_Ldap_Driver implements IdentityProvider_Driver {
       self::$_guest_user->guest = true;
       self::$_guest_user->admin = false;
       self::$_guest_user->locale = null;
+      self::$_guest_user->email = null;
       self::$_guest_user->groups = array($this->everybody());
     }
     return self::$_guest_user;
@@ -80,6 +81,9 @@ class IdentityProvider_Ldap_Driver implements IdentityProvider_Driver {
    * @see IdentityProvider_Driver::lookup_user.
    */
   public function lookup_user($id) {
+    if ($id == 0) {
+      return $this->guest();
+    }
     $result = ldap_search(self::$_connection, self::$_params["user_domain"], "uidNumber=$id");
     $entries = ldap_get_entries(self::$_connection, $result);
     if ($entries["count"] > 0) {
@@ -225,35 +229,43 @@ class Ldap_User implements User_Definition {
 
   public function __get($key) {
     switch($key) {
-      case "name":
-        return $this->ldap_entry["uid"][0];
+    case "name":
+      return $this->ldap_entry["uid"][0];
 
-      case "guest":
-        return false;
+    case "guest":
+      return false;
 
-      case "id":
-        return $this->ldap_entry["uidnumber"][0];
+    case "id":
+      return $this->ldap_entry["uidnumber"][0];
 
-      case "groups":
-        return IdentityProvider_Ldap_Driver::groups_for($this);
+    case "groups":
+      return IdentityProvider_Ldap_Driver::groups_for($this);
 
-      case "locale":  // @todo
-        return null;
+    case "locale":  // @todo
+      return null;
 
-      case "admin":
-        return in_array($this->ldap_entry["uid"][0],
-                        IdentityProvider_Ldap_Driver::$_params["admins"]);
+    case "admin":
+      return in_array($this->ldap_entry["uid"][0],
+                      IdentityProvider_Ldap_Driver::$_params["admins"]);
 
-      case "dn":
-        return $this->ldap_entry["dn"];
+    case "email":
+      return $this->ldap_entry["mail"];
 
-      case "url":  // @todo
-        return null;
+    case "dn":
+      return $this->ldap_entry["dn"];
 
-      default:
-        throw new Exception("@todo UNKNOWN_KEY ($key)");
+    case "url":  // @todo
+      return null;
+
+    default:
+      throw new Exception("@todo UNKNOWN_KEY ($key)");
     }
   }
+
+  public function avatar_url($size=80, $default=null) {
+    return sprintf("http://www.gravatar.com/avatar/%s.jpg?s=%d&r=pg%s",
+                   md5($this->email), $size, $default ? "&d=" . urlencode($default) : "");
+  }
 }
 
 class Ldap_Group implements Group_Definition {