Changeset 468 for branches/htmlform/cgi-bin

Timestamp:

08/12/10 12:00:28 (14 years ago)

Author:

Kris Deugau

Message:

/branches/htmlform

Merge trunk bugfixes and updates

Location:

branches/htmlform

Files:

• . (modified) (1 prop)
• cgi-bin/IPDB.pm (modified) (1 diff)
• cgi-bin/admin.cgi (modified) (1 diff)
• cgi-bin/extras/db2rwhois.pl (modified) (1 diff)
• cgi-bin/ipdb.psql (modified) (3 diffs)
• cgi-bin/main.cgi (modified) (3 diffs)
• cgi-bin/search.cgi (modified) (2 diffs)

branches/htmlform/cgi-bin/IPDB.pm

@@ -833 +833 @@
   my ($action,$subj,$message) = @_;
 
+  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/htmlform/cgi-bin/admin.cgi

@@ -265 +265 @@
         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/htmlform/cgi-bin/extras/db2rwhois.pl

@@ -74 +74 @@
         "not (cidr <<= '10.0.0.0/8') and ".
         "not (type = 'wr') and ".
-        "masklen(cidr) <=30 and ".
+        "((masklen(cidr) <=30 and family(cidr)=4) or (masklen(cidr) <=56 and family(cidr)=6)) and ".
         "cidr <<= ?");
 

branches/htmlform/cgi-bin/ipdb.psql

@@ -76 +76 @@
         "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,
@@ -95 +94 @@
 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 '',
@@ -112 +110 @@
 GRANT ALL on "allocations" to "ipdb";
 
-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;
 
 REVOKE ALL on "searchme" from PUBLIC;

branches/htmlform/cgi-bin/main.cgi

@@ -960 +960 @@
   # because I'm lazy, we'll try to make the SELECT's bring out identical)ish) data
   if ($webvar{block} =~ /\/32$/) {
-    $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}'"
   }
 
@@ -1037 +1037 @@
   }
 ## 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;
@@ -1055 +1054 @@
 ## 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/htmlform/cgi-bin/search.cgi

@@ -139 +139 @@
   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}%')";
@@ -353 +352 @@
     # 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";