Peter M. Groen / knowledgetree

Commit 27bdf178e0bdddae24dd703699d16d3d369c6619

Authored by Neil Blakey-Milner
1 parent cd52172c

Use either mail or principalUser, as either could be there. 

SF Tracker:	996172
Submitted by:	peckman10


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@3307 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
presentation/lookAndFeel/knowledgeTree/administration/usermanagement/addUserUI.inc
  View file @27bdf17
@@ -110,7 +110,8 @@ function getDetailsLDAPPage($sUserName, $aAttributes, $sUserIdentifier) { @@ -110,7 +110,8 @@ function getDetailsLDAPPage($sUserName, $aAttributes, $sUserIdentifier) {
110 $sToRender .= "<td>" . _("Name") . ": </td><td><input size = \"40\" type=\"text\" name=\"fName\" value = \"" . $aUserAttributes["givenname"] ." " . $aUserAttributes["sn"] ."\"> </td>\n"; 110 $sToRender .= "<td>" . _("Name") . ": </td><td><input size = \"40\" type=\"text\" name=\"fName\" value = \"" . $aUserAttributes["givenname"] ." " . $aUserAttributes["sn"] ."\"> </td>\n";
111 $sToRender .= "</tr>\n"; 111 $sToRender .= "</tr>\n";
112 $sToRender .= "<tr>\n"; 112 $sToRender .= "<tr>\n";
113 - $sToRender .= "<td>" . _("Email Address") . ": </td><td><input size = \"40\" type=\"text\" name=\"fEmail\" value = \"" . $aUserAttributes["userPrincipalName"] ."\"> </td>\n"; 113 + $sDefaultEmail = KTUtil::arrayGet($aUserAttributes, "mail", KTUtil::arrayGet($aUserAttributes, "userPrincipalName", ""));
  114 + $sToRender .= "<td>" . _("Email Address") . ": </td><td><input size = \"40\" type=\"text\" name=\"fEmail\" value = \"" . $sDefaultEmail ."\"> </td>\n";
114 $sToRender .= "</tr>\n"; 115 $sToRender .= "</tr>\n";
115 $sToRender .= "<tr>\n"; 116 $sToRender .= "<tr>\n";
116 $sToRender .= "<td>" . _("Mobile Number") . ": </td><td><input size = \"40\" type=\"text\" name=\"fMobile\" value = \"" . $aUserAttributes["mobile"] ."\"> </td>\n"; 117 $sToRender .= "<td>" . _("Mobile Number") . ": </td><td><input size = \"40\" type=\"text\" name=\"fMobile\" value = \"" . $aUserAttributes["mobile"] ."\"> </td>\n";