zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-06-30 08:03:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

further cleanups to filtering code

Browse source
This commit is contained in:
Kyle Drake 2015-07-15 16:23:58 -07:00
parent a7ee94b0c7
commit aa56561dff
6 changed files with 52 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app_helpers.rb
View file

@ -14,7 +14,7 @@ end
def require_login_ajax
halt 'You are not logged in!' unless signed_in?
halt 'You are banned.' if current_site.is_banned? || parent_site.is_banned?
halt 'Please contact support.' if banned?
end
def csrf_safe?
@ -31,11 +31,7 @@ end
def require_login
redirect '/' unless signed_in?
if session[:banned] || current_site.is_banned || parent_site.is_banned
signout
session[:banned] = true
redirect '/'
end
enforce_ban if banned?
end
def signed_in?
@ -52,15 +48,18 @@ def parent_site
current_site.parent? ? current_site : current_site.parent
end
def require_unbanned_ip
if session[:banned] || (is_banned_ip = Site.banned_ip?(request.ip))
signout
session[:banned] = request.ip if !session[:banned]
def banned?(ip_check=false)
return true if session[:banned]
return true if current_site && (current_site.is_banned || parent_site.is_banned)
flash[:error] = 'Site creation has been banned due to a Terms of Service violation from your location. '+
'If you believe this to be in error, <a href="/contact">contact the site admin</a>.'
return {result: 'error'}.to_json
end
return true if ip_check && Site.banned_ip?(request.ip)
false
end
def enforce_ban
signout
session[:banned] = true
redirect '/'
end
def title