From 8ee7acbd2065ccfa0b1c943409860eded61013c8 Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 15 Nov 2021 17:01:50 +0100 Subject: [PATCH] =?UTF-8?q?=C3=9Cbersetzungen=20und=20weitere=20=C3=84nder?= =?UTF-8?q?ungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- login/ForgotPW.aspx.vb | 70 ++++++++++++++++++++++------------------ login/login_FLEX.aspx.vb | 4 +-- 2 files changed, 41 insertions(+), 33 deletions(-) diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb index 9789865..675e0c8 100644 --- a/login/ForgotPW.aspx.vb +++ b/login/ForgotPW.aspx.vb @@ -49,18 +49,19 @@ Partial Class ForgotPW regexval_txt_Email.Validate() If regexval_txt_Email.IsValid = False Then regexval_txt_Email.ForeColor = Drawing.Color.OrangeRed - regexval_txt_Email.ErrorMessage = "Annotation: The Domain does not match." + VERAG_VARIABLES.seterrorcount(2) + regexval_txt_Email.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Anmerkung: Die Domäne ist nicht die korrekt hinterlegte." regexval_txt_Email_2.Validate() If regexval_txt_Email_2.IsValid = True Then email = txtEmail.Text lblMessage.ForeColor = Drawing.Color.Lime - lblMessage.Text = "E-mail Address valid." + lblMessage.Text = "E-mail Addresse ist validiert.." End If Else regexval_txt_Email.Validate() If regexval_txt_Email.IsValid = True Then lblMessage.ForeColor = Drawing.Color.Lime - lblMessage.Text = "E-mail Address valid." + lblMessage.Text = "E-mail Adresse ist korrekt." email = txtEmail.Text End If End If @@ -73,7 +74,8 @@ Partial Class ForgotPW customerID = txt_CustomerID.Text Else valid_getNumberInput.ForeColor = Drawing.Color.Red - valid_getNumberInput.ErrorMessage = "Customer-ID is not numeric or too long." + VERAG_VARIABLES.seterrorcount(2) + valid_getNumberInput.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Die Kundennummer ist nicht numerisch oder zu lang." End If End If @@ -82,20 +84,21 @@ Partial Class ForgotPW check_UserName_regex.Validate() If check_UserName_regex.IsValid = False Then check_UserName_regex.ForeColor = Drawing.Color.Red - check_UserName_regex.ErrorMessage = "The Username is too long." + VERAG_VARIABLES.seterrorcount(3) + check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Der Benutzername ist zu lange." isusrnmright = False Else username = txt_Username.Text isusrnmright = True check_UserName_regex.ForeColor = Drawing.Color.Lime - check_UserName_regex.ErrorMessage = "Valid Username has been entered." + check_UserName_regex.ErrorMessage = "Ein korrekter Benutzername ist eingegeben worden." End If End If Else 'MsgBox("The form has not been filled completeley.", MsgBoxStyle.Critical, "Error08") lblMessage.ForeColor = Color.Red VERAG_VARIABLES.seterrorcount(8) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "The form has not been filled completeley." + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Das Formular muss vollständig ausgefüllt werden." End If 'Erweiterte Degub Msg-Box @@ -134,7 +137,8 @@ Partial Class ForgotPW isusrnmright = 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!" + VERAG_VARIABLES.seterrorcount(5) + check_UserName_regex.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Kein passender Benutzername wurde in der Datenbank gefunden!" isusrnmright = False Try check_UserName_regex.Validate() @@ -146,35 +150,38 @@ Partial Class ForgotPW email = txtEmail.Text lblMessage.ForeColor = Color.Green isemailright = True - lblMessage.Text = "The given e-mail exists in our database." + lblMessage.Text = "Die Email besteht in der Datenbank." ElseIf String.IsNullOrEmpty(email) = True Then lblMessage_M.ForeColor = Color.Red isemailright = False - lblMessage_M.Text = "The given Email does not exist in our database." + VERAG_VARIABLES.seterrorcount(6) + lblMessage_M.Text = VERAG_VARIABLES.geterrornumb + "Die eingegebene E-Mail passt nicht zum Datenbankeintrag. Bitte erneut versuchen." Else lblMessage_M.ForeColor = Color.Red isemailright = False - lblMessage_M.Text = "The given e-mail does not exist in our database." + VERAG_VARIABLES.seterrorcount(7) + lblMessage_M.Text = VERAG_VARIABLES.geterrornumb + "Die E-Mail existiert in unserer Datenbank nicht." End If If (txt_CustomerID.Text = dr("UserId").ToString() AndAlso String.IsNullOrEmpty(txt_CustomerID_M.Text) = True) And String.IsNullOrEmpty(customerID) = False Then email = txtEmail.Text lblMessage.ForeColor = Color.Green isCustomeridright = True - lblMessage.Text = "The given UserId exists in our database." + VERAG_VARIABLES.seterrorcount(8) + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Die Benutzer-ID ist fehlerhaft" ElseIf String.IsNullOrEmpty(customerID) = True Then lblMessage_M.ForeColor = Color.Red isCustomeridright = False - lblMessage_M.Text = "The given User-ID does not exist in our database." + VERAG_VARIABLES.seterrorcount(9) + lblMessage_M.Text = VERAG_VARIABLES.geterrornumb + "Die einegebene Nutzernummer steht nicht in unserer Datenbank." Else lblMessage_M.ForeColor = Color.Red isCustomeridright = False - lblMessage_M.Text = "The given User-ID does not exist in our database." + VERAG_VARIABLES.seterrorcount(10) + lblMessage_M.Text = VERAG_VARIABLES.geterrornumb + "Die Nutzernummer ist nicht in der Datenbank vorhanden." End If Catch ex As Exception - Dim Msg, Style, Title As String - Msg = "E-Mail validation failed!" & vbCrLf + "Please try again!" - Style = vbRetry + vbExclamation + vbDefaultButton1 - Title = "Authentication error!" + VERAG_VARIABLES.seterrorcount(408) + Title = VERAG_VARIABLES.geterrornumb() + "Authentifizierungs-Fehler!" 'MsgBox(Msg, Style, Title) 'If MsgBox(Msg, Style, Title).Yes Then 'txtEmail.Text = String.Empty @@ -201,12 +208,12 @@ Partial Class ForgotPW 'Dim msgboxstyle = vbDefaultButton1 + vbOK 'MsgBox(tokenname, msgboxstyle) lblMessage.ForeColor = Color.Green - lblMessage.Text = "Token generated successfully." + lblMessage.Text = "Token Generierung erfolgreich." 'MsgBox("Token generated successfully.") Else lblMessage.ForeColor = Color.Red VERAG_VARIABLES.seterrorcount(14) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Token is not valid anymore. Please generate a new one by sending a new e-mail!" + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Der Token ist nicht aktuell genug oder liegt zu weit in der Vergangenheit. Bitte neuen generieren lassen mit einer neuen 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 @@ -219,27 +226,27 @@ Partial Class ForgotPW '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." + lblMessage.Text = "DasPasswort wurde erfolgreich an die hinterlegte E-Mail gesendet. Bitte prüfen Sie den Posteingang sowie den Spam-Ordner." ElseIf SendEmail(username, password, email, tokenname, customerID, isusrnmright, isCustomeridright, isemailright, Session.IsNewSession) = True Then 'MsgBox("Mail would not be sent successfully!") lblMessage.ForeColor = Color.Red If String.IsNullOrWhiteSpace(username) = True Then VERAG_VARIABLES.seterrorcount(10) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Username not recognized Error!" + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Benutzername wurde nicht erkannt!" ElseIf String.IsNullOrWhiteSpace(email) = True Then lblMessage.ForeColor = Drawing.Color.Red VERAG_VARIABLES.seterrorcount(11) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Email not recognized Error!" + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Email: Fehler bei der Erkennung!" ElseIf String.IsNullOrWhiteSpace(password) = True Then lblMessage.ForeColor = Drawing.Color.Red VERAG_VARIABLES.seterrorcount(12) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "An internal password searching error occured in our systems ." + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Ein interner Passwort-Suchfehler ist leider aufgetreten." + Environment.NewLine + "Bitte setzten Sie sich mit einem Admin in Verbindung ." End If End If Else lblMessage.ForeColor = Drawing.Color.Red VERAG_VARIABLES.seterrorcount(13) - lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Error with Database or the connection." + Environment.NewLine + "Please contact the admin." + lblMessage.Text = VERAG_VARIABLES.geterrornumb + "Datenbankverbindungsfehler." + Environment.NewLine + "Bitte den Admin kontaktieren." End If Catch Exc As Exception lblMessage.ForeColor = Drawing.Color.Red @@ -282,18 +289,18 @@ Partial Class ForgotPW If regexval_txt_Email_M.IsValid = True Then regexval_txt_Email_M.ForeColor = Drawing.Color.OrangeRed VERAG_VARIABLES.seterrorcount(15) - regexval_txt_Email_M.ErrorMessage = VERAG_VARIABLES.geterrornumb + "The Domain does not match." + regexval_txt_Email_M.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Die Kundennummer ist nicht numerisch oder zu lang." regexval_2_txt_Email_M.Validate() If regexval_2_txt_Email_M.IsValid = True Then email = txtEmail_M.Text lblMessage_M.ForeColor = Drawing.Color.Lime - lblMessage_M.Text = "E-mail Address valid." + lblMessage_M.Text = "E-mail Adresse ist validiert.." End If Else regexval_txt_Email.Validate() If regexval_2_txt_Email_M.IsValid = True Then lblMessage_M.ForeColor = Drawing.Color.Lime - lblMessage_M.Text = "E-mail Address valid." + lblMessage_M.Text = "E-mail Adresse ist korrekt." email = txtEmail_M.Text End If End If @@ -307,7 +314,7 @@ Partial Class ForgotPW Else lblMessage_M.ForeColor = Drawing.Color.Red VERAG_VARIABLES.seterrorcount(16) - lblMessage_M.Text = VERAG_VARIABLES.geterrornumb + "Customer-ID is not numeric or too long." + lblMessage_M.Text = VERAG_VARIABLES.geterrornumb + "Die Benutzerkennung ist zu lange oder ungültig." End If End If @@ -317,16 +324,17 @@ Partial Class ForgotPW If check_UserName_regex_M.IsValid = False Then check_UserName_regex_M.ForeColor = Drawing.Color.Red VERAG_VARIABLES.seterrorcount(17) - check_UserName_regex_M.ErrorMessage = VERAG_VARIABLES.geterrornumb + "The Username is too long." + check_UserName_regex_M.ErrorMessage = VERAG_VARIABLES.geterrornumb + "Der Benutzername ist zu lang." Else username = txt_Username_M.Text lblMessage_M.ForeColor = Drawing.Color.Lime - lblMessage_M.Text = "Valid Username has been entered." + lblMessage_M.Text = "Ein korrekter Benutzername ist eingegeben worden." End If End If Else 'MsgBox("The form has not been filled completeley.", MsgBoxStyle.Critical, "Error08") lblMessage_M.ForeColor = Color.Red + VERAG_VARIABLES.seterrorcount(8) lblMessage_M.Text = "Error 08. The form has not been filled completeley." End If diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index 2e4eb24..7a196d1 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -190,8 +190,8 @@ Partial Class login_FLEX Using cmd2 As New SqlCommand("UPDATE [VERAG_HOMEPAGE].[dbo].[Users] SET [LastLoginDate]=@Date WHERE [Username]=@Username AND [UserId]=@UserId AND Password=@Password") cmd2.Parameters.AddWithValue("Date", Date.Now.ToString) cmd2.Parameters.AddWithValue("Username", UserNaMe) - cmd2.Parameters.AddWithValue("UserID", Customer_ID) - cmd2.Parameters.AddWithValue("Password", passw) + cmd2.Parameters.AddWithValue("KundenNr", Customer_ID) + cmd2.Parameters.AddWithValue("Password",passw) cmd2.Connection = con con.Open() cmd2.ExecuteNonQuery()