From 1e36b99acf54f829b471b14336c81604ee6e9a59 Mon Sep 17 00:00:00 2001 From: jmontoyaa Date: Fri, 9 Sep 2016 09:26:58 +0200 Subject: [PATCH] FIx update --- main/cron/import_csv.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php index 277f85e91c..0bab9819d3 100755 --- a/main/cron/import_csv.php +++ b/main/cron/import_csv.php @@ -561,7 +561,7 @@ class ImportCsv if ($result) { foreach ($row as $key => $value) { - if (substr($key, 0, 6) == 'extra_') { + if (substr($key, 0, 6) === 'extra_') { //an extra field UserManager::update_extra_field_value($result, substr($key, 6), $value); } @@ -612,9 +612,9 @@ class ImportCsv } // Blocking password update - $avoidUsersWithPassword = $this->conditions['importStudents']['update']['avoid']['password']; + //$avoidUsersWithPassword = $this->conditions['importStudents']['update']['avoid']['password']; - if (isset($row['password'])) { + /*if (isset($row['password'])) { $user = api_get_user_entity($userInfo['id']); $encoded = UserManager::encryptPassword( $row['password'], @@ -630,10 +630,14 @@ class ImportCsv $password = null; $resetPassword = 0; // disallow password change } - } + }*/ } } + // Always disallow password change during update + $password = null; + $resetPassword = 0; // disallow password change + $expirationDate = api_get_utc_datetime(strtotime("+".intval($this->expirationDateInUserUpdate)."years")); // Update user