Allow display of admin pages

Blacklight/http/AdminPage.php

@@ -2,8 +2,8 @@
 
 namespace Blacklight\http;
 
-use App\Models\User;
 use App\Models\Category;
+use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 
 /**
@@ -29,7 +29,7 @@ class AdminPage extends BasePage
             ]
         );
 
-        if (! Auth::check()) {
+        if (! isset($this->userdata['user_roles_id']) || (int) $this->userdata['user_roles_id'] !== User::ROLE_ADMIN || ! Auth::check()) {
             $this->show403(true);
         }
 

Blacklight/http/BasePage.php

@@ -102,6 +102,14 @@ class BasePage
      */
     public function __construct()
     {
+        $kernel = app()->make(\Illuminate\Contracts\Http\Kernel::class);
+
+        $response = $kernel->handle(
+            $request = \Illuminate\Http\Request::capture()
+        );
+        $response->send();
+        $kernel->terminate($request, $response);
+
         // Buffer settings/DB connection.
         $this->settings = new Settings();
         $this->pdo = new DB();

public/admin/.htaccess

@@ -1 +0,0 @@
-DirectoryIndex index.php

public/admin/index.php

@@ -4,14 +4,6 @@ use Blacklight\http\AdminPage;
 
 require_once dirname(__DIR__, 2).DIRECTORY_SEPARATOR.'resources/views/themes/smarty.php';
 
-$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
-
-$response = $kernel->handle(
-    $request = Illuminate\Http\Request::capture()
-);
-$response->send();
-$kernel->terminate($request, $response);
-
 $page = new AdminPage();
 
 $page->title = 'Admin Hangout';

public/admin/site-edit.php

@@ -8,14 +8,9 @@ use App\Models\Category;
 use App\Models\Settings;
 use Blacklight\http\AdminPage;
 use Blacklight\utility\Utility;
-use Illuminate\Support\Facades\Auth;
 
 $page = new AdminPage();
 
-if (! Auth::check()) {
-    $page->show403(true);
-}
-
 $sites = new Sites();
 $id = 0;
 

public/index.php

@@ -4,13 +4,6 @@ use Blacklight\http\Page;
 
 require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'resources/views/themes/smarty.php';
 
-$kernel = $app->make(Illuminate\Contracts\Http\Kernel::class);
-
-$response = $kernel->handle(
-    $request = Illuminate\Http\Request::capture()
-);
-$response->send();
-$kernel->terminate($request, $response);
 
 $page = new Page;