From e3cbf2309d42eaf95dcdf6a85bbf2bb851f2dd04 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 14 Oct 2023 11:31:12 +0100
Subject: [PATCH] PHP and Code tidy fixes

---
 emhttp/languages/en_US/helptext.txt           |  2 +-
 .../dynamix.vm.manager/VMSettings.page        |  2 +-
 .../include/libvirt_helpers.php               | 33 +++++++++----------
 .../dynamix.vm.manager/scripts/VMAjaxCall.php |  2 +-
 .../dynamix.vm.manager/scripts/VMClone.php    |  2 +-
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/emhttp/languages/en_US/helptext.txt b/emhttp/languages/en_US/helptext.txt
index 1689681ed..d5f7082a4 100644
--- a/emhttp/languages/en_US/helptext.txt
+++ b/emhttp/languages/en_US/helptext.txt
@@ -1582,7 +1582,7 @@ Stopping the VM Manager will first attempt to shutdown all running VMs. After 60
 :end
 
 :vms_disable_help:
-Stop VMs from Autostarting when VM Manager starts.
+Stop VMs from Autostarting\Starting when VM Manager starts or open is run from the gui to start, error message will be seen.
 :end
 
 :vms_libvirt_volume_help:
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 1693a06fe..04f393221 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -99,7 +99,7 @@ _(Enable VMs)_:
 
 :vms_enable_help:
 
-_(Disable Autostart VMs)_:
+_(Disable Autostart/Start option for VMs)_:
 : <select id="DISABLE" name="DISABLE">
   <?= mk_option(htmlspecialchars($domain_cfg['DISABLE']), 'no', _('No'))?>
   <?= mk_option(htmlspecialchars($domain_cfg['DISABLE']), 'yes', _('Yes'))?>
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 9575152c6..7acceeeb9 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -779,7 +779,7 @@ private static $encoding = 'UTF-8';
 					$boolBlacklisted = true;
 				}
 
-				$overrideCheck = "${arrMatch['typeid']}:${arrMatch['productid']}" ;
+				$overrideCheck = "{$arrMatch['typeid']}:{$arrMatch['productid']}" ;
 				if (in_array($overrideCheck,$arrWhiteListOverride) ) $boolBlacklisted = false;
 
 				$strClass = 'other';
@@ -1515,11 +1515,9 @@ private static $encoding = 'UTF-8';
 		foreach($disks as $disk)   {
 			$file = $disk["file"] ;
 			$pathinfo =  pathinfo($file) ;
-			$filenew = $pathinfo["dirname"].'/'.$pathinfo["filename"].'.'.$name.'qcow2' ;
 			$capacity = $capacity + $disk["capacity"] ;
 		}
-		$dirpath = $pathinfo["dirname"] ;
-
+	
 		#Check free space.
 		write("addLog\0".htmlspecialchars("Checking for free space"));
 		$dirfree = disk_free_space($pathinfo["dirname"]) ;
@@ -1578,12 +1576,11 @@ private static $encoding = 'UTF-8';
 			$sourcerealdisk = trim(shell_exec("getfattr --absolute-names --only-values -n system.LOCATION ".escapeshellarg($source)." 2>/dev/null"));	
             $reptgt = str_replace('/mnt/user/', "/mnt/$sourcerealdisk/", $target);
             $repsrc = str_replace('/mnt/user/', "/mnt/$sourcerealdisk/", $source);
-            #var_dump($repsrc,$reptgt) ;
         
 			$cmdstr = "cp --reflink=always '$repsrc' '$reptgt'" ;
         	if ($reflink == true) { $refcmd = $cmdstr ; } else {$refcmd = false; }
 			$cmdstr = "rsync -ahPIXS  --out-format=%f --info=flist0,misc0,stats0,name1,progress2 '$source' '$target'" ;
-			$error = execCommand_nchan($cmdstr,$path,$refcmd) ;
+			$error = execCommand_nchan_clone($cmdstr,$target,$refcmd) ;
 			if (!$error) { write("addLog\0".htmlspecialchars("Image copied failed."));  return( false) ; }
 		}
 
