Merge

1 files changed, 6 insertions, 38 deletions

diff --git a/src/site.clj b/src/site.clj
index 7b75b71..2936f13 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -14,17 +14,7 @@
         clojure.contrib.sql
         compojure
         cookie-login
-        image-utils
-        ))
-
-(let [db-host "localhost"
-      db-port 5432
-      db-name "dumpfm"]
-  (def db {:classname "org.postgresql.Driver"
-           :subprotocol "postgresql"
-           :subname (str "//" db-host ":" db-port "/" db-name)
-           :user "postgres"
-           :password "root"}))
+        utils))
 
 (def *run-flusher* true)
 (def *flusher-sleep-ms* 4000)
@@ -80,12 +70,6 @@
 
 (def formatter (new SimpleDateFormat "h:mm EEE M/d"))
 
-(defn resp-error [message]
-  {:status 400 :headers {} :body message})
-
-(defn resp-success [message]
-  {:status 200 :headers {} :body (json-str message)})
-
 (defn non-empty-string? [s]
   (and s (> (count s) 0)))
 
@@ -104,19 +88,6 @@
        (.setTimeZone df (TimeZone/getTimeZone "GMT"))
        (.format df dt))))
 
-;; Database
-
-(defn do-select [query]
-  (with-connection db
-    (with-query-results rs query
-      (doall rs))))
-
-(defn do-count [query]
-  ((first (with-connection db
-	    (with-query-results rs query
-	      (doall rs))))
-   :count))
-
 ;; User authentication
 
 (def nick-regex #"^[A-Za-z0-9\-_∆˚†]*$")
@@ -274,13 +245,9 @@
     (try [(aget x 0) (Long/parseLong (aget x 1)) (aget x 2)]
          (catch NumberFormatException _ nil))))
 
+
 (defn read-login-token [token]
-  (if-let [[nick expiry token-hash]  (parse-login-token token)]
-    (if (>= expiry (System/currentTimeMillis))
-      (let [db-info (fetch-nick nick)
-            computed-hash (sha1-hash (db-info :hash) expiry)]
-        (if (= token-hash computed-hash)
-          db-info)))))
+  nil)
 
 (defn make-login-token
   [{nick :nick hash :hash}]
@@ -303,7 +270,7 @@
         db-user (authorize-nick-hash nick hash)
         remember-me (= (params :rememberme) "yes")
         login-cookie (if remember-me
-                       (make-login-token db-user *login-token-expiry*)
+                       (make-login-token db-user)
                        (clear-login-token *login-token-key*))]
     (if db-user
       [(session-assoc-from-db db-user)
@@ -642,6 +609,7 @@
                                            (-> request :route-params :room)
                                            (-> request :route-params :offset)
                                            params))
+  (GET "/stats" (validated-stats session params))
   ;; TODO: validate POST Referrer headers for POSTs
   (POST "/msg" (validated-msg session params))
   (POST "/submit-registration" (register session params))
@@ -696,4 +664,4 @@
   "/upload/*" (servlet multipart)
   "/*" (servlet pichat))
 
-(send-off flusher flush!)
\ No newline at end of file
+(send-off flusher flush!)