Added maxage limit + translations, removed duplicated button & kept m…

…ecanisms
EsupPortail · May 26, 2021 · e008cc9 · e008cc9
1 parent 9938dcd
commit e008cc9
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 18 deletions.
diff --git a/classes/api/manager/rocket_chat_api_manager.php b/classes/api/manager/rocket_chat_api_manager.php
@@ -158,13 +158,14 @@ public function save_rocketchat_group_settings($groupid, $settings) {
             switch($settingname) {
                 case 'retentionenabled':
                     $rcsettings1['retentionEnabled'] = (boolean) $settingvalue;
-                    break;
-                case 'overrideglobal' :
                     $rcsettings1['retentionOverrideGlobal'] = (boolean) $settingvalue;
                     break;
                 case 'maxage' :
                     $rcsettings2['retentionMaxAge'] = $settingvalue;
                     break;
+                case 'maxage_limit' :
+                    $rcsettings2['retentionMaxAgeLimit'] = $settingvalue;
+                    break;
                 case 'filesonly' :
                     $rcsettings2['retentionFilesOnly'] = (boolean) $settingvalue;
                     break;

diff --git a/lang/en/rocketchat.php b/lang/en/rocketchat.php
@@ -119,6 +119,9 @@
 $string['overrideglobal'] = 'Override global message retention mode';
 $string['overrideglobal_desc'] = 'Activate override global message retention on a private group.';
 $string['maxage'] = 'Retention time value (maxAge) for the Rocket.Chat group';
+$string['maxage_limit'] = 'Maximum retention time value (maxAge) for the Rocket.Chat group';
+$string['maxage_limit_desc'] = 'Maximum retention time value (maxAge) for the Rocket.Chat group';
+$string['limit_override'] = 'Retention time exceeded maximum setting';
 $string['maxage_desc'] = 'If you enabled override global message retention, the following retention value will override. WARNING : 0 will trigger regular deletion of messages. global Rocket.Chat retention value.';
 $string['overrideglobal_help'] = 'If you enabled override global message retention, the following retention value will override. WARNING : 0 will trigger regular deletion of messages. global Rocket.Chat retention value.';
 $string['filesonly'] = 'Prune files only, keep messages';

diff --git a/lang/fr/rocketchat.php b/lang/fr/rocketchat.php
@@ -119,6 +119,9 @@
 $string['overrideglobal'] = 'Surcharger la rétention globale des messages dans Rocket.Chat';
 $string['overrideglobal_desc'] = 'Activer La surcharger la rétention globale des messages dans Rocket.Chat';
 $string['maxage'] = 'Valeur du temps de rétention des messages(maxAge) pour un groupe Rocket.Chat';
+$string['maxage_limit'] = 'Valeur du temps de rétention maximum des messages(maxAge) pour un groupe Rocket.Chat';
+$string['maxage_limit_desc'] = 'Valeur du temps de rétention maximum des messages(maxAge) pour un groupe Rocket.Chat';
+$string['limit_override'] = 'Valeur supérieure au maximum pour la plateforme';
 $string['maxage_desc'] = 'Si le mode "Surcharger la rétention globale des messages" est activé, la valeur de temps de rétention des messages sera appliquée au group Rocket.Chat, surchageant le temps de rétention global du serveur. ATTENTION : la valeur 0 déclenche la suppression régulière des messages.';
 $string['maxage_help'] = 'Si le mode "Surcharger la rétention globale des messages" est activé,la valeur de temps de rétention des messages sera appliquée au group Rocket.Chat, surchageant le temps de rétention global du serveur. ATTENTION : la valeur 0 déclenche la suppression régulière des messages.';
 $string['filesonly'] = 'Prune files only, keep messages';

diff --git a/mod_form.php b/mod_form.php
@@ -147,25 +147,26 @@ public function definition() {
                 $mform->setDefault('retentionenabled', get_config('mod_rocketchat', 'retentionenabled'));
 
                 if (has_capability('mod/rocketchat:canactivateretentionglobaloverride', $this->get_context())) {
-                    $mform->addElement('checkbox', 'overrideglobal',
-                        get_string('overrideglobal', 'mod_rocketchat'),
-                        get_string('overrideglobal_desc', 'mod_rocketchat')
-                    );
+                    $mform->addElement('hidden', 'overrideglobal');
                     $mform->addHelpButton('overrideglobal', 'overrideglobal', 'mod_rocketchat');
                     $mform->disabledif('overrideglobal', 'retentionenabled',
                         'notchecked');
+                    $mform->setDefault('overrideglobal', get_config('mod_rocketchat', 'retentionenabled'));
                 } else {
                     $mform->addElement('hidden', 'overrideglobal');
-                    $mform->setType('overrideglobal', PARAM_INT);
                 }
+                $mform->setType('overrideglobal', PARAM_INT);
                 $mform->setDefault('overrideglobal', get_config('mod_rocketchat', 'overrideglobal'));
 
+                $mform->addElement('hidden', 'maxage_limit');
+                $mform->setType('maxage_limit', PARAM_INT);
+                $mform->setDefault('maxage_limit', get_config('mod_rocketchat', 'maxage_limit'));
                 $mform->addElement('text', 'maxage', get_string('maxage', 'mod_rocketchat'));
                 $mform->setType('maxage', PARAM_INT);
-                $mform->disabledif('maxage', 'overrideglobal',
-                    'notchecked');
                 $mform->disabledif('maxage', 'retentionenabled',
                     'notchecked');
+                $mform->addRule(array('maxage_limit', 'maxage'), get_string('limit_override', 'mod_rocketchat'), 'compare', 'gte', 'client');
+
                 if (has_capability('mod/rocketchat:candefineadvancedretentionparamaters', $this->get_context())) {
                     $mform->addElement('checkbox', 'filesonly',
                         get_string('filesonly', 'mod_rocketchat'),
@@ -242,4 +243,8 @@ protected function format_roles($roleids, $rolesoptions) {
         return $formattedrole;
     }
 
+    function validation($data, $files) {
+        global $COURSE, $DB, $CFG;
+        $errors = parent::validation($data, $files);
+    }
 }
diff --git a/settings.php b/settings.php
@@ -105,15 +105,6 @@
             0
         )
     );
-
-    $settings->add(
-        new admin_setting_configcheckbox(
-            'mod_rocketchat/overrideglobal',
-            get_string('overrideglobal', 'mod_rocketchat'),
-            get_string('overrideglobal_desc', 'mod_rocketchat'),
-            0
-        )
-    );
     $settings->add(
         new admin_setting_configtext(
             'mod_rocketchat/maxage',
@@ -122,6 +113,14 @@
             90
         )
     );
+    $settings->add(
+        new admin_setting_configtext(
+            'mod_rocketchat/maxage_limit',
+            get_string('maxage_limit', 'mod_rocketchat'),
+            get_string('maxage_limit_desc', 'mod_rocketchat'),
+            350
+        )
+    );
     $settings->add(
         new admin_setting_configcheckbox(
             'mod_rocketchat/filesonly',