Merge remote-tracking branch 'origin/1.11.x' into 1.11.x

Author: AngelFQC

tests/scripts/unify_duplicated_user_based_on_extra_field_value.php

@@ -9,6 +9,9 @@
 exit;
 require __DIR__.'/../../main/inc/global.inc.php';
 
+// Filter to only manage those users based on their user_id :
+//$filteredUsers = [11,12,13]; // set the list of user_id
+
 // set the extra field variable to use 
 $extraFieldVariable = 'dni';
 
@@ -38,6 +41,9 @@
             $mostRecentRegistrationDate = 0;
             foreach ($users as $u) {
                 $uid = (int)$u['user_id'];
+		if (isset($filteredUsers) && !in_array($uid, $filteredUsers) {
+                    continue;
+                }
                 $userInfo = api_get_user_info($uid);
 		if ($userInfo['registration_date'] > $mostRecentRegistrationDate) {
                     $mostRecentRegistrationDate = $userInfo['registration_date'];
@@ -46,11 +52,16 @@
             }
             foreach ($users as $u) {
                 $uid = (int)$u['user_id'];
+		if (isset($filteredUsers) && !in_array($uid, $filteredUsers) {
+                    continue;
+                }
                 if ($uid === $userIdToUnifyOn) { continue; }
-
-                echo 'Unifying user ' . $uid . ' on user ' . $userIdToUnifyOn . PHP_EOL;
+                $now = date('Y-m-d H:i:s');
+                echo $now . ' Unifying user ' . $uid . ' on user ' . $userIdToUnifyOn . PHP_EOL;
                 MySpace::duUpdateAllUserRefsList($uid, $userIdToUnifyOn);
                 MySpace::duDisableOrDeleteUser($uid, $unifyMode);
+                $now = date('Y-m-d H:i:s');
+                echo $now . ' User unified' . PHP_EOL;
             }
         }
     }