Don't touch the sessiondata.menu table. Working on getting these both to place nice together.

git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@711 ab2d0c66-481e-0410-8bed-d214d4d58bed

2 files changed, 10 insertions, 0 deletions

diff --git a/app/acf-util/logon-logout-html.lsp b/app/acf-util/logon-logout-html.lsp
new file mode 100644
index 0000000..b3e2f08
--- /dev/null
+++ b/app/acf-util/logon-logout-html.lsp
@@ -0,0 +1,6 @@
+<? local view= ... ?> 
+<h1>Log Out</h1>
+
+<?= html.cfe_unpack(view) ?>
+
+<?= view.logout.value ?>
diff --git a/app/acf-util/logon-model.lua b/app/acf-util/logon-model.lua
index a3a1171..3f5a149 100644
--- a/app/acf-util/logon-model.lua
+++ b/app/acf-util/logon-model.lua
@@ -29,8 +29,10 @@ local csess = session.check_session(conf.sessiondir, sessdata)
 if csess ~= "an unknown user" then
 session.unlink_session(conf.sessiondir, sessdata)
 for a,b in pairs(sessiondata) do 
+if a ~= "menu" then
 sessiondata[a] = nil
 end
+end
 sessiondata.id = session.random_hash(512)
 end
 
@@ -111,8 +113,10 @@ logoff = function (self, sessdata)
 	logoff = "Incomplete or Unsuccessful logoff"
 	end
 	for a,b in pairs(sessiondata) do
+	if a ~= "menu" then
 	sessiondata[a] = nil
 	end
+	end
 	sessiondata.id = session.random_hash(512) 
 	return ( cfe{ {value=logoff,name="logoff"},{value=sessiondata,name="sessiondata"} })
 end