From 1beedb79b1bed610d0d59e5b046212417d3cb70c Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Fri, 16 Feb 2024 13:58:59 -0600
Subject: [PATCH] better flow for current site check

---
 app/signin.rb     |  6 +-----
 app/site_files.rb |  1 -
 app_helpers.rb    | 10 ++++++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/signin.rb b/app/signin.rb
index 1237e8c5..48d43fc4 100644
--- a/app/signin.rb
+++ b/app/signin.rb
@@ -77,8 +77,4 @@ post '/signout' do
   require_login
   signout
   redirect '/'
-end
-
-def signout
-  session[:id] = nil
-end
+end
\ No newline at end of file
diff --git a/app/site_files.rb b/app/site_files.rb
index 9cf8bd17..4c04aa5b 100644
--- a/app/site_files.rb
+++ b/app/site_files.rb
@@ -88,7 +88,6 @@ end
 
 def require_login_file_upload_ajax
   file_upload_response 'You are not signed in!' unless signed_in?
-  file_upload_response 'Please contact support.' if banned?
 end
 
 post '/site_files/upload' do
diff --git a/app_helpers.rb b/app_helpers.rb
index d5de7a48..ee6b2928 100644
--- a/app_helpers.rb
+++ b/app_helpers.rb
@@ -19,7 +19,14 @@ def require_login
 end
 
 def signed_in?
-  !session[:id].nil?
+  return false if current_site.nil?
+  true
+end
+
+def signout
+  @_site = nil
+  @_parent_site = nil
+  session[:id] = nil
 end
 
 def current_site
@@ -29,7 +36,6 @@ def current_site
 
   if @_site.is_banned || @_site.is_deleted || (@_parent_site && (@_parent_site.is_banned || @_parent_site.is_deleted))
     signout
-    redirect '/'
   end
 
   @_site