Applied coding suggestions

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/Util.php b/lib/Util.php
index eab78ef..5295083 100644
--- a/lib/Util.php
+++ b/lib/Util.php
@@ -38,9 +38,8 @@ class Util {
 	public function getAppOrder() {
 		$order_user = $this->appConfig->getUserValue('order', $this->userId);
 		$order_default = $this->appConfig->getAppValue('order');
-		$forced_order = json_decode($this->appConfig->getAppValue('force'));
-                if($forced_order === null) $forced_order = false;
-		if ($order_user !== null && $order_user !== "" && !($forced_order)) {
+		$forced_order = json_decode($this->appConfig->getAppValue('force')) ?? false;
+                if ($order_user !== null && $order_user !== "" && !($forced_order)) {
 			$order = $order_user;
 		} else {
 			$order = $order_default;
@@ -72,9 +71,8 @@ class Util {
 	public function getAppHidden() {
 		$hidden_user = $this->appConfig->getUserValue('hidden', $this->userId);
 		$hidden_default = $this->appConfig->getAppValue('hidden');
-		$forced_order = json_decode($this->appConfig->getAppValue('force'));
-                if($forced_order === null) $forced_order = false;
-		if ($hidden_user !== null && $hidden_user !== "" && !($forced_order)) {
+		$forced_order = json_decode($this->appConfig->getAppValue('force')) ?? false;
+                if ($hidden_user !== null && $hidden_user !== "" && !($forced_order)) {
 			$hidden = $hidden_user;
 		} else {
 			$hidden = $hidden_default;