Changeset 512

Timestamp:

05/14/13 17:00:24 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Minor code-review cleanup

• remove a die()-on-SELECT-error in getPermissions() (no other get* sub die()s)
• Fail to delete a group if there are still reverse zones. This would probably have sucessfully failed anyway, but the error message would be a lot less friendly.
• add . to the sortby character check in getRecList() since this may include table.column sort specifications
• remove a duplicate check on logtype in getLogCount()

File:

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

trunk/DNSDB.pm

@@ -1596 +1596 @@
   my $sth = $dbh->prepare($sql);
 
+##fixme:  this should be trapped
   $sth->execute($id) or die "argh: ".$sth->errstr;
 
@@ -2483 +2484 @@
     my ($domcnt) = $dbh->selectrow_array("SELECT count(*) FROM domains WHERE group_id=?", undef, ($groupid));
     die "$domcnt domains still in group\n" if $domcnt;
+    my ($revcnt) = $dbh->selectrow_array("SELECT count(*) FROM revzones WHERE group_id=?", undef, ($groupid));
+    die "$revcnt reverse zones still in group\n" if $revcnt;
     my ($usercnt) = $dbh->selectrow_array("SELECT count(*) FROM users WHERE group_id=?", undef, ($groupid));
     die "$usercnt users still in group\n" if $usercnt;
@@ -3581 +3584 @@
   $defsort = 'val' if $args{revrec} eq 'y';      # default sort by IP on revzone record list
   $args{sortby} = $defsort if !$args{revrec};
-  $args{sortby} = $defsort if $args{sortby} !~ /^[\w_.]+$/;
+  $args{sortby} = $defsort if $args{sortby} !~ /^[\w_,.]+$/;
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;  
   my $perpage = ($args{nrecs} ? $args{nrecs} : $config{perpage});
@@ -4102 +4105 @@
   $args{logtype} = 'domain' if $args{logtype} eq 'dom';         # hack pthui
   return if !grep /^$args{logtype}$/, ('group', 'domain', 'revzone', 'user');
-
-  $args{logtype} = 'revzone' if $args{logtype} eq 'rdns';       # hack pthui
 
   my $sql = "SELECT count(*) FROM log ".