Merge pull request 'Версия 0.7.1.' (#2) from develop into main

Reviewed-on: #2
This commit is contained in:
Leonid Nikitin 2023-12-09 00:59:41 +06:00
commit c3bfd4f920
5 changed files with 15 additions and 6 deletions

View File

@ -4,6 +4,8 @@ APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
APP_FORCE_HTTPS=false
APP_DEMO_MODE=false
APP_DEMO_EMAIL=
APP_DEMO_PASSWORD=

View File

@ -22,6 +22,7 @@ use App\Services\Search\Search;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Pagination\Paginator;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\Facades\URL;
use Illuminate\Support\ServiceProvider;
use Illuminate\Validation\Rules\Password;
@ -70,6 +71,10 @@ final class AppServiceProvider extends ServiceProvider
return Helpers::isDemoMode();
});
if (config('app.force_https') === true) {
URL::forceScheme('https');
}
Password::defaults(function () {
$rule = Password::min(8);

View File

@ -70,6 +70,8 @@ return [
'asset_url' => env('ASSET_URL'),
'force_https' => (bool) env('APP_FORCE_HTTPS', false),
/*
|--------------------------------------------------------------------------
| Application Timezone

View File

@ -1,10 +1,10 @@
<?php
return [
'waiting_for_captcha_verification_in_seconds' => env('WAITING_FOR_CAPTCHA_VERIFICATION_IN_SECONDS', 900),
'validate_max_count_errors' => env('CAPTCHA_VALIDATE_MAX_COUNT_ERRORS', 3),
'max_info_display_count' => env('CAPTCHA_MAX_INFO_DISPLAY_COUNT', 1),
'verification_data_view_limit_in_minutes' => env('CAPTCHA_VERIFICATION_DATA_VIEW_LIMIT_IN_MINUTES', 60),
'waiting_for_captcha_verification_in_seconds' => (int) env('WAITING_FOR_CAPTCHA_VERIFICATION_IN_SECONDS', 900),
'validate_max_count_errors' => (int) env('CAPTCHA_VALIDATE_MAX_COUNT_ERRORS', 3),
'max_info_display_count' => (int) env('CAPTCHA_MAX_INFO_DISPLAY_COUNT', 1),
'verification_data_view_limit_in_minutes' => (int) env('CAPTCHA_VERIFICATION_DATA_VIEW_LIMIT_IN_MINUTES', 60),
'imageClass' => \App\Captcha\Images\Image::class,
'types' => [
'string' => [

View File

@ -3,6 +3,6 @@ return [
/**
* Max limit of the hour.
*/
'login_max_request' => env('LOGIN_MAX_REQUEST', 50),
'login_max_email_request' => env('LOGIN_MAX_EMAIL_REQUEST', 10),
'login_max_request' => (int) env('LOGIN_MAX_REQUEST', 50),
'login_max_email_request' => (int) env('LOGIN_MAX_EMAIL_REQUEST', 10),
];