Changeset 891 for trunk

Timestamp:

10/31/16 15:45:27 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Update FastCGI setup/call
Add nomail argument to add and update methods

File:

• trunk/cgi-bin/ipdb-rpc.cgi (modified) (3 diffs)

trunk/cgi-bin/ipdb-rpc.cgi

@@ -96 +96 @@
 my $reqcnt = 0;
 
+my $req = FCGI::Request();
+
 # main FCGI loop.
-while (FCGI::accept >= 0) {
+while ($req->Accept() >= 0) {
   # done here to a) prevent $ENV{'REMOTE_ADDR'} from being empty and b) to collect
   # the right user for the individual call (since we may be running with FCGI)
@@ -261 +263 @@
       mailNotify($ip_dbh, "a$args{type}", "ADDED: $disp_alloctypes{$args{type}} allocation",
         "$disp_alloctypes{$args{type}} $msg allocated to customer $args{custid}\n".
-        "Description: $args{desc}\n\nAllocated by: $args{rpcsystem}/$args{rpcuser}\n");
+        "Description: $args{desc}\n\nAllocated by: $args{rpcsystem}/$args{rpcuser}\n")
+        unless $args{nomail};
     } else {
       my $netblock = new NetAddr::IP $args{block};
       mailNotify($ip_dbh, "a$args{type}", "ADDED: $disp_alloctypes{$args{type}} allocation",
         "$disp_alloctypes{$args{type}} $args{block} allocated to customer $args{custid}\n".
-        "Description: $args{desc}\n\nAllocated by: $args{rpcsystem}/$args{rpcuser}\n");
+        "Description: $args{desc}\n\nAllocated by: $args{rpcsystem}/$args{rpcuser}\n")
+        unless $args{nomail};
     }
     syslog "notice", "$args{rpcsystem}/$args{rpcuser} allocated '$args{block}' to '$args{custid}' as ".
@@ -343 +347 @@
         "$disp_alloctypes{$blockinfo->{type}} $blockinfo->{block} deallocated by $authuser\n".
         "CustID: $blockinfo->{custid}\nCity: $blockinfo->{city}\n".
-        "Description: $blockinfo->{description}\n");
+        "Description: $blockinfo->{description}\n")
+        unless $args{nomail};
   } else {
     if ($args{type} =~ /^.i$/) {