Changeset 61 for trunk

Timestamp:

01/15/10 17:48:50 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

checkpoint, debugging logging/process on deleting domain

Location:

trunk

Files:

• DNSDB.pm (modified) (1 diff)
• dns.cgi (modified) (7 diffs)

trunk/DNSDB.pm

@@ -243 +243 @@
   my $domid = shift;
 
+return "FAIL", "whee!";
   # Allow transactions, and raise an exception on errors so we can catch it later.
   # Use local to make sure these get "reset" properly on exiting this block

trunk/dns.cgi

@@ -25 +25 @@
 
 my @debugbits;  # temp, to be spit out near the end of processing
-my $debugenv = 0;
+my $debugenv = 1;
 
 # Let's do these templates right...
@@ -77 +77 @@
 my $searchsubs = $session->param($webvar{page}.'searchsubs');
 
-push @debugbits, "foo<br>\n" if defined($webvar{searchsubs});
-
 # nrgh, can't handle login here because we don't have a database handle to check the user/pass with yet
 
@@ -205 +203 @@
   } elsif ($webvar{del} eq 'ok') {
     my $pargroup = parentID($webvar{id}, 'dom', 'group');
+    my $dom = domainName($dbh, $webvar{id});
     my ($code,$msg) = delDomain($dbh, $webvar{id});
     if ($code ne 'OK') {
@@ -210 +209 @@
       $page->param(del_failed => 1);
       $page->param(errmsg => $msg);
+      logaction($webvar{id}, $session->param("username"), $pargroup, "Failed to delete domain $dom");
       listdomains($curgroup);
+##work
     } else {
-##fixme: need domain to put in log message
-     logaction($webvar{id}, $session->param("username"), $pargroup, "Deleted domain $webvar{domain}");
-     changepage(page => "domlist");
+      logaction($webvar{id}, $session->param("username"), $pargroup, "Deleted domain $dom");
+      changepage(page => "domlist");
     }
   } else {
@@ -251 +251 @@
 
 } elsif ($webvar{page} eq 'record') {
-
-$debugenv = 1;
 
   if ($webvar{recact} eq 'new') {
@@ -712 +710 @@
   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') {
+  if ($webvar{ltype} && $webvar{ltype} eq 'user') {
     $sql .= "user_id=?";
     $id = $webvar{id};
@@ -1013 +1011 @@
 ##fixme:  $logingroup or $curgroup?
   my @childgroups;
-  #getChildren($dbh, $curgroup, \@childgroups, 'all') if $searchsubs;
+  getChildren($dbh, $curgroup, \@childgroups, 'all') if $searchsubs;
   my $childlist = join(',',@childgroups);