diff options
| author | Scott Ostler <scottbot9000@gmail.com> | 2010-11-02 19:55:35 -0400 |
|---|---|---|
| committer | Scott Ostler <scottbot9000@gmail.com> | 2010-11-02 19:55:35 -0400 |
| commit | e2e82dc608862c0c72e0d45599f2768665edf7dd (patch) | |
| tree | baad5d86f85c230afd6c61c40e6d3d7e4cd3f1c9 /src/site.clj | |
| parent | 73443969b5e98713e1bd36b0b524f60b77a0ad53 (diff) | |
| parent | 1f1378031e0f643011e22942ed6005d4000d015d (diff) | |
Merge src/site.clj conflict
Diffstat (limited to 'src/site.clj')
| -rw-r--r-- | src/site.clj | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/site.clj b/src/site.clj index 53c0fa7..a1f5c08 100644 --- a/src/site.clj +++ b/src/site.clj @@ -785,15 +785,9 @@ WHERE u.user_id = ANY(?)" (resp-success msg-id))))) -(defn is-bad-mgmt? [params request] - (and (= (lower-case (params :room)) "mgmt") - (not - (= (lower-case (get (:headers request) "referer")) "http://dump.fm/mgmt/idontgetit")))) - (defn validated-msg [session params request] (cond (not (validate-room-access (params :room) session)) (resp-error "UNKNOWN_ROOM") - (is-bad-mgmt? params request) (resp-error "INVALID") :else (msg session params))) ;; Browser @@ -824,7 +818,7 @@ WHERE u.user_id = ANY(?)" (let [roomkey (room :key) st (fetch-template "log" session) logger (make-time-logger) - offset (maybe-parse-int offset 0) + offset (maybe-parse-int offset 0) dump-offset (* offset *dumps-per-page*) image-only (and (not (room :admin_only)) (not= (params :show) "all")) @@ -848,7 +842,6 @@ WHERE u.user_id = ANY(?)" (.setAttribute st "roomname" (room :name)) (.setAttribute st "debug_log_items" (logger)) (.toString st))) - (defn validated-log [session room-key offset params] (if-vip @@ -1221,7 +1214,6 @@ WHERE u.user_id = ANY(?)" (not image) [200 "INVALID_REQUEST"] mute [200 (format-mute mute)] (not has-access) [200 "UNKNOWN_ROOM"] - (is-bad-mgmt? params request) [200 "INVALID_REQUEST"] :else (do-upload session image (lookup-room room-key))))) (defn upload-photo [session params] @@ -1517,4 +1509,6 @@ WHERE u.user_id = ANY(?)" ;(if (not= *server-url* "http://dump.fm") ; (start! random-poster)) - + + + |