nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-05 18:23:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

code style fix

Browse Source
This commit is contained in:
Peter Papp
2021-04-25 09:02:00 +02:00
parent e103e61617
commit c47886fb8b
157 changed files with 2250 additions and 2583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.php_cs.cache
View File

File diff suppressed because one or more lines are too long

7
app/Actions/Fortify/CreateNewUser.php
View File

@@ -1,12 +1,11 @@
<?php
namespace App\Actions\Fortify;
use App\Models\Setting;
use App\Models\User;
use App\Models\Setting;
use App\Models\UserSettings;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\Validator;
use Laravel\Fortify\Contracts\CreatesNewUsers;
class CreateNewUser implements CreatesNewUsers
@@ -25,7 +24,7 @@ class CreateNewUser implements CreatesNewUsers
->pluck('value', 'name');
// Check if account registration is enabled
if (!intval($settings['registration'])) {
if (! intval($settings['registration'])) {
abort(401);
}

1
app/Actions/Fortify/PasswordValidationRules.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Actions\Fortify;
use Laravel\Fortify\Rules\Password;

1
app/Actions/Fortify/ResetUserPassword.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Actions\Fortify;
use Illuminate\Support\Facades\Validator;

1
app/Actions/Fortify/UpdateUserPassword.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Actions\Fortify;
use Illuminate\Support\Facades\Hash;

5
app/Actions/Fortify/UpdateUserProfileInformation.php
View File

@@ -1,10 +1,9 @@
<?php
namespace App\Actions\Fortify;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\Validator;
use Illuminate\Contracts\Auth\MustVerifyEmail;
use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
class UpdateUserProfileInformation implements UpdatesUserProfileInformation

97
app/Console/Commands/SetupDevEnvironment.php
View File

@@ -1,18 +1,16 @@
<?php
namespace App\Console\Commands;
use App\Models\File;
use App\Models\Folder;
use App\Models\Share;
use App\Services\HelperService;
use App\Services\SetupService;
use App\Models\Setting;
use App\Models\User;
use Illuminate\Console\Command;
use Faker;
use Illuminate\Support\Facades\Storage;
use App\Models\File;
use App\Models\User;
use App\Models\Share;
use App\Models\Folder;
use App\Models\Setting;
use Illuminate\Support\Str;
use App\Services\SetupService;
use Illuminate\Console\Command;
use Illuminate\Support\Facades\Storage;
class SetupDevEnvironment extends Command
{
@@ -106,7 +104,7 @@ class SetupDevEnvironment extends Command
'timezone' => $this->faker->randomElement(['+1.0', '+2.0', '+3.0']),
]);
Storage::putFileAs("avatars", storage_path("demo/avatars/avatar-01.png"), 'avatar-01.png', "private");
Storage::putFileAs('avatars', storage_path('demo/avatars/avatar-01.png'), 'avatar-01.png', 'private');
// Show user credentials
$this->info('Default admin account created. Email: howdy@hi5ve.digital and Password: vuefilemanager');
@@ -125,7 +123,6 @@ class SetupDevEnvironment extends Command
'avatar' => 'avatar-03.png',
],
])->each(function ($user) {
$newbie = User::forceCreate([
'role' => 'user',
'email' => $this->faker->email,
@@ -147,7 +144,7 @@ class SetupDevEnvironment extends Command
'timezone' => $this->faker->randomElement(['+1.0', '+2.0', '+3.0']),
]);
Storage::putFileAs("avatars", storage_path("demo/avatars/{$user['avatar']}"), $user['avatar'], "private");
Storage::putFileAs('avatars', storage_path("demo/avatars/{$user['avatar']}"), $user['avatar'], 'private');
$this->info("Generated user with email: $newbie->email and Password: vuefilemanager");
});
@@ -168,12 +165,12 @@ class SetupDevEnvironment extends Command
'author' => 'user',
'name' => 'Shared Folder',
'emoji' => [
"codes" => "1F680",
"char" => "🚀",
"name" => "rocket",
"category" => "Travel & Places (transport-air)",
"group" => "Travel & Places",
"subgroup" => "transport-air"
'codes' => '1F680',
'char' => '🚀',
'name' => 'rocket',
'category' => 'Travel & Places (transport-air)',
'group' => 'Travel & Places',
'subgroup' => 'transport-air',
],
'created_at' => now(),
]);
@@ -219,7 +216,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id,
'parent_id' => $random_pics->id,
'author' => 'user',
'name' => "Nature",
'name' => 'Nature',
'emoji' => [
'codes' => '26F0',
'char' => '⛰',
@@ -235,7 +232,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id,
'parent_id' => $random_pics->id,
'author' => 'user',
'name' => "Apartments",
'name' => 'Apartments',
'emoji' => [
'codes' => '1F3E0',
'char' => '🏠',
@@ -260,7 +257,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id,
'parent_id' => $playable_media->id,
'author' => 'user',
'name' => "Video",
'name' => 'Video',
]);
$audio = Folder::factory(Folder::class)
@@ -268,7 +265,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id,
'parent_id' => $playable_media->id,
'author' => 'user',
'name' => "Audio",
'name' => 'Audio',
]);
// 4.
@@ -285,7 +282,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id,
'parent_id' => $multi_level->id,
'author' => 'user',
'name' => "First Level",
'name' => 'First Level',
]);
$second_level = Folder::factory(Folder::class)
@@ -293,7 +290,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id,
'parent_id' => $first_level->id,
'author' => 'user',
'name' => "Second Level",
'name' => 'Second Level',
]);
$third_level = Folder::factory(Folder::class)
@@ -301,7 +298,7 @@ class SetupDevEnvironment extends Command
'user_id' => $user->id,
'parent_id' => $second_level->id,
'author' => 'user',
'name' => "Third Level",
'name' => 'Third Level',
]);
// 5.
@@ -366,11 +363,10 @@ class SetupDevEnvironment extends Command
],
])
->each(function ($file) use ($user) {
$basename = Str::random(12) . '-' . $file['basename'];
// Copy file into app storage
Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, "private");
Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, 'private');
// Create file record
File::create([
@@ -410,11 +406,10 @@ class SetupDevEnvironment extends Command
],
])
->each(function ($file) use ($user, $documents) {
$basename = Str::random(12) . '-' . $file['basename'];
// Copy file into app storage
Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, "private");
Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, 'private');
// Create file record
File::create([
@@ -441,14 +436,13 @@ class SetupDevEnvironment extends Command
'name' => 'Software Licence',
'basename' => 'Project Notes.pdf',
'mimetype' => 'pdf',
]
],
])
->each(function ($file) use ($user, $shared_folder) {
$basename = Str::random(12) . '-' . $file['basename'];
// Copy file into app storage
Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, "private");
Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, 'private');
// Create file record
File::create([
@@ -503,11 +497,10 @@ class SetupDevEnvironment extends Command
],
])
->each(function ($file) use ($user, $peters_files) {
$basename = Str::random(12) . '-' . $file['basename'];
// Copy file into app storage
Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, "private");
Storage::putFileAs("files/$user->id", storage_path("demo/documents/{$file['basename']}"), $basename, 'private');
// Create file record
File::create([
@@ -531,11 +524,10 @@ class SetupDevEnvironment extends Command
'Sphere Bound 3D Titles.mp4',
])
->each(function ($file) use ($user, $videohive) {
$basename = Str::random(12) . '-' . $file;
// Copy file into app storage
Storage::putFileAs("files/$user->id", storage_path("demo/video/$file"), $basename, "private");
Storage::putFileAs("files/$user->id", storage_path("demo/video/$file"), $basename, 'private');
// Create file record
File::create([
@@ -556,11 +548,10 @@ class SetupDevEnvironment extends Command
'Apple Watch App Video Promotion.mp4',
])
->each(function ($file) use ($user, $video) {
$basename = Str::random(12) . '-' . $file;
// Copy file into app storage
Storage::putFileAs("files/$user->id", storage_path("demo/video/$file"), $basename, "private");
Storage::putFileAs("files/$user->id", storage_path("demo/video/$file"), $basename, 'private');
// Create file record
File::create([
@@ -581,11 +572,10 @@ class SetupDevEnvironment extends Command
'D-Block & S-te-Fan - Bla Bla.mp3',
])
->each(function ($file) use ($user, $audio) {
$basename = Str::random(12) . '-' . $file;
// Copy file into app storage
Storage::putFileAs("files/$user->id", storage_path("demo/audio/$file"), $basename, "private");
Storage::putFileAs("files/$user->id", storage_path("demo/audio/$file"), $basename, 'private');
// Create file record
File::create([
@@ -617,12 +607,11 @@ class SetupDevEnvironment extends Command
'You Are My Sunshine.jpg',
])
->each(function ($file) use ($user, $apartments) {
$basename = Str::random(12) . '-' . $file;
// Copy file into app storage
Storage::putFileAs("files/$user->id", storage_path("demo/images/memes/$file"), $basename, "private");
Storage::putFileAs("files/$user->id", storage_path("demo/images/memes/thumbnail-$file"), "thumbnail-$basename", "private");
Storage::putFileAs("files/$user->id", storage_path("demo/images/memes/$file"), $basename, 'private');
Storage::putFileAs("files/$user->id", storage_path("demo/images/memes/thumbnail-$file"), "thumbnail-$basename", 'private');
// Create file record
File::create([
@@ -650,12 +639,11 @@ class SetupDevEnvironment extends Command
'Kitchen Island.jpg',
])
->each(function ($file) use ($user, $apartments) {
$basename = Str::random(12) . '-' . $file;
// Copy file into app storage
Storage::putFileAs("files/$user->id", storage_path("demo/images/apartments/$file"), $basename, "private");
Storage::putFileAs("files/$user->id", storage_path("demo/images/apartments/thumbnail-$file"), "thumbnail-$basename", "private");
Storage::putFileAs("files/$user->id", storage_path("demo/images/apartments/$file"), $basename, 'private');
Storage::putFileAs("files/$user->id", storage_path("demo/images/apartments/thumbnail-$file"), "thumbnail-$basename", 'private');
// Create file record
File::create([
@@ -687,12 +675,11 @@ class SetupDevEnvironment extends Command
'Yellow Animal Eyes Fur.jpg',
])
->each(function ($file) use ($user, $nature) {
$basename = Str::random(12) . '-' . $file;
// Copy file into app storage
Storage::putFileAs("files/$user->id", storage_path("demo/images/nature/$file"), $basename, "private");
Storage::putFileAs("files/$user->id", storage_path("demo/images/nature/thumbnail-$file"), "thumbnail-$basename", "private");
Storage::putFileAs("files/$user->id", storage_path("demo/images/nature/$file"), $basename, 'private');
Storage::putFileAs("files/$user->id", storage_path("demo/images/nature/thumbnail-$file"), "thumbnail-$basename", 'private');
// Create file record
File::create([
@@ -856,18 +843,18 @@ class SetupDevEnvironment extends Command
[
'name' => 'billing_vat_number',
'value' => '41241241234',
]
],
])->each(function ($col) {
Setting::forceCreate([
'name' => $col['name'],
'value' => $col['value']
'value' => $col['value'],
]);
});
// Get system images
collect(['logo.svg', 'logo-horizontal.svg', 'favicon.png', 'og-image.jpg', 'touch-icon.png'])
->each(function ($file) {
Storage::putFileAs("system", storage_path("demo/app/$file"), $file, "private");
Storage::putFileAs('system', storage_path("demo/app/$file"), $file, 'private');
});
}
@@ -878,12 +865,12 @@ class SetupDevEnvironment extends Command
{
// Migrate database
$this->call('migrate:fresh', [
'--force' => true
'--force' => true,
]);
// Generate app key
$this->call('key:generate', [
'--force' => true
'--force' => true,
]);
}

12
app/Console/Commands/SetupProdEnvironment.php
View File

@@ -1,9 +1,8 @@
<?php
namespace App\Console\Commands;
use App\Models\Setting;
use App\Models\User;
use App\Models\Setting;
use App\Services\SetupService;
use Illuminate\Console\Command;
@@ -17,7 +16,6 @@ class SetupProdEnvironment extends Command
protected $signature = 'setup:prod';
protected $license = 'Extended';
/**
* The console command description.
*
@@ -165,11 +163,11 @@ class SetupProdEnvironment extends Command
[
'name' => 'billing_vat_number',
'value' => null,
]
],
])->each(function ($col) {
Setting::forceCreate([
'name' => $col['name'],
'value' => $col['value']
'value' => $col['value'],
]);
});
}
@@ -203,12 +201,12 @@ class SetupProdEnvironment extends Command
{
// Migrate database
$this->call('migrate:fresh', [
'--force' => true
'--force' => true,
]);
// Generate app key
$this->call('key:generate', [
'--force' => true
'--force' => true,
]);
}

7
app/Console/Kernel.php
View File

@@ -1,11 +1,10 @@
<?php
namespace App\Console;
use App\Console\Commands\SetupDevEnvironment;
use App\Console\Commands\SetupProdEnvironment;
use App\Services\SchedulerService;
use Illuminate\Console\Scheduling\Schedule;
use App\Console\Commands\SetupDevEnvironment;
use App\Console\Commands\SetupProdEnvironment;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
class Kernel extends ConsoleKernel
@@ -37,7 +36,7 @@ class Kernel extends ConsoleKernel
$schedule->call(function () use ($scheduler) {
$scheduler->delete_old_zips();
if (!is_storage_driver(['local'])) {
if (! is_storage_driver(['local'])) {
$scheduler->delete_failed_files();
}
})->everySixHours();

5
app/Exceptions/Handler.php
View File

@@ -1,10 +1,9 @@
<?php
namespace App\Exceptions;
use Throwable;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Throwable;
class Handler extends ExceptionHandler
{
@@ -14,7 +13,6 @@ class Handler extends ExceptionHandler
* @var array
*/
protected $dontReport = [
//
];
/**
@@ -52,7 +50,6 @@ class Handler extends ExceptionHandler
public function render($request, Throwable $exception)
{
if ($exception instanceof ModelNotFoundException) {
return response()
->redirectTo('/not-found')->setStatusCode(404);
}

10
app/Http/Controllers/Admin/DashboardController.php
View File

@@ -1,15 +1,13 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Models\File;
use App\Http\Controllers\Controller;
use App\Http\Resources\UsersCollection;
use App\Services\StripeService;
use DB;
use App\Models\User;
use ByteUnits\Metric;
use DB;
use App\Services\StripeService;
use Laravel\Cashier\Subscription;
use App\Http\Controllers\Controller;
use App\Http\Resources\UsersCollection;
class DashboardController extends Controller
{

9
app/Http/Controllers/Admin/InvoiceController.php
View File

@@ -1,14 +1,11 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Http\Resources\InvoiceAdminCollection;
use App\Http\Resources\InvoiceResource;
use App\Models\Invoice;
use App\Services\StripeService;
use App\Models\Setting;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Http\Resources\InvoiceResource;
use App\Http\Resources\InvoiceAdminCollection;
class InvoiceController extends Controller
{

33
app/Http/Controllers/Admin/LanguageController.php
View File

@@ -1,15 +1,14 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Resources\LanguageCollection;
use App\Http\Resources\LanguageResource;
use App\Models\Language;
use App\Http\Controllers\Controller;
use App\Models\Setting;
use App\Models\Language;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\Http\Resources\LanguageResource;
use App\Http\Resources\LanguageCollection;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response;
use App\Http\Requests\Languages\UpdateStringRequest;
use App\Http\Requests\Languages\CreateLanguageRequest;
use App\Http\Requests\Languages\UpdateLanguageRequest;
@@ -24,7 +23,8 @@ class LanguageController extends Controller
public function get_languages()
{
return response(
new LanguageCollection(Language::sortable(['created_at', 'DESC'])->get()), 200
new LanguageCollection(Language::sortable(['created_at', 'DESC'])->get()),
200
);
}
@@ -36,7 +36,8 @@ class LanguageController extends Controller
public function get_language(Language $language)
{
return response(
new LanguageResource($language), 200
new LanguageResource($language),
200
);
}
@@ -53,11 +54,12 @@ class LanguageController extends Controller
$language = Language::create([
'name' => $request->input('name'),
'locale' => $request->input('locale')
'locale' => $request->input('locale'),
]);
return response(
new LanguageResource($language), 201
new LanguageResource($language),
201
);
}
@@ -75,7 +77,8 @@ class LanguageController extends Controller
$language->update(make_single_input($request));
return response(
new LanguageResource($language), 201
new LanguageResource($language),
201
);
}
@@ -95,13 +98,14 @@ class LanguageController extends Controller
->languageTranslations()
->where('key', $request->name)
->update([
'value' => $request->value
'value' => $request->value,
]);
cache()->forget("language-translations-{$language->locale}");
return response(
'Done', 204
'Done',
204
);
}
@@ -130,7 +134,8 @@ class LanguageController extends Controller
$language->delete();
return response(
'Done', 204
'Done',
204
);
}
}

11
app/Http/Controllers/Admin/PagesController.php
View File

@@ -1,15 +1,14 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Http\Resources\PageCollection;
use App\Http\Resources\PageResource;
use App\Services\DemoService;
use App\Models\Page;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
use App\Services\DemoService;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\Http\Resources\PageResource;
use App\Http\Resources\PageCollection;
use Illuminate\Contracts\Routing\ResponseFactory;
class PagesController extends Controller
{

24
app/Http/Controllers/Admin/PlanController.php
View File

@@ -1,23 +1,20 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Http\Resources\PlanCollection;
use App\Http\Resources\PlanResource;
use App\Http\Resources\UserResource;
use App\Http\Resources\UsersCollection;
use App\Services\DemoService;
use App\Models\Plan;
use App\Services\StripeService;
use App\Models\User;
use Illuminate\Http\Request;
use App\Services\DemoService;
use Illuminate\Http\Response;
use App\Services\StripeService;
use Laravel\Cashier\Subscription;
use App\Http\Controllers\Controller;
use App\Http\Resources\PlanResource;
use Illuminate\Support\Facades\Cache;
use App\Http\Resources\PlanCollection;
use App\Http\Resources\UsersCollection;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Cache;
use Laravel\Cashier\Subscription;
use Rinvex\Subscriptions\Models\PlanFeature;
class PlanController extends Controller
{
@@ -79,7 +76,6 @@ class PlanController extends Controller
{
// TODO: inline request
if (is_demo()) {
if (Cache::has('plan-starter-pack')) {
$plan = Cache::get('plan-starter-pack');
} else {

29
app/Http/Controllers/Admin/SettingController.php
View File

@@ -1,14 +1,13 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Http\Controllers\Controller;
use App\Services\DemoService;
use App\Models\Setting;
use Artisan;
use Stripe;
use Cartalyst\Stripe\Exception\UnauthorizedException;
use Artisan;
use App\Models\Setting;
use Illuminate\Http\Request;
use App\Services\DemoService;
use App\Http\Controllers\Controller;
use Cartalyst\Stripe\Exception\UnauthorizedException;
use Symfony\Component\HttpKernel\Exception\HttpException;
class SettingController extends Controller
@@ -30,7 +29,6 @@ class SettingController extends Controller
public function show(Request $request)
{
if (strpos($request->column, '|') !== false) {
$columns = explode('|', $request->column);
return Setting::whereIn('name', $columns)
@@ -54,12 +52,11 @@ class SettingController extends Controller
// Store image if exist
if ($request->hasFile($request->name)) {
// Find and update image path
Setting::updateOrCreate([
'name' => $request->name
'name' => $request->name,
], [
'value' => store_system_image($request, $request->name)
'value' => store_system_image($request, $request->name),
]);
return response('Done', 204);
@@ -86,8 +83,7 @@ class SettingController extends Controller
// Abort in demo mode
abort_if(is_demo(), 204, 'Done.');
if (!app()->runningUnitTests()) {
if (! app()->runningUnitTests()) {
setEnvironmentValue([
'MAIL_DRIVER' => $request->driver,
'MAIL_HOST' => $request->host,
@@ -120,14 +116,12 @@ class SettingController extends Controller
// Try to get stripe account details
try {
if (!app()->runningUnitTests()) {
if (! app()->runningUnitTests()) {
Stripe::make($request->secret, '2020-03-02')
->account()
->details();
}
} catch (UnauthorizedException $e) {
throw new HttpException(401, $e->getMessage());
}
@@ -152,8 +146,7 @@ class SettingController extends Controller
]);
});
if (!app()->runningUnitTests()) {
if (! app()->runningUnitTests()) {
// Set stripe credentials to .env
setEnvironmentValue([
'CASHIER_CURRENCY' => $request->currency,
@@ -179,7 +172,7 @@ class SettingController extends Controller
// Abort in demo mode
abort_if(is_demo(), 204, 'Done.');
if (!app()->runningUnitTests()) {
if (! app()->runningUnitTests()) {
Artisan::call('cache:clear');
Artisan::call('config:clear');
Artisan::call('config:cache');

38
app/Http/Controllers/Admin/UserController.php
View File

@@ -1,29 +1,25 @@
<?php
namespace App\Http\Controllers\Admin;
use App\Models\File;
use App\Models\Folder;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\ChangeRoleRequest;
use App\Http\Requests\Admin\ChangeStorageCapacityRequest;
use App\Http\Requests\Admin\CreateUserByAdmin;
use App\Http\Requests\Admin\DeleteUserRequest;
use App\Http\Resources\InvoiceCollection;
use App\Http\Resources\UsersCollection;
use App\Http\Resources\UserResource;
use App\Http\Resources\UserStorageResource;
use App\Http\Resources\UserSubscription;
use App\Services\StripeService;
use App\Models\Share;
use Storage;
use App\Models\User;
use App\Models\UserSettings;
use Illuminate\Http\Response;
use App\Services\StripeService;
use App\Http\Controllers\Controller;
use App\Http\Resources\UserResource;
use Illuminate\Support\Facades\Auth;
use App\Http\Resources\UsersCollection;
use App\Http\Resources\UserSubscription;
use Illuminate\Support\Facades\Password;
use App\Http\Resources\InvoiceCollection;
use App\Http\Resources\UserStorageResource;
use App\Http\Requests\Admin\ChangeRoleRequest;
use App\Http\Requests\Admin\CreateUserByAdmin;
use App\Http\Requests\Admin\DeleteUserRequest;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Password;
use Storage;
use App\Http\Requests\Admin\ChangeStorageCapacityRequest;
class UserController extends Controller
{
@@ -81,7 +77,7 @@ class UserController extends Controller
*/
public function subscription(User $user)
{
if (!$user->stripeId() || !$user->subscription('main')) {
if (! $user->stripeId() || ! $user->subscription('main')) {
return response("User doesn't have any subscription.", 404);
}
@@ -222,7 +218,7 @@ class UserController extends Controller
}
if ($user->settings->name !== $request->name) {
abort(403, "The name you typed is wrong!");
abort(403, 'The name you typed is wrong!');
}
$user->delete();

30
app/Http/Controllers/App/AppFunctionsController.php
View File

@@ -1,23 +1,22 @@
<?php
namespace App\Http\Controllers\App;
use App\Http\Controllers\Controller;
use App\Http\Mail\SendContactMessage;
use App\Http\Resources\PricingCollection;
use App\Http\Requests\PublicPages\SendContactMessageRequest;
use App\Http\Resources\PageResource;
use App\Models\Language;
use App\Models\Setting;
use App\Models\Page;
use App\Models\Share;
use App\Services\StripeService;
use Doctrine\DBAL\Driver\PDOException;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Models\Setting;
use App\Models\Language;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Cache;
use App\Services\StripeService;
use App\Http\Controllers\Controller;
use App\Http\Resources\PageResource;
use Illuminate\Support\Facades\Mail;
use App\Http\Mail\SendContactMessage;
use Illuminate\Support\Facades\Cache;
use Doctrine\DBAL\Driver\PDOException;
use App\Http\Resources\PricingCollection;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\PublicPages\SendContactMessageRequest;
class AppFunctionsController extends Controller
{
@@ -55,13 +54,11 @@ class AppFunctionsController extends Controller
// Get all settings
$settings = get_settings_in_json();
} catch (PDOException $e) {
$setup_status = 'setup-database';
}
return view("index")
return view('index')
->with('settings', $settings ?? null)
->with('legal', $pages ?? null)
->with('installation', $setup_status);
@@ -85,7 +82,7 @@ class AppFunctionsController extends Controller
$item->setPublicUrl($shared->token);
}
return view("vuefilemanager.crawler.og-view")
return view('vuefilemanager.crawler.og-view')
->with('settings', get_settings_in_json())
->with('metadata', [
'url' => url('/share', ['token' => $shared->token]),
@@ -136,7 +133,6 @@ class AppFunctionsController extends Controller
public function get_setting_columns(Request $request)
{
if (strpos($request->column, '|') !== false) {
$columns = collect(explode('|', $request->column))
->each(function ($column) {
if (in_array($column, $this->blacklist)) {

20
app/Http/Controllers/App/Maintenance.php
View File

@@ -1,19 +1,14 @@
<?php
namespace App\Http\Controllers\App;
use App\Http\Controllers\Controller;
use App\Models\Language;
use App\Models\LanguageTranslation;
use App\Services\LanguageService;
use Artisan;
use DB;
use Gate;
use Artisan;
use App\Models\Language;
use Illuminate\Http\Response;
use App\Services\LanguageService;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Schema;
class Maintenance extends Controller
{
@@ -61,8 +56,6 @@ class Maintenance extends Controller
resolve(LanguageService::class)
->upgrade_language_translations();
return response('Done.', 201);
}
@@ -75,7 +68,7 @@ class Maintenance extends Controller
Gate::authorize('maintenance');
$command = Artisan::call('migrate', [
'--force' => true
'--force' => true,
]);
if ($command === 0) {
@@ -85,6 +78,7 @@ class Maintenance extends Controller
if ($command === 1) {
echo 'Operation failed.';
}
return $command;
}
}

70
app/Http/Controllers/App/SetupWizardController.php
View File

@@ -1,31 +1,29 @@
<?php
namespace App\Http\Controllers\App;
use App\Http\Controllers\Controller;
use App\Http\Requests\SetupWizard\CreateAdminRequest;
use App\Http\Requests\SetupWizard\StoreAppSetupRequest;
use App\Http\Requests\SetupWizard\StoreDatabaseCredentialsRequest;
use App\Http\Requests\SetupWizard\StoreEnvironmentSetupRequest;
use App\Http\Requests\SetupWizard\StoreStripeBillingRequest;
use App\Http\Requests\SetupWizard\StoreStripeCredentialsRequest;
use App\Http\Requests\SetupWizard\StoreStripePlansRequest;
use App\Services\SetupService;
use App\Services\StripeService;
use App\Models\Setting;
use App\Models\User;
use Artisan;
use Cartalyst\Stripe\Exception\UnauthorizedException;
use Doctrine\DBAL\Driver\PDOException;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Http;
use Illuminate\Support\Str;
use Schema;
use Stripe;
use Artisan;
use App\Models\User;
use App\Models\Setting;
use Illuminate\Support\Str;
use Illuminate\Http\Request;
use App\Services\SetupService;
use App\Services\StripeService;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Http;
use Doctrine\DBAL\Driver\PDOException;
use Illuminate\Contracts\Routing\ResponseFactory;
use Cartalyst\Stripe\Exception\UnauthorizedException;
use App\Http\Requests\SetupWizard\StoreAppSetupRequest;
use Symfony\Component\HttpKernel\Exception\HttpException;
use App\Http\Requests\SetupWizard\StoreStripePlansRequest;
use App\Http\Requests\SetupWizard\StoreStripeBillingRequest;
use App\Http\Requests\SetupWizard\StoreEnvironmentSetupRequest;
use App\Http\Requests\SetupWizard\StoreStripeCredentialsRequest;
use App\Http\Requests\SetupWizard\StoreDatabaseCredentialsRequest;
class SetupWizardController extends Controller
{
@@ -66,8 +64,7 @@ class SetupWizardController extends Controller
*/
public function setup_database(StoreDatabaseCredentialsRequest $request)
{
if (!app()->runningUnitTests()) {
if (! app()->runningUnitTests()) {
try {
// Set temporary database connection
config(['database.connections.test.driver' => $request->connection]);
@@ -79,7 +76,6 @@ class SetupWizardController extends Controller
// Test connection
\DB::connection('test')->getPdo();
} catch (PDOException $e) {
throw new HttpException(500, $e->getMessage());
}
@@ -98,11 +94,11 @@ class SetupWizardController extends Controller
Artisan::call('config:cache');
Artisan::call('key:generate', [
'--force' => true
'--force' => true,
]);
Artisan::call('migrate:fresh', [
'--force' => true
'--force' => true,
]);
}
@@ -123,15 +119,13 @@ class SetupWizardController extends Controller
*/
public function store_stripe_credentials(StoreStripeCredentialsRequest $request)
{
if (!app()->runningUnitTests()) {
if (! app()->runningUnitTests()) {
// Create stripe instance
$stripe = Stripe::make($request->secret, '2020-03-02');
try {
// Try to get stripe account details
$stripe->account()->details();
} catch (UnauthorizedException $e) {
throw new HttpException(401, $e->getMessage());
}
@@ -158,8 +152,7 @@ class SetupWizardController extends Controller
]);
});
if (!app()->runningUnitTests()) {
if (! app()->runningUnitTests()) {
// Set stripe credentials to .env
setEnvironmentValue([
'CASHIER_CURRENCY' => $request->currency,
@@ -224,7 +217,7 @@ class SetupWizardController extends Controller
]);
});
if (!app()->runningUnitTests()) {
if (! app()->runningUnitTests()) {
Artisan::call('config:cache');
}
@@ -254,8 +247,7 @@ class SetupWizardController extends Controller
*/
public function store_environment_setup(StoreEnvironmentSetupRequest $request)
{
if (!app()->runningUnitTests()) {
if (! app()->runningUnitTests()) {
$drivers = [
'local' => [
'FILESYSTEM_DRIVER' => 'local',
@@ -312,7 +304,6 @@ class SetupWizardController extends Controller
Artisan::call('config:cache');
}
return response('Done', 204);
}
@@ -380,7 +371,7 @@ class SetupWizardController extends Controller
]);
});
if (!app()->runningUnitTests()) {
if (! app()->runningUnitTests()) {
setEnvironmentValue([
'APP_NAME' => Str::camel($request->title),
]);
@@ -435,7 +426,7 @@ class SetupWizardController extends Controller
[
'name' => 'purchase_code',
'value' => $request->purchase_code,
]
],
])->each(function ($col) {
Setting::forceCreate([
'name' => $col['name'],
@@ -450,7 +441,6 @@ class SetupWizardController extends Controller
// Login account
if (Auth::attempt($request->only(['email', 'password']))) {
$request->session()->regenerate();
return response('Registration was successful', 204);
@@ -474,9 +464,7 @@ class SetupWizardController extends Controller
if (Schema::hasTable('settings') && get_setting('setup_wizard_success')) {
abort(410, 'Gone');
}
} catch (PDOException $e) {
return false;
}
}

4
app/Http/Controllers/Auth/AuthController.php
View File

@@ -1,14 +1,12 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Requests\Auth\CheckAccountRequest;
use App\Models\User;
use App\Http\Controllers\Controller;
use App\Http\Requests\Auth\CheckAccountRequest;
class AuthController extends Controller
{
/**
* Check if user account exist
*

1
app/Http/Controllers/Auth/ConfirmPasswordController.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;

11
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -1,17 +1,10 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Mail\TestMail;
use App\Notifications\ResetPassword;
use App\Notifications\ResetUserPasswordNotification;
use App\Models\User;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Lang;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Notification;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
class ForgotPasswordController extends Controller
{

1
app/Http/Controllers/Auth/LoginController.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;

8
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@@ -1,12 +1,11 @@
<?php
namespace App\Http\Controllers\Auth;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Lang;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Lang;
class ResetPasswordController extends Controller
{
@@ -30,7 +29,6 @@ class ResetPasswordController extends Controller
*/
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Get the response for a successful password reset.
*
@@ -40,7 +38,6 @@ class ResetPasswordController extends Controller
*/
protected function sendResetResponse(Request $request, $response)
{
return response(['message' => Lang::get($response)]);
}
@@ -53,7 +50,6 @@ class ResetPasswordController extends Controller
*/
protected function sendResetFailedResponse(Request $request, $response)
{
return response(['error' => Lang::get($response)], 422);
}
}

1
app/Http/Controllers/Auth/VerificationController.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;

5
app/Http/Controllers/Controller.php
View File

@@ -1,11 +1,10 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
class Controller extends BaseController
{

20
app/Http/Controllers/FileManager/BrowseController.php
View File

@@ -1,16 +1,15 @@
<?php
namespace App\Http\Controllers\FileManager;
use App\Http\Requests\FileBrowser\SearchRequest;
use App\Models\User;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Support\Collection;
use Illuminate\Http\Request;
use App\Models\Folder;
use App\Models\File;
use App\Models\User;
use App\Models\Share;
use App\Models\Folder;
use Illuminate\Http\Request;
use Illuminate\Support\Collection;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use App\Http\Requests\FileBrowser\SearchRequest;
class BrowseController extends Controller
{
@@ -27,7 +26,6 @@ class BrowseController extends Controller
// Get folder trash items
if ($request->query('trash')) {
// Get folders and files
$folders = Folder::onlyTrashed()
->with('parent')
@@ -105,7 +103,7 @@ class BrowseController extends Controller
$files_trashed = File::onlyTrashed()
->with(['parent'])
->where('user_id', $user_id)
->where(function($query) use ($folders_trashed) {
->where(function ($query) use ($folders_trashed) {
$query->whereNull('folder_id');
$query->orWhereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'id'))));
})
@@ -185,7 +183,7 @@ class BrowseController extends Controller
'name' => __t('home'),
'location' => 'base',
'folders' => $folders,
]
],
];
}

32
app/Http/Controllers/FileManager/EditItemsController.php
View File

@@ -1,24 +1,22 @@
<?php
namespace App\Http\Controllers\FileManager;
use App\Http\Requests\FileFunctions\CreateFolderRequest;
use Exception;
use App\Models\File;
use App\Models\Folder;
use Illuminate\Http\Request;
use App\Services\DemoService;
use App\Services\HelperService;
use App\Http\Controllers\Controller;
use App\Services\FileManagerService;
use Illuminate\Support\Facades\Auth;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\FileFunctions\UploadRequest;
use App\Http\Requests\FileFunctions\MoveItemRequest;
use App\Http\Requests\FileFunctions\DeleteItemRequest;
use App\Http\Requests\FileFunctions\RenameItemRequest;
use App\Http\Requests\FileFunctions\MoveItemRequest;
use App\Http\Requests\FileFunctions\UploadRequest;
use App\Services\DemoService;
use App\Services\FileManagerService;
use App\Services\HelperService;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Http\Controllers\Controller;
use App\Models\Folder;
use App\Models\File;
use Exception;
use App\Http\Requests\FileFunctions\CreateFolderRequest;
class EditItemsController extends Controller
{
@@ -134,7 +132,7 @@ class EditItemsController extends Controller
$folder = Folder::whereUserId(Auth::id())
->where('id', $id);
if (!$folder->exists()) {
if (! $folder->exists()) {
abort(404, "Requested folder doesn't exists.");
}

8
app/Http/Controllers/FileManager/FavouriteController.php
View File

@@ -1,13 +1,12 @@
<?php
namespace App\Http\Controllers\FileManager;
use App\Services\DemoService;
use App\Models\Folder;
use Illuminate\Support\Facades\Validator;
use Illuminate\Http\Request;
use App\Services\DemoService;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;
class FavouriteController extends Controller
{
@@ -30,7 +29,6 @@ class FavouriteController extends Controller
// todo: pridat validator ako AddToFavouritesRequest
foreach ($request->folders as $id) {
// Get user & folder
$user = Auth::user();

24
app/Http/Controllers/FileManager/FileAccessController.php
View File

@@ -1,13 +1,12 @@
<?php
namespace App\Http\Controllers\FileManager;
use App\Http\Controllers\Controller;
use App\Models\Zip;
use App\Services\HelperService;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use App\Services\HelperService;
use App\Models\File as UserFile;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage;
class FileAccessController extends Controller
@@ -29,7 +28,7 @@ class FileAccessController extends Controller
public function get_avatar($basename)
{
// Check if file exist
if (!Storage::exists("/avatars/$basename")) {
if (! Storage::exists("/avatars/$basename")) {
abort(404);
}
@@ -47,7 +46,7 @@ class FileAccessController extends Controller
public function get_system_image($basename)
{
// Check if file exist
if (!Storage::exists("/system/$basename")) {
if (! Storage::exists("/system/$basename")) {
abort(404);
}
@@ -81,10 +80,9 @@ class FileAccessController extends Controller
$this->check_file_access($shared, $file);
}*/
// Store user download size
$request->user()->record_download(
(int)$file->getRawOriginal('filesize')
(int) $file->getRawOriginal('filesize')
);
return $this->helper->download_file($file, Auth::id());
@@ -111,11 +109,11 @@ class FileAccessController extends Controller
);
return $disk->download("zip/$zip->basename", $zip->basename, [
"Content-Type" => 'application/zip',
"Content-Length" => $disk->size("zip/$zip->basename"),
"Accept-Ranges" => "bytes",
"Content-Range" => "bytes 0-600/" . $disk->size("zip/$zip->basename"),
"Content-Disposition" => "attachment; filename=$zip->basename",
'Content-Type' => 'application/zip',
'Content-Length' => $disk->size("zip/$zip->basename"),
'Accept-Ranges' => 'bytes',
'Content-Range' => 'bytes 0-600/' . $disk->size("zip/$zip->basename"),
'Content-Disposition' => "attachment; filename=$zip->basename",
]);
}

23
app/Http/Controllers/FileManager/ShareController.php
View File

@@ -1,19 +1,18 @@
<?php
namespace App\Http\Controllers\FileManager;
use Validator;
use App\Models\Zip;
use App\Models\Share;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use App\Http\Resources\ShareResource;
use App\Notifications\SharedSendViaEmail;
use Illuminate\Support\Facades\Notification;
use App\Http\Requests\Share\CreateShareRequest;
use App\Http\Requests\Share\UpdateShareRequest;
use App\Http\Resources\ShareResource;
use App\Models\Share;
use App\Models\Zip;
use App\Notifications\SharedSendViaEmail;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Notification;
use Validator;
class ShareController extends Controller
{
@@ -52,9 +51,7 @@ class ShareController extends Controller
// Send shared link via email
if ($request->has('emails')) {
foreach ($request->emails as $email) {
Notification::route('mail', $email)->notify(
new SharedSendViaEmail($shared->token)
);
@@ -100,7 +97,6 @@ class ShareController extends Controller
public function destroy(Request $request)
{
foreach ($request->tokens as $token) {
// Get sharing record
Share::where('token', $token)
->where('user_id', Auth::id())
@@ -141,7 +137,6 @@ class ShareController extends Controller
// Send shared link via email
if ($request->has('emails')) {
foreach ($request->emails as $email) {
Notification::route('mail', $email)
->notify(new SharedSendViaEmail($token));

21
app/Http/Controllers/FileManager/TrashController.php
View File

@@ -1,16 +1,15 @@
<?php
namespace App\Http\Controllers\FileManager;
use App\Models\File;
use App\Models\Folder;
use Illuminate\Http\Request;
use App\Services\DemoService;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Facades\Storage;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use App\Models\Folder;
use App\Models\File;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Facades\Validator;
use Illuminate\Contracts\Routing\ResponseFactory;
class TrashController extends Controller
{
@@ -38,7 +37,9 @@ class TrashController extends Controller
]);
// Return error
if ($validator->fails()) abort(400, 'Bad input');
if ($validator->fails()) {
abort(400, 'Bad input');
}
// Get user id
$user_id = Auth::id();
@@ -46,10 +47,8 @@ class TrashController extends Controller
abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
foreach ($request->input('items') as $restore) {
// Get folder
if ($restore['type'] === 'folder') {
// Get folder
$item = Folder::onlyTrashed()
->where('user_id', $user_id)
@@ -62,7 +61,6 @@ class TrashController extends Controller
$item->save();
}
} else {
// Get item
$item = File::onlyTrashed()
->where('user_id', $user_id)
@@ -105,7 +103,6 @@ class TrashController extends Controller
// Force delete files
foreach ($files as $file) {
// Delete file
Storage::delete("/files/$user_id/{$file->basename}");

40
app/Http/Controllers/Sharing/BrowseShareController.php
View File

@@ -1,20 +1,19 @@
<?php
namespace App\Http\Controllers\Sharing;
use App\Http\Controllers\Controller;
use App\Http\Requests\Share\AuthenticateShareRequest;
use App\Http\Resources\FileResource;
use App\Http\Resources\ShareResource;
use App\Models\File;
use App\Models\Folder;
use App\Models\Share;
use App\Services\HelperService;
use Illuminate\Http\Request;
use App\Models\Folder;
use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use App\Services\HelperService;
use Illuminate\Support\Collection;
use App\Http\Controllers\Controller;
use App\Http\Resources\FileResource;
use Illuminate\Support\Facades\Hash;
use App\Http\Resources\ShareResource;
use Illuminate\Support\Facades\Storage;
use App\Http\Requests\Share\AuthenticateShareRequest;
class BrowseShareController extends Controller
{
@@ -38,27 +37,25 @@ class BrowseShareController extends Controller
}
// Check if shared is image file and then show it
if ($shared->type === 'file' && !$shared->is_protected) {
if ($shared->type === 'file' && ! $shared->is_protected) {
$image = File::whereUserId($shared->user_id)
->whereType('image')
->whereId($shared->item_id)
->first();
if ($image) {
// Store user download size
$shared
->user
->record_download(
(int)$image->getRawOriginal('filesize')
(int) $image->getRawOriginal('filesize')
);
return $this->get_single_image($image, $shared->user_id);
}
}
return view("index")
return view('index')
->with('installation', 'setup-done')
->with('settings', get_settings_in_json() ?? null);
}
@@ -74,7 +71,6 @@ class BrowseShareController extends Controller
{
// Check password
if (Hash::check($request->password, $shared->password)) {
$cookie = json_encode([
'token' => $shared->token,
'authenticated' => true,
@@ -151,7 +147,6 @@ class BrowseShareController extends Controller
// Filter files
$files = $searched_files->filter(function ($file) use ($accessible_folder_ids, $shared) {
// Set public urls
$file->setPublicUrl($shared->token);
@@ -161,7 +156,6 @@ class BrowseShareController extends Controller
// Filter folders
$folders = $searched_folders->filter(function ($folder) use ($accessible_folder_ids) {
// check if item is in accessible folders
return in_array($folder->id, $accessible_folder_ids);
});
@@ -198,7 +192,7 @@ class BrowseShareController extends Controller
'name' => __t('home'),
'location' => 'public',
'folders' => $folders,
]
],
];
}
@@ -240,13 +234,15 @@ class BrowseShareController extends Controller
$path = "/files/$user_id/$file->basename";
// Check if file exist
if (!Storage::exists($path)) abort(404);
if (! Storage::exists($path)) {
abort(404);
}
return Storage::response($path, $file_pretty_name, [
"Content-Type" => Storage::mimeType($path),
"Content-Length" => Storage::size($path),
"Accept-Ranges" => "bytes",
"Content-Range" => "bytes 0-600/" . Storage::size($path),
'Content-Type' => Storage::mimeType($path),
'Content-Length' => Storage::size($path),
'Accept-Ranges' => 'bytes',
'Content-Range' => 'bytes 0-600/' . Storage::size($path),
]);
}
}

22
app/Http/Controllers/Sharing/FileSharedAccessController.php
View File

@@ -1,13 +1,11 @@
<?php
namespace App\Http\Controllers\Sharing;
use App\Http\Controllers\Controller;
use App\Models\File as UserFile;
use App\Models\Share;
use App\Models\Zip;
use App\Models\Share;
use App\Services\HelperService;
use Illuminate\Http\Request;
use App\Models\File as UserFile;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Storage;
class FileSharedAccessController extends Controller
@@ -42,11 +40,11 @@ class FileSharedAccessController extends Controller
return $disk
->download("zip/$zip->basename", $zip->basename, [
"Content-Type" => 'application/zip',
"Content-Length" => $disk->size("zip/$zip->basename"),
"Accept-Ranges" => "bytes",
"Content-Range" => "bytes 0-600/" . $disk->size("zip/$zip->basename"),
"Content-Disposition" => "attachment; filename=" . $zip->basename,
'Content-Type' => 'application/zip',
'Content-Length' => $disk->size("zip/$zip->basename"),
'Accept-Ranges' => 'bytes',
'Content-Range' => 'bytes 0-600/' . $disk->size("zip/$zip->basename"),
'Content-Disposition' => 'attachment; filename=' . $zip->basename,
]);
}
@@ -74,7 +72,7 @@ class FileSharedAccessController extends Controller
$shared
->user
->record_download(
(int)$file->getRawOriginal('filesize')
(int) $file->getRawOriginal('filesize')
);
return $this->helper->download_file($file, $shared->user_id);
@@ -104,7 +102,7 @@ class FileSharedAccessController extends Controller
$shared
->user
->record_download(
(int)$file->getRawOriginal('filesize')
(int) $file->getRawOriginal('filesize')
);
return $this->helper->download_thumbnail_file($file, $shared->user_id);

37
app/Http/Controllers/Sharing/ManipulateShareItemsController.php
View File

@@ -1,23 +1,21 @@
<?php
namespace App\Http\Controllers\Sharing;
use App\Http\Controllers\Controller;
use App\Http\Requests\FileFunctions\CreateFolderRequest;
use App\Http\Requests\FileFunctions\DeleteItemRequest;
use App\Http\Requests\FileFunctions\MoveItemRequest;
use App\Http\Requests\FileFunctions\RenameItemRequest;
use App\Http\Requests\FileFunctions\UploadRequest;
use App\Models\File;
use App\Models\Folder;
use App\Models\Share;
use App\Services\DemoService;
use App\Services\FileManagerService;
use App\Services\HelperService;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Database\Eloquent\Model;
use App\Models\Folder;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Services\DemoService;
use App\Services\HelperService;
use App\Http\Controllers\Controller;
use App\Services\FileManagerService;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\FileFunctions\UploadRequest;
use App\Http\Requests\FileFunctions\MoveItemRequest;
use App\Http\Requests\FileFunctions\DeleteItemRequest;
use App\Http\Requests\FileFunctions\RenameItemRequest;
use App\Http\Requests\FileFunctions\CreateFolderRequest;
class ManipulateShareItemsController extends Controller
{
@@ -123,7 +121,6 @@ class ManipulateShareItemsController extends Controller
{
abort_if(is_demo_account($shared->user->email), 204, 'Done.');
// Check ability to access protected share record
$this->helper->check_protected_share_record($shared);
@@ -133,7 +130,6 @@ class ManipulateShareItemsController extends Controller
}
foreach ($request->items as $file) {
// Get file|folder item
$item = get_item($file['type'], $file['id']);
@@ -205,22 +201,19 @@ class ManipulateShareItemsController extends Controller
}
foreach ($request->items as $item) {
if ($item['type'] === 'folder') {
$this->helper->check_item_access([
$request->to_id, $item['id']
$request->to_id, $item['id'],
], $shared);
}
if ($item['type'] !== 'folder') {
$file = File::where('id', $item['id'])
->where('user_id', $shared->user_id)
->firstOrFail();
$this->helper->check_item_access([
$request->to_id, $file->folder_id
$request->to_id, $file->folder_id,
], $shared);
}
}
@@ -250,7 +243,7 @@ class ManipulateShareItemsController extends Controller
$folder = Folder::whereUserId($shared->user_id)
->where('id', $id);
if (!$folder->exists()) {
if (! $folder->exists()) {
abort(404, 'Requested folder doesn\'t exists.');
}

9
app/Http/Controllers/Subscription/StripeWebhookController.php
View File

@@ -1,11 +1,8 @@
<?php
namespace App\Http\Controllers\Subscription;
use App\Services\StripeService;
use App\Models\Setting;
use App\Models\User;
use App\Services\StripeService;
use Laravel\Cashier\Http\Controllers\WebhookController as CashierController;
class StripeWebhookController extends CashierController
@@ -39,7 +36,7 @@ class StripeWebhookController extends CashierController
$user
->settings()
->update([
'storage_capacity' => get_setting('storage_default')
'storage_capacity' => get_setting('storage_default'),
]);
return $this->successMethod();
@@ -64,7 +61,7 @@ class StripeWebhookController extends CashierController
$user
->settings()
->update([
'storage_capacity' => $plan['product']['metadata']['capacity']
'storage_capacity' => $plan['product']['metadata']['capacity'],
]);
return $this->successMethod();

26
app/Http/Controllers/User/AccountController.php
View File

@@ -1,18 +1,16 @@
<?php
namespace App\Http\Controllers\User;
use App\Http\Requests\User\UpdateUserPasswordRequest;
use App\Http\Resources\InvoiceCollection;
use App\Http\Resources\StorageDetailResource;
use App\Http\Resources\UserResource;
use App\Http\Resources\UserStorageResource;
use App\Services\DemoService;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Support\Facades\Validator;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
use App\Services\DemoService;
use App\Http\Controllers\Controller;
use App\Http\Resources\UserResource;
use Illuminate\Support\Facades\Auth;
use App\Http\Resources\InvoiceCollection;
use Illuminate\Support\Facades\Validator;
use App\Http\Resources\UserStorageResource;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\User\UpdateUserPasswordRequest;
class AccountController extends Controller
{
@@ -77,7 +75,9 @@ class AccountController extends Controller
]);
// Return error
if ($validator->fails()) abort(400, 'Bad input');
if ($validator->fails()) {
abort(400, 'Bad input');
}
// Get user
$user = Auth::user();
@@ -90,7 +90,7 @@ class AccountController extends Controller
$user
->settings()
->update([
'avatar' => store_avatar($request, 'avatar')
'avatar' => store_avatar($request, 'avatar'),
]);
return response('Saved!', 204);

31
app/Http/Controllers/User/PaymentMethodsController.php
View File

@@ -1,22 +1,20 @@
<?php
namespace App\Http\Controllers\User;
use App\Http\Controllers\Controller;
use App\Http\Requests\Payments\RegisterNewPaymentMethodRequest;
use App\Http\Resources\PaymentCardCollection;
use App\Http\Resources\PaymentCardResource;
use App\Http\Resources\PaymentDefaultCardResource;
use App\Services\DemoService;
use App\Services\StripeService;
use Auth;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Cache;
use App\Services\DemoService;
use App\Services\StripeService;
use Laravel\Cashier\PaymentMethod;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Cache;
use App\Http\Resources\PaymentCardResource;
use App\Http\Resources\PaymentCardCollection;
use App\Http\Resources\PaymentDefaultCardResource;
use App\Http\Requests\Payments\RegisterNewPaymentMethodRequest;
class PaymentMethodsController extends Controller
{
public function __construct(StripeService $stripe)
{
$this->stripe = $stripe;
@@ -32,7 +30,7 @@ class PaymentMethodsController extends Controller
{
$user = Auth::user();
if (!$user->hasPaymentMethod()) {
if (! $user->hasPaymentMethod()) {
return abort(204, 'User don\'t have any payment methods');
}
@@ -40,15 +38,11 @@ class PaymentMethodsController extends Controller
$slug_default_payment_method = 'default-payment-methods-user-' . $user->id;
if (Cache::has($slug_payment_methods) && Cache::has($slug_default_payment_method)) {
$defaultPaymentMethod = Cache::get($slug_default_payment_method);
$paymentMethodsMapped = Cache::get($slug_payment_methods);
} else {
// Get default payment method
$defaultPaymentMethod = Cache::rememberForever($slug_default_payment_method, function () use ($user) {
$defaultPaymentMethodObject = $user->defaultPaymentMethod();
return $defaultPaymentMethodObject instanceof PaymentMethod
@@ -58,7 +52,6 @@ class PaymentMethodsController extends Controller
// filter payment methods without default payment
$paymentMethodsMapped = Cache::rememberForever($slug_payment_methods, function () use ($defaultPaymentMethod, $user) {
$paymentMethods = $user->paymentMethods()->filter(function ($paymentMethod) use ($defaultPaymentMethod) {
return $paymentMethod->id !== $defaultPaymentMethod->id;
});
@@ -70,7 +63,7 @@ class PaymentMethodsController extends Controller
});
}
if (!$user->card_brand || !$user->stripe_id || is_null($paymentMethodsMapped) && is_null($paymentMethodsMapped)) {
if (! $user->card_brand || ! $user->stripe_id || is_null($paymentMethodsMapped) && is_null($paymentMethodsMapped)) {
return [
'default' => null,
'others' => [],
@@ -108,7 +101,7 @@ class PaymentMethodsController extends Controller
// Clear cached payment methods
cache_forget_many([
'payment-methods-user-' . $user->id,
'default-payment-methods-user-' . $user->id
'default-payment-methods-user-' . $user->id,
]);
return response('Done', 204);
@@ -159,7 +152,7 @@ class PaymentMethodsController extends Controller
// Clear cached payment methods
cache_forget_many([
'payment-methods-user-' . $user->id,
'default-payment-methods-user-' . $user->id
'default-payment-methods-user-' . $user->id,
]);
return response('Done!', 204);

26
app/Http/Controllers/User/SubscriptionController.php
View File

@@ -1,19 +1,18 @@
<?php
namespace App\Http\Controllers\User;
use App\Http\Controllers\Controller;
use App\Http\Requests\Subscription\StoreUpgradeAccountRequest;
use App\Http\Resources\UserSubscription;
use App\Services\DemoService;
use App\Models\User;
use App\Services\StripeService;
use Auth;
use App\Models\User;
use Stripe\SetupIntent;
use App\Services\DemoService;
use Illuminate\Http\Response;
use App\Services\StripeService;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Cache;
use App\Http\Resources\UserSubscription;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Cache;
use Stripe\SetupIntent;
use App\Http\Requests\Subscription\StoreUpgradeAccountRequest;
class SubscriptionController extends Controller
{
@@ -34,7 +33,8 @@ class SubscriptionController extends Controller
public function setup_intent()
{
return response(
$this->stripe->getSetupIntent(Auth::user()), 201
$this->stripe->getSetupIntent(Auth::user()),
201
);
}
@@ -47,7 +47,7 @@ class SubscriptionController extends Controller
{
$user = User::find(Auth::id());
if (!$user->subscription('main')) {
if (! $user->subscription('main')) {
return abort(204, 'User don\'t have any subscription');
}
@@ -97,7 +97,7 @@ class SubscriptionController extends Controller
// Update user storage limit
$user->settings()->update([
'storage_capacity' => $plan['product']['metadata']['capacity']
'storage_capacity' => $plan['product']['metadata']['capacity'],
]);
return response('Done!', 204);

1
app/Http/Kernel.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http;
use Illuminate\Foundation\Http\Kernel as HttpKernel;

2
app/Http/Mail/SendContactMessage.php
View File

@@ -1,9 +1,7 @@
<?php
namespace App\Http\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Mail\Mailable;
use Illuminate\Queue\SerializesModels;

1
app/Http/Middleware/Authenticate.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Auth\Middleware\Authenticate as Middleware;

1
app/Http/Middleware/CheckForMaintenanceMode.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;

2
app/Http/Middleware/EncryptCookies.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
@@ -12,6 +11,5 @@ class EncryptCookies extends Middleware
* @var array
*/
protected $except = [
];
}

2
app/Http/Middleware/PreventRequestsDuringMaintenance.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\PreventRequestsDuringMaintenance as Middleware;
@@ -12,6 +11,5 @@ class PreventRequestsDuringMaintenance extends Middleware
* @var array
*/
protected $except = [
//
];
}

2
app/Http/Middleware/RedirectIfAuthenticated.php
View File

@@ -1,8 +1,6 @@
<?php
namespace App\Http\Middleware;
use App\Providers\RouteServiceProvider;
use Closure;
use Illuminate\Support\Facades\Auth;

1
app/Http/Middleware/TrimStrings.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;

3
app/Http/Middleware/TrustProxies.php
View File

@@ -1,9 +1,8 @@
<?php
namespace App\Http\Middleware;
use Fideloper\Proxy\TrustProxies as Middleware;
use Illuminate\Http\Request;
use Fideloper\Proxy\TrustProxies as Middleware;
class TrustProxies extends Middleware
{

1
app/Http/Middleware/VerifyCsrfToken.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;

5
app/Http/Notifications/ConfirmPayment.php
View File

@@ -1,12 +1,11 @@
<?php
namespace App\Http\Notifications;
use Laravel\Cashier\Payment;
use Illuminate\Bus\Queueable;
use Illuminate\Notifications\Notification;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Notifications\Messages\MailMessage;
use Illuminate\Notifications\Notification;
use Laravel\Cashier\Payment;
class ConfirmPayment extends Notification implements ShouldQueue
{

3
app/Http/Requests/Admin/ChangeRoleRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class ChangeRoleRequest extends FormRequest
{
return [
'attributes' => 'required|array',
'attributes.role' => 'required|string'
'attributes.role' => 'required|string',
];
}
}

3
app/Http/Requests/Admin/ChangeStorageCapacityRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class ChangeStorageCapacityRequest extends FormRequest
{
return [
'attributes' => 'required|array',
'attributes.storage_capacity' => 'required|digits_between:1,9'
'attributes.storage_capacity' => 'required|digits_between:1,9',
];
}
}

1
app/Http/Requests/Admin/CreateUserByAdmin.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/Admin/DeleteUserRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Admin;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/Auth/CheckAccountRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Auth;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/FileBrowser/SearchRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\FileBrowser;
use Illuminate\Foundation\Http\FormRequest;

2
app/Http/Requests/FileFunctions/CreateFolderRequest.php
View File

@@ -1,9 +1,7 @@
<?php
namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class CreateFolderRequest extends FormRequest
{

4
app/Http/Requests/FileFunctions/DeleteItemRequest.php
View File

@@ -1,9 +1,7 @@
<?php
namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class DeleteItemRequest extends FormRequest
{
@@ -27,7 +25,7 @@ class DeleteItemRequest extends FormRequest
return [
'data[*].force_delete' => 'required|boolean',
'data[*].type' => 'required|string',
'data[*].id' => 'required|integer'
'data[*].id' => 'required|integer',
];
}
}

2
app/Http/Requests/FileFunctions/MoveItemRequest.php
View File

@@ -1,9 +1,7 @@
<?php
namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class MoveItemRequest extends FormRequest
{

2
app/Http/Requests/FileFunctions/RenameItemRequest.php
View File

@@ -1,9 +1,7 @@
<?php
namespace App\Http\Requests\FileFunctions;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
class RenameItemRequest extends FormRequest
{

3
app/Http/Requests/FileFunctions/UploadRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\FileFunctions;
use App\Rules\DisabledMimetypes;
@@ -26,7 +25,7 @@ class UploadRequest extends FormRequest
{
return [
'folder_id' => 'nullable|uuid',
'file' => ['required', 'file', new DisabledMimetypes]
'file' => ['required', 'file', new DisabledMimetypes],
];
}
}

3
app/Http/Requests/Languages/CreateLanguageRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Languages;
use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class CreateLanguageRequest extends FormRequest
{
return [
'name' => 'required|string',
'locale' => 'required|string'
'locale' => 'required|string',
];
}
}

3
app/Http/Requests/Languages/UpdateLanguageRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Languages;
use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class UpdateLanguageRequest extends FormRequest
{
return [
'name' => 'required|string',
'value' => 'required|string'
'value' => 'required|string',
];
}
}

3
app/Http/Requests/Languages/UpdateStringRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Languages;
use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class UpdateStringRequest extends FormRequest
{
return [
'name' => 'required|string',
'value' => 'required|string'
'value' => 'required|string',
];
}
}

3
app/Http/Requests/Payments/RegisterNewPaymentMethodRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Payments;
use Illuminate\Foundation\Http\FormRequest;
@@ -25,7 +24,7 @@ class RegisterNewPaymentMethodRequest extends FormRequest
{
return [
'token' => 'required|string',
'default' => 'required|boolean'
'default' => 'required|boolean',
];
}
}

1
app/Http/Requests/PublicPages/SendContactMessageRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\PublicPages;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/SetupWizard/StoreAppSetupRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/SetupWizard/StoreDatabaseCredentialsRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/SetupWizard/StoreEnvironmentSetupRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/SetupWizard/StoreStripeBillingRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/SetupWizard/StoreStripeCredentialsRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/SetupWizard/StoreStripePlansRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\SetupWizard;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/Share/AuthenticateShareRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Share;
use Illuminate\Foundation\Http\FormRequest;

5
app/Http/Requests/Share/CreateShareRequest.php
View File

@@ -1,9 +1,8 @@
<?php
namespace App\Http\Requests\Share;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
use Illuminate\Foundation\Http\FormRequest;
class CreateShareRequest extends FormRequest
{
@@ -30,7 +29,7 @@ class CreateShareRequest extends FormRequest
'expiration' => 'integer|nullable',
'permission' => 'string',
'password' => 'string',
'emails.*' => 'email'
'emails.*' => 'email',
];
}
}

3
app/Http/Requests/Share/UpdateShareRequest.php
View File

@@ -1,9 +1,8 @@
<?php
namespace App\Http\Requests\Share;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Auth;
use Illuminate\Foundation\Http\FormRequest;
class UpdateShareRequest extends FormRequest
{

1
app/Http/Requests/Subscription/StoreUpgradeAccountRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Subscription;
use Illuminate\Foundation\Http\FormRequest;

1
app/Http/Requests/User/UpdateUserPasswordRequest.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\User;
use Illuminate\Foundation\Http\FormRequest;

3
app/Http/Resources/FileResource.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -28,7 +27,7 @@ class FileResource extends JsonResource
'thumbnail' => $this->thumbnail,
'created_at' => $this->created_at,
'updated_at' => $this->created_at,
]
],
],
];
}

1
app/Http/Resources/InvoiceAdminCollection.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection;

11
app/Http/Resources/InvoiceAdminResource.php
View File

@@ -1,10 +1,9 @@
<?php
namespace App\Http\Resources;
use App\Models\User;
use Illuminate\Http\Resources\Json\JsonResource;
use Laravel\Cashier\Cashier;
use Illuminate\Http\Resources\Json\JsonResource;
class InvoiceAdminResource extends JsonResource
{
@@ -54,10 +53,10 @@ class InvoiceAdminResource extends JsonResource
'attributes' => [
'name' => $user->settings->name,
'avatar' => $user->settings->avatar,
]
]
]
]
],
],
],
],
];
}),
],

1
app/Http/Resources/InvoiceCollection.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection;

9
app/Http/Resources/InvoiceResource.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use App\Models\User;
@@ -48,10 +47,10 @@ class InvoiceResource extends JsonResource
'attributes' => [
'name' => $user->settings->name,
'avatar' => $user->settings->avatar,
]
]
]
]
],
],
],
],
]),
],
];

3
app/Http/Resources/LanguageCollection.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use App\Models\Language;
@@ -25,7 +24,7 @@ class LanguageCollection extends ResourceCollection
'data' => $this->collection,
'meta' => [
'current_language' => new LanguageResource($current_language),
'reference_translations' => get_default_language_translations()
'reference_translations' => get_default_language_translations(),
],
];
}

3
app/Http/Resources/LanguageResource.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -24,7 +23,7 @@ class LanguageResource extends JsonResource
'translations' => map_language_translations($this->languageTranslations),
'updated_at' => $this->updated_at,
'created_at' => $this->created_at,
]
],
],
];
}

1
app/Http/Resources/PageCollection.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection;

4
app/Http/Resources/PageResource.php
View File

@@ -1,8 +1,6 @@
<?php
namespace App\Http\Resources;
use App\Models\Page;
use Illuminate\Http\Resources\Json\JsonResource;
class PageResource extends JsonResource
@@ -25,7 +23,7 @@ class PageResource extends JsonResource
'slug' => $this->slug,
'content' => $this->content,
'content_formatted' => add_paragraphs($this->content),
]
],
],
];
}

