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

Timestamp:

11/27/07 12:18:27 (17 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge bugfixes and enhancements from /branches/stable r351 through r359

File:

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

trunk/cgi-bin/main.cgi

@@ -1283 +1283 @@
   }
 
+  # need to retrieve block data before deleting so we can notify on that
+  my ($cidr,$custid,$type,$city,$description) = getBlockData($ip_dbh, $webvar{block});
+
   my ($code,$msg) = deleteBlock($ip_dbh, $webvar{block}, $webvar{alloctype});
 
   if ($code eq 'OK') {
     print "<div class=heading align=center>Success!  $webvar{block} deallocated.</div>\n";
-    syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block}";
+    syslog "notice", "$authuser deallocated '$webvar{alloctype}'-type netblock $webvar{block}".
+        " $custid, $city, desc='$description'";
     # Notify tech@ when a block/IP is deallocated
 #    mailNotify('tech@example.com',"REMOVED: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
-#       "$disp_alloctypes{$webvar{alloctype}} $webvar{block} deallocated by $authuser\n");
+#       "$disp_alloctypes{$webvar{alloctype}} $webvar{block} deallocated by $authuser\n".
+#       "CustID: $custid\nCity: $city\nDescription: $description\n");
   } else {
     if ($webvar{alloctype} =~ /^.i$/) {