Changeset 931

Timestamp:

08/28/25 13:42:55 (5 weeks ago)

Author:

Kris Deugau

Message:

/branches/secondaryzones

Update DNSDB::zoneStatus() to take a hash for arguments instead of bare
values, for easier calling for secondary zone cases

Location:

branches/secondaryzones

Files:

• DNSDB.pm (modified) (4 diffs)
• dns-rpc.cgi (modified) (2 diffs)
• dns.cgi (modified) (4 diffs)

branches/secondaryzones/DNSDB.pm

@@ -3096 +3096 @@
   my $failmsg = '';
   my $zone = ($revrec eq 'n' ? $self->domainName($zoneid) : $self->revName($zoneid));
-  my $zonestatus = $self->zoneStatus($zoneid, $revrec);
+  my $zonestatus = $self->zoneStatus(zoneid => $zoneid, revrec => $revrec);
 
   return ('FAIL', ($revrec eq 'n' ? 'Domain' : 'Reverse zone')." ID $zoneid doesn't exist") if !$zone;
@@ -5936 +5936 @@
   my $self = shift;
   my $dbh = $self->{dbh};
-  my $id = shift;
-  my $revrec = shift;
-  my $newstatus = shift || 'mu';
-
-  return undef if $id !~ /^\d+$/;
+
+  my %args = @_;
+
+  return undef if $args{zoneid} !~ /^\d+$/;
+  return undef if (!defined($args{revrec}) && !defined($args{secondary}));
+  $args{newstatus} = 'mu' if !$args{newstatus};
 
   # Allow transactions, and raise an exception on errors so we can catch it later.
@@ -5947 +5948 @@
   local $dbh->{RaiseError} = 1;
 
-  if ($newstatus ne 'mu') {
+  if ($args{newstatus} ne 'mu') {
     # ooo, fun!  let's see what we were passed for status
     eval {
-      $newstatus = 0 if $newstatus eq 'domoff';
-      $newstatus = 1 if $newstatus eq 'domon';
-      $dbh->do("UPDATE ".($revrec eq 'n' ? 'domains' : 'revzones')." SET status=? WHERE ".
-        ($revrec eq 'n' ? 'domain_id' : 'rdns_id')."=?", undef, ($newstatus,$id) );
-
+      $args{newstatus} = 0 if $args{newstatus} eq 'domoff';
+      $args{newstatus} = 1 if $args{newstatus} eq 'domon';
+      $dbh->do("UPDATE ".
+        ($args{secondary} eq 'n' ? ($args{revrec} eq 'n' ? 'domains' : 'revzones') : 'secondary_zones')." SET status=? WHERE ".
+        ($args{secondary} eq 'n' ? ($args{revrec} eq 'n' ? 'domain_id' : 'rdns_id') : 'secondary_id')."=?",
+        undef, ($args{newstatus},$args{zoneid}) );
 ##fixme  switch to more consise "Enabled <domain"/"Disabled <domain>" as with users?
-      $resultstr = "Changed ".($revrec eq 'n' ? $self->domainName($id) : $self->revName($id)).
-        " state to ".($newstatus ? 'active' : 'inactive');
+      $resultstr = "Changed ".
+        ($args{secondary} eq 'n' ?
+                ($args{revrec} eq 'n' ? $self->domainName($args{zoneid}) : $self->revName($args{zoneid})) :
+                $self->secondaryName($args{zoneid})
+        )." state to ".($args{newstatus} ? 'active' : 'inactive');
 
       my %loghash;
-      $loghash{domain_id} = $id if $revrec eq 'n';
-      $loghash{rdns_id} = $id if $revrec eq 'y';
-      $loghash{group_id} = $self->parentID(id => $id, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec);
+      if ($args{secondary} eq 'n') {
+        $loghash{domain_id} = $args{zoneid} if $args{revrec} eq 'n';
+        $loghash{rdns_id} = $args{zoneid} if $args{revrec} eq 'y';
+      } else {
+        $loghash{secondary_id} = $args{zoneid};
+      }
+      $loghash{group_id} = $self->parentID(id => $args{zoneid}, revrec => $args{revrec},
+        type => ($args{secondary} eq 'n' ? ($args{revrec} eq 'n' ? 'domain' : 'revzone') : 'secondaryzone'));
       $loghash{entry} = $resultstr;
       $self->_log(%loghash);
@@ -5978 +5988 @@
 
   my ($status) = $dbh->selectrow_array("SELECT status FROM ".
-        ($revrec eq 'n' ? "domains WHERE domain_id=?" : "revzones WHERE rdns_id=?"),
-        undef, ($id) );
+        ($args{secondary} eq 'n' ? ($args{revrec} eq 'n' ? "domains WHERE domain_id=?" : "revzones WHERE rdns_id=?") : "secondary_zones WHERE secondary_id=?"),
+        undef, ($args{zoneid}) );
   return $status;
 } # end zoneStatus()

branches/secondaryzones/dns-rpc.cgi

@@ -1957 +1957 @@
 =item reverse
 
-Set to C<y> if you want to get/set the status for a reverse zone
+Set to C<y> if you want to get/set the status for a reverse zone.  Defaults
+to C<n>.
+
+=item secondary
+
+Set to C<y> if you want to get/set the status of a seconary zone.  Defaults
+to C<n>.  C<reverse> has no meaning if C<secondary> is 'y'.
 
 =item status
@@ -1972 +1978 @@
 
   $args{reverse} = 'n' if !$args{reverse} || $args{reverse} ne 'y';
-  my @arglist = ($args{zoneid}, $args{reverse});
-  push @arglist, $args{status} if defined($args{status});
-
-  my $status = $dnsdb->zoneStatus(@arglist);
+  $args{secondary} = 'n' if !$args{secondary} || $args{secondary} ne 'y';
+
+  my $status = $dnsdb->zoneStatus(%args);
 }
 

