1berry/webmin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Returned version used for comparison; return UI variant on demand only

Browse Source
This commit is contained in:
Ilia Rostovtsev 2020-11-30 15:16:52 +03:00
parent 84b8d2179c
commit b008c9429a
No known key found for this signature in database
GPG Key ID: 121E166DD9C821AB
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
system-status/system_info.pl
View File

@ -49,7 +49,7 @@ if (&show_section('host')) {
});
# Webmin version
my $webmin_version = &get_webmin_version();
my $webmin_version = &get_webmin_version(1);
push(@table, { 'desc' => $text{'right_webmin'},
'value' => $webmin_version });
push(@raw, { 'webmin_version' => $webmin_version });

2
usermin/index.cgi
View File

@ -52,7 +52,7 @@ if (!$miniserv{'root'} && !-d $miniserv{'root'}) {
$ver = &get_usermin_version();
&ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1, 0,
&help_search_link("usermin", "google"), undef, undef,
&text('index_version', $ver));
&text('index_version', &get_usermin_version(1)));
@links = ( "edit_access.cgi",
"edit_bind.cgi",

9
usermin/usermin-lib.pl
View File

@ -64,13 +64,20 @@ Returns the version number of Usermin on this system.
=cut
sub get_usermin_version
{
my ($ui_format_dev) = @_;
local %miniserv;
&get_usermin_miniserv_config(\%miniserv);
open(VERSION, "<$miniserv{'root'}/version");
local $version = <VERSION>;
close(VERSION);
$version =~ s/\r|\n//g;
return $version;
# Format dev version nicely
if ($ui_format_dev && length($version) == 13) {
return substr($version, 0, 5) . "." . substr($version, 5, 5 - 1) . "." . substr($version, 5 * 2 - 1);
}
else {
return $version;
}
}
=head2 restart_usermin_miniserv

9
web-lib-funcs.pl
View File

@ -3944,16 +3944,15 @@ Returns the version of Webmin currently being run, such as 1.450.
=cut
sub get_webmin_version
{
my ($ui_format_dev) = @_;
if (!$get_webmin_version) {
open(VERSION, "<$root_directory/version") || return 0;
($get_webmin_version = <VERSION>) =~ tr/\r|\n//d;
close(VERSION);
if (length($get_webmin_version) > 6) {
$get_webmin_version_ui = substr($get_webmin_version, 0, 5) . "." . substr($get_webmin_version, 5, 5 - 1) . "." . substr($get_webmin_version, 5 * 2 - 1);
}
}
if ($main::webmin_script_type eq 'web' && $get_webmin_version_ui) {
return $get_webmin_version_ui;
# Format dev version nicely
if ($ui_format_dev && length($get_webmin_version) == 13) {
return substr($get_webmin_version, 0, 5) . "." . substr($get_webmin_version, 5, 5 - 1) . "." . substr($get_webmin_version, 5 * 2 - 1);
}
else {
return $get_webmin_version;

2
webmin/index.cgi
View File

@ -6,7 +6,7 @@ use strict;
use warnings;
require './webmin-lib.pl';
our (%in, %text, %gconfig, %config);
my $ver = &get_webmin_version();
my $ver = &get_webmin_version(1);
&ui_print_header(undef, $text{'index_title'}, "", undef, 1, 1, 0,
undef, undef, undef, &text('index_version', $ver));
my %access = &get_module_acl();