bugfixes

app/FileManagerFile.php

@@ -123,7 +123,7 @@ class FileManagerFile extends Model
         }
 
         // Get thumbnail from local storage
-        if ($this->attributes['thumbnail'] && is_storage_driver('local')) {
+        if ($this->attributes['thumbnail']) {
 
             // Thumbnail route
             $route = route('thumbnail', ['name' => $this->attributes['thumbnail']]);
@@ -160,16 +160,13 @@ class FileManagerFile extends Model
         }
 
         // Get thumbnail from local storage
-        if (is_storage_driver('local')) {
+        $route = route('file', ['name' => $this->attributes['basename']]);
 
-            $route = route('file', ['name' => $this->attributes['basename']]);
-
-            if ($this->public_access) {
-                return $route . '/public/' . $this->public_access;
-            }
-
-            return $route;
+        if ($this->public_access) {
+            return $route . '/public/' . $this->public_access;
         }
+
+        return $route;
     }
 
     /**

app/Http/Controllers/AppFunctionsController.php

@@ -67,7 +67,7 @@ class AppFunctionsController extends Controller
 
         return view("index")
             ->with('settings', $settings)
-            ->with('legal', $legal)
+            ->with('legal', isset($legal) ? $legal : null)
             ->with('installation', $connection);
     }
 

app/Http/Controllers/Auth/AuthController.php

@@ -23,7 +23,6 @@ class AuthController extends Controller
      */
     public function check_account(CheckAccountRequest $request)
     {
-
         // Get User
         $user = User::where('email', $request->input('email'))->select(['name', 'avatar'])->first();
 
@@ -84,10 +83,8 @@ class AuthController extends Controller
             'password' => Hash::make($request->password),
         ]);
 
-        $default_storage = Setting::where('name', 'storage_default')->first();
-
         // Create settings
-        $settings = UserSettings::create([
+        UserSettings::forceCreate([
             'user_id'          => $user->id,
             'storage_capacity' => $settings['storage_default'],
         ]);

app/Http/Controllers/General/SetupWizardController.php

@@ -126,47 +126,11 @@ class SetupWizardController extends Controller
             'value' => 1,
         ]);
 
