Default view option

diff --git a/bind8/CHANGELOG b/bind8/CHANGELOG
index b45fa6a..7eac8a6 100644 (file)
--- a/bind8/CHANGELOG
+++ b/bind8/CHANGELOG
@@ -121,3 +121,5 @@ Changed the default DNSSEC algorithm from DSA to the stronger RSASHA1.
 On Linux systems, /dev/urandom is used for generating entropy for DNSSEC.
 ---- Changes since 1.520 ----
 Added the Delete Records In Selected button to the main page, for removing the same record in multiple domains at once.
+---- Changes since 1.530 ----
+The default view for new zones can now be set via an option on the Module Config page.

diff --git a/bind8/config.info b/bind8/config.info
index b337189..139a889 100644 (file)
--- a/bind8/config.info
+++ b/bind8/config.info
@@ -23,6 +23,7 @@ short_names=Convert record names to canonical form?,1,0-Yes,1-No
 extra_forward=Extra record types for forward zones,0
 extra_reverse=Extra record types for reverse zones,0
 largezones=Show records in zones?,1,0-Yes,1-No (for large zones)
+default_view=Default view for new zones,3,First in list
 
 line2=Zone file options,11
 soa_style=Serial number style,1,0-Running number,1-Date based (YYYYMMDDnn),2-Unix time

diff --git a/bind8/delegation_form.cgi b/bind8/delegation_form.cgi
index 432236e..e399cf5 100755 (executable)
--- a/bind8/delegation_form.cgi
+++ b/bind8/delegation_form.cgi
@@ -25,8 +25,10 @@ print &ui_table_row($text{'fcreate_dom'},
 $conf = &get_config();
 @views = &find("view", $conf);
 if (@views) {
+       ($defview) = grep { lc($_->{'values'}->[0]) eq
+                           lc($config{'default_view'}) } @views;
        print &ui_table_row($text{'mcreate_view'},
-               &ui_select("view", undef,
+               &ui_select("view", $defview ? $defview->{'index'} : undef,
                  [ map { [ $_->{'index'}, $_->{'values'}->[0] ] }
                        grep { &can_edit_view($_) } @views ]), 3);
        }

diff --git a/bind8/forward_form.cgi b/bind8/forward_form.cgi
index 8786686..4f90dff 100755 (executable)
--- a/bind8/forward_form.cgi
+++ b/bind8/forward_form.cgi
@@ -25,8 +25,10 @@ print &ui_table_row($text{'fcreate_dom'},
 $conf = &get_config();
 @views = &find("view", $conf);
 if (@views) {
+       ($defview) = grep { lc($_->{'values'}->[0]) eq
+                           lc($config{'default_view'}) } @views;
        print &ui_table_row($text{'mcreate_view'},
-               &ui_select("view", undef,
+               &ui_select("view", $defview ? $defview->{'index'} : undef,
                  [ map { [ $_->{'index'}, $_->{'values'}->[0] ] }
                        grep { &can_edit_view($_) } @views ]), 3);
        }

diff --git a/bind8/hint_form.cgi b/bind8/hint_form.cgi
index ee26465..5907a21 100755 (executable)
--- a/bind8/hint_form.cgi
+++ b/bind8/hint_form.cgi
@@ -43,8 +43,10 @@ print &ui_table_row($text{'hcreate_real'},
 # Create in view
 @views = grep { &can_edit_view($_) && !$hashint{$_} } @views;
 if (@views) {
+       ($defview) = grep { lc($_->{'values'}->[0]) eq
+                           lc($config{'default_view'}) } @views;
        print &ui_table_row($text{'mcreate_view'},
-               &ui_select("view", undef,
+               &ui_select("view", $defview ? $defview->{'index'} : undef,
                  [ map { [ $_->{'index'}, $_->{'values'}->[0] ] }
                        @views ]), 3);
        }

diff --git a/bind8/master_form.cgi b/bind8/master_form.cgi
index 4955e85..81424c5 100755 (executable)
--- a/bind8/master_form.cgi
+++ b/bind8/master_form.cgi
@@ -23,8 +23,10 @@ print &ui_table_row($text{'mcreate_dom'},
 $conf = &get_config();
 @views = &find("view", $conf);
 if (@views) {
+       ($defview) = grep { lc($_->{'values'}->[0]) eq
+                           lc($config{'default_view'}) } @views;
        print &ui_table_row($text{'mcreate_view'},
-               &ui_select("view", undef,
+               &ui_select("view", $defview ? $defview->{'index'} : undef,
                        [ map { [ $_->{'index'}, $_->{'values'}->[0] ] }
                              grep { &can_edit_view($_) } @views ]), 3);
        }

diff --git a/bind8/slave_form.cgi b/bind8/slave_form.cgi
index 2d411fe..b64e798 100755 (executable)
--- a/bind8/slave_form.cgi
+++ b/bind8/slave_form.cgi
@@ -29,8 +29,10 @@ print &ui_table_row($text{'screate_dom'},
 # Create in view
 @views = &find("view", $conf);
 if (@views) {
+       ($defview) = grep { lc($_->{'values'}->[0]) eq
+                           lc($config{'default_view'}) } @views;
        print &ui_table_row($text{'mcreate_view'},
-               &ui_select("view", undef,
+               &ui_select("view", $defview ? $defview->{'index'} : undef,
                  [ map { [ $_->{'index'}, $_->{'values'}->[0] ] }
                        grep { &can_edit_view($_) } @views ]), 3);
        }