Changeset 592 for branches/stable/cgi-bin/IPDB.pm

Timestamp:

05/14/13 17:45:17 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge /trunk changes up to r516

Location:

branches/stable

Files:

• . (modified) (1 prop)
• cgi-bin/IPDB.pm (modified) (3 diffs)

branches/stable/cgi-bin/IPDB.pm

@@ -321 +321 @@
   my $alloc_from = new NetAddr::IP $_[2];
   my $sth;
+
+  $desc = '' if !$desc;
+  $notes = '' if !$notes;
+  $circid = '' if !$circid;
+  $privdata = '' if !$privdata;
 
   # Snag the "type" of the freeblock (alloc_from) "just in case"
@@ -591 +596 @@
     # have to insert all pool IPs into poolips table as "unallocated".
     $sth = $dbh->prepare("insert into poolips (pool,ip,custid,city,type)".
-        " values ('$pool', ?, '$defcustid', '$city', '$type')");
+        " values ('$pool', ?, '$defcustid', ?, '$type')");
     my @poolip_list = $pool->hostenum;
     if ($class eq 'all') { # (DSL-ish block - *all* IPs available
       if ($pool->addr !~ /\.0$/) {      # .0 causes weirdness.
-        $sth->execute($pool->addr);
+        $sth->execute($pool->addr, $city);
       }
       for (my $i=0; $i<=$#poolip_list; $i++) {
-        $sth->execute($poolip_list[$i]->addr);
+        $sth->execute($poolip_list[$i]->addr, $city);
       }
       $pool--;
       if ($pool->addr !~ /\.255$/) {    # .255 can cause weirdness.
-        $sth->execute($pool->addr);
+        $sth->execute($pool->addr, $city);
       }
     } else { # (real netblock)
       for (my $i=1; $i<=$#poolip_list; $i++) {
-        $sth->execute($poolip_list[$i]->addr);
+        $sth->execute($poolip_list[$i]->addr, $city);
       }
     }
   };
   if ($@) {
-    $msg = "'".$sth->errstr."'";
+    $msg = $@." '".$sth->errstr."'";
     eval { $dbh->rollback; };
     return ('FAIL',$msg);
@@ -847 +852 @@
   my ($action,$subj,$message) = @_;
 
-  return if $domain eq 'example.com';   # no point being obnoxious if we're still stuck with defaults.
+  return if $smtphost eq 'smtp.example.com';   # do nothing if still using default SMTP host.
 
 ##fixme: need to redesign the breakdown/processing for $action for proper handling of all cases