Fix mute url regex display

catalyst · Aug 5, 2024 · 95be7c8 · 95be7c8
1 parent 2f05062
commit 95be7c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/classes/form/override_form.php b/classes/form/override_form.php
@@ -61,10 +61,11 @@ public function definition() {
         $mform->setType('url', PARAM_URL);
         $urlregex = get_config('tool_heartbeat', 'muteurlregex');
         if (!empty($urlregex)) {
-            $urlregex = stripslashes($urlregex);
+            // Strip backslashes and remove delimiters from the regex display.
+            $urlregexdisplay = substr(stripslashes($urlregex), 1, -1);
             $mform->addRule('url', get_string('required'), 'required', null, 'client');
-            $mform->addRule('url', get_string('muteurlregex', 'tool_heartbeat', $urlregex), 'regex', $urlregex, 'client');
-            $mform->addElement('static', 'url_help', '', get_string('muteurlregex', 'tool_heartbeat', $urlregex));
+            $mform->addRule('url', get_string('muteurlregex', 'tool_heartbeat', $urlregexdisplay), 'regex', $urlregex, 'client');
+            $mform->addElement('static', 'url_help', '', get_string('muteurlregex', 'tool_heartbeat', $urlregexdisplay));
         }
 
         // Override until.

diff --git a/lang/en/tool_heartbeat.php b/lang/en/tool_heartbeat.php
@@ -97,7 +97,7 @@
 $string['editmute'] = 'Edit mute';
 $string['overriderestore'] = 'Fields have been pre-filled with information from a previous override.';
 $string['noterequired'] = 'Please add some notes';
-$string['muteurlregex'] = 'The URL must match the regex defined in settings: {$a}';
+$string['muteurlregex'] = 'The URL must match the format defined in settings: {$a}';
 $string['statusunknown'] = 'Unknown';
 $string['settings:mutedefault'] = 'Default mute duration';
 $string['settings:mutedefault:desc'] = 'Adjust the default duration of a check mute.';