From 0a3658400ed43e2a2d8a68afaf2a63771cfe36b5 Mon Sep 17 00:00:00 2001
From: Joe Cooper <joe@virtualmin.com>
Date: Mon, 30 May 2016 21:51:51 -0700
Subject: [PATCH] strict/warn, define $bconf, remove $view from can_edit_zone
 call

---
 bind8/edit_forward.cgi | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/bind8/edit_forward.cgi b/bind8/edit_forward.cgi
index da28cad70..802ffe448 100755
--- a/bind8/edit_forward.cgi
+++ b/bind8/edit_forward.cgi
@@ -1,22 +1,25 @@
 #!/usr/local/bin/perl
 # edit_forward.cgi
 # Display options for an existing forward zone
+use strict;
+use warnings;
+our (%access, %in, %text);
 
 require './bind8-lib.pl';
 &ReadParse();
 
 $in{'view'} = 'any' if ($in{'view'} eq '');
-$zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});
-$z = &zone_to_config($zone);
-$zconf = $z->{'members'};
-$dom = $zone->{'name'};
+my $zone = &get_zone_name_or_error($in{'zone'}, $in{'view'});
+my $z = &zone_to_config($zone);
+my $zconf = $z->{'members'};
+my $dom = $zone->{'name'};
 &can_edit_zone($zone) ||
 	&error($text{'master_ecannot'});
 
 $dom = $zone->{'name'};
-&can_edit_zone($zone, $view) ||
+&can_edit_zone($zone) ||
 	&error($text{'fwd_ecannot'});
-$desc = &ip6int_to_net(&arpa_to_ip($dom));
+my $desc = &ip6int_to_net(&arpa_to_ip($dom));
 &ui_print_header($desc, $text{'fwd_title'}, "",
 		 undef, undef, undef, undef, &restart_links());
 
@@ -48,6 +51,7 @@ else {
 	print &ui_buttons_start();
 
 	# Move to another view
+	my $bconf = &get_config();
 	print &move_zone_button($bconf, $zone->{'viewindex'}, $in{'zone'});
 
 	# Delete zone