michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplify https://github.com/webmin/webmin/pull/1470#issuecomment-816270694

Browse Source
This commit is contained in:
Ilia Rostovtsev
2021-04-09 18:58:16 +03:00
parent 575a801c6d
commit f358fa2a98
4 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mysql/module.overrides
View File

@@ -1 +0,0 @@
funcs=override_check_variant

19
mysql/module_overrides.pl Normal file
View File

@@ -0,0 +1,19 @@
do 'mysql-lib.pl';
# Override function to substitute module's name
sub module_overrides
{
my ($rv) = @_;
my $mysql_version;
chop($mysql_version = &read_file_contents(
"$module_config_directory/version"));
$mysql_version ||= &get_mysql_version();
if ($mysql_version =~ /mariadb/i) {
foreach my $t (keys %{$rv}) {
$rv->{$t} =~ s/MySQL/MariaDB/g;
}
}
}
1;

15
mysql/mysql-lib.pl
View File

@@ -1879,20 +1879,5 @@ if ($err) {
&error_setup($text{'login_err'});
}
# Override function to substitute module's name
sub override_check_variant
{
my ($rv) = @_;
my $mysql_version;
chop($mysql_version = &read_file_contents(
"$module_config_directory/version"));
$mysql_version ||= &get_mysql_version();
if ($mysql_version =~ /mariadb/i) {
foreach my $t (keys %{$rv}) {
$rv->{$t} =~ s/MySQL/MariaDB/g;
}
}
}
1;

21
web-lib-funcs.pl
View File

@@ -5639,20 +5639,13 @@ return if (!$mod);
my $mdir = &module_root_directory($mod);
# Call module specific overrides
if (-r "$mdir/module.overrides") {
my %overrides;
&read_file_cached("$mdir/module.overrides", \%overrides);
my $funcs = $overrides{'funcs'};
if ($funcs) {
eval {
local $main::error_must_die = 1;
my @funcs = split(/\s+/, $funcs);
&foreign_require($mod, "$mod-lib.pl");
foreach my $func (@funcs) {
&foreign_call($mod, $func, \%{$data});
}
};
}
my $call = 'module_overrides';
if (-r "$mdir/$call.pl") {
eval {
local $main::error_must_die = 1;
&foreign_require($mod, "$call.pl");
&foreign_call($mod, $call, \%{$data});
};
}
}