From 1d06c1b2123d03755feadd4833b518a51e893bd0 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 4 Nov 2022 21:43:18 +0100
Subject: [PATCH] fix issue with top and side apps (#162 #159)

---
 lib/Controller/NavController.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/NavController.php b/lib/Controller/NavController.php
index 6ea8e46..a461ce3 100644
--- a/lib/Controller/NavController.php
+++ b/lib/Controller/NavController.php
@@ -98,6 +98,8 @@ class NavController extends Controller
         $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
         $isForced = $this->config->getAppValueBool('force', '0');
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
+        $topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');
+        $userTopSideMenuApps = $this->config->getUserValueArray($user, 'top-side-menu-apps', '[]');
         $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
         $appsCategories = [];
         $categoriesAppsCount = [];
@@ -106,8 +108,12 @@ class NavController extends Controller
             $topMenuApps = $userTopMenuApps;
         }
 
+        if (!$isForced && !empty($userTopSideMenuApps)) {
+            $topSideMenuApps = $userTopSideMenuApps;
+        }
+
         foreach ($apps as $app) {
-            if (in_array($app['id'], $topMenuApps)) {
+            if (in_array($app['id'], $topMenuApps) && !in_array($app['id'], $userTopSideMenuApps)) {
                 continue;
             }