fix links that must be opened in new window

appinfo/info.xml

@@ -21,7 +21,7 @@ If you like this application and want to support the development:
 ]]></description>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
-    <version>1.16.1</version>
+    <version>1.16.2</version>
     <namespace>SideMenu</namespace>
     <category>customization</category>
     <website>https://gitnet.fr/deblan/side_menu</website>

lib/Controller/NavController.php

@@ -98,6 +98,7 @@ class NavController extends Controller
         $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
         $externalSitesInTopMenu = $this->config->getAppValueBool('external-sites-in-top-menu', '0');
         $user = OC::$server[IUserSession::class]->getUser();
+        $isForced = $this->config->getAppValueBool('force', '0');
         $appsCategories = [];
         $categoriesAppsCount = [];
         $items = [];
@@ -119,7 +120,7 @@ class NavController extends Controller
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
         $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
 
-        if (!empty($userTopMenuApps)) {
+        if (!$isForced && !empty($userTopMenuApps)) {
             $topMenuApps = $userTopMenuApps;
         }
 

templates/js/_topMenuApps.js

@@ -108,6 +108,28 @@ var updateTopMenu = function() {
         k++
     })
 
+    // Hack for https://github.com/nextcloud/server/blob/23b0b63c213f5b31eecae817ffd4a9e26f6624d0/core/src/components/MainMenu.js#L74-L96
+    menu.undelegate('li:not(#more-apps) > a', 'click')
+    menu.delegate('li:not(#more-apps) > a', 'click', function(e) {
+        var a = $(e.target)
+
+        if (!a.is('a')) {
+            a = a.closest('a')
+        }
+
+        if (a.attr('target') !== '_blank' && e.which === 1 && !e.ctrlKey && !e.metaKey && a.parent('#more-apps').length === 0) {
+            a.find('svg').remove()
+            a.find('div').remove()
+            a.prepend(jQuery('<div/>').addClass(
+                OCA.Theming && OCA.Theming.inverted
+                ? 'icon-loading-small'
+                : 'icon-loading-small-dark'
+            ))
+
+            window.location.href = a.attr('href')
+        }
+    })
+
     jQuery('#apps li.app-external-site').each(function(i, app) {
         app = jQuery(app)
         var appId = app.attr('data-id')

templates/settings/admin-form.php

@@ -18,7 +18,6 @@
 
 script('side_menu', 'admin');
 style('side_menu', 'admin');
-style('side_menu', 'support');
 
 $choicesYesNo = [
     'No' => '0',

templates/settings/personal-form.php

@@ -18,7 +18,6 @@
 
 script('side_menu', 'admin');
 style('side_menu', 'admin');
-style('side_menu', 'support');
 
 $choicesYesNo = [
     'No' => '0',