diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb
index 45bec8a..41caaa6 100644
--- a/login/ForgotPW.aspx.vb
+++ b/login/ForgotPW.aspx.vb
@@ -49,6 +49,20 @@ Partial Class ForgotPW
CustomerIDrequired.Enabled = True
valid_getNumberInput.Enabled = True
+ CustomerIDrequired.Validate()
+ If CustomerIDrequired.IsValid = True Then
+ valid_getNumber_M_Input.Validate()
+ If valid_getNumberInput.IsValid = True Then
+ customerID = txt_CustomerID.Text
+ Else
+ valid_getNumberInput.ForeColor = Drawing.Color.Red
+ valid_getNumberInput.ErrorMessage = "Customer-ID is not numeric or too long."
+ End If
+ Else
+ valid_getNumberInput.ForeColor = Drawing.Color.Red
+ valid_getNumberInput.ErrorMessage = "Customer-ID is not given."
+ End If
+
valreqtxtusername.Validate()
If valreqtxtusername.IsValid = True Then
check_UserName_regex.Validate()
@@ -61,7 +75,7 @@ Partial Class ForgotPW
check_UserName_regex.ErrorMessage = "Valid Username has been entered."
End If
Else
- check_UserName_regex.ForeColor = Drawing.Color.Lime
+ valreqtxtusername.ForeColor = Drawing.Color.Lime
check_UserName_regex.ErrorMessage = "A too long Username has been entered."
End If
@@ -87,23 +101,11 @@ Partial Class ForgotPW
End If
End If
- CustomerIDrequired.Validate()
- If CustomerIDrequired.IsValid = True Then
- valid_getNumber_M_Input.Validate()
- If valid_getNumberInput.IsValid = True Then
- customerID = txt_CustomerID.Text
- Else
- valid_getNumberInput.ForeColor = Drawing.Color.Red
- valid_getNumberInput.ErrorMessage = "Customer-ID is not numeric or too long."
- End If
- Else
- valid_getNumberInput.ForeColor = Drawing.Color.Red
- valid_getNumberInput.ErrorMessage = "Customer-ID is not given."
- End If
- ' MsgBox("3" + email + " " + username)
- End If
- 'Mobil
- If String.IsNullOrEmpty(txtEmail_M.Text) = False And String.IsNullOrEmpty(txt_Username_M.Text) = False And String.IsNullOrEmpty(txt_CustomerID_M.Text) = False And String.IsNullOrEmpty(txtEmail.Text) = True And String.IsNullOrEmpty(txt_Username.Text) = True And String.IsNullOrEmpty(txt_CustomerID.Text) = True Then
+
+ ' MsgBox("3" + email + " " + username)
+ End If
+ 'Mobil
+ If String.IsNullOrEmpty(txtEmail_M.Text) = False And String.IsNullOrEmpty(txt_Username_M.Text) = False And String.IsNullOrEmpty(txt_CustomerID_M.Text) = False And String.IsNullOrEmpty(txtEmail.Text) = True And String.IsNullOrEmpty(txt_Username.Text) = True And String.IsNullOrEmpty(txt_CustomerID.Text) = True Then
valreqtxtusername.Enabled = False
valreqtxtEmail.Enabled = False
regexval_txt_Email_2.Enabled = False
@@ -179,17 +181,17 @@ Partial Class ForgotPW
'Erweiterte Degub Msg-Box
'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 And String.IsNullOrEmpty(customerID) = 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"
- ConnectionString = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
- Else
- VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
- ConnectionString = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
- 'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;"
- End If
+ 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"
+ ConnectionString = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
+ Else
+ VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+ ConnectionString = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
+ 'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;"
End If
- Using con As New SqlConnection(ConnectionString)
+ End If
+ Using con As New SqlConnection(ConnectionString)
' Using cmd As New SqlCommand("Validate_User")
Using cmd As New SqlCommand("SELECT Username,Password,Email,KundenNr FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username AND Email=@Email AND KundenNr=@CUSTOMERId")
' cmd.CommandType = CommandType.StoredProcedure
@@ -252,50 +254,50 @@ Partial Class ForgotPW
End If
End Using
con.Close()
- End Using
- If Session.Item("TokenforEmail") = Nothing Then
- tokenname = genToken(username, password, email, customerID)
- Session.Add("TokenforEmail", tokenname)
- Session.Add("SessID", VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(Session.SessionID))
- Else
- tokenname = Session.Item("TokenforEmail")
- End If
+ End Using
+ If Session.Item("TokenforEmail") = Nothing Then
+ tokenname = genToken(username, password, email, customerID)
+ Session.Add("TokenforEmail", tokenname)
+ Session.Add("SessID", VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(Session.SessionID))
+ Else
+ tokenname = Session.Item("TokenforEmail")
+ End If
- If SendEmail(username, password, email, VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(tokenname), customerID) = True Then
- 'password = RandomString(New Random, 10)
- If (getDateoftoken(tokenname) = True) Then
- 'Dim msgboxstyle = vbDefaultButton1 + vbOK
- 'MsgBox(tokenname, msgboxstyle)
- lblMessage.ForeColor = Color.Green
- lblMessage.Text = "Token generated successfully."
- 'MsgBox("Token generated successfully.")
- Else
- lblMessage.ForeColor = Color.Red
- lblMessage.Text = "Token is not valid anymore. Please generate a new one by sending a new e-mail!"
- 'MsgBox("Token is not valid anymore. Please generate a new one by sending a new e-mail!")
-
- If Session.Item("TokenforEmail") = Nothing Then
- tokenname = genToken(username, password, email, customerID)
- Session.Add("TokenforEmail", tokenname)
- Else
- tokenname = Session.Item("TokenforEmail")
- End If
- End If
- 'SendEmail(username, password, email)
- 'MsgBox("Mail would be sent successfully!")
+ If SendEmail(username, password, email, VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(tokenname), customerID) = True Then
+ 'password = RandomString(New Random, 10)
+ If (getDateoftoken(tokenname) = True) Then
+ 'Dim msgboxstyle = vbDefaultButton1 + vbOK
+ 'MsgBox(tokenname, msgboxstyle)
lblMessage.ForeColor = Color.Green
- lblMessage.Text = "The password has been sent sucessfully on the given valid e-mail address."
- ElseIf SendEmail(username, password, email, VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(tokenname), customerID) = False Then
- 'MsgBox("Mail would not be sent successfully!")
+ lblMessage.Text = "Token generated successfully."
+ 'MsgBox("Token generated successfully.")
+ Else
lblMessage.ForeColor = Color.Red
- If String.IsNullOrWhiteSpace(username) = True Then
- lblMessage.Text = "Error10: Username not recognized Error!"
- ElseIf String.IsNullOrWhiteSpace(email) = True Then
- lblMessage.Text = "Error11: Email not recognized Error!"
- ElseIf String.IsNullOrWhiteSpace(password) = True Then
- lblMessage.Text = "An internal password searching error occured in our systems ."
+ lblMessage.Text = "Token is not valid anymore. Please generate a new one by sending a new e-mail!"
+ 'MsgBox("Token is not valid anymore. Please generate a new one by sending a new e-mail!")
+
+ If Session.Item("TokenforEmail") = Nothing Then
+ tokenname = genToken(username, password, email, customerID)
+ Session.Add("TokenforEmail", tokenname)
+ Else
+ tokenname = Session.Item("TokenforEmail")
End If
End If
+ 'SendEmail(username, password, email)
+ 'MsgBox("Mail would be sent successfully!")
+ lblMessage.ForeColor = Color.Green
+ lblMessage.Text = "The password has been sent sucessfully on the given valid e-mail address."
+ ElseIf SendEmail(username, password, email, VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(tokenname), customerID) = False Then
+ 'MsgBox("Mail would not be sent successfully!")
+ lblMessage.ForeColor = Color.Red
+ If String.IsNullOrWhiteSpace(username) = True Then
+ lblMessage.Text = "Error10: Username not recognized Error!"
+ ElseIf String.IsNullOrWhiteSpace(email) = True Then
+ lblMessage.Text = "Error11: Email not recognized Error!"
+ ElseIf String.IsNullOrWhiteSpace(password) = True Then
+ lblMessage.Text = "An internal password searching error occured in our systems ."
+ End If
+ End If
Catch Exc As Exception
lblMessage.Text = "Error08: No input found."
@@ -451,4 +453,6 @@ Partial Class ForgotPW
Return True
End If
End Function
+
+
End Class
\ No newline at end of file
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 96b56ec..ae5d67a 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -365,7 +365,7 @@