Changeset 13 for trunk

Timestamp:

09/11/09 17:59:51 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint
Merging record add/edit pieces into one template/code block
Added debugging array @debugbits to push strings into rather than printing,

since we haven't spit out headers before the processing (this is so we can
redirect)

Added DNSDB::grpName
Removed obsolete defrecs.tmpl

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns.cgi (modified) (10 diffs)
• templates/defrecs.tmpl (deleted)
• templates/menu.tmpl (modified) (1 diff)
• templates/reclist.tmpl (modified) (2 diffs)

trunk/DNSDB.pm

@@ -23 +23 @@
 @ISA            = qw(Exporter);
 @EXPORT_OK      = qw(
-        &initGlobals &connectDB &finish &addDomain &delDomain &domainName &getSOA &getRecLine &getDomRecs
-        &addRec &delRec &domStatus
+        &initGlobals &connectDB &finish &addDomain &delDomain &domainName &grpName &getSOA &getRecLine
+        &getDomRecs &addRec &delRec &domStatus
         %typemap %reverse_typemap
         );
@@ -30 +30 @@
 @EXPORT         = (); # Export nothing by default.
 %EXPORT_TAGS    = ( ALL => [qw(
-                &initGlobals &connectDB &finish &addDomain &delDomain &domainName &getSOA &getRecLine &getDomRecs
-                &addRec &delRec &domStatus
+                &initGlobals &connectDB &finish &addDomain &delDomain &domainName &grpName &getSOA &getRecLine
+                &getDomRecs &addRec &delRec &domStatus
                 %typemap %reverse_typemap
                 )]
@@ -254 +254 @@
 
 
+## DNSDB::grpName()
+# Return the domain name based on a domain ID
+# Takes a database handle and the domain ID
+# Returns the domain name or undef on failure
+sub grpName {
+  $errstr = '';
+  my $dbh = shift;
+  my $grpid = shift;
+  my $sth = $dbh->prepare("select name from groups where group_id=?");
+  $sth->execute($grpid);
+  my ($grpname) = $sth->fetchrow_array();
+  $errstr = $DBI::errstr if !$grpname;
+  return $grpname if $grpname;
+} # end domainName
+
+
 ## DNSDB::editRecord()
 # Change an existing record

trunk/dns.cgi

@@ -22 +22 @@
 use DNSDB qw(:ALL);
 
+my @debugbits;  # temp, to be spit out near the end of processing
+
 # Let's do these templates right...
 my $templatedir = "templates";
@@ -34 +36 @@
 my %webvar = $q->Vars;
 
+# persistent stuff needed on most/all pages
 my $sid = ($webvar{sid} ? $webvar{sid} : undef);
 my $session = new CGI::Session("driver:File", $sid, {Directory => $sessiondir});
@@ -46 +49 @@
 }
 
+my $group = ($webvar{grp} ? $webvar{grp} : 1);
 # handle login redirect
 if ($webvar{action} && $webvar{action} eq 'login') {
@@ -170 +174 @@
   }
 
+} elsif ($webvar{page} eq 'record') {
+  if ($webvar{recact} eq 'new') {
+    $page->param(recact => "Add record to");
+    stdrecs();
+  } elsif ($webvar{recact} eq 'edit') {
+    $page->param(recact => "Edit record in");
+    my $sth = $dbh->prepare("SELECT host,type,val,distance,weight,port,ttl FROM ".
+        ($webvar{defrec} eq 'y' ? 'default_' : '')."records WHERE record_id=?");
+    $sth->execute($webvar{id});
+    my ($host,$type,$val,$distance,$weight,$port,$ttl) = $sth->fetchrow_array;
+    $page->param(name           => $host);
+    $page->param(address        => $val);
+    $page->param(distance       => $distance);
+    $page->param(weight         => $weight);
+    $page->param(port           => $port);
+    $page->param(ttl            => $ttl);
+    stdrecs($type);
+  }
+  if ($webvar{defrec} eq 'y') {
+    $page->param(domain => "group ".grpName($dbh,$webvar{parentid}));
+  } else {
+    $page->param(domain => domainName($dbh,$webvar{parentid}));
+  }
+
 } elsif ($webvar{page} eq 'newrec') {
-  print "whee!\n";
+  push @debugbits, "whee!\n";
 
   # populate most fields as needed.  (eg, type list.)
-  newrec();
+  stdrecs();
 
 } elsif ($webvar{page} eq 'addrec') {
@@ -186 +214 @@
     }
   }
