Changeset 239 for trunk/DNSDB.pm

Timestamp:

02/23/12 15:36:59 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint; domain/reverse zone list almost complete. See #26.
Still need to do active/inactive

File:

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

trunk/DNSDB.pm

@@ -1202 +1202 @@
 
   my @filterargs;
-  $args{filter} =~ s/\./\[\.\]/g if $args{filter};
-  push @filterargs, $args{startwith} if $args{startwith};
+  $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
+  push @filterargs, "^$args{startwith}" if $args{startwith};
+  $args{filter} =~ s/\./\[\.\]/g if $args{filter};      # only match literal dots, usually in reverse zones
   push @filterargs, $args{filter} if $args{filter};
 
@@ -1236 +1237 @@
 
   $args{sortorder} = 'ASC' if !grep $args{sortorder}, ('ASC','DESC');
-  $args{offset} = 0 if !$args{offset};
+  $args{offset} = 0 if !$args{offset} || $args{offset} !~ /^(?:all|\d+)$/;
 
   my @filterargs;
-  $args{filter} =~ s/\./\[\.\]/g if $args{filter};
-  push @filterargs, $args{startwith} if $args{startwith};
+  $args{startwith} = undef if $args{startwith} && $args{startwith} !~ /^(?:[a-z]|0-9)$/;
+  push @filterargs, "^$args{startwith}" if $args{startwith};
+  $args{filter} =~ s/\./\[\.\]/g if $args{filter};      # only match literal dots, usually in reverse zones
   push @filterargs, $args{filter} if $args{filter};
 
@@ -1253 +1255 @@
         ($args{filter} ? " AND domain ~* ?" : '');
   } else {
+##fixme:  arguably startwith here is irrelevant.  depends on the UI though.
     $args{sortby} = 'revnet' if !grep $args{sortby}, ('domain','group','status');
     $sql = "SELECT rdns_id,revnet,status,groups.group_name AS group FROM revzones".
@@ -1261 +1264 @@
   }
   # A common tail.
-  $sql .= " ORDER BY ".($args{sortby} eq 'group' ? 'groups.group_name' : $args{sortby}).
-        " $args{sortorder} ".($args{offset} eq 'all' ? '' : " LIMIT $config{perpage}".
+  $sql .= " ORDER BY ".($args{sortby} eq 'group' ? 'groups.group_name' : $args{sortby})." $args{sortorder} ".
+        ($args{offset} eq 'all' ? '' : " LIMIT $config{perpage}".
         " OFFSET ".$args{offset}*$config{perpage});
   my $sth = $dbh->prepare($sql);
@@ -1272 +1275 @@
     $row{domainid} = $data[0];
     $row{domain} = $data[1];
-    $row{status} = ($data[2] ? 'Active' : 'Inactive');
+    $row{status} = $data[2];
     $row{group} = $data[3];
-    $row{bg} = ($rownum++)%2;
-    $row{mkactive} = !$data[2];
-#    $row{sid} = $args{sid};
-    $row{offset} = $args{offset};
-# ACLs
-#    $row{domain_edit} = ($permissions{admin} || $permissions{domain_edit});
-#    $row{domain_delete} = ($permissions{admin} || $permissions{domain_delete});
     push @zonelist, \%row;
   }