diff options
| -rw-r--r-- | src/site.clj | 7 | ||||
| -rw-r--r-- | static/register.html | 85 | ||||
| -rw-r--r-- | static/registerdis.html | 67 |
3 files changed, 58 insertions, 101 deletions
diff --git a/src/site.clj b/src/site.clj index e47e121..a114cf4 100644 --- a/src/site.clj +++ b/src/site.clj @@ -293,6 +293,10 @@ WHERE user_id IN (do-select [muted-ips-query])))] (contains? muted-ips ip))) +; this should check if the user was created in the last day i guess +(defn ip-recently-created? [ip] + (> (count (do-select ["select count(*) from users where created_ip=?::cidr" (str ip)] )) 1)) + (def *reserved-nicks-path* "docs/reserved_nicks.txt") (def *reserved-nicks-refresh-period-sec* 300) @@ -317,7 +321,8 @@ WHERE user_id IN invalid-nick-reason (is-invalid-nick? nick)] (cond invalid-nick-reason (resp-error invalid-nick-reason) (nick-reserved? nick) (resp-error "NICK_TAKEN") - (ip-recently-muted? ip) (resp-error "RECENTLY_MUTED") + (ip-recently-muted? ip) (resp-error "RECENTLY_MUTED") + (ip-recently-created? ip) (resp-error "RECENTLY_CREATED") :else (do (do-insert :users [:nick :hash :email] diff --git a/static/register.html b/static/register.html index 7ccf80d..0382d56 100644 --- a/static/register.html +++ b/static/register.html @@ -1,48 +1,67 @@ -<html> - <head> +<html><head> <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script> - <script type="text/javascript" src="/static/js/underscore-min.js"></script> - <script type="text/javascript" src="/static/js/register.js"></script> + <script type="text/javascript" src="http://dump.fm//static/js/underscore-min.js"></script> + <script type="text/javascript" src="http://dump.fm//static/js/register.js"></script> <script> $(document).ready(initRegister); </script> - <link rel="stylesheet" type="text/css" href="static/css/index.css"> - <link rel="shortcut icon" href="static/favicon.ico"> + <link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/index.css"> + + <link rel="shortcut icon" href="static/favicon.ico"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> + <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board"> <META NAME="description" CONTENT="Talk with pictures!"> <title>dump.fm - register</title></head> - <body> +<body> + +<div id="rapper"></div> +<div id="content" style="z-index:77;"> - <div id="rapper"></div> - <div id="content" style="z-index:77;height:100%;"> +<div id="main" align="center"> - <div id="main" align="center"> + <div id="passwordreset"> + <img src="/static/img/furie3.png" id="furie3" /> + <div id="passwordreset"> + <div id="logo-and-text"> + <a href="/"><img src="/static/img/dumppixellarge3.png"></a> + <div align="center"> + <label style="text-align:left;margin-bottom:-8px;">username</label> + <input type="text" class="field"id="nickInput" /> + <br> + + <label style="text-align:left;margin-bottom:-8px;">password</label> + <input type="password" class="field" id="passwordInput" /> + <br> + <label style="text-align:left;margin-bottom:-8px;">password2x</label> + <input type="password" class="field" id="passwordInput2" /> + + <label style="text-align:left;margin-bottom:-8px;">email</label> + <input type="text" class="field"id="emailInput" /> + </h1> - <div id="passwordreset"> - <div id="passwordreset"> - <div id="logo-and-text"> - <a href="/"><img src="/static/img/dumppixellarge3.png"></a> - <div align="center"> - <label style="text-align:center;margin-bottom:10px;">Registration is currently closed. - - <br><br> - Maybe ask a friend?</label> - - </div> - </div> - </div> + </form> + + <br> + + + <div align="center"> + <input type="submit" class="submit" id="submit" value="Register!" /> </div> + </div> + </div> + </div> +</div> - <script type="text/javascript"> - var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); - document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); - </script> - <script type="text/javascript"> - try { - var pageTracker = _gat._getTracker("UA-12364576-1"); - pageTracker._trackPageview(); - } catch(err) {}</script> +<script type="text/javascript"> +var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); +document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); +</script> +<script type="text/javascript"> +try { +var pageTracker = _gat._getTracker("UA-12364576-1"); +pageTracker._trackPageview(); +} catch(err) {}</script> - </body> +</body> </html> diff --git a/static/registerdis.html b/static/registerdis.html deleted file mode 100644 index 6343f59..0000000 --- a/static/registerdis.html +++ /dev/null @@ -1,67 +0,0 @@ -<html><head> - <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script> - <script type="text/javascript" src="http://dump.fm//static/js/underscore-min.js"></script> - <script type="text/javascript" src="http://dump.fm//static/js/registerdis.js"></script> - <script> - $(document).ready(initRegister); - </script> - <link rel="stylesheet" type="text/css" href="http://dump.fm/static/css/index.css"> - - <link rel="shortcut icon" href="static/favicon.ico"> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> - <META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board"> - <META NAME="description" CONTENT="Talk with pictures!"> - <title>dump.fm - register</title></head> -<body> - -<div id="rapper"></div> -<div id="content" style="z-index:77;"> - -<div id="main" align="center"> - - <div id="passwordreset"> - <img src="/static/img/furie3.png" id="furie3" /> - <div id="passwordreset"> - <div id="logo-and-text"> - <a href="/"><img src="/static/img/dumppixellarge3.png"></a> - <div align="center"> - <label style="text-align:left;margin-bottom:-8px;">username</label> - <input type="text" class="field"id="nickInput" /> - <br> - - <label style="text-align:left;margin-bottom:-8px;">password</label> - <input type="password" class="field" id="passwordInput" /> - <br> - <label style="text-align:left;margin-bottom:-8px;">password2x</label> - <input type="password" class="field" id="passwordInput2" /> - - <label style="text-align:left;margin-bottom:-8px;">email</label> - <input type="text" class="field"id="emailInput" /> - </h1> - - </form> - - <br> - - - <div align="center"> - <input type="submit" class="submit" id="submit" value="Register!" /> - </div> - </div> - </div> - </div> -</div> - -<script type="text/javascript"> -var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www."); -document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E")); -</script> -<script type="text/javascript"> -try { -var pageTracker = _gat._getTracker("UA-12364576-1"); -pageTracker._trackPageview(); -} catch(err) {}</script> - -</body> -</html> |