From a08e3f002b94d709c6327ea804a915409dbaccb5 Mon Sep 17 00:00:00 2001 From: Nikos Kalogridis Date: Wed, 16 Dec 2015 23:22:33 +0200 Subject: [PATCH 1/2] fix for Greek mobile phones validation. Previous one validated land line phone numbers as well --- test/validators.js | 8 ++++---- validator.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/validators.js b/test/validators.js index 51a35b7f8..565d18311 100644 --- a/test/validators.js +++ b/test/validators.js @@ -1453,13 +1453,13 @@ describe('Validators', function () { test({ validator: 'isMobilePhone' , valid: [ - '2102323234' - , '+302646041461' - , '+306944848966' + '+306944848966' , '6944848966' ] , invalid: [ - '120000000' + '2102323234' + , '+302646041461' + , '120000000' , '20000000000' , '68129485729' , '6589394827' diff --git a/validator.js b/validator.js index 2e3b2ed08..0c815f82c 100644 --- a/validator.js +++ b/validator.js @@ -90,7 +90,7 @@ 'en-HK': /^(\+?852\-?)?[569]\d{3}\-?\d{4}$/, 'fr-FR': /^(\+?33|0)[67]\d{8}$/, 'pt-PT': /^(\+351)?9[1236]\d{7}$/, - 'el-GR': /^(\+30)?((2\d{9})|(69\d{8}))$/, + 'el-GR': /^(\+30)?(69\d{8})$/, 'en-GB': /^(\+?44|0)7\d{9}$/, 'en-US': /^(\+?1)?[2-9]\d{2}[2-9](?!11)\d{6}$/, 'en-ZM': /^(\+26)?09[567]\d{7}$/, From 13420e3b2444a0da15028a5f4f145c1b715e9b1f Mon Sep 17 00:00:00 2001 From: Nikos Kalogridis Date: Wed, 16 Dec 2015 23:30:12 +0200 Subject: [PATCH 2/2] added + to be optional when country code is entered --- test/validators.js | 1 + validator.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/validators.js b/test/validators.js index 565d18311..4bed78e41 100644 --- a/test/validators.js +++ b/test/validators.js @@ -1455,6 +1455,7 @@ describe('Validators', function () { , valid: [ '+306944848966' , '6944848966' + , '306944848966' ] , invalid: [ '2102323234' diff --git a/validator.js b/validator.js index 0c815f82c..1a030172b 100644 --- a/validator.js +++ b/validator.js @@ -90,7 +90,7 @@ 'en-HK': /^(\+?852\-?)?[569]\d{3}\-?\d{4}$/, 'fr-FR': /^(\+?33|0)[67]\d{8}$/, 'pt-PT': /^(\+351)?9[1236]\d{7}$/, - 'el-GR': /^(\+30)?(69\d{8})$/, + 'el-GR': /^(\+?30)?(69\d{8})$/, 'en-GB': /^(\+?44|0)7\d{9}$/, 'en-US': /^(\+?1)?[2-9]\d{2}[2-9](?!11)\d{6}$/, 'en-ZM': /^(\+26)?09[567]\d{7}$/,