diff options
| author | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-04-27 23:31:02 -0400 |
|---|---|---|
| committer | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-04-27 23:31:02 -0400 |
| commit | 557a94e333a1aea1d9f2829683b625c87fcd928e (patch) | |
| tree | b0f7bd0cfdaf1fbc133bf1664629dc206272b4cd /src/site.clj | |
| parent | ff887cd79dfd2d7c7fc2a784a5836a2fd8aadd30 (diff) | |
| parent | c111da7fd591d1b9335cd7b2221ccf54bd5fcc64 (diff) | |
Merge branch 'master' of /pichat/repo
Diffstat (limited to 'src/site.clj')
| -rw-r--r-- | src/site.clj | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/site.clj b/src/site.clj index b4adfdf..f48f560 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))) |