diff options
| author | Scott Ostler <scottbot9000@gmail.com> | 2010-09-04 04:35:52 -0400 |
|---|---|---|
| committer | Scott Ostler <scottbot9000@gmail.com> | 2010-09-04 04:35:52 -0400 |
| commit | a3cc24432db0f4a9c9c79731f45e3c03538a432b (patch) | |
| tree | 3bb6e55aa4168c904ce4f4975ffdf6ef61e57961 | |
| parent | 86c12f125f1bcfad4959c2a9b1bb1baa8eac3285 (diff) | |
Make login/logout be POSTS
| -rw-r--r-- | src/site.clj | 15 | ||||
| -rw-r--r-- | static/index.html | 2 | ||||
| -rw-r--r-- | template/form_login.st | 8 |
3 files changed, 14 insertions, 11 deletions
diff --git a/src/site.clj b/src/site.clj index d692849..422c0b3 100644 --- a/src/site.clj +++ b/src/site.clj @@ -1035,11 +1035,16 @@ WHERE u.user_id = ANY(?)" ts (maybe-parse-long (params :ts) 0) token (params :token) valid (valid-reset-link? nick token ts)] - (.setAttribute st "valid_request" valid) - (.setAttribute st "nick" nick) - (when valid - (.setAttribute st "link" (reset-link nick token ts))) - (.toString st))) + (if (and (zero? ts) + (nil? nick) + (nil? token)) + (reset-request-page session) + (do + (.setAttribute st "valid_request" valid) + (.setAttribute st "nick" nick) + (when valid + (.setAttribute st "link" (reset-link nick token ts))) + (.toString st))))) (defn reset-account! [session params] (let [nick (params :nick) diff --git a/static/index.html b/static/index.html index 80fc133..08df9ad 100644 --- a/static/index.html +++ b/static/index.html @@ -385,7 +385,7 @@ height="205"></div> Remember Me </label> <br> - <a href="/reset-request">Lost password?</a><br> + <a href="/reset">Lost password?</a><br> </div> </div> \ diff --git a/template/form_login.st b/template/form_login.st index 2db9d0b..ab9e4f1 100644 --- a/template/form_login.st +++ b/template/form_login.st @@ -16,11 +16,9 @@ Remember Me </label> <br> </p> </form> -<span id="pwreset"> - <a href="http://dump.fm/reset-request">Password Reset</a> - </span> - - + <span id="pwreset"> + <a href="http://dump.fm/reset">Password Reset</a> + </span> </fieldset> </div> <script src="/static/js/home.js" type="text/javascript"></script> |