From 0fc10866d751db7dedf3228c3eb0a981ca22b9f6 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 25 Oct 2021 10:38:49 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20validatoren?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 login/ForgotPW.aspx | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index b8d207e..d6066f9 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -260,21 +260,23 @@
                 <tr style="color:#003680; height:30px;">                                 
                     <td align="left" colspan="2">  
                         <asp:TextBox ID="txtEmail" runat="server" Width="265" ValidationGroup="val-desk" ForeColor="Red" Font-Size="1.125em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:45px;color:#003680"/>                    
-                        <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" SetFocusOnError="true" ValidationGroup="val-desk" runat="server" Text="" ForeColor="Red"></asp:RequiredFieldValidator>                        
-                        <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@(\bverag.ag\b)" Display="Dynamic" SetFocusOnError="true" style="font-size:1em" ForeColor="Red"></asp:RegularExpressionValidator>
+                        <asp:RequiredFieldValidator ID="valreqtxtEmail" ControlToValidate="txtEmail" SetFocusOnError="true" ValidationGroup="val-desk" runat="server" Text="" ForeColor="Red"></asp:RequiredFieldValidator>                       
+                        
    
                     </td></tr>
                 <tr style="color:#003680; height:20px;">                                
                      <td align="left" colspan="2"> 
                     <asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="val-desk" Placeholder="Username" Font-Size="1.125em" Width="265" style="margin-left:45px;color:#003680;margin-bottom:-6px" />
                         <asp:RequiredFieldValidator ID="valreqtxtusername" SetFocusOnError="false" ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" Text="" ErrorMessage=""></asp:RequiredFieldValidator>           
-                        <asp:RegularExpressionValidator ID="check_UserName_regex" ErrorMessage="The Username don't meet the requirements. Try again." ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" Display="Dynamic" SetFocusOnError="false" ForeColor="Red" ValidationExpression="([a-zA-Z1-9]{4,30})"></asp:RegularExpressionValidator>
+                
                      </td></tr>
-                <tr style="color:#003680; height:10px;">
+                <tr style="color:#003680; height:30px;">
                 <td align="right" colspan="2">                    
                 <asp:Label ID="lblMessage" runat="server" />
                     <asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="txt_CustomerID" style="font-size:17px" ForeColor="Red" ValidationGroup="val-desk" runat="server" Display="Dynamic" SetFocusOnError="false" ErrorMessage="The Customer-ID is not valid." ValidationExpression="[0-9]{4,10}"></asp:RegularExpressionValidator>
-                                     <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email_2" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ForeColor="Red" SetFocusOnError="true"></asp:RegularExpressionValidator>    
+                    <asp:RegularExpressionValidator ID="check_UserName_regex" ErrorMessage="The Username don't meet the requirements. Try again." ControlToValidate="txt_Username" ValidationGroup="val-desk" runat="server" Display="Dynamic" SetFocusOnError="false" ForeColor="Red" ValidationExpression="([a-zA-Z1-9]{4,30})"></asp:RegularExpressionValidator>
+                    <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email_2" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ForeColor="Red" SetFocusOnError="true"></asp:RegularExpressionValidator>    
+                    <asp:RegularExpressionValidator ControlToValidate="txtEmail" runat="server" ID="regexval_txt_Email" ValidationGroup="val-desk" ValidationExpression="[\w\.]{0,2}\@(\bverag.ag\b)" Display="Dynamic" SetFocusOnError="true" style="font-size:1em" ForeColor="Red"></asp:RegularExpressionValidator>
                 </td></tr>                
                 <tr style="color:#003680; height:32px;"><td>    
                      <asp:LinkButton ID="btn_Send" runat="server" CssClass="btn btn-primary" Width="265px" Enabled="true" AutoPostBack="True" Font-Size="22px" style="margin-left:49px;border:none" OnClick="btn_Send_Click" Height="40px"><center><label for="btn_Send" style="color:#fff;margin:0 2px 2px auto;font-size:21px"><center>Send</center></label></center></asp:LinkButton> 
@@ -293,30 +295,30 @@
                                </tr>
                  <tr style="color:#003680; height:92px;">
                    <td align="left" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;">                                     
-            <asp:Label ID="lbl_PWvergessen_M" Text="Forgot your password?" runat="server" style="color:#003680; margin-left:61px;font-size:22px; "></asp:Label>
+                        <asp:Label ID="lbl_PWvergessen_M" Text="Forgot your password?" runat="server" style="color:#003680; margin-left:61px;font-size:22px; "></asp:Label>
                    </td></tr>                
               <tr style="color:#003680;height:40px;">                                
                      <td align="left" colspan="2">  
                          <asp:TextBox ID="txt_CustomerID_M" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="val-mobil" Width="325" Placeholder="Customer-ID" Font-Size="2.025em" style="margin:0 21px auto 22px"></asp:TextBox>                                             
