From 42348f2924aad9d26be5e950ef148e237b62987a Mon Sep 17 00:00:00 2001 From: sostler Date: Tue, 27 Apr 2010 23:26:35 -0400 Subject: Fixed registration bug --- src/site.clj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/site.clj b/src/site.clj index b4adfdf..089bba2 100644 --- a/src/site.clj +++ b/src/site.clj @@ -344,8 +344,8 @@ (defn nick-reserved? [nick] (let [query "SELECT * FROM users WHERE LOWER(nick) = ? LIMIT 1"] - (and (not (contains? (poll *reserved-nicks*) nick)) - (= (count (do-select [query (lower-case nick)])) 0)))) + (or (contains? (poll *reserved-nicks*) nick) + (= (count (do-select [query (lower-case nick)])) 0)))) (defn register [session params] (let [nick (params :nick) @@ -816,8 +816,8 @@ ORDER BY msg_count DESC") ;; Account resets -(defn reset-page [session] - ) +(defn reset-request-page [session] + (.toString (fetch-template "reset_request.st" session))) (defn reset-account-request! [session params] ) @@ -988,7 +988,7 @@ ORDER BY msg_count DESC") (GET "/directory" (directory session 0)) (GET "/directory/:offset" (directory session (maybe-parse-int (-> request :route-params :offset) 0))) - (GET "/reset" (reset-page session)) + (GET "/reset" (reset-request-page session)) (POST "/reset-request" (reset-account-request! session params)) (POST "/reset/:key" (reset-account! session (-> request :route-params :key))) -- cgit v1.2.3-70-g09d2