zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge kyledrake changes

Browse source
This commit is contained in:
Victoria Wang 2014-11-09 19:25:33 -06:00
commit 4feb316c04
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

2
views/plan/_pricing.erb
View file

@ -82,7 +82,7 @@
<div class="col col-25 catbus">
<div class="plan-image" data-original-title="VROOOOOOM!"></div>
<div class="plan-image" data-original-title="いきましょう"></div>
<h3>Cat Bus</h3>
<div class="price">$<%= Site::PLAN_FEATURES[:catbus][:price] %></div>
<div class="interval">per month</div>