Changeset 723 for trunk/dns.cgi

Timestamp:

06/17/16 18:01:13 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Record search is substantially complete, including scope limits for users
in subgroups, sorting, and various links into zones or direct record
editing (records attached to both a forward and reverse zone.
See #57.

File:

• trunk/dns.cgi (modified) (1 diff)

trunk/dns.cgi

@@ -1861 +1861 @@
 } elsif ($webvar{page} eq 'recsearch') {
 
-##FIXME
-##FIXME  Limit scope of search!!
-##FIXME
-
-#  my $count = $dnsdb->recSearchCount(searchfor => $webvar{searchfor});
-
-  $page->param(searchfor => $webvar{searchfor});
-  my $recset = $dnsdb->recSearch(searchfor => $webvar{searchfor}, group => $logingroup);
+  # we do this for the domain and record list filter/search - it should be extremely rare to
+  # need to search on characters outside this set until we get into IDNs
+  $webvar{searchfor} =~ s/[^a-zA-Z0-9_.:\@-]//g if $webvar{searchfor};
+
+  # save the search in the session, same as the "filter" in various other lists...
+  if (defined($webvar{searchfor})) {
+    if ($session->param('recsearch') && $webvar{searchfor} ne $session->param('recsearch')) {
+      $uri_self =~ s/\&offset=[^&]//;
+      $offset = 0;
+    }
+    $session->param(recsearch => $webvar{searchfor});
+  }
+  my $searchfor = $session->param('recsearch');
+
+  $sortby = 'host';
+  $session->param($webvar{page}.'sortby', $webvar{sortby}) if $webvar{sortby};
+  $session->param($webvar{page}.'order', $webvar{order}) if $webvar{order};
+  $sortby = $session->param($webvar{page}.'sortby') if $session->param($webvar{page}.'sortby');
+  $sortorder = $session->param($webvar{page}.'order') if $session->param($webvar{page}.'order');
+
+  # some magic to label and linkify the column headers for sorting
+  my @cols = ('domain','revzone','host','type','val','location');
+  my %colheads = (domain => "Domain (Group)", revzone => "Reverse zone (Group)", host => "Host",
+        type => "Type", val => "IP/value", location => "Location");
+  fill_colheads($sortby, $sortorder, \@cols, \%colheads);
+
+  # pgcount.tmpl
+  my $count = $dnsdb->recSearchCount(searchfor => $searchfor, group => $logingroup);
+  fill_pgcount($count, "records");
+  fill_fpnla($count);
+
+  # and a bit for fpnla.tmpl
+  $page->param(curpage => $webvar{page});
+
+  $page->param(searchfor => $searchfor);
+  my $recset = $dnsdb->recSearch(searchfor => $searchfor, group => $logingroup, offset => $webvar{offset},
+    sortby => $sortby, sortorder => $sortorder);
   $page->param(searchresults => $recset);