- add specific methods to get the config
- add a controller to retrieve most of the configuration
This commit is contained in:
parent
cd294273cb
commit
5153bee7c6
|
@ -21,6 +21,7 @@ return [
|
||||||
'routes' => [
|
'routes' => [
|
||||||
['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
|
['name' => 'Css#stylesheet', 'url' => '/css/stylesheet', 'verb' => 'GET'],
|
||||||
['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
|
['name' => 'Js#script', 'url' => '/js/script', 'verb' => 'GET'],
|
||||||
|
['name' => 'Js#config', 'url' => '/js/config', 'verb' => 'GET'],
|
||||||
['name' => 'Nav#items', 'url' => '/nav/items', 'verb' => 'GET'],
|
['name' => 'Nav#items', 'url' => '/nav/items', 'verb' => 'GET'],
|
||||||
['name' => 'PersonalSetting#valueSet', 'url' => '/personalSetting/valueSet', 'verb' => 'POST'],
|
['name' => 'PersonalSetting#valueSet', 'url' => '/personalSetting/valueSet', 'verb' => 'POST'],
|
||||||
],
|
],
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
namespace OCA\SideMenu\Controller;
|
namespace OCA\SideMenu\Controller;
|
||||||
|
|
||||||
use OC;
|
use OC;
|
||||||
|
use OC\User\User;
|
||||||
use OCP\AppFramework\Controller;
|
use OCP\AppFramework\Controller;
|
||||||
use OCP\AppFramework\Http\Response;
|
use OCP\AppFramework\Http\Response;
|
||||||
use OCP\AppFramework\Http\TemplateResponse;
|
use OCP\AppFramework\Http\TemplateResponse;
|
||||||
|
@ -33,13 +34,21 @@ class CssController extends Controller
|
||||||
*/
|
*/
|
||||||
protected $config;
|
protected $config;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var User
|
||||||
|
*/
|
||||||
|
protected $user;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $appName
|
* @param string $appName
|
||||||
|
* @param IRequest $request
|
||||||
|
* @param IConfig $config
|
||||||
*/
|
*/
|
||||||
public function __construct($appName, IRequest $request, IConfig $config)
|
public function __construct($appName, IRequest $request, IConfig $config)
|
||||||
{
|
{
|
||||||
parent::__construct($appName, $request);
|
parent::__construct($appName, $request);
|
||||||
|
|
||||||
|
$this->user = OC::$server[IUserSession::class]->getUser();
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,22 +60,29 @@ class CssController extends Controller
|
||||||
* @return Response
|
* @return Response
|
||||||
*/
|
*/
|
||||||
public function stylesheet()
|
public function stylesheet()
|
||||||
|
{
|
||||||
|
$response = new TemplateResponse('side_menu', 'css/stylesheet', $this->getConfig(), 'blank');
|
||||||
|
$response->addHeader('Content-Type', 'text/css');
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getConfig(): array
|
||||||
{
|
{
|
||||||
$backgroundColor = $this->config->getAppValue('side_menu', 'background-color', '#333333');
|
$backgroundColor = $this->config->getAppValue('side_menu', 'background-color', '#333333');
|
||||||
$backgroundColorTo = $this->config->getAppValue('side_menu', 'background-color-to', $backgroundColor);
|
$backgroundColorTo = $this->config->getAppValue('side_menu', 'background-color-to', $backgroundColor);
|
||||||
|
|
||||||
$user = OC::$server[IUserSession::class]->getUser();
|
|
||||||
$topMenuApps = (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true);
|
$topMenuApps = (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true);
|
||||||
|
|
||||||
if ($user) {
|
if ($this->user) {
|
||||||
$userTopMenuApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
|
$userTopMenuApps = (array) json_decode($this->config->getUserValue($this->user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
|
||||||
|
|
||||||
if (!empty($userTopMenuApps)) {
|
if (!empty($userTopMenuApps)) {
|
||||||
$topMenuApps = $userTopMenuApps;
|
$topMenuApps = $userTopMenuApps;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$parameters = [
|
return [
|
||||||
'vars' => [
|
'vars' => [
|
||||||
'background-color' => $backgroundColor,
|
'background-color' => $backgroundColor,
|
||||||
'background-color-to' => $backgroundColorTo,
|
'background-color-to' => $backgroundColorTo,
|
||||||
|
@ -86,10 +102,5 @@ class CssController extends Controller
|
||||||
'big-menu' => (bool) $this->config->getAppValue('side_menu', 'big-menu', '0'),
|
'big-menu' => (bool) $this->config->getAppValue('side_menu', 'big-menu', '0'),
|
||||||
'top-menu-apps' => $topMenuApps,
|
'top-menu-apps' => $topMenuApps,
|
||||||
];
|
];
|
||||||
|
|
||||||
$response = new TemplateResponse('side_menu', 'css/stylesheet', $parameters, 'blank');
|
|
||||||
$response->addHeader('Content-Type', 'text/css');
|
|
||||||
|
|
||||||
return $response;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,8 +19,10 @@
|
||||||
namespace OCA\SideMenu\Controller;
|
namespace OCA\SideMenu\Controller;
|
||||||
|
|
||||||
use OC;
|
use OC;
|
||||||
|
use OC\User\User;
|
||||||
|
use OCA\Theming\ThemingDefaults;
|
||||||
use OCP\AppFramework\Controller;
|
use OCP\AppFramework\Controller;
|
||||||
use OCP\AppFramework\Http\Response;
|
use OCP\AppFramework\Http\JSONResponse;
|
||||||
use OCP\AppFramework\Http\TemplateResponse;
|
use OCP\AppFramework\Http\TemplateResponse;
|
||||||
use OCP\IConfig;
|
use OCP\IConfig;
|
||||||
use OCP\IRequest;
|
use OCP\IRequest;
|
||||||
|
@ -34,12 +36,28 @@ class JsController extends Controller
|
||||||
protected $config;
|
protected $config;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $appName
|
* @var User
|
||||||
*/
|
*/
|
||||||
public function __construct($appName, IRequest $request, IConfig $config)
|
protected $user;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @var ThemingDefaults
|
||||||
|
*/
|
||||||
|
protected $themingDefaults;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param string $appName
|
||||||
|
* @param IRequest $request
|
||||||
|
* @param IConfig $config
|
||||||
|
* @param ThemingDefaults $themingDefaults
|
||||||
|
*/
|
||||||
|
public function __construct($appName, IRequest $request, IConfig $config, ThemingDefaults $themingDefaults)
|
||||||
{
|
{
|
||||||
parent::__construct($appName, $request);
|
parent::__construct($appName, $request);
|
||||||
|
|
||||||
|
$this->themingDefaults = $themingDefaults;
|
||||||
|
|
||||||
|
$this->user = OC::$server[IUserSession::class]->getUser();
|
||||||
$this->config = $config;
|
$this->config = $config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,45 +65,60 @@ class JsController extends Controller
|
||||||
* @NoAdminRequired
|
* @NoAdminRequired
|
||||||
* @NoCSRFRequired
|
* @NoCSRFRequired
|
||||||
* @PublicPage
|
* @PublicPage
|
||||||
*
|
|
||||||
* @return Response
|
|
||||||
*/
|
*/
|
||||||
public function script()
|
public function script(): TemplateResponse
|
||||||
|
{
|
||||||
|
$response = new TemplateResponse('side_menu', 'js/script', $this->getConfig(), 'blank');
|
||||||
|
$response->addHeader('Content-Type', 'text/javascript');
|
||||||
|
|
||||||
|
return $response;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @NoAdminRequired
|
||||||
|
* @NoCSRFRequired
|
||||||
|
* @PublicPage
|
||||||
|
*/
|
||||||
|
public function config(): JSONResponse
|
||||||
|
{
|
||||||
|
return new JSONResponse($this->getConfig());
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function getConfig(): array
|
||||||
{
|
{
|
||||||
$user = OC::$server[IUserSession::class]->getUser();
|
|
||||||
$topMenuApps = (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true);
|
$topMenuApps = (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true);
|
||||||
$targetBlankApps = (array) json_decode($this->config->getAppValue('side_menu', 'target-blank-apps', '[]'), true);
|
$targetBlankApps = (array) json_decode($this->config->getAppValue('side_menu', 'target-blank-apps', '[]'), true);
|
||||||
$useAvatar = (bool) $this->config->getAppValue('side_menu', 'use-avatar', '0');
|
$useAvatar = (bool) $this->config->getAppValue('side_menu', 'use-avatar', '0');
|
||||||
$avatar = null;
|
$avatar = null;
|
||||||
|
|
||||||
if ($user) {
|
if ($this->user) {
|
||||||
$userTopMenuApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
|
$userTopMenuApps = (array) json_decode($this->config->getUserValue($this->user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
|
||||||
|
|
||||||
if (!empty($userTopMenuApps)) {
|
if (!empty($userTopMenuApps)) {
|
||||||
$topMenuApps = $userTopMenuApps;
|
$topMenuApps = $userTopMenuApps;
|
||||||
}
|
}
|
||||||
|
|
||||||
$userTargetBlankMode = (int) $this->config->getUserValue($user->getUid(), 'side_menu', 'target-blank-mode', '1');
|
$userTargetBlankMode = (int) $this->config->getUserValue($this->user->getUid(), 'side_menu', 'target-blank-mode', '1');
|
||||||
$userTargetBlankApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'target-blank-apps', '[]'), true);
|
$userTargetBlankApps = (array) json_decode($this->config->getUserValue($this->user->getUid(), 'side_menu', 'target-blank-apps', '[]'), true);
|
||||||
|
|
||||||
if (2 === $userTargetBlankMode) {
|
if (2 === $userTargetBlankMode) {
|
||||||
$targetBlankApps = $userTargetBlankApps;
|
$targetBlankApps = $userTargetBlankApps;
|
||||||
}
|
}
|
||||||
|
|
||||||
$isAvatarSet = OC::$server->getAvatarManager()->getAvatar($user->getUid())->exists();
|
$isAvatarSet = OC::$server->getAvatarManager()->getAvatar($this->user->getUid())->exists();
|
||||||
|
|
||||||
if ($useAvatar && $isAvatarSet) {
|
if ($useAvatar && $isAvatarSet) {
|
||||||
$avatar = OC::$server->getURLGenerator()->linkToRoute(
|
$avatar = OC::$server->getURLGenerator()->linkToRoute(
|
||||||
'core.avatar.getAvatar', [
|
'core.avatar.getAvatar', [
|
||||||
'userId' => $user->getUid(),
|
'userId' => $this->user->getUid(),
|
||||||
'size' => 128,
|
'size' => 128,
|
||||||
'v' => $this->config->getUserValue($user, 'avatar', 'version', 0),
|
'v' => $this->config->getUserValue($this->user, 'avatar', 'version', 0),
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$parameters = [
|
return [
|
||||||
'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
|
'opener-position' => $this->config->getAppValue('side_menu', 'opener-position', 'before'),
|
||||||
'opener-hover' => (bool) $this->config->getAppValue('side_menu', 'opener-hover', '0'),
|
'opener-hover' => (bool) $this->config->getAppValue('side_menu', 'opener-hover', '0'),
|
||||||
'external-sites-in-top-menu' => (bool) $this->config->getAppValue('side_menu', 'external-sites-in-top-menu', 0),
|
'external-sites-in-top-menu' => (bool) $this->config->getAppValue('side_menu', 'external-sites-in-top-menu', 0),
|
||||||
|
@ -97,11 +130,7 @@ class JsController extends Controller
|
||||||
'avatar' => $avatar,
|
'avatar' => $avatar,
|
||||||
'top-menu-apps' => $topMenuApps,
|
'top-menu-apps' => $topMenuApps,
|
||||||
'target-blank-apps' => $targetBlankApps,
|
'target-blank-apps' => $targetBlankApps,
|
||||||
|
'logo' => $this->themingDefaults->getLogo(),
|
||||||
];
|
];
|
||||||
|
|
||||||
$response = new TemplateResponse('side_menu', 'js/script', $parameters, 'blank');
|
|
||||||
$response->addHeader('Content-Type', 'text/javascript');
|
|
||||||
|
|
||||||
return $response;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue