Skip to content

[CLEANUP] link-endings #22

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

[CLEANUP] link-endings #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91031c2
[CLEANUP] link-endings
xerc Jan 7, 2022
4153108
[CLEANUP] templates
xerc Jan 7, 2022
2a33c22
[MOD] constant expressions
xerc Jan 14, 2022
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
2 changes: 1 addition & 1 deletion Classes/Controller/BackendController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ protected function initializeAction()
$pageId = (int)\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('id');
$frameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
$persistenceConfiguration = array('persistence' => array('storagePid' => $pageId));
$this->configurationManager->setConfiguration(array_merge($frameworkConfiguration, $persistenceConfiguration));
$this->configurationManager->setConfiguration(\array_merge($frameworkConfiguration, $persistenceConfiguration));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions Classes/Controller/ConsentController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ protected function renderAssetsForRequest($request)
*/
private function klaroConfigBuild(\TYPO3\CMS\Extbase\Persistence\Generic\QueryResult $services)
{
if (is_numeric($this->settings['klaro']['privacyPolicy'])) {
if (\is_numeric($this->settings['klaro']['privacyPolicy'])) {
$privacyPage = $this->uriBuilder
->reset()
->setTargetPageUid((int)$this->settings['klaro']['privacyPolicy'])
Expand All @@ -130,7 +130,7 @@ private function klaroConfigBuild(\TYPO3\CMS\Extbase\Persistence\Generic\QueryRe
$privacyPage = $this->settings['klaro']['privacyPolicy'];
}

if (is_numeric($this->settings['klaro']['poweredBy'])) {
if (\is_numeric($this->settings['klaro']['poweredBy'])) {
$poweredByPage = $this->uriBuilder
->reset()
->setTargetPageUid((int)$this->settings['klaro']['poweredBy'])
Expand Down
2 changes: 1 addition & 1 deletion Classes/ViewHelpers/Format/EscapeViewHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public static function renderStatic(array $arguments, \Closure $renderChildrenCl
{
$value = $renderChildrenClosure();

if (!is_string($value) && !(is_object($value) && method_exists($value, '__toString'))) {
if (!\is_string($value) && !(\is_object($value) && method_exists($value, '__toString'))) {
return $value;
}

Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
Cookie Consent Panel (Optin) with DSGVO/GDPR compliant use of cookies. Preconfigured modules for Google Analytics, Facebook and other frequently used services. Arbitrary expandability with tracking scripts that generate cookies on your website. Support of Google Tag Manager and easy export of Google Tag Manager. Third-party cookies and scripts are only loaded when active consent is given. Website visitors can edit their privacy settings at any time. Automatic update of cookie information when new cookies/scripts are inserted with secure consent procedure. Cookies can be automatically added to the privacy policy via a plugin. Multilingual and full support for desktop, tablet and mobile. Four standard modes for displaying the content solution. Based on [Klaro!](https://github.com/kiprotect/klaro).

## Links
Demo: [https://consent.websedit.de/](https://consent.websedit.de/)\
Demo: [https://consent.websedit.de](https://consent.websedit.de)\
Documentation: [https://consent.websedit.de/dokumentation](https://consent.websedit.de/dokumentation)\
TYPO3 Extension Repository: [https://extensions.typo3.org/extension/we_cookie_consent/](https://extensions.typo3.org/extension/we_cookie_consent/)\
Packagist: [https://packagist.org/packages/websedit/we-cookie-consent](https://packagist.org/packages/websedit/we-cookie-consent)\
TYPO3 Extension Repository: [https://extensions.typo3.org/extension/we_cookie_consent](https://extensions.typo3.org/extension/we_cookie_consent)\
Packagist: [https://packagist.org/packages/websedit/we-cookie-consent](https://packagist.org/packages/websedit/we-cookie-consent)

## Note on v2.0.0
Due to the update of the klaro library to version 0.7.x there have been some changes. Klaro has revised the generation of the HTML DOM and some CSS classes. We have implemented a fallback function that makes an update from the old 1.3 to the new 2.0 as smooth as possible. Please note that we cannot guarantee that everything will look exactly the same as before, especially with existing customisations to the output in CSS. Therefore, please check the output after an update.

## Support
If you need private or personal support, contact us via our contact form on [https://consent.websedit.de/](https://consent.websedit.de/).
If you need private or personal support, contact us via our contact form on [https://consent.websedit.de/](https://consent.websedit.de).
16 changes: 8 additions & 8 deletions Resources/Private/Backend/Templates/Backend/GtmWizard.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ <h1>Google Tag Manager Export Wizard</h1>
<thead>
<tr>
<th class="col-responsive nowrap">&nbsp;</th>
<th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_tag_title.label" /></th>
<th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_trigger_title.label" /></th>
<th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_trigger_name.label" /></th>
<th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_variable_title.label" /></th>
<th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_variable_name.label" /></th>
<th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_tag_title.label"/></th>
<th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_trigger_title.label"/></th>
<th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_trigger_name.label"/></th>
<th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_variable_title.label"/></th>
<th class="col-responsive nowrap"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:tx_wecookieconsent_domain_model_service.gtm_variable_name.label"/></th>
</tr>
</thead>
<tbody>
Expand All @@ -26,11 +26,11 @@ <h1>Google Tag Manager Export Wizard</h1>

<br/>
<h2>Download JSON File</h2>
<f:link.action action="jsonDownload" arguments="{blocks:'{tags:1, triggers:1, variables:1}'}" class="btn btn-success"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:download_json_all" /></f:link.action>
<f:link.action action="jsonDownload" arguments="{blocks:'{triggers:1, variables:1}'}" class="btn btn-success"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:download_json_triggerAndVariables" /></f:link.action>
<f:link.action action="jsonDownload" arguments="{blocks:'{tags:1, triggers:1, variables:1}'}" class="btn btn-success"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:download_json_all"/></f:link.action>
<f:link.action action="jsonDownload" arguments="{blocks:'{triggers:1, variables:1}'}" class="btn btn-success"><f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:download_json_triggerAndVariables"/></f:link.action>
</f:then>
<f:else>
<f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:no_google_tag_manager_services" />
<f:translate key="LLL:EXT:we_cookie_consent/Resources/Private/Language/locallang_mod1.xlf:no_google_tag_manager_services"/>
</f:else>
</f:if>
</f:section>
Expand Down
2 changes: 1 addition & 1 deletion Resources/Private/Partials/Service/facebook.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
<!-- End Facebook Pixel Code -->
</f:section>

<f:section name="Footer" />
<f:section name="Footer"/>
2 changes: 1 addition & 1 deletion Resources/Private/Partials/Service/google-analytics-universal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
<!-- End Google Analytics -->
</f:section>

<f:section name="Footer" />
<f:section name="Footer"/>
2 changes: 1 addition & 1 deletion Resources/Private/Partials/Service/google-analytics.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
</script>
</f:section>

<f:section name="Footer" />
<f:section name="Footer"/>
2 changes: 1 addition & 1 deletion Resources/Private/Partials/Service/google-tagmanager-service.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
</script>
</f:section>

<f:section name="Footer" />
<f:section name="Footer"/>
2 changes: 1 addition & 1 deletion Resources/Private/Partials/Service/google-tagmanager.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
</script>
</f:section>

<f:section name="Footer" />
<f:section name="Footer"/>
2 changes: 1 addition & 1 deletion Resources/Private/Partials/Service/matomo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
</script>
</f:section>

<f:section name="Footer" />
<f:section name="Footer"/>
6 changes: 3 additions & 3 deletions Resources/Private/Templates/Consent/List.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<caption>Cookies</caption>
<thead>
<tr>
<th scope="col"><f:translate key="list.table.title" /></th>
<th scope="col"><f:translate key="list.table.description" /></th>
<th scope="col"><f:translate key="list.table.maxAge" /></th>
<th scope="col"><f:translate key="list.table.title"/></th>
<th scope="col"><f:translate key="list.table.description"/></th>
<th scope="col"><f:translate key="list.table.maxAge"/></th>
</tr>
</thead>
<tbody>
Expand Down