Merge pull request 'add check if menu exists before adding event listeners (#210)' (#211) from feature/issue210 into v2.x

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/211

.stylelintrc.json

@@ -0,0 +1,5 @@
+{
+    "rules": {
+        "indentation": 4
+    }
+}

.woodpecker.yml

@@ -5,7 +5,7 @@ pipeline:
       - npm install
     when:
       event: [tag, push, pull_request]
-      branch: [master, develop, feature/*]
+      branch: [master, develop, v2.x, feature/*]
 
   build:
     image: deblan/devenv

CHANGELOG.md

@@ -1,5 +1,24 @@
 ## [Unreleased]
 
+## 2.5.2
+### Fixed
+* add check if menu exists before adding event listeners (#210)
+
+## 2.5.1
+### Fixed
+* fix icon render (#133)
+
+## 2.5.0
+### Changed
+* upgrade dependencies
+### Fixed
+* remove duplicated code
+* remove unused variables and packages
+* replace repeated strings with variables
+* add html attributes
+* replace var with let
+* replace v-html with v-text to prevent xss
+
 ## 2.4.3
 ### Fixed
 * fix translations

Makefile

@@ -26,3 +26,8 @@ release: npm-build translations
 
 translations:
 	php bin/generate_l10n.php
+
+.ONESHELL:
+run-code-quality-analysis:
+	export SONAR_TOKEN="$$SONAR_TOKEN_DEBLAN_SIDE_MENU"
+	sonar-scanner -Dsonar.projectKey=deblan-side_menu -Dsonar.sources=. -Dsonar.host.url=https://cq.gitnet.fr

appinfo/info.xml

@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
 * [Donate with liberapay](https://liberapay.com/deblan)
 * [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
 ]]></description>
-    <version>2.4.3</version>
+    <version>2.5.2</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
     <namespace>SideMenu</namespace>

css/sideMenu.css

@@ -315,6 +315,7 @@
 @media screen and (max-width: 1024px) {
     #side-menu.side-menu-big {
         max-width: 290px;
+        height: 100vh;
     }
 
     .side-menu-categories {
@@ -325,10 +326,6 @@
     .side-menu-category {
         padding: 10px 0;
     }
-
-    #side-menu.side-menu-big {
-        height: 100vh;
-    }
 }
 
 @media screen and (min-width: 1024px) {

lib/AppInfo/Application.php

@@ -96,7 +96,7 @@ class Application extends App implements IBootstrap
 
         $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
 
-        foreach ($assets as $key => $value) {
+        foreach ($assets as $value) {
             $route = OC::$server->getURLGenerator()->linkToRoute($value['route'], ['v' => $cache]);
             $value['attr'][$value['route_attr']] = $route;
 
@@ -106,15 +106,15 @@ class Application extends App implements IBootstrap
 
     public function register(IRegistrationContext $context): void
     {
-        $context->registerService('AppRepository', function (ContainerInterface $c) {
+        $context->registerService('AppRepository', function () {
             return new AppRepository();
         });
 
-        $context->registerService('CategoryRepository', function (ContainerInterface $c) {
+        $context->registerService('CategoryRepository', function () {
             return new CategoryRepository();
         });
 
-        $context->registerService('ConfigProxy', function (ContainerInterface $c) {
+        $context->registerService('ConfigProxy', function () {
             return new ConfigProxy();
         });
     }

lib/Controller/AdminSettingController.php

@@ -69,7 +69,7 @@ class AdminSettingController extends Controller
     public function exportConfiguration()
     {
         $keys = $this->config->getAppKeys(Application::APP_ID);
-        $config = [];
+        $appConfig = [];
         $excludedKeys = [
             'cache',
             'cache-categories',
@@ -80,11 +80,11 @@ class AdminSettingController extends Controller
                 continue;
             }
 
-            $config[$key] = $this->config->getAppValue(Application::APP_ID, $key);
+            $appConfig[$key] = $this->config->getAppValue(Application::APP_ID, $key);
         }
 
         return new DataDownloadResponse(
-            json_encode($config, JSON_PRETTY_PRINT),
+            json_encode($appConfig, JSON_PRETTY_PRINT),
             'config.json',
             'text/json'
         );

lib/Service/AppRepository.php

@@ -53,7 +53,6 @@ class AppRepository
     {
         $navigation = $this->ocApp->getNavigation();
         $appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
-        $categoriesCustom = $this->config->getAppValueArray('categories-custom', '[]');
         $categories = $this->categoryRepository->getOrderedCategories();
         $apps = $this->ocApp->listAllApps();
         $visibleApps = [];

package.json

@@ -2,7 +2,7 @@
 	"license": "agpl",
 	"private": true,
 	"scripts": {
-		"build": "NODE_ENV=production webpack --progress --hide-modules --config webpack.js",
+		"build": "NODE_ENV=production webpack --progress --config webpack.js",
 		"dev": "NODE_ENV=development webpack --progress --config webpack.js",
 		"watch": "NODE_ENV=development webpack --progress --watch --config webpack.js",
 		"lint": "eslint --ext .js,.vue src",
@@ -14,7 +14,7 @@
 		"@nextcloud/axios": "^1.8.0",
 		"@nextcloud/vue": "^1.5.0",
 		"axios": "^0.24.0",
-		"trim": "0.0.1",
+		"trim": "^1.0.1",
 		"vue": "^2.6.11"
 	},
 	"browserslist": [
@@ -28,32 +28,32 @@
 		"@babel/plugin-syntax-dynamic-import": "^7.8.3",
 		"@babel/preset-env": "^7.9.0",
 		"@nextcloud/browserslist-config": "^1.0.0",
+		"@nextcloud/eslint-config": "^8.1.2",
 		"babel-eslint": "^10.1.0",
 		"babel-loader": "^8.1.0",
 		"css-loader": "^3.4.2",
-		"eslint": "^5.16.0",
+		"eslint": "^8.0.0",
-		"eslint-config-nextcloud": "0.1.1",
+		"eslint-config-standard": "^17.0.0",
-		"eslint-config-standard": "^12.0.0",
 		"eslint-import-resolver-webpack": "^0.12.1",
-		"eslint-loader": "^3.0.3",
 		"eslint-plugin-import": "^2.20.0",
 		"eslint-plugin-nextcloud": "^0.3.0",
 		"eslint-plugin-node": "^10.0.0",
-		"eslint-plugin-promise": "^4.2.1",
+		"eslint-plugin-promise": "^6.0.0",
 		"eslint-plugin-standard": "^4.0.1",
-		"eslint-plugin-vue": "^5.2.3",
+		"eslint-plugin-vue": "^9.0.0",
+		"eslint-webpack-plugin": "^3.0.0",
 		"file-loader": "^6.0.0",
-		"sass-loader": "^8.0.2",
-		"stylelint": "^8.4.0",
 		"sass": "^1.49.9",
-		"stylelint-config-recommended-scss": "^3.3.0",
+		"sass-loader": "^13.0.2",
-		"stylelint-scss": "^3.16.0",
+		"stylelint": "^14.0.0",
-		"stylelint-webpack-plugin": "^0.10.5",
+		"stylelint-config-recommended-scss": "^7.0.0",
+		"stylelint-scss": "^4.0.0",
+		"stylelint-webpack-plugin": "^3.3.0",
 		"url-loader": "^4.0.0",
 		"vue-loader": "^15.9.1",
 		"vue-template-compiler": "^2.6.11",
-		"webpack": "^4.42.0",
+		"webpack": "^5.0.0",
-		"webpack-cli": "^3.3.11",
+		"webpack-cli": "^4.0.0",
 		"webpack-merge": "^4.2.2",
 		"webpack-node-externals": "^1.7.2"
 	}

src/AdminCategoriesCustom.vue

@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     <div>
         <ul class="side-menu-setting-list">
             <li v-for="item in values" class="side-menu-setting-list-item" v-on:click="showEditForm(item)">
-                <span v-html="item.en"></span>
+                <span v-text="item.en"></span>
             </li>
         </ul>
 
@@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 		<Modal v-if="addForm" @close="hideAddForm">
 			<div class="modal__content">
                 <div v-for="lang in langs">
-                    <span class="lang" v-html="lang"></span>
+                    <span class="lang" v-text="lang"></span>
                     <input type="text" v-model="newValue[lang]" required>
                 </div>
 
@@ -42,7 +42,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 		<Modal v-if="editForm" @close="hideEditForm">
 			<div class="modal__content">
                 <div v-for="lang in langs">
-                    <span class="lang" v-html="lang"></span>
+                    <span class="lang" v-text="lang"></span>
                     <input type="text" v-model="editValue[lang]" required>
                 </div>
 

src/Logo.vue

@@ -17,9 +17,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
     <div v-bind:class="classes">
         <a v-if="link !== null" v-bind:href="link">
-            <img v-bind:src="image">
+            <img v-bind:src="image" alt="Logo">
         </a>
-        <img v-else v-bind:src="image">
+        <img v-else v-bind:src="image" alt="Logo">
     </div>
 </template>
 

src/SideMenu.vue

@@ -91,13 +91,13 @@ export default {
 
             for (let element of links) {
                 let href = element.getAttribute('href')
-                var parent = element.parentNode
+                let parent = element.parentNode
 
                 if (!parent) {
                     continue
                 }
 
-                var dataId = parent.getAttribute('data-id')
+                let dataId = parent.getAttribute('data-id')
                 dataId = dataId !== null ? dataId : ''
 
                 if (!parent.classList.contains('app-top-side-menu') && !parent.classList.contains('app-hidden') && !menuIsHidden) {

src/SideMenuApp.vue

@@ -18,7 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
     <li v-bind:class="classes">
         <a v-bind:href="href" :target="target" v-bind:title="label">
             <span class="side-menu-app-icon" v-html="icon"></span>
-            <span class="side-menu-app-text" v-html="label"></span>
+            <span class="side-menu-app-text" v-text="label"></span>
         </a>
     </li>
 </template>

src/SideMenuBig.vue

@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
                 <Loader v-if="!items.length" />
 
                 <div class="side-menu-category" v-for="category in items">
-                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-html="category.name"></h2>
+                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
 
                     <ul class="side-menu-apps-list">
                         <SideMenuBigApp
@@ -53,7 +53,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script>
-import trim from 'trim'
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
 import CloserButton from './CloserButton'

src/SideMenuBigApp.vue

@@ -17,8 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
     <li v-bind:class="classes">
         <a v-bind:href="href" :target="target" v-bind:title="label">
-            <img class="side-menu-app-icon" v-bind:src="icon"></span>
+            <img class="side-menu-app-icon" v-bind:src="icon" v-bind:alt="label" />
-            <span class="side-menu-app-text" v-html="label"></span>
+            <span class="side-menu-app-text" v-text="label"></span>
         </a>
     </li>
 </template>

src/SideMenuWithCategories.vue

@@ -32,7 +32,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
                 <Loader v-if="!items.length" />
 
                 <div class="side-menu-category" v-for="category in items">
-                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-html="category.name"></h2>
+                    <h2 class="side-menu-category-title" v-if="category.name != ''" v-text="category.name"></h2>
 
                     <ul class="side-menu-apps-list">
                         <SideMenuBigApp
@@ -51,7 +51,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 </template>
 
 <script>
-import trim from 'trim'
 import axios from 'axios'
 import OpenerButton from './OpenerButton'
 import CloserButton from './CloserButton'

templates/js/_alwaysDisplayed.js

@@ -2,7 +2,7 @@ const alwaysDisplayed = function() {
     const elements = querySelectorAll('*')
     const fixedElements = []
 
-    for (var element of elements) {
+    for (let element of elements) {
         if (typeof element !== 'object') {
             continue
         }
@@ -44,7 +44,7 @@ const alwaysDisplayed = function() {
         fixedElements.push(element)
     }
 
-    for (var i in fixedElements) {
+    for (let i in fixedElements) {
         const element = fixedElements[i]
         const computedStyle = window.getComputedStyle(element, null)
         const left = computedStyle.getPropertyValue('left')

templates/js/_topMenuApps.js

@@ -43,7 +43,7 @@ const updateTopMenu = function() {
         return
     }
 
-    navigationAppsHtml = ''
+    let navigationAppsHtml = ''
 
     for (let app of apps) {
         const dataId = app.getAttribute('data-id')

templates/js/script.php

@@ -96,6 +96,10 @@ if ($_['always-displayed']) {
         const headerMenuOpener = querySelector('#header .side-menu-opener')
         const sideMenuOpener = querySelectorAll('#side-menu .side-menu-opener')
 
+        if (!headerMenuOpener) {
+            return
+        }
+
         sideMenuFocus = () => {
             let a = querySelector('.side-menu-app.active a', sideMenu)
 
@@ -197,11 +201,13 @@ if ($_['always-displayed']) {
         <?php require_once __DIR__.'/_loaderEnabled.js'; ?>
     <?php endif; ?>
 
-    <?php if ($_['opener-position'] === 'before'): ?>
+    if (nextcloud) {
-        nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
+        <?php if ($_['opener-position'] === 'before'): ?>
-    <?php else: ?>
+            nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud)
-        nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
+        <?php else: ?>
-    <?php endif; ?>
+            nextcloud.parentNode.insertBefore(sideMenuOpener, nextcloud.nextSibling)
+        <?php endif; ?>
+    }
 
     <?php if (!empty($_['top-menu-apps']) || !empty($_['top-side-menu-apps'])): ?>
         const topMenuApps = <?php echo json_encode($_['top-menu-apps']), "\n"; ?>

templates/settings/admin-form.php

@@ -39,6 +39,8 @@ $choicesSizes = [
     'Big' => 'big',
 ];
 
+$labelShowHideApps = 'Show and hide the list of applications';
+$labelReset = 'Reset to default';
 ?>
 <div id="side-menu-section">
     <div class="section">
@@ -67,7 +69,7 @@ $choicesSizes = [
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['background-color-to']); ?>">
 
-                        <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                        <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                             'side-menu-background-color' => $_['defaults']['background-color'],
                             'side-menu-background-color-to' => $_['defaults']['background-color-to'],
                         ])) ?>"></div>
@@ -107,7 +109,7 @@ $choicesSizes = [
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['current-app-background-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-current-app-background-color' => $_['defaults']['current-app-background-color'],
                     ])) ?>"></div>
                 </div>
@@ -127,7 +129,7 @@ $choicesSizes = [
                         class="side-menu-setting side-menu-setting-live"
                         value="<?php print_unescaped($_['text-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-text-color' => $_['defaults']['text-color'],
                     ])) ?>"></div>
                 </div>
@@ -147,7 +149,7 @@ $choicesSizes = [
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['loader-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-loader-color' => $_['defaults']['loader-color'],
                     ])) ?>"></div>
                 </div>
@@ -255,7 +257,7 @@ $choicesSizes = [
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-background-color-to']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-dark-mode-background-color' => $_['defaults']['dark-mode-background-color'],
                         'side-menu-dark-mode-background-color-to' => $_['defaults']['dark-mode-background-color-to'],
                     ])) ?>"></div>
@@ -295,7 +297,7 @@ $choicesSizes = [
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-current-app-background-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-dark-mode-current-app-background-color' => $_['defaults']['dark-mode-current-app-background-color'],
                     ])) ?>"></div>
                 </div>
@@ -315,7 +317,7 @@ $choicesSizes = [
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-text-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-dark-mode-text-color' => $_['defaults']['dark-mode-text-color'],
                     ])) ?>"></div>
                 </div>
@@ -335,7 +337,7 @@ $choicesSizes = [
                         class="side-menu-setting"
                         value="<?php print_unescaped($_['dark-mode-loader-color']); ?>">
 
-                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t('Reset to default')); ?>" data-reset="<?php echo htmlentities(json_encode([
+                    <div class="theme-undo icon icon-history btn-reset" data-toggle="tooltip" data-original-title="<?php echo p($l->t($labelReset)); ?>" data-reset="<?php echo htmlentities(json_encode([
                         'side-menu-dark-mode-loader-color' => $_['defaults']['dark-mode-loader-color'],
                     ])) ?>"></div>
                 </div>
@@ -649,7 +651,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#big-menu-hidden-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="big-menu-hidden-apps" id="big-menu-hidden-apps" data-checkbox style="display: none">
@@ -718,7 +720,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-checkbox style="display: none">
@@ -772,7 +774,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="top-menu-apps" id="top-menu-apps" data-checkbox style="display: none">
@@ -805,7 +807,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div class="side-menu-setting" data-name="top-side-menu-apps" id="top-side-menu-apps" data-checkbox style="display: none">
@@ -878,7 +880,7 @@ $choicesSizes = [
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_">
-                        🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                        🖱️ <?php p($l->t($labelShowHideApps)); ?>
                     </a>
 
                     <div id="apps-categories-custom-list" style="display: none">
@@ -997,7 +999,7 @@ $choicesSizes = [
             <progress max="100" value="0" id="side-menu-save-progress"></progress>
         </button>
 
-        <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank">
+        <a href="<?php echo $urlGenerator->linkToRoute('side_menu.AdminSetting.exportConfiguration') ?>" target="_blank" rel="noopener">
             <button class="btn btn-primary" >
                 <?php p($l->t('Export the configuration')); ?>
             </button>
@@ -1015,7 +1017,7 @@ $choicesSizes = [
             <span for="side-menu-opener">
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
-                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
+                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
                     <button>
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>

templates/settings/personal-form.php

@@ -25,6 +25,8 @@ $choicesYesNo = [
     'Yes' => '1',
 ];
 
+
+$labelShowHideApps = 'Show and hide the list of applications';
 ?>
 <div id="side-menu-section">
     <?php if ($_['force']): ?>
@@ -85,7 +87,7 @@ $choicesYesNo = [
 
                         <p>
                             <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
                             </a>
                         </p>
 
@@ -131,7 +133,7 @@ $choicesYesNo = [
                     <div class="side-menu-setting-form">
                         <p>
                             <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
                             </a>
                         </p>
 
@@ -171,7 +173,7 @@ $choicesYesNo = [
                     <div class="side-menu-setting-form">
                         <p>
                             <a class="side-menu-toggler" data-target="#top-side-menu-apps" href="#_">
-                                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                                🖱️ <?php p($l->t($labelShowHideApps)); ?>
                             </a>
                         </p>
 
@@ -216,7 +218,7 @@ $choicesYesNo = [
             <span for="side-menu-opener">
                 <?php p($l->t('You like this app and you want to support me?')); ?>
 
-                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan">
+                <a style="margin-left: 10px" target="_blank" href="https://www.buymeacoffee.com/deblan" rel="noopener">
                     <button>
                         <?php p($l->t('Buy me a coffee ☕')); ?>
                     </button>