Changeset 916

Timestamp:

08/13/25 17:40:34 (11 hours ago)

Author:

Kris Deugau

Message:

/branches/secondaryzones

Add first part of secondary zone edit page

Location:

branches/secondaryzones

Files:

• DNSDB.pm (modified) (3 diffs)
• dns.cgi (modified) (1 diff)
• templates/editsecondary.tmpl (added)

branches/secondaryzones/DNSDB.pm

@@ -3089 +3089 @@
 
 
+## DNSDB::secondaryName()
+# Return the secondary zone name based on a zone ID
+# Takes the zone ID, and as with revName() an optional flag to force return
+# of the logical CIDR zone instead of the formal .arpa zone name
+# Returns the zone name or undef on failure
+sub secondaryName {
+  $errstr = '';
+  my $self = shift;
+  my $dbh = $self->{dbh};
+  my $zoneid = shift;
+  my $cidrflag = shift || 'n';
+  my ($zone) = $dbh->selectrow_array("SELECT zone FROM secondaryzones WHERE secondary_id=?", undef, ($zoneid) );
+  $errstr = $DBI::errstr if !$zone;
+  my $tmp = new NetAddr::IP $zone;
+  $zone = _ZONE($tmp, 'ZONE', 'r', '.').($tmp->{isv6} ? '.ip6.arpa' : '.in-addr.arpa')
+        if ($self->{showrev_arpa} eq 'zone' || $self->{showrev_arpa} eq 'all') && $cidrflag eq 'n';
+  return $zone if $zone;
+} # end secondaryName()
+
+
 ## DNSDB::domainID()
 # Takes a domain name and default location
@@ -4339 +4359 @@
   my $loc = shift;
 
-  my $sth = $dbh->prepare("SELECT group_id,iplist,description,comments FROM locations WHERE location=?");
-  $sth->execute($loc);
-  return $sth->fetchrow_hashref(); 
+  if (defined($loc) && $loc eq '') {
+    my %ret = (group_id => 1, iplist => '', description => 'Default/All', comments => '');
+    return \%ret;
+  } else {
+    my $sth = $dbh->prepare("SELECT group_id,iplist,description,comments FROM locations WHERE location=?");
+    $sth->execute($loc);
+    return $sth->fetchrow_hashref();
+  }
 } # end getLoc()
 
@@ -4493 +4518 @@
   return $ret;
 } # end getSOA()
+
+
+## DNSDB::getSecondaryDetails
+# Retrieve primary server(s) and location/view of a secondary zone
+sub getSecondaryDetails {
+  $errstr = '';
+  my $self = shift;
+  my $dbh = $self->{dbh};
+  my $id = shift;
+
+  my $sql = "SELECT primaryserver, default_location FROM secondaryzones WHERE secondary_id = ?";
+  my $ret = $dbh->selectrow_hashref($sql, undef, ($id) );
+  return if !$ret;
+
+  return $ret;
+} # end getSecondaryDetails()
 
 

branches/secondaryzones/dns.cgi

@@ -634 +634 @@
   listsecondaryzones();
 
+} elsif ($webvar{page} eq 'editsecondary') {
+
+  # security check - does the user have permission to view this entity?
+  # id is zone id
+  if (!check_scope(id => $webvar{id}, type => 'secondaryzone')) {
+    changepage(page => 'secondaryzones',
+        errmsg => "You do not have permission to edit the requested secondary zone");
+  }
+
+  changepage(page => "secondaryzones", errmsg => "You are not permitted to edit secondary zones", id => $webvar{id})
+        unless ($permissions{admin} || $permissions{domain_edit});
+
+  $page->param(parent => $dnsdb->secondaryName($webvar{id}));
+  my $zoneinfo = $dnsdb->getSecondaryDetails($webvar{id});
+  $page->param(prins => $zoneinfo->{primaryserver});
+  fill_loclist($curgroup, $zoneinfo->{default_location});
 
 } elsif ($webvar{page} eq 'reclist') {