PukiWiki
| Revision | 0de00ddd7cbbed03e9b274c712c7e02bcfefde65 (tree) |
|---|---|
| Time | 2016-02-08 01:51:18 |
| Author |  umorigu <umorigu@gmai...> |
| Commiter | umorigu |
BugTrack2/374 Get fullname from LDAP server on AUTH_TYPE_EXTERNAL
lib/auth.php (diff)| @@ -244,7 +244,7 @@ function ensure_valid_auth_user() | ||
| 244 | 244 | { |
| 245 | 245 | global $auth_type, $auth_users, $_msg_auth, $auth_user, $auth_groups; |
| 246 | 246 | global $auth_user_groups, $auth_user_fullname; |
| 247 | - global $auth_provider_user_prefix; | |
| 247 | + global $auth_provider_user_prefix, $ldap_user_account; | |
| 248 | 248 | switch ($auth_type) { |
| 249 | 249 | case AUTH_TYPE_BASIC: |
| 250 | 250 | { |
| @@ -278,13 +278,14 @@ function ensure_valid_auth_user() | ||
| 278 | 278 | if (isset($_SESSION['authenticated_user_fullname'])) { |
| 279 | 279 | $fullname = $_SESSION['authenticated_user_fullname']; |
| 280 | 280 | } else { |
| 281 | + $fullname = $user; | |
| 281 | 282 | if ($auth_type === AUTH_TYPE_EXTERNAL && $ldap_user_account) { |
| 282 | 283 | $ldap_user_info = ldap_get_simple_user_info($user); |
| 283 | 284 | if ($ldap_user_info) { |
| 284 | 285 | $fullname = $ldap_user_info['fullname']; |
| 285 | - $_SESSION['authenticated_user_fullname'] = $fullname; | |
| 286 | 286 | } |
| 287 | 287 | } |
| 288 | + $_SESSION['authenticated_user_fullname'] = $fullname; | |
| 288 | 289 | } |
| 289 | 290 | } |
| 290 | 291 | $auth_user = $user; |
Fork