From 16d0c5ace8763513f7f766b8a40525c472084a44 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 13 Sep 2021 16:49:45 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Customers.master     |  2 +-
 Customers/Customers.master.vb  | 12 +-----------
 Customers/CustomsAviso.aspx.vb |  4 ++--
 login/Logout.aspx              | 17 +++++++++++++++++
 login/Logout.aspx.vb           | 14 ++++++++++++++
 newpageJulius_Sidebar.aspx     |  2 +-
 newpageJulius_Sidebar.aspx.vb  |  5 ++---
 7 files changed, 38 insertions(+), 18 deletions(-)
 create mode 100644 login/Logout.aspx
 create mode 100644 login/Logout.aspx.vb

diff --git a/Customers/Customers.master b/Customers/Customers.master
index 7822bfc..12add56 100644
--- a/Customers/Customers.master
+++ b/Customers/Customers.master
@@ -275,7 +275,7 @@
                                                             <ul style="list-style: none;"class="collapse list-unstyled" id="UserSubmenu1">
                                                                     <span class="navbar-toggler-icon"></span>                                                                
                                                                     <li><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;white-space: nowrap; height:20px"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button>  </li>                                                              
-                                                                    <li><button type="button" class="btn btn-primary" id="LogoutButton1" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;width:200px;z-index:1032;margin-left:-16px"><img src="../images/Icons/main/Logout.svg.png"; style="font-size:14px;width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button></li>                     
+                                                                    <li><button type="button" class="btn btn-primary" id="LogoutButton1" href="../login/Logout.aspx" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;width:200px;z-index:1032;margin-left:-16px"><img src="../images/Icons/main/Logout.svg.png"; style="font-size:14px;width:20px; height:20px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</button></li>                     
                                                             </ul>
                                                       </li>    
              </ul>                
diff --git a/Customers/Customers.master.vb b/Customers/Customers.master.vb
index 5129592..53f596b 100644
--- a/Customers/Customers.master.vb
+++ b/Customers/Customers.master.vb
@@ -3,17 +3,7 @@ Partial Class Customers_Customers
     Inherits System.Web.UI.MasterPage
     Protected Sub LogoutButton1_Click(sender As Object, e As EventArgs)
         MsgBox("Logged out!")
-        FormsAuthentication.SignOut()
-
-        Session.Clear() 'clear session
-        Session.Abandon() 'Abandon session
-        Response.Cache.SetExpires(DateTime.UtcNow.AddMinutes(-1))
-        Response.Cache.SetCacheability(HttpCacheability.NoCache)
-        Response.Cache.SetNoStore()
-
-
-
-        Response.Redirect("../newpageJulius_Sidebar.aspx")
+        Response.Redirect("../login/Logout.aspx")
     End Sub
 End Class
 
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 4b8c493..3c8ab50 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -44,7 +44,7 @@ Partial Class Kundenbereich_Default
 
         dt = Nothing
 
-        If datebis > datevon Then
+        If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
             Try
                 datevon = Date.Parse(pickdate1.Text)
                 datebis = Date.Parse(pickdate2.Text)
@@ -153,7 +153,7 @@ Partial Class Kundenbereich_Default
 
                     normaltable.Rows.Add(tr)
 
-                i = i + 1
+                i += 1
             Next
         End If
 
diff --git a/login/Logout.aspx b/login/Logout.aspx
new file mode 100644
index 0000000..1bcd505
--- /dev/null
+++ b/login/Logout.aspx
@@ -0,0 +1,17 @@
+<%@ Page Language="VB" AutoEventWireup="false" CodeFile="Logout.aspx.vb" Inherits="login_Logout" %>
+
+<!DOCTYPE html>
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title></title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <div>
+            
+        </div>
+    </form>
+</body>
+</html>
diff --git a/login/Logout.aspx.vb b/login/Logout.aspx.vb
new file mode 100644
index 0000000..9e3a549
--- /dev/null
+++ b/login/Logout.aspx.vb
@@ -0,0 +1,14 @@
+
+Partial Class login_Logout
+    Inherits System.Web.UI.Page
+    Protected Sub Page_Load(sender As Object, e As EventArgs)
+        FormsAuthentication.SignOut()
+        Dim sessionname = Session.Item("lastpage").ToString
+        Session.Clear() 'clear session
+        Session.Abandon() 'Abandon session
+        Response.Cache.SetExpires(DateTime.UtcNow.AddMinutes(-1))
+        Response.Cache.SetCacheability(HttpCacheability.NoCache)
+        Response.Cache.SetNoStore()
+        Response.Redirect(sessionname)
+    End Sub
+End Class
diff --git a/newpageJulius_Sidebar.aspx b/newpageJulius_Sidebar.aspx
index 819a1ac..df25bf1 100644
--- a/newpageJulius_Sidebar.aspx
+++ b/newpageJulius_Sidebar.aspx
@@ -552,7 +552,7 @@
                                     <iframe id="frame1" src="login/login_FLEX.aspx" runat="server" seamless="seamless" style="width:300px;height:300px;overflow:no-content;background-image:none;" scrolling="no" /> 
                                  </AnonymousTemplate>
                                  <LoggedInTemplate>
-                                     <iframe id="frame1" src="login/Loggedin.aspx" runat="server" seamless="seamless" style="width:300px;height:300px;overflow:no-content;background-image:none;" scrolling="no" /> 
+                                     <iframe id="frame2" src="login/Loggedin.aspx" runat="server" seamless="seamless" style="width:300px;height:300px;overflow:no-content;background-image:none;" scrolling="no" /> 
                                  </LoggedInTemplate>                                 
                              </asp:LoginView>
                           <div style="height:10px"></div>
diff --git a/newpageJulius_Sidebar.aspx.vb b/newpageJulius_Sidebar.aspx.vb
index 0b02ca4..bb1d58a 100644
--- a/newpageJulius_Sidebar.aspx.vb
+++ b/newpageJulius_Sidebar.aspx.vb
@@ -9,8 +9,7 @@ Partial Class _Default
         Response.Cache.SetExpires(DateTime.UtcNow.AddMinutes(-1))
         Response.Cache.SetCacheability(HttpCacheability.NoCache)
         Response.Cache.SetNoStore()
-
-        Response.Redirect("newpageJulius_Sidebar.aspx")
+        Session.Add("lastpage", "../newpageJulius_Sidebar.aspx")
+        Response.Redirect("login/Logout.aspx")
     End Sub
-
 End Class