From b94c5bfae34181d7a012662e62e0b652d86b05fd Mon Sep 17 00:00:00 2001 From: ja Date: Fri, 15 Oct 2021 15:14:37 +0200 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20an=20Codefiles=20Der=20alte?= =?UTF-8?q?=20alle=20Elemente=20w=C3=BCrden=20fehlen=20Fehler=20tritt=20nu?= =?UTF-8?q?n=20nicht=20mehr=20auf.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Customers/CustomsAviso.aspx | 2 +- Customers/CustomsAviso.aspx.vb | 2 +- Customers/LKWs.aspx | 2 +- Customers/LKWs.aspx.vb | 2 +- Customers/Welcome.aspx | 2 +- Customers/Welcome.aspx.vb | 2 +- css/login/loginFLEX.css | 2 +- login/ForgotPW.aspx | 9 +- login/ForgotPW.aspx.vb | 230 ++++++++++++++++---------------- login/login_FLEX.aspx | 69 ++++++---- login/login_FLEX.aspx.vb | 17 ++- login/login_FLEX_iFrame.aspx | 2 +- login/login_FLEX_iFrame.aspx.vb | 2 +- login/login_TEST.aspx | 2 +- login/login_TEST.aspx.vb | 2 +- 15 files changed, 188 insertions(+), 159 deletions(-) diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 5b6f0a4..47f0de9 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="Aufträge VERAG" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="CustomsAviso.aspx.vb" Inherits="CustomsAviso_Default" UnobtrusiveValidationMode="None"%> +<%@ Page Title="Aufträge VERAG" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="CustomsAviso.aspx.vb" Inherits="CustomsAviso" UnobtrusiveValidationMode="None"%> diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index 3c1b288..38bff39 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -2,7 +2,7 @@ Imports System.Data Imports System.Web.UI.HtmlControls -Partial Class CustomsAviso_Default +Partial Class CustomsAviso Inherits System.Web.UI.Page Dim datevon As DateTime Dim datebis As DateTime diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx index ee76363..5b3e8a5 100644 --- a/Customers/LKWs.aspx +++ b/Customers/LKWs.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="LKWs.aspx.vb" Inherits="Customers_Default" %> +<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="LKWs.aspx.vb" Inherits="LKWS" %> diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb index 61c8063..bd091f7 100644 --- a/Customers/LKWs.aspx.vb +++ b/Customers/LKWs.aspx.vb @@ -1,5 +1,5 @@  -Partial Class Customers_Default +Partial Class LKWS Inherits System.Web.UI.Page End Class diff --git a/Customers/Welcome.aspx b/Customers/Welcome.aspx index 7ab4e3b..16a7045 100644 --- a/Customers/Welcome.aspx +++ b/Customers/Welcome.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="Welcome VERAG SPEDITION AG " Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Welcome.aspx.vb" Inherits="Customers_Default" %> +<%@ Page Title="Welcome VERAG SPEDITION AG " Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Welcome.aspx.vb" Inherits="Welcome" %> diff --git a/Customers/Welcome.aspx.vb b/Customers/Welcome.aspx.vb index 61c8063..b3611f5 100644 --- a/Customers/Welcome.aspx.vb +++ b/Customers/Welcome.aspx.vb @@ -1,5 +1,5 @@  -Partial Class Customers_Default +Partial Class Welcome Inherits System.Web.UI.Page End Class diff --git a/css/login/loginFLEX.css b/css/login/loginFLEX.css index cb4a1f9..89ece48 100644 --- a/css/login/loginFLEX.css +++ b/css/login/loginFLEX.css @@ -11,7 +11,7 @@ background-color: #fff; overflow:clip; } - + #Login1_LoginButton { color: #fff; background-color: #003680; diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx index 00da658..1580a73 100644 --- a/login/ForgotPW.aspx +++ b/login/ForgotPW.aspx @@ -238,7 +238,12 @@ { window.history.back() } - + + @@ -257,7 +262,7 @@ - + diff --git a/login/ForgotPW.aspx.vb b/login/ForgotPW.aspx.vb index 9efdaaf..392a94e 100644 --- a/login/ForgotPW.aspx.vb +++ b/login/ForgotPW.aspx.vb @@ -7,17 +7,19 @@ Imports System.Data Partial Class login_ForgotPW Inherits System.Web.UI.Page + Dim ConnectionString As String = String.Empty Protected Sub btn_Back_Click(sender As Object, e As EventArgs) Response.Redirect("login/login_FLEX.aspx") End Sub Protected Sub btn_Send_Click(sender As Object, e As EventArgs) + Dim username As String = String.Empty Dim password As String = String.Empty Dim email As String = String.Empty Dim tokenname As String = String.Empty - If txtEmail.Text = String.Empty And txt_Username_M.Text = String.Empty Then + 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 valreqtxtEmail_M.Enabled = False valreqtxtEmail.Enabled = True regexval_txt_Email_2.Enabled = True @@ -27,7 +29,7 @@ Partial Class login_ForgotPW check_UserName_regex.Validate() If valreqtxtEmail.IsValid = True AndAlso check_UserName_regex.IsValid = True Then email = txtEmail.Text - username = txt_Username_M.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() @@ -38,7 +40,8 @@ Partial Class login_ForgotPW check_UserName_regex.IsValid = True End If End If - Else + '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 valreqtxtEmail_M.Enabled = True regexval_txt_Email.Enabled = False regexval_txt_Email_2.Enabled = False @@ -58,118 +61,120 @@ Partial Class login_ForgotPW check_UserName_regex_M.IsValid = True End If End If - End If - If String.IsNullOrEmpty(email) = False AndAlso String.IsNullOrEmpty(tokenname) = True AndAlso String.IsNullOrEmpty(password) = True AndAlso String.IsNullOrEmpty(username) = False Then - Dim ConnectionString = String.Empty - If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then - '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 - 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) - ' Using cmd As New SqlCommand("Validate_User") - Using cmd As New SqlCommand("SELECT Username,Password,Email FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username") - ' cmd.CommandType = CommandType.StoredProcedure - cmd.Parameters.AddWithValue("@Username", username) - cmd.Connection = con - con.Open() - 'userId = Convert.ToInt32(cmd.ExecuteScalar()) - Dim dr As SqlDataReader = cmd.ExecuteReader() - If dr.Read() Then - username = dr("Username").ToString() - 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 - 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 - check_UserName_regex.Enabled = False - check_UserName_regex_M.Enabled = True - check_UserName_regex_M.IsValid = True - username = txt_Username_M.Text - ElseIf String.IsNullOrEmpty(txt_Username_M.Text) = True AndAlso String.IsNullOrEmpty(txtEmail_M.Text) = 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 = False - ElseIf String.IsNullOrEmpty(txt_Username.Text) = False Then - check_UserName_regex.MatchTimeout = 3000 - 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 txtEmail_M.Text = String.Empty) 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 txtEmail.Text = String.Empty) Then - regexval_txt_Email_M.Validate() - email = txtEmail_M.Text - lblMessage_M.ForeColor = Color.Green - lblMessage_M.Text = "The given e-mail exists in our database." - Else - lblMessage_M.ForeColor = Color.Red - lblMessage_M.Text = "The given e-mail does not exist in our database." - End If + If String.IsNullOrEmpty(email) = False AndAlso String.IsNullOrEmpty(tokenname) = True And String.IsNullOrEmpty(password) = True AndAlso String.IsNullOrEmpty(username) = False Then - 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!" - 'MsgBox(Msg, Style, Title) - 'If MsgBox(Msg, Style, Title).Yes Then - 'txtEmail.Text = String.Empty - 'txtEmail.Focus() - 'ElseIf MsgBox(Msg, Style, Title).No Then - 'End If - End Try - End If - End Using - con.Close() - End Using - If Session.Item("TokenforEmail") = Nothing Then - tokenname = genToken(username, password, email) - 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)) = 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.") + 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 - 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) - Session.Add("TokenforEmail", tokenname) - Else - tokenname = Session.Item("TokenforEmail") - End If + 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 - '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)) = False Then - 'MsgBox("Mail would not be sent successfully!") - lblMessage.ForeColor = Color.Red + + Using con As New SqlConnection(ConnectionString) + ' Using cmd As New SqlCommand("Validate_User") + Using cmd As New SqlCommand("SELECT Username,Password,Email FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username") + ' cmd.CommandType = CommandType.StoredProcedure + cmd.Parameters.AddWithValue("@Username", username) + cmd.Connection = con + con.Open() + 'userId = Convert.ToInt32(cmd.ExecuteScalar()) + Dim dr As SqlDataReader = cmd.ExecuteReader() + If dr.Read() Then + username = dr("Username").ToString() + 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 + 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 + check_UserName_regex.Enabled = False + check_UserName_regex_M.Enabled = True + check_UserName_regex_M.IsValid = True + username = txt_Username_M.Text + ElseIf String.IsNullOrEmpty(txt_Username_M.Text) = True AndAlso String.IsNullOrEmpty(txtEmail_M.Text) = 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 = False + ElseIf String.IsNullOrEmpty(txt_Username.Text) = False Then + check_UserName_regex.MatchTimeout = 3000 + 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 + 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 + regexval_txt_Email_M.Validate() + email = txtEmail_M.Text + lblMessage_M.ForeColor = Color.Green + lblMessage_M.Text = "The given e-mail exists in our database." + Else + lblMessage_M.ForeColor = Color.Red + lblMessage_M.Text = "The given e-mail does not exist in our database." + 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!" + 'MsgBox(Msg, Style, Title) + 'If MsgBox(Msg, Style, Title).Yes Then + 'txtEmail.Text = String.Empty + 'txtEmail.Focus() + 'ElseIf MsgBox(Msg, Style, Title).No Then + 'End If + End Try + End If + End Using + con.Close() + End Using + If Session.Item("TokenforEmail") = Nothing Then + tokenname = genToken(username, password, email) + 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)) = 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) + 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)) = 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 @@ -181,7 +186,8 @@ Partial Class login_ForgotPW Else 'MsgBox("The form has not been filled completeley.", MsgBoxStyle.Critical, "Error08") lblMessage.ForeColor = Color.Red - lblMessage.Text = "The form has not been filled completeley." + lblMessage.Text = "The form has not been filled completeley." + End If End If End Sub diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx index b691c82..91d2094 100644 --- a/login/login_FLEX.aspx +++ b/login/login_FLEX.aspx @@ -1,10 +1,10 @@ -<%@ Page Language="VB" Debug="true" AutoEventWireup="false" CodeFile="login_FLEX.aspx.vb" Inherits="login_login_TEST"%> +<%@ Page Language="VB" Debug="true" AutoEventWireup="false" CodeFile="login_FLEX.aspx.vb" Inherits="login_FLEX"%> - <%@ import Namespace="MySql.Data.MySqlClient"%> + <%@ import Namespace="MySql.Data.MySqlClient"%> @@ -26,8 +26,8 @@ - - + +