github-featured/webmin--webmin
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

Deprecate the unused template params support in hlink.cgi

Browse Source
This commit is contained in:
Jamie Cameron
2026-02-11 16:16:33 -08:00
parent 07a11f7de6
commit 38352f5c01
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
help.cgi
-10
View File
@@ -37,16 +37,6 @@ if (&foreign_exists($module) &&
} }
} }
# if any template variables were given as URL params, substitute them into the file
foreach my $k (keys %in) {
if ($k =~ /^tmpl_(\S+)$/i) {
$hash{$1} = $in{$k};
}
}
if (%hash) {
$help = &substitute_template($help, \%hash);
}
# find and replace the <header> section # find and replace the <header> section
if ($help =~ s/<header>([^<]+)<\/header>//i) { if ($help =~ s/<header>([^<]+)<\/header>//i) {
&popup_header($1); &popup_header($1);
web-lib-funcs.pl
+2 -5
View File
@@ -4175,23 +4175,20 @@ help page. The parameters are :
=item height - Height of the help popup window. Defaults to 400 pixels. =item height - Height of the help popup window. Defaults to 400 pixels.
=item tmpl - Hash ref of template variables to substitute in the help page.
The actual help pages are in each module's help sub-directory, in files with The actual help pages are in each module's help sub-directory, in files with
.html extensions. .html extensions.
=cut =cut
sub hlink sub hlink
{ {
my ($txt, $page, $mod, $width, $height, $tmpl) = @_; my ($txt, $page, $mod, $width, $height) = @_;
$mod ||= &get_module_name(); $mod ||= &get_module_name();
if (defined(&theme_hlink)) { if (defined(&theme_hlink)) {
return &theme_hlink(@_); return &theme_hlink(@_);
} }
$width ||= $tconfig{'help_width'} || $gconfig{'help_width'} || 600; $width ||= $tconfig{'help_width'} || $gconfig{'help_width'} || 600;
$height ||= $tconfig{'help_height'} || $gconfig{'help_height'} || 400; $height ||= $tconfig{'help_height'} || $gconfig{'help_height'} || 400;
my $params = $tmpl ? "?".join("&", map { "tmpl_".&urlize($_)."=".&urlize($tmpl->{$_}) } keys %$tmpl) : ""; return "<a onClick='window.open(\"@{[&get_webprefix()]}/help.cgi/$mod/$page\", \"help\", \"toolbar=no,menubar=no,scrollbars=yes,width=$width,height=$height,resizable=yes\"); return false' href=\"@{[&get_webprefix()]}/help.cgi/$mod/$page\">$txt</a>";
return "<a onClick='window.open(\"@{[&get_webprefix()]}/help.cgi/$mod/$page$params\", \"help\", \"toolbar=no,menubar=no,scrollbars=yes,width=$width,height=$height,resizable=yes\"); return false' href=\"@{[&get_webprefix()]}/help.cgi/$mod/$page$params\">$txt</a>";
} }
=head2 user_chooser_button(field, multiple, [form]) =head2 user_chooser_button(field, multiple, [form])