@@ -310,23 +309,23 @@ _(Custom banner)_:
_(Show banner background color fade)_:
:
-
-
+
+
_(Favorites enabled)_:
:
-
-
+
+
:display_favorites_enabled_help:
_(Allow realtime updates on inactive browsers)_:
:
-
-
+
+
diff --git a/emhttp/plugins/dynamix/SysDevs.page b/emhttp/plugins/dynamix/SysDevs.page
index dce5eb649..08b4944ce 100644
--- a/emhttp/plugins/dynamix/SysDevs.page
+++ b/emhttp/plugins/dynamix/SysDevs.page
@@ -46,6 +46,58 @@ function applyCfg() {
$("#applycfg").attr("disabled",true);
});
}
+function formatFullInput(input) {
+ return input
+ .split(';')
+ .filter(Boolean) // remove empty trailing entry
+ .map(entry => {
+ let [pci, status] = entry.split(',');
+ status = status.charAt(0).toUpperCase() + status.slice(1).toLowerCase();
+ return `${pci} _(${status})_`;
+ })
+ .join('
');
+}
+function formatVMS(input) {
+ return input
+ .split(';')
+ .filter(Boolean) // remove empty trailing entry
+ .join('
');
+}
+function ackPCI(pcidevice, action) {
+ $.post('/webGui/include/PCIUpdate.php', { action: "getvm", pciid: pcidevice }).done(function(vms) {
+ let swaltext = "";
+
+ switch(action) {
+ case 'removed':
+ swaltext = "_(Acknowledge removal of PCI Address)_: " + pcidevice + "
_(VMs where PCI device used)_
" + formatVMS(vms);
+ break;
+ case 'changed':
+ swaltext = "_(Acknowledge update of PCI Address)_: " + pcidevice + "
_(VMs where PCI device used)_
"+ formatVMS(vms);
+ break;
+ case 'added':
+ swaltext = "_(Acknowledge addition of PCI Address)_: " + pcidevice + "
_(VMs where PCI device used)_
" + formatVMS(vms);
+ break;
+ case 'all':
+ swaltext = "_(Acknowledge all PCI Address modifications)_:
" + formatFullInput(pcidevice) + "
_(VMs where PCI device used)_
" + formatVMS(vms);
+ break;
+ }
+
+ swal({
+ title: "Are you sure?",
+ text: swaltext,
+ type: "warning",
+ html: true,
+ showCancelButton: true
+ }, function() {
+ $.post('/webGui/include/PCIUpdate.php', { action: action, pciid: pcidevice }).done(function(d) {
+ if (d === "OK") {
+ $('#t1').load('/webGui/include/SysDevs.php', { table: 't1' });
+ }
+ });
+ });
+ });
+}
+
diff --git a/emhttp/plugins/dynamix/include/.login.php b/emhttp/plugins/dynamix/include/.login.php
index e6367dcbd..5f003e7a9 100644
--- a/emhttp/plugins/dynamix/include/.login.php
+++ b/emhttp/plugins/dynamix/include/.login.php
@@ -163,11 +163,14 @@ $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();
?>
-
+
@@ -201,8 +204,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;
@@ -286,7 +289,7 @@ $theme_dark = in_array($display['theme'], ['black', 'gray']);
width: 500px;
margin: 6rem auto;
border-radius: 10px;
- background: ;
+ background: ;
}
#login::after {
content: "";
@@ -378,7 +381,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..7359f10e6 100644
--- a/emhttp/plugins/dynamix/include/.set-password.php
+++ b/emhttp/plugins/dynamix/include/.set-password.php
@@ -40,10 +40,12 @@ 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..aed12e972 100644
--- a/emhttp/plugins/dynamix/include/Boot.php
+++ b/emhttp/plugins/dynamix/include/Boot.php
@@ -24,16 +24,12 @@ $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();
?>
-lang="" class="">
+lang="" class="getThemeHtmlClass() ?>">
@@ -46,7 +42,7 @@ if ($themes2) {
">
">
-
">
+
">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-";
-if ($themes2) echo "
";
-echo "
";
-foreach ($tasks as $button) {
- $page = $button['name'];
- $play = $task==$page ? " active" : "";
- echo "
";
- // create list of nchan scripts to be started
- if (isset($button['Nchan'])) nchan_merge($button['root'], $button['Nchan']);
-}
-unset($tasks);
-echo "
";
-echo "
";
-if (isset($myPage['Lock'])) {
- $title = $themes2 ? "" : _('Unlock sortable items');
- echo "
";
-}
-if ($display['usage']) my_usage();
-
-foreach ($buttons 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 = $themes2 ? "" : " title=\""._($button['Title'])."\"";
- echo "
";
- } else {
- echo "
";
- }
- // create list of nchan scripts to be started
- if (isset($button['Nchan'])) nchan_merge($button['root'], $button['Nchan']);
-}
-
-echo "
";
-
-if ($themes2) echo "
";
-echo "
";
-foreach ($buttons as $button) {
- annotate($button['file']);
- // include page specific stylesheets (if existing)
- $css = "/{$button['root']}/sheets/{$button['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
- eval('?>'.parse_text($button['text']));
-}
-unset($buttons,$button);
-
-// Build page content
-// Reload page every X minutes during extended viewing?
-if (isset($myPage['Load']) && $myPage['Load'] > 0) {
- ?>
-
- ";
-$tab = 1;
-$pages = [];
+$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']));
-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 "
";
- }
- }
- // create list of nchan scripts to be started
+// nchan related actions
+$nchan = ['webGui/nchan/notify_poller','webGui/nchan/session_check'];
+if ($wlan0) $nchan[] = 'webGui/nchan/wlan0';
+// build nchan scripts from found pages
+$allPages = array_merge($taskPages, $buttonPages, $pages);
+foreach ($allPages as $page) {
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']}";
- $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 "
";
}
+// 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
@@ -874,496 +71,84 @@ if (count($pages)) {
}
if (count($running)) file_put_contents($nchan_pid,implode("\n",$running)."\n"); else @unlink($nchan_pid);
}
-unset($pages,$page,$pgs,$pg,$icon,$nchan,$running,$start,$stop,$row,$script,$opt,$nchan_run);
?>
-
-
-
-
+
+lang="" class="getThemeHtmlClass() ?>">
+
+
<?=_var($var, 'NAME')?>/<?=_var($myPage, 'name')?>
+
+
+
+
+
+
+
+
+
">
+
">
+
">
+
">
+
">
+
">
-
+
">
+
">
+
">
+
">
+
">
-
+
-var nchan_vmaction = new NchanSubscriber('/sub/vmaction',{subscriber:'websocket', reconnectTimeout:5000});
-nchan_vmaction.on('message', function(data) {
- if (!data || openDone(data) || openError(data)) return;
- var box = $('pre#swaltext');
- data = data.split('\0');
- switch (data[0]) {
- case 'addLog':
- var rows = document.getElementsByClassName('logLine');
- if (rows.length) {
- var row = rows[rows.length-1];
- row.innerHTML += data[1]+'
';
- }
- break;
- case 'progress':
- var rows = document.getElementsByClassName('progress-'+data[1]);
- if (rows.length) {
- rows[rows.length-1].textContent = data[2];
- }
- break;
- case 'addToID':
- var rows = document.getElementById(data[1]);
- if (rows === null) {
- rows = document.getElementsByClassName('logLine');
- if (rows.length) {
- var row = rows[rows.length-1];
- row.innerHTML += '
'+data[1]+': '+data[2]+' ';
- }
- } else {
- var rows_content = rows.getElementsByClassName('content');
- if (!rows_content.length || rows_content[rows_content.length-1].textContent != data[2]) {
- rows.innerHTML += '
'+data[2]+' .';
- }
- }
- break;
- case 'show_Wait':
- progress_span[data[1]] = document.getElementById('wait-'+data[1]);
- progress_dots[data[1]] = setInterval(function(){if (((progress_span[data[1]].innerHTML += '.').match(/\./g)||[]).length > 9) progress_span[data[1]].innerHTML = progress_span[data[1]].innerHTML.replace(/\.+$/,'');},500);
- break;
- case 'stop_Wait':
- clearInterval(progress_dots[data[1]]);
- progress_span[data[1]].innerHTML = '';
- break;
- default:
- box.html(box.html()+data[0]);
- break;
- }
- box.scrollTop(box[0].scrollHeight);
-});
+
-const scrollDuration = 500;
-$(window).scroll(function() {
- if ($(this).scrollTop() > 0) {
- $('.back_to_top').fadeIn(scrollDuration);
- } else {
- $('.back_to_top').fadeOut(scrollDuration);
- }
-
- var top = $('div#header').height()-1; // header height has 1 extra pixel to cover overlap
- $('div#menu').css($(this).scrollTop() > top ? {position:'fixed',top:'0'} : {position:'absolute',top:top+'px'});
- // banner
- $('div.upgrade_notice').css($(this).scrollTop() > 24 ? {position:'fixed',top:'0'} : {position:'absolute',top:'24px'});
-
-});
+'.parse_text($button['text']));
+}
-$('.move_to_end').click(function(event) {
- event.preventDefault();
- $('html,body').animate({scrollTop:$(document).height()},scrollDuration);
- return false;
-});
-
-$('.back_to_top').click(function(event) {
- event.preventDefault();
- $('html,body').animate({scrollTop:0},scrollDuration);
- return false;
-});
-
-
-$.post('/webGui/include/Notify.php',{cmd:'init',csrf_token:csrf_token});
-
-$(function() {
- defaultPage.start();
- $('div.spinner.fixed').html(unraid_logo);
- setTimeout(function(){$('div.spinner').not('.fixed').each(function(){$(this).html(unraid_logo);});},500); // display animation if page loading takes longer than 0.5s
- shortcut.add('F1',function(){HelpButton();});
-
- $('#licensetype').addClass('orange-text');
-
- $('#licensetype').addClass('red-text');
-
- $('input[value=""],input[value="Apply"],input[name="cmdEditShare"],input[name="cmdUserEdit"]').prop('disabled',true);
- $('form').find('select,input[type=text],input[type=number],input[type=password],input[type=checkbox],input[type=radio],input[type=file],textarea').not('.lock').each(function(){$(this).on('input change',function() {
- var form = $(this).parentsUntil('form').parent();
- form.find('input[value=""],input[value="Apply"],input[name="cmdEditShare"],input[name="cmdUserEdit"]').not('input.lock').prop('disabled',false);
- form.find('input[value=""],input[value="Done"]').not('input.lock').val("").prop('onclick',null).off('click').click(function(){formHasUnsavedChanges=false;refresh(form.offset().top);});
- });});
- // add leave confirmation when form has changed without applying (opt-in function)
- if ($('form.js-confirm-leave').length>0) {
- $('form.js-confirm-leave').on('change',function(e){formHasUnsavedChanges=true;}).on('submit',function(e){formHasUnsavedChanges=false;});
- $(window).on('beforeunload',function(e){if (formHasUnsavedChanges) return '';}); // note: the browser creates its own popup window and warning message
- }
- // form parser: add escapeQuotes protection
- $('form').each(function(){
- var action = $(this).prop('action').actionName();
- if (action=='update.htm' || action=='update.php') {
- var onsubmit = $(this).attr('onsubmit')||'';
- $(this).attr('onsubmit','clearTimeout(timers.flashReport);escapeQuotes(this);'+onsubmit);
- }
- });
- var top = ($.cookie('top')||0) - $('.tabs').offset().top - 75;
- if (top>0) {$('html,body').scrollTop(top);}
- $.removeCookie('top');
- if ($.cookie('addAlert') != null) bannerAlert(addAlert.text,addAlert.cmd,addAlert.plg,addAlert.func);
-
- showNotice("
");
-
-
- addBannerWarning("
.
.",true,true);
-
-
- var opts = [];
- context.settings({above:false});
- opts.push({header:""});
- opts.push({text:"",icon:'fa-folder-open-o',action:function(e){e.preventDefault();openNotifier();}});
- opts.push({text:"",icon:'fa-file-text-o',action:function(e){e.preventDefault();viewHistory();}});
- opts.push({text:"",icon:'fa-check-square-o',action:function(e){e.preventDefault();closeNotifier();}});
- context.attach('#board',opts);
- if (location.pathname.search(/\/(AddVM|UpdateVM|AddContainer|UpdateContainer)/)==-1) {
- $('blockquote.inline_help').each(function(i) {
- $(this).attr('id','helpinfo'+i);
- var pin = $(this).prev();
- if (!pin.prop('nodeName')) pin = $(this).parent().prev();
- while (pin.prop('nodeName') && pin.prop('nodeName').search(/(table|dl)/i)==-1) pin = pin.prev();
- pin.find('tr:first,dt:last').each(function() {
- var node = $(this);
- var name = node.prop('nodeName').toLowerCase();
- if (name=='dt') {
- while (!node.html() || node.html().search(/(
=0 || name!='dt') {
- if (name=='dt' && node.is(':first-of-type')) break;
- node = node.prev();
- name = node.prop('nodeName').toLowerCase();
- }
- node.css('cursor','help').click(function(){$('#helpinfo'+i).toggle('slow');});
- } else {
- if (node.html() && (name!='tr' || node.children('td:first').html())) node.css('cursor','help').click(function(){$('#helpinfo'+i).toggle('slow');});
- }
- });
- });
- }
- $('form').append($('"+href+"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ '.Markdown(parse_text($page['text'])));
+ else:
+ eval('?>'.parse_text($page['text']));
+ endif;
+
+ if ($close): ?>
+
+
+
+
+
+
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
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..2b248b534
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout/Navigation/Main.php
@@ -0,0 +1,84 @@
+
+
diff --git a/emhttp/plugins/dynamix/include/Helpers.php b/emhttp/plugins/dynamix/include/Helpers.php
index 68474afcf..f22723a31 100644
--- a/emhttp/plugins/dynamix/include/Helpers.php
+++ b/emhttp/plugins/dynamix/include/Helpers.php
@@ -416,4 +416,156 @@ 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;
+}
+// Load saved PCI data
+function loadSavedData($filename) {
+ if (file_exists($filename)) {
+ $saveddata = file_get_contents($filename);
+ } else $saveddata = "";
+
+ return json_decode($saveddata, true);
+}
+
+// Run lspci -Dmn to get the current devices
+function loadCurrentPCIData() {
+ $output = shell_exec('lspci -Dmn');
+ $devices = [];
+
+ if (file_exists("/boot/config/current.json")){
+ $devices = loadSavedData("/boot/config/current.json");
+ } else {
+ foreach (explode("\n", trim($output)) as $line) {
+ $parts = explode(" ", $line);
+
+ 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;
+ }
+ }
+ return $devices;
+}
+
+// Compare the saved and current data
+function comparePCIData() {
+
+ $changes = [];
+ $saved = loadSavedData("/boot/config/savedpcidata.json");
+ if (!$saved) return [];
+ $current = loadCurrentPCIData();
+
+ // Compare saved devices with current devices
+ foreach ($saved as $pci_id => $saved_device) {
+ if (!isset($current[$pci_id])) {
+ // Device has been removed
+ $changes[$pci_id] = [
+ 'status' => 'removed',
+ 'device' => $saved_device
+ ];
+ } else {
+ // Device exists in both, check for modifications
+ $current_device = $current[$pci_id];
+ $differences = [];
+
+ // Compare fields
+ foreach (['vendor_id', 'device_id', 'class'] as $field) {
+ if (isset($saved_device[$field]) && isset($current_device[$field]) && $saved_device[$field] !== $current_device[$field]) {
+ $differences[$field] = [
+ 'old' => $saved_device[$field],
+ 'new' => $current_device[$field]
+ ];
+ }
+ }
+
+ if (!empty($differences)) {
+ $changes[$pci_id] = [
+ 'status' => 'changed',
+ 'device' => $current_device,
+ 'differences' => $differences
+ ];
+ }
+ }
+ }
+
+ // Check for added devices
+ foreach ($current as $pci_id => $current_device) {
+ if (!isset($saved[$pci_id])) {
+ // Device has been added
+ $changes[$pci_id] = [
+ 'status' => 'added',
+ 'device' => $current_device
+ ];
+ }
+ }
+ return $changes;
+}
+
+
+
?>
diff --git a/emhttp/plugins/dynamix/include/PCIUpdate.php b/emhttp/plugins/dynamix/include/PCIUpdate.php
new file mode 100644
index 000000000..2e6f195cd
--- /dev/null
+++ b/emhttp/plugins/dynamix/include/PCIUpdate.php
@@ -0,0 +1,96 @@
+
+get_domains();
+ foreach ($vms as $vm) {
+ $vmpciids = $lv->domain_get_vm_pciids($vm);
+ foreach($vmpciids as $pciid => $pcidetail) {
+ if (isset($pci_device_changes["0000:".$pciid])) {
+ $pcitovm["0000:".$pciid][$vm] = $vm;
+ }
+ }
+ }
+ return $pcitovm;
+}
+
+$savedfile = "/boot/config/savedpcidata.json";
+$saved = loadSavedData($savedfile);
+if (!$saved) {echo "ERROR"; return;};
+$current = loadCurrentPCIData();
+$pciaddr = $_POST['pciid'];
+$action = $_POST['action']??'';
+
+switch($action) {
+case "all":
+ $pciaddrs = explode(";", $pciaddr);
+ foreach ($pciaddrs as $pciaddraction){
+ if ($pciaddraction == "") continue;
+ $values = explode(',',$pciaddraction);
+ process_action($values[0],$values[1]);
+ }
+ file_put_contents($savedfile,json_encode($saved,JSON_PRETTY_PRINT));
+ break;
+case "removed":
+case "added":
+case "changed":
+ process_action($pciaddr,$action);
+ file_put_contents($savedfile,json_encode($saved,JSON_PRETTY_PRINT));
+ break;
+case "getvm":
+ $pcimap = build_pci_vm_map();
+ $pciaddrs = explode(";", $pciaddr);
+ $vmact =[];
+
+ foreach ($pciaddrs as $pcidev) {
+ if ($pcidev == "") continue;
+ if (strpos($pcidev,",")) {
+ $values = explode(',',$pcidev);
+ $pcidev = $values[0];
+ }
+ foreach ($pcimap[$pcidev] as $key => $vmname) {
+ $vmact[$vmname]= $vmname;
+ }
+ }
+ $ret = implode(";",$vmact);
+
+ echo $ret;
+ exit;
+
+}
+
+file_put_contents($savedfile,json_encode($saved,JSON_PRETTY_PRINT));
+echo "OK";
+?>
diff --git a/emhttp/plugins/dynamix/include/PageBuilder.php b/emhttp/plugins/dynamix/include/PageBuilder.php
index 0bb42f052..8218e4578 100644
--- a/emhttp/plugins/dynamix/include/PageBuilder.php
+++ b/emhttp/plugins/dynamix/include/PageBuilder.php
@@ -97,6 +97,49 @@ function tab_title($title,$path,$tag) {
}
}
+/**
+ * Generate CSS for sidebar icons
+ *
+ * @param array $tasks Array of task pages
+ * @param array $buttons Array of button pages
+ * @return string CSS for sidebar icons
+ */
+function generate_sidebar_icon_css($tasks, $buttons) {
+ $css = '';
+
+ // Generate CSS for task icons
+ foreach ($tasks as $button) {
+ if (isset($button['Code'])) {
+ $css .= ".nav-item a[href='/{$button['name']}']:before{content:'\\{$button['Code']}'}\n";
+ }
+ }
+
+ // Add lock button icon
+ $css .= ".nav-item.LockButton a:before{content:'\\e955'}\n";
+
+ // Generate CSS for utility button icons
+ foreach ($buttons as $button) {
+ if (isset($button['Code'])) {
+ $css .= ".nav-item.{$button['name']} a:before{content:'\\{$button['Code']}'}\n";
+ }
+ }
+
+ return $css;
+}
+
+function includePageStylesheets($page) {
+ global $docroot, $theme;
+ $css = "/{$page['root']}/sheets/{$page['name']}";
+ $css_stock = "$css.css";
+ $css_theme = "$css-$theme.css"; // @todo add syslog for deprecation notice
+ if (is_file($docroot.$css_stock)) echo '
',"\n";
+ if (is_file($docroot.$css_theme)) echo '
',"\n";
+}
+
+function annotate($text) {
+ echo "\n\n";
+}
+
// hack to embed function output in a quoted string (e.g., in a page Title)
// see: http://stackoverflow.com/questions/6219972/why-embedding-functions-inside-of-strings-is-different-than-variables
function _func($x) {return $x;}
diff --git a/emhttp/plugins/dynamix/include/SysDevs.php b/emhttp/plugins/dynamix/include/SysDevs.php
index 32fbddb22..1feee62d0 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,15 @@ 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");
+ }
+ $ackparm = "";
foreach ($groups as $line) {
if (!$line) continue;
if ($line[0]=='I') {
@@ -126,6 +137,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 +153,32 @@ 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,' ';
+ if (array_key_exists($pciaddress,$pci_device_diffs)) {
+ echo "";
+ echo " ";
+ echo _("Differences");
+ foreach($pci_device_diffs[$pciaddress]['differences'] as $key => $changes){
+ echo " $key "._("before").":{$changes['old']} "._("after").":{$changes['new']} ";
+ }
+ echo "
@@ -211,11 +245,19 @@ EOT;
}
break;
case 't2':
+ $is_intel_cpu = is_intel_cpu();
+ $core_types = $is_intel_cpu ? get_intel_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 
";
- } 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 "";
- }
- }
- // create list of nchan scripts to be started
+// nchan related actions
+$nchan = ['webGui/nchan/notify_poller','webGui/nchan/session_check'];
+if ($wlan0) $nchan[] = 'webGui/nchan/wlan0';
+// build nchan scripts from found pages
+$allPages = array_merge($taskPages, $buttonPages, $pages);
+foreach ($allPages as $page) {
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']}";
- $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 "![](\"/$root/images/$icon\")
";
+ } elseif (file_exists("$docroot/$root/$icon")) {
+ return "