Changeset 323 for trunk/dns.cgi

Timestamp:

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

Author:

Kris Deugau

Message:

/trunk

Moved some more SQL out of dns.cgi (see #1). Added pagination
and sorting to the log display while I was at it.

File:

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

trunk/dns.cgi

@@ -96 +96 @@
   $session->param('reclistsortby','host');
   $session->param('reclistorder','ASC');
+  $session->param('logsortby','stamp');
+  $session->param('logorder','DESC');
 }
 
@@ -1497 +1499 @@
 } elsif ($webvar{page} eq 'log') {
 
-##fixme put in some real log-munching stuff
-  my $sql = "SELECT user_id, email, name, entry, date_trunc('second',stamp) FROM log WHERE ";
   my $id = $curgroup;  # we do this because the group log may be called from (almost) any page,
                        # but the others are much more limited.  this is probably non-optimal.
 
   if ($webvar{ltype} && $webvar{ltype} eq 'user') {
-    $sql .= "user_id=?";
+##fixme:  where should we call this from?
     $id = $webvar{id};
     if (!check_scope(id => $id, type => 'user')) {
@@ -1511 +1511 @@
     $page->param(logfor => 'user '.userFullName($dbh,$id));
   } elsif ($webvar{ltype} && $webvar{ltype} eq 'dom') {
-    $sql .= "domain_id=?";
     $id = $webvar{id};
     if (!check_scope(id => $id, type => 'domain')) {
@@ -1519 +1518 @@
     $page->param(logfor => 'domain '.domainName($dbh,$id));
   } elsif ($webvar{ltype} && $webvar{ltype} eq 'rdns') {
-    $sql .= "rdns_id=?";
     $id = $webvar{id};
     if (!check_scope(id => $id, type => 'revzone')) {
@@ -1528 +1526 @@
   } else {
     # Default to listing curgroup log
-    $sql .= "group_id=?";
     $page->param(logfor => 'group '.groupName($dbh,$id));
     # note that scope limitations are applied via the change-group check;
     # group log is always for the "current" group
   }
+  $webvar{ltype} = 'group' if !$webvar{ltype};
+  my $lcount = getLogCount($dbh, (id => $id, logtype => $webvar{ltype})) or push @debugbits, $DNSDB::errstr;
+
+  $page->param(id => $id);
+  $page->param(ltype => $webvar{ltype});
+
+  fill_fpnla($lcount);
+  fill_pgcount($lcount, "log entries", '');
+  $page->param(curpage => $webvar{page}.($webvar{ltype} ? "&ltype=$webvar{ltype}" : ''));
+
+  $sortby = 'stamp';
+  $sortorder = 'DESC';  # newest-first;  although filtering is probably going to be more useful than sorting
+# sort/order
+  $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');
+
+  # Set up the column headings with the sort info
+  my @cols = ('fname','username','entry','stamp');
+  my %colnames = (fname => 'Name', username => 'Username/Email', entry => 'Log Entry', stamp => 'Date/Time');
+  fill_colheads($sortby, $sortorder, \@cols, \%colnames);
+
+##fixme:  increase per-page limit or use separate limit for log?  some ops give *lots* of entries...
+  my $logentries = getLogEntries($dbh, (id => $id, logtype => $webvar{ltype},
+        offset => $webvar{offset}, sortby => $sortby, sortorder => $sortorder));
+  $page->param(logentries => $logentries);
+
 ##fixme:
 # - filtering
 # - show reverse zone column?
-# - pagination/limiting number of records - put newest-first so user
-#   doesn't always need to go to the last page for recent activity?
-  my $sth = $dbh->prepare($sql);
-  $sth->execute($id);
-  my @logbits;
-  while (my ($uid, $email, $name, $entry, $stamp) = $sth->fetchrow_array) {
-    my %row;
-    $row{userfname} = $name;
-    $row{userid} = $uid;
-    $row{useremail} = $email;
-    ($row{logentry} = $entry) =~ s/\n/<br>\n/g;
-    ($row{logtime}) = ($stamp =~ /^(.+)-\d\d$/);
-    push @logbits, \%row;
-  }
-  $page->param(logentries => \@logbits);
+# - on log record creation, bundle "parented" log actions (eg, "AXFR record blah for domain foo",
+#   or "Add record bar for new domain baz") into one entry (eg, "AXFR domain foo", "Add domain baz")?
+#   need a way to expand this into the complete list, and to exclude "child" entries
 
   # scope check fail target