Changeset 592

Timestamp:

05/14/13 17:45:17 (12 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)
• cgi-bin/admin.cgi (modified) (3 diffs)
• cgi-bin/ipdb.psql (modified) (3 diffs)
• cgi-bin/main.cgi (modified) (5 diffs)
• cgi-bin/search.cgi (modified) (2 diffs)
• editDisplay.html (modified) (1 diff)

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

branches/stable/cgi-bin/admin.cgi

@@ -17 +17 @@
 use DBI;
 use CommonWeb qw(:ALL);
-use CustIDCK;
 #use POSIX qw(ceil);
 use NetAddr::IP;
@@ -26 +25 @@
 ##uselib##
 
+use CustIDCK;
 use MyIPDB;
 
@@ -254 +254 @@
         syslog "notice", "$authuser allocated '$webvar{cidr}' to '$webvar{custid}' as ".
                 "'$webvar{alloctype}'";
-        mailNotify($ip_dbh, "a$webvar{alloctype}",
-          "$disp_alloctypes{$webvar{alloctype}} $webvar{cidr} allocated to customer".
-          " $webvar{custid}\n".
+        mailNotify($ip_dbh, "a$webvar{alloctype}", "ADDED: $disp_alloctypes{$webvar{alloctype}} allocation",
+          "$disp_alloctypes{$webvar{alloctype}} $webvar{cidr} allocated to customer $webvar{custid}\n".
           "Description: $webvar{desc}\n\nAllocated by: $authuser\n");
       }

branches/stable/cgi-bin/ipdb.psql

@@ -47 +47 @@
         "pool" cidr DEFAULT '255.255.255.255/32' NOT NULL,
         "ip" cidr DEFAULT '255.255.255.255/32' NOT NULL PRIMARY KEY,
-        "oldcustid" character varying(16) DEFAULT '' NOT NULL,
         "city" character varying(30) DEFAULT '' NOT NULL,
         "type" character(2) DEFAULT '' NOT NULL,
@@ -63 +62 @@
 CREATE TABLE "allocations" (
         "cidr" cidr DEFAULT '255.255.255.255/32' NOT NULL PRIMARY KEY,
-        "oldcustid" character varying(16) DEFAULT '',
         "type" character(2) DEFAULT '',
         "city" character varying(30) DEFAULT '',
@@ -77 +75 @@
 );
 
-CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes, allocations.oldcustid, allocations.circuitid FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes, poolips.oldcustid, poolips.circuitid FROM poolips;
+CREATE VIEW "searchme" as SELECT allocations.cidr, allocations.custid, allocations."type", allocations.city, allocations.description, allocations.notes, allocations.circuitid FROM allocations UNION SELECT poolips.ip, poolips.custid, poolips.type, poolips.city, poolips.description, poolips.notes, poolips.circuitid FROM poolips;
 
 CREATE TABLE "alloctypes" (

branches/stable/cgi-bin/main.cgi

@@ -14 +14 @@
 use DBI;
 use CommonWeb qw(:ALL);
-use CustIDCK;
 use POSIX qw(ceil);
 use NetAddr::IP;
@@ -23 +22 @@
 ##uselib##
 
+use CustIDCK;
 use MyIPDB;
 
@@ -1045 +1045 @@
   # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data
   if ($webvar{block} =~ /\/32$/ && !$webvar{reallyblock}) {
-    $sql = "select ip,custid,type,city,circuitid,description,notes,modifystamp,privdata,oldcustid from poolips where ip='$webvar{block}'";
+    $sql = "select ip,custid,type,city,circuitid,description,notes,modifystamp,privdata from poolips where ip='$webvar{block}'";
   } else {
-    $sql = "select cidr,custid,type,city,circuitid,description,notes,modifystamp,privdata,oldcustid,swip from allocations where cidr='$webvar{block}'"
+    $sql = "select cidr,custid,type,city,circuitid,description,notes,modifystamp,privdata,swip from allocations where cidr='$webvar{block}'"
   }
 
@@ -1122 +1122 @@
   }
 ## end node hack
-    $html =~ s/\$\$OLDCUSTID\$\$/$data[9]/g;
     $html =~ s/\$\$CITY\$\$/<input type=text name=city value="$data[3]">/g;
     $html =~ s/\$\$CIRCID\$\$/<input type="text" name="circid" value="$data[4]" maxlength=64 size=64 class="regular">/g;
@@ -1140 +1139 @@
 ## end node hack
     $html =~ s/\$\$CUSTID\$\$/$data[1]/g;
-    $html =~ s/\$\$OLDCUSTID\$\$/$data[9]/g;
     $html =~ s/\$\$TYPESELECT\$\$/$disp_alloctypes{$data[2]}/g;
     $html =~ s/\$\$CITY\$\$/$data[3]/g;

branches/stable/cgi-bin/search.cgi

@@ -128 +128 @@
   my $sql = "(select $cols from searchme where".
         " $webvar{custexclude} (custid ilike '%$webvar{custid}%'".
-        " OR $webvar{custexclude} oldcustid ilike '%$webvar{custid}%'))".
         " $sqlconcat (select $cols from searchme where $webvar{descexclude} description ilike '%$webvar{desc}%')".
         " $sqlconcat (select $cols from searchme where $webvar{notesexclude} notes ilike '%$webvar{notes}%')";
@@ -336 +335 @@
     # Query for a customer ID.  Note that we can't restrict to "numeric-only"
     # as we have non-numeric custIDs in the legacy data.  :/
-    $sql = "select $cols from searchme where custid ilike '%$query%' or oldcustid ilike '%$query%' or description like '%$query%'";
+    $sql = "select $cols from searchme where custid ilike '%$query%' or description like '%$query%'";
     my $count = countRows($sql);
     $sql .= " order by cidr limit $RESULTS_PER_PAGE offset $offset";

branches/stable/editDisplay.html

@@ -15 +15 @@
 
 <tr class="color2"><td class=heading>CustID:</td><td class="regular">$$CUSTID$$</td></tr>
-<tr class="color2"><td class=heading>Old CustID:</td><td class="regular">$$OLDCUSTID$$</td></tr>
 
 <tr class="color2"><td class=heading>SWIPed?:</td><td class=regular>$$SWIP$$</td></tr>