Changeset 486127
- Timestamp:
- 01/07/2012 12:21:45 PM (14 years ago)
- Location:
- active-directory-integration/trunk
- Files:
-
- 3 edited
-
ad-integration.php (modified) (3 diffs)
-
bulkimport.php (modified) (4 diffs)
-
readme.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
active-directory-integration/trunk/ad-integration.php
r485180 r486127 610 610 611 611 // Don't use Active Directory for admin user (ID 1) 612 $user = get_userdatabylogin($username); 612 // $user = get_userdatabylogin($username); // deprecated 613 $user = get_user_by('login', $username); 614 613 615 if (is_object($user) && ($user->ID == 1)) { 614 616 $this->_log(ADI_LOG_NOTICE,'User with ID 1 will never be authenticated by Active Directory Integration.'); … … 761 763 762 764 // getting user data (again!) 763 $user = get_userdatabylogin($username); 765 // $user = get_userdatabylogin($username); // deprecated 766 $user = get_user_by('login', $username); 764 767 765 768 // role … … 2796 2799 $authorization_groups = explode(';', $this->_authorization_group); 2797 2800 foreach ($authorization_groups as $authorization_group) { 2801 //$authorization_group = utf8_decode($authorization_group); // TODO: Dies ist ein Test. 2802 //echo 'group: '.$authorization_group.'<br>'; 2798 2803 if ($this->_adldap->user_ingroup($username, $authorization_group, true)) { 2799 2804 $this->_log(ADI_LOG_NOTICE,'Authorized by membership of group "'.$authorization_group.'"'); -
active-directory-integration/trunk/bulkimport.php
r485564 r486127 204 204 $this->_log(ADI_LOG_DEBUG,'Members of group "'.$group.'": ' . implode(', ',$members)); 205 205 foreach ($members AS $user) { 206 $all_users[ $user] = $user;206 $all_users[strtolower($user)] = $user; 207 207 } 208 208 } else { … … 235 235 if (is_array($blogusers)) { 236 236 foreach ($blogusers AS $user) { 237 $all_users[ $user->user_login] = $user->user_login;237 $all_users[strtolower($user->user_login)] = $user->user_login; 238 238 } 239 239 } … … 256 256 257 257 // getting user data 258 $user = get_userdatabylogin($username); 258 //$user = get_userdatabylogin($username); // deprecated 259 $user = get_user_by('login', $username); 259 260 260 261 // role … … 287 288 288 289 // create new users or update them 289 if (!$user OR ( $user->user_login != $username)) {290 if (!$user OR (strtolower($user->user_login) != strtolower($username))) { // use strtolower!!! 290 291 $user_id = $this->_create_user($ad_username, $userinfo, $display_name, $user_role, '', true); 291 292 $added_users++; -
active-directory-integration/trunk/readme.txt
r485180 r486127 129 129 * ADD: Option to show on user list if a user was authenticated (or imported) from Active Directory and the disabled state of user. 130 130 * ADD: Option to choose whether ADI should fallback to local (WordPress) password check if authentication against Active Directory fails. You should deactivate this for security reasons. 131 * FIX: Username is handled as case sensitive on Bulk Import but this is a wrong behavior. (Issue #0041) 131 132 132 133 = 1.1.2 =
Note: See TracChangeset
for help on using the changeset viewer.