Changeset 228 for trunk/cgi-bin/main.cgi

Timestamp:

04/15/05 16:31:44 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Port forward bugfixes from /branches/stable r215, r220, and r224.

File:

• trunk/cgi-bin/main.cgi (modified) (3 diffs)

trunk/cgi-bin/main.cgi

@@ -1106 +1106 @@
     my $blockoptions = "<select name=alloctype><option".
         (($data[2] eq 'me') ? ' selected' : '') ." value='me'>Dialup netblock</option>\n<option".
-        (($data[2] eq 'de') ? ' selected' : '') ." value='de'>Dynamic DSL netblock</option>\n<option".  (($data[2] eq 'dc') ? ' selected' : '') ." value='dc'>Dynamic cable netblock</option>\n<option".
-        (($data[2] eq 'ce') ? ' selected' : '') ." value='ce'>Dynamic cable netblock</option>\n<option".        (($data[2] eq 'dc') ? ' selected' : '') ." value='dc'>Dynamic cable netblock</option>\n<option".
-        (($data[2] eq 'we') ? ' selected' : '') ." value='we'>Dynamic wireless netblock</option>\n<option".     (($data[2] eq 'dc') ? ' selected' : '') ." value='dc'>Dynamic cable netblock</option>\n<option".
+        (($data[2] eq 'de') ? ' selected' : '') ." value='de'>Dynamic DSL netblock</option>\n<option".
+        (($data[2] eq 'ce') ? ' selected' : '') ." value='ce'>Dynamic cable netblock</option>\n<option".
+        (($data[2] eq 'we') ? ' selected' : '') ." value='we'>Dynamic wireless netblock</option>\n<option".
         (($data[2] eq 'cn') ? ' selected' : '') ." value='cn'>Customer netblock</option>\n<option".
         (($data[2] eq 'en') ? ' selected' : '') ." value='en'>End-use netblock</option>\n<option".
@@ -1136 +1136 @@
 
   # Make sure incoming data is in correct format - custID among other things.
-  validateInput;
+  return if !validateInput;
 
   # SQL transaction wrapper
@@ -1144 +1144 @@
     if (my $pooltype = ($webvar{alloctype} =~ /^(.)i$/) ) {
       $sql = "update poolips set custid='$webvar{custid}',notes='$webvar{notes}',".
-        "circuitid='$webvar{circid}',description='$webvar{desc}' ".
+        "circuitid='$webvar{circid}',description='$webvar{desc}',city='$webvar{city}' ".
         "where ip='$webvar{block}'";
     } else {