Changeset 591 for trunk/cgi-bin/main.cgi

Timestamp:

01/25/13 16:16:04 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

File off rough edges doing DNS updates for deleting allocations. See #1.

• pass back and handle more subtle variations on WARN
• add a watch comment noting some bizarre behaviour that could not be duplicated later.
• more fully handle large allocations spanning multiple reverse zones (eg, /23 dynamic DSL spans 2 /24 reverse zones)
• retrieve the DNS pattern from the parent in case of zone-spanning block deletes; the records in the zone can't be relied on to rebuild an "unused"-ish record in this case.

Should use dnsadmin:trunk/@r460 or higher for proper behaviour.

File:

• trunk/cgi-bin/main.cgi (modified) (2 diffs)

trunk/cgi-bin/main.cgi

@@ -895 +895 @@
   $page->param(delparent => $blockinfo->{parent}) if $webvar{rdepth};
   $page->param(prdepth => $webvar{rdepth});
-  if ($code =~ /^WARN/) {
+  if ($code =~ /^WARN(POOL|MERGE)/) {
     my ($bp,$bd) = split /,/, $msg;
     $page->param(bparent => $bp);
@@ -901 +901 @@
     $page->param(mergeip => $code eq 'WARNPOOL');
   }
-
+  if ($code eq 'WARN') {
+    $msg =~ s/\n/<br>\n/g;
+    $page->param(genwarn => $msg);
+  }
   if ($code eq 'OK' || $code =~ /^WARN/) {
     syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block} ".