Add support for post arguments

- Remove exclusion from share directory from .gitignore
- Add Unraid specific container hook script
- Add Tailscale icon
- Add helptexts for Tailscale

This integration allows users to easily make use of Tailscale in their Docker containers by just clicking a switch on the Docker page.
The Tailscale plugin itself is not needed for this integration but for the best user experience it is strongly recommended to install the Tailscale plugin from Community Applications.

How this works:
1. Configure Tailscale in the Docker template in Unraid and click Apply
2. Unraid will extract the default Entrypoint and CMD from the container
3. The hook script will be mounted in the container to /opt/unraid/tailscale-hook and the Entrypoint from the container will be modified to /opt/unraid/tailscale-hook
4. The original Entrypoint and CMD from the container, alongside with the other necessary variables for Tailscale will be passed over to the container
5. When the container starts the hook script will be executed, install dependencies (currently Alpine, Arch and Debian based containers are supported), download the newest version from Tailscale and run it
6. After the first start with Tailscale the container will halt and wait for the user to click on the link which is presented in the log from the container to add the container to your Tailnet
(alternatively one could also open up a Console from the container and issue `tailscale status` which will also present the link to authenticate the container to your Tailnet)
7. The hook script will pass over the default Entrypoint and CMD which was extracted in step 2 and the container will start as usual

These steps will be repeated after Container update, force update from the Docker page and if changes in the template are made.
If the container is only Started/Restarted the hook script will detect that Tailscale is installed and only start it, if one wants to update Tailscale inside the container simply hit `force update` on the Docker page in Unraid (with Advanced View Enabled)

The integration will show a Tailscale icon on the Docker page for each Tailscale enabled Container and show some basic information from the container (Installed Tailscale Version, Online Status, Hostname, Main Relay, IPs, Exit Node, Auth Expiry,...)
When Serve or Funnel is enabled it will also generate `Tailscale WebUI` in the drop down for the container which you can open up if Tailscale is installed from the device you are accessing Unraid.

.gitignore

@@ -49,5 +49,27 @@ Temporary Items
 # Sublime text SFTP configuration file
 sftp-config.json
 
+# VS Code SFTP configuration file
+.vscode/sftp.json
+
+# =========================
+# Exclude these dirs commonly found in /usr/local
+games/
+info/
+lib64/
+man/
+share/
+
 # Auto-generated when emhttpd/webGUI start
-languages/en_US/helptext.dot
+emhttp/languages/en_US/helptext.dot
+
+# Auto-generated when web copmonents are built
+emhttp/plugins/dynamix.my.servers/unraid-components/index.html
+
+# development scripts
+.dev-scripts/
+emhttp/plugins/node_modules/
+emhttp/plugins/.prettierignore
+emhttp/plugins/.prettierrc
+emhttp/plugins/package-lock.json
+emhttp/plugins/package.json

.vscode/extensions.json

@@ -0,0 +1,10 @@
+{
+    "recommendations": [
+        "natizyskunk.sftp",
+        "davidanson.vscode-markdownlint",
+        "bmewburn.vscode-intelephense-client",
+        "foxundermoon.shell-format",
+        "timonwong.shellcheck",
+        "esbenp.prettier-vscode"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,83 @@
+{
+    "files.associations": {
+        "*.page": "php"
+    },
+    "prettier.tabWidth": 4,
+    "editor.tabSize": 4,
+    "editor.indentSize": "tabSize",
+    "intelephense.stubs": [
+        "apache",
+        "bcmath",
+        "bz2",
+        "calendar",
+        "com_dotnet",
+        "Core",
+        "ctype",
+        "curl",
+        "date",
+        "dba",
+        "dom",
+        "enchant",
+        "exif",
+        "FFI",
+        "fileinfo",
+        "filter",
+        "fpm",
+        "ftp",
+        "gd",
+        "gettext",
+        "gmp",
+        "hash",
+        "iconv",
+        "imap",
+        "intl",
+        "json",
+        "ldap",
+        "libxml",
+        "mbstring",
+        "meta",
+        "mysqli",
+        "oci8",
+        "odbc",
+        "openssl",
+        "pcntl",
+        "pcre",
+        "PDO",
+        "pdo_ibm",
+        "pdo_mysql",
+        "pdo_pgsql",
+        "pdo_sqlite",
+        "pgsql",
+        "Phar",
+        "posix",
+        "pspell",
+        "random",
+        "readline",
+        "Reflection",
+        "session",
+        "shmop",
+        "SimpleXML",
+        "snmp",
+        "soap",
+        "sockets",
+        "sodium",
+        "SPL",
+        "sqlite3",
+        "standard",
+        "superglobals",
+        "sysvmsg",
+        "sysvsem",
+        "sysvshm",
+        "tidy",
+        "tokenizer",
+        "xml",
+        "xmlreader",
+        "xmlrpc",
+        "xmlwriter",
+        "xsl",
+        "Zend OPcache",
+        "zip",
+        "zlib",
+        "libvirt-php"
+    ]
+}

.vscode/sftp-template.json

@@ -0,0 +1,36 @@
+{
+  "_comment": "rename this file to .vscode/sftp.json and replace name/host/privateKeyPath for your system",
+  "name": "Tower",
+  "host": "Tower.local",
+  "protocol": "sftp",
+  "port": 22,
+  "username": "root",
+  "privateKeyPath": "C:/Users/username/.ssh/tower",
+  "remotePath": "/usr/local",
+  "uploadOnSave": true,
+  "useTempFile": false,
+  "openSsh": false,
+  "ignore": [
+    "// comment: ignore dot files/dirs in root of repo",
+    ".vscode",
+    ".git",
+    ".DS_Store",
+    "// comment: ignore symlinks in repo",
+    "sbin/emcmd",
+    "sbin/plugin",
+    "sbin/language",
+    "sbin/newperms",
+    "sbin/inet",
+    "sbin/samba",
+    "sbin/diagnostics",
+    "emhttp/boot",
+    "emhttp/state",
+    "emhttp/mnt",
+    "emhttp/log",
+    "emhttp/plugins/dynamix/images/case-model.png",
+    "emhttp/webGui",
+    "// comment: ignore files distributed by Unraid Connect",
+    "emhttp/plugins/dynamix.my.servers",
+    "emhttp/plugins/dynamix/include/UpdateDNS.php"
+  ]
+}

README.md

@@ -0,0 +1,21 @@
+# Unraid webgui repo
+
+## Structure
+
+The emhttp, etc, sbin, and src dirs in this repo are extracted to the /usr/local/ directory when an Unraid release is built.
+
+## Contributions
+
+Please be aware that there is a fairly high barrier to entry when working on the Unraid webgui. It has grown organically over the years and you will need to do quite a bit of reverse engineering to understand it.
+
+If you choose to proceed, clone this repo locally, test edits by copying the changes to your server, then submit a PR to <https://github.com/unraid/webgui> when fully tested.
+
+Be sure to describe (in the Unraid forum, a GitHub issue, or the GitHub PR) the problem/feature you are working on and explain how the proposed change solves it.
+
+We recommend using VS Code with the following plugins:
+
+* Install [natizyskunk.sftp](https://marketplace.visualstudio.com/items?itemName=Natizyskunk.sftp) and use .vscode/sftp-template.json as a template for creating your personalized sftp.json file to have VS Code upload files to your server when they are saved. Your personalized sftp.json file is blocked by .gitignore so it should never be included in your PR.
+* Install [bmewburn.vscode-intelephense-client](https://marketplace.visualstudio.com/items?itemName=bmewburn.vscode-intelephense-client) and when reasonable, implement its recommendations for PHP code.
+* Install [DavidAnson.vscode-markdownlint](https://marketplace.visualstudio.com/items?itemName=DavidAnson.vscode-markdownlint) and when reasonable, implement its recommendations for markdown code.
+* Install [foxundermoon.shell-format](https://marketplace.visualstudio.com/items?itemName=foxundermoon.shell-format) and [timonwong.shellcheck](https://marketplace.visualstudio.com/items?itemName=timonwong.shellcheck) and when reasonable, implement their recommendations when making changes to bash scripts.
+* Install [esbenp.prettier-vscode](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode) and when reasonable, use it for formatting files.

emhttp/languages/en_US/helptext.txt

@@ -256,7 +256,7 @@ Unraid OS uses these default options when creating a multiple-device pool:
 
 `-dconvert=raid1 -mconvert=raid1`
 
-For more complete documentation, please refer to the btrfs-balance [Manpage](https://btrfs.wiki.kernel.org/index.php/Manpage/btrfs-balance)
+For more complete documentation, please refer to the btrfs-balance [Manpage](https://man7.org/linux/man-pages/man8/btrfs-balance.8.html)
 
 *Note: raid5 and raid6 are generally still considered **experimental** by the Linux community*
 :end
@@ -489,7 +489,7 @@ If no suffix, a count of 1024-byte blocks is assumed.
 
 :share_edit_global1_help:
 A *Share*, also called a *User Share*, is simply the name of a top-level directory that exists on one or more of your
-storage devices (array and cache).  Each share can be exported for network access.  When browsing a share, we return the
+storage volumes (array disks and pools).  Each share can be exported for network access.  When browsing a share, we return the
 composite view of all files and subdirectories for which that top-level directory exists on each storage device.
 
 *Read settings from* is used to preset the settings of the new share with the settings of an existing share.
@@ -607,9 +607,7 @@ disable these services while mover is running.
 :share_edit_copy_on_write_help:
 Set to **No** to cause the *btrfs* NOCOW (No Copy-on-Write) attribute to be set on the share directory
 when created on a device formatted with *btrfs* file system.  Once set, newly created files and
-subdirectories on the device will inherit the NOCOW attribute.  We recommend this setting for shares
-used to store vdisk images, including the Docker loopback image file.  This setting has no effect
-on non-btrfs file systems.
+subdirectories on the device will inherit the NOCOW attribute. This setting has no effect on non-btrfs file systems.
 
 Set to **Auto** for normal operation, meaning COW **will** be in effect on devices formatted with *btrfs*.
 :end
@@ -622,6 +620,32 @@ Share does *not* contain any data and may be deleted if not needed any longer.
 Share can *not* be deleted as long as it contains data. Be aware that some data can be hidden. See also [SMB Settings](/Settings/SMB) -> Hide "dot" files.
 :end
 
+:share_edit_exclusive_access_help:
+When set to "Yes" indicates a symlink directly to a pool has been set up for the share in the /mnt/user tree.
+
+Refer to [Global Share Settings](Settings/ShareSettings) -> Permit exclusive shares.
+:end
+
+:share_edit_primary_storage_help:
+**Primary storage** is where *new files and folders* are created.  If
+Primary storage is below the minimum free space setting then new files
+and folders will be created in **Secondary storage**, if configured.
+
+**Important:** For *Exclusive access* shares, the Min free space
+settings are ignored.
+:end
+
+:share_edit_secondary_storage_help:
+**Secondary storage** is where new files and directories are created if no
+room on Primary storage.  When both Primary and Secondary storage are
+configured the 'mover' will transfer files between them.
+:end
+
+:share_edit_mover_action_help:
+This defines the direction of file transfer between Primary and
+Secondary storage when both are configured.
+:end
+
 :smb_security_help:
 *Read settings from* is used to preset the SMB security settings of the current selected share with the settings of an existing share.
 
@@ -640,6 +664,8 @@ will *hide* the share from *browsing* but is still accessible if you know the sh
 :smb_time_machine_volume_help:
 This limits the reported volume size, preventing Time Machine from using the entire real disk space
 for backup.  For example, setting this value to "1024" would limit the reported disk space to 1GB.
+Note that Ventura 13.6 and later require a value to be present.  No entry will prevent Time Machine
+from working correctly.
 :end
 
 :smb_case_sensitive_names_help:
@@ -917,6 +943,18 @@ A value of zero will disable the warning threshold (including notifications).
 A value of zero will disable the critical threshold (including notifications).
 :end
 
+:ssd_default_warning_temperature_help:
+*Warning SSD temperature* sets the default warning threshold for all SSD devices temperature. Exceeding this threshold will result in a warning notification.
+
+A value of zero will disable the warning threshold (including notifications).
+:end
+
+:ssd_default_critical_temperature_help:
+*Critical disk temperature* sets the default critical threshold for all SSD devices temperature. Exceeding this threshold will result in an alert notification.
+
+A value of zero will disable the critical threshold (including notifications).
+:end
+
 :disk_default_smart_notification_help:
 SMART notifications are generated on either an increasing RAW value of the attribute, or a decreasing NORMALIZED value which reaches a predefined threshold set by the manufacturer.
 
@@ -959,10 +997,21 @@ Before you can start the Docker service for the first time, please specify an im
 Once started, Docker will always automatically start after the array has been started.
 :end
 
+:docker_readmore_help:
+Some systems with a lot of docker containers may experience lag using the main Docker page.
+
+Setting this to "No" may help speed up general page usage by disabling the use of readmore-js.
+Instead of chevrons indicating more data for Port and Volume mapping, all data is displayed.
+:end
+
 :docker_timeout_help:
 The time in seconds to allow a container to gracefully stop before forcing it to stop
 :end
 
+:docker_pid_limit_help:
+Set a PID Limit to limit the number of PIDs that a docker can use. The default is 2048.  Set to zero for unlimited PIDs (not recommended).
+:end
+
 :docker_vdisk_type_help:
 Select where to keep the Docker persistent state.
 
@@ -989,6 +1038,15 @@ You must specify a folder for Docker. The system will automatically create this
 It is recommended to create this folder under a share which resides on the Cache pool (setting: cache=Only). For best performance SSD devices are preferred.
 :end
 
+:docker_storage_driver_help:
+overlay2 (default): Will use overlay2 as the storage driver for Docker, regardless of the underlying filesystem.
+
+native: The native storage driver for your underlying filesystem will be used (XFS: overlay2 | ZFS: zfs | BTRFS: btrfs).
+
+ATTENTION: Changing the storage type from an existing Docker installation is not possible, you have to delete your Docker directory first, change the storage type and then reinstall your containers.
+It is recommended to take a screenshot from your Docker containers before changing the storage type. After deleting and changing the storage type, reinstall the containers by clicking Add Container on the Docker page and select one by one from the drop down to reinstall them with your previous settings).
+:end
+
 :docker_appdata_location_help:
 You can specify a folder to automatically generate and store subfolders containing configuration files for each Docker app (via the /config mapped volume).
 
@@ -1017,14 +1075,23 @@ Specifies the number of LOG files when LOG rotation is done.
 If set to **Yes**, when creating/editing containers the interface will be present with some extra fields related to template authoring.
 :end
 
+:docker_custom_network_type_help:
+The **ipvlan** type is best when connection to the physical network is not needed.
+Please read <u><a style="color:blue" href='https://docs.docker.com/network/ipvlan/', target='_blank'>this</a></u> on implementing an ipvlan network.<br>
+
+The **macvlan** type of network allows direct connection to the physical network.
+Please read <u><a style="color:blue" href='https://docs.docker.com/network/macvlan/', target='_blank'>this</a></u> on implementing a macvlan network.<br>
+
+**Note:** Docker uses its own dhcp service, which is the **DHCP Pool** setting.
+When you use multiple Unraid servers, then each server must have a different Docker **DHCP Pool** range configured.
+:end
+
 :docker_custom_network_access_help:
-Allows direct communication between the host and containers using a custom (macvlan) network.<br>
-By default this is prohibited.
+Allows direct communication between the host and containers using a custom **macvlan** network.  By default this is disabled.
 :end
 
 :docker_user_defined_network_help:
-User created networks are networks created by the user outside of the GUI.<br>
-By default user created networks are removed from Docker. This is done to prevent potential conflicts with the automatic generation of custom networks.
+User created networks are networks created by the user outside of the GUI.  By default user created networks are removed from Docker. This is done to prevent potential conflicts with the automatic generation of custom networks.
 
 Change this setting to preserve user defined networks, but it is the responsibility of the user to ensure these entries work correctly and are conflict free.
 :end
@@ -1061,6 +1128,10 @@ This is the active Docker version.
 This is the location of the Docker image.
 :end
 
+:docker_storage_driver_active_help:
+This is the storage driver for Docker.
+:end
+
 :docker_appdata_location_active_help:
 This is the storage location for Docker containers.
 :end
@@ -1149,10 +1220,17 @@ SSL certificate.  Use this URL to access your server:
 Note that use of a self-signed SSL certificate will generate a browser
 warning.
 
-Select **Strict** to enable *exclusive* use of an Unraid.net SSL
+Select **Strict** to enable *exclusive* use of a myunraid.net SSL
 certificate for https access (see **Provision** below).  Note that a DNS
 server must be reachable.
 
+**Redirects:** When accessing `http://<server-ip-address>` or `http://<server-name>.<localTLD>`, the 
+behavior will change depending on the value of the Use SSL/TLS setting:
+
+* If Use SSL/TLS is set to **Strict**, you will be redirected to `https://<lan-ip>.<hash>.myunraid.net`
+* If Use SSL/TLS is set to **Yes**, you will be redirected to `https://<server-ip-address> or https://<server-name>.<localTLD>`
+* If Use SSL/TLS is set to **No**, then the http url will load directly.
+
 Important: **Strict** may not be selectable if your router or upstream DNS server has
 [DNS rebinding protection](https://en.wikipedia.org/wiki/DNS_rebinding) enabled. DNS rebinding
 protection prevents DNS from resolving a private IP network range. DNS rebinding protection is meant as
@@ -1200,11 +1278,24 @@ Enter the HTTPS port, default port is 443.
 Enter your local Top Level Domain. May be blank.
 :end
 
+:mgmt_local_access_urls_help:
+The Local Access URLs shown above are based on your current settings. 
+To adjust URLs or redirects, see the help text for "Use SSL/TLS".
+:end
+
+:mgmt_wg_access_urls_help:
+These URLs will only work when connected via the appropriate WireGuard tunnel as configured on ***Settings > VPN Manager***
+:end
+
+:mgmt_tailscale_access_urls_help:
+These URLs will only work when connected to the appropriate Tailscale Tailnet.
+:end
+
 :mgmt_certificate_expiration_help:
-**Provision** may be used to install a *free* Unraid.net SSL Certificate from
+**Provision** may be used to install a *free* myunraid.net SSL Certificate from
 [Let's Encrypt](https://letsencrypt.org/).
 
-The Unraid.net SSL certificate can be used in two ways.  First,
+The myunraid.net SSL certificate can be used in two ways.  First,
 having the certificate present enables your server to respond to an
 alternate URL of the form:
 
@@ -1218,24 +1309,20 @@ set to `*.<hash>.myunraid.net` thus validating the https connection.
 You may enable this URL exclusively on your LAN by setting **Use
 SSL/TLS** to **Strict**.
 
-The second use for an Unraid.net certificate is to enable secure
-remote access available through the My Servers plugin feature.  Note
+The second use for a myunraid.net certificate is to enable secure
+remote access available through the Unraid Connect plugin feature.  Note
 that it is possible to use secure remote access in conjunction with
 insecure local access.
 
-After an Unraid.net SSL Certificate has been installed, two
-background services are activated while the server is signed in to unraid.net:
-
-- *updatedns* - This starts 30 seconds after server reboot has completed and contacts the Lime Technology
-DNS service to register the servers local IP address. Thereafter it wakes up every 10 minutes in case
-the local IP address has changed.
+After a myunraid.net SSL Certificate has been installed, a
+background service is activated:
 
 - *renewcert* - This starts 60 seconds after server reboot has completed and contacts the Lime Technology
-certificate renewal service to determine if your Unraid.net SSL certificate needs to be renewed.
+certificate renewal service to determine if your myunraid.net SSL certificate needs to be renewed.
 Thereafter it wakes up every 24 hours. If within 30 days of expiration, a new certificate is automatically
 provisioned and downloaded to your server.
 
-**Delete** may be used to delete the Unraid.net certificate file.
+**Delete** may be used to delete the myunraid.net certificate file.
 
 **nginx certificate handling details**
 
@@ -1243,16 +1330,17 @@ nginx makes use of two certificate files stored on the USB flash boot device:<br
 
 - a self-signed certificate: `config/ssl/certs/<server-name>_unraid_bundle.pem`
 
-- an Unraid.net certificate: `config/ssl/certs/certificate_bundle.pem`
+- a myunraid.net certificate: `config/ssl/certs/certificate_bundle.pem`
 
 The self-signed SSL certificate file is automatically created when nginx
 starts; and re-created if the server hostname or local TLD is changed.
 
 **nginx stapling support**
 
-Whether nginx enables OCSP Staping is determined by which certificate is in use:<br>
-`config/ssl/certs/certificate_bundle.pem` => Yes<br>
-`config/ssl/certs/<server-name>_unraid_bundle.pem` => No
+OCSP Stapling is automatically enabled if the certificate contains an OCSP responder URL.
+
+Hence, for self-signed certificates stapling is not enabled; for CA-signed certificates
+stabling is enabled.
 :end
 
 :ftp_server_help:
@@ -1391,6 +1479,19 @@ Uncheck all disks in order to not exclude any disks
 disks which represent a subset of the Included/Excluded disks defined here.
 :end
 
+:shares_exclusive_shares_help:
+If set to Yes, share directories under /mnt/user are actually symlinks to the share directory on a storage volume
+provided the following conditions are met:
+
+* The Primary storage for a share is set to a pool.
+* The Secondary storage for a share is set to **none**.
+* The share exists on a single volume.
+* The share is **not** exported over NFS.
+
+The advantage of *exclusive* shares is that transfers bypass the FUSE layer which may significantly
+increase I/O performance.
+:end
+
 :shares_tunable_hard_links_help:
 If set to Yes then support the link() operation.
 
@@ -1413,7 +1514,7 @@ This will increase write performance but might possibly decrease read performanc
 Let the server act as a central syslog server and collect syslog messages from other systems.
 The server can listen on UDP, TCP or both with a selectable port number.
 
-Syslog information is stored per IP address. That is every system gets its own syslog file.
+Syslog information is stored either per IP address or per hostname. That is every system gets its own syslog file.
 :end
 
 :syslog_local_folder_help:
@@ -1421,6 +1522,15 @@ Select the share folder where the syslogs will be stored.
 It is recommended that you use a share located on the cache drive to prevent array disk spinups.
 :end
 
+:syslog_remote_system_identifier_help:
+Select the identifier for the remote system (used in the logfile name). 
+
+* "IP Address" uses the IP address (IPv4 or IPv6) of the sending system.
+* "Hostname (from syslog message)" uses the hostname included in each syslog message.
+* "Hostname (from DNS reverse lookup)" performs a DNS reverse lookup for the sending IP and uses the result.
+
+:end
+
 :syslog_local_rotation_help:
 By default LOG rotation is disabled and will create a single LOG file of unlimited size.
 
@@ -1447,6 +1557,13 @@ Change this setting to YES when troubleshooting is required and it is not possib
 A mirror of the syslog file is stored in the **logs** folder of the flash device.
 :end
 
+:syslog_shutdown_flash_help:
+This setting is YES by default and enables the system to copy the syslog file to the USB device on shutdown or reboot.
+
+After rebooting, the syslog from this run will be visible on Tools > Syslog > syslog-previous;
+it will also be included in diagnostics as logs/syslog-previous.txt
+:end
+
 :confirm_reboot_help:
 Choose if rebooting or powering down the server needs a confirmation checkbox.
 :end
@@ -1461,6 +1578,12 @@ The display settings below determine how items are displayed on screen. Use thes
 You can experiment with these settings as desired, they only affect visual properties.
 :end
 
+:display_width_help:
+**Boxed** is the legacy setting which constrains the content width to maximum 1920 pixels
+
+**Unlimited** allows content to use all available width, which maybe useful on wide screens
+:end
+
 :display_font_size_help:
 Changes the font size in the GUI. This is a per device setting.
 :end
@@ -1511,10 +1634,18 @@ Selects the temperature unit for the disk temperature thresholds. Changing the u
 Make sure any newly entered values represent the selected temperature unit.
 :end
 
+:display_favorites_enabled_help:
+Enables favorite support. If set to no, will stop heart icon showing for additions. If existing favorites are saved, favorites tab and pre-saved options will still continue to show and function until all are deleted.
+:end
+
 :vms_enable_help:
 Stopping the VM Manager will first attempt to shutdown all running VMs. After 60 seconds, any remaining VM instances will be terminated.
 :end
 
+:vms_disable_help:
+Stop VMs from Autostarting\Starting when VM Manager starts or open is run from the gui to start, error message will be seen.
+:end
+
 :vms_libvirt_volume_help:
 This is the libvirt volume.
 :end
@@ -1573,6 +1704,23 @@ When shutting down the server, this defines how long to wait in seconds for *gra
 NOTE: It's recommended to shut down guest VMs from within the VM.
 :end
 
+:vms_console_help:
+For setting the console options to show on context menus. Web will show only inbuild web clients(VNC and SPICE), 
+Virtual Manager Remote Viewer will only show the Remote Viewer option. Both will show both Web and Remote Viewer.
+:end
+
+:vms_rdpopt_help:
+Adds option to menu to start RDP. RDP file is downloaded. You need to set browser to open when ready.
+:end
+
+:vms_usage_help:
+Show metrics for CPU both guest and host percentage, memory, disk io and network io.
+:end
+
+:vms_usage_timer_help:
+Setting in seconds for metrics refresh time.
+:end
+
 :vms_acs_override_help:
 *PCIe ACS override* allows various hardware components to expose themselves as isolated devices.
 Typically it is sufficient to isolate *Downstream* ports.
@@ -1785,6 +1933,18 @@ Select the gateway from the dropdown list or enter a valid IPv4/IPv6 address as
 The metric value is optional, it defaults to 1. Use it to select the preferred gateway when more than one entry of the same route exists.
 :end
 
+:eth_network_extra_include_help:
+Enter one or more interface names or IP addresses which will be included in the list of listening interfaces for local system services.
+
+This is particularly useful when you have created custom interfaces (e.g. tailscale VPN tunnel) which are used to access local system services.
+:end
+
+:eth_network_extra_exclude_help:
+Enter one or more interface names or IP addresses which will be excluded from the list of listening interfaces for local system services.
+
+This can be used to exclude dedicated local interfaces (e.g. p-t-p connections) or exclude dynamic interfaces (WireGuard tunnels) from using local system services.
+:end
+
 :apc_ups_daemon_help:
 Set to 'Yes' to enable apcupsd and start the daemon, set to 'No' to disable apcupsd and stop the daemon.
 :end
@@ -1827,6 +1987,10 @@ Enter the *device* which corresponds to your situation, only applicable when *UP
 + **modbus** - /dev/tty**
 :end
 
+:apc_ups_override_ups_capacity_help:
+If your device doesn't natively report Nominal Power (`NOMPOWER`) from `apcupsd`, but does report the Load Percentage (`LOADPCT`), you can manually define the UPS capacity rating in Watts (W) (this is the 'real power' value in Watts (W), not the 'apparent power' in Volt Amps (VA), and should be detailed on your UPS manual or product listing) and the plugin will dynamically calculate a virtual Nominal Power estimate (`≈`) by comparing the Override UPS Capacity (W) and the current Load Percentage. It is only an estimate, as it doesn't factor in things like the UPS' efficiency.
+:end
+
 :apc_battery_level_help:
 If during a power failure, the remaining battery percentage (as reported by the UPS) is below or equal to *Battery level*, apcupsd will initiate a system shutdown.
 :end
@@ -1920,12 +2084,22 @@ Write mover messages to the syslog file.
 
 :notifications_display_help:
 In *Detailed* view all notifications will be displayed on screen as soon as they arrive.<br>
-Notifications can be acknowledged individually or all in once.
+Notifications can be acknowledged individually or all at once.
 
 In *Summarized* view notifications will be counted only and the number of unread notifications is shown in the menu header per category.<br>
 Click on the counters to either acknowledge or view the unread notifications.
 :end
 
+:notifications_display_position_help:
+Choose the position of where notifications appear on screen in *Detailed* view. Multiple notifications are stacked, bottom-to-top or
+top-to-bottom depending on the selected placement.
+:end
+
+:notifications_auto_close_help:
+Number of seconds before notifications are automatically closed in *Detailed* view.<br>
+A value of 0 disables automatic closure.
+:end
+
 :notifications_date_format_help:
 Select the desired date format which is used in the notifications archive. Recommended is YYYY-MM-DD, which makes the date/time column sortable in a sensible way.
 :end
@@ -1934,10 +2108,6 @@ Select the desired date format which is used in the notifications archive. Recom
 Select the desired time format which is used in the notifications archive. Recommended is 24 hours, which makes the date/time column sortable in a sensible way.
 :end
 
-:notifications_display_position_help:
-Choose the position of where notifications appear on screen. Multiple notifications are stacked, bottom-to-top or top-to-bottom depending on the selected placement.
-:end
-
 :notifications_store_flash_help:
 By default notifications are stored on RAM disk, which will get lost upon system reboot.
 Notifications may be stored permanently on the flash drive under folder '/boot/config/plugins/dynamix' instead.
@@ -2133,6 +2303,136 @@ Generally speaking, it is recommended to leave this setting to its default value
 IMPORTANT NOTE:  If adjusting port mappings, do not modify the settings for the Container port as only the Host port can be adjusted.
 :end
 
+:docker_container_network_help:
+This allows your container to utilize the network configuration of another container. Select the appropriate container from the list.<br/>This setup can be particularly beneficial if you wish to route your container's traffic through a VPN.
+:end
+
+:docker_tailscale_help:
+Enable Tailscale to add this container as a machine on your Tailnet.
+:end
+
+:docker_tailscale_hostname_help:
+Provide the hostname for this container. It does not need to match the container name, but it must be unique on your Tailnet. Note that an HTTPS certificate will be generated for this hostname, which means it will be placed in a public ledger, so use a name that you don't mind being public.
+For more information see <a href="https://tailscale.com/kb/1153/enabling-https" target="_blank">enabling https</a>.
+:end
+
+:docker_tailscale_be_exitnode_help:
+Enable this if other machines on your Tailnet should route their Internet traffic through this container, this is most useful for containers that connect to commercial VPN services. 
+Be sure to authorize this Exit Node in your <a href="https://login.tailscale.com/admin/machines" target="_blank">Tailscale Machines Admin Panel</a>.
+For more details, see the Tailscale documentation on <a href="https://tailscale.com/kb/1103/exit-nodes" target="_blank">Exit Nodes</a>.
+:end
+
+:docker_tailscale_exitnode_ip_help:
+Optionally route this container's outgoing Internet traffic through an Exit Node on your Tailnet. Choose the Exit Node or input its Tailscale IP address.
+For more details, see <a href="https://tailscale.com/kb/1103/exit-nodes" target="_blank">Exit Nodes</a>.
+:end
+
+:docker_tailscale_lanaccess_help:
+Only applies when this container is using an Exit Node. Enable this to allow the container to access the local network.
+
+<b>WARNING:</b>&nbsp;Even with this feature enabled, systems on your LAN may not be able to access the container unless they have Tailscale installed.
+:end
+
+:docker_tailscale_userspace_networking_help:
+When enabled, this container will operate in a restricted environment. Tailscale DNS will not work, and the container will not be able to initiate connections to other Tailscale machines. However, other machines on your Tailnet will still be able to communicate with this container.
+
+When disabled, this container will have full access to your Tailnet. Tailscale DNS will work, and the container can fully communicate with other machines on the Tailnet.
+However, systems on your LAN may not be able to access the container unless they have Tailscale installed.
+:end
+
+:docker_tailscale_ssh_help:
+Tailscale SSH is similar to the Docker "Console" option in the Unraid webgui, except you connect with an SSH client and authenticate via Tailscale.
+For more details, see the <a href="https://tailscale.com/kb/1193/tailscale-ssh" target="_blank">Tailscale SSH</a> documentation..
+:end
+
+:docker_tailscale_serve_mode_help:
+Enabling <b>Serve</b> will automatically reverse proxy the primary web service from this container and make it available on your Tailnet using https with a valid certificate! 
+
+Note that when accessing the <b>Tailscale WebUI</b> url, no additional authentication layer is added beyond restricting it to your Tailnet - the container is still responsible for managing usernames/passwords that are allowed to access it. Depending on your configuration, direct access to the container may still be possible as well.
+
+For more details, see the <a href="https://tailscale.com/kb/1312/serve" target="_blank">Tailscale Serve</a> documentation.
+
+If the documentation recommends additional settings for a more complex use case, enable "Tailscale Show Advanced Settings". Support for these advanced settings is not available beyond confirming the commands are passed to Tailscale correctly.
+
+<b>Funnel</b> is similar to <b>Serve</b>, except that the web service is made available on the open Internet. Use with care as the service will likely be attacked. As with <b>Serve</b>, the container itself is responsible for handling any authentication.
+
+We recommend reading the <a href="https://tailscale.com/kb/1223/funnel" target="_blank">Tailscale Funnel</a> documentation. before enabling this feature.
+
+<b>Note:</b>&nbsp;Enabling <b>Serve</b> or <b>Funnel</b> publishes the Tailscale hostname to a public ledger.
+For more details, see the Tailscale Documentation: <a href="https://tailscale.com/kb/1153/enabling-https" target="_blank">Enabling HTTPS</a>.
+:end
+
+:docker_tailscale_serve_port_help:
+This field should specify the port for the primary web service this container offers. Note: it should specify the port in the container, not a port that was remapped on the host.
+
+The system attempted to determine the correct port automatically. If it used the wrong value then there is likely an issue with the "Web UI" field for this container, visible by switching from "Basic View" to "Advanced View" in the upper right corner of this page. 
+
+In most cases this port is all you will need to specify in order to Serve the website in this container, although additional options are available below for more complex containers.
+
+This value is passed to the `<serve_port>` portion of this command which starts serve or funnel:<br>
+`tailscale [serve|funnel] --bg --<protocol><protocol_port><path> http://localhost:`**`<serve_port>`**`<local_path>`<br>
+For more details see the <a href="https://tailscale.com/kb/1242/tailscale-serve" target="_blank">Tailscale Serve Command Line</a> documentation.
+:end
+
+:docker_tailscale_show_advanced_help:
+Here there be dragons!
+:end
+
+:docker_tailscale_serve_local_path_help:
+When not specified, this value defaults to an empty string. It is passed to the `<local_path>` portion of this command which starts serve or funnel:<br>
+`tailscale [serve|funnel] --bg --<protocol><protocol_port><path> http://localhost:<serve_port>`**`<local_path>`**<br>
+For more details see the <a href="https://tailscale.com/kb/1242/tailscale-serve" target="_blank">Tailscale Serve Command Line</a> documentation.
+:end
+
+:docker_tailscale_serve_protocol_help:
+When not specified, this value defaults to "https". It is passed to the `<protocol>` portion of this command which starts serve or funnel:<br>
+`tailscale [serve|funnel] --bg --`**`<protocol>`**`=<protocol_port><path> http://localhost:<serve_port><local_path>`<br>
+For more details see the <a href="https://tailscale.com/kb/1242/tailscale-serve" target="_blank">Tailscale Serve Command Line</a> documentation.
+:end
+
+:docker_tailscale_serve_protocol_port_help:
+When not specified, this value defaults to "=443". It is passed to the `<protocol_port>` portion of this command which starts serve or funnel:<br>
+`tailscale [serve|funnel] --bg --<protocol>`**`<protocol_port>`**`<path> http://localhost:<serve_port><local_path>`<br>
+For more details see the <a href="https://tailscale.com/kb/1242/tailscale-serve" target="_blank">Tailscale Serve Command Line</a> documentation.
+:end
+
+:docker_tailscale_serve_path_help:
+When not specified, this value defaults to an empty string. It is passed to the `<path>` portion of this command which starts serve or funnel:<br>
+`tailscale [serve|funnel] --bg --<protocol><protocol_port>`**`<path>`** `http://localhost:<serve_port><local_path>`<br>
+For more details see the <a href="https://tailscale.com/kb/1242/tailscale-serve" target="_blank">Tailscale Serve Command Line</a> documentation.
+:end
+
+:docker_tailscale_serve_webui_help:
+If <b>Serve</b> is enabled this will be an https url with a proper domain name that is accessible over your Tailnet, no port needed!
+
+If <b>Funnel</b> is enabled the same url will be available on the Internet.
+
+If they are disabled then the url will be generated from the container's main "Web UI" field, but modified to use the Tailscale IP. If the wrong port is specified here then switch from "Basic View" to "Advanced View" and review the "Web UI" field for this container.
+:end
+
+:docker_tailscale_advertise_routes_help:
+If desired, specify any routes that should be passed to the **`--advertise-routes=`** parameter when running **`tailscale up`**.
+For more details see the <a href="https://tailscale.com/kb/1019/subnets#connect-to-tailscale-as-a-subnet-router" target="_blank">Subnet routers</a> documentation.
+:end
+
+:docker_tailscale_daemon_extra_params_help:
+Specify any extra parameters to pass when starting **`tailscaled`**.
+For more details see the <a href="https://tailscale.com/kb/1278/tailscaled" target="_blank">tailscaled</a> documentation.
+:end
+
+:docker_tailscale_extra_param_help:
+Specify any extra parameters to pass when running **`tailscale up`**.
+For more details see the <a href="https://tailscale.com/kb/1080/cli#up" target="_blank">Tailscale CLI</a> documentation.
+:end
+
+:docker_tailscale_statedir_help:
+If state directory detection fails on startup, you can specify a persistent directory in the container to override automatic detection.
+:end
+
+:docker_tailscale_troubleshooting_packages_help:
+Enable this to install `ping`, `nslookup`, and `curl` into the container to help troubleshoot networking issues. Once the issues are resolved we recommend disabling this to reduce the size of the container.
+:end
+
 :docker_privileged_help:
 For containers that require the use of host-device access directly or need full exposure to host capabilities, this option will need to be selected.
 For more information, see this link: <a href="https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities" target="_blank">https://docs.docker.com/engine/reference/run/#runtime-privilege-and-linux-capabilities</a>
@@ -2200,11 +2500,11 @@ Provide a comma separated list of urls that are allowed to access the unraid-api
 :end
 
 :myservers_remote_t2fa_help:
-When Transparent 2FA for Remote Access is enabled, you will access your server by clicking the "Remote Access" link on the <a href="https://forums.unraid.net/my-servers/" target="_blank" rel="noopener noreferrer">My Servers dashboard</a>. The system will transparently request a 2FA token from your server and embed it in the server's login form. Your server will deny any Remote Access login attempt that does not include a valid token. Each token can be used only once, and is only valid for five minutes.
+When Transparent 2FA for Remote Access is enabled, you will access your server by clicking the "Remote Access" link on the <a href="https://connect.myunraid.net/" target="_blank" rel="noopener noreferrer">Go to Connect</a>. The system will transparently request a 2FA token from your server and embed it in the server's login form. Your server will deny any Remote Access login attempt that does not include a valid token. Each token can be used only once, and is only valid for five minutes.
 :end
 
 :myservers_local_t2fa_help:
-When Transparent 2FA for Local Access is enabled, you will access your server by clicking the "Local Access" link on the <a href="https://forums.unraid.net/my-servers/" target="_blank" rel="noopener noreferrer">My Servers dashboard</a>. The system will transparently request a 2FA token from your server and embed it in the server's login form. Your server will deny any Local Access login attempt that does not include a valid token. Each token can be used only once, and is only valid for five minutes.
+When Transparent 2FA for Local Access is enabled, you will access your server by clicking the "Local Access" link on the <a href="https://connect.myunraid.net/" target="_blank" rel="noopener noreferrer">Go to Connect</a>. The system will transparently request a 2FA token from your server and embed it in the server's login form. Your server will deny any Local Access login attempt that does not include a valid token. Each token can be used only once, and is only valid for five minutes.
 
 This is fairly extreme for Local Access, and in most cases is not needed. It requires a solid Internet connection. If you need to access the webGUI while the Internet is down, SSH to the server and run 'use_ssl no', this will give you access via http://<?=$nginx['NGINX_LANIP']?><?=$nginx['NGINX_PORT'] !== '80' ? ':'.$nginx['NGINX_PORT'] : '' ?>
 :end
@@ -2228,8 +2528,8 @@ The *tunnel network pool* must be a unique network not already existing on the s
 :end
 
 :wg_local_tunnel_network_pool_X_help:
-WireGuard tunnels need an internal IP address. Assign a network pool using the default IPv4 network <?=$netpool['wgX']?>/24 or
-the default IPv6 network <?=$netpool6['wgX']?>/64 or assign your own network pool from which automatic assignment can be done for both this server and any peers.
+WireGuard tunnels need an internal IP address. Assign a network pool using the default IPv4 network, 
+the default IPv6 network, or assign your own network pool from which automatic assignment can be done for both this server and any peers.
 
 The *tunnel network pool* must be a unique network not already existing on the server or any of the peers.
 :end
@@ -2243,7 +2543,7 @@ This field is auto filled-in when a local tunnel network pool is created. It is
 :end
 
 :wg_local_endpoint_help:
-This field is automatically filled in with the public management domain name *www.&lt;hash&gt;.myunraid.net* or the public address of the server.<br>
+This field is automatically filled in with the public management domain name *&lt;wan-ip&gt;.&lt;hash&gt;.myunraid.net* or the public address of the server.<br>
 This allows VPN tunnels to be established from external peers to the server.<br>
 Configure the correct port forwarding on your router (default port is <?=$netport['wg0']?> but this may be changed) to allow any incoming connections to reach the server.
 
@@ -2254,9 +2554,9 @@ Note to Cloudflare users: the Cloudflare proxy is designed for http traffic, it
 :end
 
 :wg_local_endpoint_X_help:
-This field is automatically filled in with the public management domain name *www.&lt;hash&gt;.myunraid.net* or the public address of the server.<br>
+This field is automatically filled in with the public management domain name *&lt;wan-ip&gt;.&lt;hash&gt;.myunraid.net* or the public address of the server.<br>
 This allows VPN tunnels to be established from external peers to the server.<br>
-Configure the correct port forwarding on your router (default port is <?=$netport['wgX']?> but this may be changed) to allow any incoming connections to reach the server.
+Configure the correct port forwarding on your router to allow any incoming connections to reach the server.
 
 Users with a registered domain name can use this field to specify how their server is known on the Internet. E.g. www.myserver.mydomain.<br>
 Again make sure your router is properly set up.
@@ -2266,7 +2566,7 @@ Note to Cloudflare users: the Cloudflare proxy is designed for http traffic, it
 
 :wg_local_server_uses_nat_help:
 When NAT is enabled, the server uses its own LAN address when forwarding traffic from the tunnel to other devices in the LAN network.
-Use this setting when no router modifications are desired, but this approach doesn't work with Docker containers using custom IP addressess.
+Use this setting when no router modifications are desired, but this approach doesn't work with Docker containers using custom IP addresses.
 
 When NAT is disabled, the server uses the WireGuard tunnel address when forwarding traffic.
 In this case it is required that the default gateway (router) has a static route configured to refer tunnel address back to the server.
@@ -2333,3 +2633,77 @@ A keepalive timer will hold the connection open, for most situations a timer val
 
 Note that for mobile devices this will use more data and drain your battery faster.
 :end
+
+:sysdrivers_intro_help:
+This page displays all the drivers available on this system. Filter the list according to whether the driver is Inuse or not, or search for a specific driver if desired.
+
+Any 3rd party driver installed by a plugin will have a support symbol next to it, click this to get support for the plugin.
+
+Click the edit button to add/modify/delete any modprobe.d config file in the config/modprobe.d directory on the flash drive.
+:end
+
+:console_keyboard_help:
+Select your default keymap for the local console (not the web Terminal).
+:end
+
+:console_screen_help:
+**Default:** 'Default' will set the blank timeout to 15 minutes and powersave to 60 minutes.
+
+**Disabled:** 'Disabled' will disable the blank and powersave timeout.
+
+**All other values:** Will set the blank timout to the selected value and disable the powersave timeout.
+:end
+
+:console_bash_help:
+If set to 'Yes' the bash history will persist reboots, set to 'No' to disable.
+
+**ATTENTION:** The bash history will be written to the USB Boot device so this will introduce higher wear and tear!
+
+**Note:** Disabling and Enabling will remove the entire bash history.
+:end
+
+:WOL_intro_help:
+This page allows the setup to start/resume and stop VMs, Containters(Docker and LXC) using WOL magic packets
+
+It does not setup wake up of the Unraid server.
+
+The process will look for the defined mac address defined within the service(VM or container) with the exception of dockers. Dockers do not have a mac address until they are running so you will need to define a user mac address to allow you to start them
+
+If the service is paused a WOL Packet will resume. 
+
+For each service you can set: enable, disable or enable and shutdown
+
+When the enable and shutdown is set if the service is running when the next WOL packet is recieved a shutdown will be performed.
+:end
+
+:WOL_enable_help:
+If set to yes Unraidwold daemon is set to run.
+:end
+
+:WOL_run_docker_help:
+If set to yes when wake on lan packets are received checks are carrried out for dockers otherwise dockers will be ignored.
+:end
+
+:WOL_run_VM_help:
+If set to yes when wake on lan packets are received checks are carrried out for virtual machines otherwise virtual machines will be ignored.
+:end
+
+:WOL_run_LXC_help:
+If set to yes when wake on lan packets are received checks are carrried out for LXC otherwise LXC will be ignored. The LXC plugin needs to be installed for LXC to be processed.
+:end
+
+:WOL_run_shutdown_help:
+If set to yes when wake on lan packets are received checks are carrried out and if enabled for service and that service is running the entity will be shutdown. System has to be set to Enabled and Shutdwon for it to be action.
+:end
+
+:WOL_interface_help:
+Specify the interface to the daemon to bind to. Some interfaces may not be able to recieve etherframe packets. Recommend to bind to a physical interface.
+:end
+
+:WOL_promiscuous_mode_help:
+Enable to set the NIC not to filer packets.
+:end
+
+:WOL_log_file_help:
+Default is to log to syslog but if you want a different log location set the file name.
+:end

emhttp/logging.htm

@@ -78,7 +78,7 @@ function addLog(logLine) {
 }
 function addCloseButton() {
   var done = location.search.split('&').pop().split('=')[1];
-  addLog("<p class='centered'><button class='logLine' type='button' onclick='" + (top.Shadowbox ? "top.Shadowbox" : "window") + ".close()'>"+decodeURI(done)+"</button></p>");
+  addLog("<p class='centered'><button class='logLine' type='button' onclick='" + (parent.Shadowbox ? "parent.Shadowbox" : "window") + ".close()'>"+decodeURI(done)+"</button></p>");
 }
 </script>
 </head>

emhttp/login.php

@@ -1,6 +1,7 @@
 <?php
 $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
 require_once "$docroot/webGui/include/Helpers.php";
+require_once "$docroot/webGui/include/Wrappers.php";
 
 // add translations
 extract(parse_plugin_cfg('dynamix',true));
@@ -27,6 +28,9 @@ if ($_SERVER['REQUEST_URI'] == '/logout') {
     $error = _('Successfully logged out');
 }
 
+// If issue with license key redirect to Tools/Registration, otherwise go to start page
+$start_page = (!empty(_var($var,'regCheck'))) ? 'Tools/Registration' : _var($var,'START_PAGE','Main');
+
 $result = exec( "/usr/bin/passwd --status root");
 if (($result === false) || (substr($result, 0, 6) !== "root P"))
   include "$docroot/webGui/include/.set-password.php";

emhttp/plugins/dynamix.apcupsd/UPSdetails.page

@@ -3,8 +3,8 @@ Title="UPS Details"
 Tag="battery-3"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015, Dan Landon.
  *
  * This program is free software; you can redistribute it and/or
@@ -14,16 +14,19 @@ Tag="battery-3"
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
  */
+$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+require_once "$docroot/webGui/include/Wrappers.php";
 ?>
 <script>
 function getUPSstatus() {
-  $.get('/plugins/dynamix.apcupsd/include/UPSstatus.php',{all:'true'},function(data) {
-    if (data) {
-      data = data.split(/\n/);
-      $('#ups_summary').html(data[0]);
-      $('#ups_status').html(data[1]);
-    }
-    setTimeout(getUPSstatus,15000);
+  var batteryLevel = "<?= _var($cfg,'BATTERYLEVEL',0) ?>";
+  var batteryRuntime = "<?= _var($cfg,'MINUTES',0) ?>";
+
+  $.post('/plugins/dynamix.apcupsd/include/UPSstatus.php',{level:batteryLevel,runtime:batteryRuntime},function(data) {
+    data = data.split('\n');
+    $('#ups_summary').html(data[0]);
+    $('#ups_status').html(data[1]);
+    setTimeout(getUPSstatus,3000);
   });
 }
 $(getUPSstatus);

emhttp/plugins/dynamix.apcupsd/UPSsettings.page

@@ -5,9 +5,9 @@ Icon="icon-ups"
 Tag="battery-3"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015, Dan Landon.
- * Copyright 2012-2020, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -22,11 +22,6 @@ Tag="battery-3"
 $sName = "dynamix.apcupsd";
 $cfg = parse_plugin_cfg($sName);
 ?>
-
-<style>
-table.ups thead tr th{width:16.6%;padding-left:10px;}
-table.ups tbody tr td{padding-left:10px;font-weight:bold;}
-</style>
 <script>
 function toggleCustomCable(form) {
   var readonly = form.UPSCABLE.value != 'custom';
@@ -45,14 +40,14 @@ $(function() {
 });
 </script>
 <table class="tablesorter shift ups" <?if (!file_exists("/var/run/apcupsd.pid")):?>style="display:none"<?endif;?>>
-<thead><tr><th>_(UPS Status)_</th><th>_(Battery Charge)_</th><th>_(Runtime Left)_</th><th>_(Nominal Power)_</th><th>_(UPS Load)_</th><th>_(UPS Load)_ %</th></tr></thead>
-<tbody id="ups_summary"><tr><td colspan="6">&nbsp;</td></tr></tbody>
+<thead><tr><th><i class='ups fa fa-shield'></i>_(UPS Model)_</th><th><i class='ups fa fa-plug'></i>_(UPS Status)_</th><th><i class='ups fa fa-battery'></i>_(Battery Charge)_</th><th><i class='ups fa fa-clock-o'></i>_(Runtime Left)_</th><th><i class='ups fa fa-bolt'></i>_(Nominal Power)_</th><th><i class='ups fa fa-bars'></i>_(UPS Load)_</th><th><i class='ups fa fa-ellipsis-h'></i>_(Output Voltage)_</th></tr></thead>
+<tbody id="ups_summary"><tr class="ups"><td colspan="7">&nbsp;</td></tr></tbody>
 </table>
 
+<span style="float:right;margin-right:10px"><a href="http://apcupsd.org/manual/manual.html" target="_blank" title="_(APC UPS Daemon user manual)_"><i class="fa fa-file-text-o"></i> <u>_(Online Manual)_</u></a></span>
 <form markdown="1" name="apcupsd_settings" method="POST" action="/update.php" target="progressFrame">
 <input type="hidden" name="#file" value="<?=$sName?>/<?=$sName?>.cfg">
 <input type="hidden" name="#include" value="/plugins/<?=$sName?>/include/update.apcupsd.php">
-<span style="float:right;margin-right:10px"><a href="http://apcupsd.org/manual/manual.html" target="_blank" title="_(APC UPS Daemon user manual)_"><i class="fa fa-file-text-o"></i> <u>_(Online Manual)_</u></a></span>
 
 _(Start APC UPS daemon)_:
 : <select name="SERVICE">
@@ -96,6 +91,11 @@ _(Device)_:
 
 :apc_ups_device_help:
 
+_(Override UPS Capacity (Watts))_:
+: <input type="number" name="OVERRIDE_UPS_CAPACITY" maxlength="5" class="narrow" value="<?=htmlspecialchars($cfg['OVERRIDE_UPS_CAPACITY']);?>">
+
+:apc_ups_override_ups_capacity_help:
+
 _(Battery level to initiate shutdown)_ (%):
 : <input type="text" name="BATTERYLEVEL" class="narrow" maxlength="3" value="<?=htmlspecialchars($cfg['BATTERYLEVEL']);?>">
 

emhttp/plugins/dynamix.apcupsd/apcupsd.notify

@@ -0,0 +1,6 @@
+#
+# Send system notify message from apcupsd
+#
+read MESSAGE
+[[ "$MESSAGE" == *restored* || "$MESSAGE" == *returned* ]] && LEVEL=normal || LEVEL=alert
+/usr/local/emhttp/webGui/scripts/notify -l "/Settings/UPSsettings" -e "Unraid Server Alert" -s "UPS Alert" -d "$MESSAGE" -i $LEVEL

emhttp/plugins/dynamix.apcupsd/default.cfg

@@ -3,6 +3,7 @@ UPSCABLE="usb"
 CUSTOMUPSCABLE=""
 UPSTYPE="usb"
 DEVICE=""
+OVERRIDE_UPS_CAPACITY=""
 BATTERYLEVEL="10"
 MINUTES="10"
 TIMEOUT="0"

emhttp/plugins/dynamix.apcupsd/event/driver_loaded

@@ -6,7 +6,10 @@ cfg=/boot/config/plugins/dynamix.apcupsd/dynamix.apcupsd.cfg
 [[ -f /var/run/apcupsd.pid || ! -f $cfg ]] && exit
 
 # Read settings
-source $cfg
+. $cfg
+
+# run & log functions
+. /etc/rc.d/rc.runlog
 
 # Apply settings
 sed -i -e '/^NISIP/c\\NISIP 0.0.0.0' $conf
@@ -27,4 +30,4 @@ else
 fi
 
 # Start daemon
-[[ $SERVICE == enable ]] && /etc/rc.d/rc.apcupsd start |& logger
+[[ $SERVICE == enable ]] && /etc/rc.d/rc.apcupsd start |& log

emhttp/plugins/dynamix.apcupsd/include/UPSstatus.php

@@ -0,0 +1,109 @@
+<?PHP
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2015, Dan Landon.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<?
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
+// add translations
+$_SERVER['REQUEST_URI'] = 'settings';
+require_once "$docroot/webGui/include/Translations.php";
+
+require_once "$docroot/webGui/include/Helpers.php";
+$cfg = parse_plugin_cfg('dynamix.apcupsd');
+$overrideUpsCapacity = (int) htmlspecialchars($cfg['OVERRIDE_UPS_CAPACITY'] ?: 0);
+
+$state = [
+  'ONLINE'   => _('Online'),
+  'SLAVE'    => '('._('slave').')',
+  'TRIM'     => '('._('trim').')',
+  'BOOST'    => '('._('boost').')',
+  'COMMLOST' => _('Lost communication'),
+  'ONBATT'   => _('On battery'),
+  'NOBATT'   => _('No battery detected'),
+  'LOWBATT'  => _('Low on battery'),
+  'OVERLOAD' => _('UPS overloaded'),
+  'SHUTTING DOWN' => _('System goes down')
+];
+
+$red     = "class='red-text'";
+$green   = "class='green-text'";
+$orange  = "class='orange-text'";
+$defaultCell = "<td>-</td>";
+$status  = array_fill(0,7,$defaultCell);
+$result  = [];
+$level   = $_POST['level'] ?: 10;
+$runtime = $_POST['runtime'] ?: 5;
+
+if (file_exists("/var/run/apcupsd.pid")) {
+  exec("/sbin/apcaccess 2>/dev/null", $rows);
+  for ($i=0; $i<count($rows); $i++) {
+    [$key,$val] = array_map('trim',array_pad(explode(':',$rows[$i],2),2,''));
+    switch ($key) {
+    case 'MODEL':
+      $status[0] = "<td $green>$val</td>";
+      break;
+    case 'STATUS':
+      $text = strtr($val, $state);
+      $status[1] = $val ? (strpos($val,'ONLINE')!==false ? "<td $green>$text</td>" : "<td $red>$text</td>") : "<td $orange>"._('Refreshing')."...</td>";
+      break;
+    case 'BCHARGE':
+      $charge = round(strtok($val,' '));
+      $status[2] = $charge>$level ? "<td $green>$charge %</td>" : "<td $red>$charge %</td>";
+      break;
+    case 'TIMELEFT':
+      $time = round(strtok($val,' '));
+      $unit = _('minutes');
+      $status[3] = $time>$runtime ? "<td $green>$time $unit</td>" : "<td $red>$time $unit</td>";
+      break;
+    case 'NOMPOWER':
+      $power = strtok($val,' ');
+      $status[4] = $power>0 ? "<td $green>$power W</td>" : "<td $red>$power W</td>";
+      break;
+    case 'LOADPCT':
+      $load = strtok($val,' ');
+      $status[5] = round($load)." %";
+      break;
+    case 'OUTPUTV':
+      $output = round(strtok($val,' '));
+      $status[6] = "$output V";
+      break;
+    case 'NOMINV':
+      $volt = strtok($val,' ');
+      $minv = floor($volt / 1.1); // +/- 10% tolerance
+      $maxv = ceil($volt * 1.1);
+      break;
+    case 'LINEFREQ':
+      $freq = round(strtok($val,' '));
+      break;
+    }
+    if ($i%2==0) $result[] = "<tr>";
+    $result[]= "<td><strong>$key</strong></td><td>$val</td>";
+    if ($i%2==1) $result[] = "</tr>";
+  }
+  if (count($rows)%2==1) $result[] = "<td></td><td></td></tr>";
+
+  // If the override is defined, override the power value, using the same implementation as above.
+  // This is a better implementation, as it allows the existing Unraid code to work with the override.
+  if ($overrideUpsCapacity > 0) {
+    $power = $overrideUpsCapacity;
+    $status[4] = $power>0 ? "<td $green>$power W</td>" : "<td $red>$power W</td>";
+  }
+
+  if ($power && isset($load)) $status[5] = ($load<90 ? "<td $green>" : "<td $red>").round($power*$load/100)." W (".$status[5].")</td>";
+  elseif (isset($load)) $status[5] = ($load<90 ? "<td $green>" : "<td $red>").$status[5]."</td>";
+  $status[6] = isset($output) ? ((!$volt || ($minv<$output && $output<$maxv) ? "<td $green>" : "<td $red>").$status[6].(isset($freq) ? " ~ $freq Hz" : "")."</td>") : $status[6];
+}
+if (empty($rows)) $result[] = "<tr><td colspan='4' style='text-align:center'>"._('No information available')."</td></tr>";
+
+echo "<tr class='ups'>",implode($status),"</tr>\n",implode($result);
+?>

emhttp/plugins/dynamix.apcupsd/include/update.apcupsd.php

@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2015, Dan Landon.
  *
  * This program is free software; you can redistribute it and/or

emhttp/plugins/dynamix.apcupsd/sheets/UPSsettings.css

@@ -0,0 +1,4 @@
+table.ups thead tr th{width:16.6%;padding-left:10px}
+table.ups tbody tr td{padding-left:10px;font-weight:bold}
+tr.ups{height:3rem;line-height:3rem}
+i.ups{margin-right:8px}

emhttp/plugins/dynamix.docker.manager/AddContainer.page

@@ -3,9 +3,9 @@ Cond="(pgrep('dockerd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2014-2020, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,

emhttp/plugins/dynamix.docker.manager/Docker.page

@@ -1,10 +1,12 @@
 Menu="Tasks:60"
 Type="xmenu"
 Code="e90b"
+Lock="true"
 Cond="exec(\"grep -o '^DOCKER_ENABLED=.yes' /boot/config/docker.cfg 2>/dev/null\")"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or

emhttp/plugins/dynamix.docker.manager/DockerContainers.page

@@ -6,9 +6,9 @@ Markdown="false"
 Nchan="docker_load:stop"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2021, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -19,33 +19,19 @@ Nchan="docker_load:stop"
  */
 ?>
 <?
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+
 $width   = in_array($theme,['white','black']) ? -58: -44;
 $top     = in_array($theme,['white','black']) ? 40 : 20;
 $busy    = "<i class='fa fa-spin fa-circle-o-notch'></i> "._('Please wait')."... "._('starting up containers');
 $cpus    = cpu_list();
-
-// adjust the text color in log window
-$fgcolor = in_array($theme,['white','azure']) ? '#1c1c1c' : '#f2f2f2';
-exec("sed -ri 's/^\.logLine\{color:#......;/.logLine{color:$fgcolor;/' $docroot/plugins/dynamix.docker.manager/log.htm >/dev/null &");
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.ui.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov("/plugins/dynamix.docker.manager/styles/style-$theme.css")?>">
-<style>
-.basic{display:block}
-.advanced{display:none;white-space:nowrap}
-.dockerhandle{cursor:grab;}
-.log{cursor:zoom-in}
-.exec{cursor:pointer}
-table#docker_containers{text-align:left}
-th.five{width:5%}
-th.nine{width:9%}
-th.load{width:140px}
-input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;background-color:transparent}
-table tbody td{line-height:normal}
-</style>
+
 <table id="docker_containers" class="tablesorter shift">
-<thead><tr><th><a href="#" style="cursor:hand;margin-left:12px;display:inline-block;width:32px" onclick="resetSorting()" title="_(Reset sorting)_"><i class="fa fa-th-list"></i></a>_(Application)_</th><th>_(Version)_</th><th>_(Network)_</th><th>_(Port Mappings)_ <small>(_(App to Host)_)</small></th><th>_(Volume Mappings)_ <small>(_(App to Host)_)</small></th><th class="load advanced">_(CPU & Memory load)_</th><th class="nine">_(Autostart)_</th><th class="five">_(Uptime)_</th><th></th></tr></thead>
+<thead><tr><th><a id="resetsort" class="nohand" onclick="resetSorting()" title="_(Reset sorting)_"><i class="fa fa-th-list"></i></a>_(Application)_</th><th>_(Version)_</th><th>_(Network)_</th><th>_(Container IP)_</th><th>_(Container Port)_</th><th>_(LAN IP:Port)_</th><th>_(Volume Mappings)_ <small>(_(App to Host)_)</small></th><th class="load advanced">_(CPU & Memory load)_</th><th class="nine">_(Autostart)_</th><th class="five">_(Uptime)_</th></tr></thead>
 <tbody id="docker_list"><tr><td colspan='9'></td></tr></tbody>
 </table>
 <input type="button" onclick="addContainer()" value="_(Add Container)_" style="display:none">
@@ -55,61 +41,83 @@ table tbody td{line-height:normal}
 <input type="button" onclick="resumeAll()" value="_(Resume All)_" style="display:none">
 <input type="button" onclick="checkAll()" value="_(Check for Updates)_" id="checkAll" style="display:none">
 <input type="button" onclick="updateAll()" value="_(Update All)_" id="updateAll" style="display:none">
-<input type="button" onclick="sizes()" value="_(Container Size)_" style="display:none">
+<input type="button" onclick="contSizes()" value="_(Container Size)_" style="display:none">
 <div id="iframe-popup" style="display:none;-webkit-overflow-scrolling:touch;"></div>
 
 <script src="<?autov('/webGui/javascript/jquery.switchbutton.js')?>"></script>
 <script src="<?autov('/plugins/dynamix.docker.manager/javascript/docker.js')?>"></script>
 <script>
+var docker = [];
 <?if (!$tabbed):?>
-$('#title').append("<span id='busy' class='red-text strong' style='display:none;margin-left:40px'><?=$busy?></span>");
+$('.title').append("<span id='busy' class='red-text strong' style='display:none;margin-left:40px'><?=$busy?></span>");
 <?else:?>
 $('.tabs').append("<span id='busy' class='red-text strong' style='display:none;position:relative;top:<?=$top?>px;left:40px;font-size:1.4rem;letter-spacing:2px'><?=$busy?></span>");
 <?endif;?>
-<?if ($display['resize']):?>
+<?if (_var($display,'resize')):?>
 function resize() {
-  var width = [];
   $('#docker_list').height(Math.max(window.innerHeight-340,330));
   $('#docker_containers thead,#docker_containers tbody').removeClass('fixed');
-  $('#docker_containers tbody tr:first-child td').each(function(){width.push($(this).width());});
-  $('#docker_containers thead tr th').each(function(i){$(this).width(width[i]);});
-  $('#docker_containers tbody tr td').each(function(i){$(this).width(width[i]);});
+  $('#docker_containers thead tr th').each(function(){$(this).width($(this).width());});
+  $('#docker_containers tbody tr td').each(function(){$(this).width($(this).width());});
   $('#docker_containers thead,#docker_containers tbody').addClass('fixed');
 }
 <?endif;?>
 function resetSorting() {
+  if ($.cookie('lockbutton')==null) return;
   $('input[type=button]').prop('disabled',true);
   $.post('/plugins/dynamix.docker.manager/include/UserPrefs.php',{reset:true},function(){loadlist();});
 }
 function listview() {
   var more = $.cookie('docker_listview_mode')=='advanced';
+  <?if(($dockercfg['DOCKER_READMORE']??'yes') === 'yes'):?>
   $('.docker_readmore').readmore({maxHeight:32,moreLink:"<a href='#' style='text-align:center'><i class='fa fa-chevron-down'></i></a>",lessLink:"<a href='#' style='text-align:center'><i class='fa fa-chevron-up'></i></a>"});
+  <?endif;?>
   $('input.autostart').each(function(){
     var wait = $('#'+$(this).prop('id').replace('auto','wait'));
     var auto = $(this).prop('checked');
     if (auto && more) wait.show(); else wait.hide();
   });
 }
-var sortableHelper = function(e,i){
-  i.children().each(function(){
-    $(this).width($(this).width());
-  });
-  return i;
-};
-function loadlist(init) {
-  timers.docker = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
-  $.get('/plugins/dynamix.docker.manager/include/DockerContainers.php',function(d) {
-    clearTimeout(timers.docker);
-    var data = d.split(/\0/);
-    $('#docker_list').html(data[0]).sortable({helper:sortableHelper,handle:'.dockerhandle',items:'tr.sortable',cursor:'move',axis:'y',containment:'parent',cancel:'span.docker_readmore,input',delay:100,opacity:0.5,zIndex:9999,
+function LockButton() {
+  if ($.cookie('lockbutton')==null) {
+    $.cookie('lockbutton','lockbutton');
+    $('#resetsort').removeClass('nohand').addClass('hand');
+    $('i.mover').show();
+    $('#docker_list .sortable').css({'cursor':'move'});
+<?if ($themes1):?>
+    $('div.nav-item.LockButton').find('a').prop('title',"_(Lock sortable items)_");
+    $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock green-text').addClass('icon-u-lock-open red-text');
+<?endif;?>
+    $('div.nav-item.LockButton').find('span').text("_(Lock sortable items)_");
+    $('#docker_list').sortable({helper:'clone',items:'.sortable',cursor:'grab',axis:'y',containment:'parent',cancel:'span.docker_readmore,input',delay:100,opacity:0.5,zIndex:9999,forcePlaceholderSize:true,
     update:function(e,ui){
       var row = $('#docker_list').find('tr:first');
       var names = ''; var index = '';
       row.parent().children().find('td.ct-name').each(function(){names+=$(this).find('.appname').text()+';';index+=$(this).parent().parent().children().index($(this).parent())+';';});
       $.post('/plugins/dynamix.docker.manager/include/UserPrefs.php',{names:names,index:index});
     }});
+  } else {
+    $.removeCookie('lockbutton');
+    $('#resetsort').removeClass('hand').addClass('nohand');
+    $('i.mover').hide();
+    $('#docker_list .sortable').css({'cursor':'default'});
+<?if ($themes1):?>
+    $('div.nav-item.LockButton').find('a').prop('title',"_(Unlock sortable items)_");
+    $('div.nav-item.LockButton').find('b').removeClass('icon-u-lock-open red-text').addClass('icon-u-lock green-text');
+<?endif;?>
+    $('div.nav-item.LockButton').find('span').text("_(Unlock sortable items)_");
+    $('#docker_list').sortable('destroy');
+  }
+}
+function loadlist(init) {
+  timers.docker = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
+  docker = [];
+  $.get('/plugins/dynamix.docker.manager/include/DockerContainers.php',function(d) {
+    clearTimeout(timers.docker);
+    var data = d.split(/\0/);
+    $('#docker_list').html(data[0]);
     $('head').append('<script>'+data[1]+'<\/script>');
-<?if ($display['resize']):?>
+<?if (_var($display,'resize')):?>
     resize();
     if (init) $(window).bind('resize',function(){resize();});
 <?endif;?>
@@ -128,7 +136,6 @@ function loadlist(init) {
       $.post('/plugins/dynamix.docker.manager/include/UpdateConfig.php',{action:'wait',container:$(this).attr('container'),wait:$(this).val()});
     });
     if ($.cookie('docker_listview_mode')=='advanced') {$('.advanced').show(); $('.basic').hide();}
-    context.init({preventDoubleContext:false,left:true,above:false});
     $('input[type=button]').prop('disabled',false).show('slow');
     var update = false, rebuild = false;
     for (var i=0,ct; ct=docker[i]; i++) {
@@ -142,8 +149,10 @@ function loadlist(init) {
     if (rebuild) rebuildAll();
   });
 }
-function sizes() {
-  openBox("/plugins/dynamix.docker.manager/include/ContainerSize.php","_(Container Size)_",600,600);
+function contSizes() {
+  // show spinner over window
+  $('div.spinner.fixed').css({'z-index':'100000'}).show();
+  openPlugin('container_size', "_(Container Size)_");
 }
 var dockerload = new NchanSubscriber('/sub/dockerload',{subscriber:'websocket'});
 dockerload.on('message', function(msg){
@@ -151,7 +160,7 @@ dockerload.on('message', function(msg){
   for (var i=0,row; row=data[i]; i++) {
     var id = row.split(';');
     var w1 = Math.round(Math.min(id[1].slice(0,-1)/<?=count($cpus)*count(preg_split('/[,-]/',$cpus[0]))?>,100)*100)/100+'%';
-    $('.cpu-'+id[0]).text(w1.replace('.','<?=$display['number'][0]?>'));
+    $('.cpu-'+id[0]).text(w1.replace('.','<?=_var($display,'number','.,')[0]?>'));
     $('.mem-'+id[0]).text(id[2]);
     $('#cpu-'+id[0]).css('width',w1);
   }
@@ -165,7 +174,13 @@ $(function() {
     $.cookie('docker_listview_mode',$('.advancedview').is(':checked')?'advanced':'basic',{expires:3650});
     listview();
   });
+  $.removeCookie('lockbutton');
   loadlist(true);
   dockerload.start();
 });
+
+window.onunload = function(){
+  dockerload.stop();
+}
 </script>
+

emhttp/plugins/dynamix.docker.manager/DockerSettings.page

@@ -4,9 +4,9 @@ Icon="icon-docker"
 Tag="icon-docker"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2021, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -21,7 +21,10 @@ Tag="icon-docker"
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 $DockerClient  = new DockerClient();
-$DockerStopped = pgrep('dockerd')===false;
+exec("/etc/rc.d/rc.docker status >/dev/null",$dummy,$DockerStopped);
+
+exec("ls --indicator-style=none /sys/class/net|awk '/^br[0-9]+$/'",$nics);
+$bridge = count($nics)>0;
 
 function strposX($s, $c, $n=1) {
   $p = 0;
@@ -46,10 +49,11 @@ foreach ($other as $network) {
   }
 }
 $include = $include6 = $address = $address6 = $gateway = $gateway6 = $unset = $protocol = [];
+$wide = false;
 foreach ($custom as $network) {
   if (in_array($network,$slaves)) continue;
-  $ip4    = exec("ip -4 addr show $network|awk '/inet /{print $2;exit}'");
-  $ip6    = exec("ip -6 addr show $network scope global|awk '/inet6 /{print $2;exit}'");
+  $ip4    = exec("ip -br -4 addr show $network scope global|awk '{print $3}'");
+  $ip6    = exec("ip -br -6 addr show $network scope global|awk '{print $3}'");
   $gw4    = $ip4 ? exec("ip -4 route show dev $network default|awk '{print $3;exit}'") : '';
   $gw6    = $ip6 ? exec("ip -6 route show dev $network default|awk '{print $3;exit}'") : '';
   $route4 = $ip4 ? exec("ip -4 route show dev $network $ip4|awk '{print $1;exit}'") : '';
@@ -57,9 +61,9 @@ foreach ($custom as $network) {
   [$eth,$vlan] = my_explode('.',$network);
   $eth = str_replace(['bond','br'],'eth',$eth);
   if (!$vlan) {
-    $protocol[$network] = $$eth['PROTOCOL:0'] ?? 'ipv4';
+    $protocol[$network] = _var($$eth,'PROTOCOL:0','ipv4');
   } else {
-    foreach ($$eth as $key => $value) if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol[$network] = $$eth[str_replace('VLANID','PROTOCOL',$key)] ?? 'ipv4'; break;}
+    foreach ($$eth as $key => $value) if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol[$network] = _var($$eth,str_replace('VLANID','PROTOCOL',$key),'ipv4'); break;}
   }
   if ($ip4 && $route4) {
     $include[$network] = $route4;
@@ -99,34 +103,12 @@ function base_net($route) {
   return substr(explode('/',$route)[0],0,-2);
 }
 $bgcolor = strstr('white,azure',$display['theme']) ? '#f2f2f2' : '#1c1c1c';
+
+//Check if docker.cfg not exists
+$no_dockercfg = !is_file('/boot/config/docker.cfg');
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.filetree.css')?>">
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
-<style>
-.errortext{color:#EF3D47;display:none;margin-left:20px}
-.fileTree{background:<?=$bgcolor?>;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
-.basic{display:inline-block}
-.advanced{display:none}
-select.mask{min-width:0;margin:0 10px 0 4px}
-select.net{min-width:0;margin:0 4px 0 2px}
-select option.hide{display:none}
-input.ip4{width:100px;margin:0 4px 0 1px}
-input.ip6{width:140px;margin:0 4px}
-input.gw4{width:100px;margin:0 4px 0 1px}
-input.gw6{width:160px;margin:0 4px}
-input.pool6{width:40px;margin:0 4px 0 1px}
-span.net{margin-left:4px;margin-right:2px}
-span.ip4{display:inline-block;width:260px}
-span.ip6{display:inline-block;width:310px}
-span.gw4{display:inline-block;width:200px}
-span.gw6{display:inline-block;width:270px}
-span.nonexist{margin-left:20px}
-<?if (strstr('white,azure',$display['theme'])):?>
-span.disabled{color:#B0B0B0}
-<?else:?>
-span.disabled{color:#404040}
-<?endif;?>
-</style>
 <span class="status vhshift"><input type="checkbox" class="advancedview"></span>
 
 <form markdown="1" id="settingsForm" name="settingsForm" method="POST" action="/update.php" target="progressFrame" onsubmit="return prepareDocker(this)">
@@ -136,47 +118,63 @@ span.disabled{color:#404040}
 <input type="hidden" name="#arg[1]" value="cmdStatus=Apply">
 <input type="hidden" name="#cleanup" value="true">
 <input type="hidden" name="DOCKER_CUSTOM_NETWORKS" value="<?=implode(' ',$unset)?> ">
-<input type="hidden" name="DOCKER_IMAGE_FILE" value="<?=$dockercfg['DOCKER_IMAGE_FILE']?>">
+<input type="hidden" name="DOCKER_IMAGE_FILE" value="<?=_var($dockercfg,'DOCKER_IMAGE_FILE')?>">
+
 _(Enable Docker)_:
 : <select id="DOCKER_ENABLED" name="DOCKER_ENABLED">
-  <?=mk_option($dockercfg['DOCKER_ENABLED'], 'no', _('No'))?>
-  <?=mk_option($dockercfg['DOCKER_ENABLED'], 'yes', _('Yes'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_ENABLED'), 'no', _('No'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_ENABLED'), 'yes', _('Yes'))?>
   </select>
-  <?if ($var['fsState'] != "Started"):?>
-  <span id="arraystopped"><i class="fa fa-warning icon warning"></i> <?=($dockercfg['DOCKER_ENABLED']=='yes') ? '_(Docker will be available after Array is Started)_' : '_(Apply to activate Docker after Array is Started)_'?></span>
-  <?elseif (!is_dir(dirname($dockercfg['DOCKER_IMAGE_FILE'])) || !is_dir($dockercfg['DOCKER_APP_CONFIG_PATH'])):?>
+  <?if (_var($var,'fsState')!="Started"):?>
+  <span id="arraystopped"><i class="fa fa-warning icon warning"></i> <?=(_var($dockercfg,'DOCKER_ENABLED')=='yes') ? '_(Docker will be available after Array is Started)_' : '_(Apply to activate Docker after Array is Started)_'?></span>
+  <?elseif (!is_dir(dirname(_var($dockercfg,'DOCKER_IMAGE_FILE'))) || !is_dir(_var($dockercfg,'DOCKER_APP_CONFIG_PATH'))):?>
   <span class="basic"><i class="fa fa-warning icon warning"></i> _(One or more paths do not exist)_ (<a href="#" onclick="$('.advancedview').switchButton('option','checked',true); return false">_(view)_</a>)</span>
   <?endif;?>
 
 :docker_enable_help:
 
-_(Docker Stop Timeout)_:
-: <input class='narrow' id="DOCKER_TIMEOUT" type="number" name="DOCKER_TIMEOUT" min='1' value="<?=$dockercfg['DOCKER_TIMEOUT']?>">_(seconds)_
+_(Enable container table readmore-js)_:
+: <select id="DOCKER_READMORE" name="DOCKER_READMORE">
+
+  <?=mk_option(_var($dockercfg,'DOCKER_READMORE'), 'yes', _('Yes'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_READMORE'), 'no', _('No'))?>
+
+  </select>
+
+:docker_readmore_help:
+
+_(Docker Stop Timeout)_ (_(seconds)_):
+: <input class='narrow' id="DOCKER_TIMEOUT" type="number" name="DOCKER_TIMEOUT" min='1' value="<?=_var($dockercfg,'DOCKER_TIMEOUT')?>">
 
 :docker_timeout_help:
 
+_(Docker PID Limit)_:
+: <input class='narrow' id="DOCKER_PID_LIMIT" type="number" name="DOCKER_PID_LIMIT" min='1' value="<?=_var($dockercfg,'DOCKER_PID_LIMIT')?>" placeholder="2048">
+
+:docker_pid_limit_help:
+
 <?if ($DockerStopped):?>
 
 _(Docker data-root)_:
 : <select id="DOCKER_IMAGE_TYPE" name="DOCKER_IMAGE_TYPE" onchange="updateLocation(this.value)">
-  <?=mk_option($dockercfg['DOCKER_IMAGE_TYPE'], '', _('btrfs vDisk'))?>
-  <?=mk_option($dockercfg['DOCKER_IMAGE_TYPE'], 'xfs', _('xfs vDisk'))?>
-  <?=mk_option($dockercfg['DOCKER_IMAGE_TYPE'], 'folder', _('directory'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_IMAGE_TYPE'), '', _('btrfs vDisk'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_IMAGE_TYPE'), 'xfs', _('xfs vDisk'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_IMAGE_TYPE'), 'folder', _('directory'))?>
   </select>
 
 :docker_vdisk_type_help:
 
 <div markdown="1" id="vdisk_file" style="display:none">
 _(Docker vDisk size)_:
-: <input id="DOCKER_IMAGE_SIZE" type="number" name="DOCKER_IMAGE_SIZE" value="<?=$dockercfg['DOCKER_IMAGE_SIZE']?>" class="narrow" required>GB<span id="SIZE_ERROR" class="errortext"></span>
+: <input id="DOCKER_IMAGE_SIZE" type="number" name="DOCKER_IMAGE_SIZE" value="<?=_var($dockercfg,'DOCKER_IMAGE_SIZE')?>" class="narrow" required>GB<span id="SIZE_ERROR" class="errortext"></span>
 
 :docker_vdisk_size_help:
 
 _(Docker vDisk location)_:
-: <input type="text" id="DOCKER_IMAGE_FILE1" name="DOCKER_IMAGE_FILE1" autocomplete="off" spellcheck="false" value="<?=$dockercfg['DOCKER_IMAGE_FILE']?>" placeholder="_(e.g.)_ /mnt/user/system/docker.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" disabled required pattern="^[^\\]*(docker-xfs\.img|docker\.img)$">
+: <input type="text" id="DOCKER_IMAGE_FILE1" name="DOCKER_IMAGE_FILE1" autocomplete="off" spellcheck="false" value="<?=_var($dockercfg,'DOCKER_IMAGE_FILE')?>" placeholder="_(e.g.)_ /mnt/user/system/docker.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" disabled required pattern="^[^\\]*(docker-xfs\.img|docker\.img)$">
   <span class="deleteLabel"><label><input type="checkbox" class="deleteCheckbox"> _(Delete vDisk file)_</label></span>
   <?if ($var['fsState'] != "Started"):?><span><i class="fa fa-warning icon warning"></i> _(Modify with caution: unable to validate path until Array is Started)_</span>
-  <?elseif (!is_dir(dirname($dockercfg['DOCKER_IMAGE_FILE']))):?><span class="nonexist"><i class="fa fa-warning icon warning"></i> _(Path does not exist)_</span>
+  <?elseif (!is_dir(dirname(_var($dockercfg,'DOCKER_IMAGE_FILE')))):?><span class="nonexist"><i class="fa fa-warning icon warning"></i> _(Path does not exist)_</span>
   <?endif;?><span id="IMAGE_ERROR1" class="errortext"></span>
 
 :docker_vdisk_location_help:
@@ -184,20 +182,37 @@ _(Docker vDisk location)_:
 </div>
 <div markdown="1" id="vdisk_dir" style="display:none">
 _(Docker directory)_:
-: <input type="text" id="DOCKER_IMAGE_FILE2" name="DOCKER_IMAGE_FILE2" autocomplete="off" spellcheck="false" value="<?=$dockercfg['DOCKER_IMAGE_FILE']?>" placeholder="_(e.g.)_ /mnt/user/system/docker" data-pickcloseonfile="true" data-pickfilter="HIDE_FILES_FILTER" data-pickroot="/mnt" data-pickfolders="true" disabled required pattern="^[^\\]*/$">
+: <input type="text" id="DOCKER_IMAGE_FILE2" name="DOCKER_IMAGE_FILE2" autocomplete="off" spellcheck="false" value="<?=_var($dockercfg,'DOCKER_IMAGE_FILE')?>" placeholder="_(e.g.)_ /mnt/user/system/docker" data-pickcloseonfile="true" data-pickfilter="HIDE_FILES_FILTER" data-pickroot="/mnt" data-pickfolders="true" disabled required pattern="^[^\\]*/$">
   <span class="deleteLabel"><label><input type="checkbox" class="deleteCheckbox"> _(Delete directory)_</label></span>
   <?if ($var['fsState'] != "Started"):?><span><i class="fa fa-warning icon warning"></i> _(Modify with caution: unable to validate path until Array is Started)_</span>
-  <?elseif (!is_dir(dirname($dockercfg['DOCKER_IMAGE_FILE']))):?><span class="nonexist"><i class="fa fa-warning icon warning"></i> _(Path does not exist)_</span>
+  <?elseif (!is_dir(dirname(_var($dockercfg,'DOCKER_IMAGE_FILE')))):?><span class="nonexist"><i class="fa fa-warning icon warning"></i> _(Path does not exist)_</span>
   <?endif;?><span id="IMAGE_ERROR2" class="errortext"></span>
 
 :docker_vdisk_directory_help:
 
 </div>
+
+<div markdown="1" id="backingfs_type" style="display:none">
+_(Docker storage driver)_:
+: <select id="DOCKER_BACKINGFS" name="DOCKER_BACKINGFS" onchange="updateBackingFS(this.value)">
+  <?=mk_option(_var($dockercfg,'DOCKER_BACKINGFS'), 'overlay2', _('overlay2'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_BACKINGFS'), 'native', _('native'))?>
+  </select>
+  <?if ($var['fsState'] != "Started"):?>
+  <span id="WARNING_BACKINGFS" style="display:none;"><i class="fa fa-warning icon warning"></i>_(Only modify if this is a new installation since this can lead to unwanted behaviour!)_</span>
+  <?elseif (is_dir(_var($dockercfg,'DOCKER_IMAGE_FILE'))):?>
+  <span id="WARNING_BACKINGFS" style="display:none;"><i class="fa fa-warning icon warning"></i>_(Switching the Storage Driver requires to delete and rebuild the Docker directory manually!)_</span>
+  <?endif;?>
+
+:docker_storage_driver_help:
+
+</div>
+
 _(Default appdata storage location)_:
-: <input type="text" id="DOCKER_APP_CONFIG_PATH" name="DOCKER_APP_CONFIG_PATH" autocomplete="off" spellcheck="false" value="<?=$dockercfg['DOCKER_APP_CONFIG_PATH']?>" placeholder="_(e.g.)_ /mnt/user/appdata/" data-pickfilter="HIDE_FILES_FILTER" data-pickroot="<?=is_dir('/mnt/user')?'/mnt/user':'/mnt'?>" data-pickfolders="true" pattern="^[^\\]*/$">
+: <input type="text" id="DOCKER_APP_CONFIG_PATH" name="DOCKER_APP_CONFIG_PATH" autocomplete="off" spellcheck="false" value="<?=_var($dockercfg,'DOCKER_APP_CONFIG_PATH')?>" placeholder="_(e.g.)_ /mnt/user/appdata/" data-pickfilter="HIDE_FILES_FILTER" data-pickroot="/mnt" data-pickfolders="true" pattern="^[^\\]*/$">
   <?if ($var['fsState'] != "Started"):?>
   <span><i class="fa fa-warning icon warning"></i> _(Modify with caution: unable to validate path until Array is Started)_</span>
-  <?elseif (!is_dir($dockercfg['DOCKER_APP_CONFIG_PATH'])):?>
+  <?elseif (!is_dir(_var($dockercfg,'DOCKER_APP_CONFIG_PATH'))):?>
   <span class="nonexist"><i class="fa fa-warning icon warning"></i> _(Path does not exist)_</span>
   <?endif;?>
 
@@ -206,8 +221,8 @@ _(Default appdata storage location)_:
 <div markdown="1" class="advanced">
 _(Docker LOG rotation)_:
 : <select name="DOCKER_LOG_ROTATION" onchange="showLogOptions(this.value)">
-  <?=mk_option($dockercfg['DOCKER_LOG_ROTATION'], 'no', _('Disabled'))?>
-  <?=mk_option($dockercfg['DOCKER_LOG_ROTATION'], 'yes', _('Enabled'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_LOG_ROTATION'), 'no', _('Disabled'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_LOG_ROTATION'), 'yes', _('Enabled'))?>
   </select>
 
 :docker_log_rotation_help:
@@ -215,21 +230,21 @@ _(Docker LOG rotation)_:
 <div markdown="1" id="DOCKER_LOG_OPTIONS" style="display:none">
 _(Docker LOG maximum file size)_:
 : <select name="DOCKER_LOG_SIZE">
-  <?=mk_option($dockercfg['DOCKER_LOG_SIZE'], '10m', '10 '._('MB'))?>
-  <?=mk_option($dockercfg['DOCKER_LOG_SIZE'], '20m', '20 '._('MB'))?>
-  <?=mk_option($dockercfg['DOCKER_LOG_SIZE'], '50m', '50 '._('MB'))?>
-  <?=mk_option($dockercfg['DOCKER_LOG_SIZE'], '100m', '100 '._('MB'))?>
-  <?=mk_option($dockercfg['DOCKER_LOG_SIZE'], '500m', '500 '._('MB'))?>
-  <?=mk_option($dockercfg['DOCKER_LOG_SIZE'], '1g', '1000 '._('MB'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_LOG_SIZE'), '10m', '10 '._('MB'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_LOG_SIZE'), '20m', '20 '._('MB'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_LOG_SIZE'), '50m', '50 '._('MB'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_LOG_SIZE'), '100m', '100 '._('MB'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_LOG_SIZE'), '500m', '500 '._('MB'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_LOG_SIZE'), '1g', '1000 '._('MB'))?>
   </select>
 
 :docker_log_file_size_help:
 
 _(Docker LOG number of files)_:
 : <select name="DOCKER_LOG_FILES">
-  <?=mk_option($dockercfg['DOCKER_LOG_FILES'], '1', '1')?>
-  <?=mk_option($dockercfg['DOCKER_LOG_FILES'], '2', '2')?>
-  <?=mk_option($dockercfg['DOCKER_LOG_FILES'], '3', '3')?>
+  <?=mk_option(_var($dockercfg,'DOCKER_LOG_FILES'), '1', '1')?>
+  <?=mk_option(_var($dockercfg,'DOCKER_LOG_FILES'), '2', '2')?>
+  <?=mk_option(_var($dockercfg,'DOCKER_LOG_FILES'), '3', '3')?>
   </select>
 
 :docker_log_file_number_help:
@@ -237,30 +252,32 @@ _(Docker LOG number of files)_:
 </div>
 _(Template Authoring Mode)_:
 : <select id="DOCKER_AUTHORING_MODE" name="DOCKER_AUTHORING_MODE">
-  <?=mk_option($dockercfg['DOCKER_AUTHORING_MODE'], 'no', _('No'))?>
-  <?=mk_option($dockercfg['DOCKER_AUTHORING_MODE'], 'yes', _('Yes'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_AUTHORING_MODE'), 'no', _('No'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_AUTHORING_MODE'), 'yes', _('Yes'))?>
   </select>
 
 :docker_authoring_mode_help:
 
 _(Docker custom network type)_:
 : <select name="DOCKER_NETWORK_TYPE">
-  <?=mk_option($dockercfg['DOCKER_NETWORK_TYPE'], '', _('macvlan'))?>
-  <?=mk_option($dockercfg['DOCKER_NETWORK_TYPE'], '1', _('ipvlan'))?>
-  </select>
+  <?=mk_option(_var($dockercfg,'DOCKER_NETWORK_TYPE'), '1', _('ipvlan'), $bridge?'':'disabled')?>
+  <?=mk_option(_var($dockercfg,'DOCKER_NETWORK_TYPE'), '', _('macvlan'), $bridge?'':'selected')?>
+  </select>&nbsp;_(Please read the Help carefully)_.  _(Misconfiguration can cause problems)_.
+
+:docker_custom_network_type_help:
 
 _(Host access to custom networks)_:
 : <select name="DOCKER_ALLOW_ACCESS">
-  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], '', _('Disabled'))?>
-  <?=mk_option($dockercfg['DOCKER_ALLOW_ACCESS'], 'yes', _('Enabled'))?>
-  </select>
+  <?=mk_option(_var($dockercfg,'DOCKER_ALLOW_ACCESS'), '', _('Disabled'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_ALLOW_ACCESS'), 'yes', _('Enabled'))?>
+  </select>&nbsp;_(Make sure you understand what you are doing before enabling)_.
 
 :docker_custom_network_access_help:
 
 _(Preserve user defined networks)_:
 : <select name="DOCKER_USER_NETWORKS">
-  <?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'remove', _('No'))?>
-  <?=mk_option($dockercfg['DOCKER_USER_NETWORKS'], 'preserve', _('Yes'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_USER_NETWORKS'), 'remove', _('No'))?>
+  <?=mk_option(_var($dockercfg,'DOCKER_USER_NETWORKS'), 'preserve', _('Yes'))?>
   </select>
 
 :docker_user_defined_network_help:
@@ -272,13 +289,13 @@ $docker_auto = "DOCKER_AUTO_$net";
 $docker_dhcp = "DOCKER_DHCP_$net";
 ?>
 
-<input type="hidden" name="<?=$docker_auto?>" value="<?=$dockercfg[$docker_auto]?>">
+<input type="hidden" name="<?=$docker_auto?>" value="<?=_var($dockercfg,$docker_auto)?>">
 
 _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
 <?
-  $auto = $dockercfg[$docker_auto]!='no';
+  $auto = _var($dockercfg,$docker_auto)!='no';
   $autoDisabled = $auto ? '':'disabled';
-  $dhcp = $dockercfg[$docker_dhcp] ?? false;
+  $dhcp = _var($dockercfg,$docker_dhcp);
   $dhcpDisabled = ($auto && $dhcp) ? '':'disabled';
   $net = base_min($route);
   $max = base_max($route);
@@ -302,8 +319,8 @@ _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
 <?
   for ($b=$box; $b<=3; $b++) {
     switch ($b) {
-      case 1: $step = $size/65536%256; break;
-      case 2: $step = $size/256%256; break;
+      case 1: $step = floor($size/65536)%256; break;
+      case 2: $step = floor($size/256)%256; break;
       case 3: $step = $size%256; break;
     }
     if ($step===0) $step = 256;
@@ -326,8 +343,8 @@ _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
 <?foreach ($unset as $network):?>
 <?
 $port = normalize($network);
-[$subnet,$mask] = my_explode('/',$dockercfg["DOCKER_SUBNET_$port"] ?? '');
-[$range,$size] = my_explode('/',$dockercfg["DOCKER_RANGE_$port"] ?? '');
+[$subnet,$mask] = my_explode('/',_var($dockercfg,"DOCKER_SUBNET_$port"));
+[$range,$size] = my_explode('/',_var($dockercfg,"DOCKER_RANGE_$port"));
 $disabled = $subnet ? '':'disabled';
 $dhcpDisabled = $range ? '':'disabled';
 ?>
@@ -339,7 +356,7 @@ _(IPv4 custom network on interface)_ <?=$network?> (_(optional)_):
   <select id="DOCKER_CUSTOM_<?=$port?>_mask" name="DOCKER_MASK_<?=$port?>" class="mask"<?=$disabled?>>
   <?for ($m=16; $m<=30; $m++) echo mk_option($mask?:24,$m,$m)?></select>
   </span>
-  <span class="<?=$gw4class?>">**_(Gateway)_:** <input type="text" id="DOCKER_CUSTOM_<?=$port?>_gw" name="DOCKER_GATEWAY_<?=$port?>" class="ip4" value="<?=$dockercfg["DOCKER_GATEWAY_$port"]?>" title="_(IPv4 address A.B.C.D)_"<?=$disabled?>></span>
+  <span class="<?=$gw4class?>">**_(Gateway)_:** <input type="text" id="DOCKER_CUSTOM_<?=$port?>_gw" name="DOCKER_GATEWAY_<?=$port?>" class="ip4" value="<?=_var($dockercfg,"DOCKER_GATEWAY_$port")?>" title="_(IPv4 address A.B.C.D)_"<?=$disabled?>></span>
   <input type="checkbox" id="DOCKER_CUSTOM_<?=$port?>_dhcp" onchange="customDHCP(this.id,4)"<?=$subnet?'checked':''?><?=$dhcpDisabled?>>
   **_(DHCP pool)_:** <input type="text" id="DOCKER_CUSTOM_<?=$port?>_pool" name="DOCKER_RANGE_<?=$port?>" class="ip4" value="<?=$range?>" title="_(IPv4 address A.B.C.D)_"<?=$disabled?>>/
   <select id="DOCKER_CUSTOM_<?=$port?>_size" name="DOCKER_SIZE_<?=$port?>" class="mask" onchange="changeHosts(this.id,this.value)"<?=$disabled?>>
@@ -364,9 +381,9 @@ $docker_dhcp6 = "DOCKER_DHCP6_$net";
 
 _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
 <?
-  $auto6 = $dockercfg[$docker_auto]!='no';
+  $auto6 = _var($dockercfg,$docker_auto)!='no';
   $auto6Disabled = $auto6 ? '':'disabled';
-  $dhcp6 = $dockercfg[$docker_dhcp6] ?? false;
+  $dhcp6 = _var($dockercfg,$docker_dhcp6);
   $dhcp6Disabled = ($auto6 && $dhcp6) ? '':'disabled';
   $net = base_net($route);
   $mask = explode('/',$route)[1];
@@ -394,8 +411,8 @@ _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
 <?foreach ($unset as $network):?>
 <?
 $port = normalize($network);
-[$subnet6,$mask6] = my_explode('/',$dockercfg["DOCKER_SUBNET6_$port"] ?? '');
-[$range6,$size6] = my_explode('/',$dockercfg["DOCKER_RANGE6_$port"] ?? '');
+[$subnet6,$mask6] = my_explode('/',_var($dockercfg,"DOCKER_SUBNET6_$port"));
+[$range6,$size6] = my_explode('/',_var($dockercfg,"DOCKER_RANGE6_$port"));
 $disabled = $subnet6 ? '':'disabled';
 $dhcpDisabled = $range6 ? '':'disabled';
 ?>
@@ -406,7 +423,7 @@ _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
   <span class="ip6">**_(Subnet)_:**<input type="text" id="DOCKER_CUSTOM6_<?=$port?>_net" name="DOCKER_SUBNET6_<?=$port?>" class="ip6" value="<?=$subnet6?>" title="_(IPv6 address nnnn:xxxx::yyyy)_"<?=$disabled?>>/
   <select id="DOCKER_CUSTOM6_<?=$port?>_mask" name="DOCKER_MASK6_<?=$port?>" class="mask"<?=$disabled?>>
   <?for ($m=64; $m<=120; $m+=8) echo mk_option($mask6?:64,$m,$m)?></select></span>
-  <span class="gw6">**_(Gateway)_:**<input type="text" id="DOCKER_CUSTOM6_<?=$port?>_gw" name="DOCKER_GATEWAY6_<?=$port?>" class="gw6" value="<?=$dockercfg["DOCKER_GATEWAY6_$port"]?>" title="_(IPv6 address nnnn:xxxx::yyyy)_"<?=$disabled?>></span>
+  <span class="gw6">**_(Gateway)_:**<input type="text" id="DOCKER_CUSTOM6_<?=$port?>_gw" name="DOCKER_GATEWAY6_<?=$port?>" class="gw6" value="<?=_var($dockercfg,"DOCKER_GATEWAY6_$port")?>" title="_(IPv6 address nnnn:xxxx::yyyy)_"<?=$disabled?>></span>
   <input type="checkbox" id="DOCKER_CUSTOM6_<?=$port?>_dhcp" onchange="customDHCP(this.id,6)"<?=$subnet6?'checked':''?><?=$dhcpDisabled?>>
   **_(DHCP pool)_:**<input type="text" id="DOCKER_CUSTOM6_<?=$port?>_pool" name="DOCKER_RANGE6_<?=$port?>" class="ip6" value="<?=$range6?>" title="_(IPv6 address nnnn:xxxx::yyyy)_"<?=$disabled?>>/
   <select id="DOCKER_CUSTOM6_<?=$port?>_size" name="DOCKER_SIZE6_<?=$port?>" class="mask"<?=$disabled?>>
@@ -421,44 +438,52 @@ _(IPv6 custom network on interface)_ <?=$network?> (_(optional)_):
 </div>
 <?else: /* DOCKER STARTED */?>
 
+
 _(Docker version)_:
 : <?$arrInfo = $DockerClient->getInfo(); echo $arrInfo['Version']?>
 
 :docker_version_help:
 
-<?if (($dockercfg['DOCKER_IMAGE_TYPE'] ?? '')!='folder'):?>
+<?if (_var($dockercfg,'DOCKER_IMAGE_TYPE')!='folder'):?>
 _(Docker vDisk location)_:
-: <?=$dockercfg['DOCKER_IMAGE_FILE']?>
+: <?=_var($dockercfg,'DOCKER_IMAGE_FILE')?>
 <?else:?>
 _(Docker directory)_:
-: <?=$dockercfg['DOCKER_IMAGE_FILE']?>
+: <?=_var($dockercfg,'DOCKER_IMAGE_FILE')?>
 <?endif;?>
 
 :docker_vdisk_location_active_help:
 
+_(Docker storage driver)_:
+: <?=_var($dockercfg,'DOCKER_BACKINGFS')?>
+
+:docker_storage_driver_active_help:
+
 _(Default appdata storage location)_:
-: <?=$dockercfg['DOCKER_APP_CONFIG_PATH']?>
+: <?=_var($dockercfg,'DOCKER_APP_CONFIG_PATH')?>
 
 :docker_appdata_location_active_help:
 
 <div markdown="1" class="advanced">
 _(Docker LOG rotation)_:
-: <?=$dockercfg['DOCKER_LOG_ROTATION']=='yes' ? _('Enabled') : _('Disabled')?>
+: <?=_var($dockercfg,'DOCKER_LOG_ROTATION')=='yes' ? _('Enabled') : _('Disabled')?>
 
 :docker_log_rotation_active_help:
 
 _(Docker custom network type)_:
-: <?=$dockercfg['DOCKER_NETWORK_TYPE']=='' ? _('macvlan') : _('ipvlan')?>
+: <?=_var($dockercfg,'DOCKER_NETWORK_TYPE')!='1' || !$bridge ? _('macvlan') : _('ipvlan')?>
+
+:docker_custom_network_type_help:
 
 _(Host access to custom networks)_:
-: <?=$dockercfg['DOCKER_ALLOW_ACCESS']=='yes' ? _('Enabled') : _('Disabled')?>
+: <?=_var($dockercfg,'DOCKER_ALLOW_ACCESS')=='yes' ? _('Enabled') : _('Disabled')?>
 
-:docker_custom_network_active_help:
+:docker_custom_network_access_help:
 
 _(Preserve user defined networks)_:
-: <?=$dockercfg['DOCKER_USER_NETWORKS']=='preserve' ? _('Yes') : _('No')?>
+: <?=_var($dockercfg,'DOCKER_USER_NETWORKS')=='preserve' ? _('Yes') : _('No')?>
 
-:docker_user_defined_network_active_help:
+:docker_user_defined_network_help:
 
 <?foreach ($include as $network => $route):?>
 <?
@@ -469,7 +494,7 @@ $docker_dhcp = "DOCKER_DHCP_$net";
 _(IPv4 custom network on interface)_ <?=$network?>:
 : <span class="<?=$gw4class?>">**_(Subnet)_:** <?=$route?></span>
   <span class="<?=$gw4class?>">**_(Gateway)_:** <?=$gateway[$network]?></span>
-  **_(DHCP pool)_:** <?=$dockercfg[$docker_dhcp] ?? "_(not set)_"?><?if ($dockercfg[$docker_dhcp]):?>&nbsp;&nbsp;(<?=pow(2,32-explode('/',$dockercfg[$docker_dhcp])[1])?> _(hosts)_)<?endif;?>
+  **_(DHCP pool)_:** <?=_var($dockercfg,$docker_dhcp) ?: "_(not set)_"?><?if (isset($dockercfg[$docker_dhcp])):?>&nbsp;&nbsp;(<?=pow(2,32-my_explode('/',$dockercfg[$docker_dhcp])[1])?> _(hosts)_)<?endif;?>
 
 <?endif;?>
 <?endforeach;?>
@@ -479,19 +504,19 @@ $port = normalize($network);
 [$eth,$vlan] = my_explode('.',$network);
 $eth = str_replace(['bond','br'],'eth',$eth);
 if (!$vlan) {
-  $protocol = $$eth['PROTOCOL:0'] ?? 'ipv4';
+  $protocol = _var($$eth,'PROTOCOL:0','ipv4');
 } else {
   foreach ($$eth as $key => $value) {
-    if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol = $$eth[str_replace('VLANID','PROTOCOL',$key)] ?? 'ipv4'; break;}
+    if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol = _var($$eth,str_replace('VLANID','PROTOCOL',$key),'ipv4'); break;}
   }
 }
-[$subnet,$mask] = my_explode('/',$dockercfg["DOCKER_SUBNET_$port"] ?? '');
-[$range,$size] = my_explode('/',$dockercfg["DOCKER_RANGE_$port"] ?? '');
+[$subnet,$mask] = my_explode('/',_var($dockercfg,"DOCKER_SUBNET_$port"));
+[$range,$size] = my_explode('/',_var($dockercfg,"DOCKER_RANGE_$port"));
 ?>
 <?if ($protocol != 'ipv6' && $subnet):?>
 _(IPv4 custom network on interface)_ <?=$network?>:
 : <span class="<?=$gw4class?>">**_(Subnet)_:** <?=$subnet?>/<?=$mask?></span>
-  <span class="<?=$gw4class?>">**_(Gateway)_:** <?=$dockercfg["DOCKER_GATEWAY_$port"]?></span>
+  <span class="<?=$gw4class?>">**_(Gateway)_:** <?=_var($dockercfg,"DOCKER_GATEWAY_$port")?></span>
   **_(DHCP pool)_:** <?=$range ? "$range/$size" : "_(not set)_"?><?if ($range):?>&nbsp;&nbsp;(<?=pow(2,32-($size?:25))?> _(hosts)_)<?endif;?>
 
 <?endif;?>
@@ -505,7 +530,7 @@ if (isset($dockercfg[$docker_dhcp6]) || empty($dockercfg["DOCKER_AUTO_$net"])):?
 _(IPv6 custom network on interface)_ <?=$network?>:
 : <span class="gw6">**_(Subnet)_:** <?=$route?></span>
   <span class="gw6">**_(Gateway)_:** <?=$gateway6[$network]?></span>
-  **_(DHCP pool)_:** <?=$dockercfg[$docker_dhcp6] ?? "_(not set)_"?>
+  **_(DHCP pool)_:** <?=_var($dockercfg,$docker_dhcp6) ?: "_(not set)_"?>
 
 <?endif;?>
 <?endforeach;?>
@@ -515,19 +540,19 @@ $port = normalize($network);
 [$eth,$vlan] = my_explode('.',$network);
 $eth = str_replace(['bond','br'],'eth',$eth);
 if (!$vlan) {
-  $protocol = $$eth['PROTOCOL:0'] ?? 'ipv4';
+  $protocol = _var($$eth,'PROTOCOL:0','ipv4');
 } else {
   foreach ($$eth as $key => $value) {
-    if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol = $$eth[str_replace('VLANID','PROTOCOL',$key)] ?? 'ipv4'; break;}
+    if (strpos($key,'VLANID')!==false && $value==$vlan) {$protocol = _var($$eth,str_replace('VLANID','PROTOCOL',$key),'ipv4'); break;}
   }
 }
-[$subnet6,$mask6] = my_explode('/',$dockercfg["DOCKER_SUBNET6_$port"] ?? '');
-[$range6,$size6] = my_explode('/',$dockercfg["DOCKER_RANGE6_$port"] ?? '');
+[$subnet6,$mask6] = my_explode('/',_var($dockercfg,"DOCKER_SUBNET6_$port"));
+[$range6,$size6] = my_explode('/',_var($dockercfg,"DOCKER_RANGE6_$port"));
 ?>
 <?if ($protocol != 'ipv4' && $subnet6):?>
 _(IPv6 custom network on interface)_ <?=$network?>:
 : <span class="gw6">**_(Subnet)_:** <?=$subnet6?>/<?=$mask6?></span>
-  <span class="gw6">**_(Gateway)_:** <?=$dockercfg["DOCKER_GATEWAY6_$port"]?></span>
+  <span class="gw6">**_(Gateway)_:** <?=_var($dockercfg,"DOCKER_GATEWAY6_$port")?></span>
   **_(DHCP pool)_:** <?=$range6 ? "$range6/$size6" : "_(not set)_"?>
 <?endif;?>
 <?endforeach;?>
@@ -544,7 +569,7 @@ _(IPv6 custom network on interface)_ <?=$network?>:
 
 <?if (!$DockerStopped && exec("findmnt --output FSTYPE --noheadings /var/lib/docker")=='btrfs'):?>
 <div markdown="1" class="advanced">
-<div id="title"><span class="left"><i class="title fa fa-address-card-o"></i>_(Docker volume info)_</span></div>
+<div class="title"><span class="left"><i class="title fa fa-address-card-o"></i>_(Docker volume info)_</span></div>
 _(btrfs filesystem show)_:
 : <?="<pre>".shell_exec("btrfs filesystem show /var/lib/docker")."</pre>"?>
 
@@ -593,6 +618,9 @@ function prepareDocker(form) {
   $(form).find('input[name="DOCKER_IMAGE_FILE"]').val($('#DOCKER_IMAGE_TYPE').val()=='folder' ? $("#DOCKER_IMAGE_FILE2").val() : $("#DOCKER_IMAGE_FILE1").val());
   $("#DOCKER_IMAGE_FILE1").prop('disabled',true);
   $("#DOCKER_IMAGE_FILE2").prop('disabled',true);
+  <?if ($no_dockercfg):?>
+    $(form).find('input[name="DOCKER_BACKINGFS"]').val($('#DOCKER_IMAGE_TYPE').val()=='folder' ? $("#DOCKER_BACKINGFS").val() : $("#DOCKER_BACKINGFS").val('native'));
+  <?endif;?>
 <?endif;?>
   $(form).find('input:hidden[name^="DOCKER_DHCP_"]').each(function(){
     var id = '#'+$(this).attr('name')+'_';
@@ -759,13 +787,13 @@ function changeMask(id,val) {
   for (var b=1; b<=3; b++) {
     var cell = id+b;
     switch (b) {
-      case 1: var step = mask/65536%256; break;
-      case 2: var step = mask/256%256; break;
+      case 1: var step = Math.floor(mask/65536)%256; break;
+      case 2: var step = Math.floor(mask/256)%256; break;
       case 3: var step = mask%256; break;
     }
     if (step==0) step = 256;
     if ($(cell).length==0) continue;
-    var max = $(cell+' option').size();
+    var max = $(cell+' option').length;
     for (var i=0; i < max; i++) if (i%step==0) $(cell+' option:eq('+i+')').removeClass('hide'); else $(cell+' option:eq('+i+')').addClass('hide');
     if ($(cell+' option:selected').val()%step!=0) $(cell+' option:selected').removeAttr('selected');
   }
@@ -858,39 +886,54 @@ function btrfsScrub(path) {
     }
   });
 }
+var originalPath = $("#DOCKER_IMAGE_FILE2").val();
 function updateLocation(val) {
   var content1 = $("#DOCKER_IMAGE_FILE1");
   var content2 = $("#DOCKER_IMAGE_FILE2");
+  var dropdown = $("#DOCKER_BACKINGFS");
+  var path = originalPath.split('/');
   switch (val) {
   case 'xfs':
-    var path = content2.val().split('/');
     path.splice(-1,1);
     content1.val((path.join('/') + '/docker-xfs.img'));
     $('#vdisk_file').show('slow');
     $('#vdisk_dir').hide('slow');
+    $('#backingfs_type').hide();
     content1.prop('disabled',false).trigger('change');
     content2.prop('disabled',true);
+    dropdown.val('native');
     break;
   case 'folder':
-    var path = content2.val().split('/');
     if (path[path.length-1]=='') path.splice(-2,2); else path.splice(-1,1);
-    content2.val(path.join('/') + '/docker/');
+    content2.val(path.join('/') + '/');
     $('#vdisk_file').hide('slow');
     $('#vdisk_dir').show('slow');
+    $('#backingfs_type').show('slow');
     content1.prop('disabled',true);
     content2.prop('disabled',false).trigger('change');
     break;
   default:
-    var path = content2.val().split('/');
     path.splice(-1,1);
     content1.val((path.join('/') + '/docker.img'));
     $('#vdisk_file').show('slow');
     $('#vdisk_dir').hide('slow');
+    $('#backingfs_type').hide();
     content1.prop('disabled',false).trigger('change');
     content2.prop('disabled',true);
+    dropdown.val('native');
     break;
   }
 }
+function updateBackingFS(val) {
+  var backingfs = "<?= _var($dockercfg,'DOCKER_BACKINGFS') ?>";
+  var warning = document.getElementById("WARNING_BACKINGFS");
+  var checkbox = $(".deleteCheckbox");
+  if (val !== backingfs) {
+    warning.style.display = "inline";
+  } else {
+    warning.style.display = "none";
+  }
+}
 function checkbox_state(value) {
   $.post('/plugins/dynamix.docker.manager/include/UpdateConfig.php',{action:'exist',name:value},function(state){state==0 ? $('.deleteLabel').fadeIn() : $('.deleteLabel').fadeOut();});
 }
@@ -898,6 +941,7 @@ $(function() {
 <?if ($DockerStopped):?>
   if ($('#DOCKER_IMAGE_TYPE').val()=='folder') {
     $('#vdisk_dir').show();
+    $('#backingfs_type').show();
     checkbox_state($("#DOCKER_IMAGE_FILE2").val());
     $("#DOCKER_IMAGE_FILE2").prop('disabled',false);
   } else {

emhttp/plugins/dynamix.docker.manager/UpdateContainer.page

@@ -3,9 +3,9 @@ Cond="(pgrep('dockerd')!==false)"
 Markdown="false"
 ---
 <?PHP
-/* Copyright 2005-2020, Lime Technology
- * Copyright 2014-2020, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2020, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,

emhttp/plugins/dynamix.docker.manager/default.cfg

@@ -6,4 +6,7 @@ DOCKER_LOG_FILES="1"
 DOCKER_AUTHORING_MODE="no"
 DOCKER_USER_NETWORKS="remove"
 DOCKER_ALLOW_ACCESS=""
-DOCKER_TIMEOUT=10
+DOCKER_TIMEOUT=10
+DOCKER_READMORE="yes"
+DOCKER_PID_LIMIT=""
+DOCKER_BACKINGFS="overlay2"

emhttp/plugins/dynamix.docker.manager/include/ContainerManager.php

@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2014-2022, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 $user_prefs = $dockerManPaths['user-prefs'];

emhttp/plugins/dynamix.docker.manager/include/DockerClient.php

@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2014-2022, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,19 +12,16 @@
  */
 ?>
 <?
-libxml_use_internal_errors(true); # Suppress any warnings from xml errors.
-
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
-// add translations
-if ($_SERVER['REQUEST_URI'] != 'docker' && substr($_SERVER['REQUEST_URI'],0,7) != '/Docker') {
-  $_SERVER['REQUEST_URI'] = 'docker';
-  require_once "$docroot/webGui/include/Translations.php";
-}
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/Helpers.php";
 require_once "$docroot/webGui/include/Wrappers.php";
 
+// add translations
+if (_var($_SERVER,'REQUEST_URI')!='docker' && substr(_var($_SERVER,'REQUEST_URI'),0,7)!='/Docker') {
+	$_SERVER['REQUEST_URI'] = 'docker';
+	require_once "$docroot/webGui/include/Translations.php";
+}
+
 $dockerManPaths = [
 	'autostart-file' => "/var/lib/docker/unraid-autostart",
 	'update-status'  => "/var/lib/docker/unraid-update-status.json",
@@ -46,13 +43,24 @@ $host = ipaddr($ethX);
 // get network drivers
 $driver = DockerUtil::driver();
 
+// determine active port name
+$port = file_exists('/sys/class/net/br0') ? 'BR0' : (file_exists('/sys/class/net/bond0') ? 'BOND0' : 'ETH0');
+
 // Docker configuration file - guaranteed to exist
 $docker_cfgfile = '/boot/config/docker.cfg';
-$defaults = @parse_ini_file("$docroot/plugins/dynamix.docker.manager/default.cfg") ?: [];
-$dockercfg = array_replace_recursive($defaults, parse_ini_file($docker_cfgfile));
+if (file_exists($docker_cfgfile)) {
+	exec("grep -Pom2 '_SUBNET_|_{$port}(_[0-9]+)?=' $docker_cfgfile",$cfg);
+	if (isset($cfg[0]) && $cfg[0]=='_SUBNET_' && empty($cfg[1])) {
+		# interface has changed, update configuration
+		exec("sed -ri 's/_(BR0|BOND0|ETH0)(_[0-9]+)?=/_{$port}\\2=/' $docker_cfgfile");
+	}
+}
+
+$defaults = (array)@parse_ini_file("$docroot/plugins/dynamix.docker.manager/default.cfg");
+$dockercfg = array_replace_recursive($defaults, (array)@parse_ini_file($docker_cfgfile));
 
 function var_split($item, $i=0) {
-	return explode(' ',$item)[$i];
+	return array_pad(explode(' ',$item),$i+1,'')[$i];
 }
 
 #######################################
@@ -168,7 +176,7 @@ class DockerTemplates {
 			}
 			// if after above we don't have a valid url, check for GitLab
 			if (empty($github_api['url'])) {
-				$source = file_get_contents($url);
+				$source = $this->download_url($url);
 				// the following should always exist for GitLab Community Edition or GitLab Enterprise Edition
 				if (preg_match("/<meta content='GitLab (Community|Enterprise) Edition' name='description'>/", $source) > 0) {
 					$parse = parse_url($url);
@@ -246,88 +254,149 @@ class DockerTemplates {
 		foreach ($this->getTemplates($scope) as $file) {
 			$doc = new DOMDocument();
 			$doc->load($file['path']);
-			$TemplateRepository = DockerUtil::ensureImageTag($doc->getElementsByTagName('Repository')->item(0)->nodeValue);
-			if ( $name )
-				if ($doc->getElementsByTagName('Name')->item(0)->nodeValue !== $name)
-					continue;
-			if ($Repository == $TemplateRepository) {
-				$TemplateField = $doc->getElementsByTagName($field)->item(0)->nodeValue;
+			if ($name) {
+				if (@$doc->getElementsByTagName('Name')->item(0)->nodeValue !== $name) continue;
+			}
+			$TemplateRepository = DockerUtil::ensureImageTag($doc->getElementsByTagName('Repository')->item(0)->nodeValue??'');
+			if ($TemplateRepository && $TemplateRepository==$Repository) {
+				$TemplateField = $doc->getElementsByTagName($field)->item(0)->nodeValue??'';
 				return trim($TemplateField);
 			}
 		}
 		return null;
 	}
-	
+
 	public function getUserTemplate($Container) {
 		foreach ($this->getTemplates('user') as $file) {
 			$doc = new DOMDocument('1.0', 'utf-8');
 			$doc->load($file['path']);
-			$Name = $doc->getElementsByTagName('Name')->item(0)->nodeValue;
+			$Name = $doc->getElementsByTagName('Name')->item(0)->nodeValue??'';
 			if ($Name==$Container) return $file['path'];
 		}
 		return false;
 	}
 
-	private function getControlURL(&$ct, $myIP) {
+	private function getControlURL(&$ct, $myIP, $WebUI) {
 		global $host;
 		$port = &$ct['Ports'][0];
-		$myIP = $myIP ?: $this->getTemplateValue($ct['Image'], 'MyIP') ?: ($ct['NetworkMode']=='host'||$port['NAT'] ? $host : ($port['IP'] ?: DockerUtil::myIP($ct['Name'])));
-		$WebUI = preg_replace("%\[IP\]%", $myIP, $this->getTemplateValue($ct['Image'], 'WebUI'));
+		$myIP = $myIP ?: $this->getTemplateValue($ct['Image'],'MyIP') ?: (_var($ct,'NetworkMode')=='host'||_var($port,'NAT') ? $host : (_var($port,'IP') ?: DockerUtil::myIP($ct['Name'])));
+		// Get the WebUI address from the templates as a fallback
+		$WebUI = preg_replace("%\[IP\]%", $myIP, $WebUI ?? $this->getTemplateValue($ct['Image'], 'WebUI'));
 		if (preg_match("%\[PORT:(\d+)\]%", $WebUI, $matches)) {
-			$ConfigPort = $matches[1];
+			$ConfigPort = $matches[1] ?? '';
 			foreach ($ct['Ports'] as $port) {
-				if ($port['NAT'] && $port['PrivatePort']==$ConfigPort) {$ConfigPort = $port['PublicPort']; break;}
+				if (_var($port,'NAT') && _var($port,'PrivatePort')==$ConfigPort) {$ConfigPort = _var($port,'PublicPort'); break;}
 			}
 			$WebUI = preg_replace("%\[PORT:\d+\]%", $ConfigPort, $WebUI);
 		}
 		return $WebUI;
 	}
 
+	private function getTailscaleJson($name) {
+		$TS_raw = [];
+		exec("docker exec -i ".$name." /bin/sh -c \"tailscale status --peers=false --json\" 2>/dev/null", $TS_raw);
+		if (!empty($TS_raw)) {
+			$TS_raw = implode("\n", $TS_raw);
+			return json_decode($TS_raw, true);
+		}
+		return '';
+	}
+
 	public function getAllInfo($reload=false,$com=true,$communityApplications=false) {
-		global $dockerManPaths, $host;
+		global $driver, $dockerManPaths, $host;
 		$DockerClient = new DockerClient();
 		$DockerUpdate = new DockerUpdate();
 		//$DockerUpdate->verbose = $this->verbose;
 		$info = DockerUtil::loadJSON($dockerManPaths['webui-info']);
-		$autoStart = array_map('var_split', @file($dockerManPaths['autostart-file'], FILE_IGNORE_NEW_LINES) ?: []);
+		$autoStart = array_map('var_split', @file($dockerManPaths['autostart-file'],FILE_IGNORE_NEW_LINES) ?: []);
+		//$TS_dns = $this->getTailscaleDNS();
 		foreach ($DockerClient->getDockerContainers() as $ct) {
 			$name = $ct['Name'];
 			$image = $ct['Image'];
 			$tmp = &$info[$name] ?? [];
 			$tmp['running'] = $ct['Running'];
 			$tmp['paused'] = $ct['Paused'];
-			$tmp['autostart'] = in_array($name, $autoStart);
+			$tmp['autostart'] = in_array($name,$autoStart);
 			$tmp['cpuset'] = $ct['CPUset'];
+			$tmp['url'] = $ct['Url'] ?? $tmp['url'] ?? '';
 			// read docker label for WebUI & Icon
-			if ($ct['Url'] && !$tmp['url']) $tmp['url'] = $ct['Url'];
-			if ($ct['Icon']) $tmp['icon'] = $ct['Icon'];
-			if ( ! $communityApplications ) {
+			if (isset($ct['Icon'])) $tmp['icon'] = $ct['Icon'];
+			if (isset($ct['Shell'])) $tmp['shell'] = $ct['Shell'];
+			if (!$communityApplications) {
 				if (!is_file($tmp['icon']) || $reload) $tmp['icon'] = $this->getIcon($image,$name,$tmp['icon']);
 			}
 			if ($ct['Running']) {
 				$port = &$ct['Ports'][0];
-				$webui = $this->getTemplateValue($ct['Image'], 'WebUI');
+				$webui = $tmp['url'] ?? $this->getTemplateValue($ct['Image'], 'WebUI');
 				if (strlen($webui) > 0 && !preg_match("%\[(IP|PORT:(\d+))\]%", $webui)) {
 					// non-templated webui, user specified
 					$tmp['url'] = $webui;
 				} else {
-					$ip = ($ct['NetworkMode']=='host'||$port['NAT'] ? $host : $port['IP']);
-					$tmp['url'] = $ip ? (strpos($tmp['url'],$ip)!==false ? $tmp['url'] : $this->getControlURL($ct, $ip)) : $tmp['url'];
+					if ($ct['NetworkMode']=='host') {
+						$ip = $host;
+					} elseif (isset($driver[$ct['NetworkMode']]) && ($driver[$ct['NetworkMode']] == 'ipvlan' || $driver[$ct['NetworkMode']] == 'macvlan')) {
+						$ip = reset($ct['Networks'])['IPAddress'];
+					} elseif (!is_null(_var($port,'PublicPort'))) {
+						$ip = $host;
+					} else {
+						$ip = _var($port,'IP');
+					}
+					$tmp['url'] = $ip ? (strpos($tmp['url'],$ip)!==false ? $tmp['url'] : $this->getControlURL($ct, $ip, $tmp['url'])) : $tmp['url'];
+					if (strpos($ct['NetworkMode'], 'container:') === 0)
+					  $tmp['url'] = '';
 				}
-				$tmp['shell'] = $tmp['shell'] ?? $this->getTemplateValue($image, 'Shell');
+				// Check if webui & ct TSurl is set, if set construct WebUI URL on Docker page
+				$tmp['TSurl'] = '';
+				if (!empty($webui) && !empty($ct['TSUrl'])) {
+					$TS_no_peers = $this->getTailscaleJson($name);
+					if (!empty($TS_no_peers) && (!empty($TS_no_peers['CurrentTailnet']['MagicDNSEnabled']) || $TS_no_peers['CurrentTailnet']['MagicDNSEnabled'])) {
+						$TS_container = $TS_no_peers['Self'];
+						$TS_DNSName = _var($TS_container,'DNSName','');
+						$TS_HostNameActual = substr($TS_DNSName, 0, strpos($TS_DNSName, '.'));
+						// Check if serve or funnel are enabled by checking for [hostname] and replace string with TS_DNSName
+						if (strpos($ct['TSUrl'], '[hostname]') !== false && isset($TS_DNSName)) {
+							$tmp['TSurl'] = str_replace("[hostname][magicdns]", rtrim($TS_DNSName, '.'), $ct['TSUrl']);
+						// Check if serve is disabled, construct url with port, path and query if present and replace [noserve] with url
+						} elseif (strpos($ct['TSUrl'], '[noserve]') !== false && isset($TS_container['TailscaleIPs'])) {
+							$ipv4 = '';
+							foreach ($TS_container['TailscaleIPs'] as $ip) {
+								if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+									$ipv4 = $ip;
+									break;
+								}
+							}
+							if (!empty($ipv4)) {
+								$webui_url = isset($webui) ? parse_url($webui) : '';
+								$webui_port = (preg_match('/\[PORT:(\d+)\]/', $webui, $matches)) ? ':' . $matches[1] : '';
+								$webui_path = $webui_url['path'] ?? '';
+								$webui_query = isset($webui_url['query']) ? '?' . $webui_url['query'] : '';
+								$tmp['TSurl'] = 'http://' . $ipv4 . $webui_port . $webui_path . $webui_query;
+							}
+						// Check if TailscaleWebUI in the xml is custom and display instead
+						} elseif (strpos($ct['TSUrl'], '[hostname]') === false && strpos($ct['TSUrl'], '[noserve]') === false) {
+							$tmp['TSurl'] = $ct['TSUrl'];
+						}
+					}
+				}
+				if ( ($tmp['shell'] ?? false) == false )
+					$tmp['shell'] = $this->getTemplateValue($image, 'Shell');
 			}
 			$tmp['registry'] = $tmp['registry'] ?? $this->getTemplateValue($image, 'Registry');
 			$tmp['Support'] = $tmp['Support'] ?? $this->getTemplateValue($image, 'Support');
 			$tmp['Project'] = $tmp['Project'] ?? $this->getTemplateValue($image, 'Project');
 			$tmp['DonateLink'] = $tmp['DonateLink'] ?? $this->getTemplateValue($image, 'DonateLink');
 			$tmp['ReadMe'] = $tmp['ReadMe'] ?? $this->getTemplateValue($image, 'ReadMe');
-			if (!$tmp['updated'] || $reload) {
+			if (empty($tmp['updated']) || $reload) {
 				if ($reload) $DockerUpdate->reloadUpdateStatus($image);
 				$tmp['updated'] = var_export($DockerUpdate->getUpdateStatus($image),true);
 			}
 			if (!$com) $tmp['updated'] = 'undef';
-			if (!$tmp['template'] || $reload) $tmp['template'] = $this->getUserTemplate($name);
-			if ($reload) $DockerUpdate->updateUserTemplate($name);
+			if ($ct['Manager'] !== 'dockerman')
+				$tmp['template'] = null;
+			else if (empty($tmp['template']) || $reload) {
+				$tmp['template'] = $this->getUserTemplate($name);
+				if ($reload) $DockerUpdate->updateUserTemplate($name);
+			}
 			//$this->debug("\n$name");
 			//foreach ($tmp as $c => $d) $this->debug(sprintf('   %-10s: %s', $c, $d));
 		}
@@ -341,10 +410,9 @@ class DockerTemplates {
 		if (!$imgUrl) $imgUrl = $tmpIconUrl;
 		if (!$imgUrl || trim($imgUrl) == "/plugins/dynamix.docker.manager/images/question.png") return '';
 
-		$imageName = $contName ?: $name;
 		$iconRAM = sprintf('%s/%s-%s.png', $dockerManPaths['images-ram'], $contName, 'icon');
 		$icon    = sprintf('%s/%s-%s.png', $dockerManPaths['images'], $contName, 'icon');
-		
+
 		if (!is_dir(dirname($iconRAM))) mkdir(dirname($iconRAM), 0755, true);
 		if (!is_dir(dirname($icon))) mkdir(dirname($icon), 0755, true);
 
@@ -355,8 +423,8 @@ class DockerTemplates {
 		if (!is_file($icon) && is_file($iconRAM)) {
 			@copy($iconRAM,$icon);
 		}
-		if ( !is_file($iconRAM) ) {
-			exec("/usr/bin/logger ".escapeshellarg("$imageName: Could not download icon $imgUrl"));
+		if (!is_file($iconRAM)) {
+			my_logger("$contName: Could not download icon $imgUrl");
 		}
 
 		return (is_file($iconRAM)) ? str_replace($docroot, '', $iconRAM) : '';
@@ -417,7 +485,7 @@ class DockerUpdate{
 
 	// DEPRECATED: Only used for Docker Index V1 type update checks
 	public function getRemoteVersion($image) {
-		[$strRepo, $strTag] = array_pad(explode(':', DockerUtil::ensureImageTag($image)),2,'');
+		extract(DockerUtil::parseImageTag($image));
 		$apiUrl = sprintf('http://index.docker.io/v1/repositories/%s/tags/%s', $strRepo, $strTag);
 		//$this->debug("API URL: $apiUrl");
 		$apiContent = $this->download_url($apiUrl);
@@ -425,7 +493,7 @@ class DockerUpdate{
 	}
 
 	public function getRemoteVersionV2($image) {
-		[$strRepo, $strTag] = array_pad(explode(':', DockerUtil::ensureImageTag($image)),2,'');
+		extract(DockerUtil::parseImageTag($image));
 		/*
 		 * Step 1: Check whether or not the image is in a private registry, get corresponding auth data and generate manifest url
 		 */
@@ -442,8 +510,8 @@ class DockerUpdate{
 		/*
 		 * Step 2: Get www-authenticate header from manifest url to generate token or basic auth
 		 */
+		$header = ['Accept: application/vnd.docker.distribution.manifest.list.v2+json,application/vnd.docker.distribution.manifest.v2+json,application/vnd.oci.image.index.v1+json'];
 		$digest_ch = getCurlHandle($manifestURL, 'HEAD', $header);
-		$header = ['Accept: application/vnd.docker.distribution.manifest.list.v2+json,application/vnd.docker.distribution.manifest.v2+json'];
 		preg_match('@www-authenticate:\s*Bearer\s*(.*)@i', $reply, $matches);
 		if (!empty($matches[1])) {
 			$strArgs = explode(',', $matches[1]);
@@ -519,7 +587,7 @@ class DockerUpdate{
 		global $dockerManPaths;
 		$DockerClient = new DockerClient();
 		$updateStatus = DockerUtil::loadJSON($dockerManPaths['update-status']);
-		$images = $image ? [DockerUtil::ensureImageTag($image)] : array_map(function($ar){return $ar['Tags'][0];}, $DockerClient->getDockerImages());
+		$images = $image ? [DockerUtil::ensureImageTag($image)] : array_map(function($ar){return $ar['Tags'][0]??'';}, $DockerClient->getDockerImages());
 		foreach ($images as $img) {
 			$localVersion = null;
 			if (!empty($updateStatus[$img]) && array_key_exists('local', $updateStatus[$img])) {
@@ -559,7 +627,7 @@ class DockerUpdate{
 	public function updateUserTemplate($Container) {
 		// Don't update templates, but leave code in place for future reference
 		return;
-				
+
 		$changed = false;
 		$DockerTemplates = new DockerTemplates();
 		$validElements = ['Support', 'Overview', 'Category', 'Project', 'Icon', 'ReadMe'];
@@ -706,11 +774,11 @@ class DockerClient {
 	}
 
 	public function getDockerJSON($url, $method='GET', &$code=null, $callback=null, $unchunk=false, $headers=null) {
-		$api = '/v1.37'; // used to force an API version. See https://docs.docker.com/develop/sdk/#api-version-matrix
+		$api = ''; // latest API version. See https://docs.docker.com/develop/sdk/#api-version-matrix
 		$fp = stream_socket_client('unix:///var/run/docker.sock', $errno, $errstr);
 		if ($fp === false) {
 			echo "Couldn't create socket: [$errno] $errstr";
-			return null;
+			return [];
 		}
 		$protocol = $unchunk ? 'HTTP/1.0' : 'HTTP/1.1';
 		$out = "$method {$api}{$url} $protocol\r\nHost:127.0.0.1\r\nConnection:Close\r\n";
@@ -744,7 +812,7 @@ class DockerClient {
 
 	public function doesImageExist($image) {
 		foreach ($this->getDockerImages() as $img) {
-			if (strpos($img['Tags'][0], $image)!==false) return true;
+			if (strpos($img['Tags'][0]??'', $image)!==false) return true;
 		}
 		return false;
 	}
@@ -778,10 +846,7 @@ class DockerClient {
 
 	public function stopContainer($id, $t=false) {
 		global $dockercfg;
-
-		if ( ! $t )
-			$t = intval($dockercfg['DOCKER_TIMEOUT']) ?: 10;
-		$this->getDockerJSON("/containers/$id/stop?t=$t", 'POST', $code);
+		$this->getDockerJSON("/containers/$id/stop?t=".($t ?: _var($dockercfg,'DOCKER_TIMEOUT',10)), 'POST', $code);
 		$this->flushCache($this::$containersCache);
 		return $code;
 	}
@@ -867,7 +932,7 @@ class DockerClient {
 		}
 		[$ret['username'], $ret['password']] = array_pad(explode(':', base64_decode($dockerConfig['auths'][ $configKey ]['auth'])),2,'');
 
-		return $ret; 
+		return $ret;
 	}
 
 	public function removeImage($id) {
@@ -889,7 +954,7 @@ class DockerClient {
 	}
 
 	public function getDockerContainers() {
-		global $driver;
+		global $driver, $host;
 		// Return cached values
 		if (is_array($this::$containersCache)) return $this::$containersCache;
 		$this::$containersCache = [];
@@ -907,26 +972,60 @@ class DockerClient {
 			$c['Volumes']     = $info['HostConfig']['Binds'];
 			$c['Created']     = $this->humanTiming($ct['Created']);
 			$c['NetworkMode'] = $ct['HostConfig']['NetworkMode'];
+			$c['Manager'] 	  = $info['Config']['Labels']['net.unraid.docker.managed'] ?? false;
+			if ($c['Manager'] == 'composeman') {
+				$c['ComposeProject'] = $info['Config']['Labels']['com.docker.compose.project'];
+			}
 			[$net, $id]       = array_pad(explode(':',$c['NetworkMode']),2,'');
 			$c['CPUset']      = $info['HostConfig']['CpusetCpus'];
 			$c['BaseImage']   = $ct['Labels']['BASEIMAGE'] ?? false;
 			$c['Icon']        = $info['Config']['Labels']['net.unraid.docker.icon'] ?? false;
 			$c['Url']         = $info['Config']['Labels']['net.unraid.docker.webui'] ?? false;
+			$c['TSUrl']       = $info['Config']['Labels']['net.unraid.docker.tailscale.webui'] ?? false;
+			$c['TSHostname']  = $info['Config']['Labels']['net.unraid.docker.tailscale.hostname'] ?? false;
+			$c['Shell']       = $info['Config']['Labels']['net.unraid.docker.shell'] ?? false;
+			$c['Manager']     = $info['Config']['Labels']['net.unraid.docker.managed'] ?? false;
 			$c['Ports']       = [];
+			$c['Networks']	  = [];
 			if ($id) $c['NetworkMode'] = $net.str_replace('/',':',DockerUtil::ctMap($id)?:'/???');
-			if ($driver[$c['NetworkMode']]=='bridge') {
-				$ports = &$info['HostConfig']['PortBindings'];
-				$nat = true;
-			} else {
+			if (isset($driver[$c['NetworkMode']])) {
+				if ($driver[$c['NetworkMode']]=='bridge') {
+					$ports = &$info['HostConfig']['PortBindings'];
+				} elseif ($driver[$c['NetworkMode']]=='host') {
+					$c['Ports']['host'] = ['host' => ''];
+				} elseif ($driver[$c['NetworkMode']]=='ipvlan' || $driver[$c['NetworkMode']]=='macvlan') {
+					$i = $ct['NetworkSettings']['Networks'][$c['NetworkMode']]['IPAddress'];
+					$c['Ports']['vlan'] = ["$i" => $i];
+				} else {
+					$ports = &$info['Config']['ExposedPorts'];
+				}
+			} else if (!$id) {
+				$c['NetworkMode'] = DockerUtil::ctMap($c['NetworkMode']);
 				$ports = &$info['Config']['ExposedPorts'];
-				$nat = false;
 			}
-			$ip = $ct['NetworkSettings']['Networks'][$c['NetworkMode']]['IPAddress'];
-			$ports = is_array($ports) ? $ports : array();
+			foreach($ct['NetworkSettings']['Networks'] as $netName => $netVals) {
+				$i = $c['NetworkMode']=='host' ? $host : $netVals['IPAddress'];
+				$c['Networks'][$netName] = [ 'IPAddress' => $i ];
+				if ($driver[$netName]=='ipvlan' || $driver[$netName]=='macvlan') {
+					if (!isset($c['Ports']['vlan'])) $c['Ports']['vlan'] = [];
+					$c['Ports']['vlan']["$i"] = $i;
+				}
+			}
+			$ip = $c['NetworkMode']=='host' ? $host : $ct['NetworkSettings']['Networks'][$c['NetworkMode']]['IPAddress'] ?? null;
+			$c['Networks'][$c['NetworkMode']] = [ 'IPAddress' => $ip ];
+			$ports = (isset($ports) && is_array($ports)) ? $ports : [];
 			foreach ($ports as $port => $value) {
+				if (!isset($info['HostConfig']['PortBindings'][$port])) {
+					continue;
+				}
 				[$PrivatePort, $Type] = array_pad(explode('/', $port),2,'');
-				$c['Ports'][] = ['IP' => $ip, 'PrivatePort' => $PrivatePort, 'PublicPort' => $nat ? $value[0]['HostPort']:$PrivatePort, 'NAT' => $nat, 'Type' => $Type ];
+				$PublicPort = $info['HostConfig']['PortBindings']["$port"][0]['HostPort'] ?: null;
+				$nat = ($driver[$c['NetworkMode']]=='bridge');
+				if (array_key_exists($PrivatePort, $c['Ports']) && $Type != $c['Ports'][$PrivatePort]['Type'])
+					$Type = $c['Ports'][$PrivatePort]['Type'] . '/' . $Type;
+				$c['Ports'][$PrivatePort] = ['IP' => $ip, 'PrivatePort' => $PrivatePort, 'PublicPort' => $PublicPort, 'NAT' => $nat, 'Type' => $Type, 'Driver' => $driver[$c['NetworkMode']]];
 			}
+			ksort($c['Ports']);
 			$this::$containersCache[] = $c;
 		}
 		array_multisort(array_column($this::$containersCache,'Name'), SORT_NATURAL|SORT_FLAG_CASE, $this::$containersCache);
@@ -952,7 +1051,7 @@ class DockerClient {
 
 	public function getImageName($id) {
 		foreach ($this->getDockerImages() as $img) {
-			if ($img['Id']==$id) return $img['Tags'][0];
+			if ($img['Id']==$id) return $img['Tags'][0]??'';
 		}
 		return null;
 	}
@@ -967,9 +1066,9 @@ class DockerClient {
 			$c['Id']          = $this->extractID($ct['Id']);
 			$c['ParentId']    = $this->extractID($ct['ParentId']);
 			$c['Size']        = $this->formatBytes($ct['Size']);
-			$c['VirtualSize'] = $this->formatBytes($ct['VirtualSize']);
+			$c['VirtualSize'] = $this->formatBytes($ct['VirtualSize'] ?? null);
 			$c['Tags']        = array_map('htmlspecialchars', $ct['RepoTags'] ?? []);
-			$c['Repository']  = vsprintf('%1$s/%2$s', preg_split("#[:\/]#", DockerUtil::ensureImageTag($ct['RepoTags'][0])));
+			$c['Repository']  = DockerUtil::parseImageTag($ct['RepoTags'][0]??'')['strRepo'];
 			$c['usedBy']      = $this->usedBy($c['Id']);
 			$this::$imagesCache[$c['Id']] = $c;
 		}
@@ -982,22 +1081,54 @@ class DockerClient {
 ##################################
 
 class DockerUtil {
-	public static function ensureImageTag($image) {
-		[$strRepo, $strTag] = array_map('trim', array_pad(explode(':', $image.':'),2,''));
-		if (strpos($strRepo, 'sha256:') === 0) {
-			// sha256 was provided instead of actual repo name so truncate it for display:
-			$strRepo = substr($strRepo, 7, 12);
-		} elseif (strpos($strRepo, '/') === false) {
-			// Prefix library/ if there's no author (maybe a Docker offical image?)
-			$strRepo = "library/$strRepo";
-		}
-		// Add :latest tag to image if it's absent
-		if (empty($strTag)) $strTag = 'latest';
+	public static function ensureImageTag($image): string
+	{
+		extract(static::parseImageTag($image));
+
 		return "$strRepo:$strTag";
 	}
 
+	public static function parseImageTag($image): array
+	{
+		if (strpos($image, 'sha256:') === 0) {
+			// sha256 was provided instead of actual repo name so truncate it for display:
+			$strRepo = substr($image, 7, 12);
+		} elseif (strpos($image, '/') === false) {
+			return static::parseImageTag('library/' . $image);
+		} else {
+			$parsedImage = static::splitImage($image);
+			if (!empty($parsedImage)) {
+				$strRepo = $parsedImage['strRepo'];
+				$strTag = $parsedImage['strTag'];
+			} else {
+				// Unprocessable input
+				$strRepo = $image;
+			}
+		}
+
+		// Add :latest tag to image if it's absent
+		if (empty($strTag)) $strTag = 'latest';
+
+		return array_map('trim', ['strRepo' => $strRepo, 'strTag' => $strTag]);
+	}
+
+	private static function splitImage($image): ?array
+	{
+		if (false === preg_match('@^(.+/)*([^/:]+)(:[^:/]*)*$@', $image, $newSections) || count($newSections) < 3) {
+			return null;
+		} else {
+			[, $strRepo, $image, $strTag] = array_merge($newSections, ['']);
+			$strTag = str_replace(':','',$strTag??'');
+
+			return [
+				'strRepo' => $strRepo . $image,
+				'strTag' => $strTag,
+			];
+		}
+	}
+
 	public static function loadJSON($path) {
-		$objContent = (file_exists($path)) ? json_decode(file_get_contents($path), true) : [];
+		$objContent = (file_exists($path)) ? json_decode(@file_get_contents($path), true) : [];
 		if (empty($objContent)) $objContent = [];
 		return $objContent;
 	}

emhttp/plugins/dynamix.docker.manager/include/DockerContainers.php

@@ -0,0 +1,353 @@
+<?PHP
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<?
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Helpers.php";
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+
+// add translations
+$_SERVER['REQUEST_URI'] = 'docker';
+require_once "$docroot/webGui/include/Translations.php";
+
+$DockerClient    = new DockerClient();
+$DockerTemplates = new DockerTemplates();
+$containers      = $DockerClient->getDockerContainers();
+$images          = $DockerClient->getDockerImages();
+$user_prefs      = $dockerManPaths['user-prefs'];
+$autostart_file  = $dockerManPaths['autostart-file'];
+
+if (!$containers && !$images) {
+  echo "<tr><td colspan='7' style='text-align:center;padding-top:12px'>"._('No Docker containers installed')."</td></tr>";
+  return;
+}
+
+if (file_exists($user_prefs)) {
+  $prefs = (array)@parse_ini_file($user_prefs);
+  $sort = [];
+  foreach ($containers as $ct) $sort[] = array_search($ct['Name'],$prefs);
+  array_multisort($sort,SORT_NUMERIC,$containers);
+  unset($sort);
+}
+
+// Read container info
+$allInfo = $DockerTemplates->getAllInfo();
+$docker = [];
+$null = '0.0.0.0';
+
+$autostart = (array)@file($autostart_file,FILE_IGNORE_NEW_LINES);
+$names = array_map('var_split',$autostart);
+
+// Grab Tailscale json from container
+function tailscale_stats($name) {
+  exec("docker exec -i ".$name." /bin/sh -c \"tailscale status --json | jq '{Self: .Self, ExitNodeStatus: .ExitNodeStatus, Version: .Version}'\" 2>/dev/null", $TS_stats);
+  if (!empty($TS_stats)) {
+    $TS_stats = implode("\n", $TS_stats);
+    return json_decode($TS_stats, true);
+  }
+  return '';
+}
+
+// Download Tailscal JSON and return Array, refresh file if older than 24 hours
+function tailscale_json_dl($file, $url) {
+  $dl_status = 0;
+  if (!is_dir('/tmp/tailscale')) {
+    mkdir('/tmp/tailscale', 0777, true);
+  }
+  if (!file_exists($file)) {
+    exec("wget -T 3 -q -O " . $file . " " . $url, $output, $dl_status);
+  } else {
+    $fileage =  time() - filemtime($file);
+    if ($fileage > 86400) {
+      unlink($file);
+      exec("wget -T 3 -q -O " . $file . " " . $url, $output, $dl_status);
+    }
+  }
+  if ($dl_status === 0) {
+    return json_decode(@file_get_contents($file), true);
+  } elseif ($dl_status === 0 && is_file($file)) {
+    return json_decode(@file_get_contents($file), true);
+  } else {
+    unlink($file);
+    return '';
+  }
+}
+
+// Grab Tailscale DERP map JSON
+$TS_derp_url = 'https://login.tailscale.com/derpmap/default';
+$TS_derp_file = '/tmp/tailscale/tailscale-derpmap.json';
+$TS_derp_list = tailscale_json_dl($TS_derp_file, $TS_derp_url);
+
+// Grab Tailscale version JSON
+$TS_version_url = 'https://pkgs.tailscale.com/stable/?mode=json';
+$TS_version_file = '/tmp/tailscale/tailscale-latest-version.json';
+// Extract tarbal version string
+$TS_latest_version = tailscale_json_dl($TS_version_file, $TS_version_url);
+if (!empty($TS_latest_version)) {
+  $TS_latest_version = $TS_latest_version["TarballsVersion"];
+}
+
+function my_lang_time($text) {
+  [$number, $text] = my_explode(' ',$text,2);
+  return sprintf(_("%s $text"),$number);
+}
+function my_lang_log($text) {
+  global $language;
+  if (isset($language['healthy'])) $text = str_replace('healthy',$language['healthy'],$text);
+  if (isset($language['Exited'])) $text = str_replace('Exited',$language['Exited'],$text);
+  if (strpos($text,'ago')!==false) {
+    [$t1,$t2] = my_explode(') ',$text);
+    return $t1.'): '.my_lang_time($t2);
+  }
+  return _(_($text),2);
+}
+foreach ($containers as $ct) {
+  $name = $ct['Name'];
+  $id = $ct['Id'];
+  $info = &$allInfo[$name];
+  $running = $info['running'] ? 1 : 0;
+  $paused = $info['paused'] ? 1 : 0;
+  $is_autostart = $info['autostart'] ? 'true':'false';
+  $composestack = isset($ct['ComposeProject']) ? $ct['ComposeProject'] : '';
+  $updateStatus = substr($ct['NetworkMode'], -4) == ':???' ? 2 : ($info['updated'] == 'true' ? 0 : ($info['updated'] == 'false' ? 1 : 3));
+  $template = $info['template']??'';
+  $shell = $info['shell']??'';
+  $webGui = html_entity_decode($info['url']??'');
+  $TShostname = isset($ct['TSHostname']) ? $ct['TSHostname'] : '';
+  $TSwebGui = html_entity_decode($info['TSurl']??'');
+  $support = html_entity_decode($info['Support']??'');
+  $project = html_entity_decode($info['Project']??'');
+  $registry = html_entity_decode($info['registry']??'');
+  $donateLink = html_entity_decode($info['DonateLink']??'');
+  $readme = html_entity_decode($info['ReadMe']??'');
+  $menu = sprintf("onclick=\"addDockerContainerContext('%s','%s','%s',%s,%s,%s,%s,'%s','%s','%s','%s','%s','%s','%s', '%s','%s')\"", addslashes($name), addslashes($ct['ImageId']), addslashes($template), $running, $paused, $updateStatus, $is_autostart, addslashes($webGui), addslashes($TSwebGui), $shell, $id, addslashes($support), addslashes($project),addslashes($registry),addslashes($donateLink),addslashes($readme));
+  $docker[] = "docker.push({name:'$name',id:'$id',state:$running,pause:$paused,update:$updateStatus});";
+  $shape = $running ? ($paused ? 'pause' : 'play') : 'square';
+  $status = $running ? ($paused ? 'paused' : 'started') : 'stopped';
+  $color = $status=='started' ? 'green-text' : ($status=='paused' ? 'orange-text' : 'red-text');
+  $update = $updateStatus==1 && !empty($compose) ? 'blue-text' : '';
+  $icon = $info['icon'] ?: '/plugins/dynamix.docker.manager/images/question.png';
+  $image = substr($icon,-4)=='.png' ? "<img src='$icon?".filemtime("$docroot{$info['icon']}")."' class='img' onerror=this.src='/plugins/dynamix.docker.manager/images/question.png';>" : (substr($icon,0,5)=='icon-' ? "<i class='$icon img'></i>" : "<i class='fa fa-$icon img'></i>");
+  $wait = var_split($autostart[array_search($name,$names)]??'',1);
+  $networks = [];
+  $network_ips = [];
+  $ports_internal = [];
+  $ports_external = [];
+  if (isset($ct['Ports']['vlan'])) {
+    foreach ($ct['Ports']['vlan'] as $i)
+      $ports_external[] = sprintf('%s', $i);
+    $ports_internal[0] = sprintf('%s', 'all');
+  }
+  foreach($ct['Networks'] as $netName => $netVals) {
+    $networks[] = $netName;
+    $network_ips[] = $running ? $netVals['IPAddress'] : null;
+
+    if (isset($ct['Networks']['host'])) {
+      $ports_external[] = sprintf('%s', $netVals['IPAddress']);
+      $ports_internal[0] = sprintf('%s', 'all');
+    } else if (!isset($ct['Ports']['vlan']) || strpos($ct['NetworkMode'], 'container:') != 0) {
+      foreach ($ct['Ports'] as $port) {
+        if (_var($port,'PublicPort') && _var($port,'Driver') == 'bridge')
+          $ports_external[] = sprintf('%s:%s', $host, strtoupper(_var($port,'PublicPort')));
+        if ((!isset($ct['Networks']['host'])) || (!isset($ct['Networks']['vlan'])))
+          $ports_internal[] = sprintf('%s:%s', _var($port,'PrivatePort'), strtoupper(_var($port,'Type')));
+      }
+    }
+  }
+  $paths = [];
+  $ct['Volumes'] = is_array($ct['Volumes']) ? $ct['Volumes'] : [];
+  foreach ($ct['Volumes'] as $mount) {
+    [$host_path,$container_path,$access_mode] = my_explode(':',$mount,3);
+    $paths[] = sprintf('%s<i class="fa fa-%s" style="margin:0 6px"></i>%s', htmlspecialchars($container_path), $access_mode=='ro'?'long-arrow-left':'arrows-h', htmlspecialchars($host_path));
+  }
+  echo "<tr class='sortable'><td class='ct-name' style='width:220px;padding:8px'><i class='fa fa-arrows-v mover orange-text'></i>";
+  if ($template && empty($composestack)) {
+    $appname = "<a class='exec' onclick=\"editContainer('".addslashes(htmlspecialchars($name))."','".addslashes(htmlspecialchars($template))."')\">".htmlspecialchars($name)."</a>";
+  } else {
+    $appname = htmlspecialchars($name);
+  }
+  echo "<span class='outer'><span id='$id' $menu class='hand'>$image</span><span class='inner'><span class='appname $update'>$appname</span><br><i id='load-$id' class='fa fa-$shape $status $color'></i><span class='state'>"._($status).(!empty($composestack) ? '<br/>Compose Stack: ' . $composestack : '')."</span></span></span>";
+  echo "<div class='advanced' style='margin-top:8px'>"._('Container ID').": $id<br>";
+  if ($ct['BaseImage']) echo "<i class='fa fa-cubes' style='margin-right:5px'></i>".htmlspecialchars($ct['BaseImage'])."<br>";
+  echo _('By').": ";
+  $registry = $info['registry'];
+  ['strRepo' => $author, 'strTag' => $version] = DockerUtil::parseImageTag($ct['Image']);
+  if ($registry) {
+    echo "<a href='".htmlspecialchars($registry)."' target='_blank'>".htmlspecialchars(compress($author,24))."</a>";
+  } else {
+    echo htmlspecialchars(compress($author,24));
+  }
+  echo "</div></td><td class='updatecolumn'>";
+  switch ($updateStatus) {
+    case 0:
+      if ($ct['Manager'] == "dockerman") {
+        echo "<span class='green-text' style='white-space:nowrap;'><i class='fa fa-check fa-fw'></i> "._('up-to-date')."</span>";
+        echo "<div class='advanced'><a class='exec' onclick=\"updateContainer('".addslashes(htmlspecialchars($name))."');\"><span style='white-space:nowrap;'><i class='fa fa-cloud-download fa-fw'></i> "._('force update')."</span></a></div>";
+      } elseif (!empty($composestack)) {
+        echo "<div><span><i class='fa fa-docker fa-fw'/></i> Compose</span></div>";
+        echo "<span tyle='white-space:nowrap;'><i class='fa fa-check fa-fw'></i> "._('up-to-date')."</span>";
+      } else {
+        echo "<div><span><i class='fa fa-docker fa-fw'/></i> 3rd Party</span></div>";
+        echo "<span tyle='white-space:nowrap;'><i class='fa fa-check fa-fw'></i> "._('up-to-date')."</span>";
+      }
+      break;
+    case 1:
+      echo "<div class='advanced'><span class='orange-text' style='white-space:nowrap;'><i class='fa fa-flash fa-fw'></i> "._('update ready')."</span></div>";
+      if ($ct['Manager'] == "dockerman") {
+        echo "<a class='exec' onclick=\"updateContainer('".addslashes(htmlspecialchars($name))."');\"><span style='white-space:nowrap;'><i class='fa fa-cloud-download fa-fw'></i> "._('apply update')."</span></a>";      
+      } elseif (!empty($composestack)) {
+        echo "<div><span><i class='fa fa-docker fa-fw'/></i> Compose</span></a></div>";
+        echo "<span style='white-space:nowrap;'><i class='fa fa-cloud-download fa-fw'></i> "._('update available')."</span>";
+      } else {
+        echo "<div><span><i class='fa fa-docker fa-fw'/></i> 3rd Party</span></div>";
+        echo "<span style='white-space:nowrap;'><i class='fa fa-cloud-download fa-fw'></i> "._('update available')."</span>";
+      }
+      break;
+    case 2:
+      echo "<div class='advanced'><span class='orange-text' style='white-space:nowrap;'><i class='fa fa-flash fa-fw'></i> "._('rebuild ready')."</span></div>";
+      echo "<a class='exec'><span style='white-space:nowrap;'><i class='fa fa-recycle fa-fw'></i> "._('rebuilding')."</span></a>";
+      break;
+    default:
+      if ($ct['Manager'] == "dockerman") {
+        echo "<span class='orange-text' style='white-space:nowrap;'><i class='fa fa-unlink'></i> "._('not available')."</span>";
+        echo "<div class='advanced'><a class='exec' onclick=\"updateContainer('".addslashes(htmlspecialchars($name))."');\"><span style='white-space:nowrap;'><i class='fa fa-cloud-download fa-fw'></i> "._('force update')."</span></a></div>";
+      } elseif (!empty($composestack)) {
+        echo "<div><span><i class='fa fa-docker fa-fw'/></i> Compose</span></div>";
+        echo "<span style='white-space:nowrap;'><i class='fa fa-unlink'></i> "._('not available')."</span>";
+      } else {
+        echo "<div><span><i class='fa fa-docker fa-fw'/></i> 3rd Party</span></div>";
+        echo "<span style='white-space:nowrap;'><i class='fa fa-unlink'></i> "._('not available')."</span>";
+      }
+      break;
+    }
+  // Check if Tailscale for container is enabled by checking if TShostname is set
+  if (!empty($TShostname)) {
+    if ($running) {
+      // Get stats from container and check if they are not empty
+      $TSstats = tailscale_stats($name);
+      if (!empty($TSstats)) {
+        // Construct TSinfo from TSstats
+        $TSinfo = '';
+        if (!$TSstats["Self"]["Online"]) {
+          $TSinfo .= "Online:\t\t&#10060;\nPlease check the logs!";
+        } else {
+          $TS_version = explode('-', $TSstats["Version"])[0];
+          if (!empty($TS_version)) {
+            if (!empty($TS_latest_version)) {
+              if ($TS_version !== $TS_latest_version) {
+                $TSinfo .= "Version:\t\t" . $TS_version . " &#10132; " . $TS_latest_version . " available!\n";
+              } else {
+                $TSinfo .= "Version:\t\t" . $TS_version . "\n";
+              }
+            } else {
+              $TSinfo .= "Version:\t\t" . $TS_version . "\n";
+            }
+          }
+          $TSinfo .= "Online:\t\t&#9989;\n";
+          $TS_DNSName = $TSstats["Self"]["DNSName"];
+          $TS_HostNameActual = substr($TS_DNSName, 0, strpos($TS_DNSName, '.'));
+          if (strcasecmp($TS_HostNameActual, $TShostname) !== 0 && !empty($TS_DNSName)) {
+            $TSinfo .= "Hostname:\tReal Hostname &#10132; " . $TS_HostNameActual . "\n";
+          } else {
+            $TSinfo .= "Hostname:\t" . $TShostname . "\n";
+          }
+          // Map region relay code to cleartext region if TS_derp_list is available
+          if (!empty($TS_derp_list)) {
+            foreach ($TS_derp_list['Regions'] as $region) {
+              if ($region['RegionCode'] === $TSstats["Self"]["Relay"]) {
+                $TSregion = $region['RegionName'];
+                break;
+              }
+            }
+            if (!empty($TSregion)) {
+              $TSinfo .= "Main Relay:\t" . $TSregion . "\n";
+            } else {
+              $TSinfo .= "Main Relay:\t" . $TSstats["Self"]["Relay"] . "\n";
+            }
+          } else {
+            $TSinfo .= "Main Relay:\t" . $TSstats["Self"]["Relay"] . "\n";
+          }
+          if (!empty($TSstats["Self"]["TailscaleIPs"])) {
+            $TSinfo .= "Addresses:\t" . implode("\n\t\t\t", $TSstats["Self"]["TailscaleIPs"]) . "\n";
+          }
+          if (!empty($TSstats["Self"]["PrimaryRoutes"])) {
+            $TSinfo .= "Routes:\t\t" . implode("\n\t\t\t", $TSstats["Self"]["PrimaryRoutes"]) . "\n";
+          }
+          if ($TSstats["Self"]["ExitNodeOption"]) {
+            $TSinfo .= "Is Exit Node:\t&#9989;\n";
+          } else {
+            if (!empty($TSstats["ExitNodeStatus"])) {
+              $TS_exit_node_status = ($TSstats["ExitNodeStatus"]["Online"]) ? "&#9989;" : "&#10060;";
+              $TSinfo .= "Exit Node:\t" . strstr($TSstats["ExitNodeStatus"]["TailscaleIPs"][0], '/', true) . " | Status: " . $TS_exit_node_status ."\n";
+            } else {
+              $TSinfo .= "Is Exit Node:\t&#10060;\n";
+            }
+          }
+          if (!empty($TSwebGui)) {
+            $TSinfo .= "URL:\t\t" . $TSwebGui . "\n";
+          }
+          if (!empty($TSstats["Self"]["KeyExpiry"])) {
+            $TS_expiry = new DateTime($TSstats["Self"]["KeyExpiry"]);
+            $current_Date = new DateTime();
+            $TS_expiry_formatted = $TS_expiry->format('Y-m-d');
+            $TS_expiry_diff = $current_Date->diff($TS_expiry);
+            if ($TS_expiry_diff->invert) {
+              $TSinfo .= "Key Expiry:\t&#10060; Expired! Renew/Disable key expiry!\n";
+            } else {
+              $TSinfo .= "Key Expiry:\t" . $TS_expiry_formatted . " (" . $TS_expiry_diff->days . " days)\n";
+            }
+          }
+        }
+      // Display message to refresh page if Tailscale in the container wasn't maybe ready to get the data
+      } else {
+        echo "<div title='Error gathering Tailscale information from container.\nPlease check the logs and refresh the page.'><img src='/plugins/dynamix.docker.manager/images/tailscale.png' style='height: 16px;'> Tailscale</div></td>";
+      }
+      // Display TSinfo if data was fetched correctly
+      echo "<div title='" . $TSinfo . "'><img src='/plugins/dynamix.docker.manager/images/tailscale.png' style='height: 16px;'> Tailscale</div>";
+    // Display message that container isn't running
+    } else {
+      echo "<div title='Container not runnig'><img src='/plugins/dynamix.docker.manager/images/tailscale.png' style='height: 16px;'> Tailscale</div></td>";
+    }
+  }
+  echo "<div class='advanced'><i class='fa fa-info-circle fa-fw'></i> ".compress(_($version),12,0)."</div></td>";
+  echo "<td style='white-space:nowrap'><span class='docker_readmore'> ".implode('<br>',$networks)."</span></td>";
+  echo "<td style='white-space:nowrap'><span class='docker_readmore'> ".implode('<br>',$network_ips)."</span></td>";
+  echo "<td style='white-space:nowrap'><span class='docker_readmore'>".implode('<br>',$ports_internal)."</span></td>";
+  echo "<td style='white-space:nowrap'><span class='docker_readmore'>".implode('<br>',$ports_external)."</span></td>";
+  echo "<td style='word-break:break-all'><span class='docker_readmore'>".implode('<br>',$paths)."</span></td>";
+  echo "<td class='advanced'><span class='cpu-$id'>0%</span><div class='usage-disk mm'><span id='cpu-$id' style='width:0'></span><span></span></div>";
+  echo "<br><span class='mem-$id'>0 / 0</span></td>";
+  if (empty($composestack)) {
+    if ($ct['Manager'] == "dockerman") {
+      echo "<td><input type='checkbox' id='$id-auto' class='autostart' container='".htmlspecialchars($name)."'".($info['autostart'] ? ' checked':'').">";
+    } else {
+      echo "<td><i class='fa fa-docker fa-fw'/></i> 3rd Party";
+    }
+  } else {
+    echo "<td><i class='fa fa-docker'/></i> Compose";
+  }
+  echo "<span id='$id-wait' style='float:right;display:none'>"._('wait')."<input class='wait' container='".htmlspecialchars($name)."' type='number' value='$wait' placeholder='0' title=\""._('seconds')."\"></span></td>";
+  echo "<td><div style='white-space:nowrap'>".htmlspecialchars(str_replace('Up',_('Uptime').':',my_lang_log($ct['Status'])))."<div style='margin-top:4px'>"._('Created').": ".htmlspecialchars(my_lang_time($ct['Created']))."</div></div></td></tr>";
+}
+foreach ($images as $image) {
+  if (count($image['usedBy'])) continue;
+  $id = $image['Id'];
+  $menu = sprintf("onclick=\"addDockerImageContext('%s','%s')\"", $id, implode(',',$image['Tags']));
+  echo "<tr class='advanced'><td style='width:220px;padding:8px'>";
+  echo "<span class='outer apps'><span id='$id' $menu class='hand'><img src='/webGui/images/disk.png' class='img'></span><span class='inner'>("._('orphan image').")<br><i class='fa fa-square stopped grey-text'></i><span class='state'>"._('stopped')."</span></span></span>";
+  echo "</td><td colspan='6'>"._('Image ID').": $id<br>";
+  echo implode(', ',$image['Tags']);
+  echo "</td><td>"._('Created')." ".htmlspecialchars(_($image['Created'],0))."</td></tr>";
+}
+echo "\0".implode($docker)."\0".(pgrep('rc.docker')!==false ? 1:0);
+?>

emhttp/plugins/dynamix.docker.manager/include/DockerUpdate.php

@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2014-2022, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,10 +12,11 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+require_once "$docroot/webGui/include/Wrappers.php";
 
-$ncsi = exec("wget --spider --no-check-certificate -nv -T10 -t1 https://www.msftncsi.com/ncsi.txt 2>&1|grep -o 'OK'")=='OK';
+$ncsi = check_network_connectivity();
 $DockerTemplates = new DockerTemplates();
 if ($ncsi) $DockerTemplates->downloadTemplates();
 $DockerTemplates->getAllInfo($ncsi,$ncsi);

emhttp/plugins/dynamix.docker.manager/include/Events.php

@@ -0,0 +1,72 @@
+<?PHP
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<?
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Secure.php";
+require_once "$docroot/webGui/include/Wrappers.php";
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+
+// add translations
+$_SERVER['REQUEST_URI'] = 'docker';
+require_once "$docroot/webGui/include/Translations.php";
+
+$DockerClient = new DockerClient();
+$action       = unscript(_var($_REQUEST,'action'));
+$container    = unbundle(_var($_REQUEST,'container'));
+$name         = unscript(_var($_REQUEST,'name'));
+$image        = unscript(_var($_REQUEST,'image'));
+$arrResponse  = ['error' => _('Missing parameters')];
+
+switch ($action) {
+case 'start':
+	if ($container) $arrResponse = ['success' => $DockerClient->startContainer($container)];
+	break;
+case 'pause':
+	if ($container) $arrResponse = ['success' => $DockerClient->pauseContainer($container)];
+	break;
+case 'stop':
+	if ($container) $arrResponse = ['success' => $DockerClient->stopContainer($container)];
+	break;
+case 'resume':
+	if ($container) $arrResponse = ['success' => $DockerClient->resumeContainer($container)];
+	break;
+case 'restart':
+	if ($container) $arrResponse = ['success' => $DockerClient->restartContainer($container)];
+	break;
+case 'remove_container':
+	if ($container) $arrResponse = ['success' => $DockerClient->removeContainer($name, $container, 1)];
+	break;
+case 'remove_image':
+	if ($image) $arrResponse = ['success' => $DockerClient->removeImage($image)];
+	break;
+case 'remove_all':
+	if ($container && $image) {
+		// first: try to remove container
+		$ret = $DockerClient->removeContainer($name, $container, 2);
+		if ($ret === true) {
+			// next: try to remove image
+			$arrResponse = ['success' => $DockerClient->removeImage($image)];
+		} else {
+			// error: container failed to remove
+			$arrResponse = ['success' => $ret];
+		}
+	}
+	break;
+default:
+	$arrResponse = ['error' => _('Unknown action')." '$action'"];
+	break;
+}
+
+header('Content-Type: application/json');
+die(json_encode($arrResponse));

emhttp/plugins/dynamix.docker.manager/include/Helpers.php

@@ -0,0 +1,699 @@
+<?PHP
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<?
+function addRoute($ct) {
+  // add static route(s) for remote WireGuard access
+  [$pid,$net] = array_pad(explode(' ',exec("docker inspect --format='{{.State.Pid}} {{.NetworkSettings.Networks}}' $ct")),2,'');
+  $net = substr($net,4,strpos($net,':')-4);
+  if (!$pid || $net != 'br0') return;
+  $thisip  = ipaddr();
+  foreach (glob('/etc/wireguard/wg*.cfg') as $cfg) {
+    $network = exec("grep -Pom1 '^Network:0=\"\\K[^\"]+' $cfg");
+    if ($network) exec("nsenter -n -t $pid ip -4 route add $network via $thisip 2>/dev/null");
+  }
+}
+
+function xml_encode($string) {
+  return htmlspecialchars($string, ENT_XML1, 'UTF-8');
+}
+
+function xml_decode($string) {
+  return strval(html_entity_decode($string, ENT_XML1, 'UTF-8'));
+}
+
+function generateTSwebui($url, $serve, $webUI) {
+  if (!isset($webUI)) {
+    return '';
+  }
+  $webui_url = isset($webUI) ? parse_url($webUI) : '';
+  $webui_port = (preg_match('/\[PORT:(\d+)\]/', $webUI, $matches)) ? ':' . $matches[1] : '';
+  $webui_path = $webui_url['path'] ?? '';
+  $webui_query = isset($webui_url['query']) ? '?' . $webui_url['query'] : '';
+  if (!empty($url)) {
+    if (strpos($url, '[hostname]') !== false || strpos($url, '[noserve]') !== false) {
+      if ($serve === 'serve' || $serve === 'funnel') {
+        return 'https://[hostname][magicdns]' . $webui_path . $webui_query;
+      } elseif ($serve === 'no') {
+        return 'http://[noserve]' . $webui_port . $webui_path . $webui_query;
+      }
+    }
+    return $url;
+  } else {
+    if (!empty($webUI)) {
+      if ($serve === 'serve' || $serve === 'funnel') {
+        return 'https://[hostname][magicdns]' . $webui_path . $webui_query;
+      } elseif ($serve === 'no') {
+        return 'http://[noserve]' . $webui_port . $webui_path . $webui_query;
+    }
+  }
+  return '';
+  }
+}
+
+function postToXML($post, $setOwnership=false) {
+  $dom = new domDocument;
+  $dom->appendChild($dom->createElement("Container"));
+  $xml = simplexml_import_dom($dom);
+  $xml['version']                  = 2;
+  $xml->Name                       = xml_encode(preg_replace('/\s+/', '', $post['contName']));
+  $xml->Repository                 = xml_encode(trim($post['contRepository']));
+  $xml->Registry                   = xml_encode(trim($post['contRegistry']));
+  if (isset($post['netCONT']) && !empty(trim($post['netCONT']))) {
+    $xml->Network                  = xml_encode($post['contNetwork'].':'.$post['netCONT']);
+  } else {
+    $xml->Network                  = xml_encode($post['contNetwork']);
+  }
+  $xml->MyIP                       = xml_encode($post['contMyIP']);
+  $xml->Shell                      = xml_encode($post['contShell']);
+  $xml->Privileged                 = strtolower($post['contPrivileged']??'')=='on' ? 'true' : 'false';
+  $xml->Support                    = xml_encode($post['contSupport']);
+  $xml->Project                    = xml_encode($post['contProject']);
+  $xml->Overview                   = xml_encode($post['contOverview']);
+  $xml->Category                   = xml_encode($post['contCategory']);
+  $xml->WebUI                      = xml_encode(trim($post['contWebUI']));
+  $xml->TemplateURL                = xml_encode($post['contTemplateURL']);
+  $xml->Icon                       = xml_encode(trim($post['contIcon']));
+  $xml->ExtraParams                = xml_encode($post['contExtraParams']);
+  $xml->PostArgs                   = xml_encode($post['contPostArgs']);
+  $xml->CPUset                     = xml_encode($post['contCPUset']);
+  $xml->DateInstalled              = xml_encode(time());
+  $xml->DonateText                 = xml_encode($post['contDonateText']);
+  $xml->DonateLink                 = xml_encode($post['contDonateLink']);
+  $xml->Requires                   = xml_encode($post['contRequires']);
+  $size = is_array($post['confName']??null) ? count($post['confName']) : 0;
+  for ($i = 0; $i < $size; $i++) {
+    $Type                  = $post['confType'][$i];
+    $config                = $xml->addChild('Config', xml_encode($post['confValue'][$i]));
+    $config['Name']        = xml_encode($post['confName'][$i]);
+    $config['Target']      = xml_encode($post['confTarget'][$i]);
+    $config['Default']     = xml_encode($post['confDefault'][$i]);
+    $config['Mode']        = xml_encode($post['confMode'][$i]);
+    $config['Description'] = xml_encode($post['confDescription'][$i]);
+    $config['Type']        = xml_encode($post['confType'][$i]);
+    $config['Display']     = xml_encode($post['confDisplay'][$i]);
+    $config['Required']    = xml_encode($post['confRequired'][$i]);
+    $config['Mask']        = xml_encode($post['confMask'][$i]);
+  }
+  if (isset($post['contTailscale']) && strtolower($post['contTailscale']) == 'on') {
+    $xml->TailscaleEnabled             = 'true';
+    $xml->TailscaleIsExitNode          = xml_encode($post['TSisexitnode']);
+    $xml->TailscaleHostname            = xml_encode($post['TShostname']);
+    $xml->TailscaleExitNodeIP          = xml_encode($post['TSexitnodeip']);
+    $xml->TailscaleSSH                 = xml_encode($post['TSssh']);
+    $xml->TailscaleUserspaceNetworking = xml_encode($post['TSuserspacenetworking']);
+    $xml->TailscaleLANAccess           = xml_encode($post['TSallowlanaccess']);
+    $xml->TailscaleServe               = xml_encode($post['TSserve']);
+    $xml->TailscaleWebUI               = xml_encode(generateTSwebui($post['TSwebui'], $post['TSserve'], $post['contWebUI']));
+    if (isset($post['TSserve']) && strtolower($post['TSserve']) !== 'no') {
+      $xml->TailscaleServePort           = xml_encode($post['TSserveport']);
+      $xml->TailscaleServeLocalPath      = xml_encode($post['TSservelocalpath']);
+      $xml->TailscaleServeProtocol       = xml_encode($post['TSserveprotocol']);
+      $xml->TailscaleServeProtocolPort   = xml_encode($post['TSserveprotocolport']);
+      $xml->TailscaleServePath           = xml_encode($post['TSservepath']);
+    }
+    $xml->TailscaleDParams             = xml_encode($post['TSdaemonparams']);
+    $xml->TailscaleParams              = xml_encode($post['TSextraparams']);
+    $xml->TailscaleStateDir            = xml_encode($post['TSstatedir']);
+    $xml->TailscaleRoutes              = xml_encode($post['TSroutes']);;
+    if (isset($post['TStroubleshooting']) && strtolower($post['TStroubleshooting']) === 'on') {
+      $xml->TailscaleTroubleshooting     = 'true';
+    }
+  }
+  $dom = new DOMDocument('1.0');
+  $dom->preserveWhiteSpace = false;
+  $dom->formatOutput = true;
+  $dom->loadXML($xml->asXML());
+  return $dom->saveXML();
+}
+
+function xmlToVar($xml) {
+  global $subnet;
+  $xml                                 = is_file($xml) ? simplexml_load_file($xml) : simplexml_load_string($xml);
+  $out                                 = [];
+  $out['Name']                         = preg_replace('/\s+/', '', xml_decode($xml->Name));
+  $out['Repository']                   = xml_decode($xml->Repository);
+  $out['Registry']                     = xml_decode($xml->Registry);
+  $out['Network']                      = xml_decode($xml->Network);
+  $out['MyIP']                         = xml_decode($xml->MyIP ?? '');
+  $out['Shell']                        = xml_decode($xml->Shell ?? 'sh');
+  $out['Privileged']                   = xml_decode($xml->Privileged);
+  $out['Support']                      = xml_decode($xml->Support);
+  $out['Project']                      = xml_decode($xml->Project);
+  $out['Overview']                     = stripslashes(xml_decode($xml->Overview));
+  $out['Category']                     = xml_decode($xml->Category);
+  $out['WebUI']                        = xml_decode($xml->WebUI);
+  $out['TemplateURL']                  = xml_decode($xml->TemplateURL);
+  $out['Icon']                         = xml_decode($xml->Icon);
+  $out['ExtraParams']                  = xml_decode($xml->ExtraParams);
+  $out['PostArgs']                     = xml_decode($xml->PostArgs);
+  $out['CPUset']                       = xml_decode($xml->CPUset);
+  $out['DonateText']                   = xml_decode($xml->DonateText);
+  $out['DonateLink']                   = xml_decode($xml->DonateLink);
+  $out['Requires']                     = xml_decode($xml->Requires);
+  $out['TailscaleEnabled']             = xml_decode($xml->TailscaleEnabled ?? '');
+  $out['TailscaleIsExitNode']          = xml_decode($xml->TailscaleIsExitNode ?? '');
+  $out['TailscaleHostname']            = xml_decode($xml->TailscaleHostname ?? '');
+  $out['TailscaleExitNodeIP']          = xml_decode($xml->TailscaleExitNodeIP ?? '');
+  $out['TailscaleSSH']                 = xml_decode($xml->TailscaleSSH ?? '');
+  $out['TailscaleLANAccess']           = xml_decode($xml->TailscaleLANAccess ?? '');
+  $out['TailscaleUserspaceNetworking'] = xml_decode($xml->TailscaleUserspaceNetworking ?? '');
+  $out['TailscaleServe']               = xml_decode($xml->TailscaleServe ?? '');
+  $out['TailscaleServePort']           = xml_decode($xml->TailscaleServePort ?? '');
+  $out['TailscaleServeLocalPath']      = xml_decode($xml->TailscaleServeLocalPath ?? '');
+  $out['TailscaleServeProtocol']       = xml_decode($xml->TailscaleServeProtocol ?? '');
+  $out['TailscaleServeProtocolPort']   = xml_decode($xml->TailscaleServeProtocolPort ?? '');
+  $out['TailscaleServePath']           = xml_decode($xml->TailscaleServePath ?? '');
+  $out['TailscaleWebUI']               = xml_decode($xml->TailscaleWebUI ?? '');
+  $out['TailscaleRoutes']              = xml_decode($xml->TailscaleRoutes ?? '');
+  $out['TailscaleDParams']             = xml_decode($xml->TailscaleDParams ?? '');
+  $out['TailscaleParams']              = xml_decode($xml->TailscaleParams ?? '');
+  $out['TailscaleStateDir']            = xml_decode($xml->TailscaleStateDir ?? '');
+  $out['TailscaleTroubleshooting']     = xml_decode($xml->TailscaleTroubleshooting ?? '');
+  $out['Config']                       = [];
+  if (isset($xml->Config)) {
+    foreach ($xml->Config as $config) {
+      $c = [];
+      $c['Value'] = strlen(xml_decode($config)) ? xml_decode($config) : xml_decode($config['Default']);
+      foreach ($config->attributes() as $key => $value) {
+        $value = xml_decode($value);
+        if ($key == 'Mode') {
+          switch (xml_decode($config['Type'])) {
+          case 'Path':
+            $value = in_array(strtolower($value),['rw','rw,slave','rw,shared','ro','ro,slave','ro,shared']) ? $value : "rw";
+            break;
+          case 'Port':
+            $value = in_array(strtolower($value),['tcp','udp']) ? $value : "tcp";
+            break;
+          }
+        }
+        $c[$key] = strip_tags(html_entity_decode($value));
+      }
+      $out['Config'][] = $c;
+    }
+  }
+  // some xml templates advertise as V2 but omit the new <Network> element
+  // check for and use the V1 <Networking> element when this occurs
+  if (empty($out['Network']) && isset($xml->Networking->Mode)) {
+    $out['Network'] = xml_decode($xml->Networking->Mode);
+  }
+  // check if network exists
+  if (preg_match('/^container:(.*)/', $out['Network'])) {
+    $out['Network'] = $out['Network'];
+  } elseif (!key_exists($out['Network'],$subnet)) {
+    $out['Network'] = 'none';
+  }
+  // V1 compatibility
+  if ($xml['version'] != '2') {
+    if (isset($xml->Description)) {
+      $out['Overview'] = stripslashes(xml_decode($xml->Description));
+    }
+    if (isset($xml->Networking->Publish->Port)) {
+      $portNum = 0;
+      foreach ($xml->Networking->Publish->Port as $port) {
+        if (empty(xml_decode($port->ContainerPort))) continue;
+        $portNum += 1;
+        $out['Config'][] = [
+          'Name'        => "Host Port {$portNum}",
+          'Target'      => xml_decode($port->ContainerPort),
+          'Default'     => xml_decode($port->HostPort),
+          'Value'       => xml_decode($port->HostPort),
+          'Mode'        => xml_decode($port->Protocol) ? xml_decode($port->Protocol) : "tcp",
+          'Description' => '',
+          'Type'        => 'Port',
+          'Display'     => 'always',
+          'Required'    => 'true',
+          'Mask'        => 'false'
+        ];
+      }
+    }
+    if (isset($xml->Data->Volume)) {
+      $volNum = 0;
+      foreach ($xml->Data->Volume as $vol) {
+        if (empty(xml_decode($vol->ContainerDir))) continue;
+        $volNum += 1;
+        $out['Config'][] = [
+          'Name'        => "Host Path {$volNum}",
+          'Target'      => xml_decode($vol->ContainerDir),
+          'Default'     => xml_decode($vol->HostDir),
+          'Value'       => xml_decode($vol->HostDir),
+          'Mode'        => xml_decode($vol->Mode) ? xml_decode($vol->Mode) : "rw",
+          'Description' => '',
+          'Type'        => 'Path',
+          'Display'     => 'always',
+          'Required'    => 'true',
+          'Mask'        => 'false'
+        ];
+      }
+    }
+    if (isset($xml->Environment->Variable)) {
+      $varNum = 0;
+      foreach ($xml->Environment->Variable as $varitem) {
+        if (empty(xml_decode($varitem->Name))) continue;
+        $varNum += 1;
+        $out['Config'][] = [
+          'Name'        => "Key {$varNum}",
+          'Target'      => xml_decode($varitem->Name),
+          'Default'     => xml_decode($varitem->Value),
+          'Value'       => xml_decode($varitem->Value),
+          'Mode'        => '',
+          'Description' => '',
+          'Type'        => 'Variable',
+          'Display'     => 'always',
+          'Required'    => 'false',
+          'Mask'        => 'false'
+        ];
+      }
+    }
+    if (isset($xml->Labels->Variable)) {
+      $varNum = 0;
+      foreach ($xml->Labels->Variable as $varitem) {
+        if (empty(xml_decode($varitem->Name))) continue;
+        $varNum += 1;
+        $out['Config'][] = [
+          'Name'        => "Label {$varNum}",
+          'Target'      => xml_decode($varitem->Name),
+          'Default'     => xml_decode($varitem->Value),
+          'Value'       => xml_decode($varitem->Value),
+          'Mode'        => '',
+          'Description' => '',
+          'Type'        => 'Label',
+          'Display'     => 'always',
+          'Required'    => 'false',
+          'Mask'        => 'false'
+        ];
+      }
+    }
+  }
+  xmlSecurity($out);
+  return $out;
+}
+
+function xmlSecurity(&$template) {
+  foreach ($template as &$element) {
+    if (is_array($element)) {
+      xmlSecurity($element);
+    } else {
+      if (is_string($element)) {
+        $tempElement = htmlspecialchars_decode($element);
+        $tempElement = str_replace("[","<",$tempElement);
+        $tempElement = str_replace("]",">",$tempElement);
+        if (preg_match('#<script(.*?)>(.*?)</script>#is',$tempElement) || preg_match('#<iframe(.*?)>(.*?)</iframe>#is',$tempElement) || (stripos($tempElement,"<link") !== false) ) {
+          $element = "REMOVED";
+        }
+      }
+    }
+  }
+}
+
+function xmlToCommand($xml, $create_paths=false) {
+  global $docroot, $var, $driver;
+  $xml           = xmlToVar($xml);
+  $cmdName       = strlen($xml['Name']) ? '--name='.escapeshellarg($xml['Name']) : '';
+  $cmdPrivileged = strtolower($xml['Privileged'])=='true' ? '--privileged=true' : '';
+  if (preg_match('/^container:(.*)/', $xml['Network'])) {
+    $cmdNetwork  = preg_match('/\-\-net(work)?=/',$xml['ExtraParams']) ? "" : '--net='.escapeshellarg($xml['Network']);
+  } else {
+    $cmdNetwork  = preg_match('/\-\-net(work)?=/',$xml['ExtraParams']) ? "" : '--net='.escapeshellarg(strtolower($xml['Network']));
+  }
+  $cmdMyIP       = '';
+  foreach (explode(' ',str_replace(',',' ',$xml['MyIP'])) as $myIP) if ($myIP) $cmdMyIP .= (strpos($myIP,':')?'--ip6=':'--ip=').escapeshellarg($myIP).' ';
+  $cmdCPUset     = strlen($xml['CPUset']) ? '--cpuset-cpus='.escapeshellarg($xml['CPUset']) : '';
+  $Volumes       = [''];
+  $Ports         = [''];
+  $Variables     = [''];
+  $Labels        = [''];
+  $Devices       = [''];
+  // Bind Time
+  $Variables[]   = 'TZ="'.$var['timeZone'].'"';
+  // Add HOST_OS variable
+  $Variables[]   = 'HOST_OS="Unraid"';
+  // Add HOST_HOSTNAME variable
+  $Variables[]   = 'HOST_HOSTNAME="'.$var['NAME'].'"';
+  // Add HOST_CONTAINERNAME variable
+  $Variables[]   = 'HOST_CONTAINERNAME="'.$xml['Name'].'"';
+  // Docker labels for WebUI and Icon
+  $Labels[]      = 'net.unraid.docker.managed=dockerman';
+  if (strlen($xml['WebUI']))  $Labels[] = 'net.unraid.docker.webui='.escapeshellarg($xml['WebUI']);
+  if (strlen($xml['Icon'])) $Labels[] = 'net.unraid.docker.icon='.escapeshellarg($xml['Icon']);
+
+  // Initialize Tailscale variables
+  $TS_entrypoint = '';
+  $TS_hook = '';
+  $TS_hostname = '';
+  $TS_hostname_label = '';
+  $TS_ssh = '';
+  $TS_tundev = '';
+  $TS_cap = '';
+  $TS_exitnode = '';
+  $TS_exitnode_ip = '';
+  $TS_lan_access = '';
+  $TS_userspace_networking = '';
+  $TS_daemon_params = '';
+  $TS_extra_params = '';
+  $TS_state_dir = '';
+  $TS_serve_funnel = '';
+  $TS_serve_port = '';
+  $TS_serve_local_path = '';
+  $TS_serve_protocol = '';
+  $TS_serve_protocol_port = '';
+  $TS_serve_path = '';
+  $TS_web_ui = '';
+  $TS_troubleshooting = '';
+  $TS_routes = '';
+  $TS_postargs = '';
+  // Get all information from xml and create variables for cmd
+  if ($xml['TailscaleEnabled'] == 'true') {
+    $TS_entrypoint = '--entrypoint=\'/opt/unraid/tailscale\'';
+    $TS_hook = '-v \'/usr/local/share/docker/tailscale_container_hook\':\'/opt/unraid/tailscale\'';
+    $TS_hostname = !empty($xml['TailscaleHostname']) ? '-e TAILSCALE_HOSTNAME=' . escapeshellarg($xml['TailscaleHostname']) : '';
+    $TS_hostname_label = !empty($xml['TailscaleHostname']) ? '-l net.unraid.docker.tailscale.hostname=' . escapeshellarg($xml['TailscaleHostname']) : '';
+    $TS_ssh = !empty($xml['TailscaleSSH']) ? '-e TAILSCALE_USE_SSH=' . escapeshellarg($xml['TailscaleSSH']) : '';
+    $TS_daemon_params = !empty($xml['TailscaleDParams']) ? '-e TAILSCALED_PARAMS=' . escapeshellarg($xml['TailscaleDParams']) : '';
+    $TS_extra_params = !empty($xml['TailscaleParams']) ? '-e TAILSCALE_PARAMS=' . escapeshellarg($xml['TailscaleParams']) : '';
+    $TS_state_dir = !empty($xml['TailscaleStateDir']) ? '-e TAILSCALE_STATE_DIR=' . escapeshellarg($xml['TailscaleStateDir']) : '';
+    $TS_userspace_networking = !empty($xml['TailscaleUserspaceNetworking']) ? '-e TAILSCALE_USERSPACE_NETWORKING=' . escapeshellarg($xml['TailscaleUserspaceNetworking']) : '';
+    // Only add tun, cap and specific vairables to containers which are defined as Exit Nodes and Userspace Networking disabled
+    if (_var($xml,'TailscaleIsExitNode') == 'true') {
+      $TS_tundev = preg_match('/--d(evice)?[= ](\'?\/dev\/net\/tun\'?)/', $xml['ExtraParams']) ? "" : "--device='/dev/net/tun'";
+      $TS_cap = preg_match('/--cap\-add=NET_ADMIN/', $xml['ExtraParams']) ? "" : "--cap-add=NET_ADMIN";
+      $TS_exitnode = '-e TAILSCALE_EXIT_NODE=true';
+    } elseif (_var($xml,'TailscaleUserspaceNetworking') == 'false') {
+      $TS_tundev = preg_match('/--d(evice)?[= ](\'?\/dev\/net\/tun\'?)/', $xml['ExtraParams']) ? "" : "--device='/dev/net/tun'";
+      $TS_cap = preg_match('/--cap\-add=NET_ADMIN/', $xml['ExtraParams']) ? "" : "--cap-add=NET_ADMIN";
+      $TS_lan_access = '-e TAILSCALE_ALLOW_LAN_ACCESS=' . escapeshellarg($xml['TailscaleLANAccess']);
+      $TS_exitnode_ip = !empty($xml['TailscaleExitNodeIP']) ? '-e TAILSCALE_EXIT_NODE_IP=' . escapeshellarg($xml['TailscaleExitNodeIP']) : '';
+    }
+    $TS_serve_funnel = ($xml['TailscaleServe'] == 'funnel') ? '-e TAILSCALE_FUNNEL=true' : '';
+    $TS_serve_port = !empty($xml['TailscaleServePort']) ? '-e TAILSCALE_SERVE_PORT=' . escapeshellarg($xml['TailscaleServePort']) : '';
+    $TS_serve_local_path = !empty($xml['TailscaleServeLocalPath']) ? '-e TAILSCALE_SERVE_LOCALPATH=' . escapeshellarg($xml['TailscaleServeLocalPath']) : '';
+    $TS_serve_protocol = !empty($xml['TailscaleServeProtocol']) ? '-e TAILSCALE_SERVE_PROTOCOL=' . escapeshellarg($xml['TailscaleServeProtocol']) : '';
+    $TS_serve_protocol_port = !empty($xml['TailscaleServeProtocolPort']) ? '-e TAILSCALE_SERVE_PROTOCOL_PORT=' . escapeshellarg($xml['TailscaleServeProtocolPort']) : '';
+    $TS_serve_path = !empty($xml['TailscaleServePath']) ? '-e TAILSCALE_SERVE_PATH=' . escapeshellarg($xml['TailscaleServePath']) : '';
+    $TS_web_ui = !empty($xml['TailscaleWebUI']) ? '-l net.unraid.docker.tailscale.webui=' . escapeshellarg($xml['TailscaleWebUI']) : '';
+    $TS_troubleshooting = !empty($xml['TailscaleTroubleshooting']) ? '-e TAILSCALE_TROUBLESHOOTING=' . escapeshellarg($xml['TailscaleTroubleshooting']) : '';
+    $TS_routes = !empty($xml['TailscaleRoutes']) ? '-e TAILSCALE_ADVERTISE_ROUTES=' . escapeshellarg($xml['TailscaleRoutes']) : '';
+    if (!empty($xml['PostArgs'])) {
+      $TS_postargs = '-e ORG_POSTARGS=' . escapeshellarg($xml['PostArgs']);
+      $xml['PostArgs'] = '';
+    }
+  }
+
+  foreach ($xml['Config'] as $key => $config) {
+    $confType        = strtolower(strval($config['Type']));
+    $hostConfig      = strlen($config['Value']) ? $config['Value'] : $config['Default'];
+    $containerConfig = strval($config['Target']);
+    $Mode            = strval($config['Mode']);
+    if ($confType != "device" && !strlen($containerConfig)) continue;
+    if ($confType == "path") {
+      if ( ! trim($hostConfig) || ! trim($containerConfig) )
+        continue;
+      $Volumes[] = escapeshellarg($hostConfig).':'.escapeshellarg($containerConfig).':'.escapeshellarg($Mode);
+      if (!file_exists($hostConfig) && $create_paths) {
+        @mkdir($hostConfig, 0777, true);
+        @chown($hostConfig, 99);
+        @chgrp($hostConfig, 100);
+      }
+    } elseif ($confType == 'port') {
+      switch ($driver[$xml['Network']]) {
+      case 'host':
+      case 'macvlan':
+      case 'ipvlan':
+        // Export ports as variable if network is set to host or macvlan or ipvlan
+        $Variables[] = strtoupper(escapeshellarg($Mode.'_PORT_'.$containerConfig).'='.escapeshellarg($hostConfig));
+        break;
+      case 'bridge':
+        // Export ports as port if network is set to (custom) bridge
+        $Ports[] = escapeshellarg($hostConfig.':'.$containerConfig.'/'.$Mode);
+        break;
+      case 'none':
+        // No export of ports if network is set to none
+      }
+    } elseif ($confType == "label") {
+      $Labels[] = escapeshellarg($containerConfig).'='.escapeshellarg($hostConfig);
+    } elseif ($confType == "variable") {
+      $Variables[] = escapeshellarg($containerConfig).'='.escapeshellarg($hostConfig);
+    } elseif ($confType == "device") {
+      $Devices[] = escapeshellarg($hostConfig);
+    }
+  }
+
+  /* Read the docker configuration file. */
+  $cfgfile		= "/boot/config/docker.cfg";
+  $config_ini	= @parse_ini_file($cfgfile, true, INI_SCANNER_RAW);
+  $docker_cfg	= ($config_ini !== false) ? $config_ini : [];
+
+  // Add pid limit if user has not specified it as an extra parameter
+  $pidsLimit = preg_match('/--pids-limit (\d+)/', $xml['ExtraParams'], $matches) ? $matches[1] : null;
+  if ($pidsLimit === null) {
+    $pid_limit = "--pids-limit ";
+    if (($docker_cfg['DOCKER_PID_LIMIT']??'') != "") {
+      $pid_limit .= $docker_cfg['DOCKER_PID_LIMIT'];
+    } else {
+      $pid_limit .= "2048";
+    }
+  } else {
+    $pid_limit = "";
+  }
+
+  $cmd = sprintf($docroot.'/plugins/dynamix.docker.manager/scripts/docker create %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s %s',
+         $cmdName, $TS_entrypoint, $cmdNetwork, $cmdMyIP, $cmdCPUset, $pid_limit, $cmdPrivileged, implode(' -e ', $Variables), $TS_hostname, $TS_exitnode, $TS_exitnode_ip, $TS_lan_access, $TS_routes, $TS_ssh, $TS_userspace_networking, $TS_serve_funnel, $TS_serve_port, $TS_serve_local_path, $TS_serve_protocol, $TS_serve_protocol_port, $TS_serve_path, $TS_daemon_params, $TS_extra_params, $TS_state_dir, $TS_troubleshooting, $TS_postargs, implode(' -l ', $Labels), $TS_web_ui, $TS_hostname_label, implode(' -p ', $Ports), implode(' -v ', $Volumes), $TS_hook, $TS_cap, $TS_tundev, implode(' --device=', $Devices), $xml['ExtraParams'], escapeshellarg($xml['Repository']), $xml['PostArgs']);
+  return [preg_replace('/\s\s+/', ' ', $cmd), $xml['Name'], $xml['Repository']];
+}
+function stopContainer($name, $t=false, $echo=true) {
+  global $DockerClient;
+  $waitID = mt_rand();
+  if ($echo) {
+    echo "<p class=\"logLine\" id=\"logBody\"></p>";
+    echo "<script>addLog('<fieldset style=\"margin-top:1px;\" class=\"CMD\"><legend>"._('Stopping container').": ",addslashes(htmlspecialchars($name)),"</legend><p class=\"logLine\" id=\"logBody\"></p><span id=\"wait{$waitID}\">"._('Please wait')." </span></fieldset>');show_Wait($waitID);</script>\n";
+    @flush();
+  }
+  $retval = $DockerClient->stopContainer($name, $t);
+  $out = ($retval === true) ? _('Successfully stopped container')." '$name'" : _('Error').": ".$retval;
+  if ($echo) {
+    echo "<script>stop_Wait($waitID);addLog('<b>",addslashes(htmlspecialchars($out)),"</b>');</script>\n";
+    @flush();
+  }
+}
+
+function removeContainer($name, $cache=false, $echo=true) {
+  global $DockerClient;
+  $waitID = mt_rand();
+  if ($echo) {
+    echo "<p class=\"logLine\" id=\"logBody\"></p>";
+    echo "<script>addLog('<fieldset style=\"margin-top:1px;\" class=\"CMD\"><legend>"._('Removing container').": ",addslashes(htmlspecialchars($name)),"</legend><p class=\"logLine\" id=\"logBody\"></p><span id=\"wait{$waitID}\">"._('Please wait')." </span></fieldset>');show_Wait($waitID);</script>\n";
+    @flush();
+  }
+  $retval = $DockerClient->removeContainer($name, false, $cache);
+  $out = ($retval === true) ? _('Successfully removed container')." '$name'" : _('Error').": ".$retval;
+  if ($echo) {
+    echo "<script>stop_Wait($waitID);addLog('<b>",addslashes(htmlspecialchars($out)),"</b>');</script>\n";
+    @flush();
+  }
+}
+
+function removeImage($image, $echo=true) {
+  global $DockerClient;
+  $waitID = mt_rand();
+  if ($echo) {
+    echo "<p class=\"logLine\" id=\"logBody\"></p>";
+    echo "<script>addLog('<fieldset style=\"margin-top:1px;\" class=\"CMD\"><legend>"._('Removing orphan image').": ",addslashes(htmlspecialchars($image)),"</legend><p class=\"logLine\" id=\"logBody\"></p><span id=\"wait{$waitID}\">"._('Please wait')." </span></fieldset>');show_Wait($waitID);</script>\n";
+    @flush();
+  }
+  $retval = $DockerClient->removeImage($image);
+  $out = ($retval === true) ? _('Successfully removed orphan image')." '$image'" : _('Error').": ".$retval;
+  if ($echo) {
+    echo "<script>stop_Wait($waitID);addLog('<b>",addslashes(htmlspecialchars($out))."</b>');</script>\n";
+    @flush();
+  }
+}
+
+function pullImage($name, $image, $echo=true) {
+  global $DockerClient, $DockerTemplates, $DockerUpdate;
+  $waitID = mt_rand();
+  if (!preg_match("/:\S+$/", $image)) $image .= ":latest";
+  if ($echo) {
+    echo "<p class=\"logLine\" id=\"logBody\"></p>";
+    echo "<script>addLog('<fieldset style=\"margin-top:1px;\" class=\"CMD\"><legend>"._('Pulling image').": ",addslashes(htmlspecialchars($image)),"</legend><p class=\"logLine\" id=\"logBody\"></p><span id=\"wait{$waitID}\">"._('Please wait')." </span></fieldset>');show_Wait($waitID);</script>\n";
+    @flush();
+  }
+  $alltotals = [];
+  $laststatus = [];
+  $strError = '';
+  $DockerClient->pullImage($image, function ($line) use (&$alltotals, &$laststatus, &$waitID, &$strError, $image, $DockerClient, $DockerUpdate, $echo) {
+    $cnt = json_decode($line, true);
+    $id = $cnt['id'] ?? '';
+    $status = $cnt['status'] ?? '';
+    if (isset($cnt['error'])) $strError = $cnt['error'];
+    if ($waitID !== false) {
+      if ($echo) {
+        echo "<script>stop_Wait($waitID);</script>\n";
+        @flush();
+      }
+      $waitID = false;
+    }
+    if (empty($status)) return;
+    if (!empty($id)) {
+      if (!empty($cnt['progressDetail']) && !empty($cnt['progressDetail']['total'])) {
+        $alltotals[$id] = $cnt['progressDetail']['total'];
+      }
+      if (empty($laststatus[$id])) {
+        $laststatus[$id] = '';
+      }
+      switch ($status) {
+      case 'Waiting':
+        // Omit
+        break;
+      case 'Downloading':
+        if ($laststatus[$id] != $status) {
+          if ($echo) echo "<script>addToID('$id','",addslashes(htmlspecialchars($status)),"');</script>\n";
+        }
+        $total = $cnt['progressDetail']['total'];
+        $current = $cnt['progressDetail']['current'];
+        if ($total > 0) {
+          $percentage = round(($current / $total) * 100);
+          if ($echo) echo "<script>progress('$id',' ",$percentage,"% ",_('of')," ",$DockerClient->formatBytes($total),"');</script>\n";
+        } else {
+          // Docker must not know the total download size (http-chunked or something?)
+          // just show the current download progress without the percentage
+          $alltotals[$id] = $current;
+          if ($echo) echo "<script>progress('$id',' ",$DockerClient->formatBytes($current),"');</script>\n";
+        }
+        break;
+      default:
+        if ($laststatus[$id] == "Downloading") {
+          if ($echo) echo "<script>progress('$id',' 100% ",_('of')," ",$DockerClient->formatBytes($alltotals[$id]),"');</script>\n";
+        }
+        if ($laststatus[$id] != $status) {
+          if ($echo) echo "<script>addToID('",($id=='latest'?mt_rand():$id),"','",addslashes(htmlspecialchars($status)),"');</script>\n";
+        }
+        break;
+      }
+      $laststatus[$id] = $status;
+    } else {
+      if (strpos($status, 'Status: ') === 0) {
+        if ($echo) echo "<script>addLog('",addslashes(htmlspecialchars($status)),"');</script>\n";
+      }
+      if (strpos($status, 'Digest: ') === 0) {
+        $DockerUpdate->setUpdateStatus($image, substr($status, 8));
+      }
+    }
+    if ($echo) @flush();
+  });
+  if ($echo) {
+    echo "<script>addLog('<br><b>",_('TOTAL DATA PULLED'),":</b> ",$DockerClient->formatBytes(array_sum($alltotals)),"');</script>\n";
+    @flush();
+  }
+  if (!empty($strError)) {
+    if ($echo) {
+      echo "<script>addLog('<br><span class=\"error\"><b>",_('Error'),":</b> ",addslashes(htmlspecialchars($strError)),"</span>');</script>\n";
+      @flush();
+    }
+    return false;
+  }
+  return true;
+}
+
+function execCommand($command, $echo=true) {
+  $waitID = mt_rand();
+  if ($echo) {
+    [$cmd,$args] = explode(' ',$command,2);
+    echo '<p class="logLine" id="logBody"></p>';
+    echo '<script>addLog(\'<fieldset style="margin-top:1px;" class="CMD"><legend>',_('Command execution'),'</legend>';
+    echo basename($cmd),' ',str_replace(" -","<br>&nbsp;&nbsp;-",addslashes(htmlspecialchars($args))),'<br>';
+    echo '<span id="wait'.$waitID.'">',_('Please wait').' </span>';
+    echo '<p class="logLine" id="logBody"></p></fieldset>\');show_Wait('.$waitID.');</script>';
+    @flush();
+  }
+  $proc = popen("$command 2>&1",'r');
+  while ($out = fgets($proc)) {
+    $out = preg_replace("%[\t\n\x0B\f\r]+%", '', $out);
+    if ($echo) {
+      echo '<script>addLog("',htmlspecialchars($out),'");</script>';
+      @flush();
+    }
+  }
+  $retval = pclose($proc);
+  if ($echo) echo '<script>stop_Wait('.$waitID.');</script>';
+  $out = $retval ?  _('The command failed').'.' : _('The command finished successfully').'!';
+  if ($echo) echo '<script>addLog(\'<br><b>',$out,'</b>\');</script>';
+  return $retval===0;
+}
+
+function getXmlVal($xml, $element, $attr=null, $pos=0) {
+  $xml = (is_file($xml)) ? simplexml_load_file($xml) : simplexml_load_string($xml);
+  $element = $xml->xpath("//$element")[$pos];
+  return isset($element) ? (isset($element[$attr]) ? strval($element[$attr]) : strval($element)) : "";
+}
+
+function setXmlVal(&$xml, $value, $el, $attr=null, $pos=0) {
+  $xml = (is_file($xml)) ? simplexml_load_file($xml) : simplexml_load_string($xml);
+  $element = $xml->xpath("//$el")[$pos];
+  if (!isset($element)) $element = $xml->addChild($el);
+  if ($attr) {
+    $element[$attr] = $value;
+  } else {
+    $element->{0} = $value;
+  }
+  $dom = new DOMDocument('1.0');
+  $dom->preserveWhiteSpace = false;
+  $dom->formatOutput = true;
+  $dom->loadXML($xml->asXML());
+  $xml = $dom->saveXML();
+}
+
+function getAllocations() {
+  global $DockerClient, $host;
+
+  $ports = [];
+  foreach ($DockerClient->getDockerContainers() as $ct) {
+    $list = $port = [];
+    $nat = $ip = false;
+    $list['Name'] = $ct['Name'];
+    foreach ($ct['Ports'] as $tmp) {
+      if (isset($tmp['NAT'])) {
+        $nat = $tmp['NAT'];
+      }
+      if (isset($tmp['IP'])) {
+        $ip = $tmp['IP'];
+      }
+      if (isset($tmp['PublicPort'])) {
+        $port[] = $tmp['PublicPort'];
+      }
+    }
+    sort($port);
+    $ip = $ct['NetworkMode']=='host'||$nat ? $host : ($ip ?: DockerUtil::myIP($ct['Name']) ?: '0.0.0.0');
+    $list['Port'] = "<span class='net'>{$ct['NetworkMode']}</span><span class='ip'>$ip</span>".(implode(', ',array_unique($port)) ?: '???');
+    $ports[] = $list;
+  }
+  return $ports;
+}
+
+function getCurlHandle($url, $method='GET') {
+  $ch = curl_init();
+  curl_setopt($ch, CURLOPT_URL, $url);
+  curl_setopt($ch, CURLOPT_FRESH_CONNECT, true);
+  curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+  curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 15);
+  curl_setopt($ch, CURLOPT_TIMEOUT, 45);
+  curl_setopt($ch, CURLOPT_ENCODING, "");
+  curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+  curl_setopt($ch, CURLOPT_REFERER, "");
+  if ($method === 'HEAD') {
+    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'HEAD');
+    curl_setopt($ch, CURLOPT_HEADER, true);
+    curl_setopt($ch, CURLOPT_NOBODY, true);
+  }
+  return $ch;
+}
+?>

emhttp/plugins/dynamix.docker.manager/include/PruneConfig.php

@@ -1,6 +1,7 @@
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2012-2018, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,

emhttp/plugins/dynamix.docker.manager/include/UpdateConfig.php

@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2021, Lime Technology
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2021, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 $autostart_file = $dockerManPaths['autostart-file'];
@@ -25,7 +25,7 @@ case 'autostart':
   $container = urldecode(($_POST['container']));
   $wait = $_POST['wait'];
   $item = rtrim("$container $wait");
-  $autostart = @file($autostart_file, FILE_IGNORE_NEW_LINES) ?: [];
+  $autostart = (array)@file($autostart_file, FILE_IGNORE_NEW_LINES);
   $key = array_search($item, $autostart);
   if ($_POST['auto']=='true') {
     if ($key===false) $autostart[] = $item;
@@ -48,7 +48,7 @@ case 'wait':
   $container = urldecode(($_POST['container']));
   $wait = $_POST['wait'];
   $item = rtrim("$container $wait");
-  $autostart = file($autostart_file, FILE_IGNORE_NEW_LINES) ?: [];
+  $autostart = (array)@file($autostart_file, FILE_IGNORE_NEW_LINES);
   $names = array_map('var_split', $autostart);
   $autostart[array_search($container,$names)] = $item;
   file_put_contents($autostart_file, implode("\n", $autostart)."\n");

emhttp/plugins/dynamix.docker.manager/include/UserPrefs.php

@@ -1,7 +1,7 @@
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2015-2018, Derek Macias, Eric Schultz, Jon Panozzo.
- * Copyright 2012-2018, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,7 +12,7 @@
  */
 ?>
 <?
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
 
 $autostart_file = $dockerManPaths['autostart-file'];

emhttp/plugins/dynamix.docker.manager/javascript/docker.js

@@ -1,9 +1,11 @@
 var eventURL = '/plugins/dynamix.docker.manager/include/Events.php';
 
-function addDockerContainerContext(container, image, template, started, paused, update, autostart, webui, shell, id, Support, Project, Registry, donateLink, ReadMe) {
+function addDockerContainerContext(container, image, template, started, paused, update, autostart, webui, tswebui, shell, id, Support, Project, Registry, donateLink, ReadMe) {
   var opts = [];
+  context.settings({right:false,above:false});
   if (started && !paused) {
     if (webui !== '' && webui != '#') opts.push({text:_('WebUI'), icon:'fa-globe', href:webui, target:'_blank'});
+    if (tswebui !== '' && tswebui != '#') opts.push({text:_('Tailscale WebUI'), icon:'fa-globe', href:tswebui, target:'_blank'});
     opts.push({text:_('Console'), icon:'fa-terminal', action:function(e){e.preventDefault(); openTerminal('docker',container,shell);}});
     opts.push({divider:true});
   }
@@ -60,17 +62,15 @@ function popupWithIframe(title, cmd, reload, func) {
   $('#iframe-popup').dialog({
     autoOpen:true,
     title:title,
+    height: 600,
+    width: 900,
     draggable:true,
-    width: Math.min(Math.max(window.innerWidth/2,900),1600),
-    height: Math.max(window.innerHeight*3/5,600),
     resizable:true,
     modal:true,
-    show:{effect:'fade', duration:250},
-    hide:{effect:'fade', duration:250},
-    open:function(ev, ui) {
+    open:function(ev, ui){
       $('#myIframe').attr('src', cmd);
     },
-    close:function(event, ui) {
+    close:function(event, ui){
       if (reload && !$('#myIframe').contents().find('#canvas').length) {
         if (func) setTimeout(func+'()',0); else location = window.location.href;
       } else {
@@ -78,13 +78,13 @@ function popupWithIframe(title, cmd, reload, func) {
       }
     }
   });
-  $(".ui-dialog .ui-dialog-titlebar").addClass('menu');
-  $('.ui-dialog .ui-dialog-titlebar-close').text('X').prop('title',_('Close'));
-  $(".ui-dialog .ui-dialog-title").css({'text-align':'center','width':'100%'});
-  $(".ui-dialog .ui-dialog-content").css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-dialog-titlebar-close').css({'display':'none'});
+  $('.ui-dialog-title').css({'text-align':'center','width':'100%','font-size':'1.8rem'});
+  $('.ui-dialog-content').css({'padding-top':'15px','vertical-align':'bottom'});
+  $('.ui-button-text').css({'padding':'0px 5px'});
 }
 function execUpContainer(container) {
-  var title = _('Updating the container')+': '+container;
+  var title = _('Updating the container TEST')+': '+container;
   var cmd = '/plugins/dynamix.docker.manager/include/CreateDocker.php?updateContainer=true&ct[]='+encodeURIComponent(container);
   popupWithIframe(title, cmd, true, 'loadlist');
 }
@@ -101,32 +101,19 @@ function editContainer(container, template) {
   location = path+'/UpdateContainer?xmlTemplate=edit:'+template;
 }
 function updateContainer(container) {
-  var body = _('Update container')+': '+container;
   swal({
-    title:_('Are you sure?'),
-    text:body,
-    type:'warning',
-    showCancelButton:true,
-    confirmButtonText:_('Yes, update it!'),
-    cancelButtonText:_('Cancel')
+    title:_('Are you sure?'),text:_('Update container')+': '+container, type:'warning',html:true,showCancelButton:true,closeOnConfirm:false,confirmButtonText:_('Yes, update it!'),cancelButtonText:_('Cancel')
   },function(){
-    execUpContainer(container);
+    openDocker('update_container '+encodeURIComponent(container),_('Updating the container'),'','loadlist');
   });
 }
 function rmContainer(container, image, id) {
   var body = _('Remove container')+': '+container+'<br><br><label><input id="removeimagechk" type="checkbox" checked style="display:inline;width:unset;height:unset;margin-top:unset;margin-bottom:unset">'+_('also remove image')+'</label>';
   $('input[type=button]').prop('disabled',true);
   swal({
-    title:_('Are you sure?'),
-    text:body,
-    type:'warning',
-    html:true,
-    showCancelButton:true,
-    confirmButtonText:_('Yes, delete it!'),
-    cancelButtonText:_('Cancel'),
-    showLoaderOnConfirm:true
+    title:_('Are you sure?'),text:body,type:'warning',html:true,showCancelButton:true,confirmButtonText:_('Yes, delete it!'),cancelButtonText:_('Cancel'),showLoaderOnConfirm:true
   },function(c){
-    if (!c) {setTimeout(loadlist,0); return;}
+    if (!c) {setTimeout(loadlist); return;}
     $('div.spinner.fixed').show('slow');
     if ($('#removeimagechk').prop('checked')) {
       eventControl({action:'remove_all', container:id, name:container, image:image},'loadlist');
@@ -139,13 +126,7 @@ function rmImage(image, imageName) {
   var body = _('Remove image')+': '+$('<textarea />').html(imageName).text();
   $('input[type=button]').prop('disabled',true);
   swal({
-    title:_('Are you sure?'),
-    text:body,
-    type:'warning',
-    showCancelButton:true,
-    confirmButtonText:_('Yes, delete it!'),
-    cancelButtonText:_('Cancel'),
-    showLoaderOnConfirm:true
+    title:_('Are you sure?'),text:body,type:'warning',html:true,showCancelButton:true,confirmButtonText:_('Yes, delete it!'),cancelButtonText:_('Cancel'),showLoaderOnConfirm:true
   },function(c){
     if (!c) {setTimeout(loadlist,0); return;}
     $('div.spinner.fixed').show('slow');
@@ -159,12 +140,12 @@ function eventControl(params, spin) {
     if (data.success === true) {
       if (spin) setTimeout(spin+'()',500); else location=window.location.href;
     } else {
-      setTimeout(function(){swal({
-        title:_('Execution error'), html:true,
-        text:data.success, type:'error',
-        confirmButtonText:_('Ok')
-      },function(){
-        if (spin) setTimeout(spin+'()',500); else location=window.location.href;});
+      setTimeout(function(){
+        swal({
+          title:_('Execution error'),text:data.success,type:'error',html:true,confirmButtonText:_('Ok')
+        },function(){
+          if (spin) setTimeout(spin+'()',500); else location=window.location.href;
+        });
       },100);
     }
   },'json');
@@ -196,10 +177,9 @@ function checkAll() {
 }
 function updateAll() {
   $('input[type=button]').prop('disabled',true);
-  var ct = '';
-  for (var i=0,d; d=docker[i]; i++) if (d.update==1) ct += '&ct[]='+encodeURIComponent(d.name);
-  var cmd = '/plugins/dynamix.docker.manager/include/CreateDocker.php?updateContainer=true'+ct;
-  popupWithIframe(_('Updating all Containers'), cmd, true, 'loadlist');
+  var ct = [];
+  for (var i=0,d; d=docker[i]; i++) if (d.update==1) ct.push(encodeURIComponent(d.name));
+  openDocker('update_container '+ct.join('*'),_('Updating all Containers'),'','loadlist');
 }
 function rebuildAll() {
   $('input[type=button]').prop('disabled',true);

emhttp/plugins/dynamix.docker.manager/log.htm

@@ -0,0 +1,548 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+<meta name="format-detection" content="telephone=no">
+<meta name="viewport" content="width=1300">
+<meta name="robots" content="noindex, nofollow">
+<meta name="referrer" content="same-origin">
+<style>
+/************************
+/
+/  Fonts
+/
+/************************/
+@font-face{font-family:clear-sans;font-weight:normal;font-style:normal; src:url('/webGui/styles/clear-sans.woff?v=20220513') format('woff')}
+@font-face{font-family:clear-sans;font-weight:bold;font-style:normal; src:url('/webGui/styles/clear-sans-bold.woff?v=20220513') format('woff')}
+@font-face{font-family:clear-sans;font-weight:normal;font-style:italic; src:url('/webGui/styles/clear-sans-italic.woff?v=20220513') format('woff')}
+@font-face{font-family:clear-sans;font-weight:bold;font-style:italic; src:url('/webGui/styles/clear-sans-bold-italic.woff?v=20220513') format('woff')}
+@font-face{font-family:bitstream;font-weight:normal;font-style:normal; src:url('/webGui/styles/bitstream.woff?v=20220513') format('woff')}
+@font-face{font-family:bitstream;font-weight:bold;font-style:normal; src:url('/webGui/styles/bitstream-bold.woff?v=20220513') format('woff')}
+@font-face{font-family:bitstream;font-weight:normal;font-style:italic; src:url('/webGui/styles/bitstream-italic.woff?v=20220513') format('woff')}
+@font-face{font-family:bitstream;font-weight:bold;font-style:italic; src:url('/webGui/styles/bitstream-bold-italic.woff?v=20220513') format('woff')}
+
+html{font-family:clear-sans;height:100%}
+body{font-size:1.3rem;padding:0;margin:0;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
+.logLine{color:#1c1c1c;font-family:bitstream;font-size:1.2rem;line-height:1.6rem;margin:0 8px;padding:0;text-align:left}
+.logLine.spacing{margin:10px}
+input[type=button],input[type=reset],input[type=submit],button,button[type=button],a.button{font-family:clear-sans;font-size:1.1rem;text-transform:uppercase;margin:0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#f15a2c;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+input:hover[type=button],input:hover[type=reset],input:hover[type=submit],button:hover,button:hover[type=button],a.button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+input[type=button][disabled],input[type=reset][disabled],input[type=submit][disabled],button[disabled],button[type=button][disabled],a.button[disabled]
+input:hover[type=button][disabled],input:hover[type=reset][disabled],input:hover[type=submit][disabled],button:hover[disabled],button:hover[type=button][disabled],a.button:hover[disabled]
+input:active[type=button][disabled],input:active[type=reset][disabled],input:active[type=submit][disabled],button:active[disabled],button:active[type=button][disabled],a.button:active[disabled]
+{opacity:0.5;cursor:default;color:#808080;background:-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#404040),to(#808080)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#404040),to(#404040)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#808080),to(#808080)) 100% 100% no-repeat;background:linear-gradient(90deg,#404040 0,#808080) 0 0 no-repeat,linear-gradient(90deg,#404040 0,#808080) 0 100% no-repeat,linear-gradient(0deg,#404040 0,#404040) 0 100% no-repeat,linear-gradient(0deg,#808080 0,#808080) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+p.centered{text-align:center}
+span.error{color:#D8000C;background-color:#FFBABA;display:block;width:100%}
+span.warn{color:#9F6000;background-color:#FEEFB3;display:block;width:100%}
+span.system{color:#00529B;background-color:#BDE5F8;display:block;width:100%}
+span.array{color:#4F8A10;background-color:#DFF2BF;display:block;width:100%}
+span.login{color:#D63301;background-color:#FFCCBA;display:block;width:100%}
+span.label{padding:4px 8px;margin-right:10px;border-radius:4px;display:inline;width:auto}
+legend{font-size:1.1rem;font-weight:bold}
+#content{margin:10;padding:0}
+</style>
+<script>
+/*
+This script block has the following license.
+Original: https://github.com/drudru/ansi_up Version: 5.0.1
+Modified by: https://github.com/nysos3 for use in unRaid
+(The MIT License)
+
+Copyright (c) 2011 Dru Nelson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
+var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
+  if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
+  return cooked;
+};
+
+var PacketKind;
+(function (PacketKind) {
+  PacketKind[PacketKind["EOS"] = 0] = "EOS";
+  PacketKind[PacketKind["Text"] = 1] = "Text";
+  PacketKind[PacketKind["Incomplete"] = 2] = "Incomplete";
+  PacketKind[PacketKind["ESC"] = 3] = "ESC";
+  PacketKind[PacketKind["Unknown"] = 4] = "Unknown";
+  PacketKind[PacketKind["SGR"] = 5] = "SGR";
+  PacketKind[PacketKind["OSCURL"] = 6] = "OSCURL";
+})(PacketKind || (PacketKind = {}));
+
+var AnsiUp = (function() {
+  function AnsiUp() {
+    this.VERSION = "5.0.1";
+    this.setup_palettes();
+    this._use_classes = false;
+    this.bold = false;
+    this.fg = this.bg = null;
+    this._buffer = '';
+    this._url_whitelist = { 'http': 1, 'https': 1 };
+  }
+  Object.defineProperty(AnsiUp.prototype, "use_classes", {
+    get: function() {
+      return this._use_classes;
+    },
+    set: function(arg) {
+      this._use_classes = arg;
+    },
+    enumerable: false,
+    configurable: true
+  });
+  Object.defineProperty(AnsiUp.prototype, "url_whitelist", {
+    get: function() {
+      return this._url_whitelist;
+    },
+    set: function(arg) {
+      this._url_whitelist = arg;
+    },
+    enumerable: false,
+    configurable: true
+  });
+  AnsiUp.prototype.setup_palettes = function() {
+    var _this = this;
+    this.ansi_colors = [
+      [
+        { rgb: [0, 0, 0], class_name: "ansi-black" },
+        { rgb: [187, 0, 0], class_name: "ansi-red" },
+        { rgb: [0, 187, 0], class_name: "ansi-green" },
+        { rgb: [187, 187, 0], class_name: "ansi-yellow" },
+        { rgb: [0, 0, 187], class_name: "ansi-blue" },
+        { rgb: [187, 0, 187], class_name: "ansi-magenta" },
+        { rgb: [0, 187, 187], class_name: "ansi-cyan" },
+        { rgb: [255, 255, 255], class_name: "ansi-white" }
+      ],
+      [
+        { rgb: [85, 85, 85], class_name: "ansi-bright-black" },
+        { rgb: [255, 85, 85], class_name: "ansi-bright-red" },
+        { rgb: [0, 255, 0], class_name: "ansi-bright-green" },
+        { rgb: [255, 255, 85], class_name: "ansi-bright-yellow" },
+        { rgb: [85, 85, 255], class_name: "ansi-bright-blue" },
+        { rgb: [255, 85, 255], class_name: "ansi-bright-magenta" },
+        { rgb: [85, 255, 255], class_name: "ansi-bright-cyan" },
+        { rgb: [255, 255, 255], class_name: "ansi-bright-white" }
+      ]
+    ];
+    this.palette_256 = [];
+    this.ansi_colors.forEach(function(palette) {
+      palette.forEach(function(rec) {
+        _this.palette_256.push(rec);
+      });
+    });
+    var levels = [0, 95, 135, 175, 215, 255];
+    for (var r = 0; r < 6; ++r) {
+      for (var g = 0; g < 6; ++g) {
+        for (var b = 0; b < 6; ++b) {
+          var col = { rgb: [levels[r], levels[g], levels[b]], class_name: 'truecolor' };
+          this.palette_256.push(col);
+        }
+      }
+    }
+    var grey_level = 8;
+    for (var i = 0; i < 24; ++i, grey_level += 10) {
+      var gry = { rgb: [grey_level, grey_level, grey_level], class_name: 'truecolor' };
+      this.palette_256.push(gry);
+    }
+  };
+  AnsiUp.prototype.escape_txt_for_html = function(txt) {
+    return txt.replace(/[&<>"']/gm, function(str) {
+      if (str === "&")
+        return "&amp;";
+      if (str === "<")
+        return "&lt;";
+      if (str === ">")
+        return "&gt;";
+      if (str === "\"")
+        return "&quot;";
+      if (str === "'")
+        return "&#x27;";
+    });
+  };
+  AnsiUp.prototype.append_buffer = function(txt) {
+    var str = this._buffer + txt;
+    this._buffer = str;
+  };
+  AnsiUp.prototype.get_next_packet = function() {
+    var pkt = {
+      kind: PacketKind.EOS,
+      text: '',
+      url: ''
+    };
+    var len = this._buffer.length;
+    if (len == 0)
+      return pkt;
+    var pos = this._buffer.indexOf("\x1B");
+    if (pos == -1) {
+      pkt.kind = PacketKind.Text;
+      pkt.text = this._buffer;
+      this._buffer = '';
+      return pkt;
+    }
+    if (pos > 0) {
+      pkt.kind = PacketKind.Text;
+      pkt.text = this._buffer.slice(0, pos);
+      this._buffer = this._buffer.slice(pos);
+      return pkt;
+    }
+    if (pos == 0) {
+      if (len == 1) {
+        pkt.kind = PacketKind.Incomplete;
+        return pkt;
+      }
+      var next_char = this._buffer.charAt(1);
+      if ((next_char != '[') && (next_char != ']')) {
+        pkt.kind = PacketKind.ESC;
+        pkt.text = this._buffer.slice(0, 1);
+        this._buffer = this._buffer.slice(1);
+        return pkt;
+      }
+      if (next_char == '[') {
+        if (!this._csi_regex) {
+          this._csi_regex = rgx(__makeTemplateObject(["\n                        ^                           # beginning of line\n                                                    #\n                                                    # First attempt\n                        (?:                         # legal sequence\n                          \u001B[                      # CSI\n                          ([<-?]?)              # private-mode char\n                          ([d;]*)                    # any digits or semicolons\n                          ([ -/]?               # an intermediate modifier\n                          [@-~])                # the command\n                        )\n                        |                           # alternate (second attempt)\n                        (?:                         # illegal sequence\n                          \u001B[                      # CSI\n                          [ -~]*                # anything legal\n                          ([\0-\u001F:])              # anything illegal\n                        )\n                    "], ["\n                        ^                           # beginning of line\n                                                    #\n                                                    # First attempt\n                        (?:                         # legal sequence\n                          \\x1b\\[                      # CSI\n                          ([\\x3c-\\x3f]?)              # private-mode char\n                          ([\\d;]*)                    # any digits or semicolons\n                          ([\\x20-\\x2f]?               # an intermediate modifier\n                          [\\x40-\\x7e])                # the command\n                        )\n                        |                           # alternate (second attempt)\n                        (?:                         # illegal sequence\n                          \\x1b\\[                      # CSI\n                          [\\x20-\\x7e]*                # anything legal\n                          ([\\x00-\\x1f:])              # anything illegal\n                        )\n                    "]));
+        }
+        var match = this._buffer.match(this._csi_regex);
+        if (match === null) {
+          pkt.kind = PacketKind.Incomplete;
+          return pkt;
+        }
+        if (match[4]) {
+          pkt.kind = PacketKind.ESC;
+          pkt.text = this._buffer.slice(0, 1);
+          this._buffer = this._buffer.slice(1);
+          return pkt;
+        }
+        if ((match[1] != '') || (match[3] != 'm'))
+          pkt.kind = PacketKind.Unknown;
+        else
+          pkt.kind = PacketKind.SGR;
+        pkt.text = match[2];
+        var rpos = match[0].length;
+        this._buffer = this._buffer.slice(rpos);
+        return pkt;
+      }
+      if (next_char == ']') {
+        if (len < 4) {
+          pkt.kind = PacketKind.Incomplete;
+          return pkt;
+        }
+        if ((this._buffer.charAt(2) != '8')
+          || (this._buffer.charAt(3) != ';')) {
+          pkt.kind = PacketKind.ESC;
+          pkt.text = this._buffer.slice(0, 1);
+          this._buffer = this._buffer.slice(1);
+          return pkt;
+        }
+        if (!this._osc_st) {
+          this._osc_st = rgxG(__makeTemplateObject(["\n                        (?:                         # legal sequence\n                          (\u001B\\)                    # ESC                           |                           # alternate\n                          (\u0007)                      # BEL (what xterm did)\n                        )\n                        |                           # alternate (second attempt)\n                        (                           # illegal sequence\n                          [\0-\u0006]                 # anything illegal\n                          |                           # alternate\n                          [\b-\u001A]                 # anything illegal\n                          |                           # alternate\n                          [\u001C-\u001F]                 # anything illegal\n                        )\n                    "], ["\n                        (?:                         # legal sequence\n                          (\\x1b\\\\)                    # ESC \\\n                          |                           # alternate\n                          (\\x07)                      # BEL (what xterm did)\n                        )\n                        |                           # alternate (second attempt)\n                        (                           # illegal sequence\n                          [\\x00-\\x06]                 # anything illegal\n                          |                           # alternate\n                          [\\x08-\\x1a]                 # anything illegal\n                          |                           # alternate\n                          [\\x1c-\\x1f]                 # anything illegal\n                        )\n                    "]));
+        }
+        this._osc_st.lastIndex = 0;
+        {
+          var match_1 = this._osc_st.exec(this._buffer);
+          if (match_1 === null) {
+            pkt.kind = PacketKind.Incomplete;
+            return pkt;
+          }
+          if (match_1[3]) {
+            pkt.kind = PacketKind.ESC;
+            pkt.text = this._buffer.slice(0, 1);
+            this._buffer = this._buffer.slice(1);
+            return pkt;
+          }
+        }
+        {
+          var match_2 = this._osc_st.exec(this._buffer);
+          if (match_2 === null) {
+            pkt.kind = PacketKind.Incomplete;
+            return pkt;
+          }
+          if (match_2[3]) {
+            pkt.kind = PacketKind.ESC;
+            pkt.text = this._buffer.slice(0, 1);
+            this._buffer = this._buffer.slice(1);
+            return pkt;
+          }
+        }
+        if (!this._osc_regex) {
+          this._osc_regex = rgx(__makeTemplateObject(["\n                        ^                           # beginning of line\n                                                    #\n                        \u001B]8;                    # OSC Hyperlink\n                        [ -:<-~]*       # params (excluding ;)\n                        ;                           # end of params\n                        ([!-~]{0,512})        # URL capture\n                        (?:                         # ST\n                          (?:\u001B\\)                  # ESC                           |                           # alternate\n                          (?:\u0007)                    # BEL (what xterm did)\n                        )\n                        ([ -~]+)              # TEXT capture\n                        \u001B]8;;                   # OSC Hyperlink End\n                        (?:                         # ST\n                          (?:\u001B\\)                  # ESC                           |                           # alternate\n                          (?:\u0007)                    # BEL (what xterm did)\n                        )\n                    "], ["\n                        ^                           # beginning of line\n                                                    #\n                        \\x1b\\]8;                    # OSC Hyperlink\n                        [\\x20-\\x3a\\x3c-\\x7e]*       # params (excluding ;)\n                        ;                           # end of params\n                        ([\\x21-\\x7e]{0,512})        # URL capture\n                        (?:                         # ST\n                          (?:\\x1b\\\\)                  # ESC \\\n                          |                           # alternate\n                          (?:\\x07)                    # BEL (what xterm did)\n                        )\n                        ([\\x20-\\x7e]+)              # TEXT capture\n                        \\x1b\\]8;;                   # OSC Hyperlink End\n                        (?:                         # ST\n                          (?:\\x1b\\\\)                  # ESC \\\n                          |                           # alternate\n                          (?:\\x07)                    # BEL (what xterm did)\n                        )\n                    "]));
+        }
+        var match = this._buffer.match(this._osc_regex);
+        if (match === null) {
+          pkt.kind = PacketKind.ESC;
+          pkt.text = this._buffer.slice(0, 1);
+          this._buffer = this._buffer.slice(1);
+          return pkt;
+        }
+        pkt.kind = PacketKind.OSCURL;
+        pkt.url = match[1];
+        pkt.text = match[2];
+        var rpos = match[0].length;
+        this._buffer = this._buffer.slice(rpos);
+        return pkt;
+      }
+    }
+  };
+  AnsiUp.prototype.ansi_to_html = function(txt) {
+    this.append_buffer(txt);
+    var blocks = [];
+    while (true) {
+      var packet = this.get_next_packet();
+      if ((packet.kind == PacketKind.EOS)
+        || (packet.kind == PacketKind.Incomplete))
+        break;
+      if ((packet.kind == PacketKind.ESC)
+        || (packet.kind == PacketKind.Unknown))
+        continue;
+      if (packet.kind == PacketKind.Text)
+        blocks.push(this.transform_to_html(this.with_state(packet)));
+      else if (packet.kind == PacketKind.SGR)
+        this.process_ansi(packet);
+      else if (packet.kind == PacketKind.OSCURL)
+        blocks.push(this.process_hyperlink(packet));
+    }
+    return blocks.join("");
+  };
+  AnsiUp.prototype.with_state = function(pkt) {
+    return { bold: this.bold, fg: this.fg, bg: this.bg, text: pkt.text };
+  };
+  AnsiUp.prototype.process_ansi = function(pkt) {
+    var sgr_cmds = pkt.text.split(';');
+    while (sgr_cmds.length > 0) {
+      var sgr_cmd_str = sgr_cmds.shift();
+      var num = parseInt(sgr_cmd_str, 10);
+      if (isNaN(num) || num === 0) {
+        this.fg = this.bg = null;
+        this.bold = false;
+      }
+      else if (num === 1) {
+        this.bold = true;
+      }
+      else if (num === 22) {
+        this.bold = false;
+      }
+      else if (num === 39) {
+        this.fg = null;
+      }
+      else if (num === 49) {
+        this.bg = null;
+      }
+      else if ((num >= 30) && (num < 38)) {
+        this.fg = this.ansi_colors[0][(num - 30)];
+      }
+      else if ((num >= 40) && (num < 48)) {
+        this.bg = this.ansi_colors[0][(num - 40)];
+      }
+      else if ((num >= 90) && (num < 98)) {
+        this.fg = this.ansi_colors[1][(num - 90)];
+      }
+      else if ((num >= 100) && (num < 108)) {
+        this.bg = this.ansi_colors[1][(num - 100)];
+      }
+      else if (num === 38 || num === 48) {
+        if (sgr_cmds.length > 0) {
+          var is_foreground = (num === 38);
+          var mode_cmd = sgr_cmds.shift();
+          if (mode_cmd === '5' && sgr_cmds.length > 0) {
+            var palette_index = parseInt(sgr_cmds.shift(), 10);
+            if (palette_index >= 0 && palette_index <= 255) {
+              if (is_foreground)
+                this.fg = this.palette_256[palette_index];
+              else
+                this.bg = this.palette_256[palette_index];
+            }
+          }
+          if (mode_cmd === '2' && sgr_cmds.length > 2) {
+            var r = parseInt(sgr_cmds.shift(), 10);
+            var g = parseInt(sgr_cmds.shift(), 10);
+            var b = parseInt(sgr_cmds.shift(), 10);
+            if ((r >= 0 && r <= 255) && (g >= 0 && g <= 255) && (b >= 0 && b <= 255)) {
+              var c = { rgb: [r, g, b], class_name: 'truecolor' };
+              if (is_foreground)
+                this.fg = c;
+              else
+                this.bg = c;
+            }
+          }
+        }
+      }
+    }
+  };
+  AnsiUp.prototype.transform_to_html = function(fragment) {
+    var txt = fragment.text;
+    if (txt.length === 0)
+      return txt;
+    // txt = this.escape_txt_for_html(txt);
+    if (!fragment.bold && fragment.fg === null && fragment.bg === null)
+      return txt;
+    var styles = [];
+    var classes = [];
+    var fg = fragment.fg;
+    var bg = fragment.bg;
+    if (fragment.bold)
+      styles.push('font-weight:bold');
+    if (!this._use_classes) {
+      if (fg)
+        styles.push("color:rgb(" + fg.rgb.join(',') + ")");
+      if (bg)
+        styles.push("background-color:rgb(" + bg.rgb + ")");
+    }
+    else {
+      if (fg) {
+        if (fg.class_name !== 'truecolor') {
+          classes.push(fg.class_name + "-fg");
+        }
+        else {
+          styles.push("color:rgb(" + fg.rgb.join(',') + ")");
+        }
+      }
+      if (bg) {
+        if (bg.class_name !== 'truecolor') {
+          classes.push(bg.class_name + "-bg");
+        }
+        else {
+          styles.push("background-color:rgb(" + bg.rgb.join(',') + ")");
+        }
+      }
+    }
+    var class_string = '';
+    var style_string = '';
+    if (classes.length)
+      class_string = " class=\"" + classes.join(' ') + "\"";
+    if (styles.length)
+      style_string = " style=\"" + styles.join(';') + "\"";
+    return "<span" + style_string + class_string + ">" + txt + "</span>";
+  };
+  ;
+  AnsiUp.prototype.process_hyperlink = function(pkt) {
+    var parts = pkt.url.split(':');
+    if (parts.length < 1)
+      return '';
+    if (!this._url_whitelist[parts[0]])
+      return '';
+    // var result = "<a href=\"" + this.escape_txt_for_html(pkt.url) + "\">" + this.escape_txt_for_html(pkt.text) + "</a>";
+    var result = "<a href=\"" + this.escape_txt_for_html(pkt.url) + "\">" + pkt.text + "</a>";
+    return result;
+  };
+  return AnsiUp;
+}());
+function rgx(tmplObj) {
+  var subst = [];
+  for (var _i = 1; _i < arguments.length; _i++) {
+    subst[_i - 1] = arguments[_i];
+  }
+  var regexText = tmplObj.raw[0];
+  var wsrgx = /^\s+|\s+\n|\s*#[\s\S]*?\n|\n/gm;
+  var txt2 = regexText.replace(wsrgx, '');
+  return new RegExp(txt2);
+}
+function rgxG(tmplObj) {
+  var subst = [];
+  for (var _i = 1; _i < arguments.length; _i++) {
+    subst[_i - 1] = arguments[_i];
+  }
+  var regexText = tmplObj.raw[0];
+  var wsrgx = /^\s+|\s+\n|\s*#[\s\S]*?\n|\n/gm;
+  var txt2 = regexText.replace(wsrgx, '');
+  return new RegExp(txt2, 'g');
+}
+</script>
+<script>
+var dots = [];
+var span = [];
+var ansi_up = new AnsiUp;
+
+function show_Wait(id) {
+  span[id] = document.getElementById("wait" + id);
+  dots[id] = setInterval(function() {
+    if (((span[id].innerHTML+='.').match(/\./g)||[]).length > 9) {
+      span[id].innerHTML = span[id].innerHTML.replace(/\.+$/,'');
+    }
+  }, 500);
+}
+
+function stop_Wait(id) {
+  span[id].innerHTML = '';
+  clearInterval( dots[id] );
+}
+
+function addLog(logLine) {
+  var elms = document.getElementsByClassName('logLine');
+  logLine = ansi_up.ansi_to_html(logLine);
+  if (elms.length) {
+    var el = elms[elms.length-1];
+    el.innerHTML += logLine + "<br>";
+  }
+  window.scrollTo(0, document.body.scrollHeight);
+}
+
+function loadLog(container, since) {
+  var httpRequest = new XMLHttpRequest();
+  httpRequest.onreadystatechange = function() {
+    if (httpRequest.readyState === 4 && httpRequest.status === 200) {
+      parseScript(httpRequest.responseText);
+    }
+  };
+  httpRequest.open('GET', location.protocol+'//'+location.host+location.pathname+'?action=log&container='+encodeURIComponent(container)+'&since='+encodeURIComponent(since));
+  httpRequest.send();
+}
+
+function parseScript(_source) {
+  var source = _source;
+  var scripts = [];
+  while(source.indexOf("<script") > -1 || source.indexOf("</script") > -1) {
+    var s = source.indexOf("<script");
+    var s_e = source.indexOf(">", s);
+    var e = source.indexOf("</script", s);
+    var e_e = source.indexOf(">", e);
+    scripts.push(source.substring(s_e+1, e));
+    source = source.substring(0, s) + source.substring(e_e+1);
+  }
+  for (var i=0; i<scripts.length; i++) {
+    try {
+      eval(scripts[i]);
+    } catch(ex) {}
+  }
+  return source;
+}
+
+function progress(id, prog) {
+  var elms = document.getElementsByClassName(id+'_progress');
+  if (elms.length) {
+    elms[elms.length-1].textContent = prog;
+  }
+}
+
+function addToID(id, m) {
+  var elms = document.getElementById(id);
+  if (elms === null) {
+    addLog('<span id=\"'+id+'\">IMAGE ID ['+id+']: <span class=\"content\">'+m+'</span><span class=\"'+id+'_progress\"></span>. </span>');
+  } else {
+    var elms_content = elms.getElementsByClassName("content");
+    if (!elms_content.length || elms_content[elms_content.length-1].textContent != m) {
+      elms.innerHTML += '<span class=\"content\">'+m+'</span><span class=\"'+id+'_progress\"></span>. ';
+    }
+  }
+}
+</script>
+</head>
+<body>
+<div id="content"><p class="logLine" id="logBody"></p></div>
+</body>
+</html>

emhttp/plugins/dynamix.docker.manager/scripts/container_size

@@ -0,0 +1,79 @@
+#!/usr/bin/php -q
+<?PHP
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<?
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Wrappers.php";
+extract(parse_plugin_cfg('dynamix',true));
+
+// add translations
+$_SERVER['REQUEST_URI'] = 'docker';
+$login_locale = _var($display,'locale');
+require_once "$docroot/webGui/include/Translations.php";
+
+$units = ['B','kB','MB','GB','TB','PB','EB','ZB','YB'];
+$list = [];
+
+function write(...$messages){
+  $com = curl_init();
+  curl_setopt_array($com,[
+    CURLOPT_URL => 'http://localhost/pub/plugins?buffer_length=1',
+    CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
+    CURLOPT_POST => 1,
+    CURLOPT_RETURNTRANSFER => true
+  ]);
+  foreach ($messages as $message) {
+    curl_setopt($com, CURLOPT_POSTFIELDS, $message);
+    curl_exec($com);
+  }
+  curl_close($com);
+}
+function autoscale($value) {
+  global $units;
+  $size = count($units);
+  $base = $value ? floor(log($value, 1000)) : 0;
+  if ($base>=$size) $base = $size-1;
+  $value /= pow(1000, $base);
+  $decimals = $base ? ($value>=100 ? 0 : ($value>=10 ? 1 : (round($value*100)%100===0 ? 0 : 2))) : 0;
+  return number_format($value, $decimals, '.', $value>9999 ? ',' : '').' '.$units[$base];
+}
+function align($text, $w=25) {
+  return $text.str_repeat('&nbsp;',$w-min(strlen($text),$w-1));
+}
+function gap($text) {
+  return preg_replace('/([kMGTPEZY]?B)$/'," $1",$text);
+}
+function byteval($data) {
+  global $units;
+  [$value,$base] = explode(' ',gap($data));
+  return $value*pow(1000,array_search($base,$units));
+}
+
+exec("docker ps -sa --format='{{.Names}}|{{.Size}}'",$container);
+foreach ($container as $ct) {
+  [$name,$size] = explode('|',$ct);
+  [$writable,$dummy,$total] = explode(' ',str_replace(['(',')'],'',$size));
+  $list[] = ['name' => $name, 'total' => byteval($total), 'writable' => byteval($writable), 'log' => (exec("docker inspect --format='{{.LogPath}}' $name|xargs du -b 2>/dev/null |cut -f1")) ?: "0"];
+}
+$sum = ['total' => 0, 'writable' => 0, 'log' => 0];
+array_multisort(array_column($list,'total'),SORT_DESC,$list); // sort on container size
+$i = 0;
+write(align(_('Name'),48).align(_('Container')).align(_('Writable'))._('Log')."\n");
+foreach ($list as $ct) {
+  write(($i++==0 ? '<hr>':'').align($ct['name'],48).align(autoscale($ct['total'])).align(autoscale($ct['writable'])).autoscale($ct['log'])."\n");
+  $sum['total'] += $ct['total'];
+  $sum['writable'] += $ct['writable'];
+  $sum['log'] += $ct['log'];
+}
+write("<hr>".align(_('Total size'),48).align(autoscale($sum['total'])).align(autoscale($sum['writable'])).autoscale($sum['log'])."\n",'_DONE_','');
+?>

emhttp/plugins/dynamix.docker.manager/scripts/dockerconfig

@@ -0,0 +1,58 @@
+#!/usr/bin/php -q
+<?PHP
+/* Copyright 2015-2023, Lime Technology
+ * Copyright 2015-2016, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+ * Copyright 2012-2023, Bergware International.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<?
+/* Define the path to the docker configuration file */
+$cfgfile = "/boot/config/docker.cfg";
+
+/* Define the default configuration values */
+$cfg_defaults = [
+	"DOCKER_ENABLED" => "no",
+	"DOCKER_IMAGE_FILE" => "/mnt/user/system/docker/docker.img",
+	"DOCKER_IMAGE_SIZE" => "20",
+	"DOCKER_APP_CONFIG_PATH" => "/mnt/user/appdata/",
+	"DOCKER_APP_UNRAID_PATH" => "",
+	"DOCKER_READMORE" => "yes",
+	"DOCKER_PID_LIMIT" => ""
+];
+
+/* Initialize the new configuration with the default values */
+$cfg_new = $cfg_defaults;
+
+/* Check if the configuration file exists */
+if (file_exists($cfgfile)) {
+	/* Parse the existing configuration file */
+	$cfg_old = parse_ini_file($cfgfile);
+
+	/* If the existing configuration is not empty, merge it with the defaults */
+	if (!empty($cfg_old)) {
+		/* Merge only missing keys from defaults */
+		$cfg_new = array_merge($cfg_defaults, $cfg_old);
+
+		/* If there are no changes between the new and old configurations, unset the new configuration */
+		if (empty(array_diff_assoc($cfg_new, $cfg_old))) {
+			$cfg_new = null;
+		}
+	}
+}
+
+/* If the new configuration is set, write it to the configuration file */
+if (isset($cfg_new)) {
+	$tmp = '';
+	foreach ($cfg_new as $key => $value) {
+		$tmp .= "$key=\"$value\"\n";
+	}
+	file_put_contents($cfgfile, $tmp);
+}
+?>

emhttp/plugins/dynamix.docker.manager/scripts/dockerupdate

@@ -1,7 +1,8 @@
-#!/usr/bin/php
+#!/usr/bin/php -q
 <?PHP
-/* Copyright 2005-2018, Lime Technology
- * Copyright 2014-2018, Guilherme Jardim, Eric Schultz, Jon Panozzo.
+/* Copyright 2005-2024, Lime Technology
+ * Copyright 2012-2024, Bergware International.
+ * Copyright 2014-2021, Guilherme Jardim, Eric Schultz, Jon Panozzo.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -12,23 +13,20 @@
  */
 ?>
 <?
-session_start();
-$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
-
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
 require_once "$docroot/webGui/include/Wrappers.php";
-
-$unraid  = parse_plugin_cfg('dynamix', true);
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+// this command will set the $notify array
+extract(parse_plugin_cfg('dynamix', true));
 
 // Multi-language support
-$_SESSION['locale'] = $unraid['display']['locale'];
 $_SERVER['REQUEST_URI'] = "scripts";
+$login_locale = _var($display,'locale');
 require_once "$docroot/webGui/include/Translations.php";
 
-exec("pgrep docker", $pid);
+exec('pgrep --ns $$ docker', $pid);
 if (count($pid) == 1) exit(0);
 
-require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
-
 $DockerClient = new DockerClient();
 $DockerTemplates = new DockerTemplates();
 
@@ -46,26 +44,23 @@ if (!isset($check)) {
   $DockerTemplates->getAllInfo(true);
   echo " Done.";
 } else {
-  require_once "$docroot/webGui/include/Wrappers.php";
-  $notify = "$docroot/webGui/scripts/notify";
-  $unraid = parse_plugin_cfg("dynamix",true);
-  $var = parse_ini_file("/var/local/emhttp/var.ini");
-  $server = strtoupper($var['NAME']);
-  $output = $unraid['notify']['docker_notify'];
-
-  $info = $DockerTemplates->getAllInfo(true);
+  $script = "$docroot/webGui/scripts/notify";
+  $var    = (array)@parse_ini_file("/var/local/emhttp/var.ini");
+  $server = strtoupper(_var($var,'NAME','tower'));
+  $output = _var($notify,'docker_notify');
+  $info   = $DockerTemplates->getAllInfo(true);
   foreach ($DockerClient->getDockerContainers() as $ct) {
-    $name = $ct['Name'];
+    $name  = $ct['Name'];
     $image = $ct['Image'];
     if ($info[$name]['updated'] == "false") {
-      $updateStatus = (is_file($dockerManPaths['update-status'])) ? json_decode(file_get_contents($dockerManPaths['update-status']), TRUE) : [];
+      $updateStatus = is_file($dockerManPaths['update-status']) ? json_decode(file_get_contents($dockerManPaths['update-status']),true) : [];
       $new = str_replace('sha256:', '', $updateStatus[$image]['remote']);
       $new = substr($new, 0, 4).'..'.substr($new, -4, 4);
       if ( ! isset($nonotify) ) {
         $event = str_replace("&apos;","'",_("Docker")." - $name [$new]");
         $subject = str_replace("&apos;","'",sprintf(_("Notice [%s] - Version update %s"),$server,$new));
         $description = str_replace("&apos;","'",sprintf(_("A new version of %s is available"),$name));
-        exec("$notify -e ".escapeshellarg($event)." -s ".escapeshellarg($subject)." -d ".escapeshellarg($description)." -i ".escapeshellarg("normal $output")." -l '/Docker' -x");
+        exec("$script -e ".escapeshellarg($event)." -s ".escapeshellarg($subject)." -d ".escapeshellarg($description)." -i ".escapeshellarg("normal $output")." -l '/Docker' -x");
       }
     }
   }

emhttp/plugins/dynamix.docker.manager/scripts/fixDescriptions

@@ -0,0 +1,30 @@
+#!/usr/bin/php -q
+<?PHP
+function startsWith($haystack, $needle) {
+  if (!is_string($haystack) || !is_string($needle)) return false;
+  return $needle === "" || strripos($haystack, $needle, -strlen($haystack)) !== false;
+}
+
+$xmlFiles = glob("/boot/config/plugins/dockerMan/templates-user/*.xml");
+
+foreach ($xmlFiles as $file) {
+  unset($changeFlag);
+  $xml = @simplexml_load_file($file);
+  if (!$xml) continue;
+
+  foreach ($xml->Config as $id => $config) {
+    if (startsWith((string)$config->attributes()->Description,"Container ".(string)$config->attributes()->Type)) {
+      $config->attributes()->Description = "";
+      $changeFlag = true;
+    }
+  }
+  if (isset($changeFlag)) {
+    copy($file,"$file.bak");
+    $dom = new DOMDocument('1.0');
+    $dom->preserveWhiteSpace = false;
+    $dom->formatOutput = true;
+    $dom->loadXML($xml->asXML());
+    file_put_contents($file,$dom->saveXML()); 
+  }
+}
+?>

emhttp/plugins/dynamix.docker.manager/scripts/rebuild_container

@@ -0,0 +1,38 @@
+#!/usr/bin/php -q
+<?PHP
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<?
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+
+$DockerClient = new DockerClient();
+$DockerUpdate = new DockerUpdate();
+$DockerTemplates = new DockerTemplates();
+
+$start  = array_map(function($row){return strtok($row,' ');},@file('/var/lib/docker/unraid-autostart',FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES) ?: []);
+$custom = DockerUtil::custom();
+$subnet = DockerUtil::network($custom);
+$cpus   = DockerUtil::cpus();
+$tmpl   = $DockerTemplates->getUserTemplate($argv[1]);
+$xml    = file_get_contents($tmpl);
+
+[$cmd,$name,$repository] = xmlToCommand($tmpl);
+$old = $DockerClient->getImageID($repository);
+
+removeContainer($name,false,false);
+execCommand(str_replace('/docker create ','/docker run -d ',$cmd),false);
+if (!in_array($name,$start)) stopContainer($name,false,false);
+$DockerClient->flushCaches();
+$new = $DockerClient->getImageID($repository);
+if ($old && $old != $new) removeImage($old,false);
+?>

emhttp/plugins/dynamix.docker.manager/scripts/update_container

@@ -0,0 +1,213 @@
+#!/usr/bin/php -q
+<?PHP
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<?
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Wrappers.php";
+extract(parse_plugin_cfg('dynamix',true));
+
+// add translations
+$_SERVER['REQUEST_URI'] = '';
+$login_locale = _var($display,'locale');
+require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php";
+
+$var = parse_ini_file('/var/local/emhttp/var.ini');
+$DockerClient = new DockerClient();
+$DockerUpdate = new DockerUpdate();
+$DockerTemplates = new DockerTemplates();
+
+$custom = DockerUtil::custom();
+$subnet = DockerUtil::network($custom);
+$cpus   = DockerUtil::cpus();
+
+function write(...$messages){
+  $com = curl_init();
+  curl_setopt_array($com,[
+    CURLOPT_URL => 'http://localhost/pub/docker?buffer_length=1',
+    CURLOPT_UNIX_SOCKET_PATH => '/var/run/nginx.socket',
+    CURLOPT_POST => 1,
+    CURLOPT_RETURNTRANSFER => true
+  ]);
+  foreach ($messages as $message) {
+    curl_setopt($com, CURLOPT_POSTFIELDS, $message);
+    curl_exec($com);
+  }
+  curl_close($com);
+}
+function stopContainer_nchan($name) {
+  global $DockerClient;
+  $waitID = mt_rand();
+  write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Stopping container').": ".htmlspecialchars($name)."</legend><p class='logLine'></p><span id='wait-$waitID'>"._('Please wait')." </span></fieldset>","show_Wait\0$waitID");
+  $retval = $DockerClient->stopContainer($name);
+  $out = ($retval === true) ? _('Successfully stopped container').": $name" : _('Error').": ".$retval;
+  write("stop_Wait\0$waitID","addLog\0<b>".htmlspecialchars($out)."</b>");
+}
+function removeContainer_nchan($name) {
+  global $DockerClient;
+  $waitID = mt_rand();
+  write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Removing container').": ".htmlspecialchars($name)."</legend><p class='logLine'></p><span id='wait-$waitID'>"._('Please wait')." </span></fieldset>","show_Wait\0$waitID");
+  $retval = $DockerClient->removeContainer($name);
+  $out = ($retval === true) ? _('Successfully removed container').": $name" : _('Error').": ".$retval;
+  write("stop_Wait\0$waitID","addLog\0<b>".htmlspecialchars($out)."</b>");
+}
+function removeImage_nchan($image) {
+  global $DockerClient;
+  $waitID = mt_rand();
+  write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Removing orphan image').": ".htmlspecialchars($image)."</legend><p class='logLine'></p><span id='wait-$waitID'>"._('Please wait')." </span></fieldset>","show_Wait\0$waitID");
+  $retval = $DockerClient->removeImage($image);
+  $out = ($retval === true) ? _('Successfully removed orphan image').": $image" : _('Error').": ".$retval;
+  write("stop_Wait\0$waitID","addLog\0<b>".htmlspecialchars($out)."</b>");
+}
+function pullImage_nchan($name, $image) {
+  global $DockerClient, $DockerTemplates, $DockerUpdate;
+  $waitID = mt_rand();
+  if (!preg_match("/:\S+$/", $image)) $image .= ":latest";
+  write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Pulling image').": ".htmlspecialchars($image)."</legend><p class='logLine'></p><span id='wait-$waitID'>"._('Please wait')." </span></fieldset>","show_Wait\0$waitID");
+  $alltotals = [];
+  $laststatus = [];
+  $strError = '';
+  $DockerClient->pullImage($image, function ($line) use (&$alltotals, &$laststatus, &$waitID, &$strError, $image, $DockerClient, $DockerUpdate) {
+    $cnt = json_decode($line, true);
+    $id = $cnt['id'] ?? '';
+    $status = $cnt['status'] ?? '';
+    if (isset($cnt['error'])) $strError = $cnt['error'];
+    if ($waitID !== false) {
+      write("stop_Wait\0$waitID");
+      $waitID = false;
+    }
+    if (empty($status)) return;
+    if (!empty($id)) {
+      if (!empty($cnt['progressDetail']) && !empty($cnt['progressDetail']['total'])) {
+        $alltotals[$id] = $cnt['progressDetail']['total'];
+      }
+      if (empty($laststatus[$id])) {
+        $laststatus[$id] = '';
+      }
+      switch ($status) {
+      case 'Waiting':
+        // Omit
+        break;
+      case 'Downloading':
+        if ($laststatus[$id] != $status) {
+          write("addToID\0$id\0".htmlspecialchars($status));
+        }
+        $total = $cnt['progressDetail']['total'];
+        $current = $cnt['progressDetail']['current'];
+        if ($total > 0) {
+          $percentage = round(($current / $total) * 100);
+          write("progress\0$id\0 ".$percentage."% "._('of')." ".$DockerClient->formatBytes($total));
+        } else {
+          // Docker must not know the total download size (http-chunked or something?)
+          // just show the current download progress without the percentage
+          $alltotals[$id] = $current;
+          write("progress\0$id\0".$DockerClient->formatBytes($current));
+        }
+        break;
+      default:
+        if ($laststatus[$id] == "Downloading") {
+          write("progress\0$id\0 100% "._('of')." ".$DockerClient->formatBytes($alltotals[$id]));
+        }
+        if ($laststatus[$id] != $status) {
+          write("addToID\0".($id=='latest'?mt_rand():$id)."\0".htmlspecialchars($status));
+        }
+        break;
+      }
+      $laststatus[$id] = $status;
+    } else {
+      if (strpos($status, 'Status: ') === 0) {
+        write("addLog\0".htmlspecialchars($status));
+      }
+      if (strpos($status, 'Digest: ') === 0) {
+        $DockerUpdate->setUpdateStatus($image, substr($status,8));
+      }
+    }
+  });
+  write("addLog\0<br><b>"._('TOTAL DATA PULLED').":</b> ".$DockerClient->formatBytes(array_sum($alltotals)));
+  if (!empty($strError)) {
+    write("addLog\0<br><span class='error'><b>"._('Error').":</b> ".htmlspecialchars($strError)."</span>");
+    return false;
+  }
+  return true;
+}
+function execCommand_nchan($command) {
+  $waitID = mt_rand();
+  [$cmd,$args] = explode(' ',$command,2);
+  write("<p class='logLine'></p>","addLog\0<fieldset class='docker'><legend>"._('Command execution')."</legend>".basename($cmd).' '.str_replace(" -","<br>&nbsp;&nbsp;-",htmlspecialchars($args))."<br><span id='wait-$waitID'>"._('Please wait')." </span><p class='logLine'></p></fieldset>","show_Wait\0$waitID");
+  $proc = popen("$command 2>&1",'r');
+  while ($out = fgets($proc)) {
+    $out = preg_replace("%[\t\n\x0B\f\r]+%", '',$out);
+    write("addLog\0".htmlspecialchars($out));
+  }
+  $retval = pclose($proc);
+  $out = $retval ? _('The command failed').'.' : _('The command finished successfully').'!';
+  write("stop_Wait\0$waitID","addLog\0<br><b>$out</b>");
+  return $retval===0;
+}
+
+$style = ["<style>"];
+$style[] = ".logLine{font-family:bitstream!important;font-size:1.2rem!important;margin:0;padding:0}";
+$style[] = "fieldset.docker{border:solid thin;margin-top:8px}";
+$style[] = "legend{font-size:1.1rem!important;font-weight:bold}";
+$style[] = "</style>";
+
+write(implode($style)."<p class='logLine'></p>");
+foreach (explode('*',rawurldecode($argv[1])) as $value) {
+  $tmpl = $DockerTemplates->getUserTemplate($value);
+  if (!$tmpl) {
+    write("addLog\0"._('Configuration not found').". "._('Was this container created using this plugin')."?");
+    continue;
+  }
+  $xml = file_get_contents($tmpl);
+  [$cmd, $Name, $Repository] = xmlToCommand($tmpl);
+  $Registry = getXmlVal($xml, "Registry");
+  $TS_Enabled = getXmlVal($xml, "TailscaleEnabled");
+  $oldImageID = $DockerClient->getImageID($Repository);
+  // pull image
+  if (!pullImage_nchan($Name, $Repository)) continue;
+  $oldContainerInfo = $DockerClient->getContainerDetails($Name);
+  // determine if the container is still running
+  $startContainer = false;
+  if (!empty($oldContainerInfo) && !empty($oldContainerInfo['State']) && !empty($oldContainerInfo['State']['Running'])) {
+    // since container was already running, put it back it to a running state after update
+    $startContainer = true;
+    // attempt graceful stop of container first
+    stopContainer_nchan($Name);
+  }
+  if ( ($argv[2]??null) == "ca_docker_run_override" )
+    $startContainer = true;
+  if ( $startContainer )
+    $cmd = str_replace('/docker create ', '/docker run -d ', $cmd);
+  // force kill container if still running after 10 seconds
+  if (empty($_GET['communityApplications'])) removeContainer_nchan($Name);
+  // Extract real Entrypoint and Cmd from container for Tailscale
+  if ($TS_Enabled == 'true') {
+    // Create preliminary base container but don't run it
+    exec("/usr/local/emhttp/plugins/dynamix.docker.manager/scripts/docker create --name '" . escapeshellarg($Name) . "' '" . escapeshellarg($Repository) . "'");
+    // Get Entrypoint and Cmd from docker inspect
+    $containerInfo = $DockerClient->getContainerDetails($Name);
+    $ts_env  = isset($containerInfo['Config']['Entrypoint']) ? '-e ORG_ENTRYPOINT="' . implode(' ', $containerInfo['Config']['Entrypoint']) . '" ' : '';
+    $ts_env .= isset($containerInfo['Config']['Cmd']) ? '-e ORG_CMD="' . implode(' ', $containerInfo['Config']['Cmd']) . '" ' : '';
+    // Insert Entrypoint and Cmd to docker command
+    $cmd = str_replace('-l net.unraid.docker.managed=dockerman', $ts_env . '-l net.unraid.docker.managed=dockerman' , $cmd);
+    // Remove preliminary container
+    exec("/usr/local/emhttp/plugins/dynamix.docker.manager/scripts/docker rm '" . escapeshellarg($Name) . "'");
+  }
+  execCommand_nchan($cmd);
+  if ($startContainer) addRoute($Name); // add route for remote WireGuard access
+  $DockerClient->flushCaches();
+  $newImageID = $DockerClient->getImageID($Repository);
+  // remove old orphan image since it's no longer used by this container
+  if ($oldImageID && $oldImageID != $newImageID) removeImage_nchan($oldImageID);
+}
+write('_DONE_','');
+?>

emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-azure.css

@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}

emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-black.css

@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}

emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-gray.css

@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}

emhttp/plugins/dynamix.docker.manager/sheets/AddContainer-white.css

@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}

emhttp/plugins/dynamix.docker.manager/sheets/AddContainer.css

@@ -0,0 +1,14 @@
+.noshow,.advanced{display:none}
+.required:after{content:" *";color:#E80000}
+span.boxed{display:inline-block;line-height:normal;white-space:normal;width:60%}
+span.cpu,label.checkbox{display:inline-block;width:32px}
+span.ct{display:inline-block;width:230px}
+span.net{display:inline-block;width:120px}
+span.ip{display:inline-block;width:160px}
+dl,dt,dd{line-height:normal!important;height:auto!important}
+dl{padding:8px 0!important}
+dl>dt:nth-of-type(2),dl>dd:nth-of-type(2){padding:20px 0 0 0!important}
+input.setting_input{margin-right:4rem}
+input,select{margin-top:-0.8rem!important}
+div#configLocation,div#configLocation dl{padding:0!important}
+div#configLocation dt{margin-top:-0.18rem!important}

emhttp/plugins/dynamix.docker.manager/sheets/DockerContainers.css

@@ -0,0 +1,12 @@
+.basic{display:block}
+.advanced{display:none;white-space:nowrap}
+.log{cursor:zoom-in}
+.exec{cursor:pointer}
+table#docker_containers{text-align:left}
+th.five{width:5%}
+th.nine{width:9%}
+th.load{width:140px}
+input.wait{width:24px;margin:0 4px;padding:0 5px;border:none;box-shadow:none;background-color:transparent}
+table tbody td{line-height:normal}
+i.mover{margin-right:8px;display:none}
+#resetsort{margin-left:12px;display:inline-block;width:32px}

emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-azure.css

@@ -0,0 +1,2 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#B0B0B0}

emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-black.css

@@ -0,0 +1,2 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#404040}

emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-gray.css

@@ -0,0 +1,2 @@
+.fileTree{background:#1c1c1c;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#404040}

emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings-white.css

@@ -0,0 +1,2 @@
+.fileTree{background:#f2f2f2;width:300px;max-height:150px;overflow-y:scroll;overflow-x:hidden;position:absolute;z-index:100;display:none}
+span.disabled{color:#B0B0B0}

emhttp/plugins/dynamix.docker.manager/sheets/DockerSettings.css

@@ -0,0 +1,17 @@
+.errortext{color:#EF3D47;display:none;margin-left:20px}
+.basic{display:inline-block}
+.advanced{display:none}
+select.mask{min-width:0;margin:0 10px 0 4px}
+select.net{min-width:0;margin:0 4px 0 2px}
+select option.hide{display:none}
+input.ip4{width:100px;margin:0 4px 0 1px}
+input.ip6{width:140px;margin:0 4px}
+input.gw4{width:100px;margin:0 4px 0 1px}
+input.gw6{width:160px;margin:0 4px}
+input.pool6{width:40px;margin:0 4px 0 1px}
+span.net{margin-left:4px;margin-right:2px}
+span.ip4{display:inline-block;width:260px}
+span.ip6{display:inline-block;width:310px}
+span.gw4{display:inline-block;width:200px}
+span.gw6{display:inline-block;width:270px}
+span.nonexist{margin-left:20px}

emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-azure.css

@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}

emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-black.css

@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}

emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-gray.css

@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#1c1c1c}

emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer-white.css

@@ -0,0 +1 @@
+.fileTree{width:240px;max-height:200px;overflow-y:scroll;overflow-x:hidden;position:absolute;display:none;background:#f2f2f2}

emhttp/plugins/dynamix.docker.manager/sheets/UpdateContainer.css

@@ -0,0 +1,14 @@
+.noshow,.advanced{display:none}
+.required:after{content:" *";color:#E80000}
+span.boxed{display:inline-block;line-height:normal;white-space:normal;width:60%}
+span.cpu,label.checkbox{display:inline-block;width:32px}
+span.ct{display:inline-block;width:230px}
+span.net{display:inline-block;width:120px}
+span.ip{display:inline-block;width:160px}
+dl,dt,dd{line-height:normal!important;height:auto!important}
+dl{padding:8px 0!important}
+dl>dt:nth-of-type(2),dl>dd:nth-of-type(2){padding:20px 0 0 0!important}
+input.setting_input{margin-right:4rem}
+input,select{margin-top:-0.8rem!important}
+div#configLocation,div#configLocation dl{padding:0!important}
+div#configLocation dt{margin-top:-0.18rem!important}

emhttp/plugins/dynamix.docker.manager/styles/style-azure.css

@@ -0,0 +1,14 @@
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#f2f2f2;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #1c1c1c;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#e3e3e3;color:#1c1c1c;font-weight:bold}
+.ui-widget-content{border:1px solid #1c1c1c;background:#f2f2f2;color:#1c1c1c}
+.ui-state-active{background:#e8e8e8}
+.ui-dropdownchecklist-dropcontainer{background:#f2f2f2;border:1px solid #1c1c1c}
+.ui-state-disabled{color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#1c1c1c;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#f2f2f2;border:0px}

emhttp/plugins/dynamix.docker.manager/styles/style-black.css

@@ -0,0 +1,14 @@
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#1c1c1c;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #e5e5e5;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#2b2b2b;color:#f2f2f2;font-weight:bold}
+.ui-widget-content{border:1px solid #e5e5e5;background:#1c1c1c;color:#f2f2f2}
+.ui-state-active{background:#262626}
+.ui-dropdownchecklist-dropcontainer{background:#1c1c1c;border:1px solid #e5e5e5}
+.ui-state-disabled{color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#f2f2f2;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#1c1c1c;border:0px}

emhttp/plugins/dynamix.docker.manager/styles/style-gray.css

@@ -0,0 +1,14 @@
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#1c1c1c;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #e5e5e5;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#2b2b2b;color:#f2f2f2;font-weight:bold}
+.ui-widget-content{border:1px solid #e5e5e5;background:#1c1c1c;color:#f2f2f2}
+.ui-state-active{background:#262626}
+.ui-dropdownchecklist-dropcontainer{background:#1c1c1c;border:1px solid #e5e5e5}
+.ui-state-disabled{color:#f2f2f2;border-color:#6c6c6c;background:#262626;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#f2f2f2;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#1c1c1c;border:0px}

emhttp/plugins/dynamix.docker.manager/styles/style-white.css

@@ -0,0 +1,14 @@
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button{font-family:clear-sans;font-size:1.1rem;font-weight:bold;letter-spacing:2px;text-transform:uppercase;margin:10px 12px 10px 0;padding:9px 18px;text-decoration:none;white-space:nowrap;cursor:pointer;outline:none;border-radius:4px;border:0;color:#ff8c2f;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 0 no-repeat,-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#e22828),to(#e22828)) 0 100% no-repeat,-webkit-gradient(linear,left bottom,left top,from(#ff8c2f),to(#ff8c2f)) 100% 100% no-repeat;background:linear-gradient(90deg,#e22828 0,#ff8c2f) 0 0 no-repeat,linear-gradient(90deg,#e22828 0,#ff8c2f) 0 100% no-repeat,linear-gradient(0deg,#e22828 0,#e22828) 0 100% no-repeat,linear-gradient(0deg,#ff8c2f 0,#ff8c2f) 100% 100% no-repeat;background-size:100% 2px,100% 2px,2px 100%,2px 100%}
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset button:hover{color:#f2f2f2;background:-webkit-gradient(linear,left top,right top,from(#e22828),to(#ff8c2f));background:linear-gradient(90deg,#e22828 0,#ff8c2f)}
+.ui-dropdownchecklist .ui-state-default{background:#f2f2f2;border:none;box-shadow:none;outline:none;cursor:pointer;height:2.2rem;line-height:2.2rem}
+.ui-dropdownchecklist-group{font-weight:normal;font-style:italic;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector{border:1px solid #1c1c1c;display:inline-block;cursor:pointer;padding:1px 9px 1px 8px}
+.ui-dropdownchecklist-selector-wrapper{vertical-align:middle;font-size:0}
+.ui-widget-header{border:none;background:#e3e3e3;color:#1c1c1c;font-weight:bold}
+.ui-widget-content{border:1px solid #1c1c1c;background:#f2f2f2;color:#1c1c1c}
+.ui-state-active{background:#e8e8e8}
+.ui-dropdownchecklist-dropcontainer{background:#f2f2f2;border:1px solid #1c1c1c}
+.ui-state-disabled{color:#1c1c1c;border-color:#a2a2a2;background:#e8e8e8;opacity:0.5}
+.ui-dropdownchecklist-indent{padding-left:7px}
+.ui-dropdownchecklist-text{color:#1c1c1c;font-size:1.3rem}
+.ui-dropdownchecklist .ui-widget-content .ui-state-default{background:#f2f2f2;border:0px}

emhttp/plugins/dynamix.docker.manager/system/Docker

@@ -0,0 +1,28 @@
+#!/bin/bash
+# Get active containers
+ACTIVE_CONTAINERS="$(docker ps -q --no-trunc 2>/dev/null)"
+
+# Exit if no containers are active and return zero
+if [ -z "${ACTIVE_CONTAINERS}" ]; then
+  echo "0"
+  exit
+fi
+
+# Get all relevant memory entries from containers
+for container in ${ACTIVE_CONTAINERS} ; do
+  CONT_MEMORY="$(cat /sys/fs/cgroup/docker/${container}/memory.stat 2>/dev/null | grep -Ew "anon|kernel|kernel_stack|pagetables|sec_pagetables|percpu|sock|vmalloc|shmem" | awk '{print $2}')"
+  # Add up memory values
+  for value in ${CONT_MEMORY} ; do
+    if [[ ${value} =~ ^[0-9]+$ ]]; then
+      ((MEMORY_USAGE += value))
+    fi
+  done
+  unset CONT_MEMORY
+done
+
+# Check if value is a integer and return the value otherwiese return zero
+if [[ ${MEMORY_USAGE} =~ ^[0-9]+$ ]]; then
+  echo "${MEMORY_USAGE}"
+else
+  echo "0"
+fi

emhttp/plugins/dynamix.gui.search/gui_search.page

@@ -0,0 +1,115 @@
+Menu='Buttons:1'
+Icon='icon-u-search'
+Title='Search'
+Code='e956'
+---
+<?
+###################################################
+#                                                 #
+# GUI Search copyright 2021-2023, Andrew Zawadzki #
+#           Licenced under GPLv2                  #
+#                                                 #
+###################################################
+
+$currentUnraidPage = str_replace('Browse','Main',basename(explode('?',$_SERVER['REQUEST_URI'])[0]));
+$guiSearchBoxSpan  = "<span id='guiSearchBoxSpan'><input type='text' id='guiSearchBox' autocomplete='new-password'></input></span><span class='guiSearchBoxResults'></span>";
+?>
+<script>
+var languageVisible;
+var guiSearchSuggestions;
+
+var browserName = (function(agent){
+	switch (true) {
+		case agent.indexOf('edge') >= 0: return 'Edge'; // Edge
+		case agent.indexOf('edg/') >= 0: return 'Edge'; // Edge Chromium Based
+		case agent.indexOf('opr') >= 0 && !!window.opr: return 'Opera';
+		case agent.indexOf('chrome') >= 0 && !!window.chrome: return 'Chrome';
+		case agent.indexOf('trident') >= 0: return 'MS IE';
+		case agent.indexOf('firefox') >= 0: return 'Mozilla Firefox';
+		case agent.indexOf('safari') >= 0: return 'Safari';
+		default: return 'other';
+	}
+})(window.navigator.userAgent.toLowerCase());
+
+$(function(){
+<?if ($themes2):?>
+	$('.nav-item.gui_search').hover(function(){gui_search();},function(e){closeSearchBox(e);});
+<?endif;?>
+	$.post('/plugins/dynamix.gui.search/include/exec.php',function(data) {
+		if (data) {
+			try {guiSearchSuggestions = JSON.parse(data); setupGUIsearch();}
+			catch(e) {console.log('Invalid JSON for GUI search autocomplete');}
+		}
+	});
+});
+
+function guiSearchBoxSpan() {
+	return $('#guiSearchBoxSpan').length>0;
+}
+
+function setupGUIsearch() {
+	window.addEventListener('keydown',function(e){
+		if (!e.shiftKey && !e.altKey && (navigator.appVersion.indexOf('Mac')==-1 ? e.ctrlKey : e.metaKey) && e.keyCode==75) {
+			e.preventDefault();
+		<?if ($themes1):?>
+			if (guiSearchBoxSpan()) closeSearchBox(e); else gui_search();
+		<?endif;?>
+		}
+	});
+	if (browserName != 'Chrome' && browserName != 'Edge') {
+		var hashTag = (window.location.hash||'').substr(1).replace('%20',' ').replace('%2d','-');
+		if (hashTag.length) $('body').mark(hashTag,{'accuracy': {'value': 'exactly','limiters': ['.',':','?']},'separateWordSearch': false});
+	}
+}
+
+function gui_search() {
+<?if ($themes1):?>
+	languageVisible = $('.nav-item.LanguageButton').is(':visible');
+	$('.nav-tile.right').prepend("<?=$guiSearchBoxSpan?>").css('overflow','visible');
+	$('.nav-item.util,.nav-user.show').hide();
+<?else:?>
+	if (!guiSearchBoxSpan()) $('.nav-item.gui_search a').append("<?=$guiSearchBoxSpan?>");
+	$('.nav-item.gui_search').css('overflow','visible');
+<?endif;?>
+	if (guiSearchSuggestions) {
+		var guiSearchAwesomplete = new Awesomplete(document.getElementById('guiSearchBox'));
+		guiSearchAwesomplete.list = guiSearchSuggestions;
+		guiSearchAwesomplete.maxItems = 15;
+		guiSearchAwesomplete.autoFirst = true;
+		Awesomplete.$('#guiSearchBox').removeEventListener('awesomplete-selectcomplete',guiSearch);
+		Awesomplete.$('#guiSearchBox').addEventListener('awesomplete-selectcomplete',guiSearch);
+		$('#guiSearchBox').attr('autocomplete','new-password'); // Stop awesomplete from resetting autocomplete
+	}
+	$('#guiSearchBox').focus().keydown(function(e){if (e.which==27) closeSearchBox(e);}).blur(function(e){closeSearchBox(e);});
+}
+
+function closeSearchBox(e) {
+	e.stopPropagation();
+	$('#guiSearchBoxSpan').remove();
+<?if ($themes1):?>
+	$('.nav-tile.right').css({'overflow-x':'auto','overflow-y':'hidden'});
+	$('.nav-item.util,.nav-user.show').show();
+	if (!languageVisible) $('.nav-item.LanguageButton').hide();
+<?else:?>
+	$('.nav-item.gui_search').css('overflow','hidden');
+<?endif;?>
+}
+
+function guiSearch() {
+	var searchInfo = $('#guiSearchBox').val().split('**');
+	var separator  = (browserName == 'Chrome' || browserName == 'Edge') ? '#:~:text=' : '#';
+	var scrollText = (typeof searchInfo[1] != 'undefined') ? separator+searchInfo[1].replace(' ','%20').replace('-','%2d') : '';
+	var newPage    = "<?=$currentUnraidPage?>/Settings/Tools".replace(searchInfo[0]+'/','');
+
+	closeSearchBox(event);
+	if (newPage == 'Dashboard/Settings/Tools') newPage = 'Settings';
+	location.replace('/'+newPage+'/'+searchInfo[0]+scrollText);
+}
+
+if (browserName != 'Chrome' && browserName != 'Edge') {
+  var script  = document.createElement('script');
+  script.type = 'text/javascript';
+  script.src  = '<?autov('/plugins/dynamix.gui.search/javascript/jquery.mark.js')?>';
+  document.getElementsByTagName('head')[0].appendChild(script);
+}
+</script>

emhttp/plugins/dynamix.gui.search/include/exec.php

@@ -0,0 +1,147 @@
+<?
+###################################################
+#                                                 #
+# GUI Search copyright 2021-2023, Andrew Zawadzki #
+#           Licenced under GPLv2                  #
+#                                                 #
+###################################################
+@mkdir("/tmp/gui.search");
+
+extract(@parse_ini_file("/boot/config/plugins/dynamix/dynamix.cfg") ?: []);
+$locale = $locale ?? "";
+if ( $locale == "en_US")
+	$locale = "";
+
+if ( $locale != @file_get_contents("/tmp/gui.search/locale") ) {
+	@unlink("/tmp/gui.search/searchResults.json");
+}
+
+file_put_contents("/tmp/gui.search/locale",$locale);
+
+$uri = "";
+if ( $locale ) {
+	if ( is_dir("/usr/local/emhttp/languages/$locale") ) {
+		$dotFiles = glob("/usr/local/emhttp/languages/$locale/*.txt");
+		foreach ($dotFiles as $dot) {
+			$uri .= basename($dot,".txt")."/";
+		}
+		$uri = rtrim($uri,"/");
+	}
+}
+
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
+$_SERVER['REQUEST_URI'] = $uri;
+$_SESSION['locale'] = $locale;
+require_once "$docroot/plugins/dynamix/include/Translations.php";
+
+$searchPages = array();
+$pageFiles = glob("/usr/local/emhttp/plugins/*/*.page");
+if ( is_file("/tmp/gui.search/searchResults.json") ) {
+	$searchPages = unserialize(file_get_contents("/tmp/gui.search/searchResults.json"));
+}
+if ( ! $searchPages ) {
+	$MainPages = array("About","WebGui","UNRAID-OS","SystemInformation","OtherSettings","Settings","NetworkServices","Utilities","DiskUtilities","UserPreferences","WGX");
+	// pass 1 - get all the "main" pages
+	foreach ($pageFiles as $page) {
+		if ( $page == "/usr/local/emhttp/plugins/dynamix/WGX.page") continue;
+		$file = explode("---",file_get_contents($page));
+		$pageInfo = parse_ini_string($file[0],true);
+
+		if ( isset($pageInfo['Menu']) && $pageInfo['Menu'] && in_array(explode(":",$pageInfo['Menu'])[0],$MainPages) && ! in_array(basename($page,".page"),$MainPages) ) {
+			$newPage[basename($page,".page")] = array(sanitizeQuote(_($pageInfo['Title'])),basename($page));
+			if ( $locale )
+				$newPage[basename($page,".page")] = array(sanitizeQuote($pageInfo['Title']),basename($page));
+		}
+	}
+
+	//pass 2 - link back any sub-pages
+	foreach ($pageFiles as $page) {
+		$file = explode("---",file_get_contents($page));
+		if ( ! isset($file[1]) ) continue;
+		$pageInfo = parse_ini_string($file[0],true);
+
+		if (isset($pageInfo['Menu']) && $pageInfo['Menu']) {
+			$pageLinked = explode(":",$pageInfo['Menu'])[0];
+			if (isset($newPage[$pageLinked])  && ! in_array($pageLinked,$MainPages) ) {
+				$newPage[] = array(sanitizeQuote(_($pageInfo['Title']))." ("._($newPage[$pageLinked][0]).")",$pageLinked);
+				if ( $locale )
+					$newPage[] = array(sanitizeQuote(($pageInfo['Title']))." (".($newPage[$pageLinked][0]).")",$pageLinked);
+
+			}
+			getSettings();
+		}
+	}
+	//pass 3 - cleanup
+	foreach ($newPage as $page) {
+		if ( ! in_array(array("label"=>sanitizeQuote(_($page[0])),"value"=>basename($page[1],".page")),$searchPages) )
+			$searchPages[] = array("label"=>sanitizeQuote(_($page[0])),"value"=>basename($page[1],".page"));
+	}
+	file_put_contents("/tmp/gui.search/searchResults.json",serialize($searchPages));
+}
+echo json_encode($searchPages);
+
+function getSettings() {
+	global $searchPages, $pageInfo, $page,$file,$locale;
+
+	$bannedPages = array("ShareEdit","UserEdit","Device","community.applications","Selftest","DeviceInfo","EthX","CA_Notices","SecuritySMB","SecurityNFS");
+	if (in_array(basename($page,".page"),$bannedPages) ) return;
+	foreach (explode("\n",$file[1]) as $line) {
+		$line = trim($line);
+		if ( startsWith($line,"_(") && (endsWith($line,")_:") || endsWith($line,")_):") ) ) {
+			preg_match("/<!--search:.*-->/i",$line,$extra,PREG_OFFSET_CAPTURE);
+			$string = str_replace(["_(",")_:",")_?",")_"],["","","",""],$line);
+
+			$extraEng = "";
+			$extraTra = "";
+			if ( $extra ) {
+				$extrasearch = trim(str_replace(["<!--search:","-->"],["",""],$extra[0][0]));
+				$string = str_replace($extra[0][0],"",$string);
+				foreach ( explode("|",$extrasearch) as $term ) {
+					$extraEng .= $term."|";
+					$extraTra .= _($term)."|";
+				}
+				$extraEng = " [".rtrim($extraEng,"|")."]";
+				$extraTra = " [".rtrim($extraTra,"|")."]";
+			}
+			$string = sanitizeQuote($string);
+
+			$linkPage = basename($page,".page");
+			if (strpos($linkPage,"WG") === 0) {
+				$linkPage = "VPNmanager";
+			}
+			if ( stripos(str_replace(" ","",$line),"<!--donotindex-->") )
+				continue;
+			if ( ! in_array(array("label"=>"$string $extraTra (".sanitizeQuote($pageInfo['Title']).")","value"=>"$linkPage**"._($string)),$searchPages) ) {
+				$searchPages[] = array("label"=>_($string)." $extraTra (".sanitizeQuote(_($pageInfo['Title'])).")","value"=>"$linkPage**"._($string));
+				if ( $locale ) {
+					if ( _($string) !== $string )
+						$searchPages[] = array("label"=>($string)." $extraEng (".sanitizeQuote($pageInfo['Title']).")","value"=>"$linkPage**"._($string));
+				}
+			}
+		}
+	}
+}
+
+function sanitizeQuote($string) {
+	return str_replace("'","",str_replace('"',"",$string));
+}
+
+##############################################
+# Determine if $haystack begins with $needle #
+##############################################
+function startsWith($haystack, $needle) {
+	if ( !is_string($haystack) || ! is_string($needle) ) return false;
+	return $needle === "" || strripos($haystack, $needle, -strlen($haystack)) !== FALSE;
+}
+#############################################
+# Determine if $string ends with $endstring #
+#############################################
+function endsWith($string, $endString) {
+	$len = strlen($endString);
+	if ($len == 0) {
+		return true;
+	}
+	return (substr($string, -$len) === $endString);
+}
+?>

emhttp/plugins/dynamix.gui.search/sheets/gui_search-azure.css

@@ -0,0 +1,2 @@
+#guiSearchBoxSpan{display:inline-block;margin:0 0 0 20px;padding:0;height:auto;line-height:normal;font-size:1.3rem}
+#guiSearchBox{position:relative;top:0;left:0;width:50rem;border:none;border-radius:20px;margin:0;padding:5px 12px;color:#1c1b1b;background-color:#feefb3}

emhttp/plugins/dynamix.gui.search/sheets/gui_search-black.css

@@ -0,0 +1,3 @@
+#guiSearchBoxSpan{display:inline-block;position:relative;margin:4px 2px 2px 2px;padding:0;text-align:left;height:auto;line-height:normal;font-size:1.3rem}
+#guiSearchBoxSpan:after{font-family:unraid;content:'\e956';position:absolute;top:.8rem;left:1.5rem;font-size:1.3rem}
+#guiSearchBox{width:50rem;border:none;border-radius:20px;padding-left:4rem;opacity:0.5;invert(100%)}

emhttp/plugins/dynamix.gui.search/sheets/gui_search-gray.css

@@ -0,0 +1,2 @@
+#guiSearchBoxSpan{display:inline-block;margin:0 0 0 20px;padding:0;height:auto;line-height:normal;font-size:1.3rem}
+#guiSearchBox{position:relative;top:0;left:0;width:50rem;border:none;border-radius:20px;margin:0;padding:5px 12px;color:#1c1b1b;background-color:#feefb3}

emhttp/plugins/dynamix.gui.search/sheets/gui_search-white.css

@@ -0,0 +1,3 @@
+#guiSearchBoxSpan{display:inline-block;position:relative;margin:4px 2px 2px 2px;padding:0;text-align:left;height:auto;line-height:normal;font-size:1.3rem}
+#guiSearchBoxSpan:after{font-family:unraid;content:'\e956';position:absolute;top:.8rem;left:1.5rem;font-size:1.3rem}
+#guiSearchBox{width:50rem;border:none;border-radius:20px;padding-left:4rem;opacity:0.5;invert(100%)}

emhttp/plugins/dynamix.my.servers/Registration.page

@@ -0,0 +1,20 @@
+Menu="About:30"
+Type="xmenu"
+Title="Registration"
+Icon="icon-registration"
+Tag="pencil"
+---
+<?php
+/* Copyright 2005-2023, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<unraid-i18n-host>
+  <unraid-registration></unraid-registration>
+</unraid-i18n-host>

emhttp/plugins/dynamix.my.servers/data/server-state.php

@@ -0,0 +1,23 @@
+<?php
+/* Copyright 2005-2023, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+$var = (array)parse_ini_file('state/var.ini');
+
+require_once "$docroot/webGui/include/Wrappers.php";
+require_once "$docroot/webGui/include/Helpers.php";
+extract(parse_plugin_cfg('dynamix',true));
+require_once "$docroot/plugins/dynamix.my.servers/include/state.php";
+
+$serverState = new ServerState();
+
+header('Content-type: application/json');
+
+echo $serverState->getServerStateJson();

emhttp/plugins/dynamix.my.servers/include/myservers1.php

@@ -0,0 +1,62 @@
+<?php
+/* Copyright 2005-2023, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<style>
+#header {
+    z-index: 102 !important;
+    display: -webkit-box;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-box-pack: justify;
+    -ms-flex-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+}
+#header unraid-i18n-host {
+    font-size: 16px;
+    margin-left: auto;
+    height: 100%;
+}
+
+/**
+ * Tools page, rotate the Downgrade icon to prevent needing to add a new icon to the icon font.
+ * The pseudo element is targeted here otherwise the rotation of the span would mess up spacing with the text.
+ */
+a[href="/Tools/Downgrade"] .icon-update:before {
+    display: inline-block; /* required otherwise the rotation won't work */
+    rotate: 180deg;
+}
+</style>
+<?php
+// Set the path for the local manifest file
+$localManifestFile = '/usr/local/emhttp/plugins/dynamix.my.servers/unraid-components/manifest.json';
+
+// Load the local manifest
+$localManifest = json_decode(file_get_contents($localManifestFile), true);
+
+$searchText = 'unraid-components.client.mjs';
+$fileValue = null;
+
+foreach ($localManifest as $key => $value) {
+    if (strpos($key, $searchText) !== false && isset($value["file"])) {
+        $fileValue = $value["file"];
+        break;
+    }
+}
+
+if ($fileValue !== null) {
+    $prefixedPath = '/plugins/dynamix.my.servers/unraid-components/';
+    echo '<script src="' . $prefixedPath . $fileValue . '"></script>';
+} else {
+    echo '<script>console.error("%cNo matching key containing \'' . $searchText . '\' found.", "font-weight: bold; color: white; background-color: red");</script>';
+}

emhttp/plugins/dynamix.my.servers/include/myservers2.php

@@ -0,0 +1,36 @@
+<?php
+/* Copyright 2005-2023, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once("$docroot/plugins/dynamix.my.servers/include/state.php");
+require_once("$docroot/plugins/dynamix.my.servers/include/translations.php");
+
+$serverState = new ServerState();
+$wCTranslations = new WebComponentTranslations();
+?>
+<script>
+window.LOCALE_DATA = '<?= $wCTranslations->getTranslationsJson(true) ?>';
+/**
+ * So we're not needing to modify DefaultLayout with an additional include, we'll add the Modals web component to the bottom of the body.
+ */
+const i18nHostWebComponent = 'unraid-i18n-host';
+const modalsWebComponent = 'unraid-modals';
+if (!document.getElementsByTagName(modalsWebComponent).length) {
+    const $body = document.getElementsByTagName('body')[0];
+    const $i18nHost = document.createElement(i18nHostWebComponent);
+    const $modals = document.createElement(modalsWebComponent);
+    $body.appendChild($i18nHost);
+    $i18nHost.appendChild($modals);
+}
+</script>
+
+<unraid-i18n-host>
+    <unraid-user-profile server="<?= $serverState->getServerStateJsonForHtmlAttr() ?>"></unraid-user-profile>
+</unraid-i18n-host>

emhttp/plugins/dynamix.my.servers/include/reboot-details.php

@@ -0,0 +1,168 @@
+<?php
+/* Copyright 2005-2023, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+/**
+ * RebootDetails class is responsible for detecting the type and version of a system reboot required in the context of an unRAID server.
+ *
+ * Usage:
+ * ```
+ * $rebootDetails = new RebootDetails();
+ * $rebootType = $rebootDetails->rebootType;
+ * ```
+ */
+class RebootDetails
+{
+    const CURRENT_CHANGES_TXT_PATH = '/boot/changes.txt';
+    const CURRENT_README_RELATIVE_PATH = 'plugins/unRAIDServer/README.md';
+    const CURRENT_VERSION_PATH = '/etc/unraid-version';
+    const PREVIOUS_BZ_ROOT_PATH = '/boot/previous/bzroot';
+    const PREVIOUS_CHANGES_TXT_PATH = '/boot/previous/changes.txt';
+
+    private $currentVersion = '';
+
+    public $rebootType = ''; // 'update', 'downgrade', 'thirdPartyDriversDownloading'
+    public $rebootReleaseDate = '';
+    public $rebootVersion = '';
+
+    public $previousReleaseDate = '';
+    public $previousVersion = '';
+
+    /**
+     * Constructs a new RebootDetails object and automatically detects the reboot type during initialization.
+     */
+    public function __construct()
+    {
+        $this->detectRebootType();
+    }
+
+    /**
+     * Detects the type of reboot required based on the contents of the unRAID server's README.md file.
+     * Sets the $rebootType property accordingly.
+     */
+    private function detectRebootType()
+    {
+        $docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+
+        /**
+         * Read the reboot readme, and see if it says "REBOOT REQUIRED" or "DOWNGRADE"
+         * only relying on the README.md file to save reads from the flash drive.
+         * because we started allowing downgrades from the account.unraid.net Update OS page, we can't
+         * fully rely on the README.md value of being accurate.
+         * For instance if on 6.13.0-beta.2.1 then chose to "Downgrade" to 6.13.0-beta.1.10 from the account app
+         * the README.md file would still say "REBOOT REQUIRED".
+         */
+        $rebootReadme = @file_get_contents("$docroot/" . self::CURRENT_README_RELATIVE_PATH, false, null, 0, 20) ?: '';
+        $rebootDetected = preg_match("/^\*\*(REBOOT REQUIRED|DOWNGRADE)/", $rebootReadme);
+        if (!$rebootDetected) {
+            return;
+        }
+        /**
+         * if a reboot is required, then:
+         * get current Unraid version from /etc/unraid-version
+         * then get the version of the last update from self::CURRENT_CHANGES_TXT_PATH
+         * if they're different, then a reboot is required
+         * if the version in self::CURRENT_CHANGES_TXT_PATH is less than the current version, then a downgrade is required
+         * if the version in self::CURRENT_CHANGES_TXT_PATH is greater than the current version, then an update is required
+         */
+        $this->setCurrentVersion();
+        $this->setRebootDetails();
+        if ($this->currentVersion == '' || $this->rebootVersion == '') {
+            return; // return to prevent potential incorrect outcome
+        }
+
+        $compareVersions = version_compare($this->rebootVersion, $this->currentVersion);
+        switch ($compareVersions) {
+            case -1:
+                $this->setRebootType('downgrade');
+                break;
+            case 0:
+                // we should never get here, but if we do, then no reboot is required and just return
+                return;
+            case 1:
+                $this->setRebootType('update');
+                break;
+        }
+
+        // Detect if third-party drivers were part of the update process
+        $processWaitingThirdPartyDrivers = "inotifywait -q " . self::CURRENT_CHANGES_TXT_PATH . " -e move_self,delete_self";
+        // Run the ps command to list processes and check if the process is running
+        $ps_command = "ps aux | grep -E \"$processWaitingThirdPartyDrivers\" | grep -v \"grep -E\"";
+        $output = shell_exec($ps_command) ?? '';
+        if ($this->rebootType != '' && strpos($output, $processWaitingThirdPartyDrivers) !== false) {
+            $this->setRebootType('thirdPartyDriversDownloading');
+        }
+    }
+
+    /**
+     * Detects and retrieves the version information related to the system reboot based on the contents of the '/boot/changes.txt' file.
+     *
+     * @return string The system version information or 'Not found' if not found, or 'File not found' if the file is not present.
+     */
+    private function readChangesTxt(string $file_path = self::CURRENT_CHANGES_TXT_PATH)
+    {
+        // Check if the file exists
+        if (file_exists($file_path)) {
+            exec("head -n4 $file_path", $rows);
+            foreach ($rows as $row) {
+                $i = stripos($row,'version');
+                if ($i !== false) {
+                    [$version, $releaseDate] = explode(' ', trim(substr($row, $i+7)));
+                    break;
+                }
+            }
+
+            return [
+                'releaseDate' => $releaseDate ?? 'Not found',
+                'version' => $version ?? 'Not found',
+            ];
+        } else {
+            return 'File not found';
+        }
+    }
+
+    /**
+     * Sets the current version of the Unraid server for comparison with the reboot version.
+     */
+    private function setCurrentVersion() {
+        // output ex: version="6.13.0-beta.2.1"
+        $raw = @file_get_contents(self::CURRENT_VERSION_PATH) ?: '';
+        // Regular expression to match the version between the quotes
+        $pattern = '/version="([^"]+)"/';
+        if (preg_match($pattern, $raw, $matches)) {
+            $this->currentVersion = $matches[1];
+        }
+    }
+
+    private function setRebootDetails()
+    {
+        $rebootDetails = $this->readChangesTxt();
+        $this->rebootReleaseDate = $rebootDetails['releaseDate'];
+        $this->rebootVersion = $rebootDetails['version'];
+    }
+
+    private function setRebootType($rebootType)
+    {
+        $this->rebootType = $rebootType;
+    }
+
+    /**
+     * If self::PREVIOUS_BZ_ROOT_PATH exists, then the user has the option to downgrade to the previous version.
+     * Parse the text file /boot/previous/changes.txt to get the version number of the previous version.
+     * Then we move some files around and reboot.
+     */
+    public function setPrevious()
+    {
+        if (@file_exists(self::PREVIOUS_BZ_ROOT_PATH) && @file_exists(self::PREVIOUS_CHANGES_TXT_PATH)) {
+            $parseOutput = $this->readChangesTxt(self::PREVIOUS_CHANGES_TXT_PATH);
+            $this->previousVersion = $parseOutput['version'];
+            $this->previousReleaseDate = $parseOutput['releaseDate'];
+        }
+    }
+}

emhttp/plugins/dynamix.my.servers/include/state.php

@@ -0,0 +1,342 @@
+<?php
+/* Copyright 2005-2023, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+/**
+ * @todo refactor globals – currently if you try to use $GLOBALS the class will break.
+ */
+$webguiGlobals = $GLOBALS;
+$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+
+require_once "$docroot/plugins/dynamix.my.servers/include/reboot-details.php";
+require_once "$docroot/plugins/dynamix.plugin.manager/include/UnraidCheck.php";
+/**
+ * ServerState class encapsulates server-related information and settings.
+ *
+ * Usage:
+ * ```
+ * require_once "$docroot/plugins/dynamix.my.servers/include/state.php";
+ * $serverStateClass = new ServerState();
+ *
+ * $serverStateClass->getServerState();
+ * or
+ * $serverStateClass->getServerStateJson();
+ * ```
+ */
+class ServerState
+{
+    protected $webguiGlobals;
+
+    private $var;
+    private $apiKey = '';
+    private $apiVersion = '';
+    private $avatar = '';
+    private $email = '';
+    private $extraOrigins = [];
+    private $flashBackupActivated = '';
+    private $hasRemoteApikey = false;
+    private $registeredTime = '';
+    private $username = '';
+    private $connectPluginInstalled = '';
+    private $connectPluginVersion;
+    private $configErrorEnum = [
+        "error" => 'UNKNOWN_ERROR',
+        "ineligible" => 'INELIGIBLE',
+        "invalid" => 'INVALID',
+        "nokeyserver" => 'NO_KEY_SERVER',
+        "withdrawn" => 'WITHDRAWN',
+    ];
+    private $osVersion;
+    private $osVersionBranch;
+    private $rebootDetails;
+    private $caseModel = '';
+    private $keyfileBase64UrlSafe = '';
+    private $updateOsCheck;
+    private $updateOsNotificationsEnabled = false;
+    private $updateOsResponse;
+    private $updateOsIgnoredReleases = [];
+
+    public $myServersFlashCfg = [];
+    public $myServersMemoryCfg = [];
+    public $host = 'unknown';
+    public $combinedKnownOrigins = [];
+ 
+    public $nginxCfg = [];
+    public $flashbackupStatus = [];
+    public $registered = false;
+    public $myServersMiniGraphConnected = false;
+    public $keyfileBase64 = '';
+
+    /**
+     * Constructor to initialize class properties and gather server information.
+     */
+    public function __construct()
+    {
+        /**
+         * @note – necessary evil until full webgui is class based.
+         * @see - getWebguiGlobal() for usage
+         * */
+        global $webguiGlobals;
+        $this->webguiGlobals =& $webguiGlobals;
+        // echo "<pre>" . json_encode($this->webguiGlobals, JSON_PRETTY_PRINT) . "</pre>";
+
+        $this->var = (array)parse_ini_file('state/var.ini');
+        $this->nginxCfg = @parse_ini_file('/var/local/emhttp/nginx.ini') ?? [];
+
+        $this->osVersion = $this->var['version'];
+        $this->osVersionBranch = trim(@exec('plugin category /var/log/plugins/unRAIDServer.plg') ?? 'stable');
+
+        $caseModelFile = '/boot/config/plugins/dynamix/case-model.cfg';
+        $this->caseModel = file_exists($caseModelFile) ? htmlspecialchars(@file_get_contents($caseModelFile), ENT_HTML5, 'UTF-8') : '';
+
+        $this->rebootDetails = new RebootDetails();
+
+        $this->keyfileBase64 = empty($this->var['regFILE']) ? null : @file_get_contents($this->var['regFILE']);
+        if ($this->keyfileBase64 !== false) {
+            $this->keyfileBase64 = @base64_encode($this->keyfileBase64);
+            $this->keyfileBase64UrlSafe = str_replace(['+', '/', '='], ['-', '_', ''], trim($this->keyfileBase64));
+        }
+
+        $this->updateOsCheck = new UnraidOsCheck();
+        $this->updateOsIgnoredReleases = $this->updateOsCheck->getIgnoredReleases();
+        $this->updateOsNotificationsEnabled = !empty(@$this->getWebguiGlobal('notify', 'unraidos'));
+        $this->updateOsResponse = $this->updateOsCheck->getUnraidOSCheckResult();
+
+        $this->setConnectValues();
+    }
+
+    /**
+     * Retrieve the value of a webgui global setting.
+     */
+    public function getWebguiGlobal(string $key, string $subkey = null) {
+        if (!$subkey) {
+            return _var($this->webguiGlobals, $key, '');
+        }
+        $keyArray = _var($this->webguiGlobals, $key, []);
+        return _var($keyArray, $subkey, '');
+    }
+
+    private function setConnectValues() {
+        if (file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net')) {
+            $this->connectPluginInstalled = 'dynamix.unraid.net.plg';
+        }
+        if (file_exists('/var/lib/pkgtools/packages/dynamix.unraid.net.staging')) {
+            $this->connectPluginInstalled = 'dynamix.unraid.net.staging.plg';
+        }
+        if ($this->connectPluginInstalled && !file_exists('/usr/local/sbin/unraid-api')) {
+            $this->connectPluginInstalled .= '_installFailed';
+        }
+
+        // exit early if the plugin is not installed
+        if (!$this->connectPluginInstalled) {
+            return;
+        }
+
+        $this->connectPluginVersion = file_exists('/var/log/plugins/dynamix.unraid.net.plg')
+            ? trim(@exec('/usr/local/sbin/plugin version /var/log/plugins/dynamix.unraid.net.plg 2>/dev/null'))
+            : (file_exists('/var/log/plugins/dynamix.unraid.net.staging.plg')
+                ? trim(@exec('/usr/local/sbin/plugin version /var/log/plugins/dynamix.unraid.net.staging.plg 2>/dev/null'))
+                : 'base-' . $this->var['version']);
+
+        $this->getMyServersCfgValues();
+        $this->getConnectKnownOrigins();
+        $this->getFlashBackupStatus();
+    }
+
+    private function getFlashBackupStatus() {
+        $flashbackupCfg = '/var/local/emhttp/flashbackup.ini';
+        $this->flashbackupStatus = (file_exists($flashbackupCfg)) ? @parse_ini_file($flashbackupCfg) : [];
+        $this->flashBackupActivated = empty($this->flashbackupStatus['activated']) ? '' : 'true';
+    }
+
+    private function getMyServersCfgValues() {
+        /**
+         * @todo can we read this from somewhere other than the flash? Connect page uses this path and /boot/config/plugins/dynamix.my.servers/myservers.cfg…
+         * - $myservers_memory_cfg_path ='/var/local/emhttp/myservers.cfg';
+         * - $mystatus = (file_exists($myservers_memory_cfg_path)) ? @parse_ini_file($myservers_memory_cfg_path) : [];
+         */
+        $flashCfgPath = '/boot/config/plugins/dynamix.my.servers/myservers.cfg';
+        $this->myServersFlashCfg = file_exists($flashCfgPath) ? @parse_ini_file($flashCfgPath, true) : [];
+        // ensure some vars are defined here so we don't have to test them later
+        if (empty($this->myServersFlashCfg['remote']['apikey'])) {
+            $this->myServersFlashCfg['remote']['apikey'] = "";
+        }
+        if (empty($this->myServersFlashCfg['remote']['wanaccess'])) {
+            $this->myServersFlashCfg['remote']['wanaccess'] = "no";
+        }
+        if (empty($this->myServersFlashCfg['remote']['wanport'])) {
+            $this->myServersFlashCfg['remote']['wanport'] = 33443;
+        }
+        if (empty($this->myServersFlashCfg['remote']['upnpEnabled'])) {
+            $this->myServersFlashCfg['remote']['upnpEnabled'] = "no";
+        }
+        if (empty($this->myServersFlashCfg['remote']['dynamicRemoteAccessType'])) {
+            $this->myServersFlashCfg['remote']['dynamicRemoteAccessType'] = "DISABLED";
+        }
+
+        $this->apiKey = $this->myServersFlashCfg['upc']['apikey'] ?? '';
+        $this->apiVersion = $this->myServersFlashCfg['api']['version'] ?? '';
+        $this->avatar = (!empty($this->myServersFlashCfg['remote']['avatar']) && $this->connectPluginInstalled) ? $this->myServersFlashCfg['remote']['avatar'] : '';
+        $this->email = $this->myServersFlashCfg['remote']['email'] ?? '';
+        $this->hasRemoteApikey = !empty($this->myServersFlashCfg['remote']['apikey']);
+        $this->registered = !empty($this->myServersFlashCfg['remote']['apikey']) && $this->connectPluginInstalled;
+        $this->registeredTime = $this->myServersFlashCfg['remote']['regWizTime'] ?? '';
+        $this->username = $this->myServersFlashCfg['remote']['username'] ?? '';
+    }
+
+    private function getConnectKnownOrigins() {
+        /**
+         * Allowed origins warning displayed when the current webGUI URL is NOT included in the known lists of allowed origins.
+         * Include localhost in the test, but only display HTTP(S) URLs that do not include localhost.
+         */
+        $this->host = $_SERVER['HTTP_HOST'] ?? "unknown";
+        $memoryCfgPath = '/var/local/emhttp/myservers.cfg';
+        $this->myServersMemoryCfg = (file_exists($memoryCfgPath)) ? @parse_ini_file($memoryCfgPath) : [];
+        $this->myServersMiniGraphConnected = (($this->myServersMemoryCfg['minigraph']??'') === 'CONNECTED');
+
+        $allowedOrigins = $this->myServersMemoryCfg['allowedOrigins'] ?? "";
+        $extraOrigins = $this->myServersFlashCfg['api']['extraOrigins'] ?? "";
+        $combinedOrigins = $allowedOrigins . "," . $extraOrigins; // combine the two strings for easier searching
+        $combinedOrigins = str_replace(" ", "", $combinedOrigins); // replace any spaces with nothing
+        $hostNotKnown = stripos($combinedOrigins, $this->host) === false; // check if the current host is in the combined list of origins
+
+        if ($extraOrigins) {
+            $this->extraOrigins = explode(",", $extraOrigins);
+        }
+
+        if ($hostNotKnown) {
+            $this->combinedKnownOrigins = explode(",", $combinedOrigins);
+
+            if ($this->combinedKnownOrigins) {
+                foreach($this->combinedKnownOrigins as $key => $origin) {
+                    if ( (strpos($origin, "http") === false) || (strpos($origin, "localhost") !== false) ) {
+                        // clean up $this->combinedKnownOrigins, only display warning if origins still remain to display
+                        unset($this->combinedKnownOrigins[$key]);
+                    }
+                }
+                // for some reason the unset creates an associative array, so reindex the array with just the values. Otherwise we get an object passed to the UPC JS instead of an array.
+                if ($this->combinedKnownOrigins) {
+                    $this->combinedKnownOrigins = array_values($this->combinedKnownOrigins);
+                }
+            }
+        }
+    }
+
+    /**
+     * Retrieve the server information as an associative array
+     *
+     * @return array An array containing server information.
+     */
+    public function getServerState()
+    {
+        $serverState = [
+            "array" => [
+                "state" => @$this->getWebguiGlobal('var', 'fsState'),
+                "progress" => @$this->getWebguiGlobal('var', 'fsProgress'),
+            ],
+            "apiKey" => $this->apiKey,
+            "apiVersion" => $this->apiVersion,
+            "avatar" => $this->avatar,
+            "caseModel" => $this->caseModel,
+            "config" => [
+                'valid' => ($this->var['configValid'] === 'yes'),
+                'error' => isset($this->configErrorEnum[$this->var['configValid']]) ? $this->configErrorEnum[$this->var['configValid']] : null,
+            ],
+            "connectPluginInstalled" => $this->connectPluginInstalled,
+            "connectPluginVersion" => $this->connectPluginVersion,
+            "csrf" => $this->var['csrf_token'],
+            "dateTimeFormat" => [
+                "date" => @$this->getWebguiGlobal('display', 'date') ?? '',
+                "time" => @$this->getWebguiGlobal('display', 'time') ?? '',
+            ],
+            "description" => $this->var['COMMENT'] ? htmlspecialchars($this->var['COMMENT'], ENT_HTML5, 'UTF-8') : '',
+            "deviceCount" => $this->var['deviceCount'],
+            "email" => $this->email,
+            "expireTime" => 1000 * (($this->var['regTy'] === 'Trial' || strstr($this->var['regTy'], 'expired')) ? $this->var['regTm2'] : 0),
+            "extraOrigins" => $this->extraOrigins,
+            "flashProduct" => $this->var['flashProduct'],
+            "flashVendor" => $this->var['flashVendor'],
+            "flashBackupActivated" => $this->flashBackupActivated,
+            "guid" => $this->var['flashGUID'],
+            "hasRemoteApikey" => $this->hasRemoteApikey,
+            "internalPort" => _var($_SERVER, 'SERVER_PORT'),
+            "keyfile" => $this->keyfileBase64UrlSafe,
+            "lanIp" => ipaddr(),
+            "locale" => (!empty($_SESSION) && $_SESSION['locale']) ? $_SESSION['locale'] : 'en_US',
+            "model" => $this->var['SYS_MODEL'] ? htmlspecialchars($this->var['SYS_MODEL'], ENT_HTML5, 'UTF-8') : '',
+            "name" => htmlspecialchars($this->var['NAME'], ENT_HTML5, 'UTF-8'),
+            "osVersion" => $this->osVersion,
+            "osVersionBranch" => $this->osVersionBranch,
+            "protocol" => _var($_SERVER, 'REQUEST_SCHEME'),
+            "rebootType" => $this->rebootDetails->rebootType,
+            "rebootVersion" => $this->rebootDetails->rebootVersion,
+            "regDevs" => @(int)$this->var['regDevs'] ?? 0,
+            "regGen" => @(int)$this->var['regGen'],
+            "regGuid" => @$this->var['regGUID'] ?? '',
+            "regTo" => @htmlspecialchars($this->var['regTo'], ENT_HTML5, 'UTF-8') ?? '',
+            "regTm" => $this->var['regTm'] ? @$this->var['regTm'] * 1000 : '', // JS expects milliseconds
+            "regTy" => @$this->var['regTy'] ?? '',
+            "regExp" => $this->var['regExp'] ? @$this->var['regExp'] * 1000 : '', // JS expects milliseconds
+            "registered" => $this->registered,
+            "registeredTime" => $this->registeredTime,
+            "site" => _var($_SERVER, 'REQUEST_SCHEME') . "://" . _var($_SERVER, 'HTTP_HOST'),
+            "state" => strtoupper(empty($this->var['regCheck']) ? $this->var['regTy'] : $this->var['regCheck']),
+            "theme" => [
+                "banner" => !empty($this->getWebguiGlobal('display', 'banner')),
+                "bannerGradient" => $this->getWebguiGlobal('display', 'showBannerGradient') === 'yes' ?? false,
+                "bgColor" => ($this->getWebguiGlobal('display', 'background')) ? '#' . $this->getWebguiGlobal('display', 'background') : '',
+                "descriptionShow" => (!empty($this->getWebguiGlobal('display', 'headerdescription')) && $this->getWebguiGlobal('display', 'headerdescription') !== 'no'),
+                "metaColor" => ($this->getWebguiGlobal('display', 'headermetacolor') ?? '') ? '#' . $this->getWebguiGlobal('display', 'headermetacolor') : '',
+                "name" => $this->getWebguiGlobal('display', 'theme'),
+                "textColor" => ($this->getWebguiGlobal('display', 'header')) ? '#' . $this->getWebguiGlobal('display', 'header') : '',
+            ],
+            "ts" => time(),
+            "uptime" => 1000 * (time() - round(strtok(exec("cat /proc/uptime"), ' '))),
+            "username" => $this->username,
+            "wanFQDN" => @$this->nginxCfg['NGINX_WANFQDN'] ?? '',
+        ];
+
+        if ($this->combinedKnownOrigins) {
+            $serverState['combinedKnownOrigins'] = $this->combinedKnownOrigins;
+        }
+
+        if ($this->updateOsIgnoredReleases) {
+            $serverState['updateOsIgnoredReleases'] = $this->updateOsIgnoredReleases;
+        }
+
+        if ($this->updateOsNotificationsEnabled) {
+            $serverState['updateOsNotificationsEnabled'] = $this->updateOsNotificationsEnabled;
+        }
+
+        if ($this->updateOsResponse) {
+            $serverState['updateOsResponse'] = $this->updateOsResponse;
+        }
+
+        return $serverState;
+    }
+
+    /**
+     * Retrieve the server information as JSON
+     *
+     * @return string
+     */
+    public function getServerStateJson() {
+        return json_encode($this->getServerState());
+    }
+
+    /**
+     * Retrieve the server information as JSON string with converted special characters to HTML entities
+     *
+     * @return string
+     */
+    public function getServerStateJsonForHtmlAttr() {
+        $json = json_encode($this->getServerState());
+        return htmlspecialchars($json, ENT_QUOTES, 'UTF-8');
+    }
+}

emhttp/plugins/dynamix.my.servers/include/translations.php

@@ -0,0 +1,410 @@
+<?php
+/* Copyright 2005-2023, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+/**
+ * Welcome to the Thunderdome. A place where you can get lost in a sea of translations.
+ *
+ * This file is used to generate the translations for the Vue3 based web components.
+ *
+ * These key value pairs are derived from web/locales/en_US.json.
+ * We use the en_US.json file as the source of truth for the translations.
+ * This file is then used to generate the translations for the web components and delivered to them via PHP as a JSON object in myservers2.php (my favorite file name).
+ * The web components then use the translations to display the appropriate text to the user.
+ *
+ * Workflow is as follows:
+ * 1. Create a new translation in en_US.json
+ * 2. Create a new translation in this file
+ * 3. Open unraid/lang-en_US and add the new translation to the appropriate file – typically translations.txt.
+ * 3a. This is done so that the translation is available to the rest of the Unraid webgui.
+ * 3b. Unfortunately there are numerous "special characters" that aren't allowed in Unraid's translation keys as they're automatically stripped out.
+ * 3c. This means that we have to create a new translation key that is a "safe" version of the translation key used in the web components.
+ * 3d. Special characters that are not allowed are: ? { } | & ~ ! [ ] ( ) / : * ^ . " '
+ * 3e. There are likely more but I'm unable to find the documentation PDF - updated list of invalid characters above as mentioned in the language guide document.
+ *
+ * Usage example:
+ * ```
+ * $wCTranslations = new WebComponentTranslations();
+ * $wCTranslations->getTranslations();
+ * ```
+ */
+$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
+require_once "$docroot/webGui/include/Translations.php";
+
+class WebComponentTranslations
+{
+    private $translations = [];
+
+    public function __construct()
+    {
+        $this->initializeTranslations();
+    }
+
+    private function initializeTranslations()
+    {
+        $this->translations[$_SESSION['locale'] ?? 'en_US'] = [
+            '{0} {1} Key…' => sprintf(_('%1s %2s Key…'), '{0}', '{1}'),
+            '{0} devices' => sprintf(_('%s devices'), '{0}'),
+            '{0} out of {1} allowed devices – upgrade your key to support more devices' => sprintf(_('%1s out of %2s allowed devices – upgrade your key to support more devices'), '{0}', '{1}'),
+            '{0} out of {1} devices' => sprintf(_('%1s out of %2s devices'), '{0}', '{1}'),
+            '{0} Release Notes' => sprintf(_('%s Release Notes'), '{0}'),
+            '{0} Signed In Successfully' => sprintf(_('%s Signed In Successfully'), '{0}'),
+            '{0} Signed Out Successfully' => sprintf(_('%s Signed Out Successfully'), '{0}'),
+            '{0} Update Available' => sprintf(_('%s Update Available'), '{0}'),
+            '{1} Key {0} Successfully' => sprintf(_('%2s Key %1s Successfully'), '{0}', '{1}'),
+            '<p>It is not possible to use a Trial key with an existing Unraid OS installation.</p><p>You may purchase a license key corresponding to this USB Flash device to continue using this installation.</p>' => '<p>' . _('It is not possible to use a Trial key with an existing Unraid OS installation') . '</p><p>' . _('You may purchase a license key corresponding to this USB Flash device to continue using this installation.') . '</p>',
+            '<p>Please refresh the page to ensure you load your latest configuration</p>' => '<p>' . _('Please refresh the page to ensure you load your latest configuration') . '</p>',
+            '<p>Register for Connect by signing in to your Unraid.net account</p>' => '<p>' . _('Register for Connect by signing in to your Unraid.net account') . '</p>',
+            '<p>The license key file does not correspond to the USB Flash boot device. Please copy the correct key file to the /config directory on your USB Flash boot device or choose Purchase Key.</p><p>Your Unraid registration key is ineligible for replacement as it has been replaced within the last 12 months.</p>' => '<p>' . _('The license key file does not correspond to the USB Flash boot device.') . ' ' . _('Please copy the correct key file to the /config directory on your USB Flash boot device or choose Purchase Key') . '</p><p>' . _('Your Unraid registration key is ineligible for replacement as it has been replaced within the last 12 months.') . '</p>',
+            '<p>The license key file does not correspond to the USB Flash boot device. Please copy the correct key file to the /config directory on your USB Flash boot device or choose Purchase Key.</p><p>Your Unraid registration key is ineligible for replacement as it is blacklisted.</p>' => '<p>' . _('The license key file does not correspond to the USB Flash boot device.') . ' ' . _('Please copy the correct key file to the /config directory on your USB Flash boot device or choose Purchase Key') . '</p><p>' . _('Your Unraid registration key is ineligible for replacement as it is blacklisted.') . '</p>',
+            '<p>The license key file does not correspond to the USB Flash boot device. Please copy the correct key file to the /config directory on your USB Flash boot device.</p><p>You may also attempt to Purchase or Replace your key.</p>' => '<p>' . _('The license key file does not correspond to the USB Flash boot device.') . ' ' . _('Please copy the correct key file to the /config directory on your USB Flash boot device') . '</p><p>' . _('You may also attempt to Purchase or Replace your key.') . '</p>',
+            '<p>There are multiple license key files present on your USB flash device and none of them correspond to the USB Flash boot device. Please remove all key files, except the one you want to replace, from the /config directory on your USB Flash boot device.</p><p>Alternately you may purchase a license key for this USB flash device.</p><p>If you want to replace one of your license keys with a new key bound to this USB Flash device, please first remove all other key files first.</p>' => '<p>' . _('There are multiple license key files present on your USB flash device and none of them correspond to the USB Flash boot device.') . ' ' . _('Please remove all key files, except the one you want to replace, from the /config directory on your USB Flash boot device') . '</p><p>' . _('Alternately you may purchase a license key for this USB flash device') . '</p><p>' . _('If you want to replace one of your license keys with a new key bound to this USB Flash device, please first remove all other key files first.') . '</p>',
+            '<p>There is a physical problem accessing your USB Flash boot device</p>' => '<p>' . _('There is a physical problem accessing your USB Flash boot device') . '</p>',
+            '<p>There is a problem with your USB Flash device</p>' => '<p>' . _('There is a problem with your USB Flash device') . '</p>',
+            '<p>This USB Flash boot device has been blacklisted. This can occur as a result of transferring your license key to a replacement USB Flash device, and you are currently booted from your old USB Flash device.</p><p>A USB Flash device may also be blacklisted if we discover the serial number is not unique – this is common with USB card readers.</p>' => '<p>' . _('This USB Flash boot device has been blacklisted.') . ' ' . _('This can occur as a result of transferring your license key to a replacement USB Flash device, and you are currently booted from your old USB Flash device.') . '</p><p>' . _('A USB Flash device may also be blacklisted if we discover the serial number is not unique – this is common with USB card readers.') . '</p>',
+            '<p>This USB Flash device has an invalid GUID. Please try a different USB Flash device</p>' => '<p>' . _('This USB Flash device has an invalid GUID. Please try a different USB Flash device') . '</p>',
+            '<p>To continue using Unraid OS you may purchase a license key. Alternately, you may request a Trial extension.</p>' => '<p>' . _('To continue using Unraid OS you may purchase a license key.') . ' ' . _('Alternately, you may request a Trial extension.') . '</p>',
+            '<p>To support more storage devices as your server grows, click Upgrade Key.</p>' => '<p>' . _('To support more storage devices as your server grows, click Upgrade Key.') . '</p>',
+            '<p>You have used all your Trial extensions. To continue using Unraid OS you may purchase a license key.</p>' => '<p>' . _('You have used all your Trial extensions.') . ' ' . _('To continue using Unraid OS you may purchase a license key.') . '</p>',
+            '<p>Your <em>Trial</em> key includes all the functionality and device support of an <em>Unleashed</em> key.</p><p>After your <em>Trial</em> has reached expiration, your server <strong>still functions normally</strong> until the next time you Stop the array or reboot your server.</p><p>At that point you may either purchase a license key or request a <em>Trial</em> extension.</p>' => '<p>' . _('Your **Trial** key includes all the functionality and device support of an **Unleashed** key') . '</p><p>' . _('After your **Trial** has reached expiration, your server *still functions normally* until the next time you Stop the array or reboot your server') . '</p><p>' . _('At that point you may either purchase a license key or request a *Trial* extension.') . '</p>',
+            '<p>Your license key file is corrupted or missing. The key file should be located in the /config directory on your USB Flash boot device.</p><p>If you do not have a backup copy of your license key file you may attempt to recover your key.</p><p>If this was an expired Trial installation, you may purchase a license key.</p>' => '<p>' . _('Your license key file is corrupted or missing.') . ' ' . _('The key file should be located in the /config directory on your USB Flash boot device') . '</p><p>' . _('If you do not have a backup copy of your license key file you may attempt to recover your key with your Unraid.net account') . '</p><p>' . _('If this was an expired Trial installation, you may purchase a license key.') . '</p>',
+            '<p>Your license key file is corrupted or missing. The key file should be located in the /config directory on your USB Flash boot device.</p><p>You may attempt to recover your key with your Unraid.net account.</p><p>If this was an expired Trial installation, you may purchase a license key.</p>' => '<p>' . _('Your license key file is corrupted or missing.') . ' ' . _('The key file should be located in the /config directory on your USB Flash boot device') . '</p><p>' . _('If you do not have a backup copy of your license key file you may attempt to recover your key with your Unraid.net account') . '</p><p>' . _('If this was an expired Trial installation, you may purchase a license key.') . '</p>',
+            '<p>Your server will not be usable until you purchase a Registration key or install a free 30 day <em>Trial</em> key. A <em>Trial</em> key provides all the functionality of an Unleashed Registration key.</p><p>Registration keys are bound to your USB Flash boot device serial number (GUID). Please use a high quality name brand device at least 1GB in size.</p><p>Note: USB memory card readers are generally not supported because most do not present unique serial numbers.</p><p><strong>Important:</strong></p><ul class="list-disc pl-16px"><li>Please make sure your server time is accurate to within 5 minutes</li><li>Please make sure there is a DNS server specified</li></ul>' => '<p>' . _('Your server will not be usable until you purchase a Registration key or install a free 30 day <em>Trial</em> key.') . ' ' . _('A <em>Trial</em> key provides all the functionality of an Unleashed Registration key.') . '</p><p>' . _('Registration keys are bound to your USB Flash boot device serial number (GUID).') . ' ' . _('Please use a high quality name brand device at least 1GB in size.') . '</p><p>' . _('Note: USB memory card readers are generally not supported because most do not present unique serial numbers.') . '</p><p>' . _('*Important:*') . '</p><ul class="list-disc pl-16px"><li>' . _('Please make sure your server time is accurate to within 5 minutes') . '</li><li>' . _('Please make sure there is a DNS server specified') . '</li>>' . '</ul>',
+            '<p>Your Trial key requires an internet connection.</p><p><a href="/Settings/NetworkSettings" class="underline">Please check Settings > Network</a></p>' => '<p>' . _('Your Trial key requires an internet connection') . '</p><p><a href="/Settings/NetworkSettings" class="underline">' . _('Please check Settings > Network') . '</a></p>',
+            '<p>Your Unraid registration key is ineligible for replacement as it has been replaced within the last 12 months.</p>' => '<p>' . _('Your Unraid registration key is ineligible for replacement as it has been replaced within the last 12 months.') . '</p>',
+            'A Trial key provides all the functionality of an Unleashed Registration key' => _('A Trial key provides all the functionality of an Unleashed Registration key'),
+            'Acklowledge that you have made a Flash Backup to enable this action' => _('Acklowledge that you have made a Flash Backup to enable this action'),
+            'ago' => _('ago'),
+            'All you need is an active internet connection, an Unraid.net account, and the Connect plugin. Get started by installing the plugin.' => _('All you need is an active internet connection, an Unraid.net account, and the Connect plugin.') . ' ' . _('Get started by installing the plugin.'),
+            'Attached Storage Devices' => _('Attached Storage Devices'),
+            'Backing up...this may take a few minutes' => _('Backing up...this may take a few minutes'),
+            'Basic' => _('Basic'),
+            'Begin downgrade to {0}' => sprintf(_('Begin downgrade to %s'), '{0}'),
+            'Beta' => _('Beta'),
+            'Blacklisted USB Flash GUID' => _('Blacklisted USB Flash GUID'),
+            'BLACKLISTED' => _('BLACKLISTED'),
+            'Calculating OS Update Eligibility…' => _('Calculating OS Update Eligibility…'),
+            'Calculating trial expiration…' => _('Calculating trial expiration…'),
+            'Callback redirect type not present or incorrect' => _('Callback redirect type not present or incorrect'),
+            'Cancel {0}' => sprintf(_('Cancel %s'), '{0}'),
+            'Cancel' => _('Cancel'),
+            'Cannot access your USB Flash boot device' => _('Cannot access your USB Flash boot device'),
+            'Cannot validate Unraid Trial key' => _('Cannot validate Unraid Trial key'),
+            'Check for OS Updates' => _('Check for OS Updates'),
+            'check for OS updates' => _('check for OS updates'),
+            'Check for Prereleases' => _('Check for Prereleases'),
+            'Checking WAN IPs…' => _('Checking WAN IPs…'),
+            'Checking...' => _('Checking...'),
+            'Checkout the Connect Documentation' => _('Checkout the Connect Documentation'),
+            'Click to close modal' => _('Click to close modal'),
+            'Click to Copy LAN IP {0}' => sprintf(_('Click to copy LAN IP %s'), '{0}'),
+            'Close Dropdown' => _('Close Dropdown'),
+            'Close Modal' => _('Close Modal'),
+            'Close' => _('Close'),
+            'Configure Connect Features' => _('Configure Connect Features'),
+            'Confirm and start update' => _('Confirm and start update'),
+            'Confirm to Install Unraid OS {0}' => sprintf(_('Confirm to Install Unraid OS %s'), '{0}'),
+            'Connected' => _('Connected'),
+            'Contact Support' => _('Contact Support'),
+            'Continue' => _('Continue'),
+            'Copied' => _('Copied'),
+            'Copy Key URL' => _('Copy Key URL'),
+            'Copy your Key URL: {0}' => sprintf(_('Copy your Key URL: %s'), '{0}'),
+            'Create Flash Backup' => _('Create Flash Backup'),
+            'Current Version {0}' => sprintf(_('Current Version %s'), '{0}'),
+            'Current Version: Unraid {0}' => sprintf(_('Current Version: Unraid %s'), '{0}'),
+            'Customizable Dashboard Tiles' => _('Customizable Dashboard Tiles'),
+            'day' => sprintf(_('%s day'), '{n}') . ' | ' . sprintf(_('%s days'), '{n}'),
+            'Deep Linking' => _('Deep Linking'),
+            'DNS issue, unable to resolve wanip4.unraid.net' => _('DNS issue, unable to resolve wanip4.unraid.net'),
+            'Downgrade Unraid OS to {0}' => sprintf(_('Downgrade Unraid OS to %s'), '{0}'),
+            'Downgrade Unraid OS' => _('Downgrade Unraid OS'),
+            'Downgrades are only recommended if you\'re unable to solve a critical issue.' => _('Downgrades are only recommended if you\'re unable to solve a critical issue.'),
+            'Download Diagnostics' => _('Download Diagnostics'),
+            'Download the Diagnostics zip then please open a bug report on our forums with a description of the issue along with your diagnostics.' => _('Download the Diagnostics zip then please open a bug report on our forums with a description of the issue along with your diagnostics.'),
+            'Download unraid-api Logs' => _('Download unraid-api Logs'),
+            'Dynamic Remote Access' => _('Dynamic Remote Access'),
+            'Enable update notifications' => _('Enable update notifications'),
+            'Enhance your experience with Unraid Connect' => _('Enhance your experience with Unraid Connect'),
+            'Enhance your Unraid experience with Connect' => _('Enhance your Unraid experience with Connect'),
+            'Enhance your Unraid experience' => _('Enhance your Unraid experience'),
+            'Error creating a trial key. Please try again later.' => _('Error creating a trial key. Please try again later.'),
+            'Error Parsing Changelog • {0}' => sprintf(_('Error Parsing Changelog • %s'), '{0}'),
+            'Error' => _('Error'),
+            'Expired {0}' => sprintf(_('Expired %s'), '{0}'),
+            'Expired' => _('Expired'),
+            'Expires at {0}' => sprintf(_('Expires at %s'), '{0}'),
+            'Expires in {0}' => sprintf(_('Expires in %s'), '{0}'),
+            'Extend License to Update' => _('Extend License to Update'),
+            'Extend License' => _('Extend License'),
+            'Extend Trial' => _('Extend Trial'),
+            'Extending your free trial by 15 days' => _('Extending your free trial by 15 days'),
+            'Extension Installed' => _('Extension Installed'),
+            'Failed to {0} {1} Key' => sprintf(_('Failed to %1s %2s Key'), '{0}', '{1}'),
+            'Failed to install key' => _('Failed to install key'),
+            'Failed to update Connect account configuration' => _('Failed to update Connect account configuration'),
+            'Fetching & parsing changelog…' => _('Fetching & parsing changelog…'),
+            'Fix Error' => _('Fix Error'),
+            'Flash Backup is not available. Navigate to {0}/Main/Settings/Flash to try again then come back to this page.' => sprintf(_('Flash Backup is not available. Navigate to %s/Main/Settings/Flash to try again then come back to this page.'), '{0}'),
+            'Flash GUID Error' => _('Flash GUID Error'),
+            'Flash GUID required to check replacement status' => _('Flash GUID required to check replacement status'),
+            'Flash GUID' => _('Flash GUID'),
+            'Flash Product' => _('Flash Product'),
+            'Flash Vendor' => _('Flash Vendor'),
+            'Get an overview of your server\'s state, storage space, apps and VMs status, and more.' => _('Get an overview of your server\'s state, storage space, apps and VMs status, and more.'),
+            'Get Started' => _('Get Started'),
+            'Go to Connect plugin settings' => _('Go to Connect plugin settings'),
+            'Go to Connect' => _('Go to Connect'),
+            'Go to Management Access Now' => _('Go to Management Access Now'),
+            'Go to Settings > Notifications to enable automatic OS update notifications for future releases.' => _('Go to Settings > Notifications to enable automatic OS update notifications for future releases.'),
+            'Go to Tools > Management Access to activate the Flash Backup feature and ensure your backup is up-to-date.' => _('Go to Tools > Management Access to activate the Flash Backup feature and ensure your backup is up-to-date.'),
+            'Go to Tools > Management Access to ensure your backup is up-to-date.' => _('Go to Tools > Management Access to ensure your backup is up-to-date.'),
+            'Go to Tools > Registration to fix' => _('Go to Tools > Registration to fix'),
+            'Go to Tools > Registration to Learn More' => _('Go to Tools > Registration to Learn More'),
+            'Go to Tools > Update OS for more options.' => _('Go to Tools > Update OS for more options.'),
+            'Go to Tools > Update' => _('Go to Tools > Update'),
+            'hour' => sprintf(_('%s hour'), '{n}') . ' | ' . sprintf(_('%s hours'), '{n}'),
+            'I have made a Flash Backup' => _('I have made a Flash Backup'),
+            'If you are asked to supply logs, please open a support request on our Contact Page and reply to the email message you receive with your logs attached.' => _('If you are asked to supply logs, please open a support request on our Contact Page and reply to the email message you receive with your logs attached.'),
+            'Ignore this message if you are currently connected via Remote Access or VPN.' => _('Ignore this message if you are currently connected via Remote Access or VPN.'),
+            'Ignore this release until next reboot' => _('Ignore this release until next reboot'),
+            'Ignored Releases' => _('Ignored Releases'),
+            'In the rare event you need to downgrade we ask that you please provide us with Diagnostics so we can investigate your issue.' => _('In the rare event you need to downgrade we ask that you please provide us with Diagnostics so we can investigate your issue.'),
+            'Install Connect' => _('Install Connect'),
+            'Install Recovered' => _('Install Recovered'),
+            'Install Replaced' => _('Install Replaced'),
+            'Install Unraid OS {0}' => sprintf(_('Install Unraid OS %s'), '{0}'),
+            'Install' => _('Install'),
+            'Installed' => _('Installed'),
+            'Installing Extended Trial' => _('Installing Extended Trial'),
+            'Installing Extended' => _('Installing Extended'),
+            'Installing Recovered' => _('Installing Recovered'),
+            'Installing Replaced' => _('Installing Replaced'),
+            'Installing' => _('Installing'),
+            'Introducing Unraid Connect' => _('Introducing Unraid Connect'),
+            'Invalid API Key Format' => _('Invalid API Key Format'),
+            'Invalid API Key' => _('Invalid API Key'),
+            'Invalid installation' => _('Invalid installation'),
+            'It\s highly recommended to review the changelog before continuing your update.' => _('It\'s highly recommended to review the changelog before continuing your update.'),
+            'Key ineligible for {0}' => sprintf(_('Key ineligible for %s'), '{0}'),
+            'Key ineligible for future releases' => _('Key ineligible for future releases'),
+            'Keyfile required to check replacement status' => _('Keyfile required to check replacement status'),
+            'LAN IP {0}' => sprintf(_('LAN IP %s'), '{0}'),
+            'LAN IP Copied' => _('LAN IP Copied'),
+            'LAN IP' => _('LAN IP'),
+            'Last checked: {0}' => sprintf(_('Last checked: %s'), '{0}'),
+            'Learn more about the error' => _('Learn more about the error'),
+            'Learn more and fix' => _('Learn more and fix'),
+            'Learn more and link your key to your account' => _('Learn more and link your key to your account'),
+            'Learn More' => _('Learn More'),
+            'Learn more' => _('Learn more'),
+            'Let\'s Unleash your Hardware!' => _('Let\'s Unleash your Hardware!'),
+            'License key actions' => _('License key actions'),
+            'License key type' => _('License key type'),
+            'License Management' => _('License Management'),
+            'Link Key' => _('Link Key'),
+            'Linked to Unraid.net account' => _('Linked to Unraidnet account'),
+            'Loading' => _('Loading'),
+            'Manage Unraid.net Account in new tab' => _('Manage Unraid.net Account in new tab'),
+            'Manage Unraid.net Account' => _('Manage Unraid.net Account'),
+            'Manage your license keys at any time via the My Keys section.' => _('Manage your license keys at any time via the My Keys section.'),
+            'Manage Your Server Within Connect' => _('Manage Your Server Within Connect'),
+            'minute' => sprintf(_('%s minute'), '{n}') . ' | ' . sprintf(_('%s minutes'), '{n}'),
+            'Missing key file' => _('Missing key file'),
+            'month' => sprintf(_('%s month'), '{n}') . ' | ' . sprintf(_('%s months'), '{n}'),
+            'More options' => _('More options'),
+            'Multiple License Keys Present' => _('Multiple License Keys Present'),
+            'Never ever be left without a backup of your config. If you need to change flash drives, generate a backup from Connect and be up and running in minutes.' => _('Never ever be left without a backup of your config.') . ' ' . _('If you need to change flash drives, generate a backup from Connect and be up and running in minutes.'),
+            'New Version: {0}' => sprintf(_('New Version: %s'), '{0}'),
+            'No downgrade available' => _('No downgrade available'),
+            'No Flash' => _('No Flash'),
+            'No Keyfile' => _('No Keyfile'),
+            'No thanks' => _('No thanks'),
+            'No USB flash configuration data' => _('No USB flash configuration data'),
+            'Not Linked' => _('Not Linked'),
+            'On January 1st, 2023 SSL certificates for unraid.net were deprecated. You MUST provision a new SSL certificate to use our new myunraid.net domain. You can do this on the Settings > Management Access page.' => _('On January 1st, 2023 SSL certificates for unraid.net were deprecated. You MUST provision a new SSL certificate to use our new myunraid.net domain. You can do this on the Settings > Management Access page.'),
+            'Online Flash Backup' => _('Online Flash Backup'),
+            'Open a bug report' => _('Open a bug report'),
+            'Open Dropdown' => _('Open Dropdown'),
+            'Opens Connect in new tab' => _('Opens Connect in new tab'),
+            'Original release date {0}' => sprintf(_('Original release date %s'), '{0}'),
+            'OS Update Eligibility Expired' => _('OS Update Eligibility Expired'),
+            'Performing actions' => _('Performing actions'),
+            'Please confirm the update details below' => _('Please confirm the update details below'),
+            'Please finish the initiated downgrade to enable updates.' => _('Please finish the initiated downgrade to enable updates.'),
+            'Please finish the initiated update to enable a downgrade.' => _('Please finish the initiated update to enable a downgrade.'),
+            'Please fix any errors and try again.' => _('Please fix any errors and try again.'),
+            'Please keep this window open while we perform some actions' => _('Please keep this window open while we perform some actions'),
+            'Please keep this window open' => _('Please keep this window open'),
+            'Please sign out then sign back in to refresh your API key.' => _('Please sign out then sign back in to refresh your API key.'),
+            'Please wait while the page reloads to install your trial key' => _('Please wait while the page reloads to install your trial key'),
+            'Plus more on the way' => _('Plus more on the way'),
+            'Plus' => _('Plus'),
+            'Pro' => _('Pro'),
+            'Purchase Key' => _('Purchase Key'),
+            'Purchase' => _('Purchase'),
+            'Ready to Install Key' => _('Ready to Install Key'),
+            'Ready to update Connect account configuration' => _('Ready to update Connect account configuration'),
+            'Real-time Monitoring' => _('Real-time Monitoring'),
+            'Reboot Now to Downgrade to {0}' => sprintf(_('Reboot Now to Downgrade to %s'), '{0}'),
+            'Reboot Now to Downgrade' => _('Reboot Now to Downgrade'),
+            'Reboot Now to Update to {0}' => sprintf(_('Reboot Now to Update to %s'), '{0}'),
+            'Reboot Now to Update' => _('Reboot Now to Update'),
+            'Reboot Required for Downgrade to {0}' => sprintf(_('Reboot Required for Downgrade to %s'), '{0}'),
+            'Reboot Required for Downgrade' => _('Reboot Required for Downgrade'),
+            'Reboot Required for Update to {0}' => sprintf(_('Reboot Required for Update to %s'), '{0}'),
+            'Reboot Required for Update' => _('Reboot Required for Update'),
+            'Rebooting will likely solve this.' => _('Rebooting will likely solve this.'),
+            'Receive the latest and greatest for Unraid OS. Whether it new features, security patches, or bug fixes – keeping your server up-to-date ensures the best experience that Unraid has to offer.' => _('Receive the latest and greatest for Unraid OS.') . ' ' . _('Whether it new features, security patches, or bug fixes – keeping your server up-to-date ensures the best experience that Unraid has to offer.'),
+            'Recover Key' => _('Recover Key'),
+            'Recovered' => _('Recovered'),
+            'Redeem Activation Code' => _('Redeem Activation Code'),
+            'Refresh' => _('Refresh'),
+            'Registered on' => _('Registered on'),
+            'Registered to' => _('Registered to'),
+            'Registration key / USB Flash GUID mismatch' => _('Registration key / USB Flash GUID mismatch'),
+            'Release date {0}' => sprintf(_('Release date %s'), '{0}'),
+            'Release requires verification to update' => _('Release requires verification to update'),
+            'Reload' => _('Reload'),
+            'Remark: Unraid\'s WAN IPv4 {0} does not match your client\'s WAN IPv4 {1}.' => sprintf(_('Remark: Unraid\'s WAN IPv4 %1s does not match your client\'s WAN IPv4 %2s.'), '{0}', '{1}'),
+            'Remark: your WAN IPv4 is {0}' => sprintf(_('Remark: your WAN IPv4 is %s'), '{0}'),
+            'Remove from ignore list' => _('Remove from ignore list'),
+            'Remove' => _('Remove'),
+            'Replace Key' => _('Replace Key'),
+            'Replaced' => _('Replaced'),
+            'Requires the local unraid-api to be running successfully' => _('Requires the local unraid-api to be running successfully'),
+            'Restarting unraid-api…' => _('Restarting unraid-api…'),
+            'second' => sprintf(_('%s second'), '{n}') . ' | ' . sprintf(_('%s seconds'), '{n}'),
+            'Server Up Since {0}' => sprintf(_('Server Up Since %s'), '{0}'),
+            'Servers equipped with a myunraid.net certificate can be managed directly from within the Connect web UI. Manage multiple servers from your phone, tablet, laptop, or PC in the same browser window.' => _('Servers equipped with a myunraid.net certificate can be managed directly from within the Connect web UI.') . ' ' . _('Manage multiple servers from your phone, tablet, laptop, or PC in the same browser window.'),
+            'Set custom server tiles how you like and automatically display your server\'s banner image on your Connect Dashboard.' => _('Set custom server tiles how you like and automatically display your server\'s banner image on your Connect Dashboard.'),
+            'Settings' => _('Settings'),
+            'Sign In Failed' => _('Sign In Failed'),
+            'Sign In requires the local unraid-api to be running' => _('Sign In requires the local unraid-api to be running'),
+            'Sign In to utilize Unraid Connect' => _('Sign In to utilize Unraid Connect'),
+            'Sign In to your Unraid.net account to get started' => _('Sign In to your Unraid.net account to get started'),
+            'Sign In with Unraid.net Account' => _('Sign In with Unraid.net Account'),
+            'Sign In' => _('Sign In'),
+            'Sign Out Failed' => _('Sign Out Failed'),
+            'Sign Out of Unraid.net' => _('Sign Out of Unraid.net'),
+            'Sign Out requires the local unraid-api to be running' => _('Sign Out requires the local unraid-api to be running'),
+            'Signing in {0}…' => sprintf(_('Signing in %s…'), '{0}'),
+            'Signing In' => _('Signing In'),
+            'Signing out {0}…' => sprintf(_('Signing out %s…'), '{0}'),
+            'Signing Out' => _('Signing Out'),
+            'Something went wrong' => _('Something went wrong'),
+            'SSL certificates for unraid.net deprecated' => _('SSL certificates for unraid.net deprecated'),
+            'Stale Server' => _('Stale Server'),
+            'Stale' => _('Stale'),
+            'Start Free 30 Day Trial' => _('Start Free 30 Day Trial'),
+            'Starting your free 30 day trial' => _('Starting your free 30 day trial'),
+            'Success!' => _('Success!'),
+            'Thank you for choosing Unraid OS!' => _('Thank you for choosing Unraid OS!'),
+            'Thank you for installing Connect!' => _('Thank you for installing Connect!'),
+            'Thank you for purchasing an Unraid {0} Key!' => sprintf(_('Thank you for purchasing an Unraid %s Key!'), '{0}'),
+            'Thank you for upgrading to an Unraid {0} Key!' => sprintf(_('Thank you for upgrading to an Unraid %s Key!'), '{0}'),
+            'The Connect dashboard links to relevant sections of the webgui, allowing quick access to those settings and server sections.' => _('The Connect dashboard links to relevant sections of the webgui, allowing quick access to those settings and server sections.'),
+            'The logs may contain sensitive information so do not post them publicly.' => _('The logs may contain sensitive information so do not post them publicly.'),
+            'The primary method of support for Unraid Connect is through our forums and Discord.' => _('The primary method of support for Unraid Connect is through our forums and Discord.'),
+            'Then go to Tools > Registration to manually install it' => _('Then go to Tools > Registration to manually install it'),
+            'This may indicate a complex network that will not work with this Remote Access solution.' => _('This may indicate a complex network that will not work with this Remote Access solution.'),
+            'This update will require a reboot' => _('This update will require a reboot'),
+            'Toggle on/off server accessibility with dynamic remote access. Automatically turn on UPnP and open a random WAN port on your router at the click of a button and close off access in seconds.' => _('Toggle on/off server accessibility with dynamic remote access.') . ' ' . _('Automatically turn on UPnP and open a random WAN port on your router at the click of a button and close off access in seconds.'),
+            'Too Many Devices' => _('Too Many Devices'),
+            'Transfer License to New Flash' => _('Transfer License to New Flash'),
+            'Trial Expired, see options below' => _('Trial Expired, see options below'),
+            'Trial Expired' => _('Trial Expired'),
+            'Trial Key Created' => _('Trial Key Created'),
+            'Trial Key Creation Failed' => _('Trial Key Creation Failed'),
+            'Trial Key Expired {0}' => sprintf(_('Trial Key Expired %s'), '{0}'),
+            'Trial Key Expired at {0}' => sprintf(_('Trial Key Expired at %s'), '{0}'),
+            'Trial Key Expires at {0}' => sprintf(_('Trial Key Expires at %s'), '{0}'),
+            'Trial Key Expires in {0}' => sprintf(_('Trial Key Expires in %s'), '{0}'),
+            'Trial Requires Internet Connection' => _('Trial Requires Internet Connection'),
+            'Trial' => _('Trial'),
+            'Unable to check for OS updates' => _('Unable to check for OS updates'),
+            'Unable to fetch client WAN IPv4' => _('Unable to fetch client WAN IPv4'),
+            'Unable to open release notes' => _('Unable to open release notes'),
+            'Unknown error' => _('Unknown error'),
+            'Unknown' => _('Unknown'),
+            'unlimited' => _('unlimited'),
+            'Unraid {0} Available' => sprintf(_('Unraid %s Available'), '{0}'),
+            'Unraid {0} Update Available' => sprintf(_('Unraid %s Update Available'), '{0}'),
+            'Unraid {0}' => sprintf(_('Unraid %s'), '{0}'),
+            'Unraid Connect Error' => _('Unraid Connect Error'),
+            'Unraid Connect Forums' => _('Unraid Connect Forums'),
+            'Unraid Connect Install Failed' => _('Unraid Connect Install Failed'),
+            'Unraid Contact Page' => _('Unraid Contact Page'),
+            'Unraid Discord' => _('Unraid Discord'),
+            'Unraid logo animating with a wave like effect' => _('Unraid logo animating with a wave like effect'),
+            'Unraid OS {0} Released' => sprintf(_('Unraid OS %s Released'), '{0}'),
+            'Unraid OS {0} Update Available' => sprintf(_('Unraid OS %s Update Available'), '{0}'),
+            'Unraid OS is up-to-date' => _('Unraid OS is up-to-date'),
+            'Unraid OS Update Available' => _('Unraid OS Update Available'),
+            'unraid-api is offline' => _('unraid-api is offline'),
+            'Up-to-date with eligible releases' => _('Up-to-date with eligible releases'),
+            'Up-to-date' => _('Up-to-date'),
+            'Update Available' => _('Update Available'),
+            'Update Released' => _('Update Released'),
+            'Update Unraid OS confirmation required' => _('Update Unraid OS confirmation required'),
+            'Update Unraid OS' => _('Update Unraid OS'),
+            'Updating 3rd party drivers' => _('Updating 3rd party drivers'),
+            'Upgrade Key' => _('Upgrade Key'),
+            'Upgrade' => _('Upgrade'),
+            'Uptime {0}' => sprintf(_('Uptime %s'), '{0}'),
+            'USB Flash device error' => _('USB Flash device error'),
+            'USB Flash has no serial number' => _('USB Flash has no serial number'),
+            'Verify to Update' => _('Verify to Update'),
+            'Version available for restore {0}' => sprintf(_('Version available for restore %s'), '{0}'),
+            'Version: {0}' => sprintf(_('Version: %s'), '{0}'),
+            'View Available Updates' => _('View Available Updates'),
+            'View Changelog & Update' => _('View Changelog & Update'),
+            'View Changelog for {0}' => sprintf(_('View Changelog for %s'), '{0}'),
+            'View Changelog on Docs' => _('View Changelog on Docs'),
+            'View Changelog to Start Update' => _('View Changelog to Start Update'),
+            'View Changelog' => _('View Changelog'),
+            'View on Docs' => _('View on Docs'),
+            'View release notes' => _('View release notes'),
+            'We recommend backing up your USB Flash Boot Device before starting the update.' => _('We recommend backing up your USB Flash Boot Device before starting the update.'),
+            'year' => sprintf(_('%s year'), '{n}') . ' | ' . sprintf(_('%s years'), '{n}'),
+            'You are still eligible to access OS updates that were published on or before {1}.' => sprintf(_('You are still eligible to access OS updates that were published on or before %s.'), '{1}'),
+            'You can also manually create a new backup by clicking the Create Flash Backup button.' => _('You can also manually create a new backup by clicking the Create Flash Backup button.'),
+            'You can manually create a backup by clicking the Create Flash Backup button.' => _('You can manually create a backup by clicking the Create Flash Backup button.'),
+            'You have already activated the Flash Backup feature via the Unraid Connect plugin.' => _('You have already activated the Flash Backup feature via the Unraid Connect plugin.'),
+            'You have exceeded the number of devices allowed for your license. Please remove a device before adding another.' => _('You have exceeded the number of devices allowed for your license. Please remove a device before adding another.'),
+            'You have not activated the Flash Backup feature via the Unraid Connect plugin.' => _('You have not activated the Flash Backup feature via the Unraid Connect plugin.'),
+            'You may still update to releases dated prior to your update expiration date.' => _('You may still update to releases dated prior to your update expiration date.'),
+            'You\'re one step closer to enhancing your Unraid experience' => _('You\'re one step closer to enhancing your Unraid experience'),
+            'Your {0} Key has been replaced!' => sprintf(_('Your %s Key has been replaced!'), '{0}'),
+            'Your {0} license included one year of free updates at the time of purchase. You are now eligible to extend your license and access the latest OS updates. You are still eligible to access OS updates that were published on or before {1}.' => sprintf(_('Your %s license included one year of free updates at the time of purchase.'), '{0}') . ' ' . _('You are now eligible to extend your license and access the latest OS updates.') . ' ' . sprintf(_('You are still eligible to access OS updates that were published on or before %s.'), '{1}'),
+            'Your {0} license included one year of free updates at the time of purchase. You are now eligible to extend your license and access the latest OS updates.' => sprintf(_('Your %s license included one year of free updates at the time of purchase.'), '{0}') . ' ' . _('You are now eligible to extend your license and access the latest OS updates.'),
+            'Your free Trial key provides all the functionality of an Unleashed Registration key' => _('Your free Trial key provides all the functionality of an Unleashed Registration key'),
+            'Your license key is not eligible for Unraid OS {0}' => sprintf(_('Your license key is not eligible for Unraid OS %s'), '{0}'),
+            'Your Trial has expired' => _('Your Trial has expired'),
+            'Your Trial key has been extended!' => _('Your Trial key has been extended!'),
+        ];
+    }
+
+    public function getTranslations()
+    {
+        return $this->translations ?? [];
+    }
+
+    /**
+     * @param $urlEncode {bool}
+     * @return string
+     */
+    public function getTranslationsJson($urlEncode = false)
+    {
+        if ($urlEncode) {
+            return rawurlencode(json_encode($this->getTranslations(), JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE));
+        }
+        return json_encode($this->getTranslations(), JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE);
+    }
+}

emhttp/plugins/dynamix.my.servers/unraid-components/manifest.json

@@ -0,0 +1,12 @@
+{
+  ".nuxt/nuxt-custom-elements/entries/unraid-components.client.mjs": {
+    "file": "_nuxt/unraid-components.client-CQOXNcK4.js",
+    "name": "unraid-components.client",
+    "src": ".nuxt/nuxt-custom-elements/entries/unraid-components.client.mjs",
+    "isEntry": true,
+    "css": [
+      "_nuxt/unraid-components-p_3YF86n.css"
+    ]
+  },
+  "ts": 1723595088
+}

emhttp/plugins/dynamix.plugin.manager/Downgrade.page

@@ -0,0 +1,153 @@
+Menu="About:20"
+Title="Downgrade OS"
+Icon="icon-update"
+Tag="upload"
+---
+<?php
+/* Copyright 2005-2023, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+/**
+ * @note icon-update is rotated via CSS in myservers1.php
+ */
+
+require_once "$docroot/plugins/dynamix.my.servers/include/reboot-details.php";
+// Create an instance of the RebootDetails class
+$rebootDetails = new RebootDetails();
+// Get the current reboot details if there are any
+$rebootDetails->setPrevious();
+
+$serverNameEscaped = htmlspecialchars(str_replace(' ', '_', strtolower($var['NAME'])));
+?>
+
+<script>
+const nchan_diagnostics = new NchanSubscriber('/sub/diagnostics', { subscriber: 'websocket' });
+const reportUrl = new URL('https://forums.unraid.net/bug-reports/');
+let diagnosticsFile = '';
+
+nchan_diagnostics.on('message', function(data) {
+  if (data == '_DONE_') {
+    nchan_diagnostics.stop();
+    $('.sweet-alert').hide('fast').removeClass('nchan');
+    swal.close();
+    $('div.spinner').show('slow');
+    location = diagnosticsFile;
+
+    setTimeout(() => {
+      cleanupDiagnostics();
+      reportAfterDiagnosticsDownload();
+    }, 2000);
+  } else if (data) {
+    let box = $('pre#swaltext');
+    box.html(box.html() + '<br>' + data).scrollTop(box[0].scrollHeight);
+  }
+});
+
+function downloadDiagnostics() {
+  const tzoffset = (new Date()).getTimezoneOffset() * 60000; // offset in milliseconds
+  const localISOTime = (new Date(Date.now() - tzoffset));
+  const year = localISOTime.getFullYear();
+  const month = String(localISOTime.getMonth() + 1).padStart(2, '0');
+  const day = String(localISOTime.getDate()).padStart(2, '0');
+  const hours = String(localISOTime.getHours()).padStart(2, '0');
+  const minutes = String(localISOTime.getMinutes()).padStart(2, '0');
+  const dateOutput = `${year}${month}${day}_${hours}${minutes}`;
+  const zipName = '<?=$serverNameEscaped?>-diagnostics-' + dateOutput + '.zip';
+
+  nchan_diagnostics.start();
+
+  $.post(
+    '/webGui/include/Download.php',
+    {
+      cmd: 'diag',
+      file: zipName,
+      anonymize: '',
+    },
+    function(zip) {
+      if (!zip) {
+        return nchan_diagnostics.stop();
+      }
+
+      diagnosticsFile = zip;
+      swal({
+        title: "_(Downloading)_...",
+        text: "/boot/logs" + zip + "<hr><pre id='swaltext'></pre>",
+        html: true,
+        animation: 'none',
+        showConfirmButton: false,
+      });
+      $('.sweet-alert').addClass('nchan');
+      $('button.confirm').prop('disabled', true);
+    },
+  );
+}
+
+function reportAfterDiagnosticsDownload() {
+  $('div.spinner').hide('fast');
+  swal({
+    title: "_(Open a bug report)_",
+    text: "_(Create a bug report on our forums with a description of the issue along with your diagsnotics)_",
+    html: true,
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonText: "<?= _('Create Bug Report') ?>",
+    cancelButtonText: "<?= _('Close') ?>",
+  }, function(confirm) {
+    if (!confirm) {
+      return false;
+    }
+    window.open(reportUrl, '_blank');
+  });
+}
+
+function cleanupDiagnostics() {
+  if (document.hasFocus()) {
+    return $.post('/webGui/include/Download.php', { cmd: 'delete', file: diagnosticsFile });
+  }
+  setTimeout(cleanupDiagnostics, 2000);
+}
+
+function startDowngrade() {
+  $('div.spinner').show('slow');
+
+  $.get(
+    '/plugins/dynamix.plugin.manager/include/Downgrade.php',
+    {
+      version: '<?= $rebootDetails->previousVersion ?>',
+    },
+    function() {
+      refresh();
+    }
+  );
+}
+
+function confirmDowngrade() {
+  swal({
+    title: "_(Confirm Downgrade)_",
+    text: "<?= $rebootDetails->previousVersion ?><br>_(A reboot will be required)_",
+    html: true,
+    type: 'warning',
+    showCancelButton: true,
+    confirmButtonText: "<?= _('Confirm') ?>",
+    cancelButtonText: "<?= _('Cancel') ?>",
+  }, function(confirm) {
+    if (!confirm) {
+      return false;
+    }
+    startDowngrade();
+  });
+}
+</script>
+
+<unraid-i18n-host>
+  <unraid-downgrade-os
+    reboot-version="<?= $rebootDetails->rebootVersion ?>"
+    restore-version="<?= $rebootDetails->previousVersion ?>"
+    restore-release-date="<?= $rebootDetails->previousReleaseDate ?>"></unraid-downgrade-os>
+</unraid-i18n-host>

emhttp/plugins/dynamix.plugin.manager/PluginHelpers.page

@@ -0,0 +1,90 @@
+Menu='Buttons'
+Link='nav-user'
+---
+<?
+/* Copyright 2023, Lime Technology
+ * Copyright 2023, Andrew Zawadzki.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+?>
+<script>
+const ca_args = {};
+
+function ca_refresh() {
+<?if ($task == 'Plugins'):?>
+	loadlist();
+<?else:?>
+	refresh();
+<?endif;?>
+}
+
+function ca_hidePluginUpdate(plugin,version,element) {
+	$.cookie(plugin,version);
+	$(element).hide();
+}
+
+function ca_pluginUpdateInstall(plugin) {
+	if (plugin == null) {
+		openPlugin(ca_args.cmd,ca_args.title,'','ca_refresh');
+		return;
+	}
+	ca_args.cmd = 'plugin update '+plugin;
+	ca_args.title = "_(Installing Update)_";
+	$.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{cmd:'alert'},function(data) {
+		if (data==0) {
+			// no alert message - proceed with update
+			setTimeout(ca_pluginUpdateInstall);
+		} else {
+			// show alert message and ask for confirmation
+			openAlert("showchanges <?=$alerts?>","_(Alert Message)_","ca_pluginUpdateInstall");
+		}
+	});
+}
+
+function caPluginUpdateCheck(plugin,options=[],callback) {
+	var pluginFilename = plugin.substr(0, plugin.lastIndexOf("."));
+	console.time("checkPlugin "+plugin);
+	console.log("checkPlugin  "+plugin);
+	$.post("/plugins/dynamix.plugin.manager/scripts/PluginAPI.php",{action:'checkPlugin',options:{plugin:plugin,name:options.name}},function(caAPIresult) {
+		console.groupCollapsed("Result checkPlugin "+plugin);
+		console.log(caAPIresult);
+		console.timeEnd("checkPlugin "+plugin);
+		console.groupEnd();
+		var result = JSON.parse(caAPIresult);
+
+		if ( options.debug == true ) result.updateAvailable = true;
+		if ( ! options.element && ! options.dontShow ) {
+			if ( result.updateAvailable ) {
+				var HTML = result.updateMessage+"<span class='bannerInfo fa fa-info-circle big' title=\"_(View Release Notes)_\" onclick='openChanges(\"showchanges /tmp/plugins/"+pluginFilename+".txt\",\"_(Release Notes)_\")'></span><a class='ca_PluginUpdateInstall' onclick='ca_pluginUpdateInstall(\""+plugin+"\")'>"+result.linkMessage+"</a>";
+				addBannerWarning(HTML,false,options.noDismiss);
+			}
+		} else {
+			if ( $.cookie(plugin) != result.version ) {
+				if ( result.updateAvailable ) {
+					var HTML = result.updateMessage+"<span class='bannerInfo fa fa-info-circle big' title=\"_(View Release Notes)_\" onclick='openChanges(\"showchanges /tmp/plugins/"+pluginFilename+".txt\",\"_(Release Notes)_\")'></span><a class='ca_PluginUpdateInstall' onclick='ca_pluginUpdateInstall(\""+plugin+"\")'>"+result.linkMessage+"</a>";
+					if ( ! options.noDismiss ) {
+						HTML = HTML.concat("<span class='ca_PluginUpdateDismiss'><i class='fa fa-close' onclick='ca_hidePluginUpdate(\""+plugin+"\",\""+result.version+"\",\""+options.element+"\")'></i></span>");
+					}
+					result.HTML = HTML;
+					if ( ! options.dontShow ) {
+						$(options.element).html(HTML);
+						$(options.element).addClass("ca_element_notice");
+					}
+				}
+			}
+		}
+		if ( typeof options === "function" ) {
+			callback = options;
+		}
+		if ( typeof callback === "function" ) {
+			callback(JSON.stringify(result));
+		}
+	});
+}
+</script>

emhttp/plugins/dynamix.plugin.manager/PluginInstall.page

@@ -3,8 +3,8 @@ Title="Install Plugin"
 Tag="download"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -15,17 +15,31 @@ Tag="download"
  */
 ?>
 <script>
-function installPlugin(name) {
-  var file = name.trim();
-  var plugin = file.replace(/^.*(\\|\/|\:)/,'').replace('.plg','')+':install';
-  var func = plugin.includes('dynamix.unraid.net') ? 'reloadToList' : 'loadlist'; // conditionally reload on closure of shadboxbox for My Servers plugin
-  if (file) openBox("/plugins/dynamix.plugin.manager/scripts/plugin&arg1=install&arg2="+file,"_(Install Plugin)_",600,900,true,func,plugin);
+const my = {};
+
+function installPlugin(file) {
+  if (file == null) {
+    $('#plugin_file').val('');
+    openPlugin(my.cmd,my.title,my.plg);
+    return;
+  }
+  file = file.trim();
+  if (!file) return;
+  $.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{cmd:'alert'},function(data) {
+    my.cmd = 'plugin install '+file;
+    my.title = "_(Install Plugin)_";
+    my.plg = file.replace(/^.*(\\|\/|\:)/,'').replace('.plg','')+':install';
+    if (data==0) {
+      // no alert message - proceed with install
+      setTimeout(installPlugin);
+    } else {
+      // show alert message and ask for confirmation
+      openAlert("showchanges <?=$alerts?>","<?=_('Alert Message')?>",'installPlugin');
+    }
+  });
 }
-function reloadToList() {
-  $.removeCookie('tab');
-  window.location.href = '/Plugins';
-};
 </script>
+
 **_(Enter URL of remote plugin file or local plugin file)_**
 
 <form name="plugin_install" method="POST" target="progressFrame">

emhttp/plugins/dynamix.plugin.manager/Plugins.page

@@ -6,8 +6,8 @@ Tabs="true"
 Code="e944"
 ---
 <?PHP
-/* Copyright 2005-2022, Lime Technology
- * Copyright 2012-2022, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -18,17 +18,37 @@ Code="e944"
  */
 ?>
 <?
-// Remove stale /tmp/plugin/*.plg entries
-foreach (glob("/tmp/plugins/*.{plg,txt}", GLOB_NOSORT+GLOB_BRACE) as $entry) if (!file_exists("/var/log/plugins/".basename($entry))) @unlink($entry);
+// Remove stale /tmp/plugin/*.plg entries (check that script 'plugin' is not running to avoid clashes)
+if (!exec('pgrep --ns $$ -f '."$docroot/plugins/dynamix.plugin.manager/scripts/plugin")) {
+  foreach (glob("/tmp/plugins/*.{plg,txt}", GLOB_NOSORT+GLOB_BRACE) as $entry) if (!file_exists("/var/log/plugins/".basename($entry))) @unlink($entry);
+}
 $check = $notify['version'] ? 0 : 1;
 ?>
 <link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.filetree.css')?>">
-<style>
-#plugin_tree{width:33%;height:200px;overflow-y:scroll}
-table tbody td{line-height:normal}
-</style>
+
 <script src="<?autov('/webGui/javascript/jquery.filetree.js')?>" charset="utf-8"></script>
 <script>
+const args = {};
+
+function openInstall(cmd,title,plg,func) {
+  if (cmd == null) {
+    openPlugin(args.cmd,args.title,args.plg,args.func,1);
+    return;
+  }
+  args.cmd = cmd;
+  args.title = title;
+  args.plg = plg;
+  args.func = func;
+  $.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{cmd:'alert'},function(data) {
+    if (data==0) {
+      // no alert message - proceed with update
+      setTimeout(openInstall);
+    } else {
+      // show alert message and ask for confirmation
+      openAlert("showchanges <?=$alerts?>","_(Alert Message)_",'openInstall');
+    }
+  });
+}
 <?if ($display['resize']):?>
 function resize(bind) {
   var width = [];
@@ -42,6 +62,27 @@ function resize(bind) {
   }
 }
 <?endif;?>
+function multiRemove() {
+  if ($('input.remove:checked').length > 1) $('#removeall').show(); else $('#removeall').hide();
+}
+function updateList() {
+  var plugin = [];
+  $('input.update').each(function(){plugin.push($(this).attr('data'));});
+  var plugins = plugin.join('*');
+  $('#updateall').hide();
+  $.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{cmd:'pending',plugin:plugins},function() {
+    openPlugin("multiplugin update "+plugins,"_(Update All Plugins)_",":return","loadlist",1);
+  });
+}
+function removeList() {
+  var plugin = [];
+  $('input.remove:checked').each(function(){plugin.push($(this).attr('data'));});
+  var plugins = plugin.join('*');
+  $('#removeall').hide();
+  $.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{cmd:'pending',plugin:plugins},function() {
+    openPlugin("multiplugin remove "+plugins,"_(Remove Selected Plugins)_","","refresh",1);
+  });
+}
 function updateInfo(data) {
   var updates = data.split('\n');
   for (var n=0,update; update=updates[n]; n++) {
@@ -49,12 +90,11 @@ function updateInfo(data) {
     for (var i=0,field; field=fields[i]; i++) {
       var row = field.split('::');
       $('#'+row[0]).attr('data',row[1]).html(row[2]);
+      var removeButton = $('input[data="'+row[0].substr(4).replace(/-/g,'.')+'.plg'+'"]');
+      if (row[2].indexOf('hourglass') >= 0) removeButton.hide(); else removeButton.show();
     }
   }
 }
-function disableButton() {
-  $('#plugin_list').find('input[type=button]').prop('disabled',true);
-}
 function initlist() {
   timers.plugins = setTimeout(function(){$('div.spinner.fixed').show('slow');},500);
   $.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{init:true,check:<?=$check?>},function(data) {
@@ -83,28 +123,35 @@ function loadlist(id,check) {
       var cmd = id.split(':');
       var tr = 'tr#'+cmd[0].replace(/[\. _]/g,'');
       switch (cmd[1]) {
-        case 'update' :
-        case 'return' : updateInfo(data[0]); break;
-        case 'remove' : list.find(tr).remove(); break;
-        case 'install': if (!list.find(tr).length) list.append(data[0]); loadlist(null,1); break;
+      case 'update':
+      case 'return':
+        updateInfo(data[0]);
+        if (data[1] > 1) $('#updateall').show(); else $('#updateall').hide();
+        break;
+      case 'remove':
+        list.find(tr).remove();
+        break;
+      case 'install':
+        if (!list.find(tr).length) list.append(data[0]); loadlist(null,1);
+        break;
       }
     } else {
       updateInfo(data[0]);
+      if (data[1] > 1) $('#updateall').show(); else $('#updateall').hide();
     }
     $('#plugin_table').trigger('update');
     $('#checkall').find('input').prop('disabled',false);
-    if (data[1] > 1) $('#updateall').show(); else $('#updateall').hide();
-    if (data[2] != null) openBox('/plugins/dynamix.plugin.manager/include/ShowChanges.php?file='+data[2],"_(Alert Message)_",600,900);
   });
 }
 $(function() {
   initlist();
   $('#plugin_tree').fileTree({root:'/boot/',top:'/boot/',filter:'plg'}, function(file) {$('#plugin_file').val(file);});
-  $('.tabs').append("<span id='updateall' class='status vhshift' style='display:none;margin-left:12px'><input type='button' value='<?=_('Update All Plugins')?>' onclick='disableButton();openBox(\"/plugins/dynamix.plugin.manager/scripts/plugin&arg1=updateall\",\"<?=_('Update All Plugins')?>\",600,600,true,\"loadlist\",\":return\")'></span>");
-  $('.tabs').append("<span id='checkall' class='status vhshift'><input type='button' value='<?=_('Check For Updates')?>' onclick='openBox(\"/plugins/dynamix.plugin.manager/scripts/checkall\",\"<?=_('Plugin Update Check')?>\",600,600,true,\"loadlist\",\":return\")' disabled></span>");
+  $('.tabs').append("<span id='checkall' class='status vhshift'><input type='button' value=\"_(Check For Updates)_\" onclick='openPlugin(\"checkall\",\"_(Plugin Update Check)_\",\":return\")' disabled></span>");
+  $('.tabs').append("<span id='updateall' class='status vhshift' style='display:none;margin-left:12px'><input type='button' value=\"_(Update All Plugins)_\" onclick='updateList()'></span>");
+  $('.tabs').append("<span id='removeall' class='status vhshift' style='display:none;margin-left:12px'><input type='button' value=\"_(Remove Selected Plugins)_\" onclick='removeList()'></span>");
 });
 </script>
-<table class='tablesorter plugins shift' id='plugin_table'>
+<table class='unraid tablesorter plugins shift' id='plugin_table'>
 <thead><tr><th></th><th>_(Plugin)_</th><th>_(Author)_</th><th>_(Version)_</th><th>_(Status)_</th><th>_(Uninstall)_</th></tr></thead>
 <tbody id="plugin_list"><tr><td colspan="6"></td><tr></tbody>
 </table>

emhttp/plugins/dynamix.plugin.manager/PluginsError.page

@@ -4,8 +4,8 @@ Tag="puzzle-piece"
 Cond="glob('/boot/config/plugins-error/*.plg')"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,

emhttp/plugins/dynamix.plugin.manager/PluginsStale.page

@@ -4,8 +4,8 @@ Tag="puzzle-piece"
 Cond="glob('/boot/config/plugins-stale/*.plg')"
 ---
 <?PHP
-/* Copyright 2005-2021, Lime Technology
- * Copyright 2012-2021, Bergware International.
+/* Copyright 2005-2023, Lime Technology
+ * Copyright 2012-2023, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,

emhttp/plugins/dynamix.plugin.manager/Update.page

@@ -0,0 +1,50 @@
+Menu="About:10"
+Title="Update OS"
+Icon="icon-update"
+Tag="upload"
+---
+<?php
+/* Copyright 2005-2023, Lime Technology
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+require_once "$docroot/plugins/dynamix.my.servers/include/reboot-details.php";
+$rebootDetails = new RebootDetails();
+?>
+<script>
+function cleanUpFlashBackup(zip) {
+  if (document.hasFocus()) {
+    $('input[value="_(Creating Flash backup)_..."]').val("_(Flash backup)_").prop('disabled',false);
+    $('div.spinner').hide('slow');
+    $('#pleaseWait').hide('slow');
+    $.post('/webGui/include/Download.php',{cmd:'unlink',file:zip});
+  } else {
+    setTimeout(function(){cleanUpFlashBackup(zip);},2000);
+  }
+}
+function flashBackup() {
+  $('input[value="_(Flash backup)_"]').val('_(Creating Flash backup)_...').prop('disabled',true);
+  $('div.spinner').show('slow');
+  $('#pleaseWait').show('slow');
+  $.post('/webGui/include/Download.php',{cmd:'backup'},function(zip) {
+    if (zip) {
+      location = '/'+zip;
+      setTimeout(function(){cleanUpFlashBackup(zip);},6000);
+    } else {
+      $('input[value="_(Creating Flash backup)_..."]').val("_(Flash backup)_");
+      $('div.spinner').hide('slow');
+      $('#pleaseWait').hide('slow');
+      swal({title:"_(Creation error)_",text:"_(Insufficient free disk space available)_",type:'error',html:true,confirmButtonText:"_(Ok)_"});
+    }
+  });
+}
+</script>
+
+<unraid-i18n-host>
+  <unraid-update-os reboot-version="<?= $rebootDetails->rebootVersion ?>"></unraid-update-os>
+</unraid-i18n-host>