Changeset 60 for trunk

Timestamp:

01/15/10 14:52:28 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Littleish cosmetic tweaks to log display
Tweaks to calls into log display page so that it shows the right data
Stub in section to show log for a user (not sure how useful this will

be...) - NB, this is not linked from anywhere and not present at all
in Vega's implementation

Location:

trunk

Files:

• dns.cgi (modified) (4 diffs)
• templates/log.tmpl (modified) (1 diff)
• templates/reclist.tmpl (modified) (1 diff)

trunk/dns.cgi

@@ -247 +247 @@
   } else {
     showdomain('n',$webvar{id});
+    $page->param(logdom => 1);
   }
 
@@ -709 +710 @@
 ##fixme need to add bits to *create* log entries...
   my $sql = "SELECT user_id, email, name, entry, date_trunc('second',stamp) FROM log WHERE ";
-  my $id = $curgroup;
-  if ($webvar{ltype} && $webvar{ltype} eq 'dom') {
+  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 ($werbvar{ltype} && $webvar{ltype} eq 'user') {
+    $sql .= "user_id=?";
+    $id = $webvar{id};
+    $page->param(logfor => 'user '.userFullName($dbh,$id));
+  } elsif ($webvar{ltype} && $webvar{ltype} eq 'dom') {
     $sql .= "domain_id=?";
     $id = $webvar{id};
+    $page->param(logfor => 'domain '.domainName($dbh,$id));
   } else {
     # Default to listing curgroup log
     $sql .= "group_id=?";
+    $page->param(logfor => 'group '.groupName($dbh,$id));
   }
   my $sth = $dbh->prepare($sql);
@@ -722 +730 @@
   while (my ($uid, $email, $name, $entry, $stamp) = $sth->fetchrow_array) {
     my %row;
-# (1,1,1,'test@test','Test','frobbed the whatsit',now());
     $row{userfname} = $name;
     $row{userid} = $uid;
@@ -732 +739 @@
   $page->param(logentries => \@logbits);
 
-}
+} # end $webvar{page} dance
 
 

trunk/templates/log.tmpl

@@ -7 +7 @@
 <div id="datatablewrapper">
 
-<table border="0" width="70%">
+<table border="0" width="90%">
 <tr><th colspan="5" align="center">Log entries for <TMPL_VAR NAME=logfor></th></tr>
   <tr class="darkrowheader">

trunk/templates/reclist.tmpl

@@ -38 +38 @@
         <td colspan="4">Records</td>
         <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;recact=new">Add record</a></td>
-        <td align="right"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=showlog&amp;id=<TMPL_VAR NAME=id>&amp;defrec=<TMPL_VAR NAME=defrec>">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>">View log</a></td>
 </tr>