fix(503): massively simplify the 503 error view

[bookstack] / app / Providers / CustomValidationServiceProvider.php

diff --git a/app/Providers/CustomValidationServiceProvider.php b/app/Providers/CustomValidationServiceProvider.php
index 4a5272b409afac6d196b18a947377504f1c7074f..ac95099cc7a0298ba4704bee0ca38494a5ae60eb 100644 (file)
--- a/app/Providers/CustomValidationServiceProvider.php
+++ b/app/Providers/CustomValidationServiceProvider.php
@@ -2,31 +2,28 @@
 
 namespace BookStack\Providers;
 
 
 namespace BookStack\Providers;
 

+use BookStack\Uploads\ImageService;

 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\ServiceProvider;
 
 class CustomValidationServiceProvider extends ServiceProvider
 {
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\ServiceProvider;
 
 class CustomValidationServiceProvider extends ServiceProvider
 {

-

     /**
      * Register our custom validation rules when the application boots.
      */
     public function boot(): void
     {
         Validator::extend('image_extension', function ($attribute, $value, $parameters, $validator) {
     /**
      * Register our custom validation rules when the application boots.
      */
     public function boot(): void
     {
         Validator::extend('image_extension', function ($attribute, $value, $parameters, $validator) {

-            $validImageExtensions = ['png', 'jpg', 'jpeg', 'gif', 'webp'];
-            return in_array(strtolower($value->getClientOriginalExtension()), $validImageExtensions);
-        });
+            $extension = strtolower($value->getClientOriginalExtension());

 
 

-        Validator::extend('no_double_extension', function ($attribute, $value, $parameters, $validator) {
-            $uploadName = $value->getClientOriginalName();
-            return substr_count($uploadName, '.') < 2;
+            return ImageService::isExtensionSupported($extension);

         });
 
         Validator::extend('safe_url', function ($attribute, $value, $parameters, $validator) {
             $cleanLinkName = strtolower(trim($value));
             $isJs = strpos($cleanLinkName, 'javascript:') === 0;
             $isData = strpos($cleanLinkName, 'data:') === 0;
         });
 
         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;
         });
     }
             return !$isJs && !$isData;
         });
     }