From e3f104ccf9a38f868a999d6cebe5fc17475bb642 Mon Sep 17 00:00:00 2001
From: janis <jahu04@outlook.com>
Date: Tue, 19 Sep 2023 14:33:29 +0200
Subject: [PATCH] improve email checker

---
 src/webapp/main/src/views/user/AccountView.vue | 4 ++--
 src/webapp/main/src/views/user/SignupView.vue  | 5 ++---
 src/webapp/setup/src/views/SetupRootView.vue   | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/webapp/main/src/views/user/AccountView.vue b/src/webapp/main/src/views/user/AccountView.vue
index 7955169..1c39333 100644
--- a/src/webapp/main/src/views/user/AccountView.vue
+++ b/src/webapp/main/src/views/user/AccountView.vue
@@ -200,7 +200,7 @@
                                     return false;
                                 }
                             }
-                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) ) ) { 
+                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '-' || mail[ l ] === '_' ) ) { 
                             return false 
                         }
                     } else {
@@ -210,7 +210,7 @@
                             } else {
                                 return false;
                             }
-                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '.' ) ) {
+                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '.' || mail[ l ] === '-' || mail[ l ] == '_' ) ) {
                             return false;
                         }
                     }
diff --git a/src/webapp/main/src/views/user/SignupView.vue b/src/webapp/main/src/views/user/SignupView.vue
index e522137..a028ecd 100644
--- a/src/webapp/main/src/views/user/SignupView.vue
+++ b/src/webapp/main/src/views/user/SignupView.vue
@@ -101,7 +101,7 @@
                                     return false;
                                 }
                             }
-                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) ) ) { 
+                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '-' || mail[ l ] === '_' ) ) { 
                             return false 
                         }
                     } else {
@@ -111,11 +111,10 @@
                             } else {
                                 return false;
                             }
-                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '.' ) ) {
+                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '.' || mail[ l ] === '-' || mail[ l ] == '_' ) ) {
                             return false;
                         }
                     }
-                    
                 }
                 if ( mail.length > stat[ 'topLevelPos' ] + 2 && stat[ 'topLevelPos' ] > 0 && stat[ 'atPos' ] > 0 ) {
                     return true;
diff --git a/src/webapp/setup/src/views/SetupRootView.vue b/src/webapp/setup/src/views/SetupRootView.vue
index 711167e..474e9b8 100644
--- a/src/webapp/setup/src/views/SetupRootView.vue
+++ b/src/webapp/setup/src/views/SetupRootView.vue
@@ -95,7 +95,7 @@
                                     return false;
                                 }
                             }
-                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) ) ) { 
+                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '-' || mail[ l ] === '_' ) ) { 
                             return false 
                         }
                     } else {
@@ -105,11 +105,10 @@
                             } else {
                                 return false;
                             }
-                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '.' ) ) {
+                        } else if ( !( /[a-z]/.test( mail[ l ] ) || /[A-Z]/.test( mail[ l ] ) || /[1-9]/.test( mail[ l ] ) || mail[ l ] === '.' || mail[ l ] === '-' || mail[ l ] == '_' ) ) {
                             return false;
                         }
                     }
-                    
                 }
                 if ( mail.length > stat[ 'topLevelPos' ] + 2 && stat[ 'topLevelPos' ] > 0 && stat[ 'atPos' ] > 0 ) {
                     return true;