Changeset 468 for branches/htmlform/cgi-bin/main.cgi

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

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;