From: Iain Patterson <me@iain.cx>
Date: Thu, 3 Oct 2013 07:51:54 +0000 (-0400)
Subject: Postcode validation.
X-Git-Tag: 2013-10-03^0
X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=adaa23b9f9bbfb55f5c1cd85d6e84c49b950887d;p=readifood.git

Postcode validation.

Validate postcode according to the rules described in BS766.
---

diff --git a/lib/contact.php b/lib/contact.php
index b680982..051f291 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -280,7 +280,13 @@
     /* Postcode. */
     echo "<tr>\n";
     echo "  <td>Postcode</td>\n";
-    echo "  <td>"; input("postcode", $address->getPostcode()); echo get_address_map_link($address); echo "</td>\n";
+    $postcode = $address->getPostcode();
+    if (validate_postcode($postcode)) {
+      echo "  <td>"; input("postcode", $postcode); echo get_address_map_link($address); echo "</td>\n";
+    }
+    else {
+      echo "  <td>"; input("postcode", $address->getPostcode()); echo " (invalid)</td>\n";
+    }
     echo "</tr>\n";
 
     /* Telephone. */
@@ -422,7 +428,11 @@
     /* Get address. */
     $area_id = $_POST['area_id'];
     $line = $_POST['address'];
-    $postcode = $_POST['postcode'];
+    $postcode = trim($_POST['postcode']);
+    if ($postcode) {
+      $postcode = format_postcode($_POST['postcode'], true);
+      if (! $postcode) return false;
+    }
     $q = new AddressQuery;
     /* XXX: Finding by area properly? */
     $address = $q->filterByAreaId($area_id)->filterByLine($line)->filterByPostcode($postcode)->findOneOrCreate();
diff --git a/lib/functions.php b/lib/functions.php
index 73ea464..0f2e0e7 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -514,6 +514,52 @@
     echo "Day: <input name=\"$name" . "_d\" value=\"$d\" size=2 maxlen=2> ";
   }
 
+  function validate_postcode($postcode, &$outward = null, &$inward = null) {
+    /*
+      Valid postcode formats (BS766):
+
+        AN NLL
+        ABN NLL
+        ANN NLL
+        ABNN NLL
+        ABND NLL
+        ANC NLL
+
+      Where N is a number; A is a letter not including Q, V, X;
+      B is a letter not including I, J, Z; C is a letter from the set
+      ABCDEFGHJKSTUW; D is a letter from the set ABEHMNPRVWXY;
+      L is a letter from the set ABDEFGHJLNPQRSTUWXYZ.
+
+      The postcode GIR 0AA is also valid.
+    */
+    $outward = $inward = null;
+
+    /* Treat blank as valid for convenience. */
+    $postcode = trim($postcode);
+    if (! $postcode) return true;
+
+    $A = '[ABCDEFGHIJKLMNOPRSTUWYZ]';
+    $B = '[ABCDEFGHKLMNOPQRSTUVWXY]';
+    $C = '[ABCDEFGHJKSTUW]';
+    $D = '[ABEHMNPRVWXY]';
+    $L = '[ABDEFGHJLNPQRSTUWXYZ]';
+    $N = '\d';
+    if (! preg_match("/^($A$N|$A$B$N|$A$N$N|$A$B$N$N|$A$B$N$D|$A$N$C|GIR)\s*($N$L$L)$/", $postcode, $m)) return false;
+    if ($m[1] == "GIR" && $m[2] != "0AA") return false;
+    list($ignored, $outward, $inward) = $m;
+    return true;
+  }
+
+  function format_postcode($postcode, $complain = true) {
+    if (validate_postcode($postcode, $outward, $inward)) {
+      return "$outward $inward";
+    }
+    if ($complain) {
+      echo "<p>Invalid postcode!</p>\n";
+      return null;
+    }
+  }
+
   function get_small_link() {
     /* Args are <alt text>, <format>, [<stuff> ...] */
     $args = func_get_args();
diff --git a/lib/hub.php b/lib/hub.php
index 12f27cf..3d8e8d5 100644
--- a/lib/hub.php
+++ b/lib/hub.php
@@ -186,7 +186,13 @@
     /* Postcode. */
     echo "<tr>\n";
     echo "  <td>Postcode</td>\n";
-    echo "  <td>"; input("postcode", $address->getPostcode()); echo get_address_map_link($address); echo "</td>\n";
+    $postcode = $address->getPostcode();
+    if (validate_postcode($postcode)) {
+      echo "  <td>"; input("postcode", $postcode); echo get_address_map_link($address); echo "</td>\n";
+    }
+    else {
+      echo "  <td>"; input("postcode", $address->getPostcode()); echo " (invalid)</td>\n";
+    }
     echo "</tr>\n";
 
     /* Telephone. */
@@ -278,7 +284,11 @@
 
     /* Get address. */
     $line = $_POST['address'];
-    $postcode = $_POST['postcode'];
+    $postcode = trim($_POST['postcode']);
+    if ($postcode) {
+      $postcode = format_postcode($_POST['postcode'], true);
+      if (! $postcode) return false;
+    }
     $q = new AddressQuery;
     /* XXX: Finding by area properly? */
     $address = $q->filterByAreaId($area_id)->filterByLine($line)->filterByPostcode($postcode)->findOneOrCreate();