FIx update

chamilo · Sep 9, 2016 · 1e36b99 · 1e36b99
1 parent e69cb1e
commit 1e36b99
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/main/cron/import_csv.php b/main/cron/import_csv.php
@@ -561,7 +561,7 @@ private function importStudents($file, $moveFile = true)
 
                     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 @@ private function importStudents($file, $moveFile = true)
                             }
 
                             // 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 @@ private function importStudents($file, $moveFile = true)
                                     $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