diff --git a/app/Http/Controllers/Search/ListController.php b/app/Http/Controllers/Search/ListController.php index a00c3c224..01a568d1f 100644 --- a/app/Http/Controllers/Search/ListController.php +++ b/app/Http/Controllers/Search/ListController.php @@ -21,10 +21,10 @@ public function index(Request $request, Campaign $campaign, EntityType $entityTy { return response()->json( $this->service - ->campaign($campaign) - ->request($request) - ->entityType($entityType) - ->search() + ->campaign($campaign) + ->request($request) + ->entityType($entityType) + ->search() ); } } diff --git a/app/Http/Middleware/PasswordConfirm.php b/app/Http/Middleware/PasswordConfirm.php index 5e26f2bd4..494cf0910 100644 --- a/app/Http/Middleware/PasswordConfirm.php +++ b/app/Http/Middleware/PasswordConfirm.php @@ -77,6 +77,10 @@ public function handle($request, Closure $next, $redirectToRoute = null) */ protected function shouldConfirmPassword($request) { + if (app()->isLocal()) { + return false; + } + $confirmedAt = time() - $request->session()->get('auth.password_confirmed_at', 0); return $confirmedAt > $this->passwordTimeout; diff --git a/app/Rules/Location.php b/app/Rules/Location.php index 15821034c..93bb883e8 100644 --- a/app/Rules/Location.php +++ b/app/Rules/Location.php @@ -2,7 +2,6 @@ namespace App\Rules; -use App\Facades\Module; use App\Models\EntityType; use Closure; use Illuminate\Contracts\Validation\ValidationRule; @@ -12,7 +11,7 @@ class Location implements ValidationRule /** * Run the validation rule. * - * @param \Closure(string, ?string=): \Illuminate\Translation\PotentiallyTranslatedString $fail + * @param Closure(string, ?string=): \Illuminate\Translation\PotentiallyTranslatedString $fail */ public function validate(string $attribute, mixed $value, Closure $fail): void { @@ -26,7 +25,7 @@ public function validate(string $attribute, mixed $value, Closure $fail): void $fail(__('crud.dynamic.unknown', ['module' => $module->name()])); } - if (empty(trim($value))) { + if (empty(mb_trim($value))) { return; } diff --git a/app/Services/Search/LiveSearchService.php b/app/Services/Search/LiveSearchService.php index 6acc717a1..108d5c26b 100644 --- a/app/Services/Search/LiveSearchService.php +++ b/app/Services/Search/LiveSearchService.php @@ -8,7 +8,6 @@ use App\Traits\EntityTypeAware; use App\Traits\RequestAware; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Http\Request; use Illuminate\Support\Str; class LiveSearchService diff --git a/app/View/Components/Forms/Foreign.php b/app/View/Components/Forms/Foreign.php index cc12bf231..a22094a35 100644 --- a/app/View/Components/Forms/Foreign.php +++ b/app/View/Components/Forms/Foreign.php @@ -4,7 +4,6 @@ use App\Facades\Module; use App\Models\Campaign; -use App\Models\Entity; use Closure; use Illuminate\Contracts\View\View; use Illuminate\Database\Eloquent\Model; diff --git a/resources/views/campaigns/delete.blade.php b/resources/views/campaigns/delete.blade.php index 57d4f4107..6ff4680e1 100644 --- a/resources/views/campaigns/delete.blade.php +++ b/resources/views/campaigns/delete.blade.php @@ -45,7 +45,7 @@
goodbye
']) !!}