Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

main/admin/user_update_import.php

@@ -105,9 +105,9 @@ function updateUsers(
             }
 
             $user_id = $userInfo['user_id'];
-            $firstName = isset($user['FirstName']) ? $user['FirstName'] : $userInfo['firstname'];
-            $lastName = isset($user['LastName']) ? $user['LastName'] : $userInfo['lastname'];
-            $userName = isset($user['NewUserName']) ? $user['NewUserName'] : $userInfo['username'];
+            $firstName = $user['FirstName'] ?? $userInfo['firstname'];
+            $lastName = $user['LastName'] ?? $userInfo['lastname'];
+            $userName = $user['NewUserName'] ?? $userInfo['username'];
             $changePassMethod = 0;
             $password = null;
             $authSource = $userInfo['auth_source'];
@@ -126,12 +126,12 @@ function updateUsers(
                 }
             }
 
-            $email = isset($user['Email']) ? $user['Email'] : $userInfo['email'];
-            $status = isset($user['Status']) ? $user['Status'] : $userInfo['status'];
-            $officialCode = isset($user['OfficialCode']) ? $user['OfficialCode'] : $userInfo['official_code'];
-            $phone = isset($user['PhoneNumber']) ? $user['PhoneNumber'] : $userInfo['phone'];
-            $pictureUrl = isset($user['PictureUri']) ? $user['PictureUri'] : $userInfo['picture_uri'];
-            $expirationDate = isset($user['ExpiryDate']) ? $user['ExpiryDate'] : $userInfo['expiration_date'];
+            $email = $user['Email'] ?? $userInfo['email'];
+            $status = $user['Status'] ?? $userInfo['status'];
+            $officialCode = $user['OfficialCode'] ?? $userInfo['official_code'];
+            $phone = $user['PhoneNumber'] ?? $userInfo['phone'];
+            $pictureUrl = $user['PictureUri'] ?? $userInfo['picture_uri'];
+            $expirationDate = $user['ExpiryDate'] ?? $userInfo['expiration_date'];
             $active = $userInfo['active'];
             if (isset($user['Active'])) {
                 $user['Active'] = (int) $user['Active'];
@@ -143,7 +143,7 @@ function updateUsers(
 
             $creatorId = $userInfo['creator_id'];
             $hrDeptId = $userInfo['hr_dept_id'];
-            $language = isset($user['Language']) ? $user['Language'] : $userInfo['language'];
+            $language = $user['Language'] ?? $userInfo['language'];
             //$sendEmail = isset($user['SendEmail']) ? $user['SendEmail'] : $userInfo['language'];
             //$sendEmail = false;
             // see BT#17893
@@ -299,7 +299,7 @@ $form->addGroup($group, '', get_lang('SendMailToUsers'));
 $defaults['sendMail'] = 0;
 
 if ($form->validate()) {
-    if (Security::check_token('post')) {
+    if (Security::check_token()) {
         Security::clear_token();
         $formValues = $form->exportValues();
 
@@ -359,14 +359,12 @@ if ($form->validate()) {
             );
             Display::addFlash(Display::return_message($warningMessage, 'warning', false));
         }
-
-        header('Location: '.api_get_self());
-        exit;
     } else {
         Display::addFlash(Display::return_message(get_lang('LinkExpired'), 'warning', false));
+    }
+
     header('Location: '.api_get_self());
     exit;
-    }
 }
 
 Display::display_header($tool_name);

tests/scripts/synchronize_user_base_from_ldap.php

@@ -99,7 +99,7 @@ if ($debug) {
 if (api_is_multiple_url_enabled()) {
     $accessUrls = api_get_access_urls(0,100000,'id');
     $multipleUrlLDAPConfig = true;
-    if (array_key_exists('host', $extldap_config) && !empty($extldap_config['host'])) {
+    if (!empty($extldap_config) && array_key_exists('host', $extldap_config) && !empty($extldap_config['host'])) {
         $multipleUrlLDAPConfig = false;
     }    
 }
@@ -116,6 +116,10 @@ foreach ($accessUrls as $accessUrl) {
     $extraFields = [];
     $extraFieldMap = [];
     $accessUrlId = $accessUrl['id'];
+    global $_configuration;
+    $_configuration['access_url'] = $accessUrlId;
+    $extldap_config[$accessUrlId] = api_get_configuration_value('extldap_config');
+    $generalTableFieldMap[$accessUrlId] = $extldap_user_correspondance[$accessUrlId] = api_get_configuration_value('extldap_user_correspondance');
     $ldapAttributes = $extraLdapAttributes[$accessUrlId];
     if (array_key_exists($accessUrlId, $generalTableFieldMap) && is_array($generalTableFieldMap[$accessUrlId])) {
         $tableFieldMap = $generalTableFieldMap[$accessUrlId];