From 5f9af816a250a82ddd3b54ea96b06945965d473e Mon Sep 17 00:00:00 2001 From: bergware Date: Sun, 4 Dec 2022 15:16:16 +0100 Subject: [PATCH 1/2] PHP 8.1 support (round 1) --- .../dynamix.my.servers/include/myservers1.php | 2 +- plugins/dynamix/DeviceInfo.page | 50 ++--- plugins/dynamix/DiskSettings.page | 44 ++-- plugins/dynamix/Eth0.page | 200 +++++++++--------- plugins/dynamix/EthX.page | 196 ++++++++--------- plugins/dynamix/ShareSettings.page | 4 +- plugins/dynamix/SmtpSettings.page | 94 ++++---- plugins/dynamix/SyslogSettings.page | 50 ++--- plugins/dynamix/TrimSettings.page | 26 +-- 9 files changed, 333 insertions(+), 333 deletions(-) diff --git a/plugins/dynamix.my.servers/include/myservers1.php b/plugins/dynamix.my.servers/include/myservers1.php index 5b1cdcb85..e9af39331 100644 --- a/plugins/dynamix.my.servers/include/myservers1.php +++ b/plugins/dynamix.my.servers/include/myservers1.php @@ -36,7 +36,7 @@ $ALLOWED_UPC_ENV_VALS = [ 'development', 'local', ]; -$UPC_ENV_CK = in_array($_COOKIE['UPC_ENV'], $ALLOWED_UPC_ENV_VALS) +$UPC_ENV_CK = in_array($_COOKIE['UPC_ENV']??'', $ALLOWED_UPC_ENV_VALS) ? $_COOKIE['UPC_ENV'] : null; // Determine what source we should use for web components diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page index ae8974d10..51de66335 100644 --- a/plugins/dynamix/DeviceInfo.page +++ b/plugins/dynamix/DeviceInfo.page @@ -857,42 +857,42 @@ _(Critical disk temperature threshold)_ (°): _(SMART notification value)_: : :info_smart_notifications_help: _(SMART notification tolerance level)_: : :info_tolerance_level_help: _(SMART controller type)_: : @@ -906,7 +906,7 @@ _(SMART attribute notifications)_:   -: >_(Attribute)_ = +: >_(Attribute)_ = :info_attribute_notifications_help: diff --git a/plugins/dynamix/DiskSettings.page b/plugins/dynamix/DiskSettings.page index 9ec4b0846..b4d735735 100644 --- a/plugins/dynamix/DiskSettings.page +++ b/plugins/dynamix/DiskSettings.page @@ -198,39 +198,39 @@ _(Default critical disk temperature threshold)_ (°): _(Default SMART notification value)_: : :disk_default_smart_notification_help: _(Default SMART notification tolerance level)_: : :disk_default_smart_tolerance_help: _(Default SMART controller type)_: : :disk_default_smart_controller_help: @@ -240,7 +240,7 @@ _(Default SMART attribute notifications)_:   -: >_(Attribute)_ = +: >_(Attribute)_ = :disk_default_smart_attribute_help: diff --git a/plugins/dynamix/Eth0.page b/plugins/dynamix/Eth0.page index 2b6e3d83e..22b222499 100644 --- a/plugins/dynamix/Eth0.page +++ b/plugins/dynamix/Eth0.page @@ -462,8 +462,8 @@ _(MAC address)_: _(Enable bonding)_: : :eth_enable_bonding_help: @@ -471,13 +471,13 @@ _(Enable bonding)_: _(Enable bridging)_: : :eth_enable_bridging_help: @@ -505,9 +505,9 @@ _(Enable bridging)_: _(Network protocol)_: : :eth_network_protocol_help: @@ -526,8 +526,8 @@ _(Network protocol)_: