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

Merge branch 'master' of github.com:webmin/webmin

Browse Source
This commit is contained in:
Jamie Cameron
2021-03-08 16:16:43 -08:00
parent a03a8ff15a 4c6ba93328
commit ec140956e8
5 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bind8/bind8-lib.pl
View File

@@ -3161,10 +3161,13 @@ my ($zone) = @_;
my @rv;
if (!$access{'ro'} && $access{'apply'}) {
my $r = $ENV{'REQUEST_METHOD'} eq 'POST' ? 0 : 1;
my $zone_name;
my $link_params;
if ($zone) {
$zone_name = "&" . "zone=$zone->{'name'}&type=$zone->{'type'}";
}
$link_params = "&" . "zone=$zone->{'name'}&type=$zone->{'type'}";
if ($zone->{'viewindex'}) {
$link_params .= "&view=$zone->{'viewindex'}";
}
}
if (&is_bind_running()) {
if ($zone && ($access{'apply'} == 1 || $access{'apply'} == 2)) {
# Apply this zone
@@ -3175,16 +3178,16 @@ if (!$access{'ro'} && $access{'apply'}) {
}
# Apply whole config
if ($access{'apply'} == 1 || $access{'apply'} == 3) {
push(@rv, &ui_link("restart.cgi?return=$r$zone_name", $text{'links_restart'}) );
push(@rv, &ui_link("restart.cgi?return=$r$link_params", $text{'links_restart'}) );
}
if ($access{'apply'} == 1) {
# Stop BIND
push(@rv, &ui_link("stop.cgi?return=$r$zone_name", $text{'links_stop'}) );
push(@rv, &ui_link("stop.cgi?return=$r$link_params", $text{'links_stop'}) );
}
}
elsif ($access{'apply'} == 1) {
# Start BIND
push(@rv, &ui_link("start.cgi?return=$r$zone_name", $text{'links_start'}));
push(@rv, &ui_link("start.cgi?return=$r$link_params", $text{'links_start'}));
}
}
return join('<br>', @rv);

5
bind8/restart.cgi
View File

@@ -31,6 +31,9 @@ my $redir_targ = ($in{'type'} eq "master" ? "edit_master.cgi" :
my $zone;
if ($in{'zone'}) {
$zone = "?zone=$in{'zone'}";
}
if ($in{'view'}) {
$zone .= "&view=$in{'view'}";
}
}
&redirect($zone && $in{'return'} ? "$redir_targ$zone" : "");

8
bind8/restart_zone.cgi
View File

@@ -18,10 +18,4 @@ my $err = &restart_zone($zone->{'name'}, $zone->{'view'});
my $tv = $zone->{'type'};
my $redir_targ = ($tv eq "master" ? "edit_master.cgi" :
$tv eq "forward" ? "edit_forward.cgi" : "edit_slave.cgi");
if ($in{'return'}) {
&redirect($redir_targ . "?zone=$in{'zone'}");
}
else {
&redirect($redir_targ . "?zone=$in{'zone'}&view=$in{'view'}");
}
&redirect($redir_targ . "?zone=$in{'zone'}&view=$in{'view'}");

5
bind8/start.cgi
View File

@@ -17,6 +17,9 @@ my $redir_targ = ($in{'type'} eq "master" ? "edit_master.cgi" :
my $zone;
if ($in{'zone'}) {
$zone = "?zone=$in{'zone'}";
}
if ($in{'view'}) {
$zone .= "&view=$in{'view'}";
}
}
&redirect($zone && $in{'return'} ? "$redir_targ$zone" : "");

5
bind8/stop.cgi
View File

@@ -13,6 +13,9 @@ my $redir_targ = ($in{'type'} eq "master" ? "edit_master.cgi" :
my $zone;
if ($in{'zone'}) {
$zone = "?zone=$in{'zone'}";
}
if ($in{'view'}) {
$zone .= "&view=$in{'view'}";
}
}
&redirect($zone && $in{'return'} ? "$redir_targ$zone" : "");