diff --git a/login/ChangePW.aspx.vb b/login/ChangePW.aspx.vb
index da8fe7b..cb1d295 100644
--- a/login/ChangePW.aspx.vb
+++ b/login/ChangePW.aspx.vb
@@ -77,7 +77,7 @@ Partial Class ChangePW
tempstr = "Error01"
End If
- If txt_Pw.Text = tempstr And txt_Pw_WH.Text = tempstr AndAlso txt_Pw_M.Text = String.Empty And txt_Pw_WH_M.Text = String.Empty Then
+ If txt_Pw.Text = tempstr And txt_Pw_WH.Text = tempstr AndAlso String.IsNullOrEmpty(txt_Pw_M.Text) = True And String.IsNullOrEmpty(txt_Pw_WH_M.Text) = True Then
Try
Dim ConnectionString = ""
Dim usrname = VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Request.QueryString("Par2"))
@@ -112,7 +112,7 @@ Partial Class ChangePW
' If MsgBox(Msg, Style, Title).Ok Then
'Response.Redirect("login_FLEX.aspx")
'End If
- ElseIf txt_Pw_M.Text = tempstr And txt_Pw_WH_M.Text = tempstr AndAlso txt_Pw.Text = String.Empty And txt_Pw_M.Text = String.Empty Then
+ ElseIf txt_Pw_M.Text = tempstr And txt_Pw_WH_M.Text = tempstr AndAlso String.IsNullOrEmpty(txt_Pw.Text) = True And String.IsNullOrEmpty(txt_Pw_M.Text) = True Then
Try
Dim ConnectionString = ""
Dim usrname = VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Request.QueryString("Par2"))
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index 0bee5f0..1063db0 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -273,7 +273,7 @@
Fill in your data here:
|
-
+
|
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index 3405236..041198a 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -283,14 +283,14 @@
|
-
-
-
+
+
+
|
|
-
+
|
@@ -331,9 +331,9 @@
|
-
-
-
+
+
+
|
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index af9be85..6f12da7 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -18,8 +18,8 @@ Partial Class login_FLEX
'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;"
End If
- Dim tb As TextBox = form1.FindControl("UserID")
- Dim tb_M As TextBox = form1.FindControl("UserID_M")
+ Dim tb As TextBox = form1.FindControl("txt_CustomerID")
+ Dim tb_M As TextBox = form1.FindControl("txt_CustomerID_M")
Dim tb2 As TextBox = form1.FindControl("UserName")
Dim tb2_M As TextBox = form1.FindControl("UserName_M")
Dim tb3 As TextBox = form1.FindControl("Password")
@@ -37,19 +37,19 @@ Partial Class login_FLEX
Dim regexusername As RegularExpressionValidator = Page.FindControl("check_UserName_regex")
Dim regexusername_M As RegularExpressionValidator = Page.FindControl("check_UserName_M_regex")
- Dim user_ID As String = String.Empty
+ Dim Customer_ID As String = String.Empty
Dim UserNaMe As String = String.Empty
Dim passw As String = String.Empty
If reqfieldvaluserID.IsValid Then
regexuserID.Validate()
If regexuserID.IsValid Then
- user_ID = tb.Text
+ Customer_ID = tb.Text
End If
ElseIf reqfieldvaluserID_M.IsValid Then
regexusername_M.Validate()
If regexusername_M.IsValid Then
- user_ID = tb_M.Text
+ Customer_ID = tb_M.Text
End If
End If
@@ -71,7 +71,7 @@ Partial Class login_FLEX
Using cmd As New SqlCommand("SELECT COUNT(*), UserId,Username, Password FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username AND Password=@Password AND Kundennr=@Kundennr")
' cmd.CommandType = CommandType.StoredProcedure
cmd.Parameters.AddWithValue("@Username", UserNaMe)
- cmd.Parameters.AddWithValue("UserID", user_ID)
+ cmd.Parameters.AddWithValue("UserID", Customer_ID)
cmd.Parameters.AddWithValue("@Password", passw)
cmd.Connection = con
con.Open()
@@ -89,24 +89,24 @@ Partial Class login_FLEX
Exit Select
Case Else
If tb.Text = dr("UserId") Then
- user_ID = dr("UserID")
+ Customer_ID = dr("UserId")
Else
Login1.FailureText = "ID cannot be found in the database!"
End If
If tb2.Text = dr("Username") Then
- user_ID = dr("Username")
+ Customer_ID = dr("Username")
Else
Login1.FailureText = "Username is not in the database!"
End If
If tb3.Text = dr("Password") Then
- user_ID = dr("Password")
+ Customer_ID = dr("Password")
Else
Login1.FailureText = "Password is not in the database!"
End If
Login1.FailureText = "Erfolgreich validiert."
Session.Add("test", UserNaMe)
- Session.Add("UserID", user_ID)
+ Session.Add("UserID", Customer_ID)
Session.Add("PW", passw)
FormsAuthentication.RedirectFromLoginPage(UserNaMe, True)