Changeset 45 for trunk

Timestamp:

11/01/04 11:14:37 (20 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge bugfixes from /branches/stable r43 and r44

Location:

trunk

Files:

• assign.html (modified) (2 diffs)
• cgi-bin/main.cgi (modified) (1 diff)
• header.inc (modified) (1 diff)

trunk/assign.html

@@ -4 +4 @@
 <form method="POST" action="main.cgi" class="regular">
 <tr class="color1">
-<td>City:&nbsp</td><td>
+<td>Customer location:&nbsp</td><td>
 <select name="city"><option selected>-</option>
 <option>Barrie</option>
@@ -76 +76 @@
 <td>Route from this POP:&nbsp</td><td>
 <select name="pop"><option selected>-</option>
+<option>Elliot Lake</option>
 <option>Huntsville</option>
 <option>North Bay</option>

trunk/cgi-bin/main.cgi

@@ -827 +827 @@
     if ($base =~ /^[ds]$/) {
       $sql = "select * from poolips where available='y' and".
-        " ptype='$base' and city='Sudbury' or city='North Bay'";
+        " ptype='$base' and (city='Sudbury' or city='North Bay')";
     } else {
 ## $city doesn't seem to get defined here.

trunk/header.inc

@@ -40 +40 @@
 <td>Search:
 <input type="text" name="input" size="20" maxlength="50" class="regular">
-<input type=radio name="searchfor" value="ipblock" checked=yes>IP/IP block
-<input type=radio name="searchfor" value="desc">Description
+<input type=radio name="searchfor" value="ipblock">IP/IP block
+<input type=radio name="searchfor" value="desc" checked=yes>Description
 <input type=radio name="searchfor" value="cust">Customer ID
 <input type=hidden name=page value="1">