strengthen banning

This commit is contained in:
Kyle Drake 2014-11-09 16:59:10 -08:00
parent 4af4347492
commit a64c123a8c

8
app.rb
View file

@ -1546,8 +1546,9 @@ end
def require_login
redirect '/' unless signed_in?
if current_site.is_banned || parent_site.is_banned
if session[:banned] || current_site.is_banned || parent_site.is_banned
session[:id] = nil
session[:banned] = true
redirect '/'
end
end
@ -1567,9 +1568,10 @@ def parent_site
end
def require_unbanned_ip
if Site.banned_ip?(request.ip)
if session[:banned] || Site.banned_ip?(request.ip)
session[:id] = nil
flash[:error] = 'Your IP address has been banned due to misconduct/spam. '+
session[:banned] = true
flash[:error] = 'Site creation has been banned due to ToS violation/spam. '+
'If you believe this to be in error, <a href="/contact">contact the site admin</a>.'
return {result: 'error'}.to_json
end