Merge branch 'v5'

This commit is contained in:
Tony Air 2024-04-26 15:30:21 +02:00
commit fc442dbc46
4 changed files with 7 additions and 8 deletions

View File

@ -12,8 +12,8 @@ SS_ENVIRONMENT_TYPE='dev'
NOCAPTCHA_SITE_KEY='' NOCAPTCHA_SITE_KEY=''
NOCAPTCHA_SECRET_KEY='' NOCAPTCHA_SECRET_KEY=''
TURNSTILE_SITE_KEY='' SS_TURNSTILE_SITE_KEY=''
TURNSTILE_SECRET_KEY='' SS_TURNSTILE_SECRET_KEY=''
GOOGLEMAPS_API_KEY='' GOOGLEMAPS_API_KEY=''
MAPBOX_API_KEY='' MAPBOX_API_KEY=''

View File

@ -19,12 +19,12 @@ UndefinedOffset\NoCaptcha\Forms\NocaptchaField:
proxy_auth: '' #Your proxy server authentication information (optional) proxy_auth: '' #Your proxy server authentication information (optional)
SilverStripe\SpamProtection\Extension\FormSpamProtectionExtension: SilverStripe\SpamProtection\Extension\FormSpamProtectionExtension:
default_spam_protector: WebbuildersGroup\Turnstile\Forms\TurnstileProtector #Set the default spam protector default_spam_protector: WebbuildersGroup\Turnstile\Forms\TurnstileProtector
#default_spam_protector: UndefinedOffset\NoCaptcha\Forms\NocaptchaProtector #default_spam_protector: UndefinedOffset\NoCaptcha\Forms\NocaptchaProtector
WebbuildersGroup\Turnstile\Forms\TurnstileField: WebbuildersGroup\Turnstile\Forms\TurnstileField:
site_key: '`TURNSTILE_SITE_KEY`' #Your site key (required) site_key: '`SS_TURNSTILE_SITE_KEY`' #Your site key (required)
secret_key: '`TURNSTILE_SECRET_KEY`' #Your secret key (required) secret_key: '`SS_TURNSTILE_SECRET_KEY`' #Your secret key (required)
verify_ssl: true #Allows you to disable php-curl's SSL peer verification by setting this to false (optional, defaults to true) verify_ssl: true #Allows you to disable php-curl's SSL peer verification by setting this to false (optional, defaults to true)
default_theme: "light" #Default theme color (optional, light, dark or auto, defaults to light) default_theme: "light" #Default theme color (optional, light, dark or auto, defaults to light)
js_onload_callback: null #Onload callback to be called when the JS for Turnstile is loaded js_onload_callback: null #Onload callback to be called when the JS for Turnstile is loaded

View File

@ -26,7 +26,6 @@
"axllent/silverstripe-version-truncator": "*", "axllent/silverstripe-version-truncator": "*",
"axllent/silverstripe-bootstrap-forms": "*", "axllent/silverstripe-bootstrap-forms": "*",
"silverstripe/redirectedurls": "*", "silverstripe/redirectedurls": "*",
"undefinedoffset/silverstripe-nocaptcha": "*",
"stevie-mayhew/silverstripe-svg": "*", "stevie-mayhew/silverstripe-svg": "*",
"innoweb/silverstripe-sitemap": "*", "innoweb/silverstripe-sitemap": "*",
"silverstripe/multiuser-editing-alert": "*", "silverstripe/multiuser-editing-alert": "*",

View File

@ -11,8 +11,8 @@ SS_ENVIRONMENT_TYPE='dev'
NOCAPTCHA_SITE_KEY='' NOCAPTCHA_SITE_KEY=''
NOCAPTCHA_SECRET_KEY='' NOCAPTCHA_SECRET_KEY=''
TURNSTILE_SITE_KEY='' SS_TURNSTILE_SITE_KEY=''
TURNSTILE_SECRET_KEY='' SS_TURNSTILE_SECRET_KEY=''
GOOGLEMAPS_API_KEY='' GOOGLEMAPS_API_KEY=''
MAPBOX_API_KEY='' MAPBOX_API_KEY=''