Changeset 35 for branches

Timestamp:

10/28/04 13:22:36 (20 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge change-alloctype from /trunk r33

Location:

branches/stable

Files:

• cgi-bin/main.cgi (modified) (2 diffs)
• editDisplay.html (modified) (1 diff)

branches/stable/cgi-bin/main.cgi

@@ -1226 +1226 @@
 # We'll just show what type of block it is.
 
-  $html =~ s/\$\$TYPE\$\$/$data[2]/g;
-  $html =~ s/\$\$FULLTYPE\$\$/$full_alloc_types{$data[2]}/g;
+# this has now been Requested, so here goes.
+
+  if ($data[2] =~ /^d[nyc]|cn|ee|ii$/) {
+    # Block that can be changed
+    my $blockoptions = "<select name=alloctype><option".
+        (($data[2] eq 'dn') ? ' selected' : '') ." value='dn'>Dialup netblock</option>\n<option".
+        (($data[2] eq 'dy') ? ' selected' : '') ." value='dy'>Dynamic DSL netblock</option>\n<option".
+        (($data[2] eq 'dc') ? ' selected' : '') ." value='dc'>Dynamic cable netblock</option>\n<option".
+        (($data[2] eq 'cn') ? ' selected' : '') ." value='cn'>Customer netblock</option>\n<option".
+        (($data[2] eq 'ee') ? ' selected' : '') ." value='ee'>End-use netblock</option>\n<option".
+        (($data[2] eq 'ii') ? ' selected' : '') ." value='ii'>Internal netblock</option>\n".
+        "</select>\n";
+    $html =~ s/\$\$TYPESELECT\$\$/$blockoptions/g;
+  } else {
+    $html =~ s/\$\$TYPESELECT\$\$/$full_alloc_types{$data[2]}<input type=hidden name=alloctype value="$data[2]">/g;
+  }
 
   # These can be modified, although CustID changes may get ignored.
@@ -1258 +1272 @@
     } else {
       $sql = "update allocations set custid='$webvar{custid}',".
-        "description='$webvar{desc}',notes='$webvar{notes}',city='$webvar{city}' ".
-        "where cidr='$webvar{block}'";
+        "description='$webvar{desc}',notes='$webvar{notes}',city='$webvar{city}',".
+        "type='$webvar{alloctype}' where cidr='$webvar{block}'";
     }
 syslog "debug", $sql;

branches/stable/editDisplay.html

@@ -11 +11 @@
 <input type=text name=city value="$$CITY$$"></td></tr>
 
-<tr class="color1"><td class=heading>Type:</td><td colspan=2 class=regular>$$FULLTYPE$$
-<input type=hidden name=alloctype value="$$TYPE$$"></td></tr>
+<tr class="color1"><td class=heading>Type:</td><td colspan=2 class=regular>$$TYPESELECT$$</td></tr>
 
 <tr class="color2"><td class=heading>CustID:</td><td colspan=2 class="regular">