Changeset 135

Timestamp:

10/07/11 14:43:59 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak getDomRecs and getRecCount to return useful, correct
results when something is entered in the "filter" space on
the record list page

File:

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

trunk/DNSDB.pm

@@ -1211 +1211 @@
   my $direction = shift || 'ASC';
 
+  my $filter = shift || '';
+  # keep the nasties down, since we can't ?-sub this bit.  :/
+  # note this is chars allowed in DNS hostnames
+  $filter =~ s/[^a-zA-Z0-9_.:-]//g;
+
   $type = 'y' if $type eq 'def';
 
@@ -1223 +1228 @@
   }
   $sql .= " AND NOT r.type=$reverse_typemap{SOA}";
+  $sql .= " AND host ILIKE '%$filter%'" if $filter;
   # use alphaorder column for "correct" ordering of sort-by-type instead of DNS RR type number
   $sql .= " ORDER BY ".($order eq 'type' ? 't.alphaorder' : "r.$order")." $direction";
@@ -1242 +1248 @@
 ## DNSDB::getRecCount()
 # Return count of non-SOA records in domain (or default records in a group)
-# Takes a database handle, default/live flag and group/domain ID
+# Takes a database handle, default/live flag, group/domain ID, and optional filtering modifier
 # Returns the count
 sub getRecCount {
@@ -1248 +1254 @@
   my $defrec = shift;
   my $id = shift;
+  my $filter = shift || '';
+
+  # keep the nasties down, since we can't ?-sub this bit.  :/
+  # note this is chars allowed in DNS hostnames
+  $filter =~ s/[^a-zA-Z0-9_.:-]//g;
 
   my ($count) = $dbh->selectrow_array("SELECT count(*) FROM ".
         ($defrec eq 'y' ? 'default_' : '')."records ".
         "WHERE ".($defrec eq 'y' ? 'group' : 'domain')."_id=? ".
-        "AND NOT type=$reverse_typemap{SOA}", undef, ($id) );
+        "AND NOT type=$reverse_typemap{SOA}".
+        ($filter ? " AND host ILIKE '%$filter%'" : ''),
+        undef, ($id) );
 
   return $count;