Changeset 416 for trunk/cgi-bin/IPDB.pm

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/IPDB.pm (modified) (3 diffs)

trunk/cgi-bin/IPDB.pm

@@ -20 +20 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
-$VERSION        = 2.0;
+$VERSION        = 2.6;
 @ISA            = qw(Exporter);
 @EXPORT_OK    = qw(
@@ -52 +52 @@
 our %bigfree;
 our %IPDBacl;
+
+our $orgname = 'Example Corp';
+our $smtphost = 'smtp.example.com';
+our $domain = 'example.com';
 
 # Let's initialize the globals.
@@ -806 +810 @@
 ## IPDB::mailNotify()
 # Sends notification mail to recipients regarding an IPDB operation
-sub mailNotify ($$$) {
-  my ($recip,$subj,$message) = @_;
-  my $mailer = Net::SMTP->new("smtp.example.com", Hello => "ipdb.example.com");
-
-  $mailer->mail('ipdb@example.com');
-  $mailer->to($recip);
-  $mailer->data("From: \"IP Database\" <ipdb\@example.com>\n",
+sub mailNotify {
+  my $dbh = shift;
+  my ($action,$subj,$message) = @_;
+
+# split action into parts for fiddlement.  nb: there are almost certainly better ways to do this.
+  my @actionbits = ($action =~ /^(.)(.)(.)$/);
+
+  # want to notify anyone who has specifically requested notify on *this* type ($action as passed),
+  # on "all static IP types" or "all pool types" (and other last-char-in-type groupings), on eg "all DSL types",
+  # and "all events with this action"
+  my @actionsets = ($action);
+##fixme: ick, eww.  really gotta find a better way to handle this...
+  push @actionsets, ($actionbits[0].'.'.$actionbits[2],
+        $actionbits[0].$actionbits[1].'.', $actionbits[0].'a') if $action =~ /^.{3}$/;
+
+  my $mailer = Net::SMTP->new($smtphost, Hello => "ipdb.$domain");
+
+  # get recip list from db
+  my $sth = $dbh->prepare("SELECT reciplist FROM notify WHERE action=?");
+
+  my @reciplist;
+  foreach (@actionsets) {
+    $sth->execute($action);
+##fixme - need to handle db errors
+    my ($recipsub) = $sth->fetchrow_array;
+    next if !$recipsub;
+    foreach (split(/,/, $recipsub)) {
+      push @reciplist, $_ if !grep {/^$_$/} @reciplist;
+    }
+  }
+
+  foreach my $recip (@reciplist) {
+    $mailer->mail("ipdb\@$domain");
+    $mailer->to($recip);
+    $mailer->data("From: \"IP Database\" <ipdb\@$domain>\n",
         "To: $recip\n",
         "Date: ".strftime("%a, %d %b %Y %H:%M:%S %z",localtime)."\n",
         "Subject: {IPDB} $subj\n",
         "X-Mailer: IPDB Notify v".sprintf("%.1d",$IPDB::VERSION)."\n",
-        "Organization: Example Corp\n",
+        "Organization: $orgname\n",
         "\n$message\n");
+  }
   $mailer->quit;
 }