Merge branch 'feature/issue38' into develop

lib/AppInfo/Application.php

@@ -55,8 +55,9 @@ class Application extends App
     public function isEnabled(): bool
     {
         $enabled = true;
+        $isForced = (bool) $this->config->getAppValue(self::APP_ID, 'force', '0');
 
-        if (null !== $this->user) {
+        if (null !== $this->user && !$isForced) {
             $enabled = (bool) $this->config->getUserValue($this->user->getUid(), self::APP_ID, 'enabled', '1');
         }
 

lib/Controller/CssController.php

@@ -67,13 +67,13 @@ class CssController extends Controller
     {
         $backgroundColor = $this->config->getAppValue('background-color', '#333333');
         $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
-
+        $isForced = $this->config->getAppValueBool('force', '0');
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
 
         if ($this->user) {
             $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
 
-            if (!empty($userTopMenuApps)) {
+            if (!empty($userTopMenuApps) && !$isForced) {
                 $topMenuApps = $userTopMenuApps;
             }
         }

lib/Controller/JsController.php

@@ -84,19 +84,20 @@ class JsController extends Controller
         $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
         $targetBlankApps = $this->config->getAppValueArray('target-blank-apps', '[]');
         $useAvatar = $this->config->getAppValueBool('use-avatar', '0');
+        $isForced = $this->config->getAppValueBool('force', '0');
         $avatar = null;
 
         if ($this->user) {
             $userTopMenuApps = $this->config->getUserValueArray($this->user, 'top-menu-apps', '[]');
 
-            if (!empty($userTopMenuApps)) {
+            if (!empty($userTopMenuApps) && !$isForced) {
                 $topMenuApps = $userTopMenuApps;
             }
 
             $userTargetBlankMode = $this->config->getUserValueInt($this->user, 'target-blank-mode', '1');
             $userTargetBlankApps = $this->config->getUserValueArray($this->user, 'target-blank-apps', '[]');
 
-            if (2 === $userTargetBlankMode) {
+            if (2 === $userTargetBlankMode && !$isForced) {
                 $targetBlankApps = $userTargetBlankApps;
             }
 

lib/Controller/PersonalSettingController.php

@@ -24,6 +24,7 @@ use OCP\IConfig;
 use OCP\IRequest;
 use OCP\IUserSession;
 use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\ConfigProxy;
 
 class PersonalSettingController extends Controller
 {
@@ -37,11 +38,12 @@ class PersonalSettingController extends Controller
      */
     private $userSession;
 
-    public function __construct($appName, IRequest $request, IConfig $config, IUserSession $userSession)
+    public function __construct($appName, IRequest $request, IConfig $config, ConfigProxy $configProxy, IUserSession $userSession)
     {
         parent::__construct($appName, $request);
 
         $this->config = $config;
+        $this->configProxy = $configProxy;
         $this->userSession = $userSession;
     }
 
@@ -104,6 +106,10 @@ class PersonalSettingController extends Controller
             }
         }
 
+        if ($this->configProxy->getAppValueBool('force', '0')) {
+            $doSave = false;
+        }
+
         if ($doSave) {
             $this->config->setUserValue($user->getUid(), Application::APP_ID, $name, $value);
 

lib/Settings/Admin.php

@@ -18,13 +18,13 @@
 
 namespace OCA\SideMenu\Settings;
 
+use OCA\SideMenu\AppInfo\Application;
 use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\IConfig;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\Settings\ISettings;
-use OCA\SideMenu\AppInfo\Application;
 
 class Admin implements ISettings
 {
@@ -39,7 +39,7 @@ class Admin implements ISettings
     private $logger;
 
     /**
-     * @var IConfig
+     * @var ConfigProxy
      */
     private $config;
 
@@ -48,7 +48,7 @@ class Admin implements ISettings
      */
     private $appRepository;
 
-    public function __construct(IL10N $l, ILogger $logger, IConfig $config, AppRepository $appRepository)
+    public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, AppRepository $appRepository)
     {
         $this->l = $l;
         $this->logger = $logger;
@@ -61,32 +61,33 @@ class Admin implements ISettings
      */
     public function getForm()
     {
-        $backgroundColor = $this->config->getAppValue(Application::APP_ID, 'background-color', '#333333');
+        $backgroundColor = $this->config->getAppValue('background-color', '#333333');
-        $backgroundColorTo = $this->config->getAppValue(Application::APP_ID, 'background-color-to', $backgroundColor);
+        $backgroundColorTo = $this->config->getAppValue('background-color-to', $backgroundColor);
 
         $parameters = [
             'background-color' => $backgroundColor,
             'background-color-to' => $backgroundColorTo,
-            'current-app-background-color' => $this->config->getAppValue(Application::APP_ID, 'current-app-background-color', '#444444'),
+            'current-app-background-color' => $this->config->getAppValue('current-app-background-color', '#444444'),
-            'loader-color' => $this->config->getAppValue(Application::APP_ID, 'loader-color', '#0e75ac'),
+            'loader-color' => $this->config->getAppValue('loader-color', '#0e75ac'),
-            'icon-invert-filter' => (int) $this->config->getAppValue(Application::APP_ID, 'icon-invert-filter', '0'),
+            'icon-invert-filter' => $this->config->getAppValueInt('icon-invert-filter', '0'),
-            'icon-opacity' => (int) $this->config->getAppValue(Application::APP_ID, 'icon-opacity', '100'),
+            'icon-opacity' => $this->config->getAppValueInt('icon-opacity', '100'),
-            'loader-enabled' => $this->config->getAppValue(Application::APP_ID, 'loader-enabled', '1'),
+            'loader-enabled' => $this->config->getAppValue('loader-enabled', '1'),
-            'text-color' => $this->config->getAppValue(Application::APP_ID, 'text-color', '#FFFFFF'),
+            'text-color' => $this->config->getAppValue('text-color', '#FFFFFF'),
-            'cache' => $this->config->getAppValue(Application::APP_ID, 'cache', '0'),
+            'cache' => $this->config->getAppValue('cache', '0'),
-            'opener' => $this->config->getAppValue(Application::APP_ID, 'opener', 'side-menu-opener'),
+            'opener' => $this->config->getAppValue('opener', 'side-menu-opener'),
-            'always-displayed' => $this->config->getAppValue(Application::APP_ID, 'always-displayed', '0'),
+            'always-displayed' => $this->config->getAppValue('always-displayed', '0'),
-            'big-menu' => $this->config->getAppValue(Application::APP_ID, 'big-menu', '0'),
+            'big-menu' => $this->config->getAppValue('big-menu', '0'),
-            'display-logo' => $this->config->getAppValue(Application::APP_ID, 'display-logo', '1'),
+            'display-logo' => $this->config->getAppValue('display-logo', '1'),
-            'use-avatar' => $this->config->getAppValue(Application::APP_ID, 'use-avatar', '0'),
+            'use-avatar' => $this->config->getAppValue('use-avatar', '0'),
-            'opener-position' => $this->config->getAppValue(Application::APP_ID, 'opener-position', 'before'),
+            'opener-position' => $this->config->getAppValue('opener-position', 'before'),
-            'opener-hover' => $this->config->getAppValue(Application::APP_ID, 'opener-hover', '0'),
+            'opener-hover' => $this->config->getAppValue('opener-hover', '0'),
-            'opener-only' => $this->config->getAppValue(Application::APP_ID, 'opener-only', '0'),
+            'opener-only' => $this->config->getAppValue('opener-only', '0'),
-            'hide-when-no-apps' => $this->config->getAppValue(Application::APP_ID, 'hide-when-no-apps', '0'),
+            'hide-when-no-apps' => $this->config->getAppValue('hide-when-no-apps', '0'),
-            'size-icon' => $this->config->getAppValue(Application::APP_ID, 'size-icon', 'normal'),
+            'size-icon' => $this->config->getAppValue('size-icon', 'normal'),
-            'size-text' => $this->config->getAppValue(Application::APP_ID, 'size-text', 'normal'),
+            'size-text' => $this->config->getAppValue('size-text', 'normal'),
-            'target-blank-apps' => (array) json_decode($this->config->getAppValue(Application::APP_ID, 'target-blank-apps', '[]'), true),
+            'force' => $this->config->getAppValue('force', '0'),
-            'top-menu-apps' => (array) json_decode($this->config->getAppValue(Application::APP_ID, 'top-menu-apps', '[]'), true),
+            'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
+            'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
             'apps' => $this->appRepository->getVisibleApps(),
         ];
 

lib/Settings/Personal.php

@@ -18,14 +18,14 @@
 
 namespace OCA\SideMenu\Settings;
 
+use OCA\SideMenu\AppInfo\Application;
+use OCA\SideMenu\Service\AppRepository;
+use OCA\SideMenu\Service\ConfigProxy;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IL10N;
 use OCP\ILogger;
-use OCP\Settings\ISettings;
-use OCP\IConfig;
 use OCP\IUserSession;
-use OCA\SideMenu\Service\AppRepository;
+use OCP\Settings\ISettings;
-use OCA\SideMenu\AppInfo\Application;
 
 class Personal implements ISettings
 {
@@ -40,7 +40,7 @@ class Personal implements ISettings
     private $logger;
 
     /**
-     * @var IConfig
+     * @var ConfigProxy
      */
     private $config;
 
@@ -54,7 +54,7 @@ class Personal implements ISettings
      */
     private $appRepository;
 
-    public function __construct(IL10N $l, ILogger $logger, IConfig $config, IUserSession $userSession, AppRepository $appRepository)
+    public function __construct(IL10N $l, ILogger $logger, ConfigProxy $config, IUserSession $userSession, AppRepository $appRepository)
     {
         $this->l = $l;
         $this->logger = $logger;
@@ -71,10 +71,11 @@ class Personal implements ISettings
         $user = $this->userSession->getUser();
 
         $parameters = [
-            'enabled' => $this->config->getUserValue($user->getUid(), Application::APP_ID, 'enabled', '1'),
+            'force' => $this->config->getAppValueBool('force', '0'),
-            'top-menu-apps' => (array) json_decode($this->config->getUserValue($user->getUid(), Application::APP_ID, 'top-menu-apps', '[]'), true),
+            'enabled' => $this->config->getUserValue($user, 'enabled', '1'),
-            'target-blank-mode' => $this->config->getUserValue($user->getUid(), Application::APP_ID, 'target-blank-mode', '1'),
+            'top-menu-apps' => $this->config->getUserValueArray($user, 'top-menu-apps', '[]'),
-            'target-blank-apps' => (array) json_decode($this->config->getUserValue($user->getUid(), Application::APP_ID, 'target-blank-apps', '[]'), true),
+            'target-blank-mode' => $this->config->getUserValue($user, 'target-blank-mode', '1'),
+            'target-blank-apps' => $this->config->getUserValueArray($user, 'target-blank-apps', '[]'),
             'apps' => $this->appRepository->getVisibleApps(),
         ];
 
@@ -91,8 +92,8 @@ class Personal implements ISettings
 
     /**
      * @return int whether the form should be rather on the top or bottom of
-     * the admin section. The forms are arranged in ascending order of the
+     *             the admin section. The forms are arranged in ascending order of the
-     * priority values. It is required to return a value between 0 and 100.
+     *             priority values. It is required to return a value between 0 and 100.
      *
      * E.g.: 70
      */

src/l10n/fixtures/de.yaml

@@ -57,3 +57,5 @@
 "Use my selection": "Verwende meine Auswahl"
 "Show and hide the list of applications": "Ein- und Ausblenden der Anwendungsliste"
 "Use the avatar instead of the logo": "Verwenden Sie den Avatar anstelle des Logos"
+"You do not have permission to change the settings.": "Sie haben keine Berechtigung zum Ändern der Einstellungen."
+"Force this configuration to users": "Erzwingen Sie diese Konfiguration für Benutzer"

src/l10n/fixtures/fr.yaml

@@ -57,3 +57,5 @@
 "Use my selection": "Utiliser ma sélection"
 "Show and hide the list of applications": "Afficher et masquer la liste des applications"
 "Use the avatar instead of the logo": "Utiliser l'avatar à la place du logo"
+"You do not have permission to change the settings.": "Vous n'avez pas la permission de changer les paramètres."
+"Force this configuration to users": "Forcer cette configuration aux utilisateurs"

templates/settings/admin-form.php

@@ -473,6 +473,20 @@ $choicesSizes = [
     </div>
 
     <div class="section">
+        <div>
+            <label for="side-menu-opener-only">
+                <?php p($l->t('Force this configuration to users')); ?>
+            </label>
+
+            <select id="side-menu-force" name="force" class="side-menu-setting">
+                <?php foreach ($choicesYesNo as $label => $value): ?>
+                    <option value="<?php echo $value ?>" <?php if ($value === $_['force']): ?>selected<?php endif; ?>>
+                        <?php echo $l->t($label);  ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
+        </div>
+
         <input type="hidden" id="side-menu-cache" name="cache" value="<?php print_unescaped($_['cache']); ?>" class="side-menu-setting">
 
         <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>

templates/settings/personal-form.php

@@ -27,125 +27,142 @@ $choicesYesNo = [
 
 ?>
 
+
 <div id="side-menu-section">
-    <div class="section">
+    <?php if ($_['force']): ?>
-        <h2>
+        <div class="section">
-            <?php p($l->t('Menu')); ?>
+            <h2>
-        </h2>
+                <?php p($l->t('Menu')); ?>
+            </h2>
 
-        <div>
+            <p>
-            <label for="side-menu-enabled">
+                <em><?php echo $l->t('You do not have permission to change the settings.'); ?></em>
-                <?php p($l->t('Enable the custom menu')); ?>
+            </p>
-            </label>
         </div>
+    <?php else: ?>
+        <div class="section">
+            <h2>
+                <?php p($l->t('Menu')); ?>
+            </h2>
 
-        <p>
-            <em><?php echo $l->t('Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'); ?></em>
-        </p>
 
-        <div>
+
-            <select id="side-menu-enabled" name="enabled" class="side-menu-setting" data-personal>
+            <div>
-                <?php foreach ($choicesYesNo as $label => $value): ?>
+                <label for="side-menu-enabled">
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['enabled']): ?>selected<?php endif; ?>>
+                    <?php p($l->t('Enable the custom menu')); ?>
-                        <?php echo $l->t($label); ?>
+                </label>
-                    </option>
+            </div>
+
+            <p>
+                <em><?php echo $l->t('Use the shortcut <span class="keyboard-key">Ctrl</span>+<span class="keyboard-key">o</span> to open and to hide the side menu. Use <span class="keyboard-key">tab</span> to navigate.'); ?></em>
+            </p>
+
+            <div>
+                <select id="side-menu-enabled" name="enabled" class="side-menu-setting" data-personal>
+                    <?php foreach ($choicesYesNo as $label => $value): ?>
+                        <option value="<?php echo $value ?>" <?php if ($value === $_['enabled']): ?>selected<?php endif; ?>>
+                            <?php echo $l->t($label); ?>
+                        </option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+
+            <div>
+                <label for="side-menu-target-blank">
+                    <?php p($l->t('Open apps in new tab')); ?>
+                </label>
+            </div>
+
+            <div>
+                <?php $choices = [
+                    'Use the global setting' => '1',
+                    'Use my selection' => '2',
+                ]; ?>
+
+                <select id="side-menu-loader-enabled" name="target-blank-mode" class="side-menu-setting" data-personal>
+                    <?php foreach ($choices as $label => $value): ?>
+                        <option value="<?php echo $value ?>" <?php if ($value === $_['target-blank-mode']): ?>selected<?php endif; ?>>
+                            <?php echo $l->t($label);  ?>
+                        </option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+
+            <p>
+                <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
+                    🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
+                </a>
+            </p>
+
+            <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-personal data-checkbox style="display: none">
+                <?php foreach ($_['apps'] as $app): ?>
+                    <div>
+                        <input
+                            type="checkbox"
+                            name="target-blank-apps[]"
+                            value="<?php echo $app['id'] ?>"
+                            id="target-blank-app-<?php echo $app['id'] ?>"
+                            <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
+                        />
+
+                        <label for="target-blank-app-<?php echo $app['id'] ?>">
+                            <?php echo p($l->t($app['name'])); ?>
+                        </label>
+                    </div>
                 <?php endforeach; ?>
-            </select>
+            </div>
         </div>
 
-        <div>
+        <div class="section">
-            <label for="side-menu-target-blank">
+            <h2>
-                <?php p($l->t('Open apps in new tab')); ?>
+                <?php p($l->t('Top menu')); ?>
-            </label>
+            </h2>
-        </div>
+            <div>
+                <label for="side-menu-top-menu-apps">
+                    <?php p($l->t('Apps that not must be moved in the side menu')); ?>
+                </label>
+            </div>
 
-        <div>
+            <p>
-            <?php $choices = [
+                <em>
-                'Use the global setting' => '1',
+                    <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
-                'Use my selection' => '2',
+                </em>
-            ]; ?>
+            </p>
 
-            <select id="side-menu-loader-enabled" name="target-blank-mode" class="side-menu-setting" data-personal>
+            <p>
-                <?php foreach ($choices as $label => $value): ?>
+                <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
-                    <option value="<?php echo $value ?>" <?php if ($value === $_['target-blank-mode']): ?>selected<?php endif; ?>>
+                    🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-                        <?php echo $l->t($label);  ?>
+                </a>
-                    </option>
+            </p>
+
+            <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal id="top-menu-apps" style="display: none">
+                <?php foreach ($_['apps'] as $app): ?>
+                    <div>
+                        <input
+                            type="checkbox"
+                            name="top-menu-apps[]"
+                            value="<?php echo $app['id'] ?>"
+                            id="top-menu-app-<?php echo $app['id'] ?>"
+                            <?php if (in_array($app['id'], $_['top-menu-apps'])): ?>checked<?php endif; ?>
+                        />
+
+                        <label for="top-menu-app-<?php echo $app['id'] ?>">
+                            <?php echo $app['name'] ?>
+                        </label>
+                    </div>
                 <?php endforeach; ?>
-            </select>
+            </div>
         </div>
-
+    <?php endif ?>
-        <p>
-            <a class="side-menu-toggler" data-target="#target-blank-apps" href="#_">
-                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-            </a>
-        </p>
-
-        <div class="side-menu-setting" data-name="target-blank-apps" id="target-blank-apps" data-personal data-checkbox style="display: none">
-            <?php foreach ($_['apps'] as $app): ?>
-                <div>
-                    <input
-                        type="checkbox"
-                        name="target-blank-apps[]"
-                        value="<?php echo $app['id'] ?>"
-                        id="target-blank-app-<?php echo $app['id'] ?>"
-                        <?php if (in_array($app['id'], $_['target-blank-apps'])): ?>checked<?php endif; ?>
-                    />
-
-                    <label for="target-blank-app-<?php echo $app['id'] ?>">
-                        <?php echo p($l->t($app['name'])); ?>
-                    </label>
-                </div>
-            <?php endforeach; ?>
-        </div>
-    </div>
 
     <div class="section">
-        <h2>
+        <?php if (!$_['force']): ?>
-            <?php p($l->t('Top menu')); ?>
+            <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
-        </h2>
-        <div>
-            <label for="side-menu-top-menu-apps">
-                <?php p($l->t('Apps that not must be moved in the side menu')); ?>
-            </label>
-        </div>
 
-        <p>
+            <span id="side-menu-message" class="msg"></span>
-            <em>
-                <?php p($l->t('If there is no selection then the global configuration is applied.')); ?>
-            </em>
-        </p>
 
-        <p>
+            <div style="height: 30px"></div>
-            <a class="side-menu-toggler" data-target="#top-menu-apps" href="#_">
+        <?php endif ?>
-                🖱️ <?php p($l->t('Show and hide the list of applications')); ?>
-            </a>
-        </p>
-
-        <div class="side-menu-setting" data-name="top-menu-apps" data-checkbox data-personal id="top-menu-apps" style="display: none">
-            <?php foreach ($_['apps'] as $app): ?>
-                <div>
-                    <input
-                        type="checkbox"
-                        name="top-menu-apps[]"
-                        value="<?php echo $app['id'] ?>"
-                        id="top-menu-app-<?php echo $app['id'] ?>"
-                        <?php if (in_array($app['id'], $_['top-menu-apps'])): ?>checked<?php endif; ?>
-                    />
-
-                    <label for="top-menu-app-<?php echo $app['id'] ?>">
-                        <?php echo $app['name'] ?>
-                    </label>
-                </div>
-            <?php endforeach; ?>
-        </div>
-    </div>
-
-    <div class="section">
-        <button id="side-menu-save" class="btn btn-primary"><?php p($l->t('Save')); ?></button>
-
-        <span id="side-menu-message" class="msg"></span>
-
-        <div style="height: 30px"></div>
 
         <div>
             <span for="side-menu-opener">