Merge branch 'develop' into translations

.gitignore

@@ -2,8 +2,4 @@
 /node_modules
 /l10n/*
 /releases
-/package-lock.json
 !/l10n/.gitkeep
-/yarn*.log
-/src/admin.js.bk
-/templates/settings/admin-form.php.bk

.woodpecker/.publish.yml

@@ -32,7 +32,7 @@ steps:
       - echo "$APP_CERTIFICATE" > "/tmp/side_menu.key"
       - echo "$APP_PUBLIC_CERTIFICATE" > "/tmp/side_menu.crt"
       - mkdir /tmp/app
-      - cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor /tmp/app
+      - cp -r README.md CHANGELOG.md appinfo lib img l10n js src templates screenshots vendor /tmp/app
       - /usr/src/nextcloud/occ integrity:sign-app
         --privateKey=/tmp/side_menu.key
         --certificate=/tmp/side_menu.crt

CHANGELOG.md

@@ -1,5 +1,70 @@
 ## [Unreleased]
 
+## 5.2.1
+### Added
+- chore: set side_menu as package name
+### Fixed
+- fix(LangRepository): check orm capabilities to query entities
+- fix(admin/\*SaveButton): cast settings to string
+
+## 5.2.0
+### Added
+* add compatibility with NC33
+### Fixed
+* fix #468: force nextcloud logo display css rule (opener-only)
+
+## 5.1.3
+### Fixed
+- fix #445: fix build by adding package-lock.json
+
+## 5.1.2
+### Added
+* add new translations
+### Fixed
+* fix #441: Side bar not working with Nextcloud 32 (thanks to AndyXheli)
+
+## 5.1.1
+### Fixed
+* fix(build): define appName to fix this error: "The `@nextcloud/vue` library was used without setting / replacing the `appName`"
+* fix #349: add custom controller to retrieve core apps
+
+## 5.1.0
+### Added
+* fix #425: allow to set a color using hex code
+### Fixed
+* #422: usage of `OC\AppFramework\Http\Request` instead of `$_SERVER`
+
+## 5.0.3
+### Fixed
+* fix #422: undefined array key "HTTP_USER_AGENT"
+
+## 5.0.2
+### Fixed
+* fix #413: add user-agent check for memories mobile app
+* fix #418: allow non admin user to access their settings
+
+## 5.0.1
+### Fixed
+* fix(StandardMenu): appLimit must return a value > 0
+
+## 5.0.0
+### Fixed
+* fix apps's order in the standard menu
+### Added
+* add new translations
+* add route `/apps/side_menu/user/config`
+* add new UI for admin and personals settings
+### Changed
+* migrate to Vue 3 and so add/update or remove dependencies
+* replace CSS with SCSS
+* remove route `/apps/side_menu/js/script`
+* remove generated Javascript using PHP
+* rewrite the standard menu of Nextcloud
+### Security
+* fix CVE-2023-44270
+* fix CVE-2024-9506
+* fix CVE-2024-6783
+
 ## 4.1.1
 ### Fixed
 * fix(CssController): add missing NoCSRFRequired import (#397)
@@ -155,7 +220,7 @@
 
 ## 3.5.1
 ### Added
-* add translations (thanks to p-bo adn gallegonovato)
+* add translations (thanks to p-bo and gallegonovato)
 ### Fixed
 * fix #189: sorting not applied on mobile
 

Makefile

@@ -20,7 +20,7 @@ release:
 
 	test -d $$RELEASE_DIRECTORY/$$VERSION && rm -fr $$RELEASE_DIRECTORY/$$VERSION
 	mkdir -p $$RELEASE_DIRECTORY/$$VERSION/side_menu
-	cp -r README.md CHANGELOG.md appinfo css lib img l10n js src templates screenshots vendor $$RELEASE_DIRECTORY/$$VERSION/side_menu
+	cp -r README.md CHANGELOG.md appinfo lib img l10n js src templates screenshots vendor $$RELEASE_DIRECTORY/$$VERSION/side_menu
 	cd $$RELEASE_DIRECTORY/$$VERSION
 	zip -r side_menu_v$$VERSION.zip side_menu
 	tar cvzf side_menu_v$$VERSION.tar.gz side_menu

README.md

@@ -24,8 +24,7 @@ You like this app and you want to support me? ☕ [Buy me a coffee](https://www.
 Requirements
 ------------
 
-* PHP >= 8.0
+* PHP >= 8.1
-* App `theming` enabled
 
 Installation and upgrade
 ------------------------
@@ -41,7 +40,7 @@ If you want to install it from source, go to https://gitnet.fr/deblan/side_menu/
 
 ```
 $ cd /path/to/nextcloud/apps
-$ curl -sS https://gitnet.fr/attachments/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx | tar xvfz -
+$ VERSION=x.y.z; curl -sS "https://gitnet.fr/deblan/side_menu/releases/download/${VERSION}/side_menu_v${VERSION}.tar.gz" | tar xvfz -
 ```
 
 Administrators can edit many settings using the administration page.

appinfo/info.xml

@@ -10,14 +10,13 @@ This application is rather suitable for instances that activate a lot of applica
 
 Use the shortcut `Ctrl`+`o` to open and to hide the side menu. Use `tab` to navigate.
 
-You can customize colors depending of the theme (Dark theme and Breeze Dark).
+You can customize colors depending of the theme.
 
-You can report a bug or request a feature by opening an issue.
+To report a bug or request a feature, please open an issue.
 
 Requirements:
 
 * PHP >= 8.1
-* App `theming` enabled
 
 If you like this application and if you want to support the development:
 
@@ -31,7 +30,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>4.1.1</version>
+    <version>5.2.1</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -54,7 +53,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png]]></screenshot>
     <dependencies>
         <php min-version="8.1" max-version="8.4" />
-        <nextcloud min-version="30" max-version="32"/>
+        <nextcloud min-version="31" max-version="33"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

lib/AppInfo/Application.php

@@ -2,8 +2,9 @@
 
 namespace OCA\SideMenu\AppInfo;
 
-use OC;
+use OC\AllConfig;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
+use OC\AppFramework\Http\Request;
 use OC\Security\CSP\ContentSecurityPolicyNonceManager;
 use OC\User\User;
 use OCA\SideMenu\Service\AppRepository;
@@ -31,23 +32,12 @@ use Psr\Container\ContainerInterface;
 class Application extends App implements IBootstrap
 {
     public const APP_ID = 'side_menu';
-
     public const APP_NAME = 'Custom menu';
 
-    /**
+    protected AllConfig $config;
-     * @var OC\AllConfig
+    protected ContentSecurityPolicyNonceManager $cspnm;
-     */
+    protected Request $request;
-    protected $config;
+    protected ?User $user = null;
-
-    /**
-     * @var ContentSecurityPolicyNonceManager
-     */
-    protected $cspnm;
-
-    /**
-     * @var User
-     */
-    protected $user;
 
     public function __construct(array $urlParams = [])
     {
@@ -96,6 +86,7 @@ class Application extends App implements IBootstrap
         $this->config = \OC::$server->getConfig();
         $this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
         $this->user = \OC::$server[IUserSession::class]->getUser();
+        $this->request = \OC::$server->getRequest();
 
         if (!$this->isEnabled()) {
             return;
@@ -106,6 +97,10 @@ class Application extends App implements IBootstrap
 
     protected function isEnabled(): bool
     {
+        if (isset($this->request->server['HTTP_USER_AGENT']) && preg_match('/MemoriesNative/', $this->request->server['HTTP_USER_AGENT'])) {
+            return false;
+        }
+
         $enabled = true;
         $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0');
 
@@ -128,7 +123,6 @@ class Application extends App implements IBootstrap
     protected function addAssets()
     {
         Util::addScript(self::APP_ID, 'side_menu-menu');
-        // Util::addStyle(self::APP_ID, 'sideMenu');
 
         $assets = [
             'stylesheet' => [
@@ -139,14 +133,6 @@ class Application extends App implements IBootstrap
                     'rel' => 'stylesheet',
                 ],
             ],
-            // 'script' => [
-            //     'route' => 'side_menu.Js.script',
-            //     'type' => 'script',
-            //     'route_attr' => 'src',
-            //     'attr' => [
-            //         'nonce' => $this->cspnm->getNonce(),
-            //     ],
-            // ],
         ];
 
         $cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');

lib/Controller/CoreController.php

@@ -0,0 +1,74 @@
+<?php
+
+/**
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace OCA\SideMenu\Controller;
+
+use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\ConfigProxy;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Attribute\FrontpageRoute;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\PublicPage;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\IRequest;
+use OCP\IUserSession;
+
+class CoreController extends Controller
+{
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        protected ConfigProxy $config,
+        protected AppRepository $appRepository,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    #[NoCSRFRequired]
+    #[NoAdminRequired]
+    #[PublicPage]
+    #[FrontpageRoute(verb: 'GET', url: '/core/apps')]
+    public function items(): JSONResponse
+    {
+        $user = \OC::$server[IUserSession::class]->getUser();
+        $items = [];
+
+        if (!$user) {
+            return new JSONResponse([
+                'items' => $items,
+            ]);
+        }
+
+        $apps = $this->appRepository->getOrderedApps($user);
+        $keys = ['id', 'name', 'category', 'href', 'icon'];
+
+        foreach ($apps as &$app) {
+            foreach ($app as $key => $value) {
+                if (!in_array($key, $keys)) {
+                    unset($app[$key]);
+                }
+            }
+        }
+
+        return new JSONResponse([
+            'items' => $apps,
+        ]);
+    }
+}

lib/Controller/JsController.php

@@ -20,7 +20,6 @@
 namespace OCA\SideMenu\Controller;
 
 use OC\User\User;
-use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\ConfigProxy;
 use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Controller;
@@ -29,10 +28,12 @@ use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
 use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\AppFramework\Http\JSONResponse;
-use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IRequest;
 use OCP\IUserSession;
 use OCP\L10N\IFactory;
+use OCP\IAvatarManager;
+use OCP\INavigationManager;
+use OCP\IURLGenerator;
 
 class JsController extends Controller
 {
@@ -44,26 +45,13 @@ class JsController extends Controller
         protected ConfigProxy $config,
         protected ThemingDefaults $themingDefaults,
         protected IFactory $l10nFactory,
+        protected IAvatarManager $avatarManager,
+        protected IUserSession $userSession,
+        protected INavigationManager $navigationManager,
+        protected IURLGenerator $urlGenerator,
     ) {
         parent::__construct($appName, $request);
-
+        $this->user = $this->userSession->getUser();
-        $this->themingDefaults = $themingDefaults;
-
-        $this->user = \OC::$server[IUserSession::class]->getUser();
-        $this->config = $config;
-        $this->l10nFactory = $l10nFactory;
-    }
-
-    #[NoCSRFRequired]
-    #[NoAdminRequired]
-    #[PublicPage]
-    #[FrontpageRoute(verb: 'GET', url: '/js/script')]
-    public function script(): TemplateResponse
-    {
-        $response = new TemplateResponse(Application::APP_ID, 'js/script', $this->getConfig(), 'blank');
-        $response->addHeader('Content-Type', 'text/javascript');
-
-        return $response;
     }
 
     #[NoCSRFRequired]
@@ -111,25 +99,25 @@ class JsController extends Controller
                 $targetBlankApps = $userTargetBlankApps;
             }
 
-            $isAvatarSet = \OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
+            $isAvatarSet = $this->avatarManager->getAvatar($this->user->getUID())->exists();
 
             if ($useAvatar && $isAvatarSet) {
-                $avatar = \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
+                $avatar = $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [
-                    'userId' => $this->user->getUid(),
+                    'userId' => $this->user->getUID(),
                     'size' => 128,
                     'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
                 ]);
             }
 
             if ($this->config->getAppValueBool('show-settings', '0')) {
-                $settingsNav = \OC::$server->getNavigationManager()->getAll('settings');
+                $settingsNav = $this->navigationManager->getAll('settings');
 
                 if (isset($settingsNav['settings'])) {
                     $settings = [
                         'href' => $settingsNav['settings']['href'],
                         'name' => $settingsNav['settings']['name'],
-                        'avatar' => \OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', [
+                        'avatar' => $this->urlGenerator->linkToRoute('core.avatar.getAvatar', [
-                            'userId' => $this->user->getUid(),
+                            'userId' => $this->user->getUID(),
                             'size' => 32,
                             'v' => $this->config->getUserValueInt($this->user, 'avatar', 'version', 0),
                         ]),
@@ -138,7 +126,7 @@ class JsController extends Controller
             }
         }
 
-        $indexUrl = \OC::$server->getURLGenerator()->linkTo('', 'index.php');
+        $indexUrl = $this->urlGenerator->linkTo('', 'index.php');
 
         return [
             'opener-position' => $this->config->getAppValue('opener-position', 'before'),

lib/Controller/PersonalSettingController.php

@@ -98,6 +98,7 @@ class PersonalSettingController extends Controller
     }
 
     #[NoCSRFRequired]
+    #[NoAdminRequired]
     #[FrontpageRoute(verb: 'GET', url: '/user/config')]
     public function configuration(): JSONResponse
     {

lib/Service/LangRepository.php

@@ -30,7 +30,12 @@ class LangRepository
             ->from('preferences')
         ;
 
-        $stmt = $qb->execute();
+        // Nextcloud >=33+
+        if (method_exists($qb, 'executeQuery')) {
+            $stmt = $qb->executeQuery();
+        } else {
+            $stmt = $qb->execute();
+        }
 
         $langs = ['en'];
 

src/components/settings/AdminSaveButton.vue

@@ -73,10 +73,10 @@ const save = async () => {
         if (Array.isArray(value) || typeof value === 'object') {
           value = JSON.stringify(value)
         } else if (typeof value === 'boolean') {
-          value = value ? 1 : 0
+          value = value ? '1' : '0'
         }
 
-        OCP.AppConfig.setValue('side_menu', key, value, {
+        OCP.AppConfig.setValue('side_menu', key, value.toString(), {
           success() {
             update()
           },

src/components/settings/UserSaveButton.vue

@@ -69,11 +69,11 @@ const save = async () => {
     if (Array.isArray(value) || typeof value === 'object') {
       value = JSON.stringify(value)
     } else if (typeof value === 'boolean') {
-      value = value ? 1 : 0
+      value = value ? '1' : '0'
     }
 
     formData.push('name=' + encodeURIComponent(key))
-    formData.push('value=' + encodeURIComponent(value))
+    formData.push('value=' + encodeURIComponent(value.toString()))
 
     fetch(url, {
       method: 'POST',

src/components/settings/form/FormColorPicker.vue

@@ -17,6 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <template>
   <NcColorPicker
     v-model="model"
+    :advancedFields="true"
     class="cm-settings-form-colorpicker"
   >
     <div

src/menus/StandardMenu.vue

@@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         :data-app-id="app.id"
         class="app-menu-entry"
         :class="{
-          'app-menu-entry__active': app.active,
+          'app-menu-entry__active': app.id === activeApp,
           'app-menu-entry__hidden-label': hiddenLabels === 1,
           'app-menu-main__show-hovered': hiddenLabels === 2,
         }"
@@ -44,7 +44,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
           :class="{ 'has-unread': app.unread > 0 }"
           :aria-label="app.name"
           :target="targetBlankApps.indexOf(app.id) !== -1 ? '_blank' : undefined"
-          :aria-current="app.active ? 'page' : false"
+          :aria-current="app.id === activeApp ? 'page' : false"
         >
           <img
             :src="app.icon"
@@ -69,7 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         v-for="app in popoverAppList"
         :key="app.id"
         :aria-label="app.name"
-        :aria-current="app.active ? 'page' : false"
+        :aria-current="app.id === activeApp ? 'page' : false"
         :href="app.href"
         :style="makeStyle(app)"
         class="cm-standardmenu-app-menu-popover-entry app-menu-popover-entry"
@@ -101,6 +101,7 @@ import { ref, onMounted } from 'vue'
 import { useConfigStore } from '../store/config.js'
 import { useNavStore } from '../store/nav.js'
 import { NcActions, NcActionLink } from '@nextcloud/vue'
+import { getActiveAppId } from '../lib/app.js'
 
 const navStore = useNavStore()
 const configStore = useConfigStore()
@@ -112,6 +113,7 @@ const topMenuApps = ref([])
 const appsOrder = ref([])
 const mainAppList = ref([])
 const popoverAppList = ref([])
+const activeApp = ref(null)
 let resizeTimeout = null
 
 const setApps = (value) => {
@@ -142,7 +144,7 @@ const appLimit = () => {
     })
   }
 
-  return Math.floor((body.offsetWidth - size) / 70)
+  return Math.max(0, Math.floor((body.offsetWidth - size) / 70))
 }
 
 const makeStyle = (app) => {
@@ -158,6 +160,11 @@ const computeLists = () => {
   popoverAppList.value = appList.value.slice(appLimit()).sort((a, b) => a.order - b.order)
 }
 
+const reComputeLists = (delay) => {
+    window.clearTimeout(resizeTimeout)
+    resizeTimeout = window.setTimeout(computeLists, delay || 100)
+}
+
 onMounted(async () => {
   const config = await configStore.getConfig()
 
@@ -165,14 +172,12 @@ onMounted(async () => {
   hiddenLabels.value = config['top-menu-mouse-over-hidden-label']
   topMenuApps.value = config['top-menu-apps']
   appsOrder.value = config['apps-order']
+  activeApp.value = getActiveAppId()
   ready.value = true
 
   setApps(await navStore.getCoreApps())
 
-  window.addEventListener('resize', () => {
+  window.addEventListener('resize', reComputeLists)
-    window.clearTimeout(resizeTimeout)
-    resizeTimeout = window.setTimeout(computeLists, 100)
-  })
 })
 </script>
 

src/store/nav.js

@@ -41,10 +41,7 @@ export const useNavStore = defineStore('nav', () => {
 
   async function getCoreApps() {
     if (coreApps == null) {
-      coreApps = await axios
+      coreApps = await await axios.get(generateUrl('/apps/side_menu/core/apps')).then((response) => response.data.items)
-        .get(generateOcsUrl('core/navigation', 2) + '/apps?format=json')
-        .then((response) => response.data)
-        .then((value) => value.ocs.data)
     }
 
     return coreApps

templates/css/stylesheet.php

@@ -38,7 +38,7 @@ body[data-theme-light], body[data-theme-light-highcontrast] {
 
 <?php if ($_['opener-only']) { ?>
   #nextcloud {
-    display: none;
+    display: none !important;
   }
 <?php } ?>
 

webpack.config.js

@@ -77,6 +77,10 @@ module.exports = {
     new webpack.ProvidePlugin({
       Buffer: ['buffer', 'Buffer'],
     }),
+
+    new webpack.DefinePlugin({
+      appName: JSON.stringify(appName),
+    }),
   ],
 
   resolve: {