VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-07-29 11:50:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add missing webprefix in system info links

Browse Source
This commit is contained in:
Ilia Rostovtsev
2021-09-28 23:07:00 +03:00
parent f69fa81e59
commit 758d1fe1fd
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bind8/system_info.pl
View File

@ -25,12 +25,12 @@ if (&foreign_available($module_name) && !$access{'noconfig'} &&
my $job = &get_dnssec_cron_job(); my $job = &get_dnssec_cron_job();
if (!$job) { if (!$job) {
$msg .= &text('index_eexpired_conf', $msg .= &text('index_eexpired_conf',
&ui_link("/$module_name/conf_dnssec.cgi", &ui_link(&get_webprefix()."/$module_name/conf_dnssec.cgi",
$text{'dnssec_title'})); $text{'dnssec_title'}));
} }
else { else {
$msg .= &text('index_eexpired_mod', $msg .= &text('index_eexpired_mod',
&ui_link("/$module_name/", &ui_link(&get_webprefix()."/$module_name/",
$text{'index_title'})); $text{'index_title'}));
} }
push(@rv, { 'type' => 'warning', push(@rv, { 'type' => 'warning',

2
status/system_info.pl
View File

@ -39,7 +39,7 @@ foreach my $s (@serv) {
$down += scalar(grep { $_ == 0 } @ups); $down += scalar(grep { $_ == 0 } @ups);
my $desc = &html_escape($s->{'desc'}); my $desc = &html_escape($s->{'desc'});
if ($can) { if ($can) {
$desc = &ui_link("/$module_name/edit_mon.cgi?id=". $desc = &ui_link(&get_webprefix()."/$module_name/edit_mon.cgi?id=".
&urlize($s->{'id'}), $desc); &urlize($s->{'id'}), $desc);
} }
$table .= &ui_columns_row([ $table .= &ui_columns_row([

12
webmin/system_info.pl
View File

@ -128,7 +128,7 @@ foreach my $a (@ann) {
'desc' => $a->{'title'}, 'desc' => $a->{'title'},
}; };
my $hide = &ui_link_button( my $hide = &ui_link_button(
"/$module_name/hide.cgi?id=".&urlize($a->{'file'}), &get_webprefix()."/$module_name/hide.cgi?id=".&urlize($a->{'file'}),
$text{'announce_hide'}); $text{'announce_hide'});
if ($a->{'type'} eq 'warning') { if ($a->{'type'} eq 'warning') {
# A warning message # A warning message
@ -136,8 +136,11 @@ foreach my $a (@ann) {
$info->{'level'} = $a->{'level'} || 'info'; $info->{'level'} = $a->{'level'} || 'info';
$info->{'warning'} = &html_escape($a->{'message'})."<p>\n"; $info->{'warning'} = &html_escape($a->{'message'})."<p>\n";
for(my $b=0; defined($a->{'link'.$b}); $b++) { for(my $b=0; defined($a->{'link'.$b}); $b++) {
my $link = $a->{'link'.$b};
$link = &get_webprefix().$link
if (&get_webprefix() && $link =~ /^\//);
$info->{'warning'} .= &ui_link_button( $info->{'warning'} .= &ui_link_button(
$a->{'link'.$b}, $a->{'desc'.$b}, "_new")."\n"; $link, $a->{'desc'.$b}, "_new")."\n";
} }
$info->{'warning'} .= $hide; $info->{'warning'} .= $hide;
} }
@ -147,8 +150,11 @@ foreach my $a (@ann) {
$info->{'level'} = $a->{'level'}; $info->{'level'} = $a->{'level'};
$info->{'html'} = &html_escape($a->{'message'})."<p>\n"; $info->{'html'} = &html_escape($a->{'message'})."<p>\n";
for(my $b=0; defined($a->{'link'.$b}); $b++) { for(my $b=0; defined($a->{'link'.$b}); $b++) {
my $link = $a->{'link'.$b};
$link = &get_webprefix().$link
if (&get_webprefix() && $link =~ /^\//);
$info->{'html'} .= &ui_link_button( $info->{'html'} .= &ui_link_button(
$a->{'link'.$b}, $a->{'desc'.$b}, "_new")."\n"; $link, $a->{'desc'.$b}, "_new")."\n";
} }
$info->{'html'} .= $hide; $info->{'html'} .= $hide;
} }