juliushaertl / apporder

lib/Util.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
 		foreach ($nav as $app) {
 			$nav_tmp[$app['href']] = $app;
 		}
-		if(is_array($order)) {
+		if (is_array($order)) {
 			foreach ($order as $app) {
 				if (array_key_exists($app, $nav_tmp)) {
 					$result[$app] = $nav_tmp[$app];

Indentation +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
 		$order_user = $this->appConfig->getUserValue('order', $this->userId);
 		$order_default = $this->appConfig->getAppValue('order');
 		$forced_order = json_decode($this->appConfig->getAppValue('force')) ?? false;
-                if ($order_user !== null && $order_user !== "" && !($forced_order)) {
+				if ($order_user !== null && $order_user !== "" && !($forced_order)) {
 			$order = $order_user;
 		} else {
 			$order = $order_default;
@@ -72,7 +72,7 @@ 
 		$hidden_user = $this->appConfig->getUserValue('hidden', $this->userId);
 		$hidden_default = $this->appConfig->getAppValue('hidden');
 		$forced_order = json_decode($this->appConfig->getAppValue('force')) ?? false;
-                if ($hidden_user !== null && $hidden_user !== "" && !($forced_order)) {
+				if ($hidden_user !== null && $hidden_user !== "" && !($forced_order)) {
 			$hidden = $hidden_user;
 		} else {
 			$hidden = $hidden_default;

lib/Controller/AppController.php

Spacing +7 added lines, -7 removed lines

@@ -58,26 +58,26 @@
 		$firstPage = null;
 
 		if ($order !== null && sizeof($order) > 0) {
-			if($hidden !== null && sizeof($hidden) > 0){
-				foreach($order as $app){
-					if(!in_array($app,$hidden)){
+			if ($hidden !== null && sizeof($hidden) > 0) {
+				foreach ($order as $app) {
+					if (!in_array($app, $hidden)) {
 						$firstPage = $app;	
 						break;
 					}
 				}
 			}
-			else{
+			else {
 				$firstPage = $order[0];
 			}
 		} 
-		if($firstPage===null)	{
+		if ($firstPage === null) {
 
 			$appId = 'files';
 
 			if (getenv('front_controller_active') === 'true') {
-				$firstPage = $this->urlGenerator->getAbsoluteURL('/apps/' . $appId . '/');
+				$firstPage = $this->urlGenerator->getAbsoluteURL('/apps/'.$appId.'/');
 			} else {
-				$firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/' . $appId . '/');
+				$firstPage = $this->urlGenerator->getAbsoluteURL('/index.php/apps/'.$appId.'/');
 			}
 		}
 		return new RedirectResponse($firstPage);

Braces +1 added lines, -2 removed lines

@@ -65,8 +65,7 @@
 						break;
 					}
 				}
-			}
-			else{
+			} else{
 				$firstPage = $order[0];
 			}
 		} 

lib/Controller/SettingsController.php

Indentation +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 			if($hidden === null) $hidden = array();
 		}
 		$force = json_decode($this->appConfig->getAppValue('force'));
-                if($force === null) $force = false;
+				if($force === null) $force = false;
 		return new TemplateResponse(
 			$this->appName,
 			'admin',

Spacing +9 added lines, -9 removed lines

@@ -55,12 +55,12 @@ 
 		// Private API call
 		$navigation = $this->navigationManager->getAll();
 		$order = json_decode($this->appConfig->getAppValue('order'));
-		if($order === null) $order = array();
+		if ($order === null) $order = array();
 		$nav = $this->util->matchOrder($navigation, $order);
 		$hidden = json_decode($this->appConfig->getAppValue('hidden'));
-		if($hidden === null) $hidden = array();
+		if ($hidden === null) $hidden = array();
 		$force = json_decode($this->appConfig->getAppValue('force'));
-		if($force === null) $force = false;
+		if ($force === null) $force = false;
 		return new TemplateResponse(
 			$this->appName,
 			'admin',
@@ -73,18 +73,18 @@ 
 		// Private API call
 		$navigation = $this->navigationManager->getAll();
 		$order = json_decode($this->appConfig->getUserValue('order', $this->userId));
-		if($order === null){
+		if ($order === null) {
 			$order = json_decode($this->appConfig->getAppValue('order'));
-			if($order === null) $order = array();
+			if ($order === null) $order = array();
 		}
 		$nav = $this->util->matchOrder($navigation, $order);
-		$hidden = json_decode($this->appConfig->getUserValue('hidden',$this->userId));
-		if($hidden === null){
+		$hidden = json_decode($this->appConfig->getUserValue('hidden', $this->userId));
+		if ($hidden === null) {
 			$hidden = json_decode($this->appConfig->getAppValue('hidden'));
-			if($hidden === null) $hidden = array();
+			if ($hidden === null) $hidden = array();
 		}
 		$force = json_decode($this->appConfig->getAppValue('force'));
-                if($force === null) $force = false;
+                if ($force === null) $force = false;
 		return new TemplateResponse(
 			$this->appName,
 			'admin',

Braces +18 added lines, -6 removed lines

@@ -55,12 +55,18 @@ 
 		// Private API call
 		$navigation = $this->navigationManager->getAll();
 		$order = json_decode($this->appConfig->getAppValue('order'));
-		if($order === null) $order = array();
+		if($order === null) {
+			$order = array();
+		}
 		$nav = $this->util->matchOrder($navigation, $order);
 		$hidden = json_decode($this->appConfig->getAppValue('hidden'));
-		if($hidden === null) $hidden = array();
+		if($hidden === null) {
+			$hidden = array();
+		}
 		$force = json_decode($this->appConfig->getAppValue('force'));
-		if($force === null) $force = false;
+		if($force === null) {
+			$force = false;
+		}
 		return new TemplateResponse(
 			$this->appName,
 			'admin',
@@ -75,16 +81,22 @@ 
 		$order = json_decode($this->appConfig->getUserValue('order', $this->userId));
 		if($order === null){
 			$order = json_decode($this->appConfig->getAppValue('order'));
-			if($order === null) $order = array();
+			if($order === null) {
+				$order = array();
+			}
 		}
 		$nav = $this->util->matchOrder($navigation, $order);
 		$hidden = json_decode($this->appConfig->getUserValue('hidden',$this->userId));
 		if($hidden === null){
 			$hidden = json_decode($this->appConfig->getAppValue('hidden'));
-			if($hidden === null) $hidden = array();
+			if($hidden === null) {
+				$hidden = array();
+			}
 		}
 		$force = json_decode($this->appConfig->getAppValue('force'));
-                if($force === null) $force = false;
+                if($force === null) {
+                	$force = false;
+                }
 		return new TemplateResponse(
 			$this->appName,
 			'admin',