Changeset 787 for trunk

Timestamp:

10/08/15 17:41:56 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix lurking error display/logging/notification bug. Update confirmation
or error reporting didn't get updated to match the processing, and was
reporting the allocation ID (which used to be the CIDR).

File:

• trunk/cgi-bin/main.cgi (modified) (1 diff)

trunk/cgi-bin/main.cgi

@@ -1132 +1132 @@
 
   if ($code eq 'FAIL') {
-    syslog "err", "$authuser could not update block/IP '$webvar{block}': '$msg'";
-    $page->param(err => "Could not update block/IP $webvar{block}: $msg");
+    syslog "err", "$authuser could not update block/IP '$binfo->{block}' (id $webvar{block}): '$msg'";
+    $page->param(err => "Could not update block/IP $binfo->{block}: $msg");
     return;
   }
 
   # If we get here, the operation succeeded.
-  syslog "notice", "$authuser updated $webvar{block}";
+  syslog "notice", "$authuser updated $binfo->{block}";
 ##fixme:  log details of the change?  old way is in the .debug stream anyway.
 ##fixme:  need to wedge something in to allow "update:field" notifications
 ## hmm.  how to tell what changed?  O_o
-mailNotify($ip_dbh, 's:swi', "SWIPed: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
-        "$webvar{block} had SWIP status changed to \"Yes\" by $authuser") if $webvar{swip} eq 'on';
+mailNotify($ip_dbh, 's:swi', "SWIPed: $disp_alloctypes{$webvar{alloctype}} $binfo->{block}",
+        "$binfo->{block} had SWIP status changed to \"Yes\" by $authuser") if $webvar{swip} eq 'on';
 
 ## node hack