1
app/Http/Resources/PaymentCardCollection.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection;

7
app/Http/Resources/PaymentCardResource.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -16,7 +15,7 @@ class PaymentCardResource extends JsonResource
{
return [
'data' => [
'id' => (string)$this['id'],
'id' => (string) $this['id'],
'type' => 'payment_method',
'attributes' => [
'provider' => 'stripe',
@@ -28,8 +27,8 @@ class PaymentCardResource extends JsonResource
'created_at' => format_date($this['created_at'], '%d. %B. %Y'),
'status' => 'active',
'default' => 0,
]
]
],
],
];
}
}

7
app/Http/Resources/PaymentDefaultCardResource.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -16,7 +15,7 @@ class PaymentDefaultCardResource extends JsonResource
{
return [
'data' => [
'id' => (string)$this['id'],
'id' => (string) $this['id'],
'type' => 'payment_method',
'attributes' => [
'provider' => 'stripe',
@@ -28,8 +27,8 @@ class PaymentDefaultCardResource extends JsonResource
'created_at' => format_date($this['created_at'], '%d. %B. %Y'),
'status' => 'active',
'default' => 0,
]
]
],
],
];
}
}

1
app/Http/Resources/PlanCollection.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection;

7
app/Http/Resources/PlanResource.php
View File

