From 34f7d4968d5b6a26fa5aa1b8b24283ac6e04650c Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 15 Mar 2025 16:22:37 +0000
Subject: [PATCH 01/85] Save PCI Data.
---
etc/rc.d/rc.6 | 4 ++++
sbin/savepcidata | 31 +++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
create mode 100644 sbin/savepcidata
diff --git a/etc/rc.d/rc.6 b/etc/rc.d/rc.6
index 8368d0f93..27022117c 100755
--- a/etc/rc.d/rc.6
+++ b/etc/rc.d/rc.6
@@ -219,6 +219,10 @@ if [[ ! -f /boot/logs/syslog && -z $MIRROR && -z $COPY ]]; then
fi
fi
+# Save PCI data to validate system changes at system start.
+
+/usr/sbin/savepcidata
+
# Before unmounting file systems write a reboot or halt record to wtmp.
/sbin/$SHUTDOWN_COMMAND -w
diff --git a/sbin/savepcidata b/sbin/savepcidata
new file mode 100644
index 000000000..01d24ae46
--- /dev/null
+++ b/sbin/savepcidata
@@ -0,0 +1,31 @@
+#!/usr/bin/php
+ $parts[0], // Full PCI address
+ 'class' => trim($parts[1], '"'),
+ 'vendor_id' => trim($parts[2], '"'),
+ 'device_id' => trim($parts[3], '"'),
+ 'revision' => (strpos($parts[4], '-r') === 0) ? substr($parts[4], 2) : null,
+ ];
+
+ // Determine correct indices for subsystem vendor/device IDs
+ $subsys_vendor_index = (isset($device['revision']) ? 5 : 4);
+ $subsys_device_index = $subsys_vendor_index + 1;
+
+ $device['subsystem_vendor_id'] = trim($parts[$subsys_vendor_index], '"');
+ $device['subsystem_device_id'] = trim($parts[$subsys_device_index], '"');
+
+ $devices[] = $device;
+ }
+
+ file_put_contents("/boot/config/savedpcidata.json",json_encode($devices,JSON_PRETTY_PRINT));
+?>
\ No newline at end of file
From d1dd42246c5af2032ff2f110059a4843ee98dd8c Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 15 Mar 2025 16:33:39 +0000
Subject: [PATCH 02/85] Set executable permission for savepcidata
---
sbin/savepcidata | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 sbin/savepcidata
diff --git a/sbin/savepcidata b/sbin/savepcidata
old mode 100644
new mode 100755
From cfdd4c487d92eb02750b69b1adb79c5c982b0904 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Fri, 4 Apr 2025 10:20:26 +0100
Subject: [PATCH 03/85] Initial commit
---
.../dynamix.vm.manager/VMMachines.page | 11 ++--
.../templates/Custom.form.php | 9 ++-
emhttp/plugins/dynamix/CPUvms.page | 15 ++++-
emhttp/plugins/dynamix/DashStats.page | 24 +++-----
emhttp/plugins/dynamix/include/CPUset.php | 13 +++--
emhttp/plugins/dynamix/include/Helpers.php | 58 +++++++++++++++++++
emhttp/plugins/dynamix/include/SysDevs.php | 11 +++-
7 files changed, 111 insertions(+), 30 deletions(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index 19b64eee3..713cf4198 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -20,6 +20,8 @@ Markdown="false"
0) $core_type = "$core_types[$cpu1]"; else $core_type = "";
if (!$cpu2) {
- echo "vCPUs: {$vm['domain']['vcpus']} $nopining ";
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index ef782b506..fa8e5118e 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -555,16 +555,19 @@ if ($snapshots!=null && count($snapshots) && !$boolNew) {
1 ? 'checked' : 'checked disabled') : '';
+ if ($is_intel_cpu && count($core_types) > 0) $core_type = "{$core_types[$cpu1]}"; else $core_type = "";
if (!$cpu2) {
- echo "
cpu $cpu1 ";
+ echo "
cpu $cpu1 ";
} else {
- echo "
cpu $cpu1 / $cpu2 ";
+ echo "
cpu $cpu1 / $cpu2 ";
$extra = ($arrConfig['domain']['vcpu'] && in_array($cpu2, $arrConfig['domain']['vcpu'])) ? ($arrConfig['domain']['vcpus'] > 1 ? 'checked' : 'checked disabled') : '';
- echo "
";
+ echo "
";
}
}
?>
diff --git a/emhttp/plugins/dynamix/CPUvms.page b/emhttp/plugins/dynamix/CPUvms.page
index 89e6e6f25..297ab883c 100644
--- a/emhttp/plugins/dynamix/CPUvms.page
+++ b/emhttp/plugins/dynamix/CPUvms.page
@@ -22,10 +22,12 @@ $cpus = cpu_list();
$total = count($cpus);
$spinner = "
";
$cpuset = implode(';',$cpus);
+$is_intel_cpu = is_intel_cpu();
+$core_types = $is_intel_cpu ? get_intel_core_types() : [];
function create($type = "") {
// create the table header. Make multiple rows when CPU cores are many ;)
- global $total, $cpus;
+ global $total, $cpus, $is_intel_cpu, $core_types;
$loop = floor(($total-1)/32) + 1;
$text = [];
for ($c = 0; $c < $loop; $c++) {
@@ -39,8 +41,12 @@ function create($type = "") {
}
$label = implode('
', array_fill(0, $loop, 'CORES:' . ($cpu2 ? '
CORES:' : '')));
if ($type == "vm") echo "
VCPUS ";
+
echo "
$label " . implode(array_map(function($t) {
- return "
$t ";
+ global $is_intel_cpu, $core_types;
+ [$cpu1, $cpu2] = my_preg_split('/[,
]/',$t);
+ if ($is_intel_cpu && count($core_types) > 0) $core_type = "$core_types[$cpu1]"; else $core_type = "";
+ return "
$t ";
}, $text));
}
?>
@@ -175,7 +181,10 @@ function ct() {
/* Inject thread to containers toggles */
if ($('a[onclick^="thread2containers"]').length === 0) {
$('form[name=ct]').find('thead tr th:gt(1)').each((i, elem) => {
- elem.innerHTML = elem.innerHTML.replace(/(\d+)/g, '
$1 ');
+ // Preserve the existing title if available
+ let existingTitle = elem.title || "";
+ let newTitle = existingTitle ? existingTitle + "
_(Toggle thread to containers)_" : "_(Toggle thread to containers)_";
+ elem.innerHTML = elem.innerHTML.replace(/(\d+)/g, '
$1 ');
});
}
});
diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 5f2e59ad0..1e418c080 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -14,19 +14,6 @@ Nchan="wg_poller,update_1,update_2,update_3,ups_status:stop,vm_dashusage"
*/
?>
+
_(Processor)_
@@ -265,14 +257,16 @@ switch ($theme) {
CPU $cpu1 - HT $cpu2 0%
0%
CPU $cpu1 $core_type - HT $cpu2 0%
0%
CPU $cpu1 0%
CPU $cpu1 $core_type 0%
$t ";},$text));
diff --git a/emhttp/plugins/dynamix/include/Helpers.php b/emhttp/plugins/dynamix/include/Helpers.php
index 68474afcf..d21633c64 100644
--- a/emhttp/plugins/dynamix/include/Helpers.php
+++ b/emhttp/plugins/dynamix/include/Helpers.php
@@ -416,4 +416,62 @@ function device_exists($name)
global $disks,$devs;
return (array_key_exists($name, $disks) && !str_contains(_var($disks[$name],'status'),'_NP')) || (array_key_exists($name, $devs));
}
+
+
+# Check for process Core Types.
+function parse_cpu_ranges($file) {
+ if (!is_file($file)) return null;
+ $ranges = file_get_contents($file);
+ $ranges = trim($ranges);
+ $cores = [];
+ foreach (explode(',', $ranges) as $range) {
+ if (strpos($range, '-') !== false) {
+ list($start, $end) = explode('-', $range);
+ $cores = array_merge($cores, range((int)$start, (int)$end));
+ } else {
+ $cores[] = (int)$range;
+ }
+ }
+ return $cores;
+}
+
+function get_intel_core_types() {
+ $core_types = array();
+ $cpu_core_file = "/sys/devices/cpu_core/cpus";
+ $cpu_atom_file = "/sys/devices/cpu_atom/cpus";
+ $p_cores = parse_cpu_ranges($cpu_core_file);
+ $e_cores = parse_cpu_ranges($cpu_atom_file);
+ if ($p_cores) {
+ foreach ($p_cores as $core) {
+ $core_types[$core] = _("P-Core");
+ }
+ }
+ if ($e_cores) {
+ foreach ($e_cores as $core) {
+ $core_types[$core] = _("E-Core");
+ }
+ }
+ return $core_types;
+}
+
+function dmidecode($key,$n,$all=true) {
+ $entries = array_filter(explode($key,shell_exec("dmidecode -qt$n")??""));
+ $properties = [];
+ foreach ($entries as $entry) {
+ $property = [];
+ foreach (explode("\n",$entry) as $line) if (strpos($line,': ')!==false) {
+ [$key,$value] = my_explode(': ',trim($line));
+ $property[$key] = $value;
+ }
+ $properties[] = $property;
+ }
+ return $all ? $properties : $properties[0]??null;
+}
+
+function is_intel_cpu() {
+ $cpu = dmidecode('Processor Information','4',0);
+ $cpu_vendor = $cpu['Manufacturer'] ?? "";
+ $is_intel_cpu = stripos($cpu_vendor, "intel") !== false ? true : false;
+ return $is_intel_cpu;
+}
?>
diff --git a/emhttp/plugins/dynamix/include/SysDevs.php b/emhttp/plugins/dynamix/include/SysDevs.php
index 32fbddb22..73b9e09aa 100644
--- a/emhttp/plugins/dynamix/include/SysDevs.php
+++ b/emhttp/plugins/dynamix/include/SysDevs.php
@@ -211,11 +211,20 @@ EOT;
}
break;
case 't2':
+ $is_intel_cpu = is_intel_cpu();
+ $core_types = $is_intel_cpu ? get_intel_core_types() : [];
+ var_dump($is_intel_cpu,$core_types);
exec('cat /sys/devices/system/cpu/*/topology/thread_siblings_list|sort -nu',$pairs);
$i = 1;
foreach ($pairs as $line) {
+ $line2 = $line;
$line = preg_replace(['/(\d+)[-,](\d+)/','/(\d+)\b/'],['$1 / $2','cpu $1'],$line);
- echo "".(strpos($line,'/')===false?"Single":"Pair ".$i++).": $line ".(strpos($line,'/')===false?"Single":"Pair ".$i++).": $line $core_type $image $vm "._($status)." $image ";
+ echo "$vm ";
+ #var_dump($pcierror,$vmpciids);
+ if ($pcierror) echo ""._($status)." $desc ";
echo "$vcpu $mem ";
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
index 69f77f5c5..018f469dc 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt.php
@@ -2257,6 +2257,18 @@ class Libvirt {
return ['pci' => $devs_pci, 'usb' => $devs_usb];
}
+ function domain_get_vm_pciids($domain) {
+ $hostdevs=$this->domain_get_host_devices_pci($domain);
+ $vmpcidevs=[];
+ foreach($hostdevs as $key => $dev) {
+ $vmpcidevs[$dev['id']] = [
+ 'vendor_id' => ltrim($dev['vendor_id'], '0x'),
+ 'device_id' => ltrim($dev['product_id'], '0x'),
+ ];
+ }
+ return $vmpcidevs;
+ }
+
function get_nic_info($domain) {
$macs = $this->get_xpath($domain, "//domain/devices/interface/mac/@address", false);
if (!$macs) return $this->_set_last_error();
diff --git a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
index e7899cb32..71431b8ff 100644
--- a/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
+++ b/emhttp/plugins/dynamix.vm.manager/javascript/vmmanager.js
@@ -83,7 +83,7 @@ function ajaxVMDispatchWebUI(params, spin){
}
},'json');
}
-function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, fstype="QEMU",consolein="web;no",usage=false,webui=""){
+function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, fstype="QEMU",consolein="web;no",usage=false,webui="",pcierror=false){
var opts = [];
var path = location.pathname;
var x = path.indexOf("?");
@@ -172,22 +172,28 @@ function addVMContext(name, uuid, template, state, vmrcurl, vmrcprotocol, log, f
ajaxVMDispatch({action:"domain-destroy", uuid:uuid}, "loadlist");
}});
} else {
- opts.push({text:_("Start"), icon:"fa-play", action:function(e) {
- e.preventDefault();
- ajaxVMDispatch({action:"domain-start", uuid:uuid}, "loadlist");
- }});
- if (vmrcprotocol == "VNC" || vmrcprotocol == "SPICE") {
- if (console == "web" || console == "both") {
- opts.push({text:_("Start with console")+ " (" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
- e.preventDefault();
- ajaxVMDispatchconsole({action:"domain-start-console", uuid:uuid, vmrcurl:vmrcurl}, "loadlist") ;
- }});}
- if (console == "remote" || console == "both") {
- opts.push({text:_("Start with remote-viewer")+ " (" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
- e.preventDefault();
- ajaxVMDispatchconsoleRV({action:"domain-start-consoleRV", uuid:uuid, vmrcurl:vmrcurl}, "loadlist") ;
- }});
+ if (!pcierror) {
+ opts.push({text:_("Start"), icon:"fa-play", action:function(e) {
+ e.preventDefault();
+ ajaxVMDispatch({action:"domain-start", uuid:uuid}, "loadlist");
+ }});
+ if (vmrcprotocol == "VNC" || vmrcprotocol == "SPICE") {
+ if (console == "web" || console == "both") {
+ opts.push({text:_("Start with console")+ " (" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
+ e.preventDefault();
+ ajaxVMDispatchconsole({action:"domain-start-console", uuid:uuid, vmrcurl:vmrcurl}, "loadlist") ;
+ }});}
+ if (console == "remote" || console == "both") {
+ opts.push({text:_("Start with remote-viewer")+ " (" + vmrcprotocol + ")" , icon:"fa-play", action:function(e) {
+ e.preventDefault();
+ ajaxVMDispatchconsoleRV({action:"domain-start-consoleRV", uuid:uuid, vmrcurl:vmrcurl}, "loadlist") ;
+ }});
+ }
}
+ } else {
+ opts.push({text:_("Start disabled due to PCI Changes"), icon:"fa fa-minus-circle orb red-orb", action:function(e) {
+ e.preventDefault();
+ }});
}
}
opts.push({divider:true});
diff --git a/emhttp/plugins/dynamix/SysDevs.page b/emhttp/plugins/dynamix/SysDevs.page
index dce5eb649..02ed63cf8 100644
--- a/emhttp/plugins/dynamix/SysDevs.page
+++ b/emhttp/plugins/dynamix/SysDevs.page
@@ -46,6 +46,27 @@ function applyCfg() {
$("#applycfg").attr("disabled",true);
});
}
+function ackPCI(pcidevice,action) {
+ switch(action) {
+ case 'removed':
+ // Remove entry from saved.
+ swaltext = "_(Acknowledge removal of PCI Address)_: "+pcidevice;
+ break;
+ case 'changed':
+ // Update saved with current
+ swaltext = "_(Acknowledge update of PCI Address)_: "+pcidevice;
+ break;
+ case 'added':
+ // Add to saved.
+ swaltext = "_(Acknowledge addition of PCI Address)_: "+pcidevice;
+ break;
+ }
+ swal({title:"Are you sure?",text:swaltext,type:"warning",html:true,showCancelButton:true},function(){
+ $.post('/webGui/include/PCIUpdate.php',{action:action,pciid:pcidevice})
+ $('#t1').load('/webGui/include/SysDevs.php',{table:'t1'});
+ });
+}
+
diff --git a/emhttp/plugins/dynamix/include/Helpers.php b/emhttp/plugins/dynamix/include/Helpers.php
index 9185a532d..1a24d1a21 100644
--- a/emhttp/plugins/dynamix/include/Helpers.php
+++ b/emhttp/plugins/dynamix/include/Helpers.php
@@ -419,11 +419,11 @@ function device_exists($name)
// Load saved PCI data
function loadSavedData($filename) {
- if (!file_exists($filename)) {
- die("File not found: $filename\n");
- }
+ if (file_exists($filename)) {
+ $saveddata = file_get_contents($filename);
+ } else $saveddata = "";
- return json_decode(file_get_contents($filename), true);
+ return json_decode($saveddata, true);
}
// Run lspci -Dmn to get the current devices
@@ -436,10 +436,14 @@ function loadCurrentPCIData() {
if (count($parts) < 6) continue; // Skip malformed lines
+ $description_str = shell_exec(("lspci -s ".$parts[0]));
+ $description = preg_replace('/^\S+\s+/', '', $description_str);
+
$device = [
'class' => trim($parts[1], '"'),
'vendor_id' => trim($parts[2], '"'),
'device_id' => trim($parts[3], '"'),
+ 'description' => trim($description,'"'),
];
$devices[$parts[0]] = $device;
@@ -452,6 +456,7 @@ function comparePCIData() {
$changes = [];
$saved = loadSavedData("/boot/config/savedpcidata.json");
+ if (!$saved) return [];
$current = loadCurrentPCIData();
#$current = loadSavedData("/boot/config/current.json");
diff --git a/emhttp/plugins/dynamix/include/PCIUpdate.php b/emhttp/plugins/dynamix/include/PCIUpdate.php
new file mode 100644
index 000000000..70c85d6f2
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/PCIUpdate.php
@@ -0,0 +1,34 @@
+
+
diff --git a/emhttp/plugins/dynamix/include/SysDevs.php b/emhttp/plugins/dynamix/include/SysDevs.php
index 32fbddb22..1027c3a7f 100644
--- a/emhttp/plugins/dynamix/include/SysDevs.php
+++ b/emhttp/plugins/dynamix/include/SysDevs.php
@@ -18,6 +18,8 @@ require_once "$docroot/webGui/include/Helpers.php";
$_SERVER['REQUEST_URI'] = 'tools';
require_once "$docroot/webGui/include/Translations.php";
+$pci_device_diffs = comparePCIData();
+
function usb_physical_port($usbbusdev) {
if (preg_match('/^Bus (?P\S+) Device (?P\S+): ID (?P\S+)(?P.*)$/', $usbbusdev, $usbMatch)) {
//udevadm info -a --name=/dev/bus/usb/003/002 | grep KERNEL==
@@ -115,6 +117,14 @@ case 't1':
$iommuinuse[] = (strpos($string,'/')) ? strstr($string, '/', true) : $string;
}
exec('lsscsi -s',$lsscsi);
+ // Filter for 'removed' devices
+ $removedArr = array_filter($pci_device_diffs, function($entry) {
+ return isset($entry['status']) && $entry['status'] === 'removed';
+ });
+ foreach ($removedArr as $removedpci => $removeddata) {
+ $groups[] = "IOMMU "._("Removed");
+ $groups[] = "\tR[{$removeddata['device']['vendor_id']}:{$removeddata['device']['device_id']}] ".str_replace("0000:","",$removedpci)." ".trim($removeddata['device']['description'],"\n");
+ }
foreach ($groups as $line) {
if (!$line) continue;
if ($line[0]=='I') {
@@ -126,6 +136,8 @@ case 't1':
$line = preg_replace("/^\t/","",$line);
$vd = trim(explode(" ", $line)[0], "[]");
$pciaddress = explode(" ", $line)[1];
+ $removed = $line[0]=='R' ? true : false;
+ if ($removed) $line=preg_replace('/R/', '', $line, 1);
if (preg_match($BDF_REGEX, $pciaddress)) {
// By default lspci does not output the when the only domain in the system is 0000. Add it back.
$pciaddress = "0000:".$pciaddress;
@@ -140,13 +152,31 @@ case 't1':
if ((strpos($line, 'Host bridge') === false) && (strpos($line, 'PCI bridge') === false)) {
if (file_exists('/sys/kernel/iommu_groups/'.$iommu.'/devices/'.$pciaddress.'/reset')) echo "";
+ if (!$removed) {
echo in_array($iommu, $iommuinuse) ? ' or just
echo (in_array($pciaddress."|".$vd, $vfio_cfg_devices) || in_array($pciaddress, $vfio_cfg_devices)) ? " checked>" : ">";
+ }
} else { echo " "; }
echo ' ',$line,' ";
+ echo " ";
+ echo _("Differences");
+ foreach($pci_device_diffs[$pciaddress]['differences'] as $key => $changes){
+ echo " $key "._("before").":{$changes['old']} "._("after").":{$changes['new']} ";
+ }
+ echo " ";
$running = 0;
+ $pci_device_changes = comparePCIData();
foreach ($vms as $vm) {
$res = $lv->get_domain_by_name($vm);
$uuid = libvirt_domain_get_uuid_string($res);
@@ -156,7 +157,15 @@ if ($_POST['vms']) {
if (!isset($domain_cfg["CONSOLE"])) $vmrcconsole = "web"; else $vmrcconsole = $domain_cfg["CONSOLE"];
if (!isset($domain_cfg["RDPOPT"])) $vmrcconsole .= ";no"; else $vmrcconsole .= ";".$domain_cfg["RDPOPT"];
$WebUI = html_entity_decode($arrConfig["template"]["webui"]);
- $menu = sprintf("onclick=\"addVMContext('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')\"", addslashes($vm), addslashes($uuid), addslashes($template), $state, addslashes($vmrcurl), strtoupper($vmrcprotocol), addslashes($log),addslashes($fstype), $vmrcconsole,false,addslashes(str_replace('"',"'",$WebUI)));
+ $vmpciids = $lv->domain_get_vm_pciids($vm);
+ $pcierror = false;
+ foreach($vmpciids as $pciid => $pcidetail) {
+ if (isset($pci_device_changes["0000:".$pciid])) {
+ $pcierror = true;
+ $image = '
From 9f1d5e6b3ba9f838852915a7820b509ad214592b Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Mon, 7 Apr 2025 11:13:12 +0100
Subject: [PATCH 08/85] PHP Fixes and code updates
---
.../dynamix.vm.manager/include/VMMachines.php | 8 ++---
.../dynamix.vm.manager/include/libvirt.php | 4 +--
.../plugins/dynamix/include/DashboardApps.php | 6 ++--
emhttp/plugins/dynamix/include/Helpers.php | 31 ++++++++++---------
4 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
index eb1bd6187..f1e9bcb3b 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMMachines.php
@@ -56,10 +56,7 @@ foreach ($vms as $vm) {
$vmpciids = $lv->domain_get_vm_pciids($vm);
$pcierror = false;
foreach($vmpciids as $pciid => $pcidetail) {
- if (isset($pci_device_changes["0000:".$pciid])) {
- $pcierror = true;
- $image = '$image ";
echo "$vm ";
- #var_dump($pcierror,$vmpciids);
- if ($pcierror) echo ""._($status)." $desc ";
echo "$vcpu $image $vm"._($status)." $image $vm";
+ if ($pcierror) echo ""._($status)."
Date: Thu, 3 Apr 2025 18:10:05 -0700
Subject: [PATCH 09/85] feat: implement ThemeHelper class to centralize theme
management and improve color handling across various pages
---
.../DockerSettings.page | 2 +-
.../include/CreateDocker.php | 3 +-
.../dynamix.vm.manager/VMMachines.page | 9 +-
.../dynamix.vm.manager/VMSettings.page | 2 +-
emhttp/plugins/dynamix/DashStats.page | 3 +-
emhttp/plugins/dynamix/DisplaySettings.page | 9 +-
emhttp/plugins/dynamix/include/.login.php | 13 +-
.../plugins/dynamix/include/.set-password.php | 18 +-
emhttp/plugins/dynamix/include/Boot.php | 13 +-
.../dynamix/include/DefaultPageLayout.php | 23 ++-
.../plugins/dynamix/include/ThemeHelper.php | 154 ++++++++++++++++++
11 files changed, 204 insertions(+), 45 deletions(-)
create mode 100644 emhttp/plugins/dynamix/include/ThemeHelper.php
diff --git a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
index 3102585b3..8ca6473b9 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
@@ -123,7 +123,7 @@ function hide_eth($network) {
return in_array($network,$mgmt_port) && lan_port('wlan0',true)==1;
}
-$bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
+$bgcolor = $themeHelper->isLightTheme() ? '#f2f2f2' : '#1c1c1c'; // $themeHelper set in DefaultPageLayout.php
//Check if docker.cfg does exist
$no_dockercfg = !is_file('/boot/config/docker.cfg');
diff --git a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
index c47c50b16..0e77a6cb4 100644
--- a/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
+++ b/emhttp/plugins/dynamix.docker.manager/include/CreateDocker.php
@@ -318,7 +318,8 @@ $authoringMode = $dockercfg['DOCKER_AUTHORING_MODE'] == "yes" ? true : false;
$authoring = $authoringMode ? 'advanced' : 'noshow';
$disableEdit = $authoringMode ? 'false' : 'true';
$showAdditionalInfo = '';
-$bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
+
+$bgcolor = $themeHelper->isLightTheme() ? '#f2f2f2' : '#1c1c1c'; // $themeHelper set in DefaultPageLayout.php
# Search for existing TAILSCALE_ entries in the Docker template
$TS_existing_vars = false;
diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index 9e4ef09e2..dd9adc55c 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -20,12 +20,13 @@ Markdown="false"
getThemeName();
$cpus = cpu_list();
-$hover = in_array($theme,['white','azure']) ? 'rgba(0,0,0,0.1)' : 'rgba(255,255,255,0.1)';
-$bgcolor = in_array($theme,['white','azure']) ? '#f2f2f2' : '#1c1c1c';
-$fgcolor = in_array($theme,['white','azure']) ? '#1c1c1c' : '#f2f2f2';
-$incolor = $theme!='gray' ? $bgcolor : '#121510';
+$hover = $themeHelper->isLightTheme() ? 'rgba(0,0,0,0.1)' : 'rgba(255,255,255,0.1)';
+$bgcolor = $themeHelper->isLightTheme() ? '#f2f2f2' : '#1c1c1c';
+$fgcolor = $themeHelper->isLightTheme() ? '#1c1c1c' : '#f2f2f2';
+$incolor = $themeName !== 'gray' ? $bgcolor : '#121510';
function showCPUs($uuid) {
global $cpus;
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 12337f911..d6c5e29e7 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -92,7 +92,7 @@ if (is_file('/boot/syslinux/syslinux.cfg')) {
$arrValidNetworks = getValidNetworks();
$pcie_acs_override = detect($bootcfg, $bootenv, 'pcie_acs_override');
$vfio_allow_unsafe = detect($bootcfg, $bootenv, 'allow_unsafe_interrupts');
-$bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
+$bgcolor = $themeHelper->isLightTheme() ? '#f2f2f2' : '#1c1c1c';
$started = $var['fsState']=='Started';
$libvirt_up = $libvirt_running=='yes';
$libvirt_log = file_exists("/var/log/libvirt/libvirtd.log");
diff --git a/emhttp/plugins/dynamix/DashStats.page b/emhttp/plugins/dynamix/DashStats.page
index 6cf9e30ed..26df08ff3 100644
--- a/emhttp/plugins/dynamix/DashStats.page
+++ b/emhttp/plugins/dynamix/DashStats.page
@@ -50,8 +50,7 @@ function customTiles($column) {
}
// adjust the text color in log window
-$fgcolor = in_array($theme,['white','azure']) ? '#1c1c1c' : '#f2f2f2';
-exec("sed -ri 's/^\.logLine\{color:#......;/.logLine{color:$fgcolor;/' $docroot/plugins/dynamix.docker.manager/log.htm >/dev/null &");
+$themeHelper->updateDockerLogColor($docroot); // $themeHelper set in DefaultPageLayout.php
exec("/etc/rc.d/rc.docker status >/dev/null",$dummy,$dockerd);
exec("/etc/rc.d/rc.libvirt status >/dev/null",$dummy,$libvirtd);
diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
index e15b0bb31..2c8f93f4d 100644
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -249,11 +249,14 @@ _(Temperature unit)_:
:display_temperature_unit_help:
+getThemeName(); // $themeHelper set in DefaultPageLayout.php
+ $themes = $themeHelper->getThemesFromFileSystem($docroot);
+?>
_(Dynamix color theme)_:
:
-
-
-
+
+
diff --git a/emhttp/plugins/dynamix/include/.login.php b/emhttp/plugins/dynamix/include/.login.php
index 73b6b554b..dc789afbe 100644
--- a/emhttp/plugins/dynamix/include/.login.php
+++ b/emhttp/plugins/dynamix/include/.login.php
@@ -236,7 +236,10 @@ $myFile = "case-model.cfg";
$myCase = file_exists("$boot/$myFile") ? file_get_contents("$boot/$myFile") : false;
extract(parse_plugin_cfg('dynamix', true));
-$theme_dark = in_array($display['theme'], ['black', 'gray']);
+
+require_once "$docroot/plugins/dynamix/include/ThemeHelper.php";
+$themeHelper = new ThemeHelper($display['theme']);
+$isDarkTheme = $themeHelper->isDarkTheme();
?>
@@ -274,8 +277,8 @@ $theme_dark = in_array($display['theme'], ['black', 'gray']);
/
/************************/
body {
- background: ;
- color: ;
+ background: ;
+ color: ;
font-family: clear-sans, sans-serif;
font-size: .875rem;
padding: 0;
@@ -359,7 +362,7 @@ $theme_dark = in_array($display['theme'], ['black', 'gray']);
width: 500px;
margin: 6rem auto;
border-radius: 10px;
- background: ;
+ background: ;
}
#login::after {
content: "";
@@ -451,7 +454,7 @@ $theme_dark = in_array($display['theme'], ['black', 'gray']);
/************************/
@media (max-width: 500px) {
body {
- background: ;
+ background: ;
}
[type=email], [type=number], [type=password], [type=search], [type=tel], [type=text], [type=url], textarea {
font-size: 16px; /* This prevents the mobile browser from zooming in on the input-field. */
diff --git a/emhttp/plugins/dynamix/include/.set-password.php b/emhttp/plugins/dynamix/include/.set-password.php
index 091f31be3..67c8a1a1d 100644
--- a/emhttp/plugins/dynamix/include/.set-password.php
+++ b/emhttp/plugins/dynamix/include/.set-password.php
@@ -40,7 +40,9 @@ if (!empty($_POST['password']) && !empty($_POST['confirmPassword'])) {
return $POST_ERROR = $VALIDATION_MESSAGES['saveError'];
}
-$THEME_DARK = in_array($display['theme'],['black','gray']);
+require_once "$docroot/plugins/dynamix/include/ThemeHelper.php";
+$themeHelper = new ThemeHelper($display['theme']);
+$isDarkTheme = $themeHelper->isDarkTheme();
?>
@@ -78,13 +80,13 @@ $THEME_DARK = in_array($display['theme'],['black','gray']);
/
/************************/
:root {
- --body-bg: ;
- --body-text-color: ;
- --section-bg: ;
- --shadow: ;
- --form-text-color: ;
- --form-bg-color: ;
- --form-border-color: ;
+ --body-bg: ;
+ --body-text-color: ;
+ --section-bg: ;
+ --shadow: ;
+ --form-text-color: ;
+ --form-bg-color: ;
+ --form-border-color: ;
}
body {
background: var(--body-bg);
diff --git a/emhttp/plugins/dynamix/include/Boot.php b/emhttp/plugins/dynamix/include/Boot.php
index 278f9928d..9d1423c1a 100644
--- a/emhttp/plugins/dynamix/include/Boot.php
+++ b/emhttp/plugins/dynamix/include/Boot.php
@@ -24,13 +24,10 @@ $var = parse_ini_file("/var/local/emhttp/var.ini");
/**
* Just like DefaultPageLayout.php
*/
-$theme = strtok($display['theme'],'-');
-$themes1 = in_array($theme,['black','white']);
-$themes2 = in_array($theme,['gray','azure']);
-$themeHtmlClass = "Theme--$theme";
-if ($themes2) {
- $themeHtmlClass .= " Theme--sidebar";
-}
+require_once "$docroot/plugins/dynamix/include/ThemeHelper.php";
+$themeHelper = new ThemeHelper($display['theme']);
+$themeName = $themeHelper->getThemeName();
+$themeHtmlClass = $themeHelper->getThemeHtmlClass();
?>
lang="" class="">
@@ -46,7 +43,7 @@ if ($themes2) {
Date: Fri, 4 Apr 2025 20:50:21 -0700
Subject: [PATCH 24/85] refactor: implement generate_sidebar_icon_css function
and update DefaultPageLayout.php to utilize it for sidebar icon CSS
generation
---
.../dynamix/include/DefaultPageLayout.php | 20 ++++++-------
.../plugins/dynamix/include/PageBuilder.php | 30 +++++++++++++++++++
2 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index fc3a09484..783199677 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -37,6 +37,9 @@ $banner = "$config/plugins/dynamix/banner.png";
$notes = '/var/tmp/unRAIDServer.txt';
if (!file_exists($notes)) file_put_contents($notes,shell_exec("$docroot/plugins/dynamix.plugin.manager/scripts/plugin changes $docroot/plugins/unRAIDServer/unRAIDServer.plg"));
+$taskPages = find_pages('Tasks');
+$buttonPages = find_pages('Buttons');
+
function annotate($text) {echo "\n\n";}
?>
@@ -79,12 +82,9 @@ function annotate($text) {echo "\n\n";}
?>
-lang="" class="">
+lang="" class="getThemeHtmlClass() ?>">
<?=_var($var,'NAME')?>/<?=_var($myPage,'name')?>
Date: Mon, 7 Apr 2025 15:40:01 -0700
Subject: [PATCH 29/85] chore: comment for VMSettings nitpick suggestion
---
emhttp/plugins/dynamix.vm.manager/VMSettings.page | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index d6c5e29e7..8609b79ac 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -92,7 +92,7 @@ if (is_file('/boot/syslinux/syslinux.cfg')) {
$arrValidNetworks = getValidNetworks();
$pcie_acs_override = detect($bootcfg, $bootenv, 'pcie_acs_override');
$vfio_allow_unsafe = detect($bootcfg, $bootenv, 'allow_unsafe_interrupts');
-$bgcolor = $themeHelper->isLightTheme() ? '#f2f2f2' : '#1c1c1c';
+$bgcolor = $themeHelper->isLightTheme() ? '#f2f2f2' : '#1c1c1c'; // $themeHelper set in DefaultPageLayout.php
$started = $var['fsState']=='Started';
$libvirt_up = $libvirt_running=='yes';
$libvirt_log = file_exists("/var/log/libvirt/libvirtd.log");
From ee489bfe5f4887977afc5b8b2b34b6bcc9ab82e3 Mon Sep 17 00:00:00 2001
From: Zack Spear
Date: Mon, 7 Apr 2025 15:42:00 -0700
Subject: [PATCH 30/85] refactor: add error handling for missing theme
directory in ThemeHelper.php
---
emhttp/plugins/dynamix/include/ThemeHelper.php | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/emhttp/plugins/dynamix/include/ThemeHelper.php b/emhttp/plugins/dynamix/include/ThemeHelper.php
index 195353f09..13bd5ad1f 100644
--- a/emhttp/plugins/dynamix/include/ThemeHelper.php
+++ b/emhttp/plugins/dynamix/include/ThemeHelper.php
@@ -135,7 +135,13 @@ class ThemeHelper {
*/
public static function getThemesFromFileSystem(string $docroot): array {
$themes = [];
- $themeFiles = glob("$docroot/webGui/styles/themes/*.css");
+ $themePath = "$docroot/webGui/styles/themes";
+ if (!is_dir($themePath)) {
+ error_log("Theme directory not found: $themePath");
+ return $themes;
+ }
+
+ $themeFiles = glob("$themePath/*.css");
foreach ($themeFiles as $themeFile) {
$themeName = basename($themeFile, '.css');
From a973866514921152fe255a2037bb17c0b117926e Mon Sep 17 00:00:00 2001
From: Zack Spear
Date: Mon, 7 Apr 2025 16:34:54 -0700
Subject: [PATCH 31/85] refactor: $buttonPages output of styles and scripts
location
---
.../dynamix/include/DefaultPageLayout.php | 27 +++++++++++--------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index db6964eeb..f6effd4cb 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -675,6 +675,21 @@ $.ajaxPrefilter(function(s, orig, xhr){
}
});
+
+',"\n";
+ if (is_file($docroot.$css_theme)) echo '";
$tab = 1;
$pages = [];
From 060fb2eb197f7217a2ae611454c793c2f2969e6f Mon Sep 17 00:00:00 2001
From: Zack Spear
Date: Mon, 7 Apr 2025 16:54:15 -0700
Subject: [PATCH 33/85] refactor: move inline JavaScript from
DefaultPageLayout.php to HeadInlineJS.php for improved maintainability
---
.../dynamix/include/DefaultPageLayout.php | 581 +----------------
.../DefaultPageLayout/HeadInlineJS.php | 588 ++++++++++++++++++
2 files changed, 589 insertions(+), 580 deletions(-)
create mode 100644 emhttp/plugins/dynamix/include/DefaultPageLayout/HeadInlineJS.php
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index a61255f2d..4d12b54f9 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -100,587 +100,8 @@ if ($themeHelper->isSidebarTheme()) {
-
+
+
From f8d13b8b0941d0b52fc8da697724490a96b136fd Mon Sep 17 00:00:00 2001
From: Zack Spear
Date: Mon, 7 Apr 2025 17:01:23 -0700
Subject: [PATCH 34/85] refactor: move inline JavaScript from of
DefaultPageLayout.php to BodyInlineJS.php for improved maintainability
---
.../dynamix/include/DefaultPageLayout.php | 477 +----------------
.../DefaultPageLayout/BodyInlineJS.php | 479 ++++++++++++++++++
2 files changed, 480 insertions(+), 476 deletions(-)
create mode 100644 emhttp/plugins/dynamix/include/DefaultPageLayout/BodyInlineJS.php
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 4d12b54f9..432d143a5 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -275,481 +275,6 @@ unset($pages,$page,$pgs,$pg,$icon,$nchan,$running,$start,$stop,$row,$script,$opt
-
-
+
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/BodyInlineJS.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/BodyInlineJS.php
new file mode 100644
index 000000000..f0143b1e1
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/BodyInlineJS.php
@@ -0,0 +1,479 @@
+
+
From 7d763f3f312df90408d88e81d3f1c6fee93a0e0f Mon Sep 17 00:00:00 2001
From: Zack Spear
Date: Mon, 7 Apr 2025 18:02:31 -0700
Subject: [PATCH 35/85] refactor: consolidate nchan script creation in
DefaultPageLayout.php for found pages
---
.../dynamix/include/DefaultPageLayout.php | 23 +++++++++++--------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 432d143a5..85c310661 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -38,6 +38,20 @@ if (!file_exists($notes)) file_put_contents($notes,shell_exec("$docroot/plugins/
$taskPages = find_pages('Tasks');
$buttonPages = find_pages('Buttons');
+$pages = []; // finds subpages
+if (!empty($myPage['text'])) $pages[$myPage['name']] = $myPage;
+if (_var($myPage,'Type')=='xmenu') $pages = array_merge($pages, find_pages($myPage['name']));
+
+// build nchan scripts from found pages
+foreach ($taskPages as $button) {
+ if (isset($button['Nchan'])) nchan_merge($button['root'], $button['Nchan']);
+}
+foreach ($buttonPages as $button) {
+ if (isset($button['Nchan'])) nchan_merge($button['root'], $button['Nchan']);
+}
+foreach ($pages as $page) {
+ if (isset($page['Nchan'])) nchan_merge($page['root'], $page['Nchan']);
+}
function annotate($text) {echo "\n\n";}
@@ -146,8 +160,6 @@ foreach ($taskPages as $button) {
$play = $task==$page ? " active" : "";
echo "";
- // create list of nchan scripts to be started
- if (isset($button['Nchan'])) nchan_merge($button['root'], $button['Nchan']);
}
unset($taskPages);
echo "
";
}
- // create list of nchan scripts to be started
- if (isset($button['Nchan'])) nchan_merge($button['root'], $button['Nchan']);
}
echo "";
@@ -188,9 +198,6 @@ unset($buttonPages,$button);
// Build page content
echo "";
$tab = 1;
-$pages = [];
-if (!empty($myPage['text'])) $pages[$myPage['name']] = $myPage;
-if (_var($myPage,'Type')=='xmenu') $pages = array_merge($pages, find_pages($myPage['name']));
if (isset($myPage['Tabs'])) $display['tabs'] = strtolower($myPage['Tabs'])=='true' ? 0 : 1;
$tabbed = $display['tabs']==0 && count($pages)>1;
@@ -234,8 +241,6 @@ foreach ($pages as $page) {
echo "
";
}
}
- // create list of nchan scripts to be started
- if (isset($page['Nchan'])) nchan_merge($page['root'], $page['Nchan']);
annotate($page['file']);
// include page specific stylesheets (if existing)
$css = "/{$page['root']}/sheets/{$page['name']}";
From 350aceea7f7a1de9f50e70fe7a76dfcf0081bd38 Mon Sep 17 00:00:00 2001
From: Zack Spear
Date: Mon, 7 Apr 2025 18:35:09 -0700
Subject: [PATCH 36/85] refactor: enhance nchan script management in
DefaultPageLayout.php by consolidating logic and improving clarity
---
.../dynamix/include/DefaultPageLayout.php | 55 +++++++++----------
1 file changed, 26 insertions(+), 29 deletions(-)
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 85c310661..a9a031fe0 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -28,8 +28,6 @@ $entity = $notify['entity'] & 1 == 1;
$alerts = '/tmp/plugins/my_alerts.txt';
$wlan0 = file_exists('/sys/class/net/wlan0');
-$nchan = ['webGui/nchan/notify_poller','webGui/nchan/session_check'];
-if ($wlan0) $nchan[] = 'webGui/nchan/wlan0';
$safemode = _var($var,'safeMode')=='yes';
$banner = "$config/plugins/dynamix/banner.png";
@@ -42,16 +40,35 @@ $pages = []; // finds subpages
if (!empty($myPage['text'])) $pages[$myPage['name']] = $myPage;
if (_var($myPage,'Type')=='xmenu') $pages = array_merge($pages, find_pages($myPage['name']));
+// nchan related actions
+$nchan = ['webGui/nchan/notify_poller','webGui/nchan/session_check'];
+if ($wlan0) $nchan[] = 'webGui/nchan/wlan0';
// build nchan scripts from found pages
-foreach ($taskPages as $button) {
- if (isset($button['Nchan'])) nchan_merge($button['root'], $button['Nchan']);
-}
-foreach ($buttonPages as $button) {
- if (isset($button['Nchan'])) nchan_merge($button['root'], $button['Nchan']);
-}
-foreach ($pages as $page) {
+$allPages = array_merge($taskPages, $buttonPages, $pages);
+foreach ($allPages as $page) {
if (isset($page['Nchan'])) nchan_merge($page['root'], $page['Nchan']);
}
+// act on nchan scripts
+if (count($pages)) {
+ $running = file_exists($nchan_pid) ? file($nchan_pid,FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES) : [];
+ $start = array_diff($nchan, $running); // returns any new scripts to be started
+ $stop = array_diff($running, $nchan); // returns any old scripts to be stopped
+ $running = array_merge($start, $running); // update list of current running nchan scripts
+ // start nchan scripts which are new
+ foreach ($start as $row) {
+ $script = explode(':',$row)[0];
+ exec("$docroot/$script &>/dev/null &");
+ }
+ // stop nchan scripts with the :stop option
+ foreach ($stop as $row) {
+ [$script,$opt] = my_explode(':',$row);
+ if ($opt == 'stop') {
+ exec("pkill -f $docroot/$script &>/dev/null &");
+ array_splice($running,array_search($row,$running),1);
+ }
+ }
+ if (count($running)) file_put_contents($nchan_pid,implode("\n",$running)."\n"); else @unlink($nchan_pid);
+}
function annotate($text) {echo "\n\n";}
@@ -252,26 +269,6 @@ foreach ($pages as $page) {
empty($page['Markdown']) || $page['Markdown']=='true' ? eval('?>'.Markdown(parse_text($page['text']))) : eval('?>'.parse_text($page['text']));
if ($close) echo "
Date: Mon, 7 Apr 2025 18:49:36 -0700
Subject: [PATCH 37/85] refactor: restructure DefaultPageLayout.php by
extracting header and navigation into separate files for improved
organization and maintainability
---
.../dynamix/include/DefaultPageLayout.php | 59 +++----------------
.../include/DefaultPageLayout/Header.php | 13 ++++
.../DefaultPageLayout/Navigation/Main.php | 44 ++++++++++++++
3 files changed, 64 insertions(+), 52 deletions(-)
create mode 100644 emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
create mode 100644 emhttp/plugins/dynamix/include/DefaultPageLayout/Navigation/Main.php
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index a9a031fe0..ef0ceccf3 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -156,62 +156,17 @@ if (isset($myPage['Load'])) {
-
+
-
+
+
+
+
+
+
";
-if ($themeHelper->isSidebarTheme()) echo "
";
-echo "
";
-foreach ($taskPages as $button) {
- $page = $button['name'];
- $play = $task==$page ? " active" : "";
- echo "
";
-}
-unset($taskPages);
-echo "
";
-echo "
";
-if (isset($myPage['Lock'])) {
- $title = $themeHelper->isSidebarTheme() ? "" : _('Unlock sortable items');
- echo "
";
-}
-if ($display['usage']) my_usage();
-
-foreach ($buttonPages as $button) {
- if (empty($button['Link'])) {
- $icon = $button['Icon'];
- if (substr($icon,-4)=='.png') {
- $icon = "
";
- } elseif (substr($icon,0,5)=='icon-') {
- $icon = "
";
- } else {
- if (substr($icon,0,3)!='fa-') $icon = "fa-$icon";
- $icon = "
";
- }
- $title = $themeHelper->isSidebarTheme() ? "" : " title=\""._($button['Title'])."\"";
- echo "
";
- } else {
- echo "
";
- }
-}
-
-echo "
";
-
-if ($themeHelper->isSidebarTheme()) echo "
";
-echo "
";
-
-unset($buttonPages,$button);
-
// Build page content
echo "
";
$tab = 1;
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
new file mode 100644
index 000000000..4a33aef78
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Header.php
@@ -0,0 +1,13 @@
+
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Navigation/Main.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Navigation/Main.php
new file mode 100644
index 000000000..762c6c653
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Navigation/Main.php
@@ -0,0 +1,44 @@
+";
+if ($themeHelper->isSidebarTheme()) echo "
";
+echo "
";
+foreach ($taskPages as $button) {
+ $page = $button['name'];
+ $play = $task==$page ? " active" : "";
+ echo "
";
+}
+unset($taskPages);
+echo "
";
+echo "
";
+if (isset($myPage['Lock'])) {
+ $title = $themeHelper->isSidebarTheme() ? "" : _('Unlock sortable items');
+ echo "
";
+}
+if ($display['usage']) my_usage();
+
+foreach ($buttonPages as $button) {
+ if (empty($button['Link'])) {
+ $icon = $button['Icon'];
+ if (substr($icon,-4)=='.png') {
+ $icon = "
";
+ } elseif (substr($icon,0,5)=='icon-') {
+ $icon = "
";
+ } else {
+ if (substr($icon,0,3)!='fa-') $icon = "fa-$icon";
+ $icon = "
";
+ }
+ $title = $themeHelper->isSidebarTheme() ? "" : " title=\""._($button['Title'])."\"";
+ echo "
";
+ } else {
+ echo "
";
+ }
+}
+
+echo "
";
+
+if ($themeHelper->isSidebarTheme()) echo "
";
+echo "
";
+
+unset($buttonPages,$button);
From 19fe88d6330af59d69887f359747bf45c2d57f6e Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Tue, 8 Apr 2025 17:14:33 +0100
Subject: [PATCH 38/85] Update savepcidata in rc.6
---
etc/rc.d/rc.6 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/etc/rc.d/rc.6 b/etc/rc.d/rc.6
index 27022117c..be06262b1 100755
--- a/etc/rc.d/rc.6
+++ b/etc/rc.d/rc.6
@@ -76,6 +76,10 @@ if [[ -x /sbin/hwclock ]]; then
fi
fi
+# Save PCI data to validate system changes at system start.
+log "Save PCI Configuration."
+/usr/local/sbin/savepcidata
+
# Run any local shutdown scripts:
if [[ -x /etc/rc.d/rc.local_shutdown ]]; then
/etc/rc.d/rc.local_shutdown stop
@@ -219,10 +223,6 @@ if [[ ! -f /boot/logs/syslog && -z $MIRROR && -z $COPY ]]; then
fi
fi
-# Save PCI data to validate system changes at system start.
-
-/usr/sbin/savepcidata
-
# Before unmounting file systems write a reboot or halt record to wtmp.
/sbin/$SHUTDOWN_COMMAND -w
From 469b499db1ab1b699043390e91f0452b08057841 Mon Sep 17 00:00:00 2001
From: Zack Spear
Date: Tue, 8 Apr 2025 09:40:35 -0700
Subject: [PATCH 39/85] refactor: enhance navigation structure in Main.php by
improving template usage and updating CSS for better layout and alignment
---
.../DefaultPageLayout/Navigation/Main.php | 118 ++++++++++++------
.../plugins/dynamix/styles/default-base.css | 6 +-
2 files changed, 83 insertions(+), 41 deletions(-)
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/Navigation/Main.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/Navigation/Main.php
index 762c6c653..2b248b534 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout/Navigation/Main.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Navigation/Main.php
@@ -1,44 +1,84 @@
";
-if ($themeHelper->isSidebarTheme()) echo "";
-echo "
";
-foreach ($taskPages as $button) {
- $page = $button['name'];
- $play = $task==$page ? " active" : "";
- echo "
";
-}
-unset($taskPages);
-echo "
";
-echo "
";
-if (isset($myPage['Lock'])) {
- $title = $themeHelper->isSidebarTheme() ? "" : _('Unlock sortable items');
- echo "
";
-}
-if ($display['usage']) my_usage();
+/**
+ * Template is used for both top navigation and sidebar navigation.
+ *
+ * @var $themeHelper ThemeHelper
+ * @var $taskPages array
+ * @var $buttonPages array
+ * @var $display array
+ * @var $task string
+ */
+?>
+";
+
+
+
-unset($buttonPages,$button);
+
+
+
+
+ "; ?>
+
+ "; ?>
+
+
+
+
+ "; ?>
+
+
+
+
+
+
+
+
+
+
+
+ isSidebarTheme()): ?>
+
+
+
Date: Tue, 8 Apr 2025 10:07:13 -0700
Subject: [PATCH 40/85] refactor: extract global elements from
DefaultPageLayout.php into MiscElements.php for improved organization and
maintainability
---
.../dynamix/include/DefaultPageLayout.php | 14 ++++-------
.../DefaultPageLayout/MiscElements.php | 24 +++++++++++++++++++
2 files changed, 28 insertions(+), 10 deletions(-)
create mode 100644 emhttp/plugins/dynamix/include/DefaultPageLayout/MiscElements.php
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index ef0ceccf3..4733b9737 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -157,13 +157,9 @@ if (isset($myPage['Load'])) {
-
-
-
-
-
+
+
+
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/MiscElements.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/MiscElements.php
new file mode 100644
index 000000000..099e87f50
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/MiscElements.php
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From 4d4266ff76d29d64d031dbbc86d62a1d05a24480 Mon Sep 17 00:00:00 2001
From: Zack Spear
Date: Tue, 8 Apr 2025 12:33:17 -0700
Subject: [PATCH 41/85] refactor: extract main content logic from
DefaultPageLayout.php into MainContent.php for improved organization and
maintainability
---
.../dynamix/include/DefaultPageLayout.php | 80 ++-----------------
.../include/DefaultPageLayout/MainContent.php | 61 ++++++++++++++
2 files changed, 69 insertions(+), 72 deletions(-)
create mode 100644 emhttp/plugins/dynamix/include/DefaultPageLayout/MainContent.php
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index 4733b9737..c6d32366a 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -156,76 +156,12 @@ if (isset($myPage['Load'])) {
-
-
-
-
-
-
-";
-$tab = 1;
-if (isset($myPage['Tabs'])) $display['tabs'] = strtolower($myPage['Tabs'])=='true' ? 0 : 1;
-$tabbed = $display['tabs']==0 && count($pages)>1;
-
-foreach ($pages as $page) {
- $close = false;
- if (isset($page['Title'])) {
- eval("\$title=\"".htmlspecialchars($page['Title'])."\";");
- if ($tabbed) {
- echo "
";
- echo tab_title($title,$page['root'],_var($page,'Tag',false));
- echo " ";
- $close = true;
- } else {
- if ($tab==1) echo "
";
- echo "
";
- echo tab_title($title,$page['root'],_var($page,'Tag',false));
- echo "
";
- }
- $tab++;
- }
- if (isset($page['Type']) && $page['Type']=='menu') {
- $pgs = find_pages($page['name']);
- foreach ($pgs as $pg) {
- @eval("\$title=\"".htmlspecialchars($pg['Title'])."\";");
- $icon = _var($pg,'Icon',"
");
- if (substr($icon,-4)=='.png') {
- $root = $pg['root'];
- if (file_exists("$docroot/$root/images/$icon")) {
- $icon = "
";
- } elseif (file_exists("$docroot/$root/$icon")) {
- $icon = "
";
- } else {
- $icon = "
";
- }
- } elseif (substr($icon,0,5)=='icon-') {
- $icon = "
";
- } elseif ($icon[0]!='<') {
- if (substr($icon,0,3)!='fa-') $icon = "fa-$icon";
- $icon = "
";
- }
- echo "
";
- }
- }
- annotate($page['file']);
- // include page specific stylesheets (if existing)
- $css = "/{$page['root']}/sheets/{$page['name']}";
- $css_stock = "$css.css";
- $css_theme = "$css-$theme.css";
- if (is_file($docroot.$css_stock)) echo '
',"\n";
- if (is_file($docroot.$css_theme)) echo '
',"\n";
- // create page content
- empty($page['Markdown']) || $page['Markdown']=='true' ? eval('?>'.Markdown(parse_text($page['text']))) : eval('?>'.parse_text($page['text']));
- if ($close) echo "
";
-}
-unset($pages,$page,$pgs,$pg,$icon,$nchan,$running,$start,$stop,$row,$script,$opt,$nchan_run);
-?>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContent.php b/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContent.php
new file mode 100644
index 000000000..a0da8c741
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/MainContent.php
@@ -0,0 +1,61 @@
+";
+$tab = 1;
+if (isset($myPage['Tabs'])) $display['tabs'] = strtolower($myPage['Tabs'])=='true' ? 0 : 1;
+$tabbed = $display['tabs']==0 && count($pages)>1;
+
+foreach ($pages as $page) {
+ $close = false;
+ if (isset($page['Title'])) {
+ eval("\$title=\"".htmlspecialchars($page['Title'])."\";");
+ if ($tabbed) {
+ echo "
";
+ echo tab_title($title,$page['root'],_var($page,'Tag',false));
+ echo " ";
+ $close = true;
+ } else {
+ if ($tab==1) echo "
";
+ echo "
";
+ echo tab_title($title,$page['root'],_var($page,'Tag',false));
+ echo "
";
+ }
+ $tab++;
+ }
+ if (isset($page['Type']) && $page['Type']=='menu') {
+ $pgs = find_pages($page['name']);
+ foreach ($pgs as $pg) {
+ @eval("\$title=\"".htmlspecialchars($pg['Title'])."\";");
+ $icon = _var($pg,'Icon',"
");
+ if (substr($icon,-4)=='.png') {
+ $root = $pg['root'];
+ if (file_exists("$docroot/$root/images/$icon")) {
+ $icon = "
";
+ } elseif (file_exists("$docroot/$root/$icon")) {
+ $icon = "
";
+ } else {
+ $icon = "
";
+ }
+ } elseif (substr($icon,0,5)=='icon-') {
+ $icon = "
";
+ } elseif ($icon[0]!='<') {
+ if (substr($icon,0,3)!='fa-') $icon = "fa-$icon";
+ $icon = "
";
+ }
+ echo "
";
+ }
+ }
+ annotate($page['file']);
+ // include page specific stylesheets (if existing)
+ $css = "/{$page['root']}/sheets/{$page['name']}";
+ $css_stock = "$css.css";
+ $css_theme = "$css-$theme.css";
+ if (is_file($docroot.$css_stock)) echo '
',"\n";
+ if (is_file($docroot.$css_theme)) echo '
',"\n";
+ // create page content
+ empty($page['Markdown']) || $page['Markdown']=='true' ? eval('?>'.Markdown(parse_text($page['text']))) : eval('?>'.parse_text($page['text']));
+ if ($close) echo "
";
+}
+unset($pages,$page,$pgs,$pg,$icon,$nchan,$running,$start,$stop,$row,$script,$opt,$nchan_run);
+?>
+
\ No newline at end of file
From 270f0735cf500615553ce5499598a549f0aca99a Mon Sep 17 00:00:00 2001
From: Zack Spear
Date: Tue, 8 Apr 2025 13:06:49 -0700
Subject: [PATCH 42/85] refactor: centralize stylesheet inclusion logic in
DefaultPageLayout.php by creating includePageStylesheets function for
improved code reuse and maintainability
---
.../dynamix/include/DefaultPageLayout.php | 18 +++++++++++++-----
.../include/DefaultPageLayout/MainContent.php | 6 ------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index c6d32366a..feef9707b 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -135,18 +135,26 @@ if ($themeHelper->isSidebarTheme()) {
',"\n";
if (is_file($docroot.$css_theme)) echo '
Date: Tue, 8 Apr 2025 13:17:09 -0700
Subject: [PATCH 43/85] refactor: reorganize HTML structure in
DefaultPageLayout.php and MainContent.php for improved readability and
maintainability
---
.../dynamix/include/DefaultPageLayout.php | 15 ++-
.../include/DefaultPageLayout/MainContent.php | 101 +++++++++---------
2 files changed, 59 insertions(+), 57 deletions(-)
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
index feef9707b..b8dc82c4a 100644
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -164,12 +164,11 @@ if (isset($myPage['Load'])) {
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
';
+ }
+ }
$cdroms = $lv->get_cdrom_stats($res,true,true) ;
if ($state == 'running') {
$mem = $dom['memory']/1024;
@@ -117,7 +126,7 @@ foreach ($vms as $vm) {
unset($dom);
if (!isset($domain_cfg["CONSOLE"])) $vmrcconsole = "web" ; else $vmrcconsole = $domain_cfg["CONSOLE"] ;
if (!isset($domain_cfg["RDPOPT"])) $vmrcconsole .= ";no" ; else $vmrcconsole .= ";".$domain_cfg["RDPOPT"] ;
- $menu = sprintf("onclick=\"addVMContext('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s', '%s')\"", addslashes($vm),addslashes($uuid),addslashes($template),$state,addslashes($vmrcurl),strtoupper($vmrcprotocol),addslashes($log),addslashes($fstype), $vmrcconsole,false,addslashes(str_replace('"',"'",$WebUI)));
+ $menu = sprintf("onclick=\"addVMContext('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s', '%s', %s)\"", addslashes($vm),addslashes($uuid),addslashes($template),$state,addslashes($vmrcurl),strtoupper($vmrcprotocol),addslashes($log),addslashes($fstype), $vmrcconsole,false,addslashes(str_replace('"',"'",$WebUI)),$pcierror);
$kvm[] = "kvm.push({id:'$uuid',state:'$state'});";
switch ($state) {
case 'running':
@@ -196,7 +205,11 @@ foreach ($vms as $vm) {
$title = _('Select ISO image');
$cdstr = $cdromcount." / 2
";
- } elseif (file_exists("$docroot/$root/$icon")) {
- $icon = "
";
- } else {
- $icon = "";
- }
- } elseif (substr($icon,0,5)=='icon-') {
- $icon = "";
- } elseif ($icon[0]!='<') {
- if (substr($icon,0,3)!='fa-') $icon = "fa-$icon";
- $icon = "";
- }
- echo "";
- }
- }
- annotate($page['file']);
- // include page specific stylesheets (if existing)
- $css = "/{$page['root']}/sheets/{$page['name']}";
- $css_stock = "$css.css";
- $css_theme = "$css-$theme.css";
- if (is_file($docroot.$css_stock)) echo '',"\n";
- if (is_file($docroot.$css_theme)) echo '',"\n";
- // create page content
- empty($page['Markdown']) || $page['Markdown']=='true' ? eval('?>'.Markdown(parse_text($page['text']))) : eval('?>'.parse_text($page['text']));
- if ($close) echo "