X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=lib%2Ffunctions.php;h=ec0b35ade4763feb1890792972f1f01166b1e107;hb=d4756a23630bd3de036e2e4d09b168b56d14b0ae;hp=73ea46443743007dd483b8a2d5d80bc6dd888516;hpb=1fb7460a871d2342eca8a99d5e6a4af26c019372;p=readifood.git

diff --git a/lib/functions.php b/lib/functions.php
index 73ea464..ec0b35a 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -320,7 +320,32 @@
   function get_address_map_link($address) {
     $postcode = trim($address->getPostcode());
     if ($postcode) {
-      return " " . get_small_link("Map", "http://maps.google.co.uk/maps?q=" . urlencode($postcode));
+      # mrt=loc specifies a location search.
+      $map = "maps.google.co.uk/maps?q=" . urlencode($postcode) . "&mrt=loc";
+      $url = "http://$map";
+      # output=embed allows display in an iframe.
+      # iwloc=near hides the popup window for the embedded view.
+      $embed = $GLOBALS['http'] . "://$map&output=embed&iwloc=near";
+      $html = " ";
+      $html .= get_small_link_with_id("map", "Map", $url);
+      $html .= "<script>\n  $(function() {\n";
+      $html .= "    var x = 0;\n";
+      $html .= "    var y = 0;\n";
+      $html .= "    var loaded = false;\n";
+      $html .= "    $(\"#map\").hover(function(e) {\n";
+      $html .= "      x = $(this).outerWidth();\n";
+      $html .= "      y = $(this).outerHeight() / 2;\n";
+      $html .= "      $(\"#popup\").css(\"left\", e.pageX + x).css(\"top\", e.pageY + y);;\n";
+      $html .= "      $(\"#popup\").show();\n";
+      $html .= "      if (! loaded) {\n";
+      $html .= "        $(\"#popup\").html(\"<iframe width='100%' height='100%' src='$embed'></iframe>\");\n";
+      $html .= "        loaded = true;\n";
+      $html .= "      }\n";
+      $html .= "    },function() {\n";
+      $html .= "      $(\"#popup\").hide();\n";
+      $html .= "    })\n";
+      $html .= "  });</script>";
+      return $html;
     }
   }
 
@@ -428,9 +453,9 @@
 
   function show_role_form($role, $roles) {
     for ($i = 0; $i < count($roles); $i++) {
-      echo " <input type=\"checkbox\" name=\"role_$i\"";
+      echo " <input type=\"checkbox\" id=\"role_$i\" name=\"role_$i\"";
       if ($role & (1 << $i)) echo " checked";
-      echo ">$roles[$i]\n";
+      echo "><label for=\"role_$i\">$roles[$i]</label>\n";
     }
   }
 
@@ -486,40 +511,71 @@
   }
 
   function show_date_form($name, $date = null) {
-    $past = 60;
-    $future = 60;
-    echo "<select name=\"$name\">\n";
-    $now = date('Y-m-d', time());
-    list($y, $m, $d) = explode('-', $now);
-    $today = mktime(0, 0, 0, $m, $d, $y);
-    if (isset($date)) {
-      list($y, $m, $d) = explode('-', $date);
-      $then = mktime(0, 0, 0, $m, $d, $y);
-      if ($then < $today - 86400 * $past || $then > $today + 86400 * $future) {
-        option($name, $date, date('l j F Y', $then), $date);
-      }
+    if (! isset($date)) $date = date('Y-m-d', time());
+    datepicker($name, $date);
+  }
+
+  function validate_postcode($postcode, &$outward = null, &$inward = null) {
+    /*
+      Valid postcode formats (BS7666):
+
+        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";
     }
-    else $date = $now;
-    for ($i = -$past; $i < $future; $i++) {
-      $then = $today + 86400 * $i;
-      option($name, date('Y-m-d', $then), date('l j F Y', $then), $date);
+    if ($complain) {
+      echo "<p>Invalid postcode!</p>\n";
+      return null;
     }
-    echo "</select>\n";
-    return;
-    if (! isset($date)) $date = date('Y-m-d');
-    list($y, $m, $d) = iso8601_to_ymd($date);
+  }
 
-    echo "Year: <input name=\"$name" . "_y\" value=\"$y\" size=4 maxlen=4> ";
-    echo "Month: <input name=\"$name" . "_m\" value=\"$m\" size=2 maxlen=2> ";
-    echo "Day: <input name=\"$name" . "_d\" value=\"$d\" size=2 maxlen=2> ";
+  function get_small_link_with_id() {
+    /* Args are <id>, <alt text>, <format>, [<stuff> ...] */
+    $args = func_get_args();
+    $id = array_shift($args);
+    if (isset($id)) $id = " id=\"$id\"";
+    $html = htmlspecialchars(array_shift($args));
+    $url = array_shift($args);
+    return vsprintf("<a$id class=\"small noprint\" href=\"$url\">$html</a>\n", $args);
   }
 
   function get_small_link() {
     /* Args are <alt text>, <format>, [<stuff> ...] */
     $args = func_get_args();
-    $html = htmlspecialchars(array_shift($args));
-    $url = array_shift($args);
-    return vsprintf("<a class=\"small noprint\" href=\"$url\">$html</a>\n", $args);
+    array_unshift($args, null);
+    return call_user_func_array("get_small_link_with_id", $args);
   }
 
   function small_link() {