Add ability to disable theme configuration page for user mode

webmin · Oct 24, 2018 · 55a921f · 55a921f
1 parent 60bce9e
commit 55a921f
Show file tree

Hide file tree

Showing 24 changed files with 88 additions and 7 deletions.
diff --git a/authentic-lib.pm b/authentic-lib.pm
@@ -877,7 +877,8 @@ sub print_left_menu
                                              $theme_text{'right_slcheck'}, 1);
                     }
 
-                } elsif (!foreign_available("webmin") && $__custom_print eq '0') {
+                } elsif (!foreign_available("webmin") && $__custom_print eq '0' &&
+                         $theme_config{'settings_show_theme_configuration_for_admins_only'} ne 'true') {
                     print_category_link($gconfig{'webprefix'} . "/settings-user.cgi", $theme_text{'settings_title'}, 1);
                     $__custom_print++;
                 }
@@ -2210,6 +2211,8 @@ sub theme_settings
             'true',
             'settings_theme_options_button',
             'true',
+            'settings_show_theme_configuration_for_admins_only',
+            'false',
             'settings_leftmenu_button_language',
             'false',
             'settings_leftmenu_button_refresh',
@@ -2315,7 +2318,18 @@ sub theme_settings
 
     if ($t eq 'exclusions') {
 
-        # Exclude list of combined settings for Virtualmin/Cloudmin/Usermin
+        # Exclude list of combined settings for UserminVirtualmin/Cloudmin
+        my @s_vc_e = ('settings_show_theme_configuration_for_admins_only');
+
+        if (!&foreign_available("server-manager") &&
+            !foreign_available("virtual-server") && !get_usermin_data("mailbox"))
+        {
+            foreach my $e (@s_vc_e) {
+                push(@theme_settings_excluded, $e);
+            }
+        }
+
+        # Exclude list of combined settings for Virtualmin/Cloudmin
         my @s_vc_e = ('settings_right_default_tab_webmin', 'settings_right_reload');
 
         if (!&foreign_available("server-manager") &&

diff --git a/buttons.pm b/buttons.pm
@@ -50,7 +50,8 @@ if ($get_user_level eq '0' &&
     print '</li>';
 }
 
-if ($theme_config{'settings_theme_options_button'} ne 'false') {
+if (($get_user_level eq '0' && $theme_config{'settings_theme_options_button'} ne 'false') || 
+    ($get_user_level ne '0' && $theme_config{'settings_show_theme_configuration_for_admins_only'} ne 'true')) {
     print '<li data-linked' .
       get_button_tooltip('settings_title', undef, 'auto top') . ' class="user-link theme-options cursor-pointer">';
     if ($get_user_level eq '0' && foreign_available('webmin')) {

diff --git a/lang/ca.UTF-8 b/lang/ca.UTF-8
@@ -962,3 +962,8 @@ settings_sysinfo_max_servers=Maximum virtual servers to show
 right_download_is_ready=Your download is ready.
 theme_xhred_download_is_being_prepared=Your download is being prepared. It may take a while. Please wait..
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
+
+settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/cz.UTF-8 b/lang/cz.UTF-8
@@ -961,3 +961,8 @@ settings_sysinfo_max_servers=Maximum virtual servers to show
 right_download_is_ready=Your download is ready.
 theme_xhred_download_is_being_prepared=Your download is being prepared. It may take a while. Please wait..
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
+
+settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/da.UTF-8 b/lang/da.UTF-8
@@ -964,3 +964,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/de.UTF-8 b/lang/de.UTF-8
@@ -953,3 +953,8 @@ settings_sysinfo_max_servers=Maximum virtual servers to show
 right_download_is_ready=Your download is ready.
 theme_xhred_download_is_being_prepared=Your download is being prepared. It may take a while. Please wait..
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
+
+settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/en.UTF-8 b/lang/en.UTF-8
@@ -964,3 +964,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/es.UTF-8 b/lang/es.UTF-8
@@ -964,3 +964,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/fr.UTF-8 b/lang/fr.UTF-8
@@ -964,3 +964,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/id.UTF-8 b/lang/id.UTF-8
@@ -966,3 +966,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/it.UTF-8 b/lang/it.UTF-8
@@ -964,3 +964,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/ja_JP.UTF-8 b/lang/ja_JP.UTF-8
@@ -961,3 +961,6 @@ theme_xhred_download_is_being_prepared= あなたのダウンロードは準備
 theme_xhred_backup_is_being_prepared= バックアップを準備中です。それには時間がかかることがあります。お待ちください..
 
 settings_mail_ui= 新しいメールUIを有効にする
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/nl.UTF-8 b/lang/nl.UTF-8
@@ -964,3 +964,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/no.UTF-8 b/lang/no.UTF-8
@@ -822,3 +822,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/pl.UTF-8 b/lang/pl.UTF-8
@@ -964,3 +964,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/pt.UTF-8 b/lang/pt.UTF-8
@@ -964,3 +964,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/ro_RO.UTF-8 b/lang/ro_RO.UTF-8
@@ -962,3 +962,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/ru.UTF-8 b/lang/ru.UTF-8
@@ -967,3 +967,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/sq.UTF-8 b/lang/sq.UTF-8
@@ -975,3 +975,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/sv.UTF-8 b/lang/sv.UTF-8
@@ -961,3 +961,6 @@ theme_xhred_download_is_being_prepared=Din nerladdning förbereds. Det kan ta et
 theme_xhred_backup_is_being_prepared=Din säkerhetskopia förbereds. Det kan ta ett tag. Vänta...
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/lang/zh_CN.UTF-8 b/lang/zh_CN.UTF-8
@@ -961,3 +961,6 @@ theme_xhred_download_is_being_prepared=Your download is being prepared. It may t
 theme_xhred_backup_is_being_prepared=Your backup is being prepared. It may take a while. Please wait..
 
 settings_mail_ui=Enable new mail UI
+
+settings_show_theme_configuration_for_admins_only=Show theme settings button for administrators only
+settings_show_theme_configuration_for_admins_only_error=Access denied: Administrator has blocked access to user customisations
diff --git a/navigation.pm b/navigation.pm
@@ -79,7 +79,8 @@ if (
                                         $theme_text{'settings_right_theme_left_background_title'}, 1);
                     $__custom_print++;
 
-                } elsif (!foreign_available("webmin") && $__custom_print eq '0') {
+                } elsif (!foreign_available("webmin") && $__custom_print eq '0' &&
+                         $theme_config{'settings_show_theme_configuration_for_admins_only'} ne 'true') {
                     print_category_link($gconfig{'webprefix'} . "/settings-user.cgi", $theme_text{'settings_title'}, 1);
                     $__custom_print++;
                 }

diff --git a/settings-user.cgi b/settings-user.cgi
@@ -13,6 +13,8 @@ our ($remote_user, %theme_config, %theme_text);
 
 require(dirname(__FILE__) . "/authentic-lib.pm");
 
+$theme_config{'settings_show_theme_configuration_for_admins_only'} eq 'true' && error($theme_text{'settings_show_theme_configuration_for_admins_only_error'});
+
 ui_print_header(($theme_text{'settings_subtitle'} . ' <tt>' . $remote_user . '</tt>'),
                 $theme_text{'settings_title'},
                 undef, undef, undef, 1);

diff --git a/unauthenticated/js/bundle.min.js b/unauthenticated/js/bundle.min.js