-
-
Notifications
You must be signed in to change notification settings - Fork 21
[TASK] add compatibility for TYPO3 12 #40
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Kanti
wants to merge
3
commits into
TehTux:develop
Choose a base branch
from
andersundsehr:typo3-12
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| services: | ||
| _defaults: | ||
| autowire: true | ||
| autoconfigure: true | ||
| public: false | ||
|
|
||
| Haffner\JhCaptcha\: | ||
| resource: '../Classes/*' | ||
| exclude: | ||
| - '../Classes/**/{Model,Exception}/*' | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1 @@ | ||
|
|
||
| plugin.tx_jhcaptcha.settings { | ||
| reCaptcha { | ||
| # cat=plugin.tx_jhcaptcha/recaptcha; type=options[2,3]; label=reCAPTCHA version (2 or 3) | ||
| version = 3 | ||
| v2 { | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v2; type=options[dark,light]; label=The color theme of the widget | ||
| theme = light | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v2; type=string; label=The language of the widget: See https://developers.google.com/recaptcha/docs/language | ||
| lang = en | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v2; type=options[normal,compact]; label=The size of the widget | ||
| size = normal | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v2; type=string; label=Site key (v2): See https://www.google.com/recaptcha/admin | ||
| siteKey = | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v2; type=string; label=Secret key (v2): See https://www.google.com/recaptcha/admin | ||
| secretKey = | ||
| } | ||
| v3 { | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v3; type=string; label=Site key (v3): See https://www.google.com/recaptcha/admin | ||
| siteKey = | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v3; type=string; label=Secret key (v3): See https://www.google.com/recaptcha/admin | ||
| secretKey = | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v3; type=string; label=Minimum Score (0.0 - 1.0) | ||
| minimumScore = 0.5 | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v3; type=string; label=Action: See https://developers.google.com/recaptcha/docs/v3 | ||
| action = homepage | ||
| } | ||
| } | ||
| # cat=plugin.tx_jhcaptcha/powermail; type=int; label= If this check fails - add other indication value (0 disables this check completely) | ||
| powermail.recaptchaId = 11 | ||
| } | ||
| @import 'EXT:jh_captcha/Configuration/TypoScript/constants.typoscript' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
|
|
||
| plugin.tx_jhcaptcha.settings { | ||
| reCaptcha { | ||
| # cat=plugin.tx_jhcaptcha/recaptcha; type=options[2,3]; label=reCAPTCHA version (2 or 3) | ||
| version = 3 | ||
| v2 { | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v2; type=options[dark,light]; label=The color theme of the widget | ||
| theme = light | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v2; type=string; label=The language of the widget: See https://developers.google.com/recaptcha/docs/language | ||
| lang = en | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v2; type=options[normal,compact]; label=The size of the widget | ||
| size = normal | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v2; type=string; label=Site key (v2): See https://www.google.com/recaptcha/admin | ||
| siteKey = | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v2; type=string; label=Secret key (v2): See https://www.google.com/recaptcha/admin | ||
| secretKey = | ||
| } | ||
| v3 { | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v3; type=string; label=Site key (v3): See https://www.google.com/recaptcha/admin | ||
| siteKey = | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v3; type=string; label=Secret key (v3): See https://www.google.com/recaptcha/admin | ||
| secretKey = | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v3; type=string; label=Minimum Score (0.0 - 1.0) | ||
| minimumScore = 0.5 | ||
| # cat=plugin.tx_jhcaptcha/recaptcha/v3; type=string; label=Action: See https://developers.google.com/recaptcha/docs/v3 | ||
| action = homepage | ||
| } | ||
| } | ||
| # cat=plugin.tx_jhcaptcha/powermail; type=int; label= If this check fails - add other indication value (0 disables this check completely) | ||
| powermail.recaptchaId = 11 | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1 @@ | ||
| plugin.tx_jhcaptcha { | ||
| settings { | ||
| reCaptcha { | ||
| version = {$plugin.tx_jhcaptcha.settings.reCaptcha.version} | ||
| v2 { | ||
| theme = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.theme} | ||
| lang = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.lang} | ||
| size = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.size} | ||
| siteKey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.siteKey} | ||
| secretKey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.secretKey} | ||
| } | ||
| v3 { | ||
| siteKey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v3.siteKey} | ||
| secretKey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v3.secretKey} | ||
| minimumScore = {$plugin.tx_jhcaptcha.settings.reCaptcha.v3.minimumScore} | ||
| action = {$plugin.tx_jhcaptcha.settings.reCaptcha.v3.action} | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| # EXT:formhandler | ||
| plugin.Tx_Formhandler.settings { | ||
| markers.jh_captcha_recaptcha = FLUIDTEMPLATE | ||
| markers.jh_captcha_recaptcha.file = EXT:jh_captcha/Resources/Private/Partials/Formhandler/ReCaptcha.html | ||
| } | ||
|
|
||
|
|
||
| # EXT:powermail | ||
| plugin.tx_powermail { | ||
| view.partialRootPaths.JhCaptcha = EXT:jh_captcha/Resources/Private/Powermail/Partials | ||
| settings.setup.spamshield { | ||
| _enable = 1 | ||
| methods.{$plugin.tx_jhcaptcha.settings.powermail.recaptchaId} { | ||
| _enable = 1 | ||
| name = reCAPTCHA (jh_captcha) | ||
| class = Haffner\JhCaptcha\Validation\Validator\Powermail | ||
| indication = {$plugin.tx_jhcaptcha.settings.powermail.recaptchaId} | ||
| configuration.secretkey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v3.secretKey} | ||
| } | ||
| } | ||
| } | ||
| [{$plugin.tx_jhcaptcha.settings.reCaptcha.version} == "2"] | ||
| plugin.tx_powermail.settings.setup.spamshield.methods.{$plugin.tx_jhcaptcha.settings.powermail.recaptchaId} { | ||
| configuration.secretkey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.secretKey} | ||
| } | ||
| [global] | ||
|
|
||
|
|
||
| # EXT:form | ||
| plugin.tx_form { | ||
| settings.yamlConfigurations.JhCaptchaRecaptcha = EXT:jh_captcha/Configuration/Yaml/ReCaptcha/BaseSetup.yaml | ||
| view.partialRootPaths.JhCaptchaRecaptcha = EXT:jh_captcha/Resources/Private/Form/Frontend/Partials | ||
| } | ||
| @import 'EXT:jh_captcha/Configuration/TypoScript/setup.typoscript' |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| plugin.tx_jhcaptcha { | ||
| settings { | ||
| reCaptcha { | ||
| version = {$plugin.tx_jhcaptcha.settings.reCaptcha.version} | ||
| v2 { | ||
| theme = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.theme} | ||
| lang = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.lang} | ||
| size = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.size} | ||
| siteKey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.siteKey} | ||
| secretKey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.secretKey} | ||
| } | ||
| v3 { | ||
| siteKey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v3.siteKey} | ||
| secretKey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v3.secretKey} | ||
| minimumScore = {$plugin.tx_jhcaptcha.settings.reCaptcha.v3.minimumScore} | ||
| action = {$plugin.tx_jhcaptcha.settings.reCaptcha.v3.action} | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| # EXT:formhandler | ||
| plugin.Tx_Formhandler.settings { | ||
| markers.jh_captcha_recaptcha = FLUIDTEMPLATE | ||
| markers.jh_captcha_recaptcha.file = EXT:jh_captcha/Resources/Private/Partials/Formhandler/ReCaptcha.html | ||
| } | ||
|
|
||
|
|
||
| # EXT:powermail | ||
| plugin.tx_powermail { | ||
| view.partialRootPaths.JhCaptcha = EXT:jh_captcha/Resources/Private/Powermail/Partials | ||
| settings.setup.spamshield { | ||
| _enable = 1 | ||
| methods.{$plugin.tx_jhcaptcha.settings.powermail.recaptchaId} { | ||
| _enable = 1 | ||
| name = reCAPTCHA (jh_captcha) | ||
| class = Haffner\JhCaptcha\Validation\Validator\Powermail | ||
| indication = {$plugin.tx_jhcaptcha.settings.powermail.recaptchaId} | ||
| configuration.secretkey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v3.secretKey} | ||
| } | ||
| } | ||
| } | ||
| [{$plugin.tx_jhcaptcha.settings.reCaptcha.version} == "2"] | ||
| plugin.tx_powermail.settings.setup.spamshield.methods.{$plugin.tx_jhcaptcha.settings.powermail.recaptchaId} { | ||
| configuration.secretkey = {$plugin.tx_jhcaptcha.settings.reCaptcha.v2.secretKey} | ||
| } | ||
| [global] | ||
|
|
||
|
|
||
| # EXT:form | ||
| plugin.tx_form { | ||
| settings.yamlConfigurations.JhCaptchaRecaptcha = EXT:jh_captcha/Configuration/Yaml/ReCaptcha/BaseSetup.yaml | ||
| view.partialRootPaths.JhCaptchaRecaptcha = EXT:jh_captcha/Resources/Private/Form/Frontend/Partials | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.