From c65bdd581b3fabc1bec6622b4d72832fc8aedd5f Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 28 Feb 2020 15:08:52 +0100
Subject: [PATCH] wip #3439 @1

---
 src/app/CubistCrudPanel.php                         |  2 +-
 src/app/Magic/Controllers/CubistMagicController.php |  7 +++----
 src/app/Middleware/LocaleSelector.php               | 11 ++++++++++-
 src/resources/install/.env                          |  2 ++
 src/resources/install/app/Http/Kernel.php           |  2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/app/CubistCrudPanel.php b/src/app/CubistCrudPanel.php
index 746ce59..c22ad29 100644
--- a/src/app/CubistCrudPanel.php
+++ b/src/app/CubistCrudPanel.php
@@ -2,7 +2,7 @@
 
 namespace Cubist\Backpack;
 
-use Backpack\CRUD\CrudPanel;
+use Backpack\CRUD\app\Library\CrudPanel\CrudPanel;
 use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
 
 /**
diff --git a/src/app/Magic/Controllers/CubistMagicController.php b/src/app/Magic/Controllers/CubistMagicController.php
index 8419ef1..f746b72 100644
--- a/src/app/Magic/Controllers/CubistMagicController.php
+++ b/src/app/Magic/Controllers/CubistMagicController.php
@@ -362,17 +362,16 @@ class CubistMagicController extends CubistCrudController
 
     public function setupListOperation()
     {
-        echo ":)";
+
     }
 
     public function setupCreateOperation()
     {
-        echo ":)";
+
     }
 
     public function setupUpdateOperation()
     {
-        echo ":)";
-    }
 
+    }
 }
diff --git a/src/app/Middleware/LocaleSelector.php b/src/app/Middleware/LocaleSelector.php
index f5af9cc..75876dd 100644
--- a/src/app/Middleware/LocaleSelector.php
+++ b/src/app/Middleware/LocaleSelector.php
@@ -29,7 +29,11 @@ class LocaleSelector extends CubistMiddleware
                 $this->can('backpack_translation')
             )
         ) {
-            $domain = $this->_getDomainByLocale(Locale::getLocaleData($defaultLocale));
+            $data = Locale::getLocaleData($defaultLocale);
+            if (null === $data) {
+                return $this->getResponse();
+            }
+            $domain = $this->_getDomainByLocale($data);
             // redirect to default locale
             if (null === $domain) {
                 abort(401);
@@ -54,6 +58,11 @@ class LocaleSelector extends CubistMiddleware
 
     protected function _getDomainByLocale($locale)
     {
+
+        if (null === $locale) {
+            return null;
+        }
+
         $domains = $locale->domains;
         if (is_string($locale->domains)) {
             $domains = json_decode($locale->domains, true);
diff --git a/src/resources/install/.env b/src/resources/install/.env
index 043de38..08dd814 100644
--- a/src/resources/install/.env
+++ b/src/resources/install/.env
@@ -39,3 +39,5 @@ MAIL_FROM_NAME="${APP_NAME}"
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+BACKPACK_LICENSE=LFDA-FLAM-8919-GF6B-60DE-2702
diff --git a/src/resources/install/app/Http/Kernel.php b/src/resources/install/app/Http/Kernel.php
index 8a7d3a9..3ff225f 100644
--- a/src/resources/install/app/Http/Kernel.php
+++ b/src/resources/install/app/Http/Kernel.php
@@ -34,7 +34,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
-            \Backpack\Base\app\Http\Middleware\UseBackpackAuthGuardInsteadOfDefaultAuthGuard::class,
+            \Backpack\CRUD\app\Http\Middleware\UseBackpackAuthGuardInsteadOfDefaultAuthGuard::class,
             \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Cubist\Backpack\app\Middleware\VariantSelector::class,
             \Cubist\Backpack\app\Middleware\LocaleSelector::class,
-- 
2.39.5