From f345d9721076f47f05ce06a5475024ef8787dffb Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 13 Oct 2021 11:47:02 +0200
Subject: [PATCH] Domain in Regex E-mail abgrage

---
 login/ChangePW.aspx   | 28 ++++++++++++----------------
 login/ForgotPW.aspx   |  2 +-
 login/login_FLEX.aspx |  2 +-
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/login/ChangePW.aspx b/login/ChangePW.aspx
index 4edde46..0c98dff 100644
--- a/login/ChangePW.aspx
+++ b/login/ChangePW.aspx
@@ -91,15 +91,8 @@
                             <asp:TextBox id="txt_Pw" CssClass="bg-key-icon" runat="server" TextMode="Password" Width="250px" Font-Names="Verdana" OnTextChanged="txt_Pw_TextChanged" AutoCompleteType="Disabled" style="margin-left:22px;color:#003680" OnClick="this.value='';"></asp:TextBox> 
                             <span></span>
                             <asp:Image ID="Image1" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="13px" Width="13px" style="margin-left:12px" ToolTip="Das Passwort muss über mindestens 4 Stellen, ein Sonderzeichen, einen Groß- sowie einen Kleinbuchstaben bei maximal 30 Zeichen verfügen."/>
-                            </td>
-                         
-                      <tr style="color:#003680;height:12px;">
-                        <td>                           
-                            <asp:RequiredFieldValidator ID="reqPassw1txt" runat="server" ErrorMessage="Bitte ein Passwort eingeben!" ControlToValidate="txt_Pw" Display="Dynamic"></asp:RequiredFieldValidator>
-                            <asp:RegularExpressionValidator ControlToValidate="txt_Pw" runat="server" ID="regexval_txt_Pw" ValidationGroup="TXT_val" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="Das Passwort muss mindestens den Kriterien des Info-Symbols entsprechen!" SetFocusOnError="true"></asp:RegularExpressionValidator>
-                            </td>
+                            </td>    
                           </tr>
-                     
                      <tr style="color:#003680;height:36.67px;">
                         <td>
                             <asp:TextBox id="txt_Pw_WH" CssClass="bg-key-icon" Width="250px" OnTextChanged="txt_Pw_WH_TextChanged" runat="server" TextMode="Password" Font-Names="Verdana" AutoCompleteType="Disabled" style="margin-left:22px;color:#003680" OnClick="this.value='';"></asp:TextBox>  
@@ -107,19 +100,22 @@
                             <asp:Image ID="Image2" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="13px" Width="13px" style="margin-left:12px" ToolTip="Das Passwort muss  mit dem vorherigen Feld übereinstimmen."/>
                         </td>
                      </tr>
-                      <tr style="color:#003680;height:12px;">
+                      
+                    <tr style="color:#003680;height:36.67px;">
+                        <td>    
+                            <asp:Button ID="btn_submitpw" runat="server" Text="Passwort wechseln" OnClick="btn_submitpw_Click" Width="340px" style="margin-left:27px;border:none"/>
+                        </td>
+                    </tr>
+                          <tr style="color:#003680;height:20px;">
                         <td>
                             <asp:CompareValidator ID="confirmPasswordReq" runat="server" ControlToCompare="txt_Pw" ControlToValidate="txt_Pw_WH" ErrorMessage="Die Passwörter stimmen nicht überein!Bitte nochmals versuchen!" Display="Dynamic"></asp:CompareValidator>
                             <asp:RequiredFieldValidator ID="reqPasswtxt" runat="server" ErrorMessage="Bitte Passwort wiederholen!" ControlToValidate="txt_Pw_WH" Display="Dynamic"></asp:RequiredFieldValidator>
-                             <asp:RegularExpressionValidator ControlToValidate="txt_Pw_WH" runat="server" ID="regexval_txt_Pw_WH" ValidationGroup="TXT_val" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="Das Passwort muss mindestens den Kriterien des Info-Symbols entsprechen!" SetFocusOnError="true"></asp:RegularExpressionValidator>
-                        </td>
+                            <asp:RegularExpressionValidator ControlToValidate="txt_Pw_WH" runat="server" ID="regexval_txt_Pw_WH" ValidationGroup="TXT_val" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="Das Passwort muss mindestens den Kriterien des Info-Symbols entsprechen!" SetFocusOnError="true"></asp:RegularExpressionValidator>                                                  
+                            <asp:RequiredFieldValidator ID="reqPassw1txt" runat="server" ErrorMessage="Bitte ein Passwort eingeben!" ControlToValidate="txt_Pw" Display="Dynamic"></asp:RequiredFieldValidator>
+                            <asp:RegularExpressionValidator ControlToValidate="txt_Pw" runat="server" ID="regexval_txt_Pw" ValidationGroup="TXT_val" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]).{4,35}$" Display="Dynamic" ErrorMessage="Das Passwort muss mindestens den Kriterien des Info-Symbols entsprechen!" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                            </td>
                     </tr>
-                    <tr style="color:#003680;height:36.67px;">
-                        <td>                          
 
-                    <asp:Button ID="btn_submitpw" runat="server" Text="Passwort wechseln" OnClick="btn_submitpw_Click" Width="340px" style="margin-left:27px;border:none"/>
-                        </td>
-                    </tr>
                 </table>
                </center>
             </form>
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 182eddb..8f33967 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -103,7 +103,7 @@
                     <td align="left" colspan="2">  
                         <asp:TextBox ID="txtEmail" runat="server" Width="250px" ValidationGroup="Valtxtemail" Font-Size="1.125em" Text="E-Mail" CssClass="bg-email-icon" style="margin-left:22px;color:#003680" OnClick="this.value='';"/>                    
                         <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" ValidationGroup="Valtxtemail" runat="server" Text="Require E-Mail Address" ></asp:RequiredFieldValidator>
-                        <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="Valtxtemail" ValidationExpression="[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ErrorMessage="The E-Mail has not the correct Format!" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                        <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="Valtxtemail" ValidationExpression="[\w\.]+\@(\bverag.ag\b)" Display="Dynamic" ErrorMessage="The E-Mail has not the correct domain!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                     </td></tr>
                 <tr style="color:#003680; height:30px;">                                
                      <td align="left" colspan="2"> 
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 8f2242d..76e9c68 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -135,7 +135,7 @@
                                      <td align="left" colspan="2">                                                                       
                                         <asp:TextBox ID="UserName" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "250" ValidationGroup="txt_Username" required="true" Font-Size="1.125em"  style="margin-left:22px;color:#003680" OnClick="this.value='';" Text="Username"></asp:TextBox>                                                
                                        <asp:RequiredFieldValidator ID="UserNamerequired" runat="server" ControlToValidate="UserName" ErrorMessage="Please enter the  Username." ToolTip="The Username is required." ValidationGroup="txt_Username"></asp:RequiredFieldValidator> 
-                                   <asp:RegularExpressionValidator ID="check_UserName_regex" ControlToValidate="UserName" ValidationGroup="txt_check_username" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^(A-Z]).{4,30}$"></asp:RegularExpressionValidator>
+                                   <asp:RegularExpressionValidator ID="check_UserName_regex" ControlToValidate="UserName" ValidationGroup="txt_check_username" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^(A-Z][a-z]).{4,30}$"></asp:RegularExpressionValidator>
                                      </td>
                                 </tr>
                                <tr style="color:#003680; height:46px;">