Merge remote-tracking branch 'origin/master' into oasis

# Conflicts:
#	.php-cs-fixer.cache
#	app/Http/helpers.php
#	app/Services/FileManagerService.php
#	composer.lock
#	public/chunks/environment-setup.js
#	public/chunks/files~chunks/shared/file-browser.js
#	public/js/main.js
#	public/mix-manifest.json

app/Http/Controllers/Admin/LanguageController.php

@@ -111,18 +111,15 @@ class LanguageController extends Controller
 
     /**
      * Delete the language with all children strings
-     *
      * @param Language $language
-     * @return ResponseFactory|Response
+     * @return Response
      */
-    public function delete_language(Language $language)
+    public function delete_language(Language $language): Response
     {
         // Abort in demo mode
         abort_if(is_demo(), 204, 'Done.');
 
-        if ($language->locale === 'en') {
-            abort(401, "Sorry, you can't delete default language.");
-        }
+        abort_if($language->locale === 'en', 401, "Sorry, you can't delete default language.");
 
         // If user try to delete language used as default,
         // then set en language as default

app/Http/Controllers/App/AppFunctionsController.php

@@ -14,8 +14,11 @@ use Illuminate\Support\Facades\Mail;
 use App\Http\Mail\SendContactMessage;
 use Illuminate\Support\Facades\Cache;
 use Doctrine\DBAL\Driver\PDOException;
+use Illuminate\Database\QueryException;
 use App\Http\Resources\PricingCollection;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Contracts\Routing\ResponseFactory;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use App\Http\Requests\PublicPages\SendContactMessageRequest;
 
 class AppFunctionsController extends Controller
@@ -178,18 +181,22 @@ class AppFunctionsController extends Controller
 
     /**
      * Get language translations for frontend app
-     *
-     * @param $lang
-     * @return array
      */
     public function get_translations($lang)
     {
-        $translations = Cache::rememberForever("language-translations-$lang", function () use ($lang) {
-            return Language::whereLocale($lang)
-                ->firstOrFail()
-                ->languageTranslations;
-        });
+        $translations = cache()
+            ->rememberForever("language-translations-$lang", function () use ($lang) {
+                try {
+                    return Language::whereLocale($lang)
+                        ->firstOrFail()
+                        ->languageTranslations;
+                } catch (QueryException | ModelNotFoundException $e) {
+                    return null;
+                }
+            });
 
-        return map_language_translations($translations);
+        return $translations
+            ? map_language_translations($translations)
+            : get_default_language_translations();
     }
 }

app/Http/Controllers/App/SetupWizardController.php

@@ -283,6 +283,14 @@ class SetupWizardController extends Controller
                     'BACKBLAZE_REGION'   => $request->storage['region'] ?? null,
                     'BACKBLAZE_BUCKET'   => $request->storage['bucket'] ?? null,
                 ],
+                'oss' => [
+                    'FILESYSTEM_DRIVER' => $request->storage['driver'] ?? null,
+                    'OSS_ACCESS_KEY_ID' => $request->storage['key'] ?? null,
+                    'OSS_SECRET_ACCESS_KEY' => $request->storage['secret'] ?? null,
+                    'OSS_ENDPOINT' => $request->storage['endpoint'] ?? null,
+                    'OSS_REGION' => $request->storage['region'] ?? null,
+                    'OSS_BUCKET' => $request->storage['bucket'] ?? null,
+                ],
             ];
 
             // Storage credentials for storage

app/Http/Requests/FileFunctions/UploadRequest.php

@@ -24,6 +24,7 @@ class UploadRequest extends FormRequest
     public function rules()
     {
         return [
+            'filename' => 'required|string',
             'folder_id' => 'nullable|uuid',
             'file'      => ['required', 'file', new DisabledMimetypes],
         ];

app/Providers/AppServiceProvider.php

@@ -22,10 +22,17 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $get_time_locale = App::getLocale() . '_' . mb_strtoupper(App::getLocale());
+        try {
+            $app_locale = get_setting('language') ?? 'en';
+        } catch (\PDOException $exception) {
+            $app_locale = 'en';
+        }
+
+        // Set locale for application
+        app()->setLocale($app_locale);
 
         // Set locale for carbon dates
-        setlocale(LC_TIME, $get_time_locale);
+        setlocale(LC_TIME, $app_locale . '_' . mb_strtoupper($app_locale));
 
         // Get all migrations with all directories
         $this->loadMigrationsFrom(

app/Services/FileManagerService.php

@@ -146,9 +146,9 @@ class FileManagerService
 
         // Store zip record
         return Zip::create([
-            'user_id'      => $shared->user_id ?? Auth::id(),
+            'user_id' => $shared->user_id ?? Auth::id(),
             'shared_token' => $shared->token ?? null,
-            'basename'     => $zip_name,
+            'basename' => $zip_name,
         ]);
     }
 
@@ -163,11 +163,11 @@ class FileManagerService
     {
         return Folder::create([
             'parent_id' => $request->parent_id,
-            'author'    => $shared ? 'visitor' : 'user',
-            'user_id'   => $shared ? $shared->user_id : Auth::id(),
-            'name'      => $request->name,
-            'color'     => $request->color ?? null,
-            'emoji'     => $request->emoji ?? null,
+            'author' => $shared ? 'visitor' : 'user',
+            'user_id' => $shared ? $shared->user_id : Auth::id(),
+            'name' => $request->name,
+            'color' => $request->color ?? null,
+            'emoji' => $request->emoji ?? null,
         ]);
     }
 
@@ -398,16 +398,16 @@ class FileManagerService
 
             // Return new file
             return UserFile::create([
-                'mimetype'  => get_file_type_from_mimetype($file_mimetype),
-                'type'      => get_file_type($file_mimetype),
+                'mimetype' => get_file_type_from_mimetype($file_mimetype),
+                'type' => get_file_type($file_mimetype),
                 'folder_id' => $request->folder_id,
-                'metadata'  => $metadata,
-                'name'      => $user_file_name,
-                'basename'  => $disk_file_name,
-                'author'    => $shared ? 'visitor' : 'user',
+                'metadata' => $metadata,
+                'name' => $request->filename,
+                'basename' => $disk_file_name,
+                'author' => $shared ? 'visitor' : 'user',
                 'thumbnail' => $thumbnail,
-                'filesize'  => $file_size,
-                'user_id'   => $user_id,
+                'filesize' => $file_size,
+                'user_id' => $user_id,
             ]);
         }
     }

app/Services/LanguageService.php

@@ -34,8 +34,12 @@ class LanguageService
                 ];
             })->toArray();
 
-        DB::table('language_translations')
-            ->insert($translations);
+        $chunks = array_chunk($translations, 100);
+
+        foreach ($chunks as $chunk) {
+            DB::table('language_translations')
+                ->insert($chunk);
+        }
     }
 
     /**
@@ -81,9 +85,13 @@ class LanguageService
                     ];
                 })->toArray();
 
-            // Store translations into database
-            DB::table('language_translations')
-                ->insert($translations);
+            $chunks = array_chunk($translations, 100);
+
+            foreach ($chunks as $chunk) {
+                // Store translations into database
+                DB::table('language_translations')
+                    ->insert($chunk);
+            }
 
             // Flush cache
             cache()->forget("language-translations-$locale");