Changeset 592 for branches/stable/cgi-bin/main.cgi

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/main.cgi (modified) (5 diffs)

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;