From 72dfdd7172089c5de4f0f93a7570d6074d495ff3 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 11 Nov 2023 11:30:22 +0000
Subject: [PATCH 1/3] Fix spice autoconenct

Update text from VNC to VM Console for titles and placeholders
---
 emhttp/plugins/dynamix.vm.manager/spice.html                | 2 +-
 emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/spice.html b/emhttp/plugins/dynamix.vm.manager/spice.html
index 0c9684419..562786aff 100644
--- a/emhttp/plugins/dynamix.vm.manager/spice.html
+++ b/emhttp/plugins/dynamix.vm.manager/spice.html
@@ -74,7 +74,7 @@
             document.getElementById('hostname').innerHTML = (vmname) ;
             if (auto === 'true' || auto == '1') {
             auto = true;
-            connect();
+            setTimeout(connect, 3000);
             }
             function spice_error(e)
             {
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 008b987ed..7bfef4d83 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1076,12 +1076,12 @@
 
 			<tr class="vncpassword">
 				<td>_(VM Console Password)_:</td>
-				<td><input type="password" name="domain[password]" autocomplete='new-password' value="<?=$arrGPU['password']?>" title="_(password for VNC)_" placeholder="_(password for VNC)_ (_(optional)_)" /></td>
+				<td><input type="password" name="domain[password]" autocomplete='new-password' value="<?=$arrGPU['password']?>" title="_(password for VM Console)_" placeholder="_(password for VM Console)_ (_(optional)_)" /></td>
 			</tr>
 			<tr class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced vnckeymap">
 				<td>_(VM Console Keyboard)_:</td>
 				<td>
-					<select name="gpu[<?=$i?>][keymap]" title="_(keyboard for VNC)_">
+					<select name="gpu[<?=$i?>][keymap]" title="_(keyboard for VM Console)_">
 					<?mk_dropdown_options($arrValidKeyMaps, $arrGPU['keymap']);?>
 					</select>
 				</td>

From e70d1fe12b9e13bb8113fbf0de09f4310a61ed06 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 11 Nov 2023 11:43:23 +0000
Subject: [PATCH 2/3] Fix additional title text

---
 emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 7bfef4d83..a360d8954 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1068,7 +1068,7 @@
 			<tr class="<?if ($arrGPU['id'] != 'virtual') echo 'was';?>advanced vncmodel">
 				<td>_(VM Console Video Driver)_:</td>
 				<td>
-					<select id="vncmodel" name="gpu[<?=$i?>][model]" class="narrow" title="_(video for VNC)_">
+					<select id="vncmodel" name="gpu[<?=$i?>][model]" class="narrow" title="_(video for VM Console)_">
 					<?mk_dropdown_options($arrValidVNCModels, $arrGPU['model']);?>
 					</select>
 				</td>

From d9b9fac0a179dd23a9286f3e8b33f55df0eb04d3 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 11 Nov 2023 12:04:14 +0000
Subject: [PATCH 3/3] Update Custom.form.php

---
 emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index a360d8954..a0449ef80 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -2079,7 +2079,7 @@ $(function() {
 			if (audio && !sound.includes(audio)) form.append('<input type="hidden" name="pci[]" value="'+audio+'#remove">');
 		});
 		<?endif?>
-		var postdata = form.find('input,select,textarea[name="qemucmdline"').serialize().replace(/'/g,"%27");
+		var postdata = form.find('input,select,textarea[name="qemucmdline"]').serialize().replace(/'/g,"%27");
 		<?if (!$boolNew):?>
 		// keep checkbox visually unchecked
 		form.find('input[name="usb[]"],input[name="usbopt[]"],input[name="pci[]"]').each(function(){