diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx index 828907c..02b1268 100644 --- a/login/ForgotPW.aspx +++ b/login/ForgotPW.aspx @@ -253,7 +253,7 @@ @@ -302,7 +302,7 @@
- +
diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb index 4d89867..2012e43 100644 --- a/login/ForgotPW.aspx.vb +++ b/login/ForgotPW.aspx.vb @@ -21,19 +21,6 @@ Partial Class ForgotPW Dim tokenname As String = String.Empty Dim customerID As String = String.Empty - Dim Booluser_desktop_notempty As Boolean = True - Dim Booluser_desktop_regex As Boolean = True - Dim Booluser_mobile_notempty As Boolean = True - Dim Booluser_mobile_regex As Boolean = True - - Dim Boolemail_desktop_notempty As Boolean = True - Dim Boolemail_desktop_regexdomain As Boolean = True - Dim Boolemail_desktop_regex As Boolean = True - Dim Boolemail_mobile_notempty As Boolean = True - Dim Boolemail_mobile_regexdomain As Boolean = True - Dim Boolemail_mobile_regex As Boolean = True - - If String.IsNullOrEmpty(txtEmail.Text) = False And String.IsNullOrEmpty(txt_Username.Text) = False And String.IsNullOrEmpty(txt_CustomerID.Text) = False And String.IsNullOrEmpty(txtEmail_M.Text) = True And String.IsNullOrEmpty(txt_Username_M.Text) = True And String.IsNullOrEmpty(txt_CustomerID_M.Text) = True Then valreqtxtusername.Enabled = True valreqtxtEmail.Enabled = True @@ -87,7 +74,7 @@ Partial Class ForgotPW valreqtxtusername.Validate() If valreqtxtusername.IsValid = True Then check_UserName_regex.Validate() - If check_UserName_regex.IsValid = True Then + If check_UserName_regex.IsValid = False Then check_UserName_regex.ForeColor = Drawing.Color.Red check_UserName_regex.ErrorMessage = "The Username is too long." Else @@ -135,13 +122,6 @@ Partial Class ForgotPW Try If txt_Username.Text = dr("Username").ToString() AndAlso String.IsNullOrEmpty(txt_Username_M.Text) = True And String.IsNullOrEmpty(customerID) = True Then username = txt_Username.Text - - ElseIf txt_Username_M.Text = dr("Username").ToString() AndAlso txt_Username.Text = String.Empty And String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(customerID)) = True Then - username = txt_Username_M.Text - ElseIf String.IsNullOrEmpty(txt_Username_M.Text) = True AndAlso String.IsNullOrEmpty(txtEmail.Text) = True And String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(customerID)) = True Then - check_UserName_regex_M.MatchTimeout = 3000 - check_UserName_regex_M.ErrorMessage = "No valid Username found in out database!" - check_UserName_regex_M.IsValid = True ElseIf String.IsNullOrEmpty(txt_Username.Text) = True Then check_UserName_regex.MatchTimeout = 3000 check_UserName_regex.ErrorMessage = "No valid Username found in out database!" @@ -151,10 +131,6 @@ Partial Class ForgotPW email = txtEmail.Text lblMessage.ForeColor = Color.Green lblMessage.Text = "The given e-mail exists in our database." - ElseIf (txtEmail_M.Text = dr("Email").ToString() AndAlso String.IsNullOrEmpty(txtEmail.Text) = True) And String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(customerID)) = True Then - email = txtEmail_M.Text - lblMessage_M.ForeColor = Color.Green - lblMessage_M.Text = "The given e-mail exists in our database." ElseIf String.IsNullOrEmpty(customerID) = True Then lblMessage_M.ForeColor = Color.Red lblMessage_M.Text = "The given User does not exist in our database." @@ -236,27 +212,15 @@ Partial Class ForgotPW Dim tokenname As String = String.Empty Dim customerID As String = String.Empty - Dim Booluser_desktop_notempty As Boolean = True - Dim Booluser_desktop_regex As Boolean = True - Dim Booluser_mobile_notempty As Boolean = True - Dim Booluser_mobile_regex As Boolean = True - - Dim Boolemail_desktop_notempty As Boolean = True - Dim Boolemail_desktop_regexdomain As Boolean = True - Dim Boolemail_desktop_regex As Boolean = True - Dim Boolemail_mobile_notempty As Boolean = True - Dim Boolemail_mobile_regexdomain As Boolean = True - Dim Boolemail_mobile_regex As Boolean = True - 'Mobil - If String.IsNullOrEmpty(txtEmail_M.Text) = True And String.IsNullOrEmpty(txt_Username_M.Text) = True And String.IsNullOrEmpty(txt_CustomerID_M.Text) = True And String.IsNullOrEmpty(txtEmail.Text) = True And String.IsNullOrEmpty(txt_Username.Text) = True And String.IsNullOrEmpty(txt_CustomerID.Text) = True Then - valreqtxtusername.Enabled = True - valreqtxtEmail.Enabled = True - regexval_txt_Email_2.Enabled = True - regexval_txt_Email.Enabled = True - check_UserName_regex.Enabled = True - CustomerIDrequired.Enabled = True - valid_getNumberInput.Enabled = True + 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 + regexval_txt_Email.Enabled = False + check_UserName_regex.Enabled = False + CustomerIDrequired.Enabled = False + valid_getNumberInput.Enabled = False regexval_2_txt_Email_M.Enabled = True regexval_txt_Email_M.Enabled = True @@ -275,14 +239,14 @@ Partial Class ForgotPW regexval_2_txt_Email_M.Validate() If regexval_2_txt_Email_M.IsValid = True Then email = txtEmail_M.Text - regexval_2_txt_Email_M.ForeColor = Drawing.Color.Lime - regexval_2_txt_Email_M.ErrorMessage = "E-mail Address valid." + lblMessage_M.ForeColor = Drawing.Color.Lime + lblMessage_M.Text = "E-mail Address valid." End If Else regexval_txt_Email.Validate() If regexval_2_txt_Email_M.IsValid = True Then - regexval_txt_Email_M.ForeColor = Drawing.Color.Lime - regexval_txt_Email_M.ErrorMessage = "E-mail Address valid." + lblMessage_M.ForeColor = Drawing.Color.Lime + lblMessage_M.Text = "E-mail Address valid." email = txtEmail_M.Text End If End If @@ -294,27 +258,27 @@ Partial Class ForgotPW If valid_getNumber_M_Input.IsValid = True Then customerID = txt_CustomerID_M.Text Else - valid_getNumber_M_Input.ForeColor = Drawing.Color.Red - valid_getNumber_M_Input.ErrorMessage = "Customer-ID is not numeric or too long." + lblMessage_M.ForeColor = Drawing.Color.Red + lblMessage_M.Text = "Customer-ID is not numeric or too long." End If End If valreqtxtusername_M.Validate() If valreqtxtusername_M.IsValid = True Then check_UserName_regex_M.Validate() - If check_UserName_regex_M.IsValid = True Then + If check_UserName_regex_M.IsValid = False Then check_UserName_regex_M.ForeColor = Drawing.Color.Red check_UserName_regex_M.ErrorMessage = "The Username is too long." Else username = txt_Username_M.Text - check_UserName_regex_M.ForeColor = Drawing.Color.Lime - check_UserName_regex_M.ErrorMessage = "Valid Username has been entered." + lblMessage_M.ForeColor = Drawing.Color.Lime + lblMessage_M.Text = "Valid Username has been entered." End If End If Else 'MsgBox("The form has not been filled completeley.", MsgBoxStyle.Critical, "Error08") - lblMessage.ForeColor = Color.Red - lblMessage.Text = "Error 08. The form has not been filled completeley." + lblMessage_M.ForeColor = Color.Red + lblMessage_M.Text = "Error 08. The form has not been filled completeley." End If 'Erweiterte Degub Msg-Box @@ -348,25 +312,14 @@ Partial Class ForgotPW customerID = dr("UserId").ToString() Try - If txt_Username.Text = dr("Username").ToString() AndAlso String.IsNullOrEmpty(txt_Username_M.Text) = True And String.IsNullOrEmpty(customerID) = True Then - username = txt_Username.Text - - ElseIf txt_Username_M.Text = dr("Username").ToString() AndAlso txt_Username.Text = String.Empty And String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(customerID)) = True Then + If txt_Username_M.Text = dr("Username").ToString() AndAlso txt_Username.Text = String.Empty And String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(customerID)) = True Then username = txt_Username_M.Text ElseIf String.IsNullOrEmpty(txt_Username_M.Text) = True AndAlso String.IsNullOrEmpty(txtEmail.Text) = True And String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(customerID)) = True Then check_UserName_regex_M.MatchTimeout = 3000 check_UserName_regex_M.ErrorMessage = "No valid Username found in out database!" check_UserName_regex_M.IsValid = True - ElseIf String.IsNullOrEmpty(txt_Username.Text) = True Then - check_UserName_regex.MatchTimeout = 3000 - check_UserName_regex.ErrorMessage = "No valid Username found in out database!" - check_UserName_regex.IsValid = True End If - If (txtEmail.Text = dr("Email").ToString() AndAlso String.IsNullOrEmpty(txtEmail_M.Text) = True) And String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(customerID)) = True Then - email = txtEmail.Text - lblMessage.ForeColor = Color.Green - lblMessage.Text = "The given e-mail exists in our database." - ElseIf (txtEmail_M.Text = dr("Email").ToString() AndAlso String.IsNullOrEmpty(txtEmail.Text) = True) And String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(customerID)) = True Then + If (txtEmail_M.Text = dr("Email").ToString() AndAlso String.IsNullOrEmpty(txtEmail.Text) = True) And String.IsNullOrEmpty(VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(customerID)) = True Then email = txtEmail_M.Text lblMessage_M.ForeColor = Color.Green lblMessage_M.Text = "The given e-mail exists in our database." @@ -402,17 +355,17 @@ Partial Class ForgotPW tokenname = Session.Item("TokenforEmail") End If - If SendEmail(username, password, email, VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(tokenname), customerID) = True Then + If SendEmail_M(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." + lblMessage_M.ForeColor = Color.Green + lblMessage_M.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!" + lblMessage_M.ForeColor = Color.Red + lblMessage_M.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 @@ -424,22 +377,22 @@ Partial Class ForgotPW 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) = True Then + lblMessage_M.ForeColor = Color.Green + lblMessage_M.Text = "The password has been sent sucessfully on the given valid e-mail address." + ElseIf SendEmail_M(username, password, email, VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(tokenname), customerID) = True Then 'MsgBox("Mail would not be sent successfully!") - lblMessage.ForeColor = Color.Red + lblMessage_M.ForeColor = Color.Red If String.IsNullOrWhiteSpace(username) = True Then - lblMessage.Text = "Error10: Username not recognized Error!" + lblMessage_M.Text = "Error10: Username not recognized Error!" ElseIf String.IsNullOrWhiteSpace(email) = True Then - lblMessage.Text = "Error11: Email not recognized Error!" + lblMessage_M.Text = "Error11: Email not recognized Error!" ElseIf String.IsNullOrWhiteSpace(password) = True Then - lblMessage.Text = "An internal password searching error occured in our systems ." + lblMessage_M.Text = "An internal password searching error occured in our systems ." End If End If Catch Exc As Exception - lblMessage.Text = "Error08: No input found." + lblMessage_M.Text = "Error08: No input found." End Try End Sub 'Function RandomString(r As Random, max As Integer) As String @@ -453,6 +406,87 @@ Partial Class ForgotPW 'Return sb.ToString() 'End Function + Function SendEmail_M(username As String, password As String, email As String, tokenname As String, userID As String) As Boolean + Dim getdomianenvironment As String = String.Empty + Dim pagename As String = String.Empty + Dim ServPort As String = String.Empty + Dim mailto As String = String.Empty + Dim Betreff As String = String.Empty + Dim htmlbody As String = String.Empty + Dim emailnr = VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA_ID.ToString + If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then + MsgBox(getdomianenvironment) + getdomianenvironment = HttpContext.Current.Request.ServerVariables("SERVER_NAME") + ServPort = ":" + Request.ServerVariables("SERVER_PORT") + 'pagename = Request.ServerVariables("SCRIPT_NAME") + mailto = email + Betreff = "Passwort reset" + Dim Ausschusstext As String = "Wir arbeiten ausschließlich auf Grund der Allgemeinen Spediteurbedingungen in der jeweils geltenden Fassung. Zahlungen werden zunächst auf Frachten, Spesen" + Dim Ausschusstext2 As String = "und Zinsen zuletzt auf Zölle angerechnet. Zahlbar und klagbar in Schärding oder Ried. Steuer-Zoll-und Tarifauskünfte sind unverbindlich." + Dim Ausschusstext3 As String = "We operate exclusively on the basis of the General Freight Forwarding Terms and Conditions in the respectively applicable version. Payments are initially" + Dim Ausschusstext4 As String = "charged on freight, fees and interests and at last on customs duties. The place of jurisdiction: Schärding / Ried. Tax, customs and tariff information are not binding." + htmlbody = String.Format("Dear {0},

Please follow the Link to reset your password:

" + Environment.NewLine + "http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(tokenname) + "&Par2=" + VERAG_PROG_ALLGEMEIN.cCryptography2.Encrypt(username) + "&Par3=" + userID + "" + Environment.NewLine + "


Kind regards,
VERAG | EDV Support
VERAG Spedition AG | A 4975 Suben, Nr. 100
T.+43 7711 2777-xx |support@verag.ag |" + emailnr + "FN xxxxxxx
" + Ausschusstext + "
" + Ausschusstext2 + "
" + Ausschusstext3 + "
" + Ausschusstext4 + "
", username, password) + ElseIf String.IsNullOrWhiteSpace(HttpContext.Current.Request.ServerVariables("SERVER_NAME")) = True Then + getdomianenvironment = HttpContext.Current.Request.ServerVariables("SERVER_NAME") + MsgBox(getdomianenvironment) + ServPort = ":" + Request.ServerVariables("SERVER_PORT") + 'pagename = Request.ServerVariables("SCRIPT_NAME") + mailto = email + Betreff = "Passwort reset" + Dim Ausschusstext As String = "Wir arbeiten ausschließlich auf Grund der Allgemeinen Spediteurbedingungen in der jeweils geltenden Fassung. Zahlungen werden zunächst auf Frachten, Spesen" + Dim Ausschusstext2 As String = "und Zinsen zuletzt auf Zölle angerechnet. Zahlbar und klagbar in Schärding oder Ried. Steuer-Zoll-und Tarifauskünfte sind unverbindlich." + Dim Ausschusstext3 As String = "We operate exclusively on the basis of the General Freight Forwarding Terms and Conditions in the respectively applicable version. Payments are initially" + Dim Ausschusstext4 As String = "charged on freight, fees and interests and at last on customs duties. The place of jurisdiction: Schärding / Ried. Tax, customs and tariff information are not binding." + htmlbody = String.Format("Dear {0},

Please follow the Link to reset your password:

" + Environment.NewLine + "http://" + getdomianenvironment + ServPort + "/login/ChangePW.aspx?Par1=" + tokenname + "&Par2=" + VERAG_PROG_ALLGEMEIN.cCryptography2.Encrypt(username) + "&Par3=" + userID + "" + Environment.NewLine + "


Kind regards,
VERAG | EDV Support
VERAG Spedition AG | A 4975 Suben, Nr. 100
T.+43 7711 2777-xx |support@verag.ag | " + emailnr + "FN xxxxxxx
" + Ausschusstext + "
" + Ausschusstext2 + "
" + Ausschusstext3 + "
" + Ausschusstext4 + "
", username, password) + ElseIf String.IsNullOrWhiteSpace(HttpContext.Current.Request.ServerVariables("SERVER_NAME")) = True Then + 'MsgBox("Error09:" + Environment.NewLine + "The Domain could not be vaildated. Check Link please or contact the Administrator of the program.") + lblMessage_M.ForeColor = Color.OrangeRed + lblMessage_M.Text = "Error09:" + Environment.NewLine + "The Domain could not be vaildated. Check the Link please or contact the Administrator of the program." + End If + 'Dim pg As String = Request.ServerVariables("URL") + 'MsgBox("/" + ServPort + Request.ServerVariables("URL")) + + Try + If Session.Item("TokenforEmail") = Nothing Then + tokenname = genToken(username, password, email, userID) + Session.Add("TokenforEmail", tokenname) + Else + tokenname = Session.Item("TokenforEmail").ToString() + End If + 'Dim Strtemp = Session.Keys.Item("urltochangepw") + If getDateoftoken(tokenname) = True Then + ' Dim attachment As Attachment = New Attachment(File.OpenRead(excel), "Kundenliste.xlsx") + ' Msg.Attachments.Add(attachment) + If String.IsNullOrEmpty(mailto) = True AndAlso String.IsNullOrEmpty(Betreff) = True AndAlso String.IsNullOrEmpty(htmlbody) = True Then + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailto, Betreff, htmlbody) + Else + 'MsgBox("Error07: Die Paramter wurden nicht alle gesetzt. Bitte Felder überprüfen.", vbAbort, "Error07") + lblMessage_M.ForeColor = Color.OrangeRed + lblMessage_M.Text = "Error07: Die Paramter wurden nicht alle gesetzt. Bitte Felder überprüfen!" + End If + lblMessage_M.ForeColor = Color.Green + lblMessage_M.Text = "Success" + Environment.NewLine + " Mail sent. Please check your inbox." + 'MsgBox("SENT") + Return True + Else + lblMessage_M.ForeColor = Color.Red + lblMessage_M.Text = "Error02: Mail not delivered!" + 'MsgBox("Error02: Mail not delivered!" & vbCrLf & "New Token has been generated.") + If Session.Item("TokenforEmail") = Nothing Then + tokenname = genToken(username, password, email, userID) + Session.Add("TokenforEmail", tokenname) + Session.Add("USerID", userID) + Else + tokenname = Session.Item("TokenforEmail").ToString() + End If + VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailto, Betreff, htmlbody, tokenname) + Return True + End If + Catch ex As Exception + 'MsgBox(Err.Number & ex.Message & ex.StackTrace.ToString) 'Falls ein Fehler auftritt wird eine MsgBox angezeigt + End Try + Return True + End Function Function SendEmail(username As String, password As String, email As String, tokenname As String, userID As String) As Boolean Dim getdomianenvironment As String = String.Empty Dim pagename As String = String.Empty @@ -508,11 +542,11 @@ Partial Class ForgotPW VERAG_PROG_ALLGEMEIN.cProgramFunctions.sendMail(mailto, Betreff, htmlbody) Else 'MsgBox("Error07: Die Paramter wurden nicht alle gesetzt. Bitte Felder überprüfen.", vbAbort, "Error07") - lblMessage.ForeColor = Color.OrangeRed - lblMessage.Text = "Error07: Die Paramter wurden nicht alle gesetzt. Bitte Felder überprüfen!" + lblMessage_M.ForeColor = Color.OrangeRed + lblMessage_M.Text = "Error07: Die Paramter wurden nicht alle gesetzt. Bitte Felder überprüfen!" End If - lblMessage.ForeColor = Color.Green - lblMessage.Text = "Success" + Environment.NewLine + " Mail sent. Please check your inbox." + lblMessage_M.ForeColor = Color.Green + lblMessage_M.Text = "Success" + Environment.NewLine + " Mail sent. Please check your inbox." 'MsgBox("SENT") Return True Else
- +