User - Add option to hide "Never expire" for expiration date in add/e…

…dit user - refs BT#19631
chamilo · Feb 2, 2022 · f862842 · f862842
1 parent f560ca7
commit f862842
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 24 deletions.
diff --git a/main/admin/user_add.php b/main/admin/user_add.php
@@ -271,18 +271,34 @@ function setExpirationDatePicker(status) {
 $group[] = $form->createElement('radio', 'send_mail', null, get_lang('No'), 0, ['id' => 'send_mail_no']);
 $form->addGroup($group, 'mail', get_lang('SendMailToNewUser'));
 // Expiration Date
-$form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
-$group = [];
-$group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
-$group[] = $form->createElement(
-    'DateTimePicker',
-    'expiration_date',
-    null,
-    [
-        'onchange' => 'javascript: enable_expiration_date();',
-    ]
-);
-$form->addGroup($group, 'max_member_group', null, null, false);
+$hideNeverExpiresOpt = api_get_configuration_value('user_hide_never_expire_option');
+$lblExpiration = '';
+$defaultExpiration = 0;
+if ($hideNeverExpiresOpt) {
+    $lblExpiration = get_lang('ExpirationDate');
+    $defaultExpiration = 1;
+    $group = [];
+    $group[] = $form->createElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('Enabled'), 1);
+    $group[] = $form->createElement(
+        'DateTimePicker',
+        'expiration_date',
+        null
+    );
+} else {
+    $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
+    $group = [];
+    $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
+    $group[] = $form->createElement(
+        'DateTimePicker',
+        'expiration_date',
+        null,
+        [
+            'onchange' => 'javascript: enable_expiration_date();',
+        ]
+    );
+}
+$form->addGroup($group, 'max_member_group', $lblExpiration, null, false);
+
 // Active account or inactive account
 $form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);
 $form->addElement('radio', 'active', '', get_lang('Inactive'), 0);
@@ -338,7 +354,7 @@ function setExpirationDatePicker(status) {
 $defaults['extra_mail_notify_invitation'] = 1;
 $defaults['extra_mail_notify_message'] = 1;
 $defaults['extra_mail_notify_group_message'] = 1;
-$defaults['radio_expiration_date'] = 0;
+$defaults['radio_expiration_date'] = $defaultExpiration;
 $defaults['status'] = STUDENT;
 $form->setDefaults($defaults);
 

diff --git a/main/admin/user_edit.php b/main/admin/user_edit.php
@@ -287,18 +287,34 @@ function confirmation(name) {
 );
 $form->addElement('label', get_lang('RegistrationDate'), $date);
 
+$defaultExpiration = 0;
 if (!$user_data['platform_admin']) {
-    // Expiration Date
-    $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
-    $group = [];
-    $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
-    $group[] = $form->createElement(
-        'DateTimePicker',
-        'expiration_date',
-        null,
-        ['onchange' => 'javascript: enable_expiration_date();']
-    );
-    $form->addGroup($group, 'max_member_group', null, null, false);
+    $hideNeverExpiresOpt = api_get_configuration_value('user_hide_never_expire_option');
+    $lblExpiration = '';
+    if ($hideNeverExpiresOpt) {
+        $lblExpiration = get_lang('ExpirationDate');
+        $defaultExpiration = 1;
+        $group = [];
+        $group[] = $form->createElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('Enabled'), 1);
+        $group[] = $form->createElement(
+            'DateTimePicker',
+            'expiration_date',
+            null
+        );
+    } else {
+        $form->addElement('radio', 'radio_expiration_date', get_lang('ExpirationDate'), get_lang('NeverExpires'), 0);
+        $group = [];
+        $group[] = $form->createElement('radio', 'radio_expiration_date', null, get_lang('Enabled'), 1);
+        $group[] = $form->createElement(
+            'DateTimePicker',
+            'expiration_date',
+            null,
+            [
+                'onchange' => 'javascript: enable_expiration_date();',
+            ]
+        );
+    }
+    $form->addGroup($group, 'max_member_group', $lblExpiration, null, false);
 
     // Active account or inactive account
     $form->addElement('radio', 'active', get_lang('ActiveAccount'), get_lang('Active'), 1);

diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php
@@ -2072,6 +2072,9 @@
 // Option to hide the teachers info on courses about info page.
 //$_configuration['course_about_teacher_name_hide'] = false;
 
+// Hides the option "Never expire" for expiration date in add/edit user page
+//$_configuration['user_hide_never_expire_option'] = false;
+
 // Allow multiple languages to a course
 // as a selection bar for languages used in the course.
 // Add another field "multilingual" to be used separately as a true/false