fix(app): add compatibility with Nextcloud 34
This commit is contained in:
@@ -6,6 +6,7 @@ use OC\AllConfig;
|
|||||||
use OC\App\AppStore\Fetcher\CategoryFetcher;
|
use OC\App\AppStore\Fetcher\CategoryFetcher;
|
||||||
use OC\AppFramework\Http\Request;
|
use OC\AppFramework\Http\Request;
|
||||||
use OC\Security\CSP\ContentSecurityPolicyNonceManager;
|
use OC\Security\CSP\ContentSecurityPolicyNonceManager;
|
||||||
|
use OC\Security\CSRF\CsrfTokenManager;
|
||||||
use OC\User\User;
|
use OC\User\User;
|
||||||
use OCA\SideMenu\Service\AppRepository;
|
use OCA\SideMenu\Service\AppRepository;
|
||||||
use OCA\SideMenu\Service\CategoryRepository;
|
use OCA\SideMenu\Service\CategoryRepository;
|
||||||
@@ -19,8 +20,11 @@ use OCP\AppFramework\Bootstrap\IRegistrationContext;
|
|||||||
use OCP\EventDispatcher\IEventDispatcher;
|
use OCP\EventDispatcher\IEventDispatcher;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use OCP\INavigationManager;
|
use OCP\INavigationManager;
|
||||||
|
use OCP\IRequest;
|
||||||
|
use OCP\IURLGenerator;
|
||||||
use OCP\IUserSession;
|
use OCP\IUserSession;
|
||||||
use OCP\L10N\IFactory;
|
use OCP\L10N\IFactory;
|
||||||
|
use OCP\Server;
|
||||||
use OCP\Util;
|
use OCP\Util;
|
||||||
use Psr\Container\ContainerInterface;
|
use Psr\Container\ContainerInterface;
|
||||||
|
|
||||||
@@ -34,9 +38,9 @@ class Application extends App implements IBootstrap
|
|||||||
public const APP_ID = 'side_menu';
|
public const APP_ID = 'side_menu';
|
||||||
public const APP_NAME = 'Custom menu';
|
public const APP_NAME = 'Custom menu';
|
||||||
|
|
||||||
protected AllConfig $config;
|
protected IConfig $config;
|
||||||
protected ContentSecurityPolicyNonceManager $cspnm;
|
protected ContentSecurityPolicyNonceManager $cspnm;
|
||||||
protected Request $request;
|
protected IRequest $request;
|
||||||
protected ?User $user = null;
|
protected ?User $user = null;
|
||||||
|
|
||||||
public function __construct(array $urlParams = [])
|
public function __construct(array $urlParams = [])
|
||||||
@@ -83,10 +87,9 @@ class Application extends App implements IBootstrap
|
|||||||
|
|
||||||
public function boot(IBootContext $context): void
|
public function boot(IBootContext $context): void
|
||||||
{
|
{
|
||||||
$this->config = \OC::$server->getConfig();
|
$this->config = Server::get(IConfig::class);
|
||||||
$this->cspnm = \OC::$server->getContentSecurityPolicyNonceManager();
|
$this->user = Server::get(IUserSession::class)->getUser();
|
||||||
$this->user = \OC::$server[IUserSession::class]->getUser();
|
$this->request = Server::get(IRequest::class);
|
||||||
$this->request = \OC::$server->getRequest();
|
|
||||||
|
|
||||||
if (!$this->isEnabled()) {
|
if (!$this->isEnabled()) {
|
||||||
return;
|
return;
|
||||||
@@ -138,7 +141,7 @@ class Application extends App implements IBootstrap
|
|||||||
$cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
|
$cache = $this->config->getAppValue(self::APP_ID, 'cache', '0');
|
||||||
|
|
||||||
foreach ($assets as $value) {
|
foreach ($assets as $value) {
|
||||||
$route = \OC::$server->getURLGenerator()->linkToRoute(
|
$route = Server::get(IURLGenerator::class)->linkToRoute(
|
||||||
$value['route'],
|
$value['route'],
|
||||||
['v' => $cache]
|
['v' => $cache]
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user