@@ -1637,7 +1634,7 @@ private static $encoding = 'UTF-8';
 	  $disks =$lv->get_disk_stats($vm) ;
 		  foreach($disks as $disk)   {
 			  $file = $disk["file"] ;
-			  $output = "" ;
+			  $output = array() ;
 			  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 			  foreach($output as $key => $line) {
 				  $line=str_replace("image: ","",$line) ;
@@ -1673,7 +1670,7 @@ private static $encoding = 'UTF-8';
 		  $disks =$lv->get_disk_stats($vm) ;
 		  foreach($disks as $disk)   {
 			  $file = $disk["file"] ;
-			  $output = "" ;
+			  $output = array() ;
 			  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 			  foreach($output as $key => $line) {
 				  $line=str_replace("image: ","",$line) ;
@@ -1693,7 +1690,7 @@ private static $encoding = 'UTF-8';
   
 		  $value = json_encode($snaps,JSON_PRETTY_PRINT) ;
 		  $res = $lv->get_domain_by_name($vm);
-		  if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_create_snapshot($lv->domain_get_uuid($vm),$name) ;
+		  #if (!empty($lv->domain_get_ovmf($res))) $nvram = $lv->nvram_create_snapshot($lv->domain_get_uuid($vm),$name) ;
 
 
 		  #Remove any NVRAMs that are no longer valid.
@@ -1907,11 +1904,12 @@ private static $encoding = 'UTF-8';
 	  global $lv ;
 	  $snapslist= getvmsnapshots($vm) ;
 	  $data = "<br><br>Images and metadata to remove if tickbox checked.<br>" ;
-
+      $capacity = 0 ;
+	  $diskspec = "" ;
 	  $disks =$lv->get_disk_stats($vm) ;
 	  foreach($disks as $disk)   {
 		  $file = $disk["file"] ;
-		  $output = "" ;
+		  $output = array() ;
 		  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 		  foreach($output as $key => $line) {
 			  $line=str_replace("image: ","",$line) ;
@@ -1922,8 +1920,8 @@ private static $encoding = 'UTF-8';
 		  $reversed = array_reverse($output) ;
 		  $snaps[$vm][$rev] = $reversed ;
 		  $pathinfo =  pathinfo($file) ;
-		  $filenew = $pathinfo["dirname"].'/'.$pathinfo["filename"].'.'.$name.'qcow2' ;
-		  $diskspec .= " --diskspec ".$disk["device"].",snapshot=external,file=".$filenew ;
+		  #$filenew = $pathinfo["dirname"].'/'.$pathinfo["filename"].'.'.$name.'qcow2' ;
+		  #$diskspec .= " --diskspec ".$disk["device"].",snapshot=external,file=".$filenew ;
 		  $capacity = $capacity + $disk["capacity"] ;
 	  }
 
@@ -1970,7 +1968,7 @@ private static $encoding = 'UTF-8';
 	  $disks =$lv->get_disk_stats($vm) ;
 	  foreach($disks as $disk)   {
 		  $file = $disk["file"] ;
-		  $output = "" ;
+		  $output = array() ;
 		  exec("qemu-img info --backing-chain -U $file  | grep image:",$output) ;
 		  foreach($output as $key => $line) {
 			  $line=str_replace("image: ","",$line) ;
@@ -2096,7 +2094,7 @@ OPTIONS
 
 		  $error = execCommand_nchan($cmdstr,$path) ;
 		  if (!$error) { 
-			  $arrResponse =  ['error' => substr($output[0],6) ] ;
+			  $arrResponse =  ['error' => "Process Failed"] ;
 			  return($arrResponse) ;
 		  } else {
 			  $arrResponse = ['success' => true] ;
@@ -2146,7 +2144,7 @@ OPTIONS
   $disks =$lv->get_disk_stats($vm) ;
   foreach($disks as $disk)   {
 	  $file = $disk["file"] ;
-	  $output = "" ;
+	  $output = array() ;
 	  exec("qemu-img info --backing-chain -U '$file'  | grep image:",$output) ;
 	  foreach($output as $key => $line) {
 		  $line=str_replace("image: ","",$line) ;
@@ -2186,7 +2184,7 @@ OPTIONS
   $error = execCommand_nchan($cmdstr,$path) ;
   
   if (!$error)  { 
-	  $arrResponse =  ['error' => substr($output[0],6) ] ;
+	  $arrResponse =  ['error' => "Process Failed" ] ;
 	  return($arrResponse) ;
   } else {
 	  # Remove nvram snapshot
@@ -2196,6 +2194,7 @@ OPTIONS
 	  }
 
   refresh_snapshots_database($vm) ;
+  $ret = $ret = delete_snapshots_database("$vm","$snap") ; 
   if($ret)
 	  $data = ["error" => "Unable to remove snap metadata $snap"] ;
   else
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
index 59b846f4d..f11df0a8c 100755
--- a/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMAjaxCall.php
@@ -40,7 +40,7 @@ function execCommand_nchan($command,$idx) {
 	[$cmd,$args] = explode(' ',$command,2);
 	write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Command execution')."</legend>".basename($cmd).' '.str_replace(" -","<br>&nbsp;&nbsp;-",htmlspecialchars($args))."<br><span id='wait-$waitID'>"._('Please wait')." </span><p class='logLine'></p></fieldset>","show_Wait\0$waitID");
 	write("addLog\0<br>") ;
-	write("addToID\0$idx\0 $action") ;
+	#write("addToID\0$idx\0 $action") ;
 	$proc = popen("$command 2>&1",'r');
 	while ($out = fgets($proc)) {
 		$out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out);
diff --git a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
index 89e36bc6c..2c33227f7 100755
--- a/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
+++ b/emhttp/plugins/dynamix.vm.manager/scripts/VMClone.php
@@ -36,7 +36,7 @@ function write(...$messages){
 	}
 	curl_close($com);
   }
-  function execCommand_nchan($command,$idx,$refcmd=false) {
+  function execCommand_nchan_clone($command,$idx,$refcmd=false) {
 	$waitID = mt_rand();
 	if ($refcmd) {
 		[$cmd,$args] = explode(' ',$refcmd,2);