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 @@ */ ?> '/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 @@ */ ?> 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 @@ */ ?> ".vfs_type($disk['fsType']).""; - echo "".my_scale($disk['fsSize']*1024,$unit,-1)." $unit"; + echo "".my_scale(($disk['fsSize']??0)*1024,$unit,-1)." $unit"; if ($display['text']%10==0) { echo "".my_scale($disk['fsUsed']*1024,$unit)." $unit"; } else { - $used = $disk['fsSize'] ? 100-round(100*$disk['fsFree']/$disk['fsSize']) : 0; + $used = isset($disk['fsSize']) && $disk['fsSize']>0 ? 100-round(100*$disk['fsFree']/$disk['fsSize']) : 0; echo "
".my_scale($disk['fsUsed']*1024,$unit)." $unit
"; } if ($display['text']<10 ? $display['text']%10==0 : $display['text']%10!=0) { echo "".my_scale($disk['fsFree']*1024,$unit)." $unit"; } else { - $free = $disk['fsSize'] ? round(100*$disk['fsFree']/$disk['fsSize']) : 0; + $free = isset($disk['fsSize']) && $disk['fsSize']>0 ? round(100*$disk['fsFree']/$disk['fsSize']) : 0; echo "
".my_scale($disk['fsFree']*1024,$unit)." $unit
"; } echo "".device_browse($disk).""; diff --git a/plugins/dynamix/include/DiskList.php b/plugins/dynamix/include/DiskList.php index 217ae7ecd..eea877037 100644 --- a/plugins/dynamix/include/DiskList.php +++ b/plugins/dynamix/include/DiskList.php @@ -11,7 +11,7 @@ */ ?> addLog('$line');"; } diff --git a/plugins/dynamix/include/NotificationsArchive.php b/plugins/dynamix/include/NotificationsArchive.php index d6c617dfd..7d3de871b 100644 --- a/plugins/dynamix/include/NotificationsArchive.php +++ b/plugins/dynamix/include/NotificationsArchive.php @@ -11,7 +11,7 @@ */ ?> /dev/null & echo $!',$op); diff --git a/plugins/dynamix/include/ShareList.php b/plugins/dynamix/include/ShareList.php index a8d3eb14e..4cdc39d43 100644 --- a/plugins/dynamix/include/ShareList.php +++ b/plugins/dynamix/include/ShareList.php @@ -11,7 +11,7 @@ */ ?> 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 @@ */ ?> 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 @@ */ ?> 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 @@ */ ?> 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');