X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a6633642232efd164d4708967ab59e498fbff896..refs/pull/3012/head:/app/Providers/CustomValidationServiceProvider.php diff --git a/app/Providers/CustomValidationServiceProvider.php b/app/Providers/CustomValidationServiceProvider.php index 4a5272b40..c54f48ca3 100644 --- a/app/Providers/CustomValidationServiceProvider.php +++ b/app/Providers/CustomValidationServiceProvider.php @@ -7,7 +7,6 @@ use Illuminate\Support\ServiceProvider; class CustomValidationServiceProvider extends ServiceProvider { - /** * Register our custom validation rules when the application boots. */ @@ -15,18 +14,15 @@ class CustomValidationServiceProvider extends ServiceProvider { Validator::extend('image_extension', function ($attribute, $value, $parameters, $validator) { $validImageExtensions = ['png', 'jpg', 'jpeg', 'gif', 'webp']; - return in_array(strtolower($value->getClientOriginalExtension()), $validImageExtensions); - }); - Validator::extend('no_double_extension', function ($attribute, $value, $parameters, $validator) { - $uploadName = $value->getClientOriginalName(); - return substr_count($uploadName, '.') < 2; + return in_array(strtolower($value->getClientOriginalExtension()), $validImageExtensions); }); Validator::extend('safe_url', function ($attribute, $value, $parameters, $validator) { $cleanLinkName = strtolower(trim($value)); $isJs = strpos($cleanLinkName, 'javascript:') === 0; $isData = strpos($cleanLinkName, 'data:') === 0; + return !$isJs && !$isData; }); }