-                         <asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="txt_CustomerID_M" SetFocusOnError="false" ForeColor="Red" Font-Size="24px" style="margin-left:22px;" ValidationGroup="val-mobil" ErrorMessage=""></asp:RequiredFieldValidator>                                      
-                         <asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="txt_CustomerID_M" ValidationGroup="val-mobil" ForeColor="Red" Font-Size="24px" runat="server" style="margin-left:22px;" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{4,10}" ErrorMessage="The Customer-ID is not valid."></asp:RegularExpressionValidator>
+                         <asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="txt_CustomerID_M" SetFocusOnError="true" ForeColor="Red" Font-Size="24px" style="margin-left:22px;" ValidationGroup="val-mobil" ErrorMessage=""></asp:RequiredFieldValidator>                                                               
                          </td></tr>
                 <tr style="color:#003680; height:40px;">                                 
                     <td align="left" colspan="2">  
                         <asp:TextBox ID="txtEmail_M" runat="server" Width="325px" ValidationGroup="val-mobil" Font-Size="2.025em" Placeholder="E-Mail" CssClass="bg-email-icon" style="margin-left:25px;color:#003680;margin-bottom:60px"/>                    
-                        <asp:RequiredFieldValidator ID="valreqtxtEmail_M" SetFocusOnError="false" ControlToValidate="txtEmail_M" ValidationGroup="val-mobil" runat="server" Text="Require E-Mail Address" ></asp:RequiredFieldValidator>                        
-                        <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="24px" runat="server" ID="regexval_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[a-zA-Z]{2}\@(\bverag.ag\b)" Display="Dynamic" ErrorMessage="The E-Mail has not the correct domain!" SetFocusOnError="true"></asp:RegularExpressionValidator>
-                        <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="24px"  runat="server" ID="regexval_2_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ErrorMessage="Plase enter an correct e-mail" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                        <asp:RequiredFieldValidator ID="valreqtxtEmail_M" SetFocusOnError="true" ControlToValidate="txtEmail_M" ValidationGroup="val-mobil" runat="server" Text="" ></asp:RequiredFieldValidator>                   
                     </td></tr>
                 <tr style="color:#003680; height:40px;">                                
                      <td align="left" colspan="2"> 
                     <asp:TextBox ID="txt_Username_M" runat="server" CssClass="bg-user-icon" ValidationGroup="val-mobil" Placeholder="Username" Font-Size="2.025em" Width="325px" style="margin-left:25px;color:#003680" OnClick="this.value='';" />
-                     <asp:RequiredFieldValidator ID="valreqtxtusername_M" ForeColor="Red" ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Text="Require Username" ErrorMessage="Please give a Username." SetFocusOnError="false"></asp:RequiredFieldValidator>        
-                         <asp:RegularExpressionValidator ID="check_UserName_regex_M" ForeColor="Red" Font-Size="24px" ErrorMessage="The Username don't meet the rquirements. Try again." ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$"></asp:RegularExpressionValidator>
+                     <asp:RequiredFieldValidator ID="valreqtxtusername_M" ForeColor="Red" ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Text="" ErrorMessage="" SetFocusOnError="true"></asp:RequiredFieldValidator>                                
                      </td></tr>
                 <tr style="color:#003680; height:50px;">
                 <td align="right" colspan="2">                    
                 <asp:Label ID="lblMessage_M" Font-Size="24px" runat="server" />
+                    <asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="txt_CustomerID_M" ValidationGroup="val-mobil" ForeColor="Red" Font-Size="24px" runat="server" style="margin-left:22px;" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{4,10}" ErrorMessage="The Customer-ID is not valid."></asp:RegularExpressionValidator>
+                    <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="24px"  runat="server" ID="regexval_2_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[\w\.]+\@[\w]+(?:\.[\w]{3}|\.[\w]{2}\.[\w]{2}|\.[\w]{2})\b" Display="Dynamic" ErrorMessage="Plase enter an correct e-mail" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                    <asp:RegularExpressionValidator ControlToValidate="txtEmail_M" ForeColor="Red" Font-Size="24px" runat="server" ID="regexval_txt_Email_M" ValidationGroup="val-mobil" ValidationExpression="[a-zA-Z]{2}\@(\bverag.ag\b)" Display="Dynamic" ErrorMessage="" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                     <asp:RegularExpressionValidator ID="check_UserName_regex_M" ForeColor="Red" Font-Size="24px" ErrorMessage="The Username don't meet the rquirements. Try again." ControlToValidate="txt_Username_M" ValidationGroup="val-mobil" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$"></asp:RegularExpressionValidator>
                     </td></tr>                
                 <tr style="color:#003680; height:40px;"><td>        
                     <asp:Button ID="btn_Send_M" runat="server" Text="Send" Width="325px" Enabled="true" AutoPostBack="True" Font-Size="22px" style="margin-left:22px;border:none" OnClick="btn_Send_M_Click" Height="37px" />