Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 231d6b1

Browse files
doboothdobooth
authored
Merge pull request #8164 from dfelton/feature/systemxml-validation-rules
Update config-reference-systemxml.md
2 parents f530484 + d595442 commit 231d6b1

File tree

2 files changed

+67
-49
lines changed

2 files changed

+67
-49
lines changed

‎src/guides/v2.3/config-guide/prod/config-reference-systemxml.md

Lines changed: 34 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -374,29 +374,38 @@ The following validation rules are available:
374374

375375
| Rule | Description |
376376
|---------------------------------|-------------------------------------------------------------------------------------------------------------------------|
377-
| `alphanumeric` | Allows letters, numbers, spaces or underscores only. |
378-
| `integer` | Enter a positive or negative non-decimal number. |
379-
| `letters-only` | Allows letters only. For example, `abcABC`. |
377+
| `alphanumeric` | Allows letters, numbers, spaces or underscores only. |
378+
| `integer` | Allows a positive or negative non-decimal number. |
379+
| `ipv4` | Allows a valid IP v4 address. |
380+
| `ipv6` | Allows a valid IP v6 address. |
381+
| `letters-only` | Allows letters only. For example, `abcABC`. |
382+
| `letters-with-basic-punc` | Allows letters or punctuation only.<br>Must pass the following expression: `/^[a-z\-.,()\u0027\u0022\s]+$/i`. |
383+
| `mobileUK` | Allows a (UK) mobile phone number. |
384+
| `no-marginal-whitespace` | Disallows white spaces at the start or end of the value. |
380385
| `no-whitespace` | Disallows white spaces. |
381-
| `time` | Allows a valid time in 24-hour format, between 00:00 and 23:59. For example `15`, `15:05` or `15:05:48` |
382-
| `time12h` | Allows a valid time in 12-hour format, between 12:00 am and 11:59:59 pm. For example `3 am`, `11:30 pm`, `02:15:00 pm`. |
383-
| `validate-no-html-tags` | HTML tags are not allowed. |
384-
| `validate-select` | Select an option. |
385-
| `validate-no-empty` | Empty Value |
386-
| `validate-alphanum-with-spaces` | Use letters (a-z or A-Z), numbers (0-9), or spaces only in this field. |
387-
| `validate-data` | Use letters (a-z or A-Z), numbers (0-9), or underscores (_) only in this field. The first character should be a letter. |
388-
| `validate-street` | Use letters (a-z or A-Z), numbers (0-9), spaces, and “#” only in this field. |
389-
| `validate-phoneStrict` | Enter a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
390-
| `validate-phoneLax` | Enter a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
391-
| `validate-fax` | Enter a valid fax number. For example, 123-456-7890. |
392-
| `validate-email` | Enter a valid email address. For example, johndoe@domain.com. |
393-
| `validate-emailSender` | Enter a valid email address. For example, johndoe@domain.com. |
394-
| `validate-password` | Enter 6 or more characters. Leading and trailing spaces will be ignored. |
395-
| `validate-admin-password` | Enter 7 or more characters, using both numeric and alphabetic. |
396-
| `validate-url` | Enter a valid URL. Protocol is required (http://, https:// or ftp://). |
397-
| `validate-clean-url` | Enter a valid URL. For example, http://www.example.com or www.example.com. |
398-
| `validate-xml-identifier` | Enter a valid XML-identifier. For example, something_1, block5, id-4. |
399-
| `validate-ssn` | Enter a valid social security number. For example, 123-45-6789. |
400-
| `validate-zip-us` | Enter a valid ZIP code. For example, 90602 or 90602-1234. |
401-
| `validate-date-au` | Use this date format: dd/mm/yyyy. For example, 17/03/2006 for the 17th of March, 2006. |
402-
| `validate-currency-dollar` | Enter a valid $ amount. For example, $100.00. |
386+
| `phoneUK` | Allows a (UK) phone number. |
387+
| `phoneUS` | Allows a (US) phone number. |
388+
| `required-entry` | Disallows an empty value (equivalent validation as `validate-no-empty`).<br>Validation failure message: "This is a required field." |
389+
| `time` | Allows a valid time in 24-hour format, between 00:00 and 23:59. For example `15`, `15:05` or `15:05:48`. |
390+
| `time12h` | Allows a valid time in 12-hour format, between 12:00 am and 11:59:59 pm. For example `3 am`, `11:30 pm`, `02:15:00 pm`. |
391+
| `validate-admin-password` | Allows 7 or more characters, using both numeric and alphabetic. |
392+
| `validate-alphanum-with-spaces` | Allows usage of letters (a-z or A-Z), numbers (0-9), or spaces only. |
393+
| `validate-clean-url` | Allows a valid URL. For example, http://www.example.com or www.example.com. |
394+
| `validate-currency-dollar` | Allows a valid (dollar) amount. For example, $100.00. |
395+
| `validate-data` | Allows usage of letters (a-z or A-Z), numbers (0-9), or underscores (\_) only.<br>The first character must be a letter.<br>(Must match expression: `/^[A-Za-z]+[A-Za-z0-9_]+$/`)<br>Validation failure message: "Please use only letters (a-z or A-Z), numbers (0-9) or underscore (\_) in this field, and the first character should be a letter." |
396+
| `validate-date-au` | Enforces the following date format: dd/mm/yyyy. For example, 17/03/2006 for the 17th of March, 2006. |
397+
| `validate-email` | Allows a valid email address. For example, johndoe@domain.com. |
398+
| `validate-emailSender` | Allows a valid email address. For example, johndoe@domain.com. |
399+
| `validate-fax` | Allows a valid fax number. For example, 123-456-7890. |
400+
| `validate-no-empty` | Disallows an empty value (equivalent validation as `requried-entry`).<br>Validation failure message: "Empty value." |
401+
| `validate-no-html-tags` | Disallows usage of HTML tags. |
402+
| `validate-password` | Allows 6 or more characters. Leading and trailing spaces will be ignored. |
403+
| `validate-phoneLax` | Allows a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
404+
| `validate-phoneStrict` | Allows a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
405+
| `validate-select` | Enforces that the select option chosen not have a `null` value, string value of `none` or string length of 0. |
406+
| `validate-ssn` | Allows a valid (US) social security number. For example, 123-45-6789. |
407+
| `validate-street` | Allows usage of letters (a-z or A-Z), numbers (0-9), spaces, and “#” only. |
408+
| `validate-url` | Allows a valid URL. Protocol is required (http://, https:// or ftp://). |
409+
| `validate-xml-identifier` | Allows a valid XML-identifier. For example, something_1, block5, id-4. |
410+
| `validate-zip-us` | Allows a valid (US) ZIP code. For example, 90602 or 90602-1234. |
411+
| `vinUS` | Allows (US) vehicle identification number (VIN) value. |

‎src/guides/v2.4/config-guide/prod/config-reference-systemxml.md

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -375,28 +375,37 @@ The following validation rules are available:
375375
| Rule | Description |
376376
|---------------------------------|-------------------------------------------------------------------------------------------------------------------------|
377377
| `alphanumeric` | Allows letters, numbers, spaces or underscores only. |
378-
| `integer` | Enter a positive or negative non-decimal number. |
379-
| `letters-only` | Allows letters only. For example, `abcABC`. |
378+
| `integer` | Allows a positive or negative non-decimal number. |
379+
| `ipv4` | Allows a valid IP v4 address. |
380+
| `ipv6` | Allows a valid IP v6 address. |
381+
| `letters-only` | Allows letters only. For example, `abcABC`. |
382+
| `letters-with-basic-punc` | Allows letters or punctuation only.<br>Must pass the following expression: `/^[a-z\-.,()\u0027\u0022\s]+$/i`. |
383+
| `mobileUK` | Allows a (UK) mobile phone number. |
384+
| `no-marginal-whitespace` | Disallows white spaces at the start or end of the value. |
380385
| `no-whitespace` | Disallows white spaces. |
381-
| `time` | Allows a valid time in 24-hour format, between 00:00 and 23:59. For example `15`, `15:05` or `15:05:48`. |
382-
| `time12h` | Allows a valid time in 12-hour format, between 12:00 am and 11:59:59 pm. For example `3 am`, `11:30 pm`, `02:15:00 pm`. |
383-
| `validate-no-html-tags` | HTML tags are not allowed. |
384-
| `validate-select` | Select an option. |
385-
| `validate-no-empty` | Empty Value |
386-
| `validate-alphanum-with-spaces` | Use letters (a-z or A-Z), numbers (0-9), or spaces only in this field. |
387-
| `validate-data` | Use letters (a-z or A-Z), numbers (0-9), or underscores (_) only in this field. The first character should be a letter. |
388-
| `validate-street` | Use letters (a-z or A-Z), numbers (0-9), spaces, and “#” only in this field. |
389-
| `validate-phoneStrict` | Enter a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
390-
| `validate-phoneLax` | Enter a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
391-
| `validate-fax` | Enter a valid fax number. For example, 123-456-7890. |
392-
| `validate-email` | Enter a valid email address. For example, johndoe@domain.com. |
393-
| `validate-emailSender` | Enter a valid email address. For example, johndoe@domain.com. |
394-
| `validate-password` | Enter 6 or more characters. Leading and trailing spaces will be ignored. |
395-
| `validate-admin-password` | Enter 7 or more characters, using both numeric and alphabetic. |
396-
| `validate-url` | Enter a valid URL. Protocol is required (http://, https:// or ftp://). |
397-
| `validate-clean-url` | Enter a valid URL. For example, http://www.example.com or www.example.com. |
398-
| `validate-xml-identifier` | Enter a valid XML-identifier. For example, something_1, block5, id-4. |
399-
| `validate-ssn` | Enter a valid social security number. For example, 123-45-6789. |
400-
| `validate-zip-us` | Enter a valid ZIP code. For example, 90602 or 90602-1234. |
401-
| `validate-date-au` | Use this date format: dd/mm/yyyy. For example, 17/03/2006 for the 17th of March, 2006. |
402-
| `validate-currency-dollar` | Enter a valid $ amount. For example, $100.00. |
386+
| `phoneUK` | Allows a (UK) phone number. |
387+
| `phoneUS` | Allows a (US) phone number. |
388+
| `required-entry` | Disallows an empty value (equivalent validation as `validate-no-empty`).<br>Validation failure message: "This is a required field." |
389+
| `time` | Allows a valid time in 24-hour format, between 00:00 and 23:59. For example `15`, `15:05` or `15:05:48`. |
390+
| `time12h` | Allows a valid time in 12-hour format, between 12:00 am and 11:59:59 pm. For example `3 am`, `11:30 pm`, `02:15:00 pm`. |
391+
| `validate-admin-password` | Allows 7 or more characters, using both numeric and alphabetic. |
392+
| `validate-alphanum-with-spaces` | Allows usage of letters (a-z or A-Z), numbers (0-9), or spaces only. |
393+
| `validate-clean-url` | Allows a valid URL. For example, http://www.example.com or www.example.com. |
394+
| `validate-currency-dollar` | Allows a valid (dollar) amount. For example, $100.00. |
395+
| `validate-data` | Allows usage of letters (a-z or A-Z), numbers (0-9), or underscores (\_) only.<br>The first character must be a letter.<br>(Must match expression: `/^[A-Za-z]+[A-Za-z0-9_]+$/`)<br>Validation failure message: "Please use only letters (a-z or A-Z), numbers (0-9) or underscore (\_) in this field, and the first character should be a letter." |
396+
| `validate-date-au` | Enforces the following date format: dd/mm/yyyy. For example, 17/03/2006 for the 17th of March, 2006. |
397+
| `validate-email` | Allows a valid email address. For example, johndoe@domain.com. |
398+
| `validate-emailSender` | Allows a valid email address. For example, johndoe@domain.com. |
399+
| `validate-fax` | Allows a valid fax number. For example, 123-456-7890. |
400+
| `validate-no-empty` | Disallows an empty value (equivalent validation as `requried-entry`).<br>Validation failure message: "Empty value." |
401+
| `validate-no-html-tags` | Disallows usage of HTML tags. |
402+
| `validate-password` | Allows 6 or more characters. Leading and trailing spaces will be ignored. |
403+
| `validate-phoneLax` | Allows a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
404+
| `validate-phoneStrict` | Allows a valid phone number. For example, (123) 456-7890 or 123-456-7890. |
405+
| `validate-select` | Enforces that the select option chosen not have a `null` value, string value of `none` or string length of 0. |
406+
| `validate-ssn` | Allows a valid (US) social security number. For example, 123-45-6789. |
407+
| `validate-street` | Allows usage of letters (a-z or A-Z), numbers (0-9), spaces, and “#” only. |
408+
| `validate-url` | Allows a valid URL. Protocol is required (http://, https:// or ftp://). |
409+
| `validate-xml-identifier` | Allows a valid XML-identifier. For example, something_1, block5, id-4. |
410+
| `validate-zip-us` | Allows a valid (US) ZIP code. For example, 90602 or 90602-1234. |
411+
| `vinUS` | Allows (US) vehicle identification number (VIN) value. |

0 commit comments

Comments
 (0)