branches/secondaryzones/dns.cgi

@@ -412 +412 @@
     }
     if ($flag && ($permissions{admin} || $permissions{domain_edit})) {
-      my $stat = $dnsdb->zoneStatus($webvar{id}, 'n', $webvar{zonestatus});
+      my $stat = $dnsdb->zoneStatus(zoneid => $webvar{id}, revrec => 'n', newstatus => $webvar{zonestatus});
       $page->param(resultmsg => $DNSDB::resultstr);
     } else {
@@ -518 +518 @@
     }
     if ($flag && ($permissions{admin} || $permissions{domain_edit})) {
-      my $stat = $dnsdb->zoneStatus($webvar{id}, 'y', $webvar{zonestatus});
+      my $stat = $dnsdb->zoneStatus(zoneid => $webvar{id}, revrec => 'y', newstatus => $webvar{zonestatus});
       $page->param(resultmsg => $DNSDB::resultstr);
     } else {
@@ -620 +620 @@
     }
     if ($flag && ($permissions{admin} || $permissions{domain_edit})) {
-      my $stat = $dnsdb->secondaryzoneStatus($webvar{id}, 'n', $webvar{zonestatus});
+      my $stat = $dnsdb->zoneStatus(zoneid => $webvar{id}, revrec => 'n', secondary => 'y', newstatus => $webvar{zonestatus});
       $page->param(resultmsg => $DNSDB::resultstr);
     } else {
@@ -1331 +1331 @@
         if $webvar{bulkaction} eq 'move';
     if ($webvar{bulkaction} eq 'deactivate' || $webvar{bulkaction} eq 'activate') {
-      my $stat = $dnsdb->zoneStatus($webvar{$input}, ($fr eq 'dom' ? 'n' : 'y'),
-        ($webvar{bulkaction} eq 'activate' ? 'domon' : 'domoff'));
+      my $stat = $dnsdb->zoneStatus(zoneid => $webvar{$input}, revrec => ($fr eq 'dom' ? 'n' : 'y'),
+        newstatus => ($webvar{bulkaction} eq 'activate' ? 'domon' : 'domoff'));
       $code = (defined($stat) ? 'OK' : 'FAIL');
       $msg = (defined($stat) ? $DNSDB::resultstr : $DNSDB::errstr);