diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2008-08-22 19:57:01 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2008-08-22 19:57:01 +0000 |
| commit | 5d7bf149227635f13e5f23f23fff2493abde6a51 (patch) | |
| tree | e5aeb3796252c76f4b403771cb938da1be409cd7 /app/acf-util | |
| parent | eeb35226477b6825abc1f53a9ad7c79abeaef0a7 (diff) | |
| download | acf-core-5d7bf149227635f13e5f23f23fff2493abde6a51.tar.bz2 acf-core-5d7bf149227635f13e5f23f23fff2493abde6a51.tar.xz | |
Modified acf_www and logon-controller to redirect to logon on dispatch error and redirect to requested page after logon.
git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@1402 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'app/acf-util')
| -rw-r--r-- | app/acf-util/logon-controller.lua | 5 | ||||
| -rw-r--r-- | app/acf-util/logon-html.lsp | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/acf-util/logon-controller.lua b/app/acf-util/logon-controller.lua index e909fb9..978ee8c 100644 --- a/app/acf-util/logon-controller.lua +++ b/app/acf-util/logon-controller.lua @@ -8,7 +8,8 @@ default_action = "status" logon = function(self) local userid = cfe({ value=clientdata.userid or "", label="User ID" }) local password = cfe({ label="Password" }) - local cmdresult = cfe({ type="form", value={userid=userid, password=password}, label="Logon", option="Logon" }) + local redir = cfe({ value=clientdata.redir or "/welcome/read", label="" }) + local cmdresult = cfe({ type="form", value={userid=userid, password=password, redir=redir}, label="Logon", option="Logon" }) if clientdata.Logon then local logon = self.model:logon(clientdata.userid, clientdata.password, conf.clientip, conf.sessiondir, sessiondata) -- If successful logon, redirect to welcome-page, otherwise try again @@ -19,7 +20,7 @@ logon = function(self) end cmdresult = self:redirect_to_referrer(cmdresult) if logon.value then - redirect(self, "/welcome/read") + redirect(self, cmdresult.value.redir.value) end else cmdresult = self:redirect_to_referrer() or cmdresult diff --git a/app/acf-util/logon-html.lsp b/app/acf-util/logon-html.lsp index 3d131bc..f6137cf 100644 --- a/app/acf-util/logon-html.lsp +++ b/app/acf-util/logon-html.lsp @@ -6,7 +6,8 @@ <h1><%= form.label %></h1> <% - form.value.password.type = "password" - local order = { "userid", "password" } - displayform(form, order) + form.value.password.type = "password" + form.value.redir.type = "hidden" + local order = { "userid", "password" } + displayform(form, order) %> |