Fix saving site online setting. Fixes lonnieezell#178

ddevsr · Aug 4, 2022 · 50a2c9e · 50a2c9e
1 parent 6e40dcd
commit 50a2c9e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Common.php b/src/Common.php
@@ -74,6 +74,6 @@ function app_date($date, bool $includeTime = false, bool $includeTimezone = fals
      */
     function site_offline(): bool
     {
-        return setting('Site.siteOnline') === false;
+        return empty(setting('Site.siteOnline'));
     }
 }
diff --git a/src/Core/Filters/OnlineCheck.php b/src/Core/Filters/OnlineCheck.php
@@ -31,15 +31,15 @@ public function before(RequestInterface $request, $arguments = null)
     {
         helper(['setting', 'auth']);
 
-        if (! setting('Site.siteOnline')) {
+        if (setting('Site.siteOnline') === null) {
             $user = auth()->user();
 
             if ($user === null || (
                 $user !== null
                 && ! $user->inGroup('superadmin')
                 && ! $user->hasPermission('site.viewOffline')
             )) {
-                return redirect()->to('site-offline');
+                return redirect()->to('/site-offline');
             }
         }
     }

diff --git a/src/Settings/Controllers/GeneralSettingsController.php b/src/Settings/Controllers/GeneralSettingsController.php
@@ -89,7 +89,7 @@ public function saveGeneral()
         }
 
         setting('Site.siteName', $this->request->getPost('siteName', FILTER_SANITIZE_STRING));
-        setting('Site.siteOnline', $this->request->getPost('siteOnline') === '1');
+        setting('Site.siteOnline', $this->request->getPost('siteOnline'));
         setting('App.appTimezone', $this->request->getPost('timezone'));
 
         setting('App.dateFormat', $this->request->getPost('dateFormat'));