Logik geändert
This commit is contained in:
ja
@@ -287,6 +287,7 @@
|
||||
<tr style="color:#003680; height:30px;">
|
||||
<td align="left" colspan="2">
|
||||
<asp:TextBox ID="txt_Username" runat="server" CssClass="bg-user-icon" ValidationGroup="Valtxtusername" Text="Username" Font-Size="1.125em" Width="265" style="margin-left:45px;color:#003680" OnClick="this.value='';" />
|
||||
<asp:RequiredFieldValidator ID="valreqtxtusername" ControlToValidate="txt_Username" ValidationGroup="Valtxtusername" runat="server" Text="Require Username" ErrorMessage="Please give a Username."></asp:RequiredFieldValidator>
|
||||
<asp:RegularExpressionValidator ID="check_UserName_regex" ErrorMessage="The Username don't meet the rquirements. Try again." ControlToValidate="txt_Username" ValidationGroup="Valtxtusername" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$"></asp:RegularExpressionValidator>
|
||||
</td></tr>
|
||||
<tr style="color:#003680; height:30px;">
|
||||
@@ -331,7 +332,8 @@
|
||||
</td></tr>
|
||||
<tr style="color:#003680; height:80px;">
|
||||
<td align="left" colspan="2">
|
||||
<asp:TextBox ID="txt_Username_M" runat="server" CssClass="bg-user-icon" ValidationGroup="Valtxtusername" Text="Username" Font-Size="2.025em" Width="325px" style="margin-left:25px;color:#003680" OnClick="this.value='';" />
|
||||
<asp:TextBox ID="txt_Username_M" runat="server" CssClass="bg-user-icon" ValidationGroup="Valtxtusername_M" Text="Username" Font-Size="2.025em" Width="325px" style="margin-left:25px;color:#003680" OnClick="this.value='';" />
|
||||
<asp:RequiredFieldValidator ID="valreqtxtusername_M" ControlToValidate="txt_Username_M" ValidationGroup="Valtxtusername_M" runat="server" Text="Require Username" ErrorMessage="Please give a Username."></asp:RequiredFieldValidator>
|
||||
<asp:RegularExpressionValidator ID="check_UserName_regex_M" Font-Size="24px" ErrorMessage="The Username don't meet the rquirements. Try again." ControlToValidate="txt_Username_M" ValidationGroup="Valtxtusername" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^([a-zA-Z1-9]{4,30})$"></asp:RegularExpressionValidator>
|
||||
</td></tr>
|
||||
<tr style="color:#003680; height:30px;">
|
||||
|
||||
@@ -19,51 +19,71 @@ Partial Class login_ForgotPW
|
||||
Dim password As String = String.Empty
|
||||
Dim email As String = String.Empty
|
||||
Dim tokenname As String = String.Empty
|
||||
If txtEmail_M.Text = String.Empty And txt_Username_M.Text = String.Empty AndAlso String.IsNullOrWhiteSpace(txtEmail.Text) = False AndAlso String.IsNullOrWhiteSpace(txt_Username.Text) = False Then
|
||||
If txtEmail_M.Text = "E-Mail" And txt_Username_M.Text = "Username" And Not txtEmail.Text = "E-Mail" And Not txt_Username.Text = "Username" And String.IsNullOrEmpty(txtEmail.Text) = False And String.IsNullOrEmpty(txt_Username.Text) = False Then
|
||||
regexval_2_txt_Email_M.Enabled = False
|
||||
valreqtxtEmail_M.Enabled = False
|
||||
valreqtxtusername_M.Enabled = False
|
||||
valreqtxtusername.Enabled = True
|
||||
valreqtxtEmail.Enabled = True
|
||||
regexval_txt_Email_2.Enabled = True
|
||||
regexval_txt_Email.Enabled = True
|
||||
regexval_2_txt_Email_M.Enabled = False
|
||||
|
||||
valreqtxtEmail.Validate()
|
||||
check_UserName_regex.Validate()
|
||||
If valreqtxtEmail.IsValid = True AndAlso check_UserName_regex.IsValid = True Then
|
||||
If valreqtxtEmail.IsValid = True Then
|
||||
email = txtEmail.Text
|
||||
username = txt_Username.Text
|
||||
ElseIf valreqtxtEmail.IsValid = False Then
|
||||
valreqtxtEmail.ErrorMessage = "Annotation: The given Domain is not the company domain."
|
||||
regexval_txt_Email.Validate()
|
||||
regexval_txt_Email_2.IsValid = True
|
||||
End If
|
||||
|
||||
valreqtxtusername.Validate()
|
||||
If valreqtxtusername.IsValid = True Then
|
||||
check_UserName_regex.Validate()
|
||||
If check_UserName_regex.IsValid = False Then
|
||||
check_UserName_regex.ErrorMessage = "Annotation: The Username does not match the requirements."
|
||||
Else
|
||||
check_UserName_regex.IsValid = True
|
||||
If check_UserName_regex.IsValid = True Then
|
||||
username = txt_Username.Text
|
||||
End If
|
||||
End If
|
||||
End If
|
||||
MsgBox("3" + email + " " + username)
|
||||
|
||||
'Mobil
|
||||
ElseIf txtEmail.Text = String.Empty And txt_Username.Text = String.Empty AndAlso String.IsNullOrWhiteSpace(txtEmail_M.Text) = False AndAlso String.IsNullOrWhiteSpace(txt_Username_M.Text) = False Then
|
||||
ElseIf txtEmail.Text = "E-Mail" And txt_Username.Text = "Username" And Not txtEmail_M.Text = "E-Mail" And Not txt_Username_M.Text = "Username" 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
|
||||
regexval_txt_Email_2.Enabled = False
|
||||
regexval_2_txt_Email_M.Enabled = True
|
||||
valreqtxtusername.Enabled = False
|
||||
valreqtxtusername_M.Enabled = True
|
||||
valreqtxtEmail_M.Validate()
|
||||
check_UserName_regex_M.Validate()
|
||||
If valreqtxtEmail_M.IsValid = True AndAlso check_UserName_regex_M.IsValid = True Then
|
||||
|
||||
If valreqtxtEmail_M.IsValid = True Then
|
||||
email = txtEmail_M.Text
|
||||
username = txt_Username_M.Text
|
||||
ElseIf valreqtxtEmail_M.IsValid = False Then
|
||||
valreqtxtEmail_M.ErrorMessage = "Annotation: The given Domain is not the company domain."
|
||||
regexval_2_txt_Email_M.Validate()
|
||||
valreqtxtEmail_M.IsValid = True
|
||||
regexval_txt_Email_M.Validate()
|
||||
regexval_txt_Email_2.IsValid = True
|
||||
End If
|
||||
|
||||
valreqtxtusername_M.Validate()
|
||||
If valreqtxtusername_M.IsValid = True Then
|
||||
check_UserName_regex_M.Validate()
|
||||
If check_UserName_regex_M.IsValid = False Then
|
||||
check_UserName_regex_M.ErrorMessage = "Annotation: The Username does not match the requirements."
|
||||
Else
|
||||
check_UserName_regex_M.IsValid = True
|
||||
End If
|
||||
If check_UserName_regex_M.IsValid = True Then
|
||||
username = txt_Username_M.Text
|
||||
End If
|
||||
End If
|
||||
|
||||
If String.IsNullOrEmpty(email) = False AndAlso String.IsNullOrEmpty(tokenname) = True And String.IsNullOrEmpty(password) = True AndAlso String.IsNullOrEmpty(username) = False Then
|
||||
|
||||
End If
|
||||
MsgBox("Userdaten in App" + Environment.NewLine + email + Environment.NewLine + username + Environment.NewLine + "Userdaten desktop" + txt_Username.Text + Environment.NewLine + txtEmail.Text + Environment.NewLine + "Userdaten Mobil:" + Environment.NewLine + txtEmail_M.Text + Environment.NewLine + txt_Username_M.Text)
|
||||
If String.IsNullOrEmpty(email) = False And String.IsNullOrEmpty(tokenname) = True And String.IsNullOrEmpty(password) = True And String.IsNullOrEmpty(username) = False Then
|
||||
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
||||
VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
|
||||
'ConnectionString = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=sa;Pwd=BmWr501956"
|
||||
@@ -88,12 +108,12 @@ Partial Class login_ForgotPW
|
||||
password = dr("Password").ToString()
|
||||
email = dr("Email").ToString()
|
||||
Try
|
||||
If txt_Username.Text = dr("Username").ToString() And String.IsNullOrEmpty(txt_Username_M.Text) = True Then
|
||||
If txt_Username.Text = dr("Username").ToString() AndAlso txt_Username_M.Text = "Username" Then
|
||||
check_UserName_regex_M.Enabled = False
|
||||
check_UserName_regex.Enabled = True
|
||||
check_UserName_regex.IsValid = True
|
||||
username = txt_Username.Text
|
||||
ElseIf txt_Username_M.Text = dr("Username").ToString() And String.IsNullOrEmpty(txt_Username.Text) = True Then
|
||||
ElseIf txt_Username_M.Text = dr("Username").ToString() AndAlso txt_Username.Text = "Username" Then
|
||||
check_UserName_regex.Enabled = False
|
||||
check_UserName_regex_M.Enabled = True
|
||||
check_UserName_regex_M.IsValid = True
|
||||
@@ -107,14 +127,14 @@ Partial Class login_ForgotPW
|
||||
check_UserName_regex.ErrorMessage = "No valid Username found in out database!"
|
||||
check_UserName_regex.IsValid = False
|
||||
End If
|
||||
If (txtEmail.Text = dr("Email").ToString() And String.IsNullOrEmpty(txtEmail_M.Text)) = True Then
|
||||
If (txtEmail.Text = dr("Email").ToString() AndAlso txtEmail_M.Text = "E-mail") Then
|
||||
regexval_txt_Email_M.Enabled = False
|
||||
regexval_txt_Email.Enabled = True
|
||||
regexval_txt_Email.Validate()
|
||||
email = txtEmail.Text
|
||||
lblMessage.ForeColor = Color.Green
|
||||
lblMessage.Text = "The given e-mail exists in our database."
|
||||
ElseIf (txtEmail_M.Text = dr("Email").ToString() And String.IsNullOrEmpty(txtEmail.Text) = True) Then
|
||||
ElseIf (txtEmail_M.Text = dr("Email").ToString() And txtEmail.Text = "E-mail") Then
|
||||
regexval_txt_Email_M.Validate()
|
||||
email = txtEmail_M.Text
|
||||
lblMessage_M.ForeColor = Color.Green
|
||||
@@ -188,7 +208,7 @@ Partial Class login_ForgotPW
|
||||
lblMessage.ForeColor = Color.Red
|
||||
lblMessage.Text = "The form has not been filled completeley."
|
||||
End If
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
'Function RandomString(r As Random, max As Integer) As String
|
||||
|
||||
Reference in New Issue
Block a user