From 0dfe1d8afafc59c4a5559c498342668d5a58d6ef Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Thu, 23 Jul 2026 22:41:41 +0000
Subject: [PATCH] =Still working away at the Integrations overhaul

---
 inc/helpers/ui.php |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/inc/helpers/ui.php b/inc/helpers/ui.php
index d0f5f4e..9ea9e3b 100644
--- a/inc/helpers/ui.php
+++ b/inc/helpers/ui.php
@@ -219,22 +219,32 @@
 
 
 
-function jvbModalActions()
+function jvbModalActions():string
 {
-    return '<div class="m-actions row">
-        <button type="button" class="cancel">'.jvbIcon('x').'<span class="screen-reader-text">Cancel</span></button>
-        <button type="submit" class="save">'.jvbIcon('floppy-disk').'<span class="screen-reader-text">Save</span></button>
-    </div>';
+    return sprintf(
+	'<div class="m-actions row">
+				<button type="button" class="cancel">%s<span class="screen-reader-text">Cancel</span></button>
+				<button type="submit" class="save">%s<span class="screen-reader-text">Save</span></button>
+			</div>',
+		jvbIcon('x'),
+		jvbIcon('floppy-disk')
+	);
 }
 
-function jvbNewModal(string $class, string $title, string $form)
+function jvbNewModal(string $class, string $id, string $title, string $form):string
 {
-    return '<dialog class="'.$class.'">
+    return sprintf(
+		'<dialog class="%s" id="%s">
         <div class="wrap">
-            <h2>'.$title.'</h2>
-            '.str_replace('</form>', jvbModalActions().'</form>', $form).'
+            <h2>%s</h2>
+            %s
         </div>
-    </dialog>';
+    </dialog>',
+		$class,
+		sanitize_title($id),
+		$title,
+		str_replace('</form>', jvbModalActions().'</form>', $form)
+	);
 }
 
 /**

--
Gitblit v1.10.0