änderungen nach revert

This commit is contained in:
ja
2021-11-18 15:56:59 +01:00
parent 13b6e6f85a
commit 26b9c81122
2 changed files with 23 additions and 48 deletions

View File

@@ -308,31 +308,7 @@
<td style="width:308px" colspan="2">
<table style="margin-left:42px;height:auto">
<tr>
<td> <asp:ImageButton ID="Image1_M" runat="server" ImageUrl="~/images/Icons/service/hilfe.png" Height="17px" Width="15px" style="margin-left:-24px"/>
<asp:Label ID="Label1" runat="server" style="color:#003680;">The Password has to contain:</asp:Label>
</td>
</tr>
<tr>
<td>
<asp:Label ID="Label3" runat="server" style="color:#003680;">1 Uppercase</asp:Label>
</td>
</tr>
<tr>
<td>
<asp:Label ID="Label4" runat="server" style="color:#003680;">1 Downcase </asp:Label>
</td>
</tr>
<tr>
<td>
<asp:Label ID="Label7" runat="server" style="color:#003680;">and one special letter</asp:Label>
</td>
</tr>
<tr>
<td>
<asp:Label ID="Label1" runat="server" style="color:#003680;">The Password has to contain:</asp:Label>
</td>
</tr>
</table>
<ul style="list-style:circle;margin-left:48px">
<li>
<asp:Label ID="Label3" runat="server" style="color:#003680;margin-left:2px">1 Uppercase</asp:Label>

View File

@@ -161,7 +161,7 @@ Partial Class login_Change_PW
If dr.HasRows Then
dr.Read()
If String.Equals(txt_Pw_WH.Text, dr("Password").ToString) = False Then
tempstr = txt_Pw.Text
tempstr = txt_Pw_WH.Text
Else
lbl_messagetext.Text = "Die gewählten Passwörter dürfen nicht dem alten entsprechen!"
End If
@@ -173,13 +173,14 @@ Partial Class login_Change_PW
Else
VERAG_VARIABLES.seterrorcount(22)
lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb + "Error bei der Passwort-Validation."
tempstr = "Error02"
End If
Else
tempstr = "Error01"
End If
If String.Equals(txt_Pw.Text, tempstr, StringComparison.CurrentCulture) = True AndAlso String.Equals(txt_Pw_WH.Text, tempstr, StringComparison.CurrentCulture) = True AndAlso String.IsNullOrEmpty(txt_Pw_M.Text) = True And String.IsNullOrEmpty(txt_Pw_WH_M.Text) = True And String.Equals(tempstr, "Error01", StringComparison.CurrentCulture) = False Then
If String.Equals(txt_Pw.Text, tempstr) = True AndAlso String.Equals(txt_Pw_WH.Text, tempstr) = True AndAlso String.IsNullOrEmpty(txt_Pw_M.Text) = True And String.IsNullOrEmpty(txt_Pw_WH_M.Text) = True And String.Equals(tempstr, "Error01") = False And tempstr = "Error02" Then
txt_Pw_WH_M.Enabled = False
@@ -205,27 +206,25 @@ Partial Class login_Change_PW
'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;"
End If
If regexval_txt_Pw.IsValid = True Then
If String.Equals(txt_Pw_WH.Text, tempstr) = True AndAlso String.Equals(txt_Pw.Text, tempstr) = True AndAlso String.IsNullOrEmpty(txt_Pw_M.Text) = True And String.IsNullOrEmpty(txt_Pw_WH_M.Text) = True And String.Equals(tempstr, "Error01") = False Then
Using con As New SqlConnection(ConnectionString)
Using cmd As New SqlCommand("UPDATE [VERAG_HOMEPAGE].[dbo].[Users] SET [Password]=@Password WHERE [Username]=@Username AND [UserId]=@UserId")
' cmd.CommandType = CommandType.StoredProcedure
cmd.Parameters.AddWithValue("@Username", usrname)
cmd.Parameters.AddWithValue("@Password", txt_Pw_WH.Text)
cmd.Parameters.AddWithValue("@UserId", UsrID)
cmd.Connection = con
con.Open()
If String.IsNullOrEmpty(usrname) = False Then
cmd.ExecuteNonQuery()
btn_submitpw.Visible = True
Else
VERAG_VARIABLES.seterrorcount(25)
lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb() + "Fehler bei der Behebung des Passwortwechsels."
End If
End Using
con.Close()
Using con As New SqlConnection(ConnectionString)
Using cmd As New SqlCommand("UPDATE [VERAG_HOMEPAGE].[dbo].[Users] SET [Password]=@Password WHERE [Username]=@Username AND [UserId]=@UserId")
' cmd.CommandType = CommandType.StoredProcedure
cmd.Parameters.AddWithValue("@Username", usrname)
cmd.Parameters.AddWithValue("@Password", tempstr)
cmd.Parameters.AddWithValue("@UserId", UsrID)
cmd.Connection = con
con.Open()
If String.IsNullOrEmpty(usrname) = False Then
cmd.ExecuteNonQuery()
btn_submitpw.Visible = True
Else
VERAG_VARIABLES.seterrorcount(25)
lbl_messagetext.Text = VERAG_VARIABLES.geterrornumb() + "Fehler bei der Behebung des Passwortwechsels."
End If
End Using
End If
con.Close()
End Using
Else
VERAG_VARIABLES.seterrorcount(22)
lbl_messagetext_M.ForeColor = Drawing.Color.Red
@@ -344,7 +343,7 @@ Partial Class login_Change_PW
Dim dr As SqlDataReader = cmd.ExecuteReader()
If dr.HasRows Then
dr.Read()
If String.Equals(txt_Pw_M.Text, dr("Password").ToString, StringComparison.CurrentCulture) = False Or String.Equals(txt_Pw_WH_M.Text, dr("Password").ToString, StringComparison.CurrentCulture) = False Then
If String.Equals(txt_Pw_M.Text, dr("Password").ToString) = False Or String.Equals(txt_Pw_WH_M.Text, dr("Password").ToString) = False Then
tempstr = txt_Pw_M.Text
Else
lbl_messagetext_M.ForeColor = Drawing.Color.Red
@@ -378,7 +377,7 @@ Partial Class login_Change_PW
Using cmd As New SqlCommand("UPDATE [VERAG_HOMEPAGE].[dbo].[Users] SET Password=@Password WHERE Username=@Username AND UserId=@UserId")
' cmd.CommandType = CommandType.StoredProcedure
cmd.Parameters.AddWithValue("@Username", usrname)
cmd.Parameters.AddWithValue("@Password", txt_Pw_WH_M.Text)
cmd.Parameters.AddWithValue("@Password", tempstr)
cmd.Parameters.AddWithValue("@UserId", UsrID)
cmd.Connection = con
con.Open()