Merge pull request unraid#2505 from SimonFair/Fix-VM-Block-commit-processing.-

Fix: Updates for VNC ports

Author: limetech

emhttp/plugins/dynamix.vm.manager/include/VMMachines.php

@@ -95,7 +95,7 @@
     if ($vmrcprotocol == "vnc") $vmrcscale = "&resize=scale"; else $vmrcscale = "";
     $vmrcurl = autov('/plugins/dynamix.vm.manager/'.$vmrcprotocol.'.html',true).$vmrcscale.'&autoconnect=true&host='._var($_SERVER,'HTTP_HOST');
     if ($vmrcprotocol == "spice") $vmrcurl .= '&vmname='. urlencode($vm) .'&port=/wsproxy/'.$vmrcport.'/'; else $vmrcurl .= '&port=&path=/wsproxy/'.$wsport.'/';
-    $graphics = strtoupper($vmrcprotocol).':'._($auto)."$vrtdriver\n";
+    $graphics = strtoupper($vmrcprotocol).':'.$vmrcport."$vrtdriver\n";
     $virtual = true ;
   } elseif ($vmrcport == -1 || $autoport) {
     $vmrcprotocol = $lv->domain_get_vmrc_protocol($res);

emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php

@@ -105,7 +105,7 @@
 			'model' => 'qxl',
 			'keymap' => 'none',
 			'port' => 5900,
-			'wsport' => 5901,
+			'wsport' => 5700,
 			'copypaste' => 'no',
 			'render' => 'auto',
 			'DisplayOptions' => ""
@@ -1331,7 +1331,7 @@
 			<span id="Porttext" class="label <?=$hiddenport?>">_(VM Console Port)_:</span>
 			<input id="port" onchange="checkVNCPorts()" min="5900" max="65535" type="number" size="5" maxlength="5" class="trim second <?=$hiddenport?>" name="gpu[<?=$i?>][port]" value="<?=$arrGPU['port']?>">
 			<span id="WSPorttext" class="label <?=$hiddenwsport?>">_(VM Console WS Port)_:</span>
-			<input id="wsport" onchange="checkVNCPorts()" min="5900" max="65535" type="number" size="5" maxlength="5" class="trim second <?=$hiddenwsport?>" name="gpu[<?=$i?>][wsport]" value="<?=$arrGPU['wsport']?>">
+			<input id="wsport" onchange="checkVNCPorts()" min="5700" max="5899" type="number" size="5" maxlength="5" class="trim second <?=$hiddenwsport?>" name="gpu[<?=$i?>][wsport]" value="<?=$arrGPU['wsport']?>">
 		</td>
 		<td></td>
 	</tr>
@@ -2131,10 +2131,10 @@
 function checkVNCPorts() {
 	const port = $("#port").val();
 	const wsport = $("#wsport").val();
-	if (port < 5900 || port > 65535 || wsport < 5900 || wsport > 65535 || port == wsport) {
+	if (port < 5900 || port > 65535 || wsport < 5700 || wsport > 5899 || port == wsport) {
 		swal({
 			title: "_(Invalid Port)_",
-			text: "_(VNC/SPICE ports must be between 5900 and 65535, and cannot be equal to each other)_",
+			text: "_(VNC/SPICE ports must be between 5900 and 65535, and cannot be equal to each other. WS port should be between 5700 and 5899)_",
 			type: "error",
 			confirmButtonText: "_(Ok)_"
 		});