",{class:"textarea fileTree"}),i.after(r)),i.click(function(){r.is(":visible")?r.slideUp("fast"):(""===r.html()&&(r.html('
Loading...'),r.fileTree({root:a.pickroot,top:a.picktop,filter:(a.pickfilter||"").split(","),match:a.pickmatch||".*"},e.isFunction(t)?t:function(e){i.val(e).change(),a.hasOwnProperty("pickcloseonfile")&&r.slideUp("fast")},e.isFunction(l)?l:function(e){a.hasOwnProperty("pickfolders")&&i.val(e).change()})),r.offset({left:i.position().left}),r.slideDown("fast"))})})}})}(jQuery);
\ No newline at end of file
+jQuery && function(e) {
+ e.extend(e.fn, {
+ fileTree: function(i, t, l) {
+ // Initialize pickexclude with an empty string if not provided
+ void 0 === i.root && (i.root = "/mnt/"),
+ void 0 === i.top && (i.top = "/mnt/"),
+ void 0 === i.filter && (i.filter = ""),
+ void 0 === i.match && (i.match = ".*"),
+ void 0 === i.script && (i.script = "/webGui/include/FileTree.php"),
+ void 0 === i.folderEvent && (i.folderEvent = "click"),
+ void 0 === i.expandSpeed && (i.expandSpeed = 300),
+ void 0 === i.collapseSpeed && (i.collapseSpeed = 300),
+ void 0 === i.expandEasing && (i.expandEasing = null),
+ void 0 === i.collapseEasing && (i.collapseEasing = null),
+ void 0 === i.multiFolder && (i.multiFolder = !1),
+ void 0 === i.loadMessage && (i.loadMessage = "Loading..."),
+ void 0 === i.multiSelect && (i.multiSelect = !1),
+ void 0 === i.allowBrowsing && (i.allowBrowsing = !1),
+ void 0 === i.pickexclude && (i.pickexclude = "");
+ e(this).each(function() {
+ function s(r, n, o) {
+ e(r).addClass("wait"),
+ e(".jqueryFileTree.start").remove(),
+ // Modify the post data to include pickexclude
+ e.post(i.script, {
+ dir: n,
+ root: i.top,
+ multiSelect: i.multiSelect,
+ filter: i.filter,
+ match: i.match,
+ show_parent: o,
+ // Add pickexclude parameter
+ pickexclude: i.pickexclude
+ }).done(function(o) {
+ var d;
+ e(r).find(".start").html(""),
+ e(r).removeClass("wait").append(o),
+ i.root == n ? e(r).find("UL:hidden").show() : e(r).find("UL:hidden").slideDown({
+ duration: i.expandSpeed,
+ easing: i.expandEasing
+ }),
+ e(d = r).find("LI A").on(i.folderEvent, function(r) {
+ r.preventDefault();
+ var n = {};
+ return n.li = e(this).closest("li"),
+ n.type = n.li.hasClass("directory") ? "directory" : "file",
+ n.value = e(this).text(),
+ n.rel = e(this).prop("rel"),
+ ".." == e(this).text() ? (i.root = n.rel, l && l(e(this).attr("rel")), a(e(this), "filetreefolderclicked", n), root = e(this).closest("ul.jqueryFileTree"), root.html('
"), s(e(root), i.root, i.allowBrowsing)) : e(this).parent().hasClass("directory") ? (e(this).parent().hasClass("collapsed") ? (a(e(this), "filetreeexpand", n), i.multiFolder || (e(this).parent().parent().find("UL").slideUp({
+ duration: i.collapseSpeed,
+ easing: i.collapseEasing
+ }), e(this).parent().parent().find("LI.directory").removeClass("expanded").addClass("collapsed")), e(this).parent().removeClass("collapsed").addClass("expanded"), e(this).parent().find("UL").remove(), s(e(this).parent(), e(this).attr("rel").match(/.*\//)[0], !1)) : (a(e(this), "filetreecollapse", n), e(this).parent().find("UL").slideUp({
+ duration: i.collapseSpeed,
+ easing: i.collapseEasing
+ }), e(this).parent().removeClass("expanded").addClass("collapsed"), a(e(this), "filetreecollapsed", n)), l && l(e(this).attr("rel")), a(e(this), "filetreefolderclicked", n)) : (t && t(e(this).attr("rel")), a(e(this), "filetreeclicked", n)), !1
+ }),
+ "click" != i.folderEvent.toLowerCase && e(d).find("LI A").on("click", function(e) {
+ return e.preventDefault(), !1
+ }),
+ a(e(this), "filetreeexpanded", o)
+ }).fail(function() {
+ e(r).find(".start").html(""),
+ e(r).removeClass("wait").append("
Unable to get file tree information")
+ })
+ }
+
+ function a(e, i, t) {
+ t.trigger = i,
+ e.trigger(i, t)
+ }
+ e(this).html('
"),
+ s(e(this), i.root, i.allowBrowsing),
+ e(this).on("change", "input:checkbox", function() {
+ var i = {};
+ i.li = e(this).closest("li"),
+ i.type = i.li.hasClass("directory") ? "directory" : "file",
+ i.value = i.li.children("a").text(),
+ i.rel = i.li.children("a").prop("rel"),
+ i.li.find("input:checkbox").prop("checked", e(this).prop("checked")),
+ e(this).prop("checked") ? a(e(this), "filetreechecked", i) : a(e(this), "filetreeunchecked", i)
+ })
+ })
+ },
+ fileTreeAttach: function(i, t, l) {
+ var s = {};
+ e.isFunction(i) ? (e.isFunction(t) && (l = t), t = i) : i && e.extend(s, i),
+ e(this).each(function() {
+ var i = e(this),
+ a = e.extend({}, s, i.data()),
+ r = i.next(".fileTree");
+ 0 === r.length && (e(document).mousedown(function(i) {
+ var t = e(".fileTree");
+ t.is(i.target) || 0 !== t.has(i.target).length || t.slideUp("fast")
+ }),
+ r = e("
", {
+ class: "textarea fileTree"
+ }),
+ i.after(r)),
+ i.click(function() {
+ r.is(":visible") ? r.slideUp("fast") : ("" === r.html() && (r.html('
Loading...'),
+ r.fileTree({
+ root: a.pickroot,
+ top: a.picktop,
+ filter: (a.pickfilter || "").split(","),
+ match: a.pickmatch || ".*",
+ // Include pickexclude parameter in fileTreeAttach
+ pickexclude: a.pickexclude
+ }, e.isFunction(t) ? t : function(e) {
+ i.val(e).change(),
+ a.hasOwnProperty("pickcloseonfile") && r.slideUp("fast")
+ }, e.isFunction(l) ? l : function(e) {
+ a.hasOwnProperty("pickfolders") && i.val(e).change()
+ })),
+ r.offset({
+ left: i.position().left
+ }),
+ r.slideDown("fast"))
+ })
+ })
+ }
+ })
+}(jQuery);
From cb48e168453dcb365c14e59a864d2cefa6596d61 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Sat, 27 Apr 2024 10:04:10 +0100
Subject: [PATCH 07/67] Fix QEMU command line expanding if no data.
Rework of XML mobile page size.
---
.../dynamix.vm.manager/include/libvirt_helpers.php | 9 +++++++--
.../plugins/dynamix.vm.manager/templates/Custom.form.php | 4 ++--
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index 3384fe5fa..5c68ec5fa 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -1330,7 +1330,12 @@ private static $encoding = 'UTF-8';
}
if ($lv->domain_get_boot_devices($res)[0] == "fd") $osbootdev = "Yes" ; else $osbootdev = "No" ;
-
+ $cmdline = null;
+ $QEMUCmdline = getQEMUCmdLine($strDOMXML);
+ $QEMUOverride = getQEMUOverride($strDOMXML);
+ if (isset($QEMUCmdline)) $cmdline = $QEMUCmdline;
+ if (isset($QEMUOverride) && isset($QEMUCmdline)) $cmdline .= "\n".$QEMUOverride;
+ if (isset($QEMUOverride) && !isset($QEMUCmdline)) $cmdline = $QEMUOverride;
return [
'template' => $arrTemplateValues,
'domain' => [
@@ -1370,7 +1375,7 @@ private static $encoding = 'UTF-8';
'nic' => $arrNICs,
'usb' => $arrUSBDevs,
'shares' => $lv->domain_get_mount_filesystems($res),
- 'qemucmdline' => getQEMUCmdLine($strDOMXML),
+ 'qemucmdline' => $cmdline,
'clocks' => getClocks($strDOMXML)
];
}
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 9579fcafa..8b91a956b 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1913,8 +1913,8 @@ $(function() {
$('.advancedview').change(function () {
if ($(this).is(':checked')) {
setTimeout(function() {
- var xmlPanelHeight = window.outerHeight - 550;
- if (xmlPanelHeight < 0) xmlPanelHeight = null;
+ var xmlPanelHeight = window.outerHeight;
+ if (xmlPanelHeight > 1024) xmlPanelHeight = xmlPanelHeight-550;
editor.setSize(null,xmlPanelHeight);
editor.refresh();
}, 100);
From 90eb25f11475173f67c2d41e19a1220005df4f3c Mon Sep 17 00:00:00 2001
From: dlandon
Date: Sat, 27 Apr 2024 06:42:29 -0500
Subject: [PATCH 08/67] Change commenting.
---
emhttp/plugins/dynamix/javascript/jquery.filetree.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/emhttp/plugins/dynamix/javascript/jquery.filetree.js b/emhttp/plugins/dynamix/javascript/jquery.filetree.js
index d1f38ed39..f17a9e1d1 100644
--- a/emhttp/plugins/dynamix/javascript/jquery.filetree.js
+++ b/emhttp/plugins/dynamix/javascript/jquery.filetree.js
@@ -22,7 +22,7 @@ jQuery && function(e) {
function s(r, n, o) {
e(r).addClass("wait"),
e(".jqueryFileTree.start").remove(),
- // Modify the post data to include pickexclude
+ /* Modify the post data to include pickexclude. */
e.post(i.script, {
dir: n,
root: i.top,
@@ -30,7 +30,7 @@ jQuery && function(e) {
filter: i.filter,
match: i.match,
show_parent: o,
- // Add pickexclude parameter
+ /* Add pickexclude parameter. */
pickexclude: i.pickexclude
}).done(function(o) {
var d;
@@ -104,7 +104,7 @@ jQuery && function(e) {
top: a.picktop,
filter: (a.pickfilter || "").split(","),
match: a.pickmatch || ".*",
- // Include pickexclude parameter in fileTreeAttach
+ /* Include pickexclude parameter in fileTreeAttach. */
pickexclude: a.pickexclude
}, e.isFunction(t) ? t : function(e) {
i.val(e).change(),
From 33b27f0a71a764729e317ca54b804e17854c3bef Mon Sep 17 00:00:00 2001
From: dlandon
Date: Sat, 27 Apr 2024 11:13:59 -0500
Subject: [PATCH 09/67] Put list of folders to be excluded in the file picker
dropdown in a php variable for greater flexibility to make changes.
---
.../plugins/dynamix.docker.manager/DockerSettings.page | 9 ++++++---
emhttp/plugins/dynamix.vm.manager/VMSettings.page | 9 ++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
index b39e9ef8b..8ce287a76 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
@@ -20,6 +20,9 @@ Tag="icon-docker"
// Add the Docker JSON client
require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+/* Folders to be excluded from the drop down file picker. */
+$excludeFolders = ".Recycle.Bin,RecycleBin,addons,disks,remotes,rootshare,user0";
+
$DockerClient = new DockerClient();
exec("/etc/rc.d/rc.docker status >/dev/null",$dummy,$DockerStopped);
@@ -163,7 +166,7 @@ _(Docker vDisk size)_:
:docker_vdisk_size_help:
_(Docker vDisk location)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
@@ -174,7 +177,7 @@ _(Docker vDisk location)_:
_(Docker directory)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
@@ -184,7 +187,7 @@ _(Docker directory)_:
_(Default appdata storage location)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 44b21450a..a39fc9125 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -19,6 +19,9 @@ Tag="columns"
" placeholder="e.g. /mnt/user/system/libvirt/libvirt.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickexclude=".Recycle.Bin,RecycleBin,addons,disks,remotes,rootshare,user0" data-pickfolders="true" required pattern="^[^\\]*libvirt\.img$">
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
@@ -125,14 +128,14 @@ _(Libvirt storage location)_:
_(Default VM storage path)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
:vms_libvirt_storage_help:
_(Default ISO storage path)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
From e6441a8345301738545ac12ff72f7348a66d697c Mon Sep 17 00:00:00 2001
From: ljm42
Date: Sun, 28 Apr 2024 16:12:40 -0700
Subject: [PATCH 10/67] in http_get_contents, detect and recover from curl
error 23
---
emhttp/plugins/dynamix/include/Wrappers.php | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index 115801216..0963472fa 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -180,16 +180,22 @@ function http_get_contents(string $url, array $opts = [], array &$getinfo = NULL
}
}
$out = curl_exec($ch);
- if(isset($getinfo)) {
+ if (curl_errno($ch) == 23) {
+ // error 23 detected, try CURLOPT_ENCODING = null
+ curl_setopt($ch, CURLOPT_ENCODING, null);
+ $out = curl_exec($ch);
+ }
+ if (isset($getinfo)) {
$getinfo = curl_getinfo($ch);
}
- if (curl_errno($ch)) {
- $msg = curl_error($ch) . " {$url}";
+ if ($errno = curl_errno($ch)) {
+ $msg = "Curl error $errno: " . (curl_error($ch) ?: curl_strerror($errno)) . ". Requested url: '$url'";
if(isset($getinfo)) {
$getinfo['error'] = $msg;
}
my_logger($msg, "http_get_contents");
}
+ curl_close($ch);
return $out;
}
/**
From d1e5f3bb109cef012b2c88b9d7cb49376218b240 Mon Sep 17 00:00:00 2001
From: ljm42
Date: Sun, 28 Apr 2024 16:37:39 -0700
Subject: [PATCH 11/67] rc.local - be consistent with backup extension
---
etc/rc.d/rc.local | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/rc.d/rc.local b/etc/rc.d/rc.local
index 480263e0d..6a6407628 100755
--- a/etc/rc.d/rc.local
+++ b/etc/rc.d/rc.local
@@ -29,7 +29,7 @@ proxy_url_1="${proxy}:${port}"
proxy_name_1="Imported from CA"
EOF
fi
- mv "${CAProxy}" "${CAProxy}.bak"
+ mv "${CAProxy}" "${CAProxy}~"
fi
# load proxy environment vars so it is used for plugin updates and the go script
From 45cfa13e14a9b88df44e315fe7b9a753a4295f4a Mon Sep 17 00:00:00 2001
From: Tom Mortensen
Date: Mon, 29 Apr 2024 12:43:24 -0700
Subject: [PATCH 12/67] changes to include '/bin' in repo
---
.gitignore | 1 -
bin/firefox | 1 +
bin/unraidwold | 1 +
sbin/emhttp | 2 +-
sbin/mover | 4 ++--
src/unraidwold/wolbuild | 2 +-
6 files changed, 6 insertions(+), 5 deletions(-)
create mode 120000 bin/firefox
create mode 120000 bin/unraidwold
diff --git a/.gitignore b/.gitignore
index 33161d56d..60e39eb2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,7 +54,6 @@ sftp-config.json
# =========================
# Exclude these dirs commonly found in /usr/local
-bin/
games/
info/
lib64/
diff --git a/bin/firefox b/bin/firefox
new file mode 120000
index 000000000..21fd74b86
--- /dev/null
+++ b/bin/firefox
@@ -0,0 +1 @@
+/usr/libexec/unraid/firefox-119.0.r20231019122658-x86_64.AppImage
\ No newline at end of file
diff --git a/bin/unraidwold b/bin/unraidwold
new file mode 120000
index 000000000..6ee2c193b
--- /dev/null
+++ b/bin/unraidwold
@@ -0,0 +1 @@
+/usr/libexec/unraid/unraidwold
\ No newline at end of file
diff --git a/sbin/emhttp b/sbin/emhttp
index 86c1ba99b..5692f798b 100755
--- a/sbin/emhttp
+++ b/sbin/emhttp
@@ -46,7 +46,7 @@ case "${1:-start}" in
exit 1
fi
# start emhttpd
- /usr/local/bin/emhttpd
+ /usr/libexec/unraid/emhttpd
;;
'stop')
log "Stopping web services..."
diff --git a/sbin/mover b/sbin/mover
index ab25bfd1b..04b5799f8 100755
--- a/sbin/mover
+++ b/sbin/mover
@@ -67,7 +67,7 @@ start() {
for SHAREPATH in /mnt/$(basename "$POOL" .cfg)/*/ ; do
SHARE=$(basename "$SHAREPATH")
if grep -qs 'shareUseCache="yes"' "/boot/config/shares/${SHARE}.cfg" ; then
- find "${SHAREPATH%/}" -depth | /usr/local/bin/move $DEBUGGING
+ find "${SHAREPATH%/}" -depth | /usr/libexec/unraid/move $DEBUGGING
fi
done
done
@@ -81,7 +81,7 @@ start() {
shareCachePool="cache"
fi
if [[ -d "/mnt/$shareCachePool" ]]; then
- find "${SHAREPATH%/}" -depth | /usr/local/bin/move $DEBUGGING
+ find "${SHAREPATH%/}" -depth | /usr/libexec/unraid/move $DEBUGGING
fi
fi
done
diff --git a/src/unraidwold/wolbuild b/src/unraidwold/wolbuild
index 0d9fd62e2..ff79781ce 100644
--- a/src/unraidwold/wolbuild
+++ b/src/unraidwold/wolbuild
@@ -7,4 +7,4 @@ git checkout main
PATH="$PATH:/usr/local/go/bin"
go mod tidy
go build
-cp /tmp/unraidwol/unraidwold /usr/local/bin
+cp /tmp/unraidwol/unraidwold /usr/libexec/unraid
From ba9bef985c60c3a6498ee2a9c8f4707bad2b61e5 Mon Sep 17 00:00:00 2001
From: dlandon
Date: Mon, 29 Apr 2024 17:58:39 -0500
Subject: [PATCH 13/67] Fix misspelled variable.
---
emhttp/plugins/dynamix.vm.manager/VMSettings.page | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index a39fc9125..8ccf45065 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -118,7 +118,7 @@ _(Libvirt vdisk size)_:
:vms_libvirt_vdisk_size_help:
_(Libvirt storage location)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
@@ -128,14 +128,14 @@ _(Libvirt storage location)_:
_(Default VM storage path)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
:vms_libvirt_storage_help:
_(Default ISO storage path)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
From f8ff2333bb12663107dfaf49e17dd2b2fdf31188 Mon Sep 17 00:00:00 2001
From: Christoph Hummer
Date: Tue, 30 Apr 2024 07:55:28 +0200
Subject: [PATCH 14/67] Update rc.S
- remove wsync from XFS mount to prevent WebGUI from freezing during heavy I/O on /boot
---
etc/rc.d/rc.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/rc.d/rc.S b/etc/rc.d/rc.S
index 731361a6c..f5d10dc8f 100755
--- a/etc/rc.d/rc.S
+++ b/etc/rc.d/rc.S
@@ -100,7 +100,7 @@ if /sbin/blkid -s TYPE $DEVICE | /bin/grep -q "btrfs" ; then
/sbin/mount -v -t btrfs -o auto,rw,noatime,nodiratime,degraded,discard=sync $DEVICE /boot || abort "cannot mount $DEVICE"
elif /sbin/blkid -s TYPE $DEVICE | /bin/grep -q "xfs" ; then
NONVFAT=xfs
- /sbin/mount -v -t xfs -o auto,rw,noatime,nodiratime,discard,wsync $DEVICE /boot || abort "cannot mount $DEVICE"
+ /sbin/mount -v -t xfs -o auto,rw,noatime,nodiratime,discard $DEVICE /boot || abort "cannot mount $DEVICE"
else
/bin/echo "Checking $DEVICE ..."
/sbin/fsck.fat -a -w $DEVICE 2>/dev/null
From 0c32fe5d4d4658db223e1b73dec700591c605c36 Mon Sep 17 00:00:00 2001
From: dlandon
Date: Tue, 30 Apr 2024 06:24:34 -0500
Subject: [PATCH 15/67] Change root folder on isos to /mnt/user.
---
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 8ccf45065..1ace30c44 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -135,7 +135,7 @@ _(Default VM storage path)_:
:vms_libvirt_storage_help:
_(Default ISO storage path)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
From efe372d1d9220d32c0dd89e92e2cfa2a8dbc3532 Mon Sep 17 00:00:00 2001
From: dlandon
Date: Wed, 1 May 2024 04:58:17 -0500
Subject: [PATCH 16/67] Change variables back to the original plugin variables.
---
.../dynamix/javascript/jquery.filetree.js | 217 +++++++++---------
1 file changed, 108 insertions(+), 109 deletions(-)
diff --git a/emhttp/plugins/dynamix/javascript/jquery.filetree.js b/emhttp/plugins/dynamix/javascript/jquery.filetree.js
index f17a9e1d1..744e5982a 100644
--- a/emhttp/plugins/dynamix/javascript/jquery.filetree.js
+++ b/emhttp/plugins/dynamix/javascript/jquery.filetree.js
@@ -1,121 +1,120 @@
/* jQuery File Tree. Authors - Cory S.N. LaViska & Dave Rogers. Copyright 2008 A Beautiful Site, LLC. - Adapted by Bergware for use in Unraid */
-jQuery && function(e) {
- e.extend(e.fn, {
- fileTree: function(i, t, l) {
- // Initialize pickexclude with an empty string if not provided
- void 0 === i.root && (i.root = "/mnt/"),
- void 0 === i.top && (i.top = "/mnt/"),
- void 0 === i.filter && (i.filter = ""),
- void 0 === i.match && (i.match = ".*"),
- void 0 === i.script && (i.script = "/webGui/include/FileTree.php"),
- void 0 === i.folderEvent && (i.folderEvent = "click"),
- void 0 === i.expandSpeed && (i.expandSpeed = 300),
- void 0 === i.collapseSpeed && (i.collapseSpeed = 300),
- void 0 === i.expandEasing && (i.expandEasing = null),
- void 0 === i.collapseEasing && (i.collapseEasing = null),
- void 0 === i.multiFolder && (i.multiFolder = !1),
- void 0 === i.loadMessage && (i.loadMessage = "Loading..."),
- void 0 === i.multiSelect && (i.multiSelect = !1),
- void 0 === i.allowBrowsing && (i.allowBrowsing = !1),
- void 0 === i.pickexclude && (i.pickexclude = "");
- e(this).each(function() {
- function s(r, n, o) {
- e(r).addClass("wait"),
- e(".jqueryFileTree.start").remove(),
- /* Modify the post data to include pickexclude. */
- e.post(i.script, {
- dir: n,
- root: i.top,
- multiSelect: i.multiSelect,
- filter: i.filter,
- match: i.match,
- show_parent: o,
- /* Add pickexclude parameter. */
- pickexclude: i.pickexclude
- }).done(function(o) {
- var d;
- e(r).find(".start").html(""),
- e(r).removeClass("wait").append(o),
- i.root == n ? e(r).find("UL:hidden").show() : e(r).find("UL:hidden").slideDown({
- duration: i.expandSpeed,
- easing: i.expandEasing
- }),
- e(d = r).find("LI A").on(i.folderEvent, function(r) {
- r.preventDefault();
- var n = {};
- return n.li = e(this).closest("li"),
- n.type = n.li.hasClass("directory") ? "directory" : "file",
- n.value = e(this).text(),
- n.rel = e(this).prop("rel"),
- ".." == e(this).text() ? (i.root = n.rel, l && l(e(this).attr("rel")), a(e(this), "filetreefolderclicked", n), root = e(this).closest("ul.jqueryFileTree"), root.html('"), s(e(root), i.root, i.allowBrowsing)) : e(this).parent().hasClass("directory") ? (e(this).parent().hasClass("collapsed") ? (a(e(this), "filetreeexpand", n), i.multiFolder || (e(this).parent().parent().find("UL").slideUp({
- duration: i.collapseSpeed,
- easing: i.collapseEasing
- }), e(this).parent().parent().find("LI.directory").removeClass("expanded").addClass("collapsed")), e(this).parent().removeClass("collapsed").addClass("expanded"), e(this).parent().find("UL").remove(), s(e(this).parent(), e(this).attr("rel").match(/.*\//)[0], !1)) : (a(e(this), "filetreecollapse", n), e(this).parent().find("UL").slideUp({
- duration: i.collapseSpeed,
- easing: i.collapseEasing
- }), e(this).parent().removeClass("expanded").addClass("collapsed"), a(e(this), "filetreecollapsed", n)), l && l(e(this).attr("rel")), a(e(this), "filetreefolderclicked", n)) : (t && t(e(this).attr("rel")), a(e(this), "filetreeclicked", n)), !1
- }),
- "click" != i.folderEvent.toLowerCase && e(d).find("LI A").on("click", function(e) {
- return e.preventDefault(), !1
- }),
- a(e(this), "filetreeexpanded", o)
- }).fail(function() {
- e(r).find(".start").html(""),
- e(r).removeClass("wait").append("Unable to get file tree information")
- })
- }
-
- function a(e, i, t) {
- t.trigger = i,
- e.trigger(i, t)
- }
- e(this).html('"),
- s(e(this), i.root, i.allowBrowsing),
- e(this).on("change", "input:checkbox", function() {
- var i = {};
- i.li = e(this).closest("li"),
- i.type = i.li.hasClass("directory") ? "directory" : "file",
- i.value = i.li.children("a").text(),
- i.rel = i.li.children("a").prop("rel"),
- i.li.find("input:checkbox").prop("checked", e(this).prop("checked")),
- e(this).prop("checked") ? a(e(this), "filetreechecked", i) : a(e(this), "filetreeunchecked", i)
+jQuery && function($) {
+ $.extend($.fn, {
+ fileTree: function(options, callback, onCancel) {
+ void 0 === options.root && (options.root = "/mnt/"),
+ void 0 === options.top && (options.top = "/mnt/"),
+ void 0 === options.filter && (options.filter = ""),
+ void 0 === options.match && (options.match = ".*"),
+ void 0 === options.script && (options.script = "/webGui/include/FileTree.php"),
+ void 0 === options.folderEvent && (options.folderEvent = "click"),
+ void 0 === options.expandSpeed && (options.expandSpeed = 300),
+ void 0 === options.collapseSpeed && (options.collapseSpeed = 300),
+ void 0 === options.expandEasing && (options.expandEasing = null),
+ void 0 === options.collapseEasing && (options.collapseEasing = null),
+ void 0 === options.multiFolder && (options.multiFolder = !1),
+ void 0 === options.loadMessage && (options.loadMessage = "Loading..."),
+ void 0 === options.multiSelect && (options.multiSelect = !1),
+ void 0 === options.allowBrowsing && (options.allowBrowsing = !1),
+ void 0 === options.pickexclude && (options.pickexclude = "");
+ $(this).each(function() {
+ function showTree($this, dir, showParent) {
+ $this.addClass("wait"),
+ $(".jqueryFileTree.start").remove(),
+ /* Modify the post data to include pickexclude. */
+ $.post(options.script, {
+ dir: dir,
+ root: options.top,
+ multiSelect: options.multiSelect,
+ filter: options.filter,
+ match: options.match,
+ show_parent: showParent,
+ /* Add pickexclude parameter. */
+ pickexclude: options.pickexclude
+ }).done(function(data) {
+ var $parent;
+ $this.find(".start").html(""),
+ $this.removeClass("wait").append(data),
+ options.root == dir ? $this.find("UL:hidden").show() : $this.find("UL:hidden").slideDown({
+ duration: options.expandSpeed,
+ easing: options.expandEasing
+ }),
+ $($parent = $this).find("LI A").on(options.folderEvent, function(event) {
+ event.preventDefault();
+ var node = {};
+ return node.li = $(this).closest("li"),
+ node.type = node.li.hasClass("directory") ? "directory" : "file",
+ node.value = $(this).text(),
+ node.rel = $(this).prop("rel"),
+ ".." == $(this).text() ? (options.root = node.rel, callback && callback($(this).attr("rel")), triggerEvent($(this), "filetreefolderclicked", node), root = $(this).closest("ul.jqueryFileTree"), root.html('- ' + options.loadMessage + "
"), showTree($(root), options.root, options.allowBrowsing)) : $(this).parent().hasClass("directory") ? ($(this).parent().hasClass("collapsed") ? (triggerEvent($(this), "filetreeexpand", node), options.multiFolder || ($(this).parent().parent().find("UL").slideUp({
+ duration: options.collapseSpeed,
+ easing: options.collapseEasing
+ }), $(this).parent().parent().find("LI.directory").removeClass("expanded").addClass("collapsed")), $(this).parent().removeClass("collapsed").addClass("expanded"), $(this).parent().find("UL").remove(), showTree($(this).parent(), $(this).attr("rel").match(/.*\//)[0], !1)) : (triggerEvent($(this), "filetreecollapse", node), $(this).parent().find("UL").slideUp({
+ duration: options.collapseSpeed,
+ easing: options.collapseEasing
+ }), $(this).parent().removeClass("expanded").addClass("collapsed"), triggerEvent($(this), "filetreecollapsed", node)), callback && callback($(this).attr("rel")), triggerEvent($(this), "filetreefolderclicked", node)) : (onCancel && onCancel($(this).attr("rel")), triggerEvent($(this), "filetreeclicked", node)), !1
+ }),
+ "click" != options.folderEvent.toLowerCase && $parent.find("LI A").on("click", function(event) {
+ return event.preventDefault(), !1
+ }),
+ triggerEvent($(this), "filetreeexpanded", data)
+ }).fail(function() {
+ $this.find(".start").html(""),
+ $this.removeClass("wait").append("Unable to get file tree information")
})
- })
+ }
+
+ function triggerEvent($elem, event, data) {
+ data.trigger = event,
+ $elem.trigger(event, data)
+ }
+ $(this).html('- ' + options.loadMessage + "
"),
+ showTree($(this), options.root, options.allowBrowsing),
+ $(this).on("change", "input:checkbox", function() {
+ var node = {};
+ node.li = $(this).closest("li"),
+ node.type = node.li.hasClass("directory") ? "directory" : "file",
+ node.value = node.li.children("a").text(),
+ node.rel = node.li.children("a").prop("rel"),
+ node.li.find("input:checkbox").prop("checked", $(this).prop("checked")),
+ $(this).prop("checked") ? triggerEvent($(this), "filetreechecked", node) : triggerEvent($(this), "filetreeunchecked", node)
+ })
+ })
},
- fileTreeAttach: function(i, t, l) {
- var s = {};
- e.isFunction(i) ? (e.isFunction(t) && (l = t), t = i) : i && e.extend(s, i),
- e(this).each(function() {
- var i = e(this),
- a = e.extend({}, s, i.data()),
- r = i.next(".fileTree");
- 0 === r.length && (e(document).mousedown(function(i) {
- var t = e(".fileTree");
- t.is(i.target) || 0 !== t.has(i.target).length || t.slideUp("fast")
+ fileTreeAttach: function(options, callback, onCancel) {
+ var settings = {};
+ $.isFunction(options) ? ($.isFunction(callback) && (onCancel = callback), callback = options) : options && $.extend(settings, options),
+ $(this).each(function() {
+ var $this = $(this),
+ config = $.extend({}, settings, $this.data()),
+ $fileTree = $this.next(".fileTree");
+ 0 === $fileTree.length && ($(document).mousedown(function(event) {
+ var $fileTree = $(".fileTree");
+ $fileTree.is(event.target) || 0 !== $fileTree.has(event.target).length || $fileTree.slideUp("fast")
}),
- r = e("", {
+ $fileTree = $("
", {
class: "textarea fileTree"
}),
- i.after(r)),
- i.click(function() {
- r.is(":visible") ? r.slideUp("fast") : ("" === r.html() && (r.html('
Loading...'),
- r.fileTree({
- root: a.pickroot,
- top: a.picktop,
- filter: (a.pickfilter || "").split(","),
- match: a.pickmatch || ".*",
+ $this.after($fileTree)),
+ $this.click(function() {
+ $fileTree.is(":visible") ? $fileTree.slideUp("fast") : ("" === $fileTree.html() && ($fileTree.html('
Loading...'),
+ $fileTree.fileTree({
+ root: config.pickroot,
+ top: config.picktop,
+ filter: (config.pickfilter || "").split(","),
+ match: config.pickmatch || ".*",
/* Include pickexclude parameter in fileTreeAttach. */
- pickexclude: a.pickexclude
- }, e.isFunction(t) ? t : function(e) {
- i.val(e).change(),
- a.hasOwnProperty("pickcloseonfile") && r.slideUp("fast")
- }, e.isFunction(l) ? l : function(e) {
- a.hasOwnProperty("pickfolders") && i.val(e).change()
+ pickexclude: config.pickexclude
+ }, $.isFunction(callback) ? callback : function(data) {
+ $this.val(data).change(),
+ config.hasOwnProperty("pickcloseonfile") && $fileTree.slideUp("fast")
+ }, $.isFunction(onCancel) ? onCancel : function(data) {
+ config.hasOwnProperty("pickfolders") && $this.val(data).change()
})),
- r.offset({
- left: i.position().left
+ $fileTree.offset({
+ left: $this.position().left
}),
- r.slideDown("fast"))
+ $fileTree.slideDown("fast"))
})
})
}
From a90d083cb018cca5261e1466e5f4a4ed8aa98d43 Mon Sep 17 00:00:00 2001
From: dlandon
Date: Thu, 2 May 2024 08:06:20 -0500
Subject: [PATCH 17/67] Revert excluded folders.
---
.../plugins/dynamix.docker.manager/DockerSettings.page | 9 +++------
emhttp/plugins/dynamix.vm.manager/VMSettings.page | 9 +++------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
index 8ce287a76..dba410d3b 100644
--- a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
+++ b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page
@@ -20,9 +20,6 @@ Tag="icon-docker"
// Add the Docker JSON client
require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
-/* Folders to be excluded from the drop down file picker. */
-$excludeFolders = ".Recycle.Bin,RecycleBin,addons,disks,remotes,rootshare,user0";
-
$DockerClient = new DockerClient();
exec("/etc/rc.d/rc.docker status >/dev/null",$dummy,$DockerStopped);
@@ -166,7 +163,7 @@ _(Docker vDisk size)_:
:docker_vdisk_size_help:
_(Docker vDisk location)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
@@ -177,7 +174,7 @@ _(Docker vDisk location)_:
_(Docker directory)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
@@ -187,7 +184,7 @@ _(Docker directory)_:
_(Default appdata storage location)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
diff --git a/emhttp/plugins/dynamix.vm.manager/VMSettings.page b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
index 1ace30c44..d4c311db8 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -19,9 +19,6 @@ Tag="columns"
" placeholder="e.g. /mnt/user/system/libvirt/libvirt.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickexclude="" data-pickfolders="true" required pattern="^[^\\]*libvirt\.img$">
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
@@ -128,14 +125,14 @@ _(Libvirt storage location)_:
_(Default VM storage path)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
:vms_libvirt_storage_help:
_(Default ISO storage path)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
From 4f82b16fddfed38be3e749bb2b92d6938898d146 Mon Sep 17 00:00:00 2001
From: dlandon
Date: Thu, 2 May 2024 08:06:46 -0500
Subject: [PATCH 18/67] Revert to minimized version.
---
.../dynamix/javascript/jquery.filetree.js | 122 +-----------------
1 file changed, 1 insertion(+), 121 deletions(-)
diff --git a/emhttp/plugins/dynamix/javascript/jquery.filetree.js b/emhttp/plugins/dynamix/javascript/jquery.filetree.js
index 744e5982a..d59f986b1 100644
--- a/emhttp/plugins/dynamix/javascript/jquery.filetree.js
+++ b/emhttp/plugins/dynamix/javascript/jquery.filetree.js
@@ -1,122 +1,2 @@
/* jQuery File Tree. Authors - Cory S.N. LaViska & Dave Rogers. Copyright 2008 A Beautiful Site, LLC. - Adapted by Bergware for use in Unraid */
-jQuery && function($) {
- $.extend($.fn, {
- fileTree: function(options, callback, onCancel) {
- void 0 === options.root && (options.root = "/mnt/"),
- void 0 === options.top && (options.top = "/mnt/"),
- void 0 === options.filter && (options.filter = ""),
- void 0 === options.match && (options.match = ".*"),
- void 0 === options.script && (options.script = "/webGui/include/FileTree.php"),
- void 0 === options.folderEvent && (options.folderEvent = "click"),
- void 0 === options.expandSpeed && (options.expandSpeed = 300),
- void 0 === options.collapseSpeed && (options.collapseSpeed = 300),
- void 0 === options.expandEasing && (options.expandEasing = null),
- void 0 === options.collapseEasing && (options.collapseEasing = null),
- void 0 === options.multiFolder && (options.multiFolder = !1),
- void 0 === options.loadMessage && (options.loadMessage = "Loading..."),
- void 0 === options.multiSelect && (options.multiSelect = !1),
- void 0 === options.allowBrowsing && (options.allowBrowsing = !1),
- void 0 === options.pickexclude && (options.pickexclude = "");
- $(this).each(function() {
- function showTree($this, dir, showParent) {
- $this.addClass("wait"),
- $(".jqueryFileTree.start").remove(),
- /* Modify the post data to include pickexclude. */
- $.post(options.script, {
- dir: dir,
- root: options.top,
- multiSelect: options.multiSelect,
- filter: options.filter,
- match: options.match,
- show_parent: showParent,
- /* Add pickexclude parameter. */
- pickexclude: options.pickexclude
- }).done(function(data) {
- var $parent;
- $this.find(".start").html(""),
- $this.removeClass("wait").append(data),
- options.root == dir ? $this.find("UL:hidden").show() : $this.find("UL:hidden").slideDown({
- duration: options.expandSpeed,
- easing: options.expandEasing
- }),
- $($parent = $this).find("LI A").on(options.folderEvent, function(event) {
- event.preventDefault();
- var node = {};
- return node.li = $(this).closest("li"),
- node.type = node.li.hasClass("directory") ? "directory" : "file",
- node.value = $(this).text(),
- node.rel = $(this).prop("rel"),
- ".." == $(this).text() ? (options.root = node.rel, callback && callback($(this).attr("rel")), triggerEvent($(this), "filetreefolderclicked", node), root = $(this).closest("ul.jqueryFileTree"), root.html('- ' + options.loadMessage + "
"), showTree($(root), options.root, options.allowBrowsing)) : $(this).parent().hasClass("directory") ? ($(this).parent().hasClass("collapsed") ? (triggerEvent($(this), "filetreeexpand", node), options.multiFolder || ($(this).parent().parent().find("UL").slideUp({
- duration: options.collapseSpeed,
- easing: options.collapseEasing
- }), $(this).parent().parent().find("LI.directory").removeClass("expanded").addClass("collapsed")), $(this).parent().removeClass("collapsed").addClass("expanded"), $(this).parent().find("UL").remove(), showTree($(this).parent(), $(this).attr("rel").match(/.*\//)[0], !1)) : (triggerEvent($(this), "filetreecollapse", node), $(this).parent().find("UL").slideUp({
- duration: options.collapseSpeed,
- easing: options.collapseEasing
- }), $(this).parent().removeClass("expanded").addClass("collapsed"), triggerEvent($(this), "filetreecollapsed", node)), callback && callback($(this).attr("rel")), triggerEvent($(this), "filetreefolderclicked", node)) : (onCancel && onCancel($(this).attr("rel")), triggerEvent($(this), "filetreeclicked", node)), !1
- }),
- "click" != options.folderEvent.toLowerCase && $parent.find("LI A").on("click", function(event) {
- return event.preventDefault(), !1
- }),
- triggerEvent($(this), "filetreeexpanded", data)
- }).fail(function() {
- $this.find(".start").html(""),
- $this.removeClass("wait").append("Unable to get file tree information")
- })
- }
-
- function triggerEvent($elem, event, data) {
- data.trigger = event,
- $elem.trigger(event, data)
- }
- $(this).html('- ' + options.loadMessage + "
"),
- showTree($(this), options.root, options.allowBrowsing),
- $(this).on("change", "input:checkbox", function() {
- var node = {};
- node.li = $(this).closest("li"),
- node.type = node.li.hasClass("directory") ? "directory" : "file",
- node.value = node.li.children("a").text(),
- node.rel = node.li.children("a").prop("rel"),
- node.li.find("input:checkbox").prop("checked", $(this).prop("checked")),
- $(this).prop("checked") ? triggerEvent($(this), "filetreechecked", node) : triggerEvent($(this), "filetreeunchecked", node)
- })
- })
- },
- fileTreeAttach: function(options, callback, onCancel) {
- var settings = {};
- $.isFunction(options) ? ($.isFunction(callback) && (onCancel = callback), callback = options) : options && $.extend(settings, options),
- $(this).each(function() {
- var $this = $(this),
- config = $.extend({}, settings, $this.data()),
- $fileTree = $this.next(".fileTree");
- 0 === $fileTree.length && ($(document).mousedown(function(event) {
- var $fileTree = $(".fileTree");
- $fileTree.is(event.target) || 0 !== $fileTree.has(event.target).length || $fileTree.slideUp("fast")
- }),
- $fileTree = $("", {
- class: "textarea fileTree"
- }),
- $this.after($fileTree)),
- $this.click(function() {
- $fileTree.is(":visible") ? $fileTree.slideUp("fast") : ("" === $fileTree.html() && ($fileTree.html('
Loading...'),
- $fileTree.fileTree({
- root: config.pickroot,
- top: config.picktop,
- filter: (config.pickfilter || "").split(","),
- match: config.pickmatch || ".*",
- /* Include pickexclude parameter in fileTreeAttach. */
- pickexclude: config.pickexclude
- }, $.isFunction(callback) ? callback : function(data) {
- $this.val(data).change(),
- config.hasOwnProperty("pickcloseonfile") && $fileTree.slideUp("fast")
- }, $.isFunction(onCancel) ? onCancel : function(data) {
- config.hasOwnProperty("pickfolders") && $this.val(data).change()
- })),
- $fileTree.offset({
- left: $this.position().left
- }),
- $fileTree.slideDown("fast"))
- })
- })
- }
- })
-}(jQuery);
+jQuery&&function(e){e.extend(e.fn,{fileTree:function(i,t,l){void 0===i.root&&(i.root="/mnt/"),void 0===i.top&&(i.top="/mnt/"),void 0===i.filter&&(i.filter=""),void 0===i.match&&(i.match=".*"),void 0===i.script&&(i.script="/webGui/include/FileTree.php"),void 0===i.folderEvent&&(i.folderEvent="click"),void 0===i.expandSpeed&&(i.expandSpeed=300),void 0===i.collapseSpeed&&(i.collapseSpeed=300),void 0===i.expandEasing&&(i.expandEasing=null),void 0===i.collapseEasing&&(i.collapseEasing=null),void 0===i.multiFolder&&(i.multiFolder=!1),void 0===i.loadMessage&&(i.loadMessage="Loading..."),void 0===i.multiSelect&&(i.multiSelect=!1),void 0===i.allowBrowsing&&(i.allowBrowsing=!1),e(this).each(function(){function s(r,n,o){e(r).addClass("wait"),e(".jqueryFileTree.start").remove(),e.post(i.script,{dir:n,root:i.top,multiSelect:i.multiSelect,filter:i.filter,match:i.match,show_parent:o}).done(function(o){var d;e(r).find(".start").html(""),e(r).removeClass("wait").append(o),i.root==n?e(r).find("UL:hidden").show():e(r).find("UL:hidden").slideDown({duration:i.expandSpeed,easing:i.expandEasing}),e(d=r).find("LI A").on(i.folderEvent,function(r){r.preventDefault();var n={};return n.li=e(this).closest("li"),n.type=n.li.hasClass("directory")?"directory":"file",n.value=e(this).text(),n.rel=e(this).prop("rel"),".."==e(this).text()?(i.root=n.rel,l&&l(e(this).attr("rel")),a(e(this),"filetreefolderclicked",n),root=e(this).closest("ul.jqueryFileTree"),root.html('
"),s(e(root),i.root,i.allowBrowsing)):e(this).parent().hasClass("directory")?(e(this).parent().hasClass("collapsed")?(a(e(this),"filetreeexpand",n),i.multiFolder||(e(this).parent().parent().find("UL").slideUp({duration:i.collapseSpeed,easing:i.collapseEasing}),e(this).parent().parent().find("LI.directory").removeClass("expanded").addClass("collapsed")),e(this).parent().removeClass("collapsed").addClass("expanded"),e(this).parent().find("UL").remove(),s(e(this).parent(),e(this).attr("rel").match(/.*\//)[0],!1)):(a(e(this),"filetreecollapse",n),e(this).parent().find("UL").slideUp({duration:i.collapseSpeed,easing:i.collapseEasing}),e(this).parent().removeClass("expanded").addClass("collapsed"),a(e(this),"filetreecollapsed",n)),l&&l(e(this).attr("rel")),a(e(this),"filetreefolderclicked",n)):(t&&t(e(this).attr("rel")),a(e(this),"filetreeclicked",n)),!1}),"click"!=i.folderEvent.toLowerCase&&e(d).find("LI A").on("click",function(e){return e.preventDefault(),!1}),a(e(this),"filetreeexpanded",o)}).fail(function(){e(r).find(".start").html(""),e(r).removeClass("wait").append("
Unable to get file tree information")})}function a(e,i,t){t.trigger=i,e.trigger(i,t)}e(this).html('
"),s(e(this),i.root,i.allowBrowsing),e(this).on("change","input:checkbox",function(){var i={};i.li=e(this).closest("li"),i.type=i.li.hasClass("directory")?"directory":"file",i.value=i.li.children("a").text(),i.rel=i.li.children("a").prop("rel"),i.li.find("input:checkbox").prop("checked",e(this).prop("checked")),e(this).prop("checked")?a(e(this),"filetreechecked",i):a(e(this),"filetreeunchecked",i)})})},fileTreeAttach:function(i,t,l){var s={};e.isFunction(i)?(e.isFunction(t)&&(l=t),t=i):i&&e.extend(s,i),e(this).each(function(){var i=e(this),a=e.extend({},s,i.data()),r=i.next(".fileTree");0===r.length&&(e(document).mousedown(function(i){var t=e(".fileTree");t.is(i.target)||0!==t.has(i.target).length||t.slideUp("fast")}),r=e("
",{class:"textarea fileTree"}),i.after(r)),i.click(function(){r.is(":visible")?r.slideUp("fast"):(""===r.html()&&(r.html('
Loading...'),r.fileTree({root:a.pickroot,top:a.picktop,filter:(a.pickfilter||"").split(","),match:a.pickmatch||".*"},e.isFunction(t)?t:function(e){i.val(e).change(),a.hasOwnProperty("pickcloseonfile")&&r.slideUp("fast")},e.isFunction(l)?l:function(e){a.hasOwnProperty("pickfolders")&&i.val(e).change()})),r.offset({left:i.position().left}),r.slideDown("fast"))})})}})}(jQuery);
\ No newline at end of file
From 245e6413cb1ab3ff09c4e1d2d6e4c36dfd800801 Mon Sep 17 00:00:00 2001
From: dlandon
Date: Thu, 2 May 2024 08:07:27 -0500
Subject: [PATCH 19/67] Exclude folders from /mnt/ and .Recycle.Bin from all
folders.
---
emhttp/plugins/dynamix/include/FileTree.php | 46 +++++++++++++--------
1 file changed, 29 insertions(+), 17 deletions(-)
diff --git a/emhttp/plugins/dynamix/include/FileTree.php b/emhttp/plugins/dynamix/include/FileTree.php
index 23835897d..c0fe22875 100644
--- a/emhttp/plugins/dynamix/include/FileTree.php
+++ b/emhttp/plugins/dynamix/include/FileTree.php
@@ -9,7 +9,7 @@
*
* History:
*
- * 1.2.1 - pass in a list of folders to exclude from the dropdown list
+ * 1.2.1 - exclude folders from the /mnt/ root folder
* 1.2.0 - adapted by Bergware for use in Unraid - support UTF-8 encoding & hardening
* 1.1.1 - SECURITY: forcing root to prevent users from determining system's file structure (per DaveBrad)
* 1.1.0 - adding multiSelect (checkbox) support (08/22/2014)
@@ -49,33 +49,45 @@ $filters = (array)$_POST['filter'];
$match = $_POST['match'];
$checkbox = $_POST['multiSelect']=='true' ? "" : "";
-/* Add the pickexclude functionality to exclude folders from the list. */
-$excludedFolders = explode(",", $_POST['pickexclude']);
+/* Excluded folders to not show in the dropdown in the '/mnt/' directory only. */
+$excludedFolders = ["RecycleBin", "addons", "disks", "remotes", "rootshare", "user0"];
echo "";
if ($_POST['show_parent']=='true' && is_top($rootdir)) echo "- $checkbox..
";
if (is_low($rootdir) && is_dir($rootdir)) {
$dirs = $files = [];
- $names = array_filter(scandir($rootdir,SCANDIR_SORT_NONE),function($n){return $n!='.' && $n!='..';});
+ $names = array_filter(scandir($rootdir, SCANDIR_SORT_NONE), function($n) { return $n != '.' && $n != '..'; });
natcasesort($names);
- foreach ($names as $name) if (is_dir($rootdir.$name)) $dirs[] = $name; else $files[] = $name;
- foreach ($dirs as $name) {
- $htmlRel = htmlspecialchars($rootdir.$name);
- $htmlName = htmlspecialchars(mb_strlen($name)<=33 ? $name : mb_substr($name,0,30).'...');
- if (is_dir($rootdir.$name)) {
- /* Check if the directory should be excluded. */
- if (!in_array($name, $excludedFolders) && (empty($match) || preg_match("/$match/",$rootdir.$name))) {
- echo "- $checkbox$htmlName
";
- }
+ foreach ($names as $name) {
+ if (is_dir($rootdir . $name)) {
+ $dirs[] = $name;
+ } else {
+ $files[] = $name;
}
}
+ foreach ($dirs as $name) {
+ $htmlRel = htmlspecialchars($rootdir . $name);
+ $htmlName = htmlspecialchars(mb_strlen($name) <= 33 ? $name : mb_substr($name, 0, 30) . '...');
+
+ /* Exclude '.Recycle.Bin' from all directories */
+ if ($name === ".Recycle.Bin") continue;
+
+ /* Exclude folders only when directory is '/mnt/' */
+ if (in_array($name, $excludedFolders) && $rootdir === "/mnt/") continue;
+
+ echo "- $checkbox$htmlName
";
+ }
foreach ($files as $name) {
- $htmlRel = htmlspecialchars($rootdir.$name);
+ $htmlRel = htmlspecialchars($rootdir . $name);
$htmlName = htmlspecialchars($name);
- $ext = mb_strtolower(pathinfo($name,PATHINFO_EXTENSION));
- foreach ($filters as $filter) if (empty($filter)||$ext==$filter) {
- if (empty($match)||preg_match("/$match/",$name)) echo "- $checkbox$htmlName
";
+ $ext = mb_strtolower(pathinfo($name, PATHINFO_EXTENSION));
+ foreach ($filters as $filter) {
+ if (empty($filter) || $ext == $filter) {
+ if (empty($match) || preg_match("/$match/", $name)) {
+ echo "- $checkbox$htmlName
";
+ }
+ }
}
}
}
From 9296e6297cf68dbadc0005940f29cc5a2944c05d Mon Sep 17 00:00:00 2001
From: dlandon
Date: Thu, 2 May 2024 08:39:53 -0500
Subject: [PATCH 20/67] Be sure /mnt/user is available before using it as root
in file picker.
---
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 d4c311db8..99d2501a3 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page
@@ -132,7 +132,7 @@ _(Default VM storage path)_:
:vms_libvirt_storage_help:
_(Default ISO storage path)_:
-:
+:
_(Modify with caution: unable to validate path until Array is Started)_
_(Path does not exist)_
From 2db31b2012dcfa830e708b791c1236467afb5754 Mon Sep 17 00:00:00 2001
From: ljm42
Date: Thu, 2 May 2024 14:49:31 -0700
Subject: [PATCH 21/67] Remove keys.lime-technology.com from hosts file
---
etc/rc.d/rc.S.cont | 1 -
1 file changed, 1 deletion(-)
diff --git a/etc/rc.d/rc.S.cont b/etc/rc.d/rc.S.cont
index b2bb66219..563a3e598 100755
--- a/etc/rc.d/rc.S.cont
+++ b/etc/rc.d/rc.S.cont
@@ -208,7 +208,6 @@ fi
/bin/echo "$NAME" >/etc/HOSTNAME
/bin/echo "# Generated" >/etc/hosts
/bin/echo "127.0.0.1 $NAME localhost" >>/etc/hosts
-/bin/echo "54.149.176.35 keys.lime-technology.com" >>/etc/hosts
# LimeTech - restore the configured timezone
if [[ $timeZone == custom ]]; then
From a8f0e3ec1993a53752452818b8274c2dfcb5ef7a Mon Sep 17 00:00:00 2001
From: ljm42
Date: Thu, 2 May 2024 15:19:49 -0700
Subject: [PATCH 22/67] When avahidaemon running, add name.local to hosts file
---
etc/rc.d/rc.avahidaemon | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/etc/rc.d/rc.avahidaemon b/etc/rc.d/rc.avahidaemon
index e0a9e60aa..786d6c570 100755
--- a/etc/rc.d/rc.avahidaemon
+++ b/etc/rc.d/rc.avahidaemon
@@ -30,6 +30,8 @@ DAEMON="Avahi mDNS/DNS-SD daemon"
CALLER="avahi"
AVAHI="/usr/sbin/avahi-daemon"
CONF="/etc/avahi/avahi-daemon.conf"
+HOSTS="/etc/hosts"
+NAME=$(
Date: Sat, 4 May 2024 15:58:35 -0700
Subject: [PATCH 23/67] in http_get_contents, detect and recover from curl
error 23
change from null to "deflate"
---
emhttp/plugins/dynamix/include/Wrappers.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index 0963472fa..98a8aa308 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -181,8 +181,8 @@ function http_get_contents(string $url, array $opts = [], array &$getinfo = NULL
}
$out = curl_exec($ch);
if (curl_errno($ch) == 23) {
- // error 23 detected, try CURLOPT_ENCODING = null
- curl_setopt($ch, CURLOPT_ENCODING, null);
+ // error 23 detected, try CURLOPT_ENCODING = "deflate"
+ curl_setopt($ch, CURLOPT_ENCODING, "deflate");
$out = curl_exec($ch);
}
if (isset($getinfo)) {
From 072e3512e0f14da5dcd52638534a9273819eb75b Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Mon, 6 May 2024 12:45:41 +0100
Subject: [PATCH 24/67] Various VM Manager Fixes
Fix VM memory size values on VM Usage
Fix issue with auto showing for QCOW2 files not in a VM path, should be manual
---
emhttp/plugins/dynamix.vm.manager/nchan/vm_usage | 2 +-
emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php | 1 -
emhttp/plugins/dynamix/nchan/vm_dashusage | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage b/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage
index 7407e8e14..f5e3d6760 100755
--- a/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage
+++ b/emhttp/plugins/dynamix.vm.manager/nchan/vm_usage
@@ -78,7 +78,7 @@ while (true) {
$echodata .= "| $vm | " ;
$echodata .= "".$vmdata['cpuguest']."%
| ";
$echodata .= "".$vmdata['cpuhost']."%
| ";
- $echodata .= my_scale($vmdata['mem'],$unit)."$unit / ".my_scale($vmdata['maxmem'],$unit)."$unit | ";
+ $echodata .= my_scale($vmdata['mem']*1024,$unit)."$unit / ".my_scale($vmdata['maxmem']*1024,$unit)."$unit | ";
$echodata .= _("Read").": ".my_scale($vmdata['rdrate'],$unit)."$unit/s
"._("Write").": ".my_scale($vmdata['wrrate'],$unit)."$unit/s | ";
$echodata .= _("RX").": ".my_scale($vmdata['rxrate'],$unit)."$unit/s
"._("TX").": ".my_scale($vmdata['txrate'],$unit)."$unit/s |
";
}
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 8b91a956b..87700e1d0 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -721,7 +721,6 @@
if (strpos($domain_cfg['DOMAINDIR'], dirname(dirname($arrDisk['new']))) === false ||
basename(dirname($arrDisk['new'])) != $arrConfig['domain']['name'] || (
basename($arrDisk['new']) != 'vdisk'.($i+1).'.img') && basename($arrDisk['new']) != 'vdisk'.($i+1).'.qcow2') {
- if ($arrDisk['driver'] == "qcow2" && (basename($arrDisk['new']) == 'vdisk'.($i+1).'.qcow2')) $default_option = "auto"; else
$default_option = 'manual';
}
if (file_exists(dirname(dirname($arrDisk['new'])).'/'.$arrConfig['domain']['name'].'/vdisk'.($i+1).'.img') || file_exists(dirname(dirname($arrDisk['new'])).'/'.$arrConfig['domain']['name'].'/vdisk'.($i+1).'.qcow2')) {
diff --git a/emhttp/plugins/dynamix/nchan/vm_dashusage b/emhttp/plugins/dynamix/nchan/vm_dashusage
index ad879b171..02d3c56da 100755
--- a/emhttp/plugins/dynamix/nchan/vm_dashusage
+++ b/emhttp/plugins/dynamix/nchan/vm_dashusage
@@ -75,7 +75,7 @@ while (true) {
$vmencode = $lv->domain_get_uuid($vm);
$echo[$vmencode ]['gcpu'] = ""._("Guest CPU").": ".$vmdata['cpuguest']."%
";
$echo[$vmencode ]['hcpu'] = ""._("Host CPU").": ".$vmdata['cpuhost']."%
";
- $echo[$vmencode ]['mem'] .= "Mem: ".my_scale($vmdata['mem'],$unit)."$unit / ".my_scale($vmdata['maxmem'],$unit)."$unit";
+ $echo[$vmencode ]['mem'] .= "Mem: ".my_scale($vmdata['mem']*1024,$unit)."$unit / ".my_scale($vmdata['maxmem']*1024,$unit)."$unit";
$echo[$vmencode ]['disk'] .= "Disk: "._("Rd").": ".my_scale($vmdata['rdrate'],$unit)."$unit/s "._("Wr").": ".my_scale($vmdata['wrrate'],$unit)."$unit/s";
$echo[$vmencode ]['net'] .= "Net: "._("RX").": ".my_scale($vmdata['rxrate'],$unit)."$unit/s "._("TX").": ".my_scale($vmdata['txrate'],$unit)."$unit/s";
}
From b4a3a90a4699354cbfd2a49723bd159516e1bc7a Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Mon, 6 May 2024 20:44:44 +0100
Subject: [PATCH 25/67] Add evdev passthru.
---
.../dynamix.vm.manager/VMUsageStats.page | 2 +-
.../dynamix.vm.manager/include/libvirt.php | 12 ++
.../include/libvirt_helpers.php | 15 ++
.../templates/Custom.form.php | 135 ++++++++++++++++++
4 files changed, 163 insertions(+), 1 deletion(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page b/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page
index b87c75e57..fd024266e 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page
@@ -1,6 +1,6 @@
Menu="VMs:0"
Title="VM Usage Statisics"
-Nchan="vm_usage:stop"
+Nchan="vm_usage"
Cond="exec(\"grep -o '^USAGE=.Y' /boot/config/domain.cfg 2>/dev/null\") && is_file('/var/run/libvirt/libvirtd.pid')"
---
";
}
#$osbootdev = "" ;
+ $evdevstr = "";
+ foreach($evdevs as $evdev) {
+ if ($evdev['dev'] == "") continue;
+ $evdevstr .= "\nsaveXML($memorybackingXML->documentElement);
return "
@@ -1043,6 +1054,7 @@
$channelscopypaste
$swtpm
$memballoon
+ $evdevstr
";
diff --git a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
index efb362397..08ddc34c5 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/libvirt_helpers.php
@@ -931,6 +931,19 @@ private static $encoding = 'UTF-8';
return $arrValidOtherStubbedDevices;
}
+ function getValidevDev() {
+ $inputevdev = array_merge(glob("/dev/input/by-id/*event-kbd"),glob("/dev/input/by-id/*event-mouse"));
+ return $inputevdev;
+ }
+
+ function getevDev($res) {
+ global $lv ;
+ $xml = $lv->domain_get_xml($res) ;
+ $xmldoc = new SimpleXMLElement($xml);
+ $xmlpath = $xmldoc->xpath('//devices/input[@type="evdev"] ');
+ return $xmlpath;
+ }
+
$cacheValidUSBDevices = null;
function getValidUSBDevices() {
global $cacheValidUSBDevices;
@@ -1375,6 +1388,7 @@ private static $encoding = 'UTF-8';
'nic' => $arrNICs,
'usb' => $arrUSBDevs,
'shares' => $lv->domain_get_mount_filesystems($res),
+ 'evdev' => getevDev($res),
'qemucmdline' => $cmdline,
'clocks' => getClocks($strDOMXML)
];
@@ -1427,6 +1441,7 @@ private static $encoding = 'UTF-8';
}
// settings not in the GUI, but maybe customized
unset($old['clock']);
+ unset($old['devices']['input']);
// preserve vnc/spice port settings
// unset($new['devices']['graphics']['@attributes']['port'],$new['devices']['graphics']['@attributes']['autoport']);
if (!$new['devices']['graphics']) unset($old['devices']['graphics']);
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 87700e1d0..d6ec24ad2 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1626,6 +1626,141 @@
Windows and Hyperv Hpet:no Hypervclock: yes Pit no rtc no.
+ ".var_dump($arrConfig['evdev'])."";
+ if ( $arrConfig['evdev'] == false) {
+
+ $evdevxml = "
+
+ ";
+ $evdevdoc = new SimpleXMLElement($evdevxml);
+ $arrConfig['evdev']= $evdevdoc->xpath('//input[@type="evdev"] ');
+ }
+
+ foreach ($arrConfig['evdev'] as $i => $arrEvdev) {
+ $strLabel = ($i > 0) ? appendOrdinalSuffix($i + 1) : '';
+ ?>
+
+
+ | _(Evdev Device)_: |
+
+
+ |
+
+
+ | _(Grab)_: |
+
+
+ |
+
+
+
+ | _(Repeat)_: |
+
+
+ |
+
+
+
+ | _(Grab Toggle)_: |
+
+
+ |
+
+
+
+
+
+
+
+
+
+ Event Devices
+ Evdev is an input interface built into the Linux kernel. QEMU’s evdev passthrough support allows a user to redirect evdev events to a guest. These events can include mouse movements and key presses. By hitting both Ctrl keys at the same time, QEMU can toggle the input recipient. QEMU’s evdev passthrough also features almost no latency, making it perfect for gaming. The main downside to evdev passthrough is the lack of button rebinding – and in some cases, macro keys won’t even work at all.
+ Optional items are normally only used for keyboards.
+
+
+ Device
+ Host device to passthrough to guest.
+
+
+
+ Grab
+ All grabs all input devices instead of just one
+
+
+
+ Repeat
+ Repeat with value 'on'/'off' to enable/disable auto-repeat events
+
+
+
+ GrabToggle
+ GrabToggle with values ctrl-ctrl, alt-alt, shift-shift, meta-meta, scrolllock or ctrl-scrolllock to change the grab key combination
+
+ Additional devices can be added/removed by clicking the symbols to the left.
+
+
From 8da53df3574f9b2298ba91b43402e8f18632b7c9 Mon Sep 17 00:00:00 2001
From: ljm42
Date: Mon, 6 May 2024 14:06:40 -0700
Subject: [PATCH 26/67] in http_get_contents, include a useragent
---
emhttp/plugins/dynamix/include/Wrappers.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/emhttp/plugins/dynamix/include/Wrappers.php b/emhttp/plugins/dynamix/include/Wrappers.php
index 98a8aa308..5b8ef69c2 100644
--- a/emhttp/plugins/dynamix/include/Wrappers.php
+++ b/emhttp/plugins/dynamix/include/Wrappers.php
@@ -174,6 +174,7 @@ function http_get_contents(string $url, array $opts = [], array &$getinfo = NULL
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch, CURLOPT_REFERER, "");
curl_setopt($ch, CURLOPT_FAILONERROR, true);
+ curl_setopt($ch, CURLOPT_USERAGENT, 'Unraid');
if(is_array($opts) && $opts) {
foreach($opts as $key => $val) {
curl_setopt($ch, $key, $val);
From 43ae4c785d01063d897835c091232bd4e4686a11 Mon Sep 17 00:00:00 2001
From: Tom Mortensen
Date: Tue, 7 May 2024 07:36:39 -0700
Subject: [PATCH 27/67] passwd file handling correction
---
etc/rc.d/rc.S.cont | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/etc/rc.d/rc.S.cont b/etc/rc.d/rc.S.cont
index 563a3e598..d98f3e407 100755
--- a/etc/rc.d/rc.S.cont
+++ b/etc/rc.d/rc.S.cont
@@ -222,7 +222,7 @@ if [[ -r /boot/config/passwd ]]; then
if [[ $USERNAME == root ]]; then
/bin/sed -i "s|^root:.*|root:x:0:0:$COMMENT:/root:/bin/bash|" /etc/passwd
fi
- if (( USERID >= 1000 )); then
+ if (( USERID >= 1000 )) && ! grep -q ":$USERID:" /etc/passwd ; then
/bin/echo "$USERNAME:x:$USERID:$GROUPID:$COMMENT:/:/bin/false" >> /etc/passwd
fi
done
Date: Tue, 7 May 2024 20:38:43 +0200
Subject: [PATCH 28/67] Fix read file on empty files
---
emhttp/plugins/dynamix/include/.login.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/emhttp/plugins/dynamix/include/.login.php b/emhttp/plugins/dynamix/include/.login.php
index 103fed3c1..87b66d383 100644
--- a/emhttp/plugins/dynamix/include/.login.php
+++ b/emhttp/plugins/dynamix/include/.login.php
@@ -17,7 +17,7 @@ if (!empty($_COOKIE['unraid_'.md5($server_name)])) {
function readFromFile($file): string {
$text = "";
- if (file_exists($file)) {
+ if (file_exists($file) && filesize($file) > 0) {
$fp = fopen($file,"r");
if (flock($fp, LOCK_EX)) {
$text = fread($fp, filesize($file));
From c45dd68e08bcf05753faadd2a3cb7b559429026d Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Tue, 7 May 2024 20:28:27 +0100
Subject: [PATCH 29/67] Update VMUsageStats.page
---
emhttp/plugins/dynamix.vm.manager/VMUsageStats.page | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page b/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page
index fd024266e..6913a70eb 100644
--- a/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMUsageStats.page
@@ -1,6 +1,6 @@
Menu="VMs:0"
Title="VM Usage Statisics"
-Nchan="vm_usage"
+Nchan="vm_usage:start"
Cond="exec(\"grep -o '^USAGE=.Y' /boot/config/domain.cfg 2>/dev/null\") && is_file('/var/run/libvirt/libvirtd.pid')"
---
Date: Wed, 8 May 2024 09:59:41 -0500
Subject: [PATCH 30/67] Display message and disable add share button if there
are no mountable array disks.
---
emhttp/plugins/dynamix/ShareList.page | 7 ++++++-
emhttp/plugins/dynamix/include/DiskList.php | 7 +++++--
emhttp/plugins/dynamix/include/ShareList.php | 4 ++++
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/emhttp/plugins/dynamix/ShareList.page b/emhttp/plugins/dynamix/ShareList.page
index 949d949a5..8b33a5b4a 100644
--- a/emhttp/plugins/dynamix/ShareList.page
+++ b/emhttp/plugins/dynamix/ShareList.page
@@ -15,6 +15,11 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareUser')=='e'"
* all copies or substantial portions of the Software.
*/
?>
+
+
| _(Name)_ | _(Comment)_ | _(SMB)_ | _(NFS)_ | _(Storage)_ | _(Size)_ | _(Free)_ |
@@ -22,7 +27,7 @@ Cond="_var($var,'fsState')!='Stopped' && _var($var,'shareUser')=='e'"
diff --git a/emhttp/plugins/dynamix/include/DiskList.php b/emhttp/plugins/dynamix/include/DiskList.php
index c2f7e97a1..eb2b9b683 100644
--- a/emhttp/plugins/dynamix/include/DiskList.php
+++ b/emhttp/plugins/dynamix/include/DiskList.php
@@ -28,10 +28,13 @@ $var = parse_ini_file('state/var.ini');
$sec = parse_ini_file('state/sec.ini',true);
$sec_nfs = parse_ini_file('state/sec_nfs.ini',true);
-// exit when no disks
-$nodisks = "| "._('There are no exportable disk shares')." |
";
+// exit when no mountable array disks
+$nodisks = "| "._('There are no mountable array or pool disks - cannot add shares').". |
";
if (!$disks) die($nodisks);
+// No shared disks
+$nodisks = "| "._('There are no exportable disk shares')." |
";
+
// GUI settings
extract(parse_plugin_cfg('dynamix',true));
diff --git a/emhttp/plugins/dynamix/include/ShareList.php b/emhttp/plugins/dynamix/include/ShareList.php
index 341542dcb..577464fcb 100644
--- a/emhttp/plugins/dynamix/include/ShareList.php
+++ b/emhttp/plugins/dynamix/include/ShareList.php
@@ -46,6 +46,10 @@ $var = parse_ini_file('state/var.ini');
$sec = parse_ini_file('state/sec.ini',true);
$sec_nfs = parse_ini_file('state/sec_nfs.ini',true);
+// exit when no mountable array disks
+$nodisks = "| "._('There are no mountable array or pool disks - cannot add shares').". |
";
+if (!$disks) die($nodisks);
+
// exit when no shares
$noshares = "| "._('There are no exportable user shares')." |
";
if (!$shares) die($noshares);
From 58f5fb269b74b8d7846b2fee493085b4d6fcd364 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Wed, 8 May 2024 21:09:30 +0100
Subject: [PATCH 31/67] Fix expand evdev options
---
emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index d6ec24ad2..550fc315b 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1626,7 +1626,7 @@
Windows and Hyperv Hpet:no Hypervclock: yes Pit no rtc no.
- ".var_dump($arrConfig['evdev'])."";
+
@@ -1639,7 +1639,7 @@
foreach ($arrConfig['evdev'] as $i => $arrEvdev) {
$strLabel = ($i > 0) ? appendOrdinalSuffix($i + 1) : '';
?>
-
+
| _(Evdev Device)_: |
From 8f8da76bf3240319b5dc0872475c94b3a0356493 Mon Sep 17 00:00:00 2001
From: Squidly271
Date: Wed, 8 May 2024 20:56:47 -0400
Subject: [PATCH 32/67] Add files via upload
---
emhttp/plugins/dynamix/agents/Bark.xml | 29 +++
emhttp/plugins/dynamix/agents/Boxcar.xml | 27 +++
emhttp/plugins/dynamix/agents/Discord.xml | 199 +++++++++++++++++++
emhttp/plugins/dynamix/agents/Gotify.xml | 39 ++++
emhttp/plugins/dynamix/agents/Prowl.xml | 40 ++++
emhttp/plugins/dynamix/agents/PushBits.xml | 62 ++++++
emhttp/plugins/dynamix/agents/Pushover.xml | 38 ++++
emhttp/plugins/dynamix/agents/Pushplus.xml | 40 ++++
emhttp/plugins/dynamix/agents/ServerChan.xml | 31 +++
emhttp/plugins/dynamix/agents/Slack.xml | 22 ++
emhttp/plugins/dynamix/agents/Telegram.xml | 43 ++++
emhttp/plugins/dynamix/agents/ntfy.sh.xml | 42 ++++
12 files changed, 612 insertions(+)
create mode 100644 emhttp/plugins/dynamix/agents/Bark.xml
create mode 100644 emhttp/plugins/dynamix/agents/Boxcar.xml
create mode 100644 emhttp/plugins/dynamix/agents/Discord.xml
create mode 100644 emhttp/plugins/dynamix/agents/Gotify.xml
create mode 100644 emhttp/plugins/dynamix/agents/Prowl.xml
create mode 100644 emhttp/plugins/dynamix/agents/PushBits.xml
create mode 100644 emhttp/plugins/dynamix/agents/Pushover.xml
create mode 100644 emhttp/plugins/dynamix/agents/Pushplus.xml
create mode 100644 emhttp/plugins/dynamix/agents/ServerChan.xml
create mode 100644 emhttp/plugins/dynamix/agents/Slack.xml
create mode 100644 emhttp/plugins/dynamix/agents/Telegram.xml
create mode 100644 emhttp/plugins/dynamix/agents/ntfy.sh.xml
diff --git a/emhttp/plugins/dynamix/agents/Bark.xml b/emhttp/plugins/dynamix/agents/Bark.xml
new file mode 100644
index 000000000..459174c0b
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/Bark.xml
@@ -0,0 +1,29 @@
+
+
+ Bark
+
+ PUSHURL
+ GROUP
+ SOUND
+ TITLE
+ MESSAGE
+
+
+
+
diff --git a/emhttp/plugins/dynamix/agents/Boxcar.xml b/emhttp/plugins/dynamix/agents/Boxcar.xml
new file mode 100644
index 000000000..79344fc7e
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/Boxcar.xml
@@ -0,0 +1,27 @@
+
+
+ Boxcar
+
+ ACCESS_TOKEN
+ TITLE
+ MESSAGE
+
+
+
diff --git a/emhttp/plugins/dynamix/agents/Discord.xml b/emhttp/plugins/dynamix/agents/Discord.xml
new file mode 100644
index 000000000..652af1218
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/Discord.xml
@@ -0,0 +1,199 @@
+
+
+ Discord
+
+ WEBH_URL
+ SERVER_ICON
+ DISCORD_TAG_ID
+
+
+
diff --git a/emhttp/plugins/dynamix/agents/Gotify.xml b/emhttp/plugins/dynamix/agents/Gotify.xml
new file mode 100644
index 000000000..049b942f0
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/Gotify.xml
@@ -0,0 +1,39 @@
+
+
+ Gotify
+
+ SERVER_URL
+ APP_TOKEN
+ TITLE
+ MESSAGE
+
+
+
diff --git a/emhttp/plugins/dynamix/agents/Prowl.xml b/emhttp/plugins/dynamix/agents/Prowl.xml
new file mode 100644
index 000000000..aaef58a82
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/Prowl.xml
@@ -0,0 +1,40 @@
+
+
+ Prowl
+
+ API_KEY
+ APP_NAME
+ TITLE
+ MESSAGE
+
+
+
diff --git a/emhttp/plugins/dynamix/agents/PushBits.xml b/emhttp/plugins/dynamix/agents/PushBits.xml
new file mode 100644
index 000000000..063054774
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/PushBits.xml
@@ -0,0 +1,62 @@
+
+
+ PushBits
+
+ SERVER_URL
+ APP_TOKEN
+ TITLE
+ MESSAGE
+
+
+
+
+ Pushbullet
+
+ TOKEN
+ TITLE
+ MESSAGE
+
+
+
diff --git a/emhttp/plugins/dynamix/agents/Pushover.xml b/emhttp/plugins/dynamix/agents/Pushover.xml
new file mode 100644
index 000000000..fde95484a
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/Pushover.xml
@@ -0,0 +1,38 @@
+
+
+ Pushover
+
+ USER_KEY
+ APP_TOKEN
+ MESSAGE
+
+
+
diff --git a/emhttp/plugins/dynamix/agents/Pushplus.xml b/emhttp/plugins/dynamix/agents/Pushplus.xml
new file mode 100644
index 000000000..5ff40697f
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/Pushplus.xml
@@ -0,0 +1,40 @@
+
+
+ Pushplus
+
+ TOKEN
+ TOPIC
+ CHANNEL
+ WEBHOOK
+ CALLBACKURL
+ TITLE
+ MESSAGE
+
+
+
diff --git a/emhttp/plugins/dynamix/agents/ServerChan.xml b/emhttp/plugins/dynamix/agents/ServerChan.xml
new file mode 100644
index 000000000..4d02aa59b
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/ServerChan.xml
@@ -0,0 +1,31 @@
+
+
+ ServerChan
+
+ SENDKEY
+ CHANNEL
+ OPENID
+ TITLE
+ MESSAGE
+
+
+
diff --git a/emhttp/plugins/dynamix/agents/Slack.xml b/emhttp/plugins/dynamix/agents/Slack.xml
new file mode 100644
index 000000000..0ccfb5baf
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/Slack.xml
@@ -0,0 +1,22 @@
+
+
+ Slack
+
+ WEBH_URL
+ APP_NAME
+ TITLE
+ MESSAGE
+
+
+
diff --git a/emhttp/plugins/dynamix/agents/Telegram.xml b/emhttp/plugins/dynamix/agents/Telegram.xml
new file mode 100644
index 000000000..946bab3ab
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/Telegram.xml
@@ -0,0 +1,43 @@
+
+
+ Telegram
+
+ BOT_TOKEN
+ TITLE
+ MESSAGE
+
+
+
diff --git a/emhttp/plugins/dynamix/agents/ntfy.sh.xml b/emhttp/plugins/dynamix/agents/ntfy.sh.xml
new file mode 100644
index 000000000..0085a504e
--- /dev/null
+++ b/emhttp/plugins/dynamix/agents/ntfy.sh.xml
@@ -0,0 +1,42 @@
+
+
+ ntfy.sh
+
+ SERVER_URL
+ NTFY_TOKEN
+ TOPIC
+ TITLE
+ MESSAGE
+
+
+
From 32f1c8c3eca56bf9bb04f83d61c6f3cd92e4a472 Mon Sep 17 00:00:00 2001
From: Squidly271
Date: Wed, 8 May 2024 20:57:42 -0400
Subject: [PATCH 33/67] Update NotificationAgents.page
---
.../plugins/dynamix/NotificationAgents.page | 127 ++++++++++--------
1 file changed, 68 insertions(+), 59 deletions(-)
diff --git a/emhttp/plugins/dynamix/NotificationAgents.page b/emhttp/plugins/dynamix/NotificationAgents.page
index 66c1c4cb4..dfb7e2bec 100644
--- a/emhttp/plugins/dynamix/NotificationAgents.page
+++ b/emhttp/plugins/dynamix/NotificationAgents.page
@@ -91,69 +91,78 @@ function initDropdown() {
Agent as $agent) {
- $name = str_replace(' ','_',$agent->Name);
- $enabledAgent = agent_fullname("$name.sh", "enabled");
- $disabledAgent = agent_fullname("$name.sh", "disabled");
- if (is_file($disabledAgent)) {
- $file = $disabledAgent;
- if (is_file($enabledAgent)) unlink($enabledAgent);
- } else {
- $file = $enabledAgent;
- }
- $values = [];
- $script = "";
- if (is_file($file)) {
- preg_match("/[#]{6,100}([^#]*?)[#]{6,100}/si", file_get_contents($file), $match);
- if (isset($match[1])) {
- foreach (explode(PHP_EOL, $match[1]) as $line) {
- if (strpos($line, "=")) {
- [$k, $v] = my_explode("=",str_replace("\"", "", $line),2);
- $values[$k] = $v;
+foreach ($xml_files as $xml_file) {
+ $xml = @simplexml_load_file($xml_file);
+ if ( ! $xml ) continue;
+
+ if ( isset($xml->Language) ) {
+ $guiLanguage = ($locale == "" ) ? "en_US" : $locale;
+ $acceptedLanguages = explode(" ",$xml->Language);
+ if ( ! in_array($guiLanguage,$acceptedLanguages) )
+ continue;
+ }
+ $name = str_replace(' ','_',$xml->Name);
+ $enabledAgent = agent_fullname("$name.sh", "enabled");
+ $disabledAgent = agent_fullname("$name.sh", "disabled");
+ if (is_file($disabledAgent)) {
+ $file = $disabledAgent;
+ if (is_file($enabledAgent)) unlink($enabledAgent);
+ } else {
+ $file = $enabledAgent;
+ }
+ $values = [];
+ $script = "";
+ if (is_file($file)) {
+ preg_match("/[#]{6,100}([^#]*?)[#]{6,100}/si", file_get_contents($file), $match);
+ if (isset($match[1])) {
+ foreach (explode(PHP_EOL, $match[1]) as $line) {
+ if (strpos($line, "=")) {
+ [$k, $v] = my_explode("=",str_replace("\"", "", $line),2);
+ $values[$k] = $v;
+ }
}
}
}
- }
- foreach (explode(PHP_EOL,(String) $agent->Script) as $line) if (trim($line)) $script .= trim($line)."{1}";
- echo ').'.png) '.str_replace('_',' ',$name).''.(is_file($enabledAgent) ? ''._("Enabled").'' : ''._("Disabled").'').'-
- ';
+ echo '';
+ if (is_file($file)) {
+ echo '';
+ echo '' : ' disabled>');
+ }
+ echo '
';
+
}
?>
From 0431343070478b0904ed7a145929df2652ddeef9 Mon Sep 17 00:00:00 2001
From: Squidly271
Date: Wed, 8 May 2024 21:01:18 -0400
Subject: [PATCH 34/67] Delete
emhttp/plugins/dynamix/include/NotificationAgents.xml
---
.../dynamix/include/NotificationAgents.xml | 677 ------------------
1 file changed, 677 deletions(-)
delete mode 100644 emhttp/plugins/dynamix/include/NotificationAgents.xml
diff --git a/emhttp/plugins/dynamix/include/NotificationAgents.xml b/emhttp/plugins/dynamix/include/NotificationAgents.xml
deleted file mode 100644
index fecccdeb0..000000000
--- a/emhttp/plugins/dynamix/include/NotificationAgents.xml
+++ /dev/null
@@ -1,677 +0,0 @@
-
-
-
- Boxcar
-
- ACCESS_TOKEN
- TITLE
- MESSAGE
-
-
-
-
- Discord
-
- WEBH_URL
- SERVER_ICON
- DISCORD_TAG_ID
-
-
-
-
- Gotify
-
- SERVER_URL
- APP_TOKEN
- TITLE
- MESSAGE
-
-
-
-
- Join
-
- API_KEY
- TITLE
- MESSAGE
-
-
-
-
- ntfy.sh
-
- SERVER_URL
- NTFY_TOKEN
- TOPIC
- TITLE
- MESSAGE
-
-
-
-
- Prowl
-
- API_KEY
- APP_NAME
- TITLE
- MESSAGE
-
-
-
-
- PushBits
-
- SERVER_URL
- APP_TOKEN
- TITLE
- MESSAGE
-
-
-
-
- Pushbullet
-
- TOKEN
- TITLE
- MESSAGE
-
-
-
-
- Pushover
-
- USER_KEY
- APP_TOKEN
- MESSAGE
-
-
-
-
- Pushplus
-
- TOKEN
- TOPIC
- CHANNEL
- WEBHOOK
- CALLBACKURL
- TITLE
- MESSAGE
-
-
-
-
- ServerChan
-
- SENDKEY
- CHANNEL
- OPENID
- TITLE
- MESSAGE
-
-
-
-
- Slack
-
- WEBH_URL
- APP_NAME
- TITLE
- MESSAGE
-
-
-
-
- Telegram
-
- BOT_TOKEN
- TITLE
- MESSAGE
-
-
-
-
- Bark
-
- PUSHURL
- GROUP
- SOUND
- TITLE
- MESSAGE
-
-
-
-
- Wxwork
-
- CropId
- AgentId
- Secret
- ProxyUrl
- TITLE
- MESSAGE
-
-
-
-
From 70760a302c6b10ed41da0b702129ba5d9c65fbf5 Mon Sep 17 00:00:00 2001
From: SimonFair <39065407+SimonFair@users.noreply.github.com>
Date: Thu, 9 May 2024 15:56:56 +0100
Subject: [PATCH 35/67] Update Custom.form.php
---
emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
index 550fc315b..28ea58112 100644
--- a/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
+++ b/emhttp/plugins/dynamix.vm.manager/templates/Custom.form.php
@@ -1717,7 +1717,7 @@
From 939a30774ad12da4b69b8aae0d8741283be94ec7 Mon Sep 17 00:00:00 2001
From: Squidly271
Date: Sat, 11 May 2024 08:17:41 -0400
Subject: [PATCH 42/67] Add lincstation n1 to to cases
---
.../plugins/dynamix/styles/default-cases.css | 3 ++-
emhttp/plugins/dynamix/styles/font-cases.woff | Bin 31168 -> 32444 bytes
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/emhttp/plugins/dynamix/styles/default-cases.css b/emhttp/plugins/dynamix/styles/default-cases.css
index e7f9e4c64..90cb716b6 100644
--- a/emhttp/plugins/dynamix/styles/default-cases.css
+++ b/emhttp/plugins/dynamix/styles/default-cases.css
@@ -1,4 +1,4 @@
-@font-face{font-family:cases;font-weight:normal;font-style:normal;src:url('/webGui/styles/font-cases.woff?v=20220508') format('woff')}
+@font-face{font-family:cases;font-weight:normal;font-style:normal;src:url('/webGui/styles/font-cases.woff?v=20240511') format('woff')}
[class^='case-'],[class*=' case-']{font-family:cases!important;speak:none;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none}
.case-1u-disks:before{content:'\e90d'}
.case-1u-vents:before{content:'\e90e'}
@@ -29,6 +29,7 @@
.case-htpc:before{content:'\e915'}
.case-IPC-4U-4424:before{content:'\e92e'}
.case-lancool-k12:before{content:'\e935'}
+.case-lincstation-n1:before{content:'\e948';}
.case-mercury-s8:before{content:'\e910'}
.case-microserver-gen7:before{content:'\e936'}
.case-mid-tower:before{content:'\e916'}
diff --git a/emhttp/plugins/dynamix/styles/font-cases.woff b/emhttp/plugins/dynamix/styles/font-cases.woff
index 1a29102c517b5a195b140d2cd9e705fe77a82bba..17b3c2c3b08e3395a43f91cc07817b858fc10887 100644
GIT binary patch
literal 32444
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 |