Admin: Modify default expiration date behaviour to avoid adding default expiration period when selecting "Never expires". Affects CSV import and user creation/edition forms - refs #5538

Author: ywarnier

main/admin/user_add.php

@@ -397,7 +397,13 @@ function setExpirationDatePicker(status) {
         }
 
         if ($user['radio_expiration_date'] == '1') {
-            $expiration_date = $user['expiration_date'];
+            if (!empty($user['expiration_date'])) {
+                $expiration_date = $user['expiration_date'];
+            } else {
+                if (!empty($days)) {
+                    $expiration_date = api_get_local_time('+'.$days.' day');
+                }
+            }
         } else {
             $expiration_date = null;
         }

main/admin/user_edit.php

@@ -421,7 +421,8 @@ function confirmation(name) {
 
 if (empty($expiration_date)) {
     $user_data['radio_expiration_date'] = 0;
-    $user_data['expiration_date'] = api_get_local_time();
+    $days = api_get_setting('account_valid_duration');
+    $user_data['expiration_date'] = api_get_local_time('+'.$days.' day');
 } else {
     $user_data['radio_expiration_date'] = 1;
     $user_data['expiration_date'] = api_get_local_time($expiration_date);

main/cron/import_csv.php

@@ -715,8 +715,6 @@ private function importTeachers($file, $moveFile = true)
 
         if (!empty($data)) {
             $this->logger->addInfo(count($data)." records found.");
-            $expirationDateOnCreation = api_get_utc_datetime(strtotime("+".intval($this->expirationDateInUserCreation)."years"));
-            $expirationDateOnUpdate = api_get_utc_datetime(strtotime("+".intval($this->expirationDateInUserUpdate)."years"));
 
             $batchSize = $this->batchSize;
             $em = Database::getManager();
@@ -752,7 +750,7 @@ private function importTeachers($file, $moveFile = true)
                         $row['phone'],
                         null, //$row['picture'], //picture
                         $row['auth_source'], // ?
-                        $expirationDateOnCreation, //'0000-00-00 00:00:00', //$row['expiration_date'], //$expiration_date = '0000-00-00 00:00:00',
+                        null,
                         1, //active
                         0,
                         null, // extra
@@ -800,7 +798,7 @@ private function importTeachers($file, $moveFile = true)
                         $userInfo['official_code'],
                         $userInfo['phone'],
                         $userInfo['picture_uri'],
-                        $expirationDateOnUpdate,
+                        null,
                         $userInfo['active'],
                         null, //$creator_id = null,
                         0, //$hr_dept_id = 0,
@@ -892,13 +890,6 @@ private function importStudents($file, $moveFile = true)
             $language = $this->defaultLanguage;
             $this->logger->addInfo(count($data)." records found.");
 
-            $expirationDateOnCreate = api_get_utc_datetime(
-                strtotime("+".intval($this->expirationDateInUserCreation)."years")
-            );
-            $expirationDateOnUpdate = api_get_utc_datetime(
-                strtotime("+".intval($this->expirationDateInUserUpdate)."years")
-            );
-
             $counter = 1;
             $secondsInYear = 365 * 24 * 60 * 60;
 
@@ -965,7 +956,7 @@ private function importStudents($file, $moveFile = true)
                         $row['phone'],
                         null, //$row['picture'], //picture
                         $row['auth_source'], // ?
-                        $expirationDateOnCreate,
+                        null,
                         1, //active
                         0,
                         null, // extra
@@ -1000,11 +991,6 @@ private function importStudents($file, $moveFile = true)
                         continue;
                     }
 
-                    if (isset($row['action']) && $row['action'] === 'delete') {
-                        // Inactive one year later
-                        $userInfo['expiration_date'] = api_get_utc_datetime(api_strtotime(time() + $secondsInYear));
-                    }
-
                     $password = $row['password']; // change password
                     $email = $row['email']; // change email
                     $resetPassword = 2; // allow password change
@@ -1075,7 +1061,7 @@ private function importStudents($file, $moveFile = true)
                         $userInfo['official_code'],
                         $userInfo['phone'],
                         $userInfo['picture_uri'],
-                        $expirationDateOnUpdate,
+                        null,
                         $userInfo['active'],
                         null, //$creator_id = null,
                         0, //$hr_dept_id = 0,

main/inc/lib/usermanager.lib.php

@@ -457,15 +457,11 @@ public static function create_user(
         if (empty($expirationDate) || $expirationDate == '0000-00-00 00:00:00') {
             // Default expiration date
             // if there is a default duration of a valid account then
-            // we have to change the expiration_date accordingly
+            // the expiration_date has to be set taking it into account before calling create_user()
             // Accept 0000-00-00 00:00:00 as a null value to avoid issues with
             // third party code using this method with the previous (pre-1.10)
             // value of 0000...
-            if (api_get_setting('account_valid_duration') != '') {
-                $expirationDate = new DateTime($currentDate);
-                $days = (int) api_get_setting('account_valid_duration');
-                $expirationDate->modify('+'.$days.' day');
-            }
+            $expirationDate = null;
         } else {
             $expirationDate = api_get_utc_datetime($expirationDate);
             $expirationDate = new \DateTime($expirationDate, new DateTimeZone('UTC'));