From 27bdf178e0bdddae24dd703699d16d3d369c6619 Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Thu, 26 May 2005 10:43:10 +0000
Subject: [PATCH] Use either mail or principalUser, as either could be there.

---
 presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
index 2e918ec..6657300 100644
--- a/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
+++ b/presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
@@ -110,7 +110,8 @@ function getDetailsLDAPPage($sUserName, $aAttributes, $sUserIdentifier) {
         $sToRender .= "<td>" . _("Name") . ": </td><td><input size = \"40\" type=\"text\" name=\"fName\" value = \"" . $aUserAttributes["givenname"] ." " . $aUserAttributes["sn"] ."\"> </td>\n";
         $sToRender .= "</tr>\n";
         $sToRender .= "<tr>\n";
-        $sToRender .= "<td>" . _("Email Address") . ": </td><td><input size = \"40\" type=\"text\" name=\"fEmail\" value = \"" . $aUserAttributes["userPrincipalName"] ."\"> </td>\n";
+        $sDefaultEmail = KTUtil::arrayGet($aUserAttributes, "mail", KTUtil::arrayGet($aUserAttributes, "userPrincipalName", ""));
+        $sToRender .= "<td>" . _("Email Address") . ": </td><td><input size = \"40\" type=\"text\" name=\"fEmail\" value = \"" . $sDefaultEmail ."\"> </td>\n";
         $sToRender .= "</tr>\n";
         $sToRender .= "<tr>\n";
         $sToRender .= "<td>" . _("Mobile Number") . ": </td><td><input size = \"40\" type=\"text\" name=\"fMobile\" value = \"" . $aUserAttributes["mobile"] ."\"> </td>\n";
--
libgit2 0.21.4