Changeset 137 for trunk/dns.cgi

Timestamp:

10/07/11 15:59:35 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix record list filtering - standardize variable/form input name(s)
Use $filter global (since we so kindly define it while setting up
other session globals)
Note the filter behaviour in pgcount.tmpl; this makes it (somewhat)
more obvious that filtering has been applied to the record list.

File:

• trunk/dns.cgi (modified) (3 diffs)

trunk/dns.cgi

@@ -319 +319 @@
   $page->param(curpage => $webvar{page});
 
-  my $count = getRecCount($dbh, $webvar{defrec}, $webvar{id});
+  my $count = getRecCount($dbh, $webvar{defrec}, $webvar{id}, $filter);
 
   $sortby = 'host';
@@ -1397 +1397 @@
   $page->param(ttl      => $soa{ttl});
 
-  $startwith = $session->param($webvar{page}.'startwith');
-  $filter = $session->param($webvar{page}.'filter');
-
-  my $foo2 = getDomRecs($dbh,$def,$id,$perpage,$webvar{offset},$sortby,$sortorder);
+#  $startwith = $session->param($webvar{page}.'startwith');
+#  $filter = $session->param($webvar{page}.'filter');
+
+  my $foo2 = getDomRecs($dbh,$def,$id,$perpage,$webvar{offset},$sortby,$sortorder,$filter);
 
   my $row = 0;
@@ -1544 +1544 @@
   $page->param(pgtype => $pgtype);
   $page->param(parent => $parent);
+  $page->param(filter => $filter);
 } # end fill_pgcount()
 
 sub listdomains {
 
-  $startwith = $session->param($webvar{page}.'startwith');
-  $filter = $session->param($webvar{page}.'filter');
+#  $startwith = $session->param($webvar{page}.'startwith');
+#  $filter = $session->param($webvar{page}.'filter');
   $searchsubs = $session->param($webvar{page}.'searchsubs');