Changeset 39 for branches/stable/cgi-bin

Timestamp:

10/28/04 15:31:30 (20 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge bugfixes and updates from /trunk r37 and r38

File:

• branches/stable/cgi-bin/main.cgi (modified) (1 diff)

branches/stable/cgi-bin/main.cgi

@@ -874 +874 @@
           " a set of smaller netblocks or a single smaller netblock.";
       } else {
-        if ($webvar{alloctype} =~ /^[sd]p$/) {
+        if ($webvar{alloctype} =~ /^[scdmw]p$/) {
           if (($webvar{city} !~ /^(Sudbury|North Bay)$/) && ($webvar{alloctype} eq 'dp')) {
             printAndExit("You must chose Sudbury or North Bay for DSL pools."); }
-          if ($webvar{alloctype} eq 'sp') { $city = "Sudbury"; } else { $city = $webvar{city}; }
+          $city = $webvar{city};
           $failmsg = "No suitable free block found.<br>\nYou will have to route another".
             " superblock <br>\nfrom one of the master blocks in Sudbury or chose a smaller".