From 9f774c8eacc9913fdc78b97ee77c8fb38d202bc0 Mon Sep 17 00:00:00 2001 From: Peter Goodhall Date: Fri, 1 Apr 2022 16:04:06 +0100 Subject: [PATCH] [Gridsquare Validation] when doing 6 char grids it errored Regex stopped looking at chars after R --- application/controllers/Qso.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/Qso.php b/application/controllers/Qso.php index 51f6321e..a86fdcf3 100755 --- a/application/controllers/Qso.php +++ b/application/controllers/Qso.php @@ -450,7 +450,7 @@ class QSO extends CI_Controller { // Allow empty locator if (preg_match('/^$/', $grid)) return true; // Allow 6-digit locator - if (preg_match('/^[A-Ra-r]{2}[0-9]{2}[A-Ra-r]{2}$/', $grid)) return true; + if (preg_match('/^[A-Ra-r]{2}[0-9]{2}[A-Za-z]{2}$/', $grid)) return true; // Allow 4-digit locator else if (preg_match('/^[A-Ra-r]{2}[0-9]{2}$/', $grid)) return true; // Allow 4-digit grid line