From 1bace8547b0fa3db316ad79e4948869a654b7140 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 5 Nov 2009 16:53:43 -0500
Subject: [PATCH] Store the canonical forms of the email address and nickname

---
 plugins/Ldap/LdapPlugin.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/Ldap/LdapPlugin.php b/plugins/Ldap/LdapPlugin.php
index 8c2d45b859..cabd3c8282 100644
--- a/plugins/Ldap/LdapPlugin.php
+++ b/plugins/Ldap/LdapPlugin.php
@@ -77,7 +77,13 @@ class LdapPlugin extends Plugin
             foreach($config_attributes as $config_attribute){
                 $value = common_config('ldap', $config_attribute.'_attribute');
                 if($value!==false){
-                    $registration_data[$config_attribute]=$entry->getValue($value,'single');
+                    if($config_attribute=='email'){
+                        $registration_data[$config_attribute]=common_canonical_email($entry->getValue($value,'single'));
+                    }else if($config_attribute=='nickname'){
+                        $registration_data[$config_attribute]=common_canonical_nickname($entry->getValue($value,'single'));
+                    }else{
+                        $registration_data[$config_attribute]=$entry->getValue($value,'single');
+                    }
                 }
             }
             //error_log(print_r($registration_data,1));