Merge pull request #66 from iainsaxon/fix/telephone-email-validation

Adjusted validation for the email and telephone
newism · Oct 7, 2021 · f040f4f · f040f4f
2 parents 4cc283c + 8df03a7
commit f040f4f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/fields/Email.php b/src/fields/Email.php
@@ -55,6 +55,14 @@ public function getSettingsHtml()
     public function getElementValidationRules(): array
     {
         $rules = parent::getElementValidationRules();
+        $rules[] = 'trim';
+        $rules[] = [
+            // the value is valid if it doesn't find a non-basic character
+            'match',
+            'not' => true,
+            'pattern' => '/[^a-z0-9_\-\@+\.]/i',
+            'message' => 'Some invalid or hidden characters were detected in the address. Please retype or paste as plain text'
+        ];
         $rules[] = 'email';
 
         return $rules;

diff --git a/src/fields/Telephone.php b/src/fields/Telephone.php
@@ -129,7 +129,7 @@ public function normalizeValue($value, ElementInterface $element = null)
          */
         if (is_array($value) && !empty(array_filter($value))) {
             return new TelephoneModel(
-                $value['countryCode'] ?? $this->defaultCountryCode,
+                strlen($value['countryCode']) ? $value['countryCode'] : $this->defaultCountryCode,
                 $value['rawInput']
             );
         }
@@ -209,7 +209,10 @@ public function getInputHtml(
      */
     private function getCountryOptions(): array
     {
-        $countries = [['value' => '', 'label' => '']];
+        // Removing the null default value as this causes more problems
+        // We already have a default country code defined in the settings and trying to manage a field that can have
+        // the first Telephone object as an optional parameter is difficult.
+//        $countries = [['value' => '', 'label' => '']];
 
         $countryRepository = new CountryRepository();
         $countryData = $countryRepository->getList();
@@ -269,7 +272,7 @@ public function getElementValidationRules(): array
     public function isValueEmpty($value, ElementInterface $element = null): bool
     {
         if ($value instanceof TelephoneModel) {
-            return (null === $value->phoneNumber);
+            return 0 === strlen($value->phoneNumber);
         }
 
         return parent::isValueEmpty($value, $element);
@@ -298,7 +301,7 @@ public function validatePhoneNumber(
                 $this->handle,
                 Craft::t(
                     'nsm-fields',
-                    'The string supplied did not seem to be a phone number.'
+                    'The string supplied did not seem to be a phone number or didn\'t match the expected format for the country.'
                 )
             );
         }

diff --git a/src/templates/_components/fieldtypes/Telephone/input.twig b/src/templates/_components/fieldtypes/Telephone/input.twig
@@ -21,7 +21,7 @@
         label: 'Country Code',
         id: name ~ 'CountryCode',
         name: name ~ '[countryCode]',
-        value: viewData ? viewData.countryCode,
+        value: viewData ? viewData.countryCode : settings.defaultCountryCode,
         options: countryOptions
     }) }}