From eb764883beb1ddf4d5a2f429f4f73c6ee93e4728 Mon Sep 17 00:00:00 2001
From: sostler <sbostler@gmail.com>
Date: Tue, 16 Feb 2010 01:36:32 -0500
Subject: Split site.clj

---
 src/site.clj | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'src/site.clj')

diff --git a/src/site.clj b/src/site.clj
index 4ba5981..b1774fd 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -9,20 +9,10 @@
            org.antlr.stringtemplate.StringTemplateGroup)
   (:use clojure.contrib.str-utils
         clojure.contrib.duck-streams
-        clojure.contrib.json.write
         clojure.contrib.sql
         compojure
         cookie-login
-        ))
-
-(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 template-group (new StringTemplateGroup "dumpfm" "template"))
 (.setRefreshInterval template-group 3)
@@ -74,12 +64,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)))
 
@@ -98,19 +82,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\-_∆˚†]*$")
@@ -586,6 +557,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))
-- 
cgit v1.2.3-70-g09d2


From d304167e85f67340fa145924a22087a0723fc1cc Mon Sep 17 00:00:00 2001
From: sostler <sbostler@gmail.com>
Date: Tue, 16 Feb 2010 01:41:54 -0500
Subject: Readded clojure.contri.json.write import

---
 src/site.clj | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/site.clj')

diff --git a/src/site.clj b/src/site.clj
index e0a40b9..dd7de80 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -10,6 +10,7 @@
   (:use clojure.xml
         clojure.contrib.str-utils
         clojure.contrib.duck-streams
+        clojure.contrib.json.write
         clojure.contrib.sql
         compojure
         cookie-login
-- 
cgit v1.2.3-70-g09d2


From 2b64baa3f6cffe0153596613ee7a749b90aaa816 Mon Sep 17 00:00:00 2001
From: dumpfmprod <dumpfmprod@ubuntu.(none)>
Date: Wed, 17 Feb 2010 00:47:47 -0500
Subject: commit site.clj to fix cookies

---
 src/site.clj | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/site.clj')

diff --git a/src/site.clj b/src/site.clj
index dd7de80..fb78a9b 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -243,13 +243,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}]
@@ -272,7 +268,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)
@@ -623,4 +619,4 @@
   "/upload" (servlet multipart)
   "/*" (servlet pichat))
 
-(send-off flusher flush!)
\ No newline at end of file
+(send-off flusher flush!)
-- 
cgit v1.2.3-70-g09d2