Hump.fm: remove dump.fm branding

7 files changed, 17 insertions, 17 deletions

diff --git a/src/admin.clj b/src/admin.clj
index 1073095..605ce87 100755
--- a/src/admin.clj
+++ b/src/admin.clj
@@ -289,7 +289,7 @@ AND cancelled = false
    (let [reports (get-reports)]
      (html
       [:html
-       [:head [:title "dump.fm reports"]]
+       [:head [:title "hump.fm reports"]]
        [:body
 	[:ul
 	 (for [r reports]
diff --git a/src/config.clj b/src/config.clj
index f8f3d7e..5fd18ba 100755
--- a/src/config.clj
+++ b/src/config.clj
@@ -45,7 +45,7 @@
 (def *cookie-domain*  
   (getenv "DUMPFM_COOKIE_DOMAIN"
           (if (= *server-user* "dumpfmprod")
-            ".dump.fm"
+            ".hump.fm"
             "")))
 
 (def *passwordless-login*
diff --git a/src/email.clj b/src/email.clj
index 8a29418..4afd94c 100755
--- a/src/email.clj
+++ b/src/email.clj
@@ -38,7 +38,7 @@
       (.setContent msg (:text mail) (:mime mail))
       (javax.mail.Transport/send msg))))
 
-(def mail-templates (StringTemplateGroup. "dumpfm-mail" "template/mail" ))
+(def mail-templates (StringTemplateGroup. "humpfm-mail" "template/mail" ))
 (.setRefreshInterval mail-templates 3)
 
 (defn parse-mail-template [temp props]
@@ -56,7 +56,7 @@
     "text/plain"))
 
 (defn dump-mail [to subject text]
-  (base-mail :user "info@dump.fm"
+  (base-mail :user "info@hump.fm"
              :password "UHR4Moghu5a2"
              :host "smtpout.secureserver.net"
              :port 465
@@ -66,7 +66,7 @@
              :text text
              :mime (classify-mimetype text)))
 
-(def *admin-lists* {"dumpfmprod" ["info@dump.fm"]
+(def *admin-lists* {"dumpfmprod" ["info@hump.fm"]
                     "sostler"    ["sbostler@gmail.com"]
                     "jules"      ["julescarbon@gmail.com"]})
 
diff --git a/src/events.clj b/src/events.clj
index a571230..4b8f58f 100755
--- a/src/events.clj
+++ b/src/events.clj
@@ -36,7 +36,7 @@
 (defn image-already-submitted? [event img-src]

   false)

 

-(def event-submission-room "dumpfm")

+(def event-submission-room *default-room*)
 

 

 (defn build-event-msg [nick evnet url]

@@ -66,4 +66,4 @@
                    (dosync

                     (add-message (build-event-msg nick (:key event) url) room))

                    (println "copied")

-                   (resp-success "OK")))))
\ No newline at end of file
+                   (resp-success "OK")))))
diff --git a/src/rooms.clj b/src/rooms.clj
index 3367ea9..617a14d 100755
--- a/src/rooms.clj
+++ b/src/rooms.clj
@@ -32,7 +32,7 @@
 (defn start-user-flusher! []
   (send flusher flush-inactive-users!))
 
-(def *default-room* "dumpfm")
+(def *default-room* "humpfm")
 
 (defn default-room? [key]
   (= (lower-case key) *default-room*))
@@ -128,7 +128,7 @@
        (first
         (do-select ["INSERT INTO users (nick, hash, email)
                      VALUES (?, ?, ?) RETURNING user_id"
-                    nick "GARBAGE" "info@dump.fm"])))))
+                    nick "GARBAGE" "info@hump.fm"])))))
 
 (def room-bot-id-cache (ref {}))
 
diff --git a/src/site.clj b/src/site.clj
index 8ca26b8..2cd3314 100755
--- a/src/site.clj
+++ b/src/site.clj
@@ -163,7 +163,7 @@
 ; v1: Format: v1%nick%expiry%token-hash
 ;     Date:   2010/04/24
 ;     Note:   Contains same information as v0, but created under the
-;             wildcard domain (i.e. ".dump.fm") so that logins work
+;             wildcard domain (i.e. ".hump.fm") so that logins work
 ;             across all subdomains.
 
 (defn encode-login-token [nick hash expiry]
@@ -176,7 +176,7 @@
 
 (defn parse-login-token [token]
   ; If users have multiple login-cookies across different domains
-  ; (i.e. both "dump.fm" and ".dump.fm"), token will be a vector
+  ; (i.e. both "hump.fm" and ".hump.fm"), token will be a vector
   ; instead of a string.
   (if (not (string? token))
     (some identity (map parse-login-token token))
@@ -1031,10 +1031,10 @@ WHERE  user_id IN
 
 ;; timb: this can be called with a callback or not...
 ;; 
-;; dump.fm/cmd/search/foo -> [result, result]
+;; hump.fm/cmd/search/foo -> [result, result]
 ;; cons: can only be ajax get'd from the same domain
 ;; 
-;; dump.fm/cmd/search/foo?callback=someFunc -> someFunc([result, result])
+;; hump.fm/cmd/search/foo?callback=someFunc -> someFunc([result, result])
 ;; cons: has to use a <script> tag. seems to freeze browser until results returned
 ;; 
 (defn json-search [undecoded-url-searchterms params]
@@ -1058,7 +1058,7 @@ WHERE  user_id IN
   (msg {:user_id 1
         :nick "scottbot"
         :avatar "http://i.imgur.com/isKqZ.gif"}
-       {:room "dumpfm"
+       {:room *default-room*
         :content (rand-elt random-posts)}))
 
 (def random-poster
@@ -1133,7 +1133,7 @@ WHERE  user_id IN
   (let [spaceless (.replace s \space \-)
         nick-clean (re-gsub #"[^A-Za-z0-9]" "" nick)
         subbed (re-gsub #"[^\w.-]" "" spaceless)]
-    (str-join "-" [(System/currentTimeMillis) "dumpfm" nick-clean subbed])))
+    (str-join "-" [(System/currentTimeMillis) *default-room* nick-clean subbed])))
 
 (defn image-url-from-file [dir date file]
   (str-join "/" [*server-url* dir date (.getName file)]))
diff --git a/src/utils.clj b/src/utils.clj
index 57060a6..0be144c 100755
--- a/src/utils.clj
+++ b/src/utils.clj
@@ -24,7 +24,7 @@
         config
         ))
 
-(let [db-name (or (System/getenv "DUMPFM_DB_NAME") "dumpfm")
+(let [db-name (or (System/getenv "DUMPFM_DB_NAME") "humpfm")
       db-user (or (System/getenv "DUMPFM_DB_USER") "postgres")
       db-pass (or (System/getenv "DUMPFM_DB_PASSWORD") "")
       db-port (let [p (System/getenv "DUMPFM_DB_PORT")]
@@ -404,7 +404,7 @@
 
 ;; Templates
 
-(def template-group (new StringTemplateGroup "dumpfm" "template"))
+(def template-group (new StringTemplateGroup "humpfm" "template"))
 (.setRefreshInterval template-group 10)
 
 (defn initialize-template [st session]