-  push @recargs, 
+# wtf?
+#  push @recargs, 
   my ($code,$msg) = addRec(@recargs);
 
@@ -195 +224 @@
     $page->param(add_failed => 1);
     $page->param(errmsg => $msg);
-    newrec();   # populate the form... er, mostly.
+    stdrecs($webvar{type});     # populate the form... er, mostly.
     $page->param(name => $webvar{name});
     $page->param(address => $webvar{address});
@@ -291 +320 @@
 print "Content-type: text/html\n\n", $header->output;
 
+foreach (@debugbits) { print; }
+
+$page->param(grp => $group);
+
 # spit it out
 print $page->output;
@@ -387 +420 @@
     $rec->{type} = $typemap{$rec->{type}};
     $rec->{row} = $row % 2;
-    # Feh.
     $rec->{defrec} = $webvar{defrec};
-    # And **FEH!!**
     $rec->{sid} = $webvar{sid};
+    $rec->{id} = $id;
     $row++;
   }
@@ -396 +428 @@
 }
 
-sub newrec {
+sub stdrecs {
+  my $type = shift || $reverse_typemap{A};
+
   my $sth = $dbh->prepare("select val,name from rectypes where stdflag=1 order by listorder");
   $sth->execute;
 
+push @debugbits, "DEBUG: type $type\n";
   my @typelist;
   while (my ($rval,$rname) = $sth->fetchrow_array()) {
     my %row = ( recval => $rval, recname => $rname );
-    $row{tselect} = 1 if $rval == $webvar{type};
+    $row{tselect} = 1 if $rval == $type;
     push @typelist, \%row;
   }
@@ -474 +509 @@
 
 ##fixme - group
-  $page->param(id => 1);
+  $page->param(grp => 1);
   my @domlist;
-  my $sth = $dbh->prepare("select domain_id,domain,status,groups.name from domains".
+  $sth = $dbh->prepare("select domain_id,domain,status,groups.name from domains".
         " inner join groups on domains.group_id=groups.group_id".
         " order by domain".($offset eq 'all' ? '' : " limit $perpage offset ".$offset*$perpage));

trunk/templates/menu.tmpl

@@ -4 +4 @@
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=useradmin">Users</a><br />
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=log">Log</a><br />
-<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=reclist&id=<TMPL_VAR NAME=id>&defrec=y">Default Records</a><br />
+<a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=reclist&id=<TMPL_VAR NAME=grp>&defrec=y">Default Records</a><br />
 <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=axfr">AXFR Import</a><br />
 <hr>

trunk/templates/reclist.tmpl

@@ -27 +27 @@
 <tr class="darkrowheader">
         <td colspan=2>Records</td>
-        <td align=right><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=newrec&parentid=<TMPL_VAR NAME=id>&defrec=<TMPL_VAR NAME=defrec>">Add record</a>
+        <td align=right><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=record&parentid=<TMPL_VAR NAME=id>&defrec=<TMPL_VAR NAME=defrec>&recact=new">Add record</a>
         <a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=showlog&id=<TMPL_VAR NAME=id>&defrec=<TMPL_VAR NAME=defrec>">View log</a>
         </td>
@@ -42 +42 @@
 <TMPL_LOOP NAME=reclist>
 <tr class="row<TMPL_VAR NAME=row>">
-<td width="20%" nowrap><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=editrec&id=<TMPL_VAR NAME=record_id>&defrec=<TMPL_VAR NAME=defrec>"><TMPL_VAR NAME=host></a></td>
+<td width="20%" nowrap><a href="dns.cgi?sid=<TMPL_VAR NAME=sid>&page=record&parentid=<TMPL_VAR NAME=id>&defrec=<TMPL_VAR NAME=defrec>&recact=edit&id=<TMPL_VAR NAME=record_id>"><TMPL_VAR NAME=host></a></td>
 <td width="5%" nowrap><TMPL_VAR NAME=type></td>
 <td nowrap><TMPL_VAR NAME=val></td>