Changeset 198

Timestamp:

12/13/11 14:52:13 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Finish Vega-equivalent mail notifications (domain creation)

Location:

trunk

Files:

• DNSDB.pm (modified) (3 diffs)
• dns.cgi (modified) (1 diff)

trunk/DNSDB.pm

@@ -17 +17 @@
 use Net::DNS;
 use Crypt::PasswdMD5;
-#use Net::SMTP;
+use Net::SMTP;
 use NetAddr::IP;
-#use POSIX;
+use POSIX;
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
@@ -216 +216 @@
       # Mail settings
       $config{mailhost}         = $1 if /^mailhost\s*=\s*([a-z0-9_.-]+)/i;
-      $config{mailnotify}       = $1 if /^mailnotify\s*=\s*([a-z0-9_.@-]+)/i;
-      $config{mailsender}       = $1 if /^mailsender\s*=\s*([a-z0-9_.@-]+)/i;
+      $config{mailnotify}       = $1 if /^mailnotify\s*=\s*([a-z0-9_.\@-]+)/i;
+      $config{mailsender}       = $1 if /^mailsender\s*=\s*([a-z0-9_.\@-]+)/i;
       $config{mailname}         = $1 if /^mailname\s*=\s*([a-z0-9\s_.-]+)/i;
       $config{orgname}          = $1 if /^orgname\s*=\s*([a-z0-9\s_.,'-]+)/i;
@@ -2062 +2062 @@
   $mailer->mail($mailsender);
   $mailer->to($config{mailnotify});
-  $mailer->data("From: \"$config{mailname}\" <$mailsender\n",
-        "To: $config{mailnotify}\n",
+  $mailer->data("From: \"$config{mailname}\" <$mailsender>\n",
+        "To: <$config{mailnotify}>\n",
         "Date: ".strftime("%a, %d %b %Y %H:%M:%S %z",localtime)."\n",
         "Subject: $subj\n",

trunk/dns.cgi

@@ -347 +347 @@
 
   if ($code eq 'OK') {
-#    logaction($msg, $session->param("username"), $webvar{group}, "Added domain $webvar{domain}");
+    mailNotify($dbh, "New ".($webvar{makeactive} eq 'on' ? 'Active' : 'Inactive')." Domain Created",
+        ($webvar{makeactive} eq 'on' ? 'Active' : 'Inactive').qq( domain "$webvar{domain}" added by ).
+        $session->param("username"));
     changepage(page => "reclist", id => $msg);
   } else {