From 740496bca66c84798c005b28e87e7e4f2cad8cd7 Mon Sep 17 00:00:00 2001 From: Emna Zouaghi Date: Wed, 18 Apr 2018 10:22:56 +0100 Subject: [PATCH 1/2] fix/PLF-7973 : address of a site in .bzh is not accepted --- .../org/exoplatform/social/user/form/UIEditUserProfileForm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java b/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java index 550638783c..44f6a9040e 100644 --- a/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java +++ b/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java @@ -85,7 +85,7 @@ public class UIEditUserProfileForm extends UIForm { "(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." + // IPAddress "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|" + // IPAddress "(?:(?:[-\\p{L}\\p{Digit}\\+\\$\\-\\*\\=]+\\.)+" + - "(?:com|org|net|edu|gov|mil|biz|info|mobi|name|aero|jobs|museum|travel|asia|cat|coop|int|pro|tel|xxx|[a-z]{2}))))|" + //Domain + "(?:com|org|net|edu|gov|mil|biz|bzh|info|mobi|name|aero|jobs|museum|travel|asia|cat|coop|int|pro|tel|xxx|[a-z]{2}))))|" + //Domain "(?:(?:(?:ht)tp(?:s?)\\:\\/\\/)(?:\\w+:\\w+@)?(?:[-\\p{L}\\p{Digit}\\+\\$\\-\\*\\=]+))" + // Protocol with hostname ")" + "(?::[\\d]{1,5})?" + // port From 7c660be1b22d5957af07ac6c27ae31cb1407c2fe Mon Sep 17 00:00:00 2001 From: Emna Zouaghi Date: Wed, 18 Apr 2018 12:35:03 +0100 Subject: [PATCH 2/2] fix/PLF-7973 : address of a site in .bzh is not accepted --- .../org/exoplatform/social/user/form/UIEditUserProfileForm.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java b/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java index 44f6a9040e..cf20490ea1 100644 --- a/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java +++ b/webapp/portlet/src/main/java/org/exoplatform/social/user/form/UIEditUserProfileForm.java @@ -85,7 +85,7 @@ public class UIEditUserProfileForm extends UIForm { "(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\." + // IPAddress "(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|" + // IPAddress "(?:(?:[-\\p{L}\\p{Digit}\\+\\$\\-\\*\\=]+\\.)+" + - "(?:com|org|net|edu|gov|mil|biz|bzh|info|mobi|name|aero|jobs|museum|travel|asia|cat|coop|int|pro|tel|xxx|[a-z]{2}))))|" + //Domain + "(?:[a-z]{2,}))))|" + //Domain "(?:(?:(?:ht)tp(?:s?)\\:\\/\\/)(?:\\w+:\\w+@)?(?:[-\\p{L}\\p{Digit}\\+\\$\\-\\*\\=]+))" + // Protocol with hostname ")" + "(?::[\\d]{1,5})?" + // port