Skip to content

fix reCaptcha not working when id is over 1000 and improve performance and script execution being blocked by manual script tags #21

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.

Sign up for GitHub

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
askabaria wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix reCaptcha not working when id is over 1000 and improve performance and script execution being blocked by manual script tags #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85841b1
fixed reCaptcha not working when id is over 1000 and improved perform…
Jul 24, 2017
23b1db6
fix other scripts being included after this script not getting executed
Jul 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 77 additions & 80 deletions Classes/ViewHelpers/ReCaptchaViewHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,95 +28,92 @@
* @package RH\RhRecaptcha\ViewHelpers
* @author Richard Haeser <richardhaeser@gmail.com>
*/
class ReCaptchaViewHelper extends AbstractViewHelper implements SingletonInterface
{
/**
* @var bool
*/
protected $initialized = false;
class ReCaptchaViewHelper extends AbstractViewHelper implements SingletonInterface {
/**
* @var bool
*/
protected $initialized = FALSE;

/**
* @var bool
*/
protected $escapeOutput = false;
/**
* @var bool
*/
protected $escapeOutput = FALSE;

/**
* @var ConfigurationManagerInterface
*/
protected $configurationManager;
/**
* @var ConfigurationManagerInterface
*/
protected $configurationManager;

/**
* @param ConfigurationManagerInterface $configurationManager
* @return void
*/
public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager)
{
$this->configurationManager = $configurationManager;
}
/**
* @param ConfigurationManagerInterface $configurationManager
* @return void
*/
public function injectConfigurationManager(ConfigurationManagerInterface $configurationManager) {
$this->configurationManager = $configurationManager;
}

/**
* Returns an instance of the page renderer
*
* @return PageRenderer
*/
public function getPageRenderer()
{
if (TYPO3_MODE === 'BE') {
$pageRenderer = $this->getDocInstance()->getPageRenderer();
} else {
$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
}
/**
* Returns an instance of the page renderer
*
* @return PageRenderer
*/
public function getPageRenderer() {
if (TYPO3_MODE === 'BE') {
$pageRenderer = $this->getDocInstance()->getPageRenderer();
} else {
$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
}

return $pageRenderer;
}
return $pageRenderer;
}

/**
* @return string
* @throws InvalidVariableException
*/
public function render()
{
$fullTs = $this->configurationManager->getConfiguration(
ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT
);
$reCaptchaSettings = $fullTs['plugin.']['tx_powermail.']['settings.']['setup.']['reCAPTCHA.'];
/**
* @return string
* @throws InvalidVariableException
*/
public function render() {
$fullTs = $this->configurationManager->getConfiguration(
ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT
);
$reCaptchaSettings = $fullTs['plugin.']['tx_powermail.']['settings.']['setup.']['reCAPTCHA.'];

if (isset($reCaptchaSettings) &&
is_array($reCaptchaSettings) &&
isset($reCaptchaSettings['siteKey']) &&
$reCaptchaSettings['siteKey']
) {
$this->templateVariableContainer->add('siteKey', $reCaptchaSettings['siteKey']);
$content = $this->renderChildren();
$this->templateVariableContainer->remove('siteKey');
} else {
throw new InvalidVariableException('No siteKey provided in TypoScript constants', 1358349150);
}
if (
isset($reCaptchaSettings) &&
is_array($reCaptchaSettings) &&
isset($reCaptchaSettings['siteKey']) &&
$reCaptchaSettings['siteKey']
) {
$this->templateVariableContainer->add('siteKey', $reCaptchaSettings['siteKey']);
$content = $this->renderChildren();
$this->templateVariableContainer->remove('siteKey');
} else {
throw new InvalidVariableException('No siteKey provided in TypoScript constants', 1358349150);
}

if (!$this->initialized) {
$key = $reCaptchaSettings['siteKey'];
$this->initialized = true;
$pageRenderer = $this->getPageRenderer();
$pageRenderer->addJsFooterInlineCode(
'recaptcha',
'
if (!$this->initialized) {
$key = $reCaptchaSettings['siteKey'];
$this->initialized = TRUE;
$pageRenderer = $this->getPageRenderer();
$pageRenderer->addJsFooterInlineCode(
'recaptcha', '
var recaptchaCallback = function() {
for (var i = 1; i <= 1000; ++i) {
if (document.getElementById(\'g-recaptcha-\' + i)) {
grecaptcha.render(\'g-recaptcha-\' + i, {\'sitekey\' : \'' . $key . '\'});
}
var recaptchas = document.getElementsByClassName("g-recaptcha");
for(var i = 0; i < recaptchas.length; i++)
{
grecaptcha.render(recaptchas.item(i), {"sitekey": "' . $reCaptchaSettings['siteKey'] . '"});
}
};
/*]]>*/
</script>
<script src="https://www.google.com/recaptcha/api.js?hl=' . $reCaptchaSettings['lang'] . '&onload=recaptchaCallback&render=explicit"
async defer data-ignore="1">/*<![CDATA[*/
',
false,
true
);
}
', FALSE, TRUE
);

return $content;
}
}

$pageRenderer->addJsFooterFile(
'https://www.google.com/recaptcha/api.js?hl=' . $reCaptchaSettings['lang'] . '&onload=recaptchaCallback&render=explicit',
'text/javascript', FALSE, FALSE, '', TRUE,null,TRUE,null
);
}

return $content;
}

}