Changeset 15 for trunk

Timestamp:

09/15/09 08:51:42 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns.cgi (modified) (4 diffs)
• templates/record.tmpl (modified) (2 diffs)

trunk/DNSDB.pm

@@ -68 +68 @@
 sub connectDB {
   $errstr = '';
-  my ($dbname,$user,$pass) = @_;
+  my $dbname = shift;
+  my $user = shift;
+  my $pass = shift;
   my $dbh;
   my $DSN = "DBI:Pg:dbname=$dbname";
@@ -385 +387 @@
   }
   $sql .= " and not type=$reverse_typemap{SOA} order by $order";
+##fixme:  need to set nstart properly (offset is not internally multiplied with limit)
   $sql .= " limit $nrecs offset $nstart" if $nstart ne 'all';
 
@@ -440 +443 @@
   my $sql = "insert into ".($defrec eq 'y' ? 'default_' : '')."records ($fields) values ($vallist)";
 # something is bugging me about this...
-print "DEBUG: $sql<br>\n";
+#warn "DEBUG: $sql";
   my $sth = $dbh->prepare($sql);
   $sth->execute;

trunk/dns.cgi

@@ -61 +61 @@
 # default
 #my $perpage = 15;
-my $perpage = 4;
+my $perpage = 3;
 my $offset = ($webvar{offset} ? $webvar{offset} : 0);
 
@@ -78 +78 @@
 initGlobals($dbh);
 
-# Default page is a login page
-my $page;       # to be initialized as an HTML::Template entity sooner or later
+## Default page is a login page
+#my $page;      # to be initialized as an HTML::Template entity sooner or later
 
 
 
 # decide which page to spit out...
-if (!$webvar{page}) {
-  $page = HTML::Template->new(filename => "$templatedir/login.tmpl");
-} else {
-  $page = HTML::Template->new(filename => "$templatedir/$webvar{page}.tmpl");
-}
+$webvar{page} = 'login' if !$webvar{page};
+#if (!$webvar{page}) {
+#  $page = HTML::Template->new(filename => "$templatedir/login.tmpl");
+#} else {
+#}
+
+my $page = HTML::Template->new(filename => "$templatedir/$webvar{page}.tmpl");
 
 $page->param(sid => $sid);
@@ -176 +178 @@
 } elsif ($webvar{page} eq 'record') {
   if ($webvar{recact} eq 'new') {
-    $page->param(recact => "Add record to");
+    $page->param(todo => "Add record to");
+    $page->param(recact => "add");
     stdrecs();
+  } elsif ($webvar{recact} eq 'add') {
+
+    my @recargs = ($dbh,$webvar{defrec},$webvar{parentid},$webvar{name},$webvar{type},$webvar{address},$webvar{ttl});
+    if ($webvar{type} == $reverse_typemap{MX} or $webvar{type} == $reverse_typemap{SRV}) {
+      push @recargs, $webvar{distance};
+      if ($webvar{type} == $reverse_typemap{SRV}) {
+        push @recargs, $webvar{weight};
+        push @recargs, $webvar{port};
+      }
+    }
+  # wtf?
+  #  push @recargs, 
+    my ($code,$msg) = addRec(@recargs);
+
+    if ($code eq 'OK') {
+      changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
+#      showdomain($webvar{defrec},$webvar{parentid});
+  # NB: should **really** redirect here, in case of reload.  >_<  eyowch.
+    } else {
+      $page->param(add_failed => 1);
+      $page->param(errmsg => $msg);
+      stdrecs($webvar{type});   # populate the form... er, mostly.
+      $page->param(name => $webvar{name});
+      $page->param(address => $webvar{address});
+      $page->param(distance => $webvar{distance})
+        if ($webvar{type} == $reverse_typemap{MX} or $webvar{type} == $reverse_typemap{SRV});
+      $page->param(weight => $webvar{weight}) if $webvar{type} == $reverse_typemap{SRV};
+      $page->param(port => $webvar{port}) if $webvar{type} == $reverse_typemap{SRV};
+    }
+
+    $page->param(defrec => $webvar{defrec});
+
   } elsif ($webvar{recact} eq 'edit') {
-    $page->param(recact => "Edit record in");
+
+    $page->param(todo => "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=?");
@@ -322 +358 @@
 foreach (@debugbits) { print; }
 
-$page->param(grp => $group);
+$page->param(grp => $group) if $webvar{page} ne 'login';
 
 # spit it out

trunk/templates/record.tmpl

@@ -6 +6 @@
 
 <TMPL_IF edit_failed><span class="errmsg">Error <TMPL VAR NAME=recact> record: <TMPL_VARNAME=errmsg></span></TMPL_IF>
-<form action="dns.cgi">
+<form action="dns.cgi" method="POST">
 <input type="hidden" name="page" value="record">
 <input type="hidden" name="defrec" value="<TMPL_VAR NAME=defrec>">
 <input type="hidden" name="sid" value="<TMPL_VAR NAME=sid>">
 <input type="hidden" name="parentid" value="<TMPL_VAR NAME=parentid>">
-
+<input type="hidden" name="recact" value="<TMPL_VAR NAME=recact>">
         <table border=0 bgcolor="white">
 
@@ -17 +17 @@
 
         <table border=0 width="100%">
-        <tr class="tableheader"><td align="center" colspan=2><TMPL_VAR NAME=recact> <TMPL_VAR NAME=domain></td></tr>
+        <tr class="tableheader"><td align="center" colspan=2><TMPL_VAR NAME=todo> <TMPL_VAR NAME=domain></td></tr>
         <tr class="datalinelight">
                 <td>Hostname</td>