Changeset 100 for branches


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/cgi-bin/main.cgi

    r99 r100  
    12191219    }
    12201220    if ($webvar{alloctype} eq 'rr') {
    1221       if ($webvar{city} !~ /^(?:Huntsville|North Bay|Ottawa|Pembroke|Sault Ste. Marie|Sudbury|Timmins|Thunder Bay|Toronto)$/) {
     1221      my $flag;
     1222      foreach (@poplist) {
     1223        if (/^$webvar{city}$/) {
     1224          $flag = 'y'; last;
     1225        }
     1226      }
     1227      if (!$flag) {
    12221228        printAndExit("Please choose a valid POP location for a routed netblock.  Valid ".
    1223                 "POP locations are currently:<br>\n Elliot Lake - Huntsville - North Bay -".
    1224                 " Ottawa -".
    1225                 " Pembroke - Sault Ste. Marie - Sudbury - Timmins - Thunder Bay - Toronto");
     1229                "POP locations are currently:<br>\n".join (" - ", @poplist));
    12261230      }
    12271231    }
Note: See TracChangeset for help on using the changeset viewer.