michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add Usermin display release version

Browse Source
This commit is contained in:
iliajie
2022-08-11 22:51:06 +03:00
parent 000a44b45a
commit a3d07a6763
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
usermin/index.cgi
View File

@@ -49,10 +49,9 @@ if (!$miniserv{'root'} && !-d $miniserv{'root'}) {
exit;
}
$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', &get_usermin_version(1)));
&text('index_version', &get_usermin_version(1, 1)));
@links = ( "edit_access.cgi",
"edit_bind.cgi",

17
usermin/usermin-lib.pl
View File

@@ -57,26 +57,35 @@ sub put_usermin_miniserv_config
&write_file($usermin_miniserv_config, \%usermin_miniserv_config_cache);
}
=head2 get_usermin_version
=head2 get_usermin_version([format_dev_version], [include_release])
Returns the version number of Usermin on this system.
=cut
sub get_usermin_version
{
my ($ui_format_dev) = @_;
my ($ui_format_dev, $inc_release_version) = @_;
local %miniserv;
&get_usermin_miniserv_config(\%miniserv);
open(VERSION, "<$miniserv{'root'}/version");
local $version = <VERSION>;
close(VERSION);
$version =~ s/\r|\n//g;
my $release_version = "";
# Usermin minor version
if ($inc_release_version) {
my $usermin_version_release = read_file_contents("$miniserv{'root'}/release") || "";
$usermin_version_release =~ s/\r|\n//g;
$release_version = "-".$usermin_version_release
if ($usermin_version_release > 1);
}
# 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);
return substr($version, 0, 5) . "." . substr($version, 5, 5 - 1) . "." . substr($version, 5 * 2 - 1) . $release_version;
}
else {
return $version;
return $version . $release_version;
}
}