Remove ALL_USER_THEMES option. Instead, disable unwanted themes.

7 files changed, 21 insertions, 44 deletions

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 1fb02d8677..bfca1ee860 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -47,7 +47,6 @@ class AccountController extends AbstractBaseController
      */
     public function edit(Tree $tree, User $user): Response
     {
-        $allow_user_themes    = (bool) Site::getPreference('ALLOW_USER_THEMES');
         $my_individual_record = Individual::getInstance($tree->getUserPreference(Auth::user(), 'gedcomid'), $tree);
         $contact_methods      = FunctionsEdit::optionsContactMethods();
         $default_individual   = Individual::getInstance($tree->getUserPreference(Auth::user(), 'rootid'), $tree);
@@ -59,7 +58,6 @@ class AccountController extends AbstractBaseController
         $title                = I18N::translate('My account');
 
         return $this->viewResponse('edit-account-page', [
-            'allow_user_themes'    => $allow_user_themes,
             'contact_methods'      => $contact_methods,
             'default_individual'   => $default_individual,
             'installed_languages'  => $installed_languages,
diff --git a/app/Http/Controllers/AdminSiteController.php b/app/Http/Controllers/AdminSiteController.php
index 44ab3a89bb..b7c3966496 100644
--- a/app/Http/Controllers/AdminSiteController.php
+++ b/app/Http/Controllers/AdminSiteController.php
@@ -408,7 +408,6 @@ class AdminSiteController extends AbstractBaseController
 
         Site::setPreference('MEMORY_LIMIT', $request->get('MEMORY_LIMIT'));
         Site::setPreference('MAX_EXECUTION_TIME', (string) (int) $request->get('MAX_EXECUTION_TIME'));
-        Site::setPreference('ALLOW_USER_THEMES', (string) (bool) $request->get('ALLOW_USER_THEMES'));
         Site::setPreference('THEME_DIR', $request->get('THEME_DIR'));
         Site::setPreference('ALLOW_CHANGE_GEDCOM', (string) (bool) $request->get('ALLOW_CHANGE_GEDCOM'));
         Site::setPreference('TIMEZONE', $request->get('TIMEZONE'));
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index d98dd059d2..a1ab426118 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -102,11 +102,9 @@ class UserController extends AbstractBaseController
      */
     public function theme(Request $request): Response
     {
-        $theme = $request->get('theme');
-        if (Site::getPreference('ALLOW_USER_THEMES') === '1' && array_key_exists($theme, Theme::themeNames())) {
-            Session::put('theme_id', $theme);
-            Auth::user()->setPreference('theme', $theme);
-        }
+        $theme = $request->get('theme', '');
+        Session::put('theme_id', $theme);
+        Auth::user()->setPreference('theme', $theme);
 
         return new Response();
     }
diff --git a/app/Module/ColorsTheme.php b/app/Module/ColorsTheme.php
index c74eb30bbf..c1509776b5 100644
--- a/app/Module/ColorsTheme.php
+++ b/app/Module/ColorsTheme.php
@@ -147,33 +147,29 @@ class ColorsTheme extends CloudsTheme
     /**
      * Create a menu of palette options
      *
-     * @return Menu|null
+     * @return Menu
      */
-    public function menuPalette()
+    public function menuPalette(): Menu
     {
-        if ($this->tree !== null && Site::getPreference('ALLOW_USER_THEMES') === '1' && $this->tree->getPreference('ALLOW_THEME_DROPDOWN') === '1') {
-            /* I18N: A colour scheme */
-            $menu = new Menu(I18N::translate('Palette'), '#', 'menu-color');
+        /* I18N: A colour scheme */
+        $menu = new Menu(I18N::translate('Palette'), '#', 'menu-color');
 
-            foreach ($this->palettes as $palette_id => $palette_name) {
-                $url = $this->request->getRequestUri();
-                $url = preg_replace('/&themecolor=[a-z]+/', '', $url);
-                $url .= '&themecolor=' . $palette_id;
+        foreach ($this->palettes as $palette_id => $palette_name) {
+            $url = $this->request->getRequestUri();
+            $url = preg_replace('/&themecolor=[a-z]+/', '', $url);
+            $url .= '&themecolor=' . $palette_id;
 
-                $menu->addSubmenu(new Menu(
-                    $palette_name,
-                    '#',
-                    'menu-color-' . $palette_id . ($this->palette === $palette_id ? ' active' : ''),
-                    [
-                        'onclick' => 'document.location=\'' . $url . '\'',
-                    ]
-                ));
-            }
-
-            return $menu;
+            $menu->addSubmenu(new Menu(
+                $palette_name,
+                '#',
+                'menu-color-' . $palette_id . ($this->palette === $palette_id ? ' active' : ''),
+                [
+                    'onclick' => 'document.location=\'' . $url . '\'',
+                ]
+            ));
         }
 
-        return null;
+        return $menu;
     }
 
     /**
diff --git a/app/Schema/SeedSiteSettingTable.php b/app/Schema/SeedSiteSettingTable.php
index d338b4ad41..b253129708 100644
--- a/app/Schema/SeedSiteSettingTable.php
+++ b/app/Schema/SeedSiteSettingTable.php
@@ -27,7 +27,6 @@ class SeedSiteSettingTable implements SeedInterface
     private const SETTINGS = [
         'INDEX_DIRECTORY'         => 'data/',
         'USE_REGISTRATION_MODULE' => '1',
-        'ALLOW_USER_THEMES'       => '1',
         'ALLOW_CHANGE_GEDCOM'     => '1',
         'SMTP_ACTIVE'             => 'internal',
         'SMTP_HOST'               => 'localhost',
diff --git a/resources/views/admin/site-preferences.phtml b/resources/views/admin/site-preferences.phtml
index 9e185eb6b7..c3e8392a5d 100644
--- a/resources/views/admin/site-preferences.phtml
+++ b/resources/views/admin/site-preferences.phtml
@@ -99,19 +99,6 @@
         </div>
     </div>
 
-    <!-- ALLOW_USER_THEMES -->
-    <fieldset class="form-group">
-        <div class="row">
-            <legend class="col-form-label col-sm-3">
-                <?= /* I18N: A configuration setting */
-                I18N::translate('Allow users to select their own theme') ?>
-            </legend>
-            <div class="col-sm-9">
-                <?= Bootstrap4::radioButtons('ALLOW_USER_THEMES', FunctionsEdit::optionsNoYes(), (string) (int) Site::getPreference('ALLOW_USER_THEMES'), true) ?>
-            </div>
-        </div>
-    </fieldset>
-
     <!-- ALLOW_CHANGE_GEDCOM -->
     <fieldset class="form-group">
         <div class="row">
diff --git a/resources/views/edit-account-page.phtml b/resources/views/edit-account-page.phtml
index 0873e02f8e..d002a2052c 100644
--- a/resources/views/edit-account-page.phtml
+++ b/resources/views/edit-account-page.phtml
@@ -140,7 +140,7 @@
         </div>
     </div>
 
-    <?php if ($allow_user_themes) : ?>
+    <?php if (count($themes) > 2) : ?>
         <div class="row form-group">
             <label class="col-sm-3 col-form-label wt-page-options-label" for="theme">
                 <?= I18N::translate('Theme') ?>