diff --git a/.woodpecker/.publish.yml b/.woodpecker/.publish.yml index c42146a..ac39564 100644 --- a/.woodpecker/.publish.yml +++ b/.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 diff --git a/CHANGELOG.md b/CHANGELOG.md index 585c860..d49e858 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,32 @@ ## [Unreleased] +## 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) diff --git a/Makefile b/Makefile index 7803a58..883cccb 100644 --- a/Makefile +++ b/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 diff --git a/README.md b/README.md index bf8abbb..48614bf 100644 --- a/README.md +++ b/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 -* App `theming` enabled +* PHP >= 8.1 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/v${VERSION}/side_menu_v${VERSION}.tar.gz | tar xvfz - ``` Administrators can edit many settings using the administration page. diff --git a/appinfo/info.xml b/appinfo/info.xml index d6a0f5f..7fd8755 100644 --- a/appinfo/info.xml +++ b/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/). ]]> - 4.1.1 + 5.0.2 agpl Simon Vieille SideMenu @@ -54,7 +53,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de - + OCA\SideMenu\Settings\Admin diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php index 906bb71..c255ae3 100644 --- a/lib/AppInfo/Application.php +++ b/lib/AppInfo/Application.php @@ -106,6 +106,10 @@ class Application extends App implements IBootstrap protected function isEnabled(): bool { + if (preg_match('/MemoriesNative/', $_SERVER['HTTP_USER_AGENT'])) { + return false; + } + $enabled = true; $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0'); @@ -128,7 +132,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 +142,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'); diff --git a/lib/Controller/JsController.php b/lib/Controller/JsController.php index f8c6228..a8be206 100644 --- a/lib/Controller/JsController.php +++ b/lib/Controller/JsController.php @@ -54,18 +54,6 @@ class JsController extends Controller $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] #[NoAdminRequired] #[PublicPage] diff --git a/lib/Controller/PersonalSettingController.php b/lib/Controller/PersonalSettingController.php index 9b63576..285f89c 100644 --- a/lib/Controller/PersonalSettingController.php +++ b/lib/Controller/PersonalSettingController.php @@ -98,6 +98,7 @@ class PersonalSettingController extends Controller } #[NoCSRFRequired] + #[NoAdminRequired] #[FrontpageRoute(verb: 'GET', url: '/user/config')] public function configuration(): JSONResponse { diff --git a/screenshots/admin_settings.png b/screenshots/admin_settings.png index 4d7a0e0..eae14bb 100644 Binary files a/screenshots/admin_settings.png and b/screenshots/admin_settings.png differ diff --git a/screenshots/personal_settings.png b/screenshots/personal_settings.png index 05a73ee..480063b 100644 Binary files a/screenshots/personal_settings.png and b/screenshots/personal_settings.png differ diff --git a/src/menus/StandardMenu.vue b/src/menus/StandardMenu.vue index 5e817ee..fb16b59 100644 --- a/src/menus/StandardMenu.vue +++ b/src/menus/StandardMenu.vue @@ -142,7 +142,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 +158,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() @@ -169,10 +174,7 @@ onMounted(async () => { setApps(await navStore.getCoreApps()) - window.addEventListener('resize', () => { - window.clearTimeout(resizeTimeout) - resizeTimeout = window.setTimeout(computeLists, 100) - }) + window.addEventListener('resize', reComputeLists) })