Changeset 572 for trunk/DNSDB.pm

Timestamp:

12/30/13 17:42:06 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix bug with reverse zones not activating/deactivating properly. This
changes the return from getZoneList slightly, for consistency.

Update the bulk domain change page to match.

File:

• trunk/DNSDB.pm (modified) (3 diffs)

trunk/DNSDB.pm

@@ -2307 +2307 @@
   if ($args{revrec} eq 'n') {
     $args{sortby} = 'domain' if !$args{sortby} || !grep /^$args{sortby}$/, ('domain','group','status');
-    $sql = "SELECT domain_id,domain,status,groups.group_name AS group FROM domains".
+    $sql = "SELECT domain_id AS zoneid,domain AS zone,status,groups.group_name AS group FROM domains".
         " INNER JOIN groups ON domains.group_id=groups.group_id".
         " WHERE domains.group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
@@ -2315 +2315 @@
 ##fixme:  arguably startwith here is irrelevant.  depends on the UI though.
     $args{sortby} = 'revnet' if !$args{sortby} || !grep /^$args{sortby}$/, ('revnet','group','status');
-    $sql = "SELECT rdns_id,revnet,status,groups.group_name AS group FROM revzones".
+    $sql = "SELECT rdns_id AS zoneid,revnet AS zone,status,groups.group_name AS group FROM revzones".
         " INNER JOIN groups ON revzones.group_id=groups.group_id".
         " WHERE revzones.group_id IN ($args{curgroup}".($args{childlist} ? ",$args{childlist}" : '').")".
@@ -2325 +2325 @@
         ($args{offset} eq 'all' ? '' : " LIMIT $self->{perpage}".
         " OFFSET ".$args{offset}*$self->{perpage});
-  my $sth = $dbh->prepare($sql);
-  $sth->execute(@filterargs);
-  my $rownum = 0;
-
-  while (my @data = $sth->fetchrow_array) {
-    my %row;
-    $row{domain_id} = $data[0];
-    $row{domain} = $data[1];
-    $row{status} = $data[2];
-    $row{group} = $data[3];
-    push @zonelist, \%row;
-  }
-
-  return \@zonelist;
+
+  my $ret = $dbh->selectall_arrayref($sql, { Slice => {} }, @filterargs);
+  return $ret;
 } # end getZoneList()