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 @@ 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" %> + + + + + + + + + +
+
+ +
+
+ + 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 @@