diff --git a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page index 0294e602b..b39e9ef8b 100644 --- a/emhttp/plugins/dynamix.docker.manager/DockerSettings.page +++ b/emhttp/plugins/dynamix.docker.manager/DockerSettings.page @@ -116,6 +116,7 @@ $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c'; + _(Enable Docker)_: : +: _(Modify with caution: unable to validate path until Array is Started)_ _(Path does not exist)_ @@ -173,7 +174,7 @@ _(Docker vDisk location)_: _(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 ea87c12a5..44b21450a 100644 --- a/emhttp/plugins/dynamix.vm.manager/VMSettings.page +++ b/emhttp/plugins/dynamix.vm.manager/VMSettings.page @@ -115,7 +115,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)_ @@ -125,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)_ diff --git a/emhttp/plugins/dynamix/include/FileTree.php b/emhttp/plugins/dynamix/include/FileTree.php index bb2bedfc4..23835897d 100644 --- a/emhttp/plugins/dynamix/include/FileTree.php +++ b/emhttp/plugins/dynamix/include/FileTree.php @@ -9,6 +9,7 @@ * * History: * + * 1.2.1 - pass in a list of folders to exclude from the dropdown list * 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) @@ -48,6 +49,9 @@ $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']); + echo "