Changeset 140 for branches


Ignore:
Timestamp:
01/27/05 17:37:31 (20 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Merge changes from /trunk r138,139 into "production" code

Location:
branches/stable
Files:
3 edited
2 copied

Legend:

Unmodified
Added
Removed
  • branches/stable/assign.html

    r98 r140  
    88$$ALLCITIES$$
    99</select>
     10&nbsp;<a href="javascript:popNotes('/ip/newcity.html')">Add new location</a>
    1011</td>
    1112</tr>
  • branches/stable/cgi-bin/main.cgi

    r136 r140  
    988988    return;
    989989  }
     990
     991  # Alloctype check.
    990992  chomp $webvar{alloctype};
     993  if (!grep /$webvar{alloctype}/, keys %disp_alloctypes) {
     994    # Danger! Danger!  alloctype should ALWAYS be set by a dropdown.  Anyone
     995    # managing to call things in such a way as to cause this deserves a cryptic error.
     996    printError("Invalid alloctype");
     997    return;
     998  }
     999
     1000  # CustID check
    9911001  # We have different handling for customer allocations and "internal" or "our" allocations
    992   if ($webvar{alloctype} =~ /^(ci|di|cn|mi|wi)$/) {
     1002  if ($webvar{alloctype} =~ /^(cn|.i)$/) {
    9931003    if (!$webvar{custid}) {
    9941004      printError("Please enter a customer ID.");
     
    10141024    }
    10151025#    print "<!-- [ In validateInput().  Insert customer ID cross-check here. ] -->\n";
    1016   } elsif ($webvar{alloctype} =~ /^([cdsmw]p|si|dn|dy|dc|dw|ee|rr|in)$/){
     1026  } else {
    10171027    # All non-customer allocations MUST be entered with "our" customer ID.
    10181028    # I have Defined this as 6750400 for consistency.
     
    10211031      $webvar{custid} = "6750400";
    10221032    }
    1023   } else {
    1024     # Danger! Danger!  alloctype should ALWAYS be set by a dropdown.  Anyone
    1025     # managing to call things in such a way as to cause this deserves a cryptic error.
    1026     printError("Invalid alloctype");
    1027     return;
    10281033  }
    10291034
  • branches/stable/changes.html

    r91 r140  
    1212<tr><td class="heading" colspan=2>Changes to the IPDB</td><tr>
    1313
     14<tr class="color2">
     15<td valign=top>01/27/2005</td>
     16<td>New cities/locations can now be added to the database here.
     17</td></tr>
    1418<tr class="color1">
    1519<td valign=top>11/30/2004</td>
Note: See TracChangeset for help on using the changeset viewer.