Fix to deprecate branding splash screen enabled by default

webmin · Mar 31, 2024 · 8cbf87b · 8cbf87b
1 parent 0a869a5
commit 8cbf87b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/authentic-init.pl b/authentic-init.pl
@@ -2067,7 +2067,7 @@ sub embed_product_branding
 
     return if (get_env('script_name') =~ /password_change\.cgi/);
     return if (getvar('error-fatal'));
-    return if ($theme_config{"settings_embed_product_branding_privileged"} eq 'false');
+    return if ($theme_config{"settings_embed_product_splash_privileged"} eq 'false');
     return &custom_embed_product_branding(@_)
       if (defined(&custom_embed_product_branding));
 

diff --git a/lang/en b/lang/en
@@ -1454,3 +1454,4 @@ theme_xhred_datatable_filter_and_export=Filter and export content
 #21.10
 settings_hotkey_logout_dbl=Sign out
 theme_xhred_hotkey_emsg=The backslash key cannot be used as a hotkey
+settings_embed_product_splash_privileged=Display a branding splash screen following login
diff --git a/tconfig-lib.pl b/tconfig-lib.pl
@@ -34,6 +34,7 @@ sub theme_settings_raw
                        'settings_cm_editor_palette',
                        'settings_global_palette_unauthenticated',
                        'settings_theme_config_admins_only_privileged',
+                       'settings_embed_product_splash_privileged',
             ] }
         ],
 
@@ -247,6 +248,7 @@ sub theme_settings_filter
     if (!&webmin_user_is_admin()) {
         push(@theme_settings_filter,
              'settings_theme_config_admins_only_privileged',
+             'settings_embed_product_splash_privileged',
              'settings_hotkey_slider',
              'settings_global_palette_unauthenticated',
              'settings_sysinfo_easypie_charts',

diff --git a/theme.info b/theme.info
@@ -4,7 +4,7 @@ bootstrap=3
 spa=1
 nomodcall=xnavigation=1
 version=21.10-RC1
-mversion=08
+mversion=09
 bversion=00
 webmin=1
 usermin=1

diff --git a/unauthenticated/js/bundle.min.js b/unauthenticated/js/bundle.min.js
diff --git a/unauthenticated/js/bundle.min.js.gz b/unauthenticated/js/bundle.min.js.gz
diff --git a/unauthenticated/js/defaults.js b/unauthenticated/js/defaults.js
@@ -11,6 +11,7 @@ var
     settings_cm_editor_palette = 'monokai',
     settings_global_palette_unauthenticated = 'light',
     settings_theme_config_admins_only_privileged = false,
+    settings_embed_product_splash_privileged = false,
 
     // Dashboard and real-time monitoring
     settings_sysinfo_easypie_charts = true,
@@ -213,9 +214,6 @@ var
     // Multiselect on click
     settings_multiselect_on_click = false,
 
-    // Show splash screen upon login
-    settings_embed_product_branding_privileged = true,
-
     // This option associates extra names for a given module/page to be searchable in autocomplete dropdown
     settings_autocomplete_extra_associations_privileged = {
         'en': [
@@ -262,7 +260,10 @@ var
                 ]
             }
         ]
-    };
+    },
+
+    // Deprecated options
+    settings_embed_product_branding_privileged = settings_embed_product_splash_privileged;
 //
 //
 //