-        return response('Done', 200);
-    }
-
-    /**
-     * Migrate database and generate necessary things
-     */
-    private function set_up_application()
-    {
-        // Generate app key
-        Artisan::call('key:generate');
-
-        // Migrate database
-        Artisan::call('migrate:fresh');
-
-        // Create Passport Keys
-        Artisan::call('passport:keys', [
-            '--force' => true
-        ]);
-
-        // Create Password grant client
-        Artisan::call('passport:client', [
-            '--password' => true,
-            '--name'     => 'vuefilemanager',
-        ]);
-
-        // Create Personal access client
-        Artisan::call('passport:client', [
-            '--personal' => true,
-            '--name'     => 'shared',
-        ]);
-
-        // Get generated client
-        $client = \DB::table('oauth_clients')->where('name', '=', 'vuefilemanager')->first();
-
-        // Set passport client to .env
-        setEnvironmentValue('PASSPORT_CLIENT_ID', $client->id);
-        setEnvironmentValue('PASSPORT_CLIENT_SECRET', $client->secret);
-
         // Clear cache
-        Artisan::call('config:clear');
-        //Artisan::call('config:cache');
+        //Artisan::call('config:clear');
+        Artisan::call('config:cache');
+
+        return response('Done', 200);
     }
 
     /**
@@ -203,6 +167,11 @@ class SetupWizardController extends Controller
             ],
         ]);
 
+        // Store options
+        $settings->each(function ($col) {
+            Setting::updateOrCreate(['name' => $col['name']], $col);
+        });
+
         // Set stripe credentials to .env
         setEnvironmentValue('CASHIER_CURRENCY', $request->currency);
         setEnvironmentValue('STRIPE_KEY', $request->key);
@@ -210,7 +179,7 @@ class SetupWizardController extends Controller
         setEnvironmentValue('STRIPE_WEBHOOK_SECRET', $request->webhookSecret);
 
         // Clear cache
-        Artisan::call('config:clear');
+        Artisan::call('config:cache');
 
         return response('Done', 200);
     }
@@ -265,8 +234,8 @@ class SetupWizardController extends Controller
         });
 
         // Clear cache
-        Artisan::call('config:clear');
-        //Artisan::call('config:cache');
+        //Artisan::call('config:clear');
+        Artisan::call('config:cache');
 
         return response('Done', 200);
     }
@@ -302,7 +271,9 @@ class SetupWizardController extends Controller
                 ],
             ]);
 
-        } else if ($storage_driver === 's3') {
+        }
+
+        if ($storage_driver === 's3') {
 
             $storage = collect([
                 [
@@ -327,7 +298,9 @@ class SetupWizardController extends Controller
                 ],
             ]);
 
-        } else if ($storage_driver === 'spaces') {
+        }
+
+        if ($storage_driver === 'spaces') {
 
             $storage = collect([
                 [
@@ -356,7 +329,9 @@ class SetupWizardController extends Controller
                 ],
             ]);
 
-        } else if ($storage_driver === 'wasabi') {
+        }
+
+        if ($storage_driver === 'wasabi') {
 
             $storage = collect([
                 [
@@ -385,7 +360,9 @@ class SetupWizardController extends Controller
                 ],
             ]);
 
-        } else if ($storage_driver === 'backblaze') {
+        }
+
+        if ($storage_driver === 'backblaze') {
 
             $storage = collect([
                 [
@@ -415,7 +392,7 @@ class SetupWizardController extends Controller
             ]);
         }
 
-        // Store storage driver options
+        // Store storage options
         $storage->each(function ($col) {
             setEnvironmentValue($col['name'], $col['value']);
         });
@@ -454,7 +431,7 @@ class SetupWizardController extends Controller
         });
 
         // Clear cache
-        Artisan::call('config:clear');
+        Artisan::call('config:cache');
 
         return response('Done', 200);
     }
@@ -517,11 +494,11 @@ class SetupWizardController extends Controller
             ],
             [
                 'name'  => 'storage_limitation',
-                'value' => $request->storageLimitation ? $request->storageLimitation : 5,
+                'value' => $request->storageLimitation,
             ],
             [
                 'name'  => 'storage_default',
-                'value' => $request->defaultStorage,
+                'value' => $request->defaultStorage ? $request->defaultStorage : 5,
             ],
         ]);
 
@@ -557,7 +534,7 @@ class SetupWizardController extends Controller
         }
 
         // Create user
-        $user = User::create([
+        $user = User::forceCreate([
             'avatar'   => $request->hasFile('avatar') ? $avatar : null,
             'name'     => $request->name,
             'role'     => 'admin',
@@ -575,20 +552,20 @@ class SetupWizardController extends Controller
         ]);
 
         // Store setup wizard progress
-        Setting::create([
+        Setting::updateOrCreate([
             'name'  => 'setup_wizard_success',
             'value' => 1,
         ]);
 
         // Store License
-        Setting::create([
+        Setting::updateOrCreate([
             'name'  => 'license',
             'value' => $request->license,
         ]);
 
         // Store Purchase Code
-        Setting::create([
-            'name'  => 'license',
+        Setting::updateOrCreate([
+            'name'  => 'purchase_code',
             'value' => $request->purchase_code,
         ]);
 
@@ -612,6 +589,42 @@ class SetupWizardController extends Controller
         return $response;
     }
 
+    /**
+     * Migrate database and generate necessary things
+     */
+    private function set_up_application()
+    {
+        // Generate app key
+        Artisan::call('key:generate');
+
+        // Migrate database
+        Artisan::call('migrate:fresh');
+
+        // Create Passport Keys
+        Artisan::call('passport:keys', [
+            '--force' => true
+        ]);
+
+        // Create Password grant client
+        Artisan::call('passport:client', [
+            '--password' => true,
+            '--name'     => 'vuefilemanager',
+        ]);
+
+        // Create Personal access client
+        Artisan::call('passport:client', [
+            '--personal' => true,
+            '--name'     => 'shared',
+        ]);
+
+        // Get generated client
+        $client = \DB::table('oauth_clients')->where('name', '=', 'vuefilemanager')->first();
+
+        // Set passport client to .env
+        setEnvironmentValue('PASSPORT_CLIENT_ID', $client->id);
+        setEnvironmentValue('PASSPORT_CLIENT_SECRET', $client->secret);
+    }
+
     /**
      * Make login request for get access token
      *

app/Http/Helpers/helpers.php

@@ -11,7 +11,8 @@ use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
 use Intervention\Image\ImageManagerStatic as Image;
 
-function get_setting($setting) {
+function get_setting($setting)
+{
     return Setting::where('name', $setting)->first()->value;
 }
 
@@ -123,12 +124,11 @@ function get_storage()
  */
 function is_storage_driver($driver)
 {
-
     if (is_array($driver)) {
-        return in_array(env('FILESYSTEM_DRIVER'), $driver);
+        return in_array(config('filesystem.default'), $driver);
     }
 
-    return env('FILESYSTEM_DRIVER') === $driver;
+    return config('filesystem.default') === $driver;
 }
 
 /**

app/Http/Requests/SetupWizard/StoreAppSetupRequest.php

@@ -29,8 +29,8 @@ class StoreAppSetupRequest extends FormRequest
             'logo'              => 'sometimes|file',
             'favicon'           => 'sometimes|file',
             'contactMail'       => 'required|email',
-            'googleAnalytics'   => 'required|string',
-            'defaultStorage'    => 'required|digits_between:1,9',
+            'googleAnalytics'   => 'sometimes|string',
+            'defaultStorage'    => 'sometimes|digits_between:1,9',
             'userRegistration'  => 'required|boolean',
             'storageLimitation' => 'required|boolean',
         ];

app/Services/StripeService.php

@@ -157,10 +157,12 @@ class StripeService
             $product = $this->stripe->products()->find($plan['product']);
 
             // Push data to $plan container
-            array_push($plans, [
-                'plan'    => $plan,
-                'product' => $product,
-            ]);
+            if ($product['active']) {
+                array_push($plans, [
+                    'plan'    => $plan,
+                    'product' => $product,
+                ]);
+            }
         }
 
         return $plans;
@@ -187,10 +189,12 @@ class StripeService
                 $product = $this->stripe->products()->find($plan['product']);
 
                 // Push data to $plan container
-                array_push($plans, [
-                    'plan'    => $plan,
-                    'product' => $product,
-                ]);
+                if ($product['active']) {
+                    array_push($plans, [
+                        'plan'    => $plan,
+                        'product' => $product,
+                    ]);
+                }
             }
         }
 
@@ -246,7 +250,7 @@ class StripeService
         $plan = $this->stripe->plans()->create([
             'id'       => Str::slug($plan['name']),
             'amount'   => $plan['price'],
-            'currency' => 'USD',
+            'currency' => config('cashier.currency'),
             'interval' => 'month',
             'product'  => $product['id'],
         ]);