diff --git a/lib/Controller/AppController.php b/lib/Controller/AppController.php index 1d3de92..83a0e8c 100644 --- a/lib/Controller/AppController.php +++ b/lib/Controller/AppController.php @@ -86,7 +86,11 @@ class AppController extends Controller protected function redirectToApp($appId): RedirectResponse { - $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false); + $isIgnoreFrontController = true === OC::$server->getConfig()->getSystemValue( + 'htaccess.IgnoreFrontController', + false + ); + $isFrontControllerActive = 'true' === getenv('front_controller_active'); if ($isIgnoreFrontController || $isFrontControllerActive) { diff --git a/lib/Controller/CssController.php b/lib/Controller/CssController.php index 028ac11..338acb7 100644 --- a/lib/Controller/CssController.php +++ b/lib/Controller/CssController.php @@ -21,14 +21,14 @@ namespace OCA\SideMenu\Controller; use OC; use OC\User\User; use OCA\SideMenu\AppInfo\Application; +use OCA\SideMenu\Service\Color; use OCA\SideMenu\Service\ConfigProxy; +use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\TemplateResponse; use OCP\IRequest; use OCP\IUserSession; -use OCA\Theming\ThemingDefaults; -use OCA\SideMenu\Service\Color; class CssController extends Controller { @@ -58,8 +58,7 @@ class CssController extends Controller ConfigProxy $config, ThemingDefaults $theming, Color $color - ) - { + ) { parent::__construct($appName, $request); $this->user = OC::$server[IUserSession::class]->getUser(); @@ -105,16 +104,18 @@ class CssController extends Controller $topSideMenuApps = $userTopSideMenuApps; } - $isDarkThemeUserEnabled = $this->config->getUserValue($this->user, 'theme', '', 'accessibility') === 'dark'; + $isDarkThemeUserEnabled = 'dark' === $this->config->getUserValue($this->user, 'theme', '', 'accessibility'); $isBreezeDarkUserEnabled = $this->config->getUserValue($this->user, 'theme_enabled', '', 'breezedark'); - $isBreezeDarkUserEnabled = $isBreezeDarkUserEnabled === '1' || ($isBreezeDarkGlobalEnabled && $isBreezeDarkUserEnabled === ''); + $isBreezeDarkUserEnabled = '1' === $isBreezeDarkUserEnabled || + ($isBreezeDarkGlobalEnabled && '' === $isBreezeDarkUserEnabled); } else { $isDarkThemeUserEnabled = false; $isBreezeDarkUserEnabled = false; } - $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) || ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled); + $isDarkMode = ($isAccessibilityAppEnabled && $isDarkThemeUserEnabled) || + ($isBreezeDarkAppEnabled && $isBreezeDarkUserEnabled); $primaryColor = $this->theming->getColorPrimary(); $lightenPrimaryColor = $this->color->adjustBrightness($primaryColor, 0.2); diff --git a/lib/Controller/PersonalSettingController.php b/lib/Controller/PersonalSettingController.php index 6f126c7..fc30c35 100644 --- a/lib/Controller/PersonalSettingController.php +++ b/lib/Controller/PersonalSettingController.php @@ -43,8 +43,13 @@ class PersonalSettingController extends Controller */ protected $userSession; - public function __construct($appName, IRequest $request, IConfig $config, ConfigProxy $configProxy, IUserSession $userSession) - { + public function __construct( + $appName, + IRequest $request, + IConfig $config, + ConfigProxy $configProxy, + IUserSession $userSession + ) { parent::__construct($appName, $request); $this->config = $config; diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php index e61f9e5..57112d0 100644 --- a/lib/Settings/Personal.php +++ b/lib/Settings/Personal.php @@ -54,8 +54,13 @@ class Personal implements ISettings */ private $appRepository; - public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, IUserSession $userSession, AppRepository $appRepository) - { + public function __construct( + IL10N $l, + ILogger $logger, + ConfigProxy $config, + IUserSession $userSession, + AppRepository $appRepository + ) { $this->l = $l; $this->logger = $logger; $this->config = $config;