Changeset 248

Timestamp:

02/28/12 17:11:56 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Quick pass over log linking and display for reverse zones. See #26.
Also add a ##fixme in logaction() for pagination, filtering, and
other log data massaging.

Fix a couple of typos introduced by hand-applying unrelated fixes
in a separate working copy

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns.cgi (modified) (5 diffs)
• templates/reclist.tmpl (modified) (1 diff)

trunk/DNSDB.pm

@@ -1827 +1827 @@
   my $dbh = shift;
   my $defrec = shift;
-  my $reverc = shift;
+  my $revrec = shift;
 
   my %soa = @_;
 
 ##fixme: data validation: make sure {recid} is really the SOA for {parent}
-  my $sql = "UPDATE "_rectable($defrec, $revrec)." SET host=?, val=?, ttl=? WHERE record_id=? AND type=6";
-  $sth = $dbh->prepare($sql);
-  $sth->execute("$soa{contact}:$soa{prins}", "$soa{refresh}:$soa{retry}:$soa{expire}:$soa{minttl}",
-        $soa{ttl}, $soa{recid});
+  my $sql = "UPDATE "._rectable($defrec, $revrec)." SET host=?, val=?, ttl=? WHERE record_id=? AND type=6";
+  $dbh->do($sql, undef, ("$soa{contact}:$soa{prins}", "$soa{refresh}:$soa{retry}:$soa{expire}:$soa{minttl}",
+        $soa{ttl}, $soa{recid}));
 
 } # end updateSOA()

trunk/dns.cgi

@@ -493 +493 @@
     $page->param(defrec => $webvar{defrec});
     showzone($webvar{defrec}, $webvar{revrec}, $webvar{id});
-    if ($webvar{defrec} eq 'y') {
-    } else {
+    if ($webvar{defrec} eq 'n') {
 #      showzone('n',$webvar{id});
 ##fixme:  permission for viewing logs?
 ##fixme:  determine which slice of the log we view (group, domain, revzone)
-      $page->param(logdom => 1);
+      if ($webvar{revrec} eq 'n') {
+        $page->param(logdom => 1);
+      } else {
+        $page->param(logrdns => 1);
+      }
     }
 
@@ -523 +526 @@
   # security check - does the user have permission to access this entity?
   if (!check_scope(id => $webvar{id}, type =>
-        ($webvar{defrec} eq 'y' ? ($webvar{revrec eq 'y' ? 'defrevrec' : 'defrec') : 'record'))) {
+        ($webvar{defrec} eq 'y' ? ($webvar{revrec} eq 'y' ? 'defrevrec' : 'defrec') : 'record'))) {
     $page->param(perm_err => "You are not permitted to edit the requested record");
     goto DONEREC;
@@ -761 +764 @@
   # id is domain/revzone/group id
   if (!check_scope(id => $webvar{id}, type =>
-        ($webvar{defrec} eq 'y' ? 'group' : ($webvar{revrec} eq 'y' ? 'revzone' : 'domain'))) {
+        ($webvar{defrec} eq 'y' ? 'group' : ($webvar{revrec} eq 'y' ? 'revzone' : 'domain')))) {
     changepage(page => 'domlist', errmsg => "You do not have permission to edit the ".
         ($webvar{defrec} eq 'y' ? 'default ' : '')."SOA record for the requested ".
@@ -1597 +1600 @@
     }
     $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')) {
+      $page->param(errmsg => "You are not permitted to view log entries for the requested reverse zone");
+      goto DONELOG;
+    }
+    $page->param(logfor => 'reverse zone '.revName($dbh,$id));
   } else {
     # Default to listing curgroup log
@@ -1604 +1615 @@
     # group log is always for the "current" group
   }
+##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);

trunk/templates/reclist.tmpl

@@ -50 +50 @@
         <td colspan="4">Records</td>
 <TMPL_IF record_create> <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=record&amp;parentid=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>&amp;revrec=<TMPL_VAR NAME=revrec>&amp;recact=new">Add record</a></td></TMPL_IF>
-        <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=log&amp;id=<TMPL_VAR NAME=id><TMPL_IF logdom>&amp;ltype=dom</TMPL_IF>">View log</a></td>
+        <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=log&amp;id=<TMPL_VAR NAME=id><TMPL_IF logdom>&amp;ltype=dom</TMPL_IF><TMPL_IF logrdns>&amp;ltype=rdns</TMPL_IF>">View log</a></td>
 </tr>