Changeset 1922330

Timestamp:

08/09/2018 02:36:40 PM (8 years ago)

Author:

data8

Message:

Added AllowedPPrefixes & BarredPrefixes parameters to Tel Val

Location:

data8-validation-for-contact-form-7/trunk/includes

Files:

• d8cf7-validation.php (modified) (2 diffs)
• d8cf7_instructions.php (modified) (2 diffs)
• d8gf-validation.php (modified) (3 diffs)

data8-validation-for-contact-form-7/trunk/includes/d8cf7-validation.php

@@ -18 +18 @@
     $line = $tag->get_option( 'landline', '(true|false)', true );
     $mobile = $tag->get_option( 'mobile', '(true|false)', true );
-    
+
+    // Get the allowed prefixes
+    $allowedPrefixesInput = $tag->get_option( 'allowedPrefixes', '', true );
+    $allowedPrefixArray = [];
+    if ($allowedPrefixesInput != '') {
+        $allowedPrefixArray = explode("_", $allowedPrefixesInput);
+    }
+    $allowedPrefixes = '';
+    foreach ($allowedPrefixArray as &$prefix) {
+        $allowedPrefixes = ($allowedPrefixes == '' ? $prefix : $allowedPrefixes.','.$prefix);
+    }
+
+    // Get the barred prefixes
+    $barredPrefixesInput = $tag->get_option( 'barredPrefixes', '', true );
+    $barredPrefixArray = [];
+    if ($barredPrefixesInput != '') {
+        $barredPrefixArray = explode("_", $barredPrefixesInput);
+    }
+    $barredPrefixes = '';
+    foreach ($barredPrefixArray as &$prefix) {
+        $barredPrefixes = ($barredPrefixes == '' ? $prefix : $barredPrefixes.','.$prefix);
+    }
+
     if ($country == '')
         $country = '44';
@@ -41 +63 @@
             'options' => array ('Option' => array(
                 array('Name' => 'UseMobileValidation', 'Value' => $mobile),
-                array('Name' => 'UseLineValidation', 'Value' => $line)
+                array('Name' => 'UseLineValidation', 'Value' => $line),
+                array('Name' => 'AllowedPrefixes', 'Value' => $allowedPrefixes),
+                array('Name' => 'BarredPrefixes', 'Value' => $barredPrefixes)
             ))
         );

data8-validation-for-contact-form-7/trunk/includes/d8cf7_instructions.php

@@ -53 +53 @@
                         <li><strong>d8landline</strong> - if the telephone number is a UK landline, use the enhanced Landline Validation service to perform more detailed validation</li>
                         <li><strong>d8country_US</strong> - if the telephone number does not include an explicit country code prefix, use the country specified in this option instead. Defaults to GB</li>
+                        <li><strong>d8AllowedPrefixes_441_442</strong> - if specified any prefixes (without the leading plus "+" and seperated by an underscore "_") are the only ones allowed</li>
+                        <li><strong>d8BarredPrefixes_44151_442</strong> - if specified any prefixes (without the leading plus "+" and seperated by an underscore "_") are barred</li>
                     </ul>
                 </li>
@@ -100 +102 @@
                         <li><strong>[tel* your-tel landline:true]</strong> - if the telephone number is a UK landline, use the enhanced Landline Validation service to perform more detailed validation</li>
                         <li><strong>[tel* your-tel country:US]</strong> - if the telephone number does not include an explicit country code prefix, use the country specified in this option instead. Defaults to GB</li>
+                        <li><strong>[tel* your-tel allowedPrefixes:+441_+442]</strong> - if included only these prefixes will be allowed</li>
+                        <li><strong>[tel* your-tel barredPrefixes:+01_+447]</strong> - if included these prefixes will NOT be allowed</li>
                     </ul>
                 </li>

data8-validation-for-contact-form-7/trunk/includes/d8gf-validation.php

@@ -49 +49 @@
     if ( $field->get_input_type() === 'phone' && $result['is_valid'] && $value != '' ) {
         $classes = explode(' ', $field->cssClass);
-        $country = '44';
+        $country = '44'; 
         $line = 'false';
         $mobile = 'false';
+        $allowedPrefixes = '';
+        $barredPrefixes = '';
         
         foreach ($classes as $class) {
@@ -62 +64 @@
             if ($class == 'd8mobile')
                 $mobile = 'true';
+            
+            // Pull out a list of Allowed Prefixes (if specified)
+            if (startsWith($class, 'd8AllowedPrefixes_')){
+                $allowedPrefixesInput = substr($class, 10);
+                $allowedPrefixArray = [];
+                if ($allowedPrefixesInput != '') {
+                    $allowedPrefixArray = explode("_", $class);
+                }
+                foreach ($allowedPrefixArray as &$prefix) {
+                    if ($prefix != 'd8AllowedPrefixes'){
+                        $allowedPrefixes = ($allowedPrefixes == '' ? '+'.$prefix : $allowedPrefixes.','.'+'.$prefix);
+                    }
+                }
+            }
+
+            // Pull out a list of Barred Prefixes (if specified)
+            if (startsWith($class, 'd8BarredPrefixes_')){
+                $barredPrefixesInput = substr($class, 10);
+                $barredPrefixArray = [];
+                if ($barredPrefixesInput != '') {
+                    $barredPrefixArray = explode("_", $class);
+                }
+                foreach ($barredPrefixArray as &$prefix) {
+                    if ($prefix != 'd8BarredPrefixes_'){
+                        $barredPrefixes = ($barredPrefixes == '' ? '+'.$prefix : $barredPrefixes.','.'+'.$prefix);
+                    }
+                }
+            }
         }
         
@@ -76 +106 @@
             'options' => array ('Option' => array(
                 array('Name' => 'UseMobileValidation', 'Value' => $mobile),
-                array('Name' => 'UseLineValidation', 'Value' => $line)
+                array('Name' => 'UseLineValidation', 'Value' => $line),
+                array('Name' => 'AllowedPrefixes', 'Value' => $allowedPrefixes),
+                array('Name' => 'BarredPrefixes', 'Value' => $barredPrefixes)
             ))
         );