@@ -1,10 +1,9 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
use Laravel\Cashier\Cashier;
use Laravel\Cashier\Subscription;
use Illuminate\Http\Resources\Json\JsonResource;
class PlanResource extends JsonResource
{
@@ -34,8 +33,8 @@ class PlanResource extends JsonResource
'capacity' => (int) $this['product']['metadata']['capacity'],
'created_at_formatted' => format_date($this['plan']['created']),
'created_at' => $this['plan']['created'],
]
]
],
],
];
}
}

1
app/Http/Resources/PricingCollection.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection;

11
app/Http/Resources/PricingResource.php
View File

@@ -1,10 +1,9 @@
<?php
namespace App\Http\Resources;
use Laravel\Cashier\Cashier;
use App\Services\StripeService;
use Illuminate\Http\Resources\Json\JsonResource;
use Laravel\Cashier\Cashier;
class PricingResource extends JsonResource
{
@@ -25,11 +24,11 @@ class PricingResource extends JsonResource
'description' => $this['product']['description'],
'price' => Cashier::formatAmount($this['plan']['amount']),
'capacity_formatted' => format_gigabytes($this['product']['metadata']['capacity']),
'capacity' => (int)$this['product']['metadata']['capacity'],
'capacity' => (int) $this['product']['metadata']['capacity'],
'currency' => config('cashier.currency'),
'tax_rates' => resolve(StripeService::class)->get_tax_rates($this['plan']['amount'])
]
]
'tax_rates' => resolve(StripeService::class)->get_tax_rates($this['plan']['amount']),
],
],
];
}
}

