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

Timestamp:

05/18/10 18:08:12 (14 years ago)

Author:

Kris Deugau

Message:

/trunk

Update mailNotify to use new table notify to decide who to spam
with notices on various events. See #2.

• existing notification calls updated. Still need to move calls into IPDB.pm's subs
• IPDB.pm and MyIPDB.pm updated with new semiglobal vars for org name, SMTP host, domain. Will add others as needed so MyIPDB.pm can be moved to /etc/ipdb/ (see #17).

Internal allocation types will need to be rearranged somewhat to
make full use of the flexibility possible. See #20.

File:

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

trunk/cgi-bin/main.cgi

@@ -890 +890 @@
                 qq(&ipdb=1&ip=$msg">Add this IP to RADIUS user table</a></div>)
         : "</div>");
-      # Notify tech@example.com
-#      mailNotify('tech@example.com',"ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
-#       "$disp_alloctypes{$webvar{alloctype}} $msg allocated to customer $webvar{custid}\n".
-#       "Description: $webvar{desc}\n\nAllocated by: $authuser\n");
+      mailNotify($ip_dbh, "a$webvar{alloctype}", "ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
+        "$disp_alloctypes{$webvar{alloctype}} $msg allocated to customer $webvar{custid}\n".
+        "Description: $webvar{desc}\n\nAllocated by: $authuser\n");
     } else {
       my $netblock = new NetAddr::IP $webvar{fullcidr};
@@ -905 +904 @@
                 qq(">Add this netblock to RADIUS user table</a></div>)
         : "</div>");
-#      mailNotify('nocmgr@example.com',"ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
-#       "$disp_alloctypes{$webvar{alloctype}} $webvar{fullcidr} allocated to customer $webvar{custid}\n".
-#       "Description: $webvar{desc}\n\nAllocated by: $authuser\n");
+      mailNotify($ip_dbh, "a$webvar{alloctype}", "ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
+        "$disp_alloctypes{$webvar{alloctype}} $webvar{fullcidr} allocated to customer $webvar{custid}\n".
+        "Description: $webvar{desc}\n\nAllocated by: $authuser\n");
     }
     syslog "notice", "$authuser allocated '$webvar{fullcidr}' to '$webvar{custid}' as ".
@@ -1224 +1223 @@
   # If we get here, the operation succeeded.
   syslog "notice", "$authuser updated $webvar{block}";
-#mailNotify('nocmgr@example.com',"SWIPed: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
-#       "$webvar{block} had SWIP status changed to \"Yes\" by $authuser");
+##fixme:  need to wedge something in to allow "update:field" notifications
+## hmm.  how to tell what changed?  O_o
+mailNotify($ip_dbh, 'ua', "SWIPed: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
+        "$webvar{block} had SWIP status changed to \"Yes\" by $authuser") if $webvar{swip} eq 'on';
   open (HTML, "../updated.html")
         or croak "Could not open updated.html :$!";
@@ -1401 +1402 @@
     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".
-#       "CustID: $custid\nCity: $city\nDescription: $description\n");
-#    mailNotify('nocmgr@example.com',"REMOVED: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
-#       "$disp_alloctypes{$webvar{alloctype}} $webvar{block} deallocated by $authuser\n".
-#       "CustID: $custid\nCity: $city\nDescription: $description\n");
+    mailNotify($ip_dbh, 'da', "REMOVED: $disp_alloctypes{$webvar{alloctype}} $webvar{block}",
+        "$disp_alloctypes{$webvar{alloctype}} $webvar{block} deallocated by $authuser\n".
+        "CustID: $custid\nCity: $city\nDescription: $description\n");
   } else {
     if ($webvar{alloctype} =~ /^.i$/) {