Merged changes from main branch up to 2.1.3.

[fa-stable.git] / includes / references.inc

diff --git a/includes/references.inc b/includes/references.inc
index 1f9455997a830ea6ca07661272ac7ecddb156184..260c7a769664407f2123fbc2d52ca647e0f86b18 100644 (file)
--- a/includes/references.inc
+++ b/includes/references.inc
@@ -56,10 +56,20 @@ class references
        
        function increment($reference) 
        {
-        if (is_numeric($reference))
-               return $reference + 1;
+               // New method done by Pete. So f.i. WA036 will increment to WA037 and so on.
+               // If $reference is trailed by digits, and digits only,
+        // extract them and add 1, then put the alpha prefix back on
+        // NB. preg_match returns 1 if the regex matches completely 
+        // also $result[0] holds entire string, 1 the first captured, 2 the 2nd etc.
+        if (preg_match('/^(.*?)(\d+)$/', $reference, $result) == 1) 
+        {
+            $dig_count = strlen($result[2]); // How many digits? eg. 0003 = 4
+            $fmt = '%0' . $dig_count . 'd'; // Make a format string - leading zeroes
+            $nextval =  $result[1] . sprintf($fmt, intval($result[2] + 1)); // Add one on, and put prefix back on
+            return $nextval;
+        }
         else 
-               return $reference;
+            return $reference;
        }
        
        //------------------------------------