From 87d560c788ad04fc53e605ab01a7210962898185 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 22 Sep 2021 10:40:32 +0200
Subject: [PATCH] Login logik wurde verbessert

---
 Customers/CustomsAviso.aspx.vb |  2 +-
 login/login_FLEX.aspx.vb       | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index a19af1a..b89c8a5 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -155,7 +155,6 @@ Partial Class Kundenbereich_Default
         'MsgBox(Session.Item("test").ToString)
         'MsgBox(Session.Item("CustomerID").ToString)
         'MsgBox(Session.Item("PW").ToString)
-
         Kdnrtext = Session.Item("CustomerID").ToString
 
         dt = Nothing
@@ -322,6 +321,7 @@ Partial Class Kundenbereich_Default
                 ElseIf (rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True) AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
                     normaltable.Rows.Add(tr)
                 End If
+
                 i += 1
             Next
         Else
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index 9c67c5e..ca05fe9 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -38,13 +38,17 @@ Partial Class login_login_TEST
                             Login1.FailureText = "Account has not been activated."
                             Exit Select
                         Case Else
-                            Session.Add("test", Login1.UserName)
-                            CustomerIDTextBox = Login1.FindControl("CustomerID")
-                            Session.Add("CustomerID", CustomerIDTextBox.Text)
-                            Session.Add("PW", Login1.Password)
+                            If Session.IsNewSession = True Then
+                                Session.Add("test", Login1.UserName)
+                                CustomerIDTextBox = Login1.FindControl("CustomerID")
+                                Session.Add("CustomerID", CustomerIDTextBox.Text)
+                                Session.Add("PW", Login1.Password)
+                                FormsAuthentication.RedirectFromLoginPage(Login1.UserName, Login1.RememberMeSet)
+                            Else
+                                FormsAuthentication.RedirectFromLoginPage(Login1.UserName, Login1.RememberMeSet)
+                            End If
 
 
-                            FormsAuthentication.RedirectFromLoginPage(Login1.UserName, Login1.RememberMeSet)
                             'FormsAuthentication.SetAuthCookie(Login1.UserName, True)
                             'Response.Redirect("mypage.aspx")
                             Exit Select
@@ -54,7 +58,6 @@ Partial Class login_login_TEST
                 con.Close()
             End Using
 
-
         End Using
     End Sub