VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-21 23:40:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "An attempt to support various module names https://github.com/virtualmin/virtualmin-gpl/pull/63#issuecomment-419717260"

Browse Source 
This reverts commit 0864f12bc1.
This commit is contained in:
Ilia Rostovtsev
2018-09-10 09:40:03 +03:00
parent 3ad339b00a
commit 66c358f984
4 changed files with 4 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WebminCore.pm
View File

File diff suppressed because one or more lines are too long

7
config-lib.pl
View File

@ -29,7 +29,7 @@
# generate_config(&config, info-file, [module], [&can-config], [checkbox-name],
# [only-section])
# Prints HTML for
# Prints HTML for
sub generate_config
{
my ($configref, $file, $module, $canconfig, $cbox, $section) = @_;
@ -232,10 +232,6 @@ foreach my $c (@info_order) {
$field = &ui_password($c, undef, $p[2] || 40, 0, $p[3]);
}
$label = "<a name=$c>$label</a>";
if (text_subs_ambiguous($ENV{'REQUEST_URI'})) {
$label = text_subs_ambiguous($ENV{'REQUEST_URI'}, $label);
}
print &ui_table_row($label, $field, 1, [ "width=30% nowrap" ]);
}
}
@ -352,3 +348,4 @@ return @new_order;
}
1;

5
help.cgi
View File

@ -25,10 +25,6 @@ open(HELP, $path) || &helperror(&text('help_efile', $path));
read(HELP, $help, $st[7]);
close(HELP);
if (text_subs_ambiguous($ENV{'SCRIPT_NAME'})) {
$help = text_subs_ambiguous($ENV{'SCRIPT_NAME'}, $help);
}
# find and replace the <header> section
if ($help =~ s/<header>([^<]+)<\/header>//i) {
&popup_header($1);
@ -103,3 +99,4 @@ print "<center><h2>$text{'error'}</h2></center>\n";
print "<hr><p><b>",@_,"</b><p><hr>\n";
exit;
}

89
web-lib-funcs.pl
View File

@ -5066,94 +5066,9 @@ if (!$norefs) {
if (defined(&theme_load_language)) {
&theme_load_language(\%text, $_[0]);
}
if (text_subs_ambiguous($_[0])) {
my %text_replaced = text_subs_ambiguous($_[0], 0, \%text);
return %text_replaced;
}
return %text;
}
=head2 text_subs_ambiguous(module)
Used to replace certain text strings that meet requirements from (meanwhile internal %modules)
=item $module - Module name to trigger substitutions on
=item $replacement - Actual string where to replace
=item %text - hash reference (derived from language file) to run substitutions in.
=cut
sub text_subs_ambiguous
{
my ($module, $replacement, $text_hashref) = @_;
my ($script_name) = ($module =~ /\?/ ? $module : $ENV{'SCRIPT_NAME'});
# Configurable options for certain modules/pages where hash's key is the mandatory module name, and value is an array of:
# 1. Text to replace from/to (required)
# 2. Other pages to run this replacement on (besides module name)
# 3. Module's executable reference, that provides the command output to test the string below
# 4. Searched string to test against the command output (if not set it will be equal to the replaced value)
my %modules = (
'mysql' => [['MySQL', 'MariaDB'],
[
'/help.cgi',
'/config.cgi?mysql',
'/config.cgi?virtual-server',
'/virtual-server/wizard.cgi',
'/virtual-server/list_databases.cgi',
'/virtual-server/edit_domain.cgi',
'/virtual-server/edit_newmysqls.cgi'
],
'mysql'
]);
# Check for extra pages to run replacements for
my @pages;
foreach my $_module (keys %modules) {
my $pages = $modules{$_module}[1];
if (grep {$_ eq $script_name} @$pages) {
push(@pages, $_module);
$module = $_module;
}
}
# Step 2. Call to run the replacement
if ($text_hashref) {
my %text_hashref_replaced = map { $_ => text_subs_ambiguous($module, $text_hashref->{$_}) } keys %{ $text_hashref };
return %text_hashref_replaced;
}
# Step 3. Test and replace all strings
if ($replacement) {
my $from = $modules{$module}[0][0];
my $to = $modules{$module}[0][1];
$replacement =~ s/$from/$to/g;
return $replacement;
}
# Step 1. Quickly test if we need to run replacement at all (if we do, respond time will be slightly
# slower than before, depending on the module
if (indexof($module, keys %modules) >= 0 || @pages) {
# Replace only when condition 3 is set
if ($modules{$module}[2]) {
read_file("$config_directory/$module/config", \%{ "$module" . '_conf' });
my $searched_string = $modules{$module}[3] || $modules{$module}[0][1];
if (backquote_command("\"${\"$module\". '_conf'}{$modules{$module}[2]}\" -V 2>&1") =~ /$searched_string/i) {
return 1;
}
}
# Replace in any case, when module name or page name matches
else {
return 1;
}
}
# Do not replace anything (as fast as before)
else {
}
}
=head2 text_subs(string)
Used internally by load_language to expand $code substitutions in language
@ -5376,10 +5291,6 @@ if ($rv{'longdesc'}) {
if (defined(&theme_get_module_info)) {
%rv = &theme_get_module_info(\%rv, $_[0], $_[1], $_[2]);
}
if (text_subs_ambiguous($_[0])) {
my %rv_replaced = text_subs_ambiguous($_[0], 0, \%rv);
return %rv_replaced;
}
return %rv;
}