From f79e1b5f3d8763b28c8ccacaf64ca2214c7bfdc4 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 18 Oct 2021 11:44:49 +0200
Subject: [PATCH] =?UTF-8?q?Button=20ver=C3=A4nderungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 login/ChangePW.aspx.vb   | 2 +-
 login/ForgotPW.aspx.vb   | 2 +-
 login/login_FLEX.aspx    | 6 +++---
 login/login_FLEX.aspx.vb | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/login/ChangePW.aspx.vb b/login/ChangePW.aspx.vb
index df2177e..ed59ad3 100644
--- a/login/ChangePW.aspx.vb
+++ b/login/ChangePW.aspx.vb
@@ -54,7 +54,7 @@ Partial Class login_ChangePW
         Dim tempstr As String = ""
         Dim Msg, Style, Title As String
 
-        If String.IsNullOrEmpty(txt_Pw.Text) = Not True AndAlso String.IsNullOrEmpty(txt_Pw_WH.Text) = Not True AndAlso txt_Pw_M.Attributes.Item("Placeholder") = "Enter Password" AndAlso txt_Pw_WH_M.Attributes.Item("Placeholder") = "Repeat Password" Then
+        If String.IsNullOrEmpty(txt_Pw.Text) = Not True AndAlso String.IsNullOrEmpty(txt_Pw_WH.Text) = Not True AndAlso txt_Pw_M.Attributes.Item("Placeholder") = "Enter Password" And String.IsNullOrEmpty(txt_Pw_M.Text) AndAlso txt_Pw_WH_M.Attributes.Item("Placeholder") = "Repeat Password" Then
 
             reqPasswtxt.Validate()
             reqPassw1txt.Validate()
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 345b9a0..7a4a805 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -51,7 +51,7 @@ Partial Class login_ForgotPW
             ' MsgBox("3" + email + " " + username)
 
             'Mobil
-        ElseIf txtEmail.Text = "E-Mail" And txt_Username.Attributes.Item("Username") And Not txtEmail_M.Text = "E-Mail" And Not txt_Username_M.Attributes.Item("Placeholder") = "Username" And String.IsNullOrEmpty(txtEmail_M.Text) = False And String.IsNullOrEmpty(txt_Username_M.Text) = False Then
+        ElseIf txtEmail.Text = "E-Mail" And txt_Username.Attributes.Item("Username") And Not txtEmail_M.Text = "E-Mail" And Not txt_Username_M.Attributes.Item("Placeholder") = "Username" And Not String.IsNullOrEmpty(txt_Username_M.Text) = True And Not String.IsNullOrEmpty(txtEmail_M.Text) = True AndAlso String.IsNullOrEmpty(txt_Username.Text) = True And String.IsNullOrEmpty(txtEmail.Text) = True And String.IsNullOrEmpty(txtEmail_M.Text) = False And String.IsNullOrEmpty(txt_Username_M.Text) = False Then
             valreqtxtEmail_M.Enabled = True
             regexval_2_txt_Email_M.Enabled = True
             regexval_txt_Email.Enabled = False
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 0086d33..1e8437f 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -334,7 +334,7 @@
                                </tr>                           
                                 <tr style="color:#003680; height:86px">
                                         <td align="left">                                                                           
-                                            <asp:TextBox ID="CustomerID_M" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID_M" Width="325" Placeholder="User-ID" Font-Size="2.025em" OnClick="this.value='';" style="margin-left: 22px;margin-top:20px;"></asp:TextBox>                                             
+                                            <asp:TextBox ID="CustomerID_M" CssClass="bg-UID-icon" runat="server" required="true" ValidationGroup="txt_checkUID_M" Width="325" Placeholder="User-ID" Font-Size="2.025em" style="margin-left: 22px;margin-top:20px;"></asp:TextBox>                                             
                                             <asp:RequiredFieldValidator ID="CustomerID_M_required" runat="server" ControlToValidate="CustomerID_M" SetFocusOnError="false" ValidationGroup="txt_checkUID_M" ErrorMessage="Please enter the User-ID."></asp:RequiredFieldValidator>                                      
                                             <asp:RegularExpressionValidator ID="valid_getNumber_M_Input" ControlToValidate="CustomerID_M" ValidationGroup="txt_checkUID_M" runat="server" Display="Dynamic" SetFocusOnError="false" ValidationExpression="[0-9]{4,10}"></asp:RegularExpressionValidator>
                                         </td>
@@ -342,7 +342,7 @@
                                 <tr style="color:#003680; height:86px;">  
                                      <td align="left" colspan="2">         
                                          
-                                        <asp:TextBox id="UserName_M" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "325" ValidationGroup="txt_Username" Placeholder="Username" required="true" Font-Size="2.025em"  style="margin-left:22px;color:#003680" OnClick="this.value='';"></asp:TextBox>                                                
+                                        <asp:TextBox id="UserName_M" runat="server" CssClass="bg-user-icon" TextMode="SingleLine" Width = "325" ValidationGroup="txt_Username" Placeholder="Username" required="true" Font-Size="2.025em"  style="margin-left:22px;color:#003680"></asp:TextBox>                                                
                                      
             <asp:RequiredFieldValidator ID="UserName_M_required" runat="server" ControlToValidate="UserName_M" ErrorMessage="Please enter the  Username." ToolTip="The Username is required." ValidationGroup="txt_Username"></asp:RequiredFieldValidator> 
                                    <asp:RegularExpressionValidator ID="check_UserName_M_regex" ControlToValidate="UserName_M" ValidationGroup="txt_check_username" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z]{4,30})$"></asp:RegularExpressionValidator>
@@ -350,7 +350,7 @@
                                 </tr>
                                <tr style="color:#003680; height:86px;">  
                                      <td align="left" colspan="2">                                        
-                                        <asp:TextBox ID="Password_M" runat="server" CssClass="bg-key-icon" TextMode="Password" required="true" Width = "325" Font-Size="2.025em" ValidationGroup="chk_PWField" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:22px;color:#003680" OnClick="this.value='';" Placeholder="Password" Text="Password"></asp:TextBox>                                    
+                                        <asp:TextBox ID="Password_M" runat="server" CssClass="bg-key-icon" TextMode="Password" required="true" Width = "325" Font-Size="2.025em" ValidationGroup="chk_PWField" MaxLength="30" AutoCompleteType="Enabled" CausesValidation="true" style="margin-left:22px;color:#003680" Placeholder="Password" Text="Password"></asp:TextBox>                                    
                                          <asp:RequiredFieldValidator ID="Passwordrequired_M" runat="server" ControlToValidate="Password_M" ErrorMessage="Password is needed to authenticate." ToolTip="Please enter the Password." ValidationGroup="chk_PWField"></asp:RequiredFieldValidator>                                                                    
                                          <asp:RegularExpressionValidator ID="checkpwd_M_REGEX" ControlToValidate="Password_M" ValidationGroup="chk_PWField_M" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[^a-zA-Z\d]){4,35}$"></asp:RegularExpressionValidator>
                                      </td>
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index c8ae699..4d6b145 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -6,7 +6,7 @@ Partial Class login_FLEX
 
     Protected Sub Page_Load(sender As Object, e As EventArgs)
         If Not Page.IsPostBack Then
-
+            Page.Validate()
         End If
     End Sub
     Protected Sub ValidateUser(sender As Object, e As EventArgs)
@@ -62,6 +62,6 @@ Partial Class login_FLEX
     End Sub
 
     Protected Sub LoginButton_Click(sender As Object, e As EventArgs)
-        Page.Validate()
+
     End Sub
 End Class