Changeset 87 for trunk

Timestamp:

11/26/04 17:28:19 (20 years ago)

Author:

Kris Deugau

Message:

/trunk

Port bugfixes and tweaks from /branches/stable r79:86 forward.

Location:

trunk

Files:

• assign.html (modified) (2 diffs)
• cgi-bin/main.cgi (modified) (4 diffs)
• changes.html (copied) (copied from branches/stable/changes.html )
• fb-assign.html (modified) (4 diffs)
• header.inc (modified) (2 diffs)

trunk/assign.html

@@ -13 +13 @@
 <option>Burlington</option>
 <option>Chapleau</option>
+<option>Chelmsford</option>
 <option>Espanola</option>
 <option>Elliot Lake</option>
@@ -74 +75 @@
 <td>Customer ID:&nbsp</td><td><input type="text" name="custid" size="15" maxlength="15"> (Only required for Customer allocations)</td>
 </tr><tr class="color1">
-<td>Route from this POP:&nbsp</td><td>
+<td>Route from/through:&nbsp</td><td>
 <select name="pop"><option selected>-</option>
+<option>Blind River</option>
+<option>Chelmsford</option>
 <option>Elliot Lake</option>
+<option>Espanola</option>
 <option>Huntsville</option>
+<option>Little Current</option>
+<option>Lively</option>
 <option>North Bay</option>
 <option>Ottawa</option>
 <option>Pembroke</option>
 <option>Sault Ste. Marie</option>
+<option>Sturgeon</option>
 <option>Sudbury</option>
 <option>Timmins</option>
 <option>Thunder Bay</option>
 <option>Toronto</option>
+<option>Valley</option>
 </select>
 </td>

trunk/cgi-bin/main.cgi

@@ -828 +828 @@
 my $city;       # Shut up Perl's "strict" scoping/usage check.
       $sql = "select * from poolips where available='y' and".
-        " ptype='$base' and city='$webvar{city}'";
+        " ptype='$base' and city='$webvar{pop}'";
     }
 
@@ -839 +839 @@
       $ipcount{$data[0]}++;
     }
+    $sth = $ip_dbh->prepare("select city from allocations where cidr=?");
     foreach my $key (keys %ipcount) {
-      $optionlist .= "<option value='$key'>$key [$ipcount{$key} free IP(s)]</option>\n";
+      $sth->execute($key);
+      my @data = $sth->fetchrow_array;
+      $optionlist .= "<option value='$key'>$key [$ipcount{$key} free IP(s)] in $data[0]</option>\n";
     }
     $cidr = "Single static IP";
@@ -931 +934 @@
   $html =~ s|\$\$ALLOC_FROM\$\$|$alloc_from|g;
   $html =~ s|\$\$CIDR\$\$|$cidr|g;
+  $webvar{city} = desanitize($webvar{city});
   $html =~ s|\$\$CITY\$\$|$webvar{city}|g;
   $html =~ s|\$\$CUSTID\$\$|$webvar{custid}|g;
+  $webvar{circid} = desanitize($webvar{circid});
   $html =~ s|\$\$CIRCID\$\$|$webvar{circid}|g;
   $webvar{desc} = desanitize($webvar{desc});
@@ -1156 +1161 @@
       printAndExit("Please enter a customer ID.");
     }
-    if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF)(?:-\d\d?)?$/) {
+    if ($webvar{custid} !~ /^(?:\d{10}|\d{7}|STAFF|TEMP)(?:-\d\d?)?$/) {
       printAndExit("Please enter a valid customer ID- this must be a 7- or 10-digit number, or STAFF for static IPs for staff.");
     }

trunk/fb-assign.html

@@ -4 +4 @@
 <form method="POST" action="main.cgi" class="regular">
 <tr class="color1"><td>Free block selected for assignment:&nbsp</td><td>$$BLOCK$$<input type=hidden name=block value="$$BLOCK$$"></td></tr>
-<tr class="color1">
+<tr class="color2">
 <td>City:&nbsp</td><td>
 <select name="city"><option selected>-</option>
@@ -14 +14 @@
 <option>Burlington</option>
 <option>Chapleau</option>
+<option>Chelmsford</option>
 <option>Espanola</option>
 <option>Elliot Lake</option>
@@ -49 +50 @@
 </td>
 </tr>
-<tr class="color2">
+<tr class="color1">
 <td>Allocation type:</td><td>
 <select name="alloctype"><option value="cn" selected>Customer netblock</option>
@@ -64 +65 @@
 <input type="button" value=" ? " onclick="helpAllocTypes()" class="regular">
 </td>
-</tr><tr class="color1">
+</tr><tr class="color2">
 <td>Customer ID:&nbsp</td><td><input type="text" name="custid" size="15" maxlength="15"> (Only required for Customer allocations)</td>
 </tr><tr class="color1">

trunk/header.inc

@@ -14 +14 @@
 function helpAllocTypes() {
         window.open("/ip/alloctypes.html", "alloc_window", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=750,height=550")
+}
+function popNotes(page) {
+        window.open(page, "IPDB_notes", "toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes,copyhistory=no,width=400,height=300");
 }
 </script>
@@ -60 +63 @@
   </tr>
 </tbody></table>
-<br></br>
+<table width="98%" border=0><tr><td align=right><a href="javascript:popNotes('/ip/changes.html')">Recent Changes</a></td></tr></table>
+<br>