summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xscripts/logreport.py4
-rwxr-xr-xsrc/email.clj29
-rwxr-xr-xstatic/error/500.html2
-rwxr-xr-xstatic/error/error.html2
-rwxr-xr-xstatic/html/help.html2
-rwxr-xr-xstatic/html/help2.html2
-rw-r--r--static/html/hump_welcome.html18
-rwxr-xr-xstatic/templates/banner_dis.st4
-rwxr-xr-xtemplate/banner_dis.st3
-rwxr-xr-xtemplate/rooms/artornot.st2
10 files changed, 43 insertions, 25 deletions
diff --git a/scripts/logreport.py b/scripts/logreport.py
index 3e6dbaf..612a578 100755
--- a/scripts/logreport.py
+++ b/scripts/logreport.py
@@ -287,7 +287,7 @@ class DumpReport(object):
self._output_errors_and_unclassified(writer)
def write_report(self, outdir):
- page_title = 'Dump Report: %s to %s' % (format_time(self.start_time),
+ page_title = 'Hump Report: %s to %s' % (format_time(self.start_time),
format_time(self.end_time))
filename = self.start_time.strftime('%Y-%m-%d__%H-%M.html')
path = os.path.join(outdir, filename)
@@ -325,7 +325,7 @@ def yield_log_windows(raw_iter, interval, parse_func, timekey):
yield start_time + (interval * i), list(g)
-# Dump log parsing
+# Hump log parsing
def parse_time(s):
# Parse times such as 02/Jul/2010:22:21:25 -0400
diff --git a/src/email.clj b/src/email.clj
index 6c09115..dded4a6 100755
--- a/src/email.clj
+++ b/src/email.clj
@@ -1,7 +1,8 @@
(ns email
(:import org.antlr.stringtemplate.StringTemplateGroup)
(:require [clojure.contrib.str-utils2 :as s])
- (:use utils))
+ (:use utils
+ config))
(defn base-mail [& m]
(let [mail (apply hash-map m)
@@ -55,16 +56,16 @@
"text/html"
"text/plain"))
-(defn dump-mail [to subject text]
- (base-mail :user "info@hump.fm"
- :password "UHR4Moghu5a2"
- :host "smtpout.secureserver.net"
- :port 465
- :ssl true
- :to [(join to ",")]
- :subject subject
- :text text
- :mime (classify-mimetype text)))
+(defn hump-mail [to subject text]
+ (base-mail :user (getenv "HUMPFM_SMTP_USER" "info@hump.fm")
+ :password (getenv "HUMPFM_SMTP_PASSWORD" "")
+ :host (getenv "HUMPFM_SMTP_HOST" "smtpout.secureserver.net")
+ :port (getenv-int "HUMPFM_SMTP_PORT" 465)
+ :ssl (getenv-bool "HUMPFM_SMTP_SSL" true)
+ :to [(join to ",")]
+ :subject subject
+ :text text
+ :mime (classify-mimetype text)))
(def *admin-lists* {"humpfmprod" ["info@hump.fm"]
"sostler" ["sbostler@gmail.com"]
@@ -78,12 +79,12 @@
([nick email] (send-registration-email nick email "welcome"))
([nick email temp]
(let [[s b] (parse-mail-template temp {"nick" nick})]
- (dump-mail [email] s b))))
+ (hump-mail [email] s b))))
(defn send-reset-email
([nick email link temp]
(let [[s b] (parse-mail-template temp {"nick" nick "link" link})]
- (dump-mail [email] s b)))
+ (hump-mail [email] s b)))
([nick email link] (send-reset-email nick email link "reset")))
(defn send-mute-email [user-nick admin-nick reason duration]
@@ -91,5 +92,5 @@
user-nick admin-nick duration)
body (format "Reason: %s"
reason)]
- (dump-mail (get-admins) subject body)))
+ (hump-mail (get-admins) subject body)))
diff --git a/static/error/500.html b/static/error/500.html
index 1a19b8b..1c1d13d 100755
--- a/static/error/500.html
+++ b/static/error/500.html
@@ -13,7 +13,7 @@ img{border:0px;}
<img src="https://archive.hump.fm/images/20100826/1282858117687-humpfm-ryder-404.gif">
<br>
We're sorry...
-<br>dump is down cuz of the government or we're too poor.<br><br>
+<br>hump is down cuz of the government or we're too poor.<br><br>
<a href="/"><img src="/static/img/humppixelhover.png" class="memelogo"></a>
</center>
</body>
diff --git a/static/error/error.html b/static/error/error.html
index 1a19b8b..1c1d13d 100755
--- a/static/error/error.html
+++ b/static/error/error.html
@@ -13,7 +13,7 @@ img{border:0px;}
<img src="https://archive.hump.fm/images/20100826/1282858117687-humpfm-ryder-404.gif">
<br>
We're sorry...
-<br>dump is down cuz of the government or we're too poor.<br><br>
+<br>hump is down cuz of the government or we're too poor.<br><br>
<a href="/"><img src="/static/img/humppixelhover.png" class="memelogo"></a>
</center>
</body>
diff --git a/static/html/help.html b/static/html/help.html
index 05629ca..c8e8d9c 100755
--- a/static/html/help.html
+++ b/static/html/help.html
@@ -57,7 +57,7 @@ Oh hai Gaga! Its Easy! Here are some ways...<br>
<div class="CBtxt">
<div class="CBcontent">
<div class="CBt"></div>
-<b>Image Search</b> The image search tool is probably the easiest way to post. Simply enter a search term and see images. When you find one you like, just click "Dump This!" and the image will post.
+<b>Image Search</b> The image search tool is probably the easiest way to post. Simply enter a search term and see images. When you find one you like, just click "Hump This!" and the image will post.
<br><img src="/static/img/imagesearchhelp.png"><br>
You can also narrow down your search criteria by clicking on 'options' and choosing where the images come from, the file type, size..etc.
<br>
diff --git a/static/html/help2.html b/static/html/help2.html
index 01bf133..d27d0d2 100755
--- a/static/html/help2.html
+++ b/static/html/help2.html
@@ -62,7 +62,7 @@ Oh hai Gaga! Its Easy! Here are some ways...<br>
<div class="CBtxt">
<div class="CBcontent">
<div class="CBt"></div>
-<b>Image Search</b> The image search tool is probably the easiest way to post. Simply enter a search term and see images. When you find one you like, just click "Dump This!" and the image will post.
+<b>Image Search</b> The image search tool is probably the easiest way to post. Simply enter a search term and see images. When you find one you like, just click "Hump This!" and the image will post.
<br><img src="/static/img/imagesearchhelp.png"><br>
You can also narrow down your search criteria by clicking on 'options' and choosing where the images come from, the file type, size..etc.
<br>
diff --git a/static/html/hump_welcome.html b/static/html/hump_welcome.html
new file mode 100644
index 0000000..4ceda98
--- /dev/null
+++ b/static/html/hump_welcome.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>hump.fm</title>
+ <style>
+ body { margin: 0; padding: 16px; font-family: Arial, Helvetica, sans-serif; background: #fff; color: #111; }
+ h1 { margin: 0 0 8px; font-size: 18px; }
+ p { margin: 0 0 10px; line-height: 1.4; }
+ a { color: #06c; }
+ </style>
+ </head>
+ <body>
+ <h1>Welcome to hump.fm</h1>
+ <p>Paste an image URL, upload a file, or snap a pic from your webcam.</p>
+ <p><a href="/register">Create an account</a> or <a href="/login">sign in</a>.</p>
+ </body>
+</html>
diff --git a/static/templates/banner_dis.st b/static/templates/banner_dis.st
index 3d2123b..546b475 100755
--- a/static/templates/banner_dis.st
+++ b/static/templates/banner_dis.st
@@ -15,7 +15,7 @@ $else$
<div id="dislogo">
<div align="center">
<img style="visibility:hidden;width:0px;height:0px;" border=0 width=0 height=0 />
- <a href="http://dismagazine.com"><img src="$domain$/static/img/dis.png" class="dislogo"><a class="img_rolldis" href="$domain$"></a>
+ <a href="https://dismagazine.com"><img src="$domain$/static/img/dis.png" class="dislogo"><a class="img_rolldis" href="$domain$"></a>
</div>
</div>
@@ -129,7 +129,7 @@ $if(!user_nick)$
</p>
</div>
<div id="dis_welcome">
- <iframe src="http://dismagazine.com/html/dis-dump.html" id="dis_frame" frameborder="0"></iframe>
+ <iframe src="/static/html/hump_welcome.html" id="dis_frame" frameborder="0"></iframe>
</div>
<link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" />
<link href="/static/css/header.css" rel="stylesheet" type="text/css" media="screen" />
diff --git a/template/banner_dis.st b/template/banner_dis.st
index ea72b33..2fe18c2 100755
--- a/template/banner_dis.st
+++ b/template/banner_dis.st
@@ -5,7 +5,6 @@ $if(!user_nick)$
$endif$
<link rel="stylesheet" type="text/css" href="/static/css/dis.hump.fm.css?v=20260204">
-<link rel="image_src" href="https://dismagazine.com/uploads/2010/08/idgi-arrow-glasses-dis-dump.png" />
<div id="rapper7">
<div id="header7">
<div id="logoicons">
@@ -119,7 +118,7 @@ $if(!user_nick)$
</p>
</div>
<div id="dis_welcome">
- <iframe src="http://dismagazine.com/html/dis-dump.html" id="dis_frame" frameborder="0"></iframe>
+ <iframe src="/static/html/hump_welcome.html" id="dis_frame" frameborder="0"></iframe>
</div>
<link href="/static/css/pages.css?v=20260130" rel="stylesheet" type="text/css" media="screen" />
<link href="/static/css/header.css?v=20260130" rel="stylesheet" type="text/css" media="screen" />
diff --git a/template/rooms/artornot.st b/template/rooms/artornot.st
index 64a6931..6e3ab62 100755
--- a/template/rooms/artornot.st
+++ b/template/rooms/artornot.st
@@ -99,7 +99,7 @@
</div>
$preload()$
<div id="vipinfo">
- <h1><a href="http://artornot.info/">Is it art..or not??!<br>Dump your art, find it on artornot.info!</a></h1>
+ <h1><a href="http://artornot.info/">Is it art..or not??!<br>Hump your art, find it on artornot.info!</a></h1>
</div>
</body>
</html>
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2026-02-05 01:50:52 +0000