Changeset 39 for trunk/dns.cgi

Timestamp:

12/01/09 17:21:41 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

XHTML strict, pass 2
fixed up a collection of things found to be broken (mostly relating to hardcoded group bits)
added a collection of notes-to-self to notes

File:

• trunk/dns.cgi (modified) (8 diffs)

trunk/dns.cgi

@@ -344 +344 @@
   $page->param(id => $webvar{id});
   $page->param(defrec => $webvar{defrec});
+  $page->param(parentid => $webvar{parentid});
   # first pass = confirm y/n (sorta)
   if (!defined($webvar{del})) {
@@ -351 +352 @@
     $page->param(ftype => $typemap{$rec{type}});
     $page->param(recval => $rec{val});
-  } else {
+  } elsif ($webvar{del} eq 'ok') {
     my ($code,$msg) = delRec($dbh,$webvar{defrec},$webvar{id});
     if ($code ne 'OK') {
@@ -357 +358 @@
       $page->param(del_failed => 1);
       $page->param(errmsg => $msg);
-    }
-##fixme:  group/parent instead of hardcoded 1
-    showdomain('y',1);
+      showdomain($webvar{defrec}, $webvar{parentid});
+    } else {
+      changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
+    }
+  } else {
+    changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
   }
 
 } elsif ($webvar{page} eq 'editsoa') {
 
-  fillsoa($webvar{defrec},$webvar{recid});
+  fillsoa($webvar{defrec},$webvar{id});
 
 } elsif ($webvar{page} eq 'updatesoa') {
-  print "ooooo!\n";
 
   my $sth;
@@ -373 +376 @@
   # no domain ID, so we're editing the default SOA for a group (we don't care which one here)
   # plus a bit of magic to update the appropriate table
-  $sql = "update ".($webvar{domainid} eq '' ? "default_records" : "records").
+  $sql = "update ".($webvar{defrec} eq 'y' ? "default_records" : "records").
         " set host='$webvar{prins}:$webvar{contact}',".
         " val='$webvar{refresh}:$webvar{retry}:$webvar{expire}:$webvar{minttl}',".
@@ -383 +386 @@
     $page->param(update_failed => 1);
     $page->param(msg => $DBI::errstr);
-    fillsoa($webvar{defrec},1);
-  } else {
+    fillsoa($webvar{defrec},$webvar{id});
+  } else {
+    changepage(page => "reclist", id => $webvar{id}, defrec => $webvar{defrec});
     $page->param(update_failed => 0);
 ##fixme!  need to set group ID properly here
-    showdomain('y',1);
+#    showdomain('y',1);
   }
 
@@ -657 +661 @@
   my $tmp_ruri = $ENV{REQUEST_URI};
   $tmp_ruri =~ s/\&([a-z])/\&amp\;$1/g;
+# le sigh.  and we need to strip any previous action
+  $tmp_ruri =~ s/\&action=[^&]+//g;
 #  $page->param(whereami => $ENV{REQUEST_URI});
   $page->param(whereami => $tmp_ruri);
@@ -733 +739 @@
   my $def = shift;
   my $id = shift;
-  my $domname;
-
-  if ($webvar{domain} == 0) {
-    $domname = "DOMAIN";
-  } else {
-    my $sth = $dbh->prepare("SELECT domain FROM domains WHERE domain_id=?");
-    $sth->execute($webvar{domain});
-    ($domname) = $sth->fetchrow_array();
-  }
-
-  $page->param(domain   => $domname);
-  $page->param(defrec   => !$webvar{domain});
-  $page->param(group    => $DNSDB::group);
+  my $domname = ($def eq 'y' ? '' : "DOMAIN");
+
+  $page->param(defrec   => $def);
+
+# i had a good reason to do this when I wrote it...
+#  $page->param(domain  => $domname);
+#  $page->param(group   => $DNSDB::group);
+  $page->param(isgrp => 1) if $def eq 'y';
+  $page->param(parent => ($def eq 'y' ? groupName($dbh, $DNSDB::group) : domainName($dbh, $id)) );
 
 # defaults
@@ -759 +761 @@
   my %soa = getSOA($dbh,$def,$id);
 
-  $page->param(domainid => $webvar{domain});
+  $page->param(id       => $id);
   $page->param(recid    => $soa{recid});
   $page->param(prins    => ($soa{prins} ? $soa{prins} : $DNSDB::def{prins}));