Skip to content

Commit 2de36e6

Browse files
committed
Fix to remove the ability to upgrade the theme from the UI
1 parent 71ec027 commit 2de36e6

7 files changed

Lines changed: 31 additions & 17 deletions

File tree

authentic-init.pl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
@theme_bundle_js,
1010
%module_text_full,
1111
%theme_config,
12+
$theme_info,
1213
%theme_text,
1314
%theme_temp_data,
1415
$get_user_level,
@@ -802,6 +803,8 @@ sub init_vars
802803
settings(get_taconfig_file()),
803804
settings(get_tgconfig_file(), "settings_"),
804805
settings(get_tuconfig_file(), "settings_"));
806+
our $theme_info = get_current_theme_info_cached($current_theme);
807+
805808
our $http_x_url =
806809
(get_env('http_x_pjax_url') || get_env('http_x_progressive_url'));
807810

@@ -1614,11 +1617,9 @@ sub theme_version
16141617
my $tversions = getvar('tversion_cached');
16151618

16161619
if (!$tversions || $nocache) {
1617-
my %tinfo = get_theme_info($current_theme);
1618-
my $version = $tinfo{'version'};
1619-
my $mversion = $tinfo{'mversion'};
1620-
my $bversion = $tinfo{'bversion'};
1621-
1620+
my $version = $theme_info->{'version'};
1621+
my $mversion = $theme_info->{'mversion'};
1622+
my $bversion = $theme_info->{'bversion'};
16221623
my $is_alpha = string_contains($version, 'alpha');
16231624
my $is_beta = string_contains($version, 'beta');
16241625
my $is_rc = string_contains($version, 'RC');
@@ -1720,6 +1721,8 @@ sub header_html_data
17201721
foreign_available("xterm") .
17211722
'" data-shell="' .
17221723
foreign_available("shell") .
1724+
'" data-upgrade="' .
1725+
($theme_config{'settings_upgrade_allowed'} eq 'true' ? '1' : '0') .
17231726
'" data-webmin="' .
17241727
foreign_available("webmin") .
17251728
'" data-usermin="' .

authentic-lib.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
$theme_root_directory,
2121
$current_theme, $root_directory, $config_directory, $var_directory,
2222

23-
%theme_text, %module_text_full, %theme_config, $get_user_level, $theme_webprefix, $http_x_url,
23+
%theme_text, %module_text_full, %theme_config, $theme_info, $get_user_level, $theme_webprefix, $http_x_url,
2424
$has_virtualmin, $has_cloudmin,
2525
$has_usermin, $has_usermin_version, $has_usermin_root_dir, $has_usermin_conf_dir, $has_usermin_var_dir);
2626

@@ -780,7 +780,7 @@ sub get_sysinfo_vars
780780
}
781781

782782
# Fetch theme version
783-
if (&webmin_user_is_admin()) {
783+
if (&webmin_user_is_admin() && $theme_config{'settings_upgrade_allowed'} eq 'true') {
784784

785785
# Theme version/update
786786
my $authentic_remote_data = theme_remote_version(1);
@@ -1561,7 +1561,7 @@ sub theme_update_incompatible
15611561

15621562
sub theme_remote_version
15631563
{
1564-
1564+
return if ($theme_config{'settings_upgrade_allowed'} ne 'true');
15651565
my ($data, $force_stable_check, $force_beta_check, $nocache) = @_;
15661566

15671567
my $remote_version = 0;

tconfig-lib.pl

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@
1111
$current_theme,
1212
$theme_webprefix,
1313
%theme_config,
14+
$theme_info,
1415
%theme_text,
1516
$has_usermin,
1617
$has_usermin_root_dir,
1718
$get_user_level);
1819

1920
sub theme_settings_raw
2021
{
21-
return (
22+
# Available settings
23+
my @theme_settings_raw = (
2224
[
2325
{ 'id' => 's1',
2426
'title' => &theme_text('settings_global_general_options_title'),
@@ -151,14 +153,21 @@ sub theme_settings_raw
151153
'settings_hotkey_custom_8_user',
152154
'settings_hotkey_custom_9_user',
153155
] }
154-
],
155-
156+
]);
157+
# Add upgrade settings if available
158+
if ($theme_config{'settings_upgrade_allowed'} eq 'true') {
159+
push(@theme_settings_raw,
156160
[
157161
{ 'id' => 's8',
158162
'title' => &theme_text('settings_right_soft_updates_page_options'),
159-
'data' =>
160-
['settings_sysinfo_theme_updates', 'settings_sysinfo_theme_updates_for_usermin', 'settings_cache_interval'] }
163+
'data' => [
164+
'settings_sysinfo_theme_updates',
165+
'settings_sysinfo_theme_updates_for_usermin',
166+
'settings_cache_interval'
167+
] }
161168
]);
169+
}
170+
return @theme_settings_raw;
162171
}
163172

164173
sub theme_settings_filter

unauthenticated/js/bundle.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
26 Bytes
Binary file not shown.

unauthenticated/js/defaults.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ var
9797
settings_hotkey_custom_9_user = '',
9898

9999
// Theme updates options defaults
100+
settings_upgrade_allowed = false,
100101
settings_sysinfo_theme_updates = false,
101102
settings_cache_interval = 86400,
102103
settings_sysinfo_theme_updates_for_usermin = true,

xhr-lib.pl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use strict;
77

88
our (%in, %gconfig, $root_directory, $remote_user, $get_user_level,
9-
%theme_config, %theme_text, $current_theme, $has_usermin);
9+
%theme_config, $theme_info, %theme_text, $current_theme, $has_usermin);
1010

1111
sub xhr
1212
{
@@ -487,7 +487,8 @@ sub xhr
487487
print convert_to_json(\@current_versions);
488488
} elsif ($in{'xhr-theme_clear_cache'} eq '1') {
489489
clear_theme_cache(&webmin_user_is_admin(), $in{'xhr-theme_clear_cache_full'});
490-
} elsif ($in{'xhr-update'} eq '1' && &webmin_user_is_admin()) {
490+
} elsif ($in{'xhr-update'} eq '1' && &webmin_user_is_admin() &&
491+
$theme_config{'settings_upgrade_allowed'} eq 'true') {
491492
my @update_rs;
492493
my $version_type = ($in{'xhr-update-type'} eq '-beta' ? '-beta' : '-release');
493494
my $update_force = $in{'xhr-update-force'};

0 commit comments

Comments
 (0)