diff --git a/plugins/dynamix.docker.manager/include/CreateDocker.php b/plugins/dynamix.docker.manager/include/CreateDocker.php index 65c2e4d4d..e83470f03 100644 --- a/plugins/dynamix.docker.manager/include/CreateDocker.php +++ b/plugins/dynamix.docker.manager/include/CreateDocker.php @@ -13,7 +13,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; $var = parse_ini_file('state/var.ini'); ignore_user_abort(true); diff --git a/plugins/dynamix.docker.manager/include/DockerClient.php b/plugins/dynamix.docker.manager/include/DockerClient.php index 2c6019040..78efbabbb 100644 --- a/plugins/dynamix.docker.manager/include/DockerClient.php +++ b/plugins/dynamix.docker.manager/include/DockerClient.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; $dockerManPaths = [ 'plugin' => '/usr/local/emhttp/plugins/dynamix.docker.manager', diff --git a/plugins/dynamix.docker.manager/include/Events.php b/plugins/dynamix.docker.manager/include/Events.php index 11eeb8591..3338fa8bb 100644 --- a/plugins/dynamix.docker.manager/include/Events.php +++ b/plugins/dynamix.docker.manager/include/Events.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php"; diff --git a/plugins/dynamix.docker.manager/include/Exec.php b/plugins/dynamix.docker.manager/include/Exec.php index 70f25cf26..7e346f882 100644 --- a/plugins/dynamix.docker.manager/include/Exec.php +++ b/plugins/dynamix.docker.manager/include/Exec.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; if ( isset( $_GET['cmd'] )) { $command = rawurldecode(($_GET['cmd'])); diff --git a/plugins/dynamix.docker.manager/include/UpdateConfig.php b/plugins/dynamix.docker.manager/include/UpdateConfig.php index 0d36706d1..57ef3bda1 100644 --- a/plugins/dynamix.docker.manager/include/UpdateConfig.php +++ b/plugins/dynamix.docker.manager/include/UpdateConfig.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/plugins/dynamix.docker.manager/include/DockerClient.php"; // Autostart file diff --git a/plugins/dynamix.docker.manager/scripts/dockerupdate.php b/plugins/dynamix.docker.manager/scripts/dockerupdate.php index a5213723f..297460823 100755 --- a/plugins/dynamix.docker.manager/scripts/dockerupdate.php +++ b/plugins/dynamix.docker.manager/scripts/dockerupdate.php @@ -12,7 +12,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; exec("pgrep docker", $pid); if (count($pid) == 1) exit(0); diff --git a/plugins/dynamix.plugin.manager/include/PluginHelpers.php b/plugins/dynamix.plugin.manager/include/PluginHelpers.php index 2539351de..b36a551c7 100644 --- a/plugins/dynamix.plugin.manager/include/PluginHelpers.php +++ b/plugins/dynamix.plugin.manager/include/PluginHelpers.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; // Invoke the plugin command with indicated method function plugin($method, $arg = '') { diff --git a/plugins/dynamix.plugin.manager/include/ShowChanges.php b/plugins/dynamix.plugin.manager/include/ShowChanges.php index 6c9ad1d30..3ac5aa6f8 100644 --- a/plugins/dynamix.plugin.manager/include/ShowChanges.php +++ b/plugins/dynamix.plugin.manager/include/ShowChanges.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Markdown.php"; ?> diff --git a/plugins/dynamix.plugin.manager/include/ShowPlugins.php b/plugins/dynamix.plugin.manager/include/ShowPlugins.php index c1298a669..5747939de 100644 --- a/plugins/dynamix.plugin.manager/include/ShowPlugins.php +++ b/plugins/dynamix.plugin.manager/include/ShowPlugins.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Markdown.php"; require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php"; diff --git a/plugins/dynamix.plugin.manager/scripts/plugincheck b/plugins/dynamix.plugin.manager/scripts/plugincheck index dcce02a95..b859b62ae 100755 --- a/plugins/dynamix.plugin.manager/scripts/plugincheck +++ b/plugins/dynamix.plugin.manager/scripts/plugincheck @@ -12,7 +12,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Wrappers.php"; require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php"; diff --git a/plugins/dynamix.plugin.manager/scripts/unraidcheck b/plugins/dynamix.plugin.manager/scripts/unraidcheck index 3ce971d18..e15b9c308 100755 --- a/plugins/dynamix.plugin.manager/scripts/unraidcheck +++ b/plugins/dynamix.plugin.manager/scripts/unraidcheck @@ -12,7 +12,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Wrappers.php"; require_once "$docroot/plugins/dynamix.plugin.manager/include/PluginHelpers.php"; diff --git a/plugins/dynamix.vm.manager/VMMachines.page b/plugins/dynamix.vm.manager/VMMachines.page index 1a72487bb..b3fb54d9d 100644 --- a/plugins/dynamix.vm.manager/VMMachines.page +++ b/plugins/dynamix.vm.manager/VMMachines.page @@ -16,7 +16,7 @@ Cond="(pgrep('libvirtd')!==false)" */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt_helpers.php"; exec('cat /sys/devices/system/cpu/*/topology/thread_siblings_list|sort -nu', $cpus); diff --git a/plugins/dynamix.vm.manager/VMajax.php b/plugins/dynamix.vm.manager/VMajax.php index b3dbc7236..eca02543c 100644 --- a/plugins/dynamix.vm.manager/VMajax.php +++ b/plugins/dynamix.vm.manager/VMajax.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Helpers.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt_helpers.php"; diff --git a/plugins/dynamix.vm.manager/VMedit.php b/plugins/dynamix.vm.manager/VMedit.php index d24cb0017..a54821d07 100644 --- a/plugins/dynamix.vm.manager/VMedit.php +++ b/plugins/dynamix.vm.manager/VMedit.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Helpers.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt_helpers.php"; diff --git a/plugins/dynamix.vm.manager/classes/libvirt_helpers.php b/plugins/dynamix.vm.manager/classes/libvirt_helpers.php index e74f3c866..1077ef74f 100644 --- a/plugins/dynamix.vm.manager/classes/libvirt_helpers.php +++ b/plugins/dynamix.vm.manager/classes/libvirt_helpers.php @@ -11,7 +11,7 @@ */ ?> - $docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; + $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; // Load emhttp variables if needed. if (!isset($var)){ diff --git a/plugins/dynamix.vm.manager/templates/Custom.form.php b/plugins/dynamix.vm.manager/templates/Custom.form.php index 528f0baa8..a2150a02d 100644 --- a/plugins/dynamix.vm.manager/templates/Custom.form.php +++ b/plugins/dynamix.vm.manager/templates/Custom.form.php @@ -11,7 +11,7 @@ */ ?> - $docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; + $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Helpers.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt_helpers.php"; diff --git a/plugins/dynamix.vm.manager/templates/LibreELEC.form.php b/plugins/dynamix.vm.manager/templates/LibreELEC.form.php index f80927a1d..50dbcdf9a 100644 --- a/plugins/dynamix.vm.manager/templates/LibreELEC.form.php +++ b/plugins/dynamix.vm.manager/templates/LibreELEC.form.php @@ -11,7 +11,7 @@ */ ?> - $docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; + $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Helpers.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt_helpers.php"; diff --git a/plugins/dynamix.vm.manager/templates/OpenELEC.form.php b/plugins/dynamix.vm.manager/templates/OpenELEC.form.php index 081767e5c..d86077faf 100644 --- a/plugins/dynamix.vm.manager/templates/OpenELEC.form.php +++ b/plugins/dynamix.vm.manager/templates/OpenELEC.form.php @@ -11,7 +11,7 @@ */ ?> - $docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; + $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Helpers.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt_helpers.php"; diff --git a/plugins/dynamix.vm.manager/templates/XML_Expert.form.php b/plugins/dynamix.vm.manager/templates/XML_Expert.form.php index 02ad69993..90875dc84 100644 --- a/plugins/dynamix.vm.manager/templates/XML_Expert.form.php +++ b/plugins/dynamix.vm.manager/templates/XML_Expert.form.php @@ -11,7 +11,7 @@ */ ?> - $docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; + $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Helpers.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt.php"; require_once "$docroot/plugins/dynamix.vm.manager/classes/libvirt_helpers.php"; diff --git a/plugins/dynamix/include/Browse.php b/plugins/dynamix/include/Browse.php index d2cc9d50a..064aabc24 100644 --- a/plugins/dynamix/include/Browse.php +++ b/plugins/dynamix/include/Browse.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Helpers.php"; function parent_link() { diff --git a/plugins/dynamix/include/DashUpdate.php b/plugins/dynamix/include/DashUpdate.php index 8551b8ea5..ea92fa44c 100644 --- a/plugins/dynamix/include/DashUpdate.php +++ b/plugins/dynamix/include/DashUpdate.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Wrappers.php"; function normalize($type,$count) { diff --git a/plugins/dynamix/include/DeleteLogFile.php b/plugins/dynamix/include/DeleteLogFile.php index f4ca94f42..a3c1d4b19 100644 --- a/plugins/dynamix/include/DeleteLogFile.php +++ b/plugins/dynamix/include/DeleteLogFile.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Wrappers.php"; $dynamix = parse_plugin_cfg('dynamix',true); diff --git a/plugins/dynamix/include/DeviceList.php b/plugins/dynamix/include/DeviceList.php index 07cb3615d..19f9b7123 100644 --- a/plugins/dynamix/include/DeviceList.php +++ b/plugins/dynamix/include/DeviceList.php @@ -11,7 +11,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Helpers.php"; $path = $_POST['path']; @@ -129,17 +129,17 @@ function fs_info(&$disk) { return; } elseif ($disk['fsStatus']=='Mounted') { echo "
ErrorWarningSystemArray
\n"; -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/ColorCoding.php"; $ata = exec("ls -n ".escapeshellarg("/sys/block/{$argv[1]}")."|grep -Po 'ata\d+'"); diff --git a/plugins/dynamix/scripts/emhttpd_update b/plugins/dynamix/scripts/emhttpd_update index 8d41f9c48..8c9e4d9c1 100755 --- a/plugins/dynamix/scripts/emhttpd_update +++ b/plugins/dynamix/scripts/emhttpd_update @@ -12,7 +12,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/publish.php"; curl_socket("/var/run/emhttpd.socket", "http://localhost/status.htm"); ?> diff --git a/plugins/dynamix/scripts/flash_backup b/plugins/dynamix/scripts/flash_backup index af28c07aa..e8a1f6f93 100755 --- a/plugins/dynamix/scripts/flash_backup +++ b/plugins/dynamix/scripts/flash_backup @@ -12,7 +12,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; $var = file_exists('/var/local/emhttp/var.ini') ? parse_ini_file('/var/local/emhttp/var.ini') : []; $dir = ['system','appdata','isos','domains']; $out = ['prev','previous','syslinux']; diff --git a/plugins/dynamix/scripts/monitor b/plugins/dynamix/scripts/monitor index f4955c2eb..d5f57c4f8 100755 --- a/plugins/dynamix/scripts/monitor +++ b/plugins/dynamix/scripts/monitor @@ -16,7 +16,7 @@ $var = parse_ini_file("/var/local/emhttp/var.ini"); $devs = parse_ini_file("/var/local/emhttp/devs.ini",true); $disks = parse_ini_file("/var/local/emhttp/disks.ini",true); -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Wrappers.php"; require_once "$docroot/webGui/include/Preselect.php"; require_once "$docroot/webGui/include/CustomMerge.php"; @@ -201,7 +201,7 @@ foreach ($disks as $disk) { // process disk SMART notifications check_smart($name,port_name($disk['smDevice'] ?? $disk['device']),$text,$info); // process disk usage notifications - check_usage($name,($disk['fsSize']?100-round(100*$disk['fsFree']/$disk['fsSize']):-1),$text,$info); + check_usage($name,isset($disk['fsSize'])&&$disk['fsSize']>0?100-round(100*$disk['fsFree']/$disk['fsSize']):-1,$text,$info); // process disk operation notifications $warn = strtok($disk['color'],'-'); $item = 'disk'; @@ -231,7 +231,7 @@ foreach ($disks as $disk) { if ($disk['numErrors']>0) $errors[] = "$text - $info (errors {$disk['numErrors']})"; // check file system of cache pool $item = 'pool'; - if ($name=='cache' && strpos($disk['fsType'],'btrfs')) { + if ($name=='cache' && strpos($disk['fsType'],'btrfs')!==false) { $attr = 'missing'; if (exec("/sbin/btrfs filesystem show {$disk['uuid']} 2>/dev/null|grep -c 'missing'")>0) { if (empty($saved[$item][$attr])) { diff --git a/plugins/dynamix/scripts/notify b/plugins/dynamix/scripts/notify index 4550191e7..9048c8190 100755 --- a/plugins/dynamix/scripts/notify +++ b/plugins/dynamix/scripts/notify @@ -13,7 +13,7 @@ */ ?> -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Wrappers.php"; require_once "$docroot/webGui/include/Encryption.php"; diff --git a/plugins/dynamix/scripts/statuscheck b/plugins/dynamix/scripts/statuscheck index 236bd31f2..a398db93e 100755 --- a/plugins/dynamix/scripts/statuscheck +++ b/plugins/dynamix/scripts/statuscheck @@ -15,7 +15,7 @@ $var = parse_ini_file("/var/local/emhttp/var.ini"); $disks = parse_ini_file("/var/local/emhttp/disks.ini",true); -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/Wrappers.php"; require_once "$docroot/webGui/include/CustomMerge.php"; diff --git a/plugins/dynamix/scripts/tail_log b/plugins/dynamix/scripts/tail_log index 593f9e649..9a4fdbf1d 100755 --- a/plugins/dynamix/scripts/tail_log +++ b/plugins/dynamix/scripts/tail_log @@ -14,7 +14,7 @@ echo "ErrorWarningSystemArrayLogin
\n"; -$docroot = $docroot ?: $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; +$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp'; require_once "$docroot/webGui/include/ColorCoding.php"; $handle = popen('/usr/bin/tail -n 40 -f '.escapeshellarg("/var/log/{$argv[1]}").' 2>&1', 'r');