9
app/Http/Resources/ShareResource.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -16,20 +15,20 @@ class ShareResource extends JsonResource
{
return [
'data' => [
'id' => (string)$this->id,
'id' => (string) $this->id,
'type' => 'shares',
'attributes' => [
'permission' => $this->permission,
'is_protected' => $this->is_protected,
'item_id' => $this->item_id,
'expire_in' => (int)$this->expire_in,
'expire_in' => (int) $this->expire_in,
'token' => $this->token,
'link' => $this->link,
'type' => $this->type,
'created_at' => $this->created_at,
'updated_at' => $this->updated_at,
]
]
],
],
];
}
}

17
app/Http/Resources/UserResource.php
View File

@@ -1,11 +1,6 @@
<?php
namespace App\Http\Resources;
use App\Services\StripeService;
use App\Models\User;
use Cartalyst\Stripe\Api\PaymentMethods;
use Faker\Factory;
use Illuminate\Http\Resources\Json\JsonResource;
class UserResource extends JsonResource
@@ -50,20 +45,20 @@ class UserResource extends JsonResource
'postal_code' => $this->settings->postal_code,
'country' => $this->settings->country,
'phone_number' => $this->settings->phone_number,
'timezone' => $this->settings->timezone
]
]
'timezone' => $this->settings->timezone,
],
],
],
'favourites' => [
'data' => [
'id' => $this->id,
'type' => 'favourite_folders',
'attributes' => [
'folders' => $this->favouriteFolders->makeHidden(['pivot'])
'folders' => $this->favouriteFolders->makeHidden(['pivot']),
],
],
],
],
]
]
],
];
}

