Merge pull request 'feature/nc34' (#500) from feature/nc34 into develop

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/500
This commit is contained in:
Simon Vieille
2026-07-17 18:43:53 +02:00
5 changed files with 2146 additions and 677 deletions
+607 -253
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -53,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.5" />
<nextcloud min-version="31" max-version="33"/>
<nextcloud min-version="31" max-version="34"/>
</dependencies>
<settings>
<admin>OCA\SideMenu\Settings\Admin</admin>
+10 -7
View File
@@ -6,6 +6,7 @@ use OC\AllConfig;
use OC\App\AppStore\Fetcher\CategoryFetcher;
use OC\AppFramework\Http\Request;
use OC\Security\CSP\ContentSecurityPolicyNonceManager;
use OC\Security\CSRF\CsrfTokenManager;
use OC\User\User;
use OCA\SideMenu\Service\AppRepository;
use OCA\SideMenu\Service\CategoryRepository;
@@ -19,8 +20,11 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\IConfig;
use OCP\INavigationManager;
use OCP\IRequest;
use OCP\IURLGenerator;
use OCP\IUserSession;
use OCP\L10N\IFactory;
use OCP\Server;
use OCP\Util;
use Psr\Container\ContainerInterface;
@@ -34,9 +38,9 @@ class Application extends App implements IBootstrap
public const APP_ID = 'side_menu';
public const APP_NAME = 'Custom menu';
protected AllConfig $config;
protected IConfig $config;
protected ContentSecurityPolicyNonceManager $cspnm;
protected Request $request;
protected IRequest $request;
protected ?User $user = null;
public function __construct(array $urlParams = [])
@@ -83,10 +87,9 @@ class Application extends App implements IBootstrap
public function boot(IBootContext $context): void
{
$this->config = \OC::$server->getConfig();
$this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
$this->user = \OC::$server[IUserSession::class]->getUser();
$this->request = \OC::$server->getRequest();
$this->config = Server::get(IConfig::class);
$this->user = Server::get(IUserSession::class)->getUser();
$this->request = Server::get(IRequest::class);
if (!$this->isEnabled()) {
return;
@@ -138,7 +141,7 @@ class Application extends App implements IBootstrap
$cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
foreach ($assets as $value) {
$route = \OC::$server->getURLGenerator()->linkToRoute(
$route = Server::get(IURLGenerator::class)->linkToRoute(
$value['route'],
['v' => $cache]
);
+1527 -415
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -13,7 +13,7 @@
"@babel/core": ">=7.12.0 <8.0.0",
"@formatjs/intl-segmenter": "^12.0.8",
"@nextcloud/router": "^3.0.1",
"@nextcloud/vue": "^9.0.0-alpha.8",
"@nextcloud/vue": "^9.9.0",
"node-polyfill-webpack-plugin": "^4.1.0",
"pinia": "^3.0.1",
"postcss": "^7.0.0 || ^8.0.1",