simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

This isn't perfect, but does solve the 'getting lost on login' issue.

Browse source
This commit is contained in:
Simon Brooke 2022-02-20 12:00:03 +00:00
parent 6c1bf5f860
commit ee7f1c0bda
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
resources/templates/base.html
View file

@ -80,8 +80,7 @@
<div id="credits"> <div id="credits">
<div> <div>
<img height="16" width="16" alt="one wiki to rule them all" src="img/smeagol.png"/>One Wiki to rule them all || <img height="16" width="16" alt="one wiki to rule them all" src="img/smeagol.png"/>One Wiki to rule them all ||
Smeagol wiki engine {{version}} || Smeagol wiki engine {{version}}
<img height="16" width="16" alt="The Web Engineering Factory &amp; Toolworks" src="https://www.weft.scot/images/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a>
</div> </div>
<div> <div>
Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> || Built with <a href="http://www.luminusweb.net/">LuminusWeb</a> ||

9
src/smeagol/routes/wiki.clj
View file

@ -380,13 +380,14 @@
(or (or
(show-sanity-check-error) (show-sanity-check-error)
(let [params (keywordize-keys (:params request)) (let [params (keywordize-keys (:params request))
headers (keywordize-keys (:headers request))
form-params (keywordize-keys (:form-params request)) form-params (keywordize-keys (:form-params request))
username (:username form-params) username (:username form-params)
password (:password form-params) password (:password form-params)
action (:action form-params) action (:action form-params)
user (session/get :user) user (session/get :user)
redirect-to (:redirect-to params)] redirect-to (or (:redirect-to params) (:referer headers))]
(if redirect-to (log/info (str "After auth, redirect to: " redirect-to))) (when redirect-to (log/info (str "After auth, redirect to: " redirect-to)))
(cond (cond
(= action (util/get-message :logout-label request)) (= action (util/get-message :logout-label request))
(do (do
@ -418,7 +419,9 @@
;; else merge a redirect target into the params ;; else merge a redirect target into the params
(let (let
[redirect-to (if (:uri request) [redirect-to (if (:uri request)
(cs/join "?" [(:uri request) (:query-string request)]))] (cs/join "?" [(:uri request) (:query-string request)])
((:headers request) "referer"))]
(log/info "Setting redirect to '" redirect-to "'")
(assoc-in request [:params :redirect-to] redirect-to)))))) (assoc-in request [:params :redirect-to] redirect-to))))))
(defn passwd-page (defn passwd-page