31
app/Http/Resources/UserStorageResource.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use App\Models\File;
@@ -17,31 +16,31 @@ class UserStorageResource extends JsonResource
public function toArray($request)
{
$document_mimetypes = [
'pdf', 'numbers', 'xlsx', 'xls', 'txt', 'md', 'rtf', 'pptx', 'ppt', 'odt', 'ods', 'odp', 'epub', 'docx', 'doc', 'csv', 'pages'
'pdf', 'numbers', 'xlsx', 'xls', 'txt', 'md', 'rtf', 'pptx', 'ppt', 'odt', 'ods', 'odp', 'epub', 'docx', 'doc', 'csv', 'pages',
];
// Get all images
$images = File::where('user_id', $this->id)
->where('type', 'image')->get()->map(function ($item) {
return (int)$item->getRawOriginal('filesize');
return (int) $item->getRawOriginal('filesize');
})->sum();
// Get all audios
$audios = File::where('user_id', $this->id)
->where('type', 'audio')->get()->map(function ($item) {
return (int)$item->getRawOriginal('filesize');
return (int) $item->getRawOriginal('filesize');
})->sum();
// Get all videos
$videos = File::where('user_id', $this->id)
->where('type', 'video')->get()->map(function ($item) {
return (int)$item->getRawOriginal('filesize');
return (int) $item->getRawOriginal('filesize');
})->sum();
// Get all documents
$documents = File::where('user_id', $this->id)
->whereIn('mimetype', $document_mimetypes)->get()->map(function ($item) {
return (int)$item->getRawOriginal('filesize');
return (int) $item->getRawOriginal('filesize');
})->sum();
// Get all other files
@@ -49,41 +48,41 @@ class UserStorageResource extends JsonResource
->whereNotIn('mimetype', $document_mimetypes)
->whereNotIn('type', ['audio', 'video', 'image'])
->get()->map(function ($item) {
return (int)$item->getRawOriginal('filesize');
return (int) $item->getRawOriginal('filesize');
})->sum();
return [
'data' => [
'id' => (string)$this->id,
'id' => (string) $this->id,
'type' => 'storage',
'attributes' => [
'used' => Metric::bytes($this->used_capacity)->format(),
'capacity' => format_gigabytes($this->settings->storage_capacity),
'percentage' => (float)get_storage_fill_percentage($this->used_capacity, $this->settings->storage_capacity),
'percentage' => (float) get_storage_fill_percentage($this->used_capacity, $this->settings->storage_capacity),
],
'meta' => [
'images' => [
'used' => Metric::bytes($images)->format(),
'percentage' => (float)get_storage_fill_percentage($images, $this->settings->storage_capacity),
'percentage' => (float) get_storage_fill_percentage($images, $this->settings->storage_capacity),
],
'audios' => [
'used' => Metric::bytes($audios)->format(),
'percentage' => (float)get_storage_fill_percentage($audios, $this->settings->storage_capacity),
'percentage' => (float) get_storage_fill_percentage($audios, $this->settings->storage_capacity),
],
'videos' => [
'used' => Metric::bytes($videos)->format(),
'percentage' => (float)get_storage_fill_percentage($videos, $this->settings->storage_capacity),
'percentage' => (float) get_storage_fill_percentage($videos, $this->settings->storage_capacity),
],
'documents' => [
'used' => Metric::bytes($documents)->format(),
'percentage' => (float)get_storage_fill_percentage($documents, $this->settings->storage_capacity),
'percentage' => (float) get_storage_fill_percentage($documents, $this->settings->storage_capacity),
],
'others' => [
'used' => Metric::bytes($others)->format(),
'percentage' => (float)get_storage_fill_percentage($others, $this->settings->storage_capacity),
'percentage' => (float) get_storage_fill_percentage($others, $this->settings->storage_capacity),
],
],
],
]
]
];
}
}

