Merge branch '1.0'

uvdesk · Nov 12, 2020 · 82152e6 · 82152e6
2 parents d2672e4 + a87799a
commit 82152e6
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/Resources/views/Agents/createSupportAgent.html.twig b/Resources/views/Agents/createSupportAgent.html.twig
@@ -368,7 +368,7 @@
                         required: true,
                         msg: '{{ "This field is mandatory" | trans}}'
                     },{
-                        pattern:  /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
+                        pattern:  /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
                         msg: '{{ "This is not a valid email address" | trans}}'
                     }],
                     'user_form[contactNumber]': function(value) {

diff --git a/Resources/views/Agents/updateSupportAgent.html.twig b/Resources/views/Agents/updateSupportAgent.html.twig
@@ -420,7 +420,7 @@
                         required: true,
                         msg: '{{ "This field is mandatory"|trans }}'
                     },{
-                        pattern:  /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
+                        pattern:  /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
                         msg: '{{ "This is not a valid email address"|trans }}'
                     }],
                     'user_form[contactNumber]': function(value) {

diff --git a/Resources/views/Customers/createSupportCustomer.html.twig b/Resources/views/Customers/createSupportCustomer.html.twig
@@ -154,7 +154,7 @@
                         required: true,
                         msg: '{{ "This field is mandatory"|trans }}'
                     },{
-                        pattern: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
+                        pattern: /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
                         msg: '{{ "Email address is invalid"|trans }}'
                     }],
                     'customer_form[contactNumber]': function(value) {

diff --git a/Resources/views/Customers/updateSupportCustomer.html.twig b/Resources/views/Customers/updateSupportCustomer.html.twig
@@ -157,7 +157,7 @@
                         required: true,
                         msg: '{{ "This field is mandatory"|trans }}'
                     },{
-                        pattern: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
+                        pattern: /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
                         msg: '{{ "Email address is invalid"|trans }}'
                     }],
                     'customer_form[contactNumber]': function(value) {

diff --git a/Resources/views/Snippets/createMemberTicket.html.twig b/Resources/views/Snippets/createMemberTicket.html.twig
@@ -116,7 +116,7 @@
                         required : true,
                         msg : "{{ 'This field is mandatory'|trans }}"
                     },{
-                        pattern : /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
+                        pattern : /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
                         msg : "{{ 'Email address is invalid'|trans }}"
                     }],
                 {% endif %}

diff --git a/Resources/views/SwiftMailer/manageConfigurations.html.twig b/Resources/views/SwiftMailer/manageConfigurations.html.twig
@@ -248,7 +248,7 @@
                             msg: '{{ "Please specify a valid email address"|trans }}'
                         },
                         {
-                            pattern: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
+                            pattern: /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
                             msg: '{{ "Please specify a valid email address"|trans }}'
                         }
                     ],

diff --git a/Resources/views/ticket.html.twig b/Resources/views/ticket.html.twig
@@ -1403,7 +1403,7 @@
                         required: true,
                         msg: '{{ "This field is mandatory" | trans}}'
                     },{
-                        pattern: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
+                        pattern: /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
                         msg: 'Please enter a valid email'
                     }],
                     'subject' : {
@@ -1448,7 +1448,7 @@
                         required: true,
                         msg: '{{ "This field is mandatory" | trans}}'
                     },{
-                        pattern: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
+                        pattern: /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
                         msg: '{{ "Email address is invalid" | trans}}'
                     }],
                     'contactNumber': function(value) {
@@ -1469,7 +1469,7 @@
                         required: true,
                         msg: '{{ "This field is mandatory" | trans}}'
                     },{
-                        pattern: /^([\w-\.]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)|(([\w-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$/,
+                        pattern: /^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
                         msg: '{{ "Please enter a valid email" | trans}}'
                     }]
                 },