Changeset 59 for trunk

Timestamp:

01/14/10 17:54:44 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Unkinked a few bugs in logging (creation and display)
Unkinked a few bugs in code that never got tested after it was modified

(add record) - need to test other bits

Fleshed out log display stub
Noted Net::DNS dep in INSTALL
Light display tweaks in log template, userlist template+CSS

Location:

trunk

Files:

• INSTALL (modified) (1 diff)
• dns.cgi (modified) (10 diffs)
• templates/dns.css (modified) (1 diff)
• templates/log.tmpl (modified) (1 diff)
• templates/useradmin.tmpl (modified) (1 diff)

trunk/INSTALL

@@ -6 +6 @@
  Net::Whois::Raw
  Text::Wrap (core) - for WHOIS response linewrapping
-
+ Net::DNS

trunk/dns.cgi

@@ -251 +251 @@
 } elsif ($webvar{page} eq 'record') {
 
+$debugenv = 1;
+
   if ($webvar{recact} eq 'new') {
 
     $page->param(todo => "Add record to");
     $page->param(recact => "add");
-    fill_rectypes();
+    $page->param(parentid => $webvar{parentid});
+    $page->param(defrec => $webvar{defrec});
+
+    fill_recdata();
 
   } elsif ($webvar{recact} eq 'add') {
@@ -267 +272 @@
       }
     }
+
     my ($code,$msg) = addRec(@recargs);
 
     if ($code eq 'OK') {
-##fixme:  need more magic to get proper group - if domain was fiddled
-# from search-subgroups listing, may not be "current" group
-
-# SELECT group_id FROM domains WHERE domain_id=?;
-# sth->execute($webvar{parentid});
-##log
       if ($webvar{defrec} eq 'y') {
         logaction(0, $session->param("username"), $webvar{parentid},
@@ -285 +285 @@
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
     } else {
-
       $page->param(failed       => 1);
       $page->param(errmsg       => $msg);
@@ -295 +294 @@
       $page->param(id           => $webvar{id});
       fill_recdata();   # populate the form... er, mostly.
+      if ($webvar{defrec} eq 'y') {
+        logaction(0, $session->param("username"), $webvar{parentid},
+                "Failed adding default record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
+      } else {
+        logaction($webvar{parentid}, $session->param("username"), parentID($webvar{parentid}, 'dom', 'group'),
+                "Failed adding record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
+      }
     }
 
@@ -348 +354 @@
       $page->param(id           => $webvar{id});
       fill_recdata();
+      if ($webvar{defrec} eq 'y') {
+        logaction(0, $session->param("username"), $webvar{parentid},
+                "Failed updating default record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
+      } else {
+        logaction($webvar{parentid}, $session->param("username"), parentID($webvar{parentid}, 'dom', 'group'),
+                "Failed updating record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
+      }
     }
   }
@@ -695 +708 @@
 ##fixme put in some real log-munching stuff
 ##fixme need to add bits to *create* log entries...
-  my $sth = $dbh->prepare("SELECT * FROM log");
-  $sth->execute;
+  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') {
+    $sql .= "domain_id=?";
+    $id = $webvar{id};
+  } else {
+    # Default to listing curgroup log
+    $sql .= "group_id=?";
+  }
+  my $sth = $dbh->prepare($sql);
+  $sth->execute($id);
   my @logbits;
-  while (my @data = $sth->fetchrow_array) {
+  while (my ($uid, $email, $name, $entry, $stamp) = $sth->fetchrow_array) {
     my %row;
 # (1,1,1,'test@test','Test','frobbed the whatsit',now());
-    $row{userfname} = $data[4];
-    $row{userid} = $data[1];
-    $row{useremail} = $data[3];
-    $row{logentry} = $data[5];
-    $row{logtime} = $data[6];
+    $row{userfname} = $name;
+    $row{userid} = $uid;
+    $row{useremail} = $email;
+    $row{logentry} = $entry;
+    ($row{logtime}) = ($stamp =~ /^(.+)-\d\d$/);
     push @logbits, \%row;
   }
@@ -1263 +1285 @@
 
 sub logaction {
-  my ($domid,$username,$groupid,$entry) = shift;
-
-  my $sth = dbh->prepare("SELECT user_id, firstname || ' ' || lastname FROM users WHERE username=?");
+  my $domid = shift;
+  my $username = shift;
+  my $groupid = shift;
+  my $entry = shift;
+
+##fixme: ooohhh, nasty.  what if we get a failure *here*?    PTHBTT!
+  my $sth = $dbh->prepare("SELECT user_id, firstname || ' ' || lastname FROM users WHERE username=?");
   $sth->execute($username);
   my ($user_id, $fullname) = $sth->fetchrow_array;
@@ -1272 +1298 @@
         "VALUES (?,?,?,?,?,?)");
   $sth->execute($domid,$user_id,$groupid,$username,$fullname,$entry);
-
 } # end logaction()
 
-#sub parentID($dbh, $id, $idtype, $partype[, $defrec])
+##fixme:  generalize to return appropriate id on all cases (ie, use $partype)
 sub parentID {
   my $id = shift;
@@ -1285 +1310 @@
 
   if ($idtype eq 'dom') {
-    return $id if $defrec eq 'y';
+    return $id if $defrec eq 'y';  # "domain" + default records, we're really looking at a group.
     $sql = "SELECT group_id FROM domains WHERE domain_id=?";
   } elsif ($idtype eq 'rec') {
-    if ($defrec && $defrec eq 'y') {
+    if ($defrec eq 'y') {
+      $sql = "SELECT group_id FROM default_records WHERE record_id=?";
     } else {
       return
@@ -1302 +1328 @@
     return "FOO", "BAR";  # can't get here.... we think.
   }
-}
+  my $sth = $dbh->prepare($sql);
+  $sth->execute($id);
+  my ($retid) = $sth->fetchrow_array;
+  return $retid if $retid;
+  # ahh! fall of the edge of the world if things went sideways
+  ##fixme:  really need to do a little more error handling, I think
+} # end parentID()

trunk/templates/dns.css

@@ -80 +80 @@
         border-bottom: 1px solid #666666;
         width: 1%;
+        white-space: nowrap;
+}
+td.data_nowrap {
         white-space: nowrap;
 }

trunk/templates/log.tmpl

@@ -8 +8 @@
 
 <table border="0" width="70%">
-<tr><th colspan="5" align="center">Log entries for domain</th></tr>
+<tr><th colspan="5" align="center">Log entries for <TMPL_VAR NAME=logfor></th></tr>
   <tr class="darkrowheader">
       <td>Name</td>

trunk/templates/useradmin.tmpl

@@ -32 +32 @@
 <tr class="row<TMPL_VAR name=bg>">
         <td align="left"><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&amp;page=useradmin&amp;action=chuser&amp;user=<TMPL_VAR NAME=userid>"><TMPL_VAR NAME=username></a></td>
-        <td><TMPL_VAR name=userfull></td>
+        <td class="data_nowrap"><TMPL_VAR name=userfull></td>
         <td><TMPL_VAR name=usertype></td>
         <td><TMPL_VAR name=usergroup></td>