13
app/Http/Resources/UserSubscription.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -30,14 +29,14 @@ class UserSubscription extends JsonResource
'active' => $this->subscription('main')->active(),
'canceled' => $this->subscription('main')->cancelled(),
'name' => $subscription['product']['name'],
'capacity' => (int)$subscription['product']['metadata']['capacity'],
'capacity' => (int) $subscription['product']['metadata']['capacity'],
'capacity_formatted' => format_gigabytes($subscription['product']['metadata']['capacity']),
'slug' => $subscription['plan']['id'],
'canceled_at' => format_date($active_subscription["canceled_at"], '%d. %B. %Y'),
'created_at' => format_date($active_subscription["current_period_start"], '%d. %B. %Y'),
'ends_at' => format_date($active_subscription["current_period_end"], '%d. %B. %Y'),
]
]
'canceled_at' => format_date($active_subscription['canceled_at'], '%d. %B. %Y'),
'created_at' => format_date($active_subscription['current_period_start'], '%d. %B. %Y'),
'ends_at' => format_date($active_subscription['current_period_end'], '%d. %B. %Y'),
],
],
];
}
}

1
app/Http/Resources/UsersCollection.php
View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources;
use Illuminate\Http\Resources\Json\ResourceCollection;

125
app/Http/helpers.php
View File

