Changeset 309

Timestamp:

04/18/12 17:29:02 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Minor code review

• remove a dangling variable and comment in addDomain()
• fix useless but syntactically correct (ebbeh?) use of grep() in getZoneList()
• fix handling for unknown sortby in getZoneList()

File:

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

trunk/DNSDB.pm

@@ -1463 +1463 @@
   return ('FAIL',"Need domain status") if !defined($state);
 
-  my %userinfo = @_;    # remaining bits.
-# user ID, username, user full name
-
   $state = 1 if $state =~ /^active$/;
   $state = 1 if $state =~ /^on$/;
@@ -1887 +1884 @@
   my @zonelist;
 
-  $args{sortorder} = 'ASC' if !grep $args{sortorder}, ('ASC','DESC');
+  $args{sortorder} = 'ASC' if !grep /^$args{sortorder}$/, ('ASC','DESC');
   $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;
 
@@ -1899 +1896 @@
   # Not as compact, and fix-me-twice if the common bits get wrong, but much easier to read
   if ($args{revrec} eq 'n') {
-    $args{sortby} = 'domain' if !grep $args{sortby}, ('revnet','group','status');
+    $args{sortby} = 'domain' if !grep /^$args{sortby}$/, ('domain','group','status');
     $sql = "SELECT domain_id,domain,status,groups.group_name AS group FROM domains".
         " INNER JOIN groups ON domains.group_id=groups.group_id".
@@ -1907 +1904 @@
   } else {
 ##fixme:  arguably startwith here is irrelevant.  depends on the UI though.
-    $args{sortby} = 'revnet' if !grep $args{sortby}, ('domain','group','status');
+    $args{sortby} = 'revnet' if !grep /^$args{sortby}$/, ('revnet','group','status');
     $sql = "SELECT rdns_id,revnet,status,groups.group_name AS group FROM revzones".
         " INNER JOIN groups ON revzones.group_id=groups.group_id".
@@ -3347 +3344 @@
 
     if ($rev eq 'n') {
-
 ##fixme:  serial
       $dbh->do("INSERT INTO domains (domain,group_id,status) VALUES (?,?,?)", undef, ($zone,$group,$status) );