Changeset 140 for branches/stable

Timestamp:

01/27/05 17:37:31 (19 years ago)

Author:

Kris Deugau

Message:

/branches/stable

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

Location:

branches/stable

Files:

• assign.html (modified) (1 diff)
• cgi-bin/main.cgi (modified) (3 diffs)
• cgi-bin/newcity.cgi (copied) (copied from trunk/cgi-bin/newcity.cgi )
• changes.html (modified) (1 diff)
• newcity.html (copied) (copied from trunk/newcity.html )

branches/stable/assign.html

@@ -8 +8 @@
 $$ALLCITIES$$
 </select>
+&nbsp;<a href="javascript:popNotes('/ip/newcity.html')">Add new location</a>
 </td>
 </tr>

branches/stable/cgi-bin/main.cgi

@@ -988 +988 @@
     return;
   }
+
+  # Alloctype check.
   chomp $webvar{alloctype};
+  if (!grep /$webvar{alloctype}/, keys %disp_alloctypes) {
+    # Danger! Danger!  alloctype should ALWAYS be set by a dropdown.  Anyone
+    # managing to call things in such a way as to cause this deserves a cryptic error.
+    printError("Invalid alloctype");
+    return;
+  }
+
+  # CustID check
   # We have different handling for customer allocations and "internal" or "our" allocations
-  if ($webvar{alloctype} =~ /^(ci|di|cn|mi|wi)$/) {
+  if ($webvar{alloctype} =~ /^(cn|.i)$/) {
     if (!$webvar{custid}) {
       printError("Please enter a customer ID.");
@@ -1014 +1024 @@
     }
 #    print "<!-- [ In validateInput().  Insert customer ID cross-check here. ] -->\n";
-  } elsif ($webvar{alloctype} =~ /^([cdsmw]p|si|dn|dy|dc|dw|ee|rr|in)$/){
+  } else {
     # All non-customer allocations MUST be entered with "our" customer ID.
     # I have Defined this as 6750400 for consistency.
@@ -1021 +1031 @@
       $webvar{custid} = "6750400";
     }
-  } else {
-    # Danger! Danger!  alloctype should ALWAYS be set by a dropdown.  Anyone
-    # managing to call things in such a way as to cause this deserves a cryptic error.
-    printError("Invalid alloctype");
-    return;
   }
 

branches/stable/changes.html

@@ -12 +12 @@
 <tr><td class="heading" colspan=2>Changes to the IPDB</td><tr>
 
+<tr class="color2">
+<td valign=top>01/27/2005</td>
+<td>New cities/locations can now be added to the database here.
+</td></tr>
 <tr class="color1">
 <td valign=top>11/30/2004</td>