From 5266e8eeba1a43f1016c2e176ea6badaa38c13fa Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Tue, 28 Dec 2021 18:31:05 +0200
Subject: [PATCH] email address fix

---
 .../res/templates/email/fields/email-address-varchar/edit.tpl   | 2 +-
 client/src/views/email/fields/email-address-varchar.js          | 2 +-
 client/src/views/fields/email.js                                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/res/templates/email/fields/email-address-varchar/edit.tpl b/client/res/templates/email/fields/email-address-varchar/edit.tpl
index b5bade200e..16f24783a7 100644
--- a/client/res/templates/email/fields/email-address-varchar/edit.tpl
+++ b/client/res/templates/email/fields/email-address-varchar/edit.tpl
@@ -1,2 +1,2 @@
 <div class="link-container list-group"></div>
-<input class="form-control" type="text" value="" autocomplete="espo-{{name}}">
+<input class="form-control" type="email" value="" autocomplete="espo-{{name}}">
diff --git a/client/src/views/email/fields/email-address-varchar.js b/client/src/views/email/fields/email-address-varchar.js
index 051f6301d6..774d72c60a 100644
--- a/client/src/views/email/fields/email-address-varchar.js
+++ b/client/src/views/email/fields/email-address-varchar.js
@@ -37,7 +37,7 @@ define(
 
         editTemplate: 'email/fields/email-address-varchar/edit',
 
-        emailAddressRegExp: /([a-zA-Z0-9._\-\+"]+@[a-zA-Z0-9._\-]+\.[a-zA-Z0-9._\-]+)/gi,
+        emailAddressRegExp: /[-!#$%&'*+/=?^_`{|}~A-Za-z0-9]+(?:\.[-!#$%&'*+/=?^_`{|}~A-Za-z0-9]+)*@([A-Za-z0-9]([A-Za-z0-9-]*[A-Za-z0-9])?\.)+[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9]/gi,
 
         data: function () {
             var data = Dep.prototype.data.call(this);
diff --git a/client/src/views/fields/email.js b/client/src/views/fields/email.js
index f4e84b5cff..ba56684c2c 100644
--- a/client/src/views/fields/email.js
+++ b/client/src/views/fields/email.js
@@ -46,7 +46,7 @@ define('views/fields/email', 'views/fields/varchar', function (Dep) {
 
             var addressList = [];
 
-            var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+            var re = /^[-!#$%&'*+/=?^_`{|}~A-Za-z0-9]+(?:\.[-!#$%&'*+/=?^_`{|}~A-Za-z0-9]+)*@([A-Za-z0-9]([A-Za-z0-9-]*[A-Za-z0-9])?\.)+[A-Za-z0-9][A-Za-z0-9-]*[A-Za-z0-9]/;
 
             var notValid = false;