Changeset 100 for branches/stable

Timestamp:

12/07/04 14:20:27 (20 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Whoops, forgot one final part of moving cities to db.
POP list must be checked in validateInput() to make sure
routing allocations go where we have a POP.

File:

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

branches/stable/cgi-bin/main.cgi

@@ -1219 +1219 @@
     }
     if ($webvar{alloctype} eq 'rr') {
-      if ($webvar{city} !~ /^(?:Huntsville|North Bay|Ottawa|Pembroke|Sault Ste. Marie|Sudbury|Timmins|Thunder Bay|Toronto)$/) {
+      my $flag;
+      foreach (@poplist) {
+        if (/^$webvar{city}$/) {
+          $flag = 'y'; last;
+        }
+      }
+      if (!$flag) {
         printAndExit("Please choose a valid POP location for a routed netblock.  Valid ".
-                "POP locations are currently:<br>\n Elliot Lake - Huntsville - North Bay -".
-                " Ottawa -". 
-                " Pembroke - Sault Ste. Marie - Sudbury - Timmins - Thunder Bay - Toronto");
+                "POP locations are currently:<br>\n".join (" - ", @poplist));
       }
     }