no more regex

Author: simonLeary42

resources/lib/UnityHTTPD.php

@@ -341,46 +341,36 @@ public static function clearMessages()
 
     private static function getMessageIndex(
         UnityHTTPDMessageLevel $level,
-        string $title_regex,
-        string $body_regex,
+        string $title,
+        string $body,
     ) {
         $messages = self::getMessages();
         $error_msg = sprintf(
-            "message(level='%s' title_regex='%s' body_regex='%s'), not found. found messages: %s",
+            "message(level='%s' title='%s' body='%s'), not found. found messages: %s",
             $level->value,
-            $title_regex,
-            $body_regex,
+            $title,
+            $body,
             jsonEncode($messages),
         );
         foreach ($messages as $i => $message) {
-            if (
-                preg_match($title_regex, $message[0]) &&
-                preg_match($body_regex, $message[1]) &&
-                $level == $message[2]
-            ) {
+            if ($title == $message[0] && $body == $message[1] && $level == $message[2]) {
                 return $i;
             }
         }
         throw new UnityHTTPDMessageNotFoundException($error_msg);
     }
 
-    /* returns the 1st message that matches criteria or throws UnityHTTPDMessageNotFoundException */
-    public static function getMessage(
-        UnityHTTPDMessageLevel $level,
-        string $title_regex,
-        string $body_regex,
-    ) {
-        $index = self::getMessageIndex($level, $title_regex, $body_regex);
+    /* returns the 1st message that matches or throws UnityHTTPDMessageNotFoundException */
+    public static function getMessage(UnityHTTPDMessageLevel $level, string $title, string $body)
+    {
+        $index = self::getMessageIndex($level, $title, $body);
         return $_SESSION["messages"][$index];
     }
 
-    /* deletes the 1st message that matches criteria or throws UnityHTTPDMessageNotFoundException */
-    public static function deleteMessage(
-        UnityHTTPDMessageLevel $level,
-        string $title_regex,
-        string $body_regex,
-    ) {
-        $index = self::getMessageIndex($level, $title_regex, $body_regex);
+    /* deletes the 1st message that matches or throws UnityHTTPDMessageNotFoundException */
+    public static function deleteMessage(UnityHTTPDMessageLevel $level, string $title, string $body)
+    {
+        $index = self::getMessageIndex($level, $title, $body);
         unset($_SESSION["messages"][$index]);
         $_SESSION["messages"] = array_values($_SESSION["messages"]);
     }

resources/templates/header.php

@@ -155,8 +155,8 @@
                         method: 'POST',
                         data: {
                           'level': '%s',
-                          'title_regex': '/^%s$/',
-                          'body_regex': '/^%s$/',
+                          'title': '%s',
+                          'body': '%s',
                         }
                     });
                   \"
@@ -169,8 +169,8 @@
             htmlspecialchars($title),
             htmlspecialchars($body),
             htmlspecialchars($level->value),
-            preg_quote(htmlspecialchars($title), "/"),
-            preg_quote(htmlspecialchars($body), "/"),
+            htmlspecialchars($title),
+            htmlspecialchars($body),
         );
     }
     if (

test/functional/DeleteMessageTest.php

@@ -24,8 +24,8 @@ public function testDeleteMessage(): void
                 __DIR__ . "/../../webroot/panel/ajax/delete_message.php",
                 [
                     "level" => "debug",
-                    "title_regex" => "/^.*2$/",
-                    "body_regex" => "/^.*2$/",
+                    "title" => "foo2",
+                    "body" => "bar2",
                 ],
                 enforce_PRG: false,
             );

webroot/panel/ajax/delete_message.php

@@ -7,6 +7,6 @@
 
 $level_str = UnityHTTPD::getPostData("level");
 $level = UnityHTTPDMessageLevel::from($level_str);
-$title_regex = UnityHTTPD::getPostData("title_regex");
-$body_regex = UnityHTTPD::getPostData("body_regex");
-UnityHTTPD::deleteMessage($level, $title_regex, $body_regex);
+$title = UnityHTTPD::getPostData("title");
+$body = UnityHTTPD::getPostData("body");
+UnityHTTPD::deleteMessage($level, $title, $body);