From efd598c8f8dfc97c0656b2c6d773e212be820176 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 25 May 2024 19:56:43 +0100
Subject: [PATCH] Fix templates broken by evdevs.

---
 .../include/libvirt_helpers.php               | 12 ++++++++-
 .../templates/Custom.form.php                 | 26 +++++++------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 8d78bcd93..75935cdfa 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -941,7 +941,17 @@ private static $encoding = 'UTF-8';
 		$xml = $lv->domain_get_xml($res) ;
 		$xmldoc = new SimpleXMLElement($xml);
 		$xmlpath = $xmldoc->xpath('//devices/input[@type="evdev"] ');
-		return $xmlpath;
+		$evdevs = [];
+		foreach ($xmlpath as $i => $evDev) {
+		$evdevs[$i] = [
+			'dev' => $evDev->source->attributes()->dev,
+			'grab' => $evDev->source->attributes()->grab,
+			'repeat' => $evDev->source->attributes()->repeat,
+			'grabToggle' => $evDev->source->attributes()->grabToggle
+			];
+		}
+		if (empty($evdevs)) $evdevs[0] = ['dev'=>"",'grab'=>"",'repeat'=>"",'grabToggle'=>""];
+		return $evdevs; 
 	}
 
 	$cacheValidUSBDevices = null;
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 12abb670b..c8086651b 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1627,15 +1627,7 @@
 		</p>
 	</blockquote>
 	<?
-	 if ( $arrConfig['evdev'] == false) {
-
-			$evdevxml = "<input type='evdev'>
-			<source dev=''/>
-			</input>";
-			$evdevdoc = new SimpleXMLElement($evdevxml);
-			$arrConfig['evdev']= $evdevdoc->xpath('//input[@type="evdev"] ');
-		}
-		
+	if (!isset($arrConfig['evdev'])) $arrConfig['evdev'][0] = ['dev'=>"",'grab'=>"",'repeat'=>"",'grabToggle'=>""];
 	foreach ($arrConfig['evdev'] as $i => $arrEvdev) {
 		$strLabel = ($i > 0) ? appendOrdinalSuffix($i + 1) : '';
 		?>
@@ -1645,8 +1637,8 @@
 				<td>
 					<select name="evdev[<?=$i?>][dev]" class="dev narrow">
 					<?
-						echo mk_option($arrEvdev->source->attributes()->dev, '', _('None'));
-						foreach(getValidevDev() as $line) echo mk_option($arrEvdev->source->attributes()->dev, $line , $line);
+						echo mk_option($arrEvdev['dev'], '', _('None'));
+						foreach(getValidevDev() as $line) echo mk_option($arrEvdev['dev'], $line , $line);
 					?>
 					</select>
 				</td>
@@ -1655,8 +1647,8 @@
 			<td>_(Grab)_:</td>
 			<td>
 				<select name="evdev[<?=$i?>][grab]" class="evdev_grab"  title="_(grab options)_">
-				<?echo mk_option($arrEvdev->source->attributes()->grab, '', _('None'));
-				foreach(["all"] as $line) echo mk_option($arrEvdev->source->attributes()->grab,$line,ucfirst($line));?>
+				<?echo mk_option($arrEvdev['grab'], '', _('None'));
+				foreach(["all"] as $line) echo mk_option($arrEvdev['grab'],$line,ucfirst($line));?>
 				</select>
 			</td>
 		</tr>
@@ -1665,8 +1657,8 @@
 			<td>_(Repeat)_:</td>
 			<td>
 				<select name="evdev[<?=$i?>][repeat]" class="evdev_repeat narrow" title="_(grab options)_">
-				<?echo mk_option($arrEvdev->source->attributes()->repeat, '', _('None'));
-				foreach(["on","off"] as $line) echo mk_option($arrEvdev->source->attributes()->repeat,$line,ucfirst($line));?>
+				<?echo mk_option($arrEvdev['repeat'], '', _('None'));
+				foreach(["on","off"] as $line) echo mk_option($arrEvdev['repeat'],$line,ucfirst($line));?>
 				</select>
 			</td>
 		</tr>
@@ -1675,8 +1667,8 @@
 			<td>_(Grab Toggle)_:</td>
 			<td>
 				<select name="evdev[<?=$i?>][grabToggle]" class="evdev_grabtoggle narrow" title="_(grab options)_">
-				<?echo mk_option($arrEvdev->source->attributes()->grabToggle, '', _('None'));
-				foreach(["ctrl-ctrl", "alt-alt", "shift-shift", "meta-meta", "scrolllock" , "ctrl-scrolllock"] as $line) echo mk_option($arrEvdev->source->attributes()->grabToggle,$line,$line);?>
+				<?echo mk_option($arrEvdev['grabToggle'], '', _('None'));
+				foreach(["ctrl-ctrl", "alt-alt", "shift-shift", "meta-meta", "scrolllock" , "ctrl-scrolllock"] as $line) echo mk_option($arrEvdev['grabToggle'],$line,$line);?>
 				</select>
 			</td>
 		</tr>