@@ -1,19 +1,18 @@
<?php
use Carbon\Carbon;
use App\Models\File;
use App\Models\Folder;
use App\Models\Setting;
use App\Models\User;
use App\Models\Share;
use App\Models\Language;
use App\Models\LanguageTranslation;
use ByteUnits\Metric;
use Carbon\Carbon;
use App\Models\Folder;
use App\Models\Setting;
use App\Models\Language;
use Illuminate\Support\Str;
use Illuminate\Support\Collection;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\QueryException;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
use Intervention\Image\ImageManagerStatic as Image;
/**
@@ -24,11 +23,11 @@ use Intervention\Image\ImageManagerStatic as Image;
*/
function obfuscate_email($email)
{
$em = explode("@", $email);
$em = explode('@', $email);
$name = implode('@', array_slice($em, 0, count($em) - 1));
$len = floor(strlen($name) / 2);
return substr($name, 0, $len) . str_repeat('*', $len) . "@" . end($em);
return substr($name, 0, $len) . str_repeat('*', $len) . '@' . end($em);
}
/**
@@ -75,17 +74,19 @@ function get_setup_status()
function add_paragraphs($str)
{
// Trim whitespace
if (($str = trim($str)) === '') return '';
if (($str = trim($str)) === '') {
return '';
}
// Standardize newlines
$str = str_replace(array("\r\n", "\r"), "\n", $str);
$str = str_replace(["\r\n", "\r"], "\n", $str);
// Trim whitespace on each line
$str = preg_replace('~^[ \t]+~m', '', $str);
$str = preg_replace('~[ \t]+$~m', '', $str);
// The following regexes only need to be executed if the string contains html
if ($html_found = (strpos($str, '<') !== FALSE)) {
if ($html_found = (strpos($str, '<') !== false)) {
// Elements that should not be surrounded by p tags
$no_p = '(?:p|div|article|header|aside|hgroup|canvas|output|progress|section|figcaption|audio|video|nav|figure|footer|video|details|main|menu|summary|h[1-6r]|ul|ol|li|blockquote|d[dlt]|pre|t[dhr]|t(?:able|body|foot|head)|c(?:aption|olgroup)|form|s(?:elect|tyle)|a(?:ddress|rea)|ma(?:p|th))';
@@ -99,7 +100,7 @@ function add_paragraphs($str)
$str = preg_replace('~\n{2,}~', "</p>\n\n<p>", $str);
// The following regexes only need to be executed if the string contains html
if ($html_found !== FALSE) {
if ($html_found !== false) {
// Remove p tags around $no_p elements
$str = preg_replace('~<p>(?=</?' . $no_p . '[^>]*+>)~i', '', $str);
$str = preg_replace('~(</?' . $no_p . '[^>]*+>)</p>~i', '$1', $str);
@@ -125,7 +126,6 @@ function setEnvironmentValue(array $values)
if (count($values) > 0) {
foreach ($values as $envKey => $envValue) {
$str .= "\n"; // In case the searched variable is in the last line without \n
$keyPosition = strpos($str, "{$envKey}=");
$endOfLinePosition = strpos($str, "\n", $keyPosition);
@@ -137,9 +137,9 @@ function setEnvironmentValue(array $values)
}
$str = substr($str, 0, -1);
if (!file_put_contents($envFile, $str)) return false;
return true;
return ! (! file_put_contents($envFile, $str))
;
}
/**
@@ -153,9 +153,9 @@ function get_invoice_number()
if ($invoices->isEmpty()) {
return now()->year . '001';
} else {
return (int)$invoices->last()->order + 1;
}
return (int) $invoices->last()->order + 1;
}
/**
@@ -206,7 +206,7 @@ function get_version()
/**
* Check if is demo
*
* @return boolean
* @return bool
*/
function is_demo()
{
@@ -281,7 +281,7 @@ function is_visitor($shared)
*/
function store_avatar($request, $name)
{
if (!$request->hasFile($name)) {
if (! $request->hasFile($name)) {
return null;
}
@@ -312,7 +312,7 @@ function store_avatar($request, $name)
*/
function store_system_image($request, $name)
{
if (!$request->hasFile($name)) {
if (! $request->hasFile($name)) {
return null;
}
@@ -356,9 +356,9 @@ function format_gigabytes($gigabytes)
{
if ($gigabytes >= 1000) {
return Metric::gigabytes($gigabytes)->format('Tb/');
} else {
return Metric::gigabytes($gigabytes)->format('GB/');
}
return Metric::gigabytes($gigabytes)->format('GB/');
}
/**
@@ -411,7 +411,7 @@ function get_storage_fill_percentage($used, $capacity)
}
// Return in 2 decimal
return number_format((float)$progress, 2, '.', '');
return number_format((float) $progress, 2, '.', '');
}
/**
@@ -445,12 +445,14 @@ function recursiveFind(array $array, $needle)
{
$iterator = new RecursiveArrayIterator($array);
$recursive = new RecursiveIteratorIterator($iterator, RecursiveIteratorIterator::SELF_FIRST);
$aHitList = array();
$aHitList = [];
foreach ($recursive as $key => $value) {
if ($key === $needle) {
array_push($aHitList, $value);
}
}
return $aHitList;
}
@@ -466,7 +468,6 @@ function appeared_once($arr)
$single_time_comming_values_array = [];
foreach ($array_count_values as $key => $val) {
if ($val == 1) {
$single_time_comming_values_array[] = $key;
}
@@ -515,13 +516,19 @@ function get_file_type($file_mimetype)
switch ($mimetype[0]) {
case 'image':
return 'image';
break;
case 'video':
return 'video';
break;
case 'audio':
return 'audio';
break;
default:
return 'file';
}
@@ -583,16 +590,11 @@ function get_pretty_name($basename, $name, $mimetype)
function get_image_meta_data($file)
{
if (get_file_type_from_mimetype($file->getMimeType()) === 'jpeg') {
try {
// Try to get the exif data
return mb_convert_encoding(Image::make($file->getRealPath())->exif(), 'UTF8', 'UTF8');
} catch (\Exception $e) {
return null;
}
}
}
@@ -603,9 +605,9 @@ function get_image_meta_data($file)
function get_default_language_translations()
{
return collect([
config("language-translations.extended"),
config("language-translations.regular"),
config("custom-language-translations")
config('language-translations.extended'),
config('language-translations.regular'),
config('custom-language-translations'),
])->collapse();
}
@@ -626,20 +628,39 @@ function is_dev()
function seems_utf8($str)
{
$length = strlen($str);
for ($i = 0; $i < $length; $i++) {
$c = ord($str[$i]);
if ($c < 0x80) $n = 0; # 0bbbbbbb
elseif (($c & 0xE0) == 0xC0) $n = 1; # 110bbbbb
elseif (($c & 0xF0) == 0xE0) $n = 2; # 1110bbbb
elseif (($c & 0xF8) == 0xF0) $n = 3; # 11110bbb
elseif (($c & 0xFC) == 0xF8) $n = 4; # 111110bb
elseif (($c & 0xFE) == 0xFC) $n = 5; # 1111110b
else return false; # Does not match any model
if ($c < 0x80) {
$n = 0;
} # 0bbbbbbb
elseif (($c & 0xE0) == 0xC0) {
$n = 1;
} # 110bbbbb
elseif (($c & 0xF0) == 0xE0) {
$n = 2;
} # 1110bbbb
elseif (($c & 0xF8) == 0xF0) {
$n = 3;
} # 11110bbb
elseif (($c & 0xFC) == 0xF8) {
$n = 4;
} # 111110bb
elseif (($c & 0xFE) == 0xFC) {
$n = 5;
} # 1111110b
else {
return false;
} # Does not match any model
for ($j = 0; $j < $n; $j++) { # n bytes matching 10bbbbbb follow ?
if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80)) {
return false;
}
}
}
return true;
}
@@ -653,11 +674,12 @@ function seems_utf8($str)
*/
function remove_accents($string)
{
if (!preg_match('/[\x80-\xff]/', $string))
if (! preg_match('/[\x80-\xff]/', $string)) {
return $string;
}
if (seems_utf8($string)) {
$chars = array(
$chars = [
// Decompositions for Latin-1 Supplement
chr(195) . chr(128) => 'A', chr(195) . chr(129) => 'A',
chr(195) . chr(130) => 'A', chr(195) . chr(131) => 'A',
@@ -755,7 +777,7 @@ function remove_accents($string)
// Euro Sign
chr(226) . chr(130) . chr(172) => 'E',
// GBP (Pound) Sign
chr(194) . chr(163) => '');
chr(194) . chr(163) => '', ];
$string = strtr($string, $chars);
} else {
@@ -771,11 +793,11 @@ function remove_accents($string)
. chr(244) . chr(245) . chr(246) . chr(248) . chr(249) . chr(250) . chr(251)
. chr(252) . chr(253) . chr(255);
$chars['out'] = "EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy";
$chars['out'] = 'EfSZszYcYuAAAAAACEEEEIIIINOOOOOOUUUUYaaaaaaceeeeiiiinoooooouuuuyy';
$string = strtr($string, $chars['in'], $chars['out']);
$double_chars['in'] = array(chr(140), chr(156), chr(198), chr(208), chr(222), chr(223), chr(230), chr(240), chr(254));
$double_chars['out'] = array('OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th');
$double_chars['in'] = [chr(140), chr(156), chr(198), chr(208), chr(222), chr(223), chr(230), chr(240), chr(254)];
$double_chars['out'] = ['OE', 'oe', 'AE', 'DH', 'TH', 'ss', 'ae', 'dh', 'th'];
$string = str_replace($double_chars['in'], $double_chars['out'], $string);
}
@@ -793,7 +815,7 @@ function remove_accents($string)
function get_files_for_zip($folders, $files, $path = [])
{
// Return file list
if (!isset($folders->folders)) {
if (! isset($folders->folders)) {
return $files->unique()->values()->all();
}
@@ -831,7 +853,6 @@ function set_time_by_user_timezone($time)
$user = Auth::user();
if ($user) {
// Get the value of timezone if user have some
$time_zone = intval($user->settings->timezone * 60 ?? null);
@@ -897,6 +918,8 @@ function replace_occurrence($string, $values)
});
return str_ireplace(
$occurrences->pluck('key')->toArray(), $occurrences->pluck('message')->toArray(), $string
$occurrences->pluck('key')->toArray(),
$occurrences->pluck('message')->toArray(),
$string
);
}

Some files were not shown because too many files have changed in this diff Show More