From c28fba7c590507990499ba024061b23eabb0fdd2 Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 18 Oct 2021 09:04:39 +0200 Subject: [PATCH] =?UTF-8?q?EMail=20deesign=20=C3=A4nderungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Global.asax | 10 +++------- login/ForgotPW.aspx.vb | 34 ++++++++++++++++++---------------- 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/Global.asax b/Global.asax index 4935182..751ad5f 100644 --- a/Global.asax +++ b/Global.asax @@ -13,8 +13,7 @@ DebugPath = "~/scripts/jquery-1.7.2.js", CdnPath = "http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.4.1.min.js", CdnDebugPath = "http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.4.1.js" - }); - + }); } void Application_End(object sender, EventArgs e) @@ -22,8 +21,7 @@ // Code, der beim Herunterfahren der Anwendung ausgeführt wird Session.Remove("TokenforEmail"); Session.Remove("SessID"); - Session.Remove("urltochangepw"); - } + Session.Remove("urltochangepw"); } void Application_Error(object sender, EventArgs e) @@ -47,7 +45,5 @@ Session.Remove("TokenforEmail"); Session.Remove("SessID"); Session.Remove("urltochangepw"); - } - - + } diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb index 7d7e576..105dc47 100644 --- a/login/ForgotPW.aspx.vb +++ b/login/ForgotPW.aspx.vb @@ -48,10 +48,10 @@ Partial Class login_ForgotPW End If End If End If - MsgBox("3" + email + " " + username) + ' MsgBox("3" + email + " " + username) - 'Mobil - 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 + 'Mobil + 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 @@ -70,19 +70,20 @@ Partial Class login_ForgotPW 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 + 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 - 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) + + End If + '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 Then If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True @@ -229,20 +230,21 @@ Partial Class login_ForgotPW 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 getdomianenvironment = HttpContext.Current.Request.ServerVariables("SERVER_NAME") ServPort = ":" + Request.ServerVariables("SERVER_PORT") 'pagename = Request.ServerVariables("SCRIPT_NAME") mailto = email Betreff = "Passwort reset" - htmlbody = String.Format("Dear, {0},

Please follow the Link to reset your password:

" + Environment.NewLine + "Link" + Environment.NewLine + "
Kind regards,
VERAG | EDV Support
support@verag.ag,", username, password) + htmlbody = String.Format("Dear, {0},

Please follow the Link to reset your password:

" + Environment.NewLine + "Link" + Environment.NewLine + "


Kind regards,
VERAG | EDV Support
VERAG Spedition AG | A 4975 Suben, Nr. 100
T.+43 7711 2777-xx | |" + "FN xxxxxxx" + emailnr, username, password) ElseIf String.IsNullOrWhiteSpace(HttpContext.Current.Request.ServerVariables("SERVER_NAME")) = False Then getdomianenvironment = HttpContext.Current.Request.ServerVariables("SERVER_NAME") ServPort = String.Empty 'pagename = Request.ServerVariables("SCRIPT_NAME") mailto = email Betreff = "Passwort reset" - htmlbody = String.Format("Dear, {0},

Please follow the Link to reset your password:

" + Environment.NewLine + "Link" + Environment.NewLine + "
Kind regards,
VERAG | EDV Support
support@verag.ag,", username, password) + htmlbody = String.Format("Dear, {0},

Please follow the Link to reset your password:

" + Environment.NewLine + "Link" + Environment.NewLine + "


Kind regards,
VERAG | EDV Support
VERAG Spedition AG | A 4975 Suben, Nr. 100
T.+43 7711 2777-xx | |" + "FN xxxxxxx", 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.ForeColor = Color.OrangeRed