allow api use via current_site, better check for current_site

This commit is contained in:
Kyle Drake 2024-02-16 10:50:36 -06:00
parent b89ffc2bad
commit 59dbc1b2e1
5 changed files with 23 additions and 36 deletions

View file

@ -16,8 +16,6 @@ end
def require_login
redirect '/' unless signed_in? && current_site
enforce_ban if banned?
signout if deleted?
end
def signed_in?
@ -27,30 +25,18 @@ end
def current_site
return nil if session[:id].nil?
@_site ||= Site[id: session[:id]]
@_parent_site ||= @_site.parent
if @_site.is_banned || @_site.is_deleted || (@_parent_site && (@_parent_site.is_banned || @_parent_site.is_deleted))
signout
redirect '/'
end
@_site
end
def parent_site
return nil if current_site.nil?
current_site.parent? ? current_site : current_site.parent
end
def deleted?
return true if current_site && current_site.is_deleted
false
end
def banned?(ip_check=false)
#return true if session[:banned]
return true if current_site && (current_site.is_banned || parent_site.is_banned)
return true if ip_check && Site.banned_ip?(request.ip)
false
end
def enforce_ban
signout
session[:banned] = true
redirect '/'
@_parent_site || current_site
end
def meta_robots(newtag=nil)