diff --git a/app.rb b/app.rb
index 338c0dcd..999ac4cc 100644
--- a/app.rb
+++ b/app.rb
@@ -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, contact the site admin.'
return {result: 'error'}.to_json
end
diff --git a/views/plan/_pricing.erb b/views/plan/_pricing.erb
index 4c761156..f5d1656f 100644
--- a/views/plan/_pricing.erb
+++ b/views/plan/_pricing.erb
@@ -82,7 +82,7 @@