Version Description
- Änderung des TCPDF PDF Creator String da manche Virenscanner diesen als bedrohlich einstuften und dies zu Fehler beim Laden führte
- Verbesserung des Cookie Popups
- Fehlerbehebung bei den Datenschutzeinstellungen der Benutzer in Kombination mit dem Cookie Popups
- Fehlerbehebung bei der Polylang Integration
Download this release
Release Info
Developer | shapepress |
Plugin | WP DSGVO Tools |
Version | 2.1.1 |
Comparing to | |
See all releases |
Code changes from version 2.1.0 to 2.1.1
- README.txt +7 -1
- admin/tabs/cookie-notice/page.php +35 -0
- admin/tabs/privacy-policy/page.php +1 -1
- includes/class-sp-dsgvo-settings-polylang.php +22 -0
- includes/helpers.php +5 -2
- includes/lib/tcpdf/include/tcpdf_static.php +1 -1
- public/actions/popup-accept.php +7 -0
- public/class-sp-dsgvo-public.php +64 -5
- public/js/sp-dsgvo-public.js +23 -1
- public/shortcodes/display-services.php +14 -1
- public/shortcodes/imprint.php +4 -1
- public/shortcodes/privacy-policy.php +4 -1
- public/shortcodes/subject-access-request/subject-access-request.php +9 -1
- public/shortcodes/super-unsubscribe/unsubscribe-form.php +7 -1
- sp-dsgvo.php +2 -2
README.txt
CHANGED
@@ -4,7 +4,7 @@ Donate link: https://wp-dsgvo.eu
|
|
4 |
Tags: gdpr, dsgvo, datenschutz, wordpress, compliance, data
|
5 |
Requires at least: 3.0.1
|
6 |
Tested up to: 4.9.8
|
7 |
-
Stable tag: 2.1.
|
8 |
Requires PHP: 5.6.0
|
9 |
License: GPLv2 or later
|
10 |
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
@@ -77,6 +77,12 @@ WICHTIG: Vor der Installation bitte alle bisher aktivierten Cookie Notice Plugin
|
|
77 |
|
78 |
== Changelog ==
|
79 |
|
|
|
|
|
|
|
|
|
|
|
|
|
80 |
= 2.1.0 =
|
81 |
* Bugfix Sprachdateien/Mehrsprachigkeit
|
82 |
* Geschwindigkeit des Cookie Poups verbessert
|
4 |
Tags: gdpr, dsgvo, datenschutz, wordpress, compliance, data
|
5 |
Requires at least: 3.0.1
|
6 |
Tested up to: 4.9.8
|
7 |
+
Stable tag: 2.1.1
|
8 |
Requires PHP: 5.6.0
|
9 |
License: GPLv2 or later
|
10 |
License URI: http://www.gnu.org/licenses/gpl-2.0.html
|
77 |
|
78 |
== Changelog ==
|
79 |
|
80 |
+
= 2.1.1 =
|
81 |
+
* Änderung des TCPDF PDF Creator String da manche Virenscanner diesen als bedrohlich einstuften und dies zu Fehler beim Laden führte
|
82 |
+
* Verbesserung des Cookie Popups
|
83 |
+
* Fehlerbehebung bei den Datenschutzeinstellungen der Benutzer in Kombination mit dem Cookie Popups
|
84 |
+
* Fehlerbehebung bei der Polylang Integration
|
85 |
+
|
86 |
= 2.1.0 =
|
87 |
* Bugfix Sprachdateien/Mehrsprachigkeit
|
88 |
* Geschwindigkeit des Cookie Poups verbessert
|
admin/tabs/cookie-notice/page.php
CHANGED
@@ -160,6 +160,30 @@
|
|
160 |
</table>
|
161 |
|
162 |
<table class="form-table policy-popup-settings" id="policy_popup_settings">
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
163 |
<tr>
|
164 |
<th scope="row"><?php _e('Popup logo','shapepress-dsgvo')?></th>
|
165 |
<td>
|
@@ -197,6 +221,17 @@
|
|
197 |
</td>
|
198 |
</tr>
|
199 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
200 |
<tr>
|
201 |
<th scope="row"><?php _e('Accept button custom text','shapepress-dsgvo')?></th>
|
202 |
<td>
|
160 |
</table>
|
161 |
|
162 |
<table class="form-table policy-popup-settings" id="policy_popup_settings">
|
163 |
+
|
164 |
+
<tr>
|
165 |
+
<th scope="row"><?php _e('Validity:','shapepress-dsgvo')?></th>
|
166 |
+
<td>
|
167 |
+
<?php $cnCookieValidity = SPDSGVOSettings::get('cn_cookie_validity'); ?>
|
168 |
+
<label for="cn_cookie_validity"> <select name="cn_cookie_validity"
|
169 |
+
id="cn_cookie_validity">
|
170 |
+
<option value="86400" <?= selected($cnCookieValidity == 86400) ?>>1
|
171 |
+
<?php _e('Tag','shapepress-dsgvo')?></option>
|
172 |
+
<option value="604800" <?= selected($cnCookieValidity == 604800) ?>>1
|
173 |
+
<?php _e('Woche','shapepress-dsgvo')?></option>
|
174 |
+
<option value="2592000"
|
175 |
+
<?= selected($cnCookieValidity == 2592000) ?>>1 <?php _e('Month','shapepress-dsgvo')?></option>
|
176 |
+
<option value="7862400"
|
177 |
+
<?= selected($cnCookieValidity == 7862400) ?>>2 <?php _e('Month','shapepress-dsgvo')?></option>
|
178 |
+
<option value="15811200"
|
179 |
+
<?= selected($cnCookieValidity == 15811200) ?>>6 <?php _e('Month','shapepress-dsgvo')?></option>
|
180 |
+
<option value="31536000"
|
181 |
+
<?= selected($cnCookieValidity == 31536000) ?>>1 <?php _e('Year','shapepress-dsgvo')?></option>
|
182 |
+
</select>
|
183 |
+
</label> <span class="info-text"><?php _e('For this period, the cookie is navigation use validly.','shapepress-dsgvo')?></span>
|
184 |
+
</td>
|
185 |
+
</tr>
|
186 |
+
|
187 |
<tr>
|
188 |
<th scope="row"><?php _e('Popup logo','shapepress-dsgvo')?></th>
|
189 |
<td>
|
221 |
</td>
|
222 |
</tr>
|
223 |
|
224 |
+
<tr>
|
225 |
+
<th scope="row"><?php _e('Reload after confirm:','shapepress-dsgvo')?></th>
|
226 |
+
|
227 |
+
<td><label for="cn_reload_on_confirm"> <input
|
228 |
+
name="cn_reload_on_confirm" type="checkbox"
|
229 |
+
id="cn_reload_on_confirm" value="1"
|
230 |
+
<?= (SPDSGVOSettings::get('cn_reload_on_confirm') === '1')? ' checked ' : ''; ?>>
|
231 |
+
</label><span class="info-text"><?php _e('Enable this option to reload the page after accepting cookies.','shapepress-dsgvo')?></span></td>
|
232 |
+
|
233 |
+
</tr>
|
234 |
+
|
235 |
<tr>
|
236 |
<th scope="row"><?php _e('Accept button custom text','shapepress-dsgvo')?></th>
|
237 |
<td>
|
admin/tabs/privacy-policy/page.php
CHANGED
@@ -24,7 +24,7 @@
|
|
24 |
</label>
|
25 |
|
26 |
<?php if($privacyPolicyPage == '0'): ?>
|
27 |
-
<p><?php _e('Create a page that uses the shortcode <code>[privacy_policy]</code>.','shapepress-dsgvo')?> <a class="button button-default" href="<?= SPDSGVOCreatePageAction::url(array('privacy_policy_page' => '1')) ?>"><?php _e('
|
28 |
<?php elseif(!pageContainsString($privacyPolicyPage, 'privacy_policy')): ?>
|
29 |
<p><?php _e('Attention: The shortcode <code>[privacy_policy]</code> was not found on the page you selected.','shapepress-dsgvo')?> <a href="<?= get_edit_post_link($privacyPolicyPage) ?>"><?php _e('Edit page','shapepress-dsgvo')?></a></p>
|
30 |
<?php else: ?>
|
24 |
</label>
|
25 |
|
26 |
<?php if($privacyPolicyPage == '0'): ?>
|
27 |
+
<p><?php _e('Create a page that uses the shortcode <code>[privacy_policy]</code>.','shapepress-dsgvo')?> <a class="button button-default" href="<?= SPDSGVOCreatePageAction::url(array('privacy_policy_page' => '1')) ?>"><?php _e('Create page','shapepress-dsgvo')?></a></p>
|
28 |
<?php elseif(!pageContainsString($privacyPolicyPage, 'privacy_policy')): ?>
|
29 |
<p><?php _e('Attention: The shortcode <code>[privacy_policy]</code> was not found on the page you selected.','shapepress-dsgvo')?> <a href="<?= get_edit_post_link($privacyPolicyPage) ?>"><?php _e('Edit page','shapepress-dsgvo')?></a></p>
|
30 |
<?php else: ?>
|
includes/class-sp-dsgvo-settings-polylang.php
CHANGED
@@ -22,22 +22,44 @@ class SPDSGVOSettingsPolylang {
|
|
22 |
|
23 |
public function __construct() {
|
24 |
if(function_exists('icl_register_string')) :
|
|
|
25 |
icl_register_string('shapepress-dsgvo', 'spdsgvo_comments_checkbox_info', SPDSGVOSettings::get('spdsgvo_comments_checkbox_info'));
|
|
|
26 |
icl_register_string('shapepress-dsgvo', 'spdsgvo_comments_checkbox_confirm', SPDSGVOSettings::get('spdsgvo_comments_checkbox_confirm'));
|
|
|
27 |
icl_register_string('shapepress-dsgvo', 'spdsgvo_comments_checkbox_text', SPDSGVOSettings::get('spdsgvo_comments_checkbox_text'));
|
|
|
28 |
icl_register_string('shapepress-dsgvo', 'sar_dsgvo_accepted_text', SPDSGVOSettings::get('sar_dsgvo_accepted_text'));
|
|
|
29 |
icl_register_string('shapepress-dsgvo', 'services_cookies_reason', SPDSGVOSettings::get('services')['cookies']['reason']);
|
|
|
30 |
icl_register_string('shapepress-dsgvo', 'services_google-analytics_reason', SPDSGVOSettings::get('services')['google-analytics']['reason']);
|
|
|
31 |
icl_register_string('shapepress-dsgvo', 'services_facebook-pixel_reason', SPDSGVOSettings::get('services')['facebook-pixel']['reason']);
|
|
|
32 |
icl_register_string('shapepress-dsgvo', 'su_dsgvo_accepted_text', SPDSGVOSettings::get('su_dsgvo_accepted_text'));
|
|
|
33 |
icl_register_string('shapepress-dsgvo', 'cookie_notice', SPDSGVOSettings::get('cookie_notice'));
|
|
|
34 |
icl_register_string('shapepress-dsgvo', 'cookie_notice_custom_text', SPDSGVOSettings::get('cookie_notice_custom_text'));
|
|
|
35 |
icl_register_string('shapepress-dsgvo', 'cn_button_text_ok', SPDSGVOSettings::get('cn_button_text_ok'));
|
|
|
36 |
icl_register_string('shapepress-dsgvo', 'cn_button_text_cancel', SPDSGVOSettings::get('cn_button_text_cancel'));
|
|
|
37 |
icl_register_string('shapepress-dsgvo', 'cn_button_text_more', SPDSGVOSettings::get('cn_button_text_more'));
|
|
|
38 |
icl_register_string('shapepress-dsgvo', 'terms_conditions', SPDSGVOSettings::get('terms_conditions'));
|
|
|
39 |
icl_register_string('shapepress-dsgvo', 'privacy_policy', SPDSGVOSettings::get('privacy_policy'));
|
|
|
40 |
icl_register_string('shapepress-dsgvo', 'imprint', SPDSGVOSettings::get('imprint'));
|
|
|
|
|
|
|
|
|
|
|
|
|
41 |
endif;
|
42 |
}
|
43 |
|
22 |
|
23 |
public function __construct() {
|
24 |
if(function_exists('icl_register_string')) :
|
25 |
+
//ok
|
26 |
icl_register_string('shapepress-dsgvo', 'spdsgvo_comments_checkbox_info', SPDSGVOSettings::get('spdsgvo_comments_checkbox_info'));
|
27 |
+
//ok
|
28 |
icl_register_string('shapepress-dsgvo', 'spdsgvo_comments_checkbox_confirm', SPDSGVOSettings::get('spdsgvo_comments_checkbox_confirm'));
|
29 |
+
//ok
|
30 |
icl_register_string('shapepress-dsgvo', 'spdsgvo_comments_checkbox_text', SPDSGVOSettings::get('spdsgvo_comments_checkbox_text'));
|
31 |
+
//ok
|
32 |
icl_register_string('shapepress-dsgvo', 'sar_dsgvo_accepted_text', SPDSGVOSettings::get('sar_dsgvo_accepted_text'));
|
33 |
+
//ok
|
34 |
icl_register_string('shapepress-dsgvo', 'services_cookies_reason', SPDSGVOSettings::get('services')['cookies']['reason']);
|
35 |
+
//ok
|
36 |
icl_register_string('shapepress-dsgvo', 'services_google-analytics_reason', SPDSGVOSettings::get('services')['google-analytics']['reason']);
|
37 |
+
//ok
|
38 |
icl_register_string('shapepress-dsgvo', 'services_facebook-pixel_reason', SPDSGVOSettings::get('services')['facebook-pixel']['reason']);
|
39 |
+
//ok
|
40 |
icl_register_string('shapepress-dsgvo', 'su_dsgvo_accepted_text', SPDSGVOSettings::get('su_dsgvo_accepted_text'));
|
41 |
+
//ok
|
42 |
icl_register_string('shapepress-dsgvo', 'cookie_notice', SPDSGVOSettings::get('cookie_notice'));
|
43 |
+
//ok
|
44 |
icl_register_string('shapepress-dsgvo', 'cookie_notice_custom_text', SPDSGVOSettings::get('cookie_notice_custom_text'));
|
45 |
+
//ok
|
46 |
icl_register_string('shapepress-dsgvo', 'cn_button_text_ok', SPDSGVOSettings::get('cn_button_text_ok'));
|
47 |
+
//ok
|
48 |
icl_register_string('shapepress-dsgvo', 'cn_button_text_cancel', SPDSGVOSettings::get('cn_button_text_cancel'));
|
49 |
+
//ok
|
50 |
icl_register_string('shapepress-dsgvo', 'cn_button_text_more', SPDSGVOSettings::get('cn_button_text_more'));
|
51 |
+
|
52 |
icl_register_string('shapepress-dsgvo', 'terms_conditions', SPDSGVOSettings::get('terms_conditions'));
|
53 |
+
//ok
|
54 |
icl_register_string('shapepress-dsgvo', 'privacy_policy', SPDSGVOSettings::get('privacy_policy'));
|
55 |
+
//ok
|
56 |
icl_register_string('shapepress-dsgvo', 'imprint', SPDSGVOSettings::get('imprint'));
|
57 |
+
//ok
|
58 |
+
icl_register_string('shapepress-dsgvo', 'accept_button_text', SPDSGVOSettings::get('accept_button_text'));
|
59 |
+
|
60 |
+
icl_register_string('shapepress-dsgvo', 'more_options_button_text', SPDSGVOSettings::get('more_options_button_text'));
|
61 |
+
icl_register_string('shapepress-dsgvo', 'close_button_url', SPDSGVOSettings::get('close_button_url'));
|
62 |
+
icl_register_string('shapepress-dsgvo', 'accordion_top', SPDSGVOSettings::get('accordion_top'));
|
63 |
endif;
|
64 |
}
|
65 |
|
includes/helpers.php
CHANGED
@@ -69,6 +69,9 @@ if(!function_exists('hasUserAcceptedPopup')) :
|
|
69 |
if($meta != '') {
|
70 |
$accept = true;
|
71 |
}
|
|
|
|
|
|
|
72 |
}
|
73 |
|
74 |
return $accept;
|
@@ -97,11 +100,11 @@ function checkCookies($perm) {
|
|
97 |
setPermissionsDefaults($perm);
|
98 |
}
|
99 |
|
100 |
-
if($perm['google-analytics'] != '0' && $perm['google-analytics'] != '1') {
|
101 |
setPermissionsDefaults($perm);
|
102 |
}
|
103 |
|
104 |
-
if($perm['facebook-pixel'] != '0' && $perm['facebook-pixel'] != '1') {
|
105 |
setPermissionsDefaults($perm);
|
106 |
}
|
107 |
}
|
69 |
if($meta != '') {
|
70 |
$accept = true;
|
71 |
}
|
72 |
+
} else
|
73 |
+
{
|
74 |
+
$accept = hasUserGivenPermissionFor('cookies') !== FALSE;
|
75 |
}
|
76 |
|
77 |
return $accept;
|
100 |
setPermissionsDefaults($perm);
|
101 |
}
|
102 |
|
103 |
+
if(!isset($perm['google-analytics']) || ($perm['google-analytics'] != '0' && $perm['google-analytics'] != '1')) {
|
104 |
setPermissionsDefaults($perm);
|
105 |
}
|
106 |
|
107 |
+
if(!isset($perm['facebook-pixel']) || ($perm['facebook-pixel'] != '0' && $perm['facebook-pixel'] != '1')) {
|
108 |
setPermissionsDefaults($perm);
|
109 |
}
|
110 |
}
|
includes/lib/tcpdf/include/tcpdf_static.php
CHANGED
@@ -125,7 +125,7 @@ class DSGVOTCPDF_STATIC {
|
|
125 |
* @public static
|
126 |
*/
|
127 |
public static function getTCPDFProducer() {
|
128 |
-
return "
|
129 |
}
|
130 |
|
131 |
/**
|
125 |
* @public static
|
126 |
*/
|
127 |
public static function getTCPDFProducer() {
|
128 |
+
return "TCPDF";
|
129 |
}
|
130 |
|
131 |
/**
|
public/actions/popup-accept.php
CHANGED
@@ -10,6 +10,13 @@ Class SPDSGVOUserPopupAccept extends SPDSGVOAjaxAction{
|
|
10 |
$meta = get_user_meta($user->ID, 'sp_dsgvo_popup', TRUE);
|
11 |
update_user_meta( $user->ID, 'sp_dsgvo_popup', '1' );
|
12 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
13 |
die;
|
14 |
}
|
15 |
}
|
10 |
$meta = get_user_meta($user->ID, 'sp_dsgvo_popup', TRUE);
|
11 |
update_user_meta( $user->ID, 'sp_dsgvo_popup', '1' );
|
12 |
}
|
13 |
+
else
|
14 |
+
{
|
15 |
+
// fallback: create cookie because in js sometimes it does not get created
|
16 |
+
//setcookie("sp_dsgvo_popup", "true",
|
17 |
+
// SPDSGVOSettings::get('cn_cookie_validity'),
|
18 |
+
// (defined('COOKIEPATH') ? COOKIEPATH : ''));
|
19 |
+
}
|
20 |
die;
|
21 |
}
|
22 |
}
|
public/class-sp-dsgvo-public.php
CHANGED
@@ -40,6 +40,11 @@ class SPDSGVOPublic
|
|
40 |
'name' => 'sp_dsgvo_cn_accepted',
|
41 |
'value' => 'TRUE'
|
42 |
);
|
|
|
|
|
|
|
|
|
|
|
43 |
|
44 |
/**
|
45 |
* Register the stylesheets for the public-facing side of the site.
|
@@ -65,6 +70,11 @@ class SPDSGVOPublic
|
|
65 |
'jquery'
|
66 |
), sp_dsgvo_VERSION, FALSE);
|
67 |
|
|
|
|
|
|
|
|
|
|
|
68 |
wp_localize_script(sp_dsgvo_NAME, 'cnArgs', array(
|
69 |
'ajaxurl' => admin_url('admin-ajax.php'),
|
70 |
'hideEffect' => SPDSGVOSettings::get('cn_animation'),
|
@@ -84,7 +94,7 @@ class SPDSGVOPublic
|
|
84 |
'declineNoCookie' => SPDSGVOSettings::get('cn_decline_no_cookie'),
|
85 |
'commentsCb'=> SPDSGVOSettings::get('sp_dsgvo_comments_checkbox'),
|
86 |
'cf7AccReplace' => SPDSGVOSettings::get('sp_dsgvo_cf7_acceptance_replace'),
|
87 |
-
'cf7AccText' =>
|
88 |
));
|
89 |
|
90 |
/* i592995 */
|
@@ -137,7 +147,11 @@ class SPDSGVOPublic
|
|
137 |
*/
|
138 |
public static function cookies_accepted()
|
139 |
{
|
140 |
-
|
|
|
|
|
|
|
|
|
141 |
}
|
142 |
|
143 |
public function cookieNotice()
|
@@ -170,20 +184,41 @@ class SPDSGVOPublic
|
|
170 |
style="font-size:<?= SPDSGVOSettings::get('cn_size_text') ?>;"
|
171 |
><?= spdsgvoUseWpml() ? __('We use cookies to give you the best user experience. If you continue to use this site, we assume that you agree.','shapepress-dsgvo') : convDeChars(SPDSGVOSettings::get('cookie_notice_custom_text')) ?></span>
|
172 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
173 |
<a href="#" id="cn-accept-cookie" data-cookie-set="accept"
|
174 |
class="cn-set-cookie button wp-default <?= SPDSGVOSettings::get('cn_custom_css_buttons') !== '' ? SPDSGVOSettings::get('cn_custom_css_buttons'):'' ?>"
|
175 |
style="background-color: <?= SPDSGVOSettings::get('cn_background_color_button') ?>;
|
176 |
color: <?= SPDSGVOSettings::get('cn_text_color_button') ?>;"
|
177 |
-
><?= spdsgvoUseWpml() ? __('Ok','shapepress-dsgvo') :
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
178 |
|
179 |
<?php if(SPDSGVOSettings::get('cn_activate_cancel_btn') != '0'): ?>
|
180 |
<a href="#" id="cn-refuse-cookie"
|
181 |
data-cookie-set="refuse" class="cn-set-cookie button wp-default <?= SPDSGVOSettings::get('cn_custom_css_buttons') !== '' ? SPDSGVOSettings::get('cn_custom_css_buttons'):'' ?>"
|
182 |
style="background-color: <?= SPDSGVOSettings::get('cn_background_color_button') ?>;
|
183 |
color: <?= SPDSGVOSettings::get('cn_text_color_button') ?>;"
|
184 |
-
><?= spdsgvoUseWpml() ? __('Decline','shapepress-dsgvo') :
|
185 |
<?php endif; ?>
|
186 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
187 |
<?php if(SPDSGVOSettings::get('cn_activate_more_btn') != '0'): ?>
|
188 |
<a
|
189 |
href="<?= get_permalink(SPDSGVOSettings::get('cn_read_more_page')) ?>"
|
@@ -192,7 +227,7 @@ class SPDSGVOPublic
|
|
192 |
class="cn-more-info button wp-default <?= SPDSGVOSettings::get('cn_custom_css_buttons') !== '' ? SPDSGVOSettings::get('cn_custom_css_buttons'):'' ?>"
|
193 |
style="background-color: <?= SPDSGVOSettings::get('cn_background_color_button') ?> !important;
|
194 |
color: <?= SPDSGVOSettings::get('cn_text_color_button') ?> !important;"
|
195 |
-
><?= spdsgvoUseWpml() ? __('Read more','shapepress-dsgvo') :
|
196 |
<?php endif; ?>
|
197 |
|
198 |
</div>
|
@@ -274,6 +309,9 @@ class SPDSGVOPublic
|
|
274 |
$url = '#';
|
275 |
$additional_class = 'close';
|
276 |
}
|
|
|
|
|
|
|
277 |
?>
|
278 |
|
279 |
<a href="<?php echo $url; ?>" id="dsgvo_popup_close" class="dsgvo-popup-close <?php echo $additional_class; ?>">
|
@@ -296,6 +334,9 @@ class SPDSGVOPublic
|
|
296 |
if($accordion_top == '') {
|
297 |
$accordion_top = __('More options', 'shapepress-dsgvo');
|
298 |
}
|
|
|
|
|
|
|
299 |
?>
|
300 |
<span><?php echo $accordion_top; ?></span>
|
301 |
<div class="toggle">
|
@@ -323,6 +364,9 @@ class SPDSGVOPublic
|
|
323 |
if($more_text == '') {
|
324 |
$more_text = __('More options', 'shapepress-dsgvo');
|
325 |
}
|
|
|
|
|
|
|
326 |
echo $more_text;
|
327 |
?>
|
328 |
</a>
|
@@ -332,6 +376,9 @@ class SPDSGVOPublic
|
|
332 |
if($accept_text == '') {
|
333 |
$accept_text = __('Accept', 'shapepress-dsgvo');
|
334 |
}
|
|
|
|
|
|
|
335 |
echo $accept_text;
|
336 |
?>
|
337 |
<svg class="dsgvo-accept-loader" width="30" height="30">
|
@@ -450,8 +497,17 @@ class SPDSGVOPublic
|
|
450 |
|
451 |
$validLicence = isValidBlogEdition() || isValidPremiumEdition();
|
452 |
$infoText = $validLicence ? SPDSGVOSettings::get('spdsgvo_comments_checkbox_info') : htmlentities(SPDSGVOSettings::getDefault('spdsgvo_comments_checkbox_info'), ENT_IGNORE, 'UTF-8');
|
|
|
|
|
|
|
453 |
$checkboxText = $validLicence ? SPDSGVOSettings::get('spdsgvo_comments_checkbox_text') : htmlentities(SPDSGVOSettings::getDefault('spdsgvo_comments_checkbox_text'), ENT_IGNORE, 'UTF-8');
|
|
|
|
|
|
|
454 |
$confirmText = $validLicence ? SPDSGVOSettings::get('spdsgvo_comments_checkbox_confirm') : htmlentities(SPDSGVOSettings::getDefault('spdsgvo_comments_checkbox_confirm'), ENT_IGNORE, 'UTF-8');
|
|
|
|
|
|
|
455 |
|
456 |
if (spdsgvoUseWpml())
|
457 |
{
|
@@ -484,6 +540,9 @@ class SPDSGVOPublic
|
|
484 |
public function dsgvoTextTagHandler( $tag ) {
|
485 |
|
486 |
$dsgvoText = $validLicence ? htmlentities(SPDSGVOSettings::get('spdsgvo_comments_checkbox_text'), ENT_IGNORE, 'UTF-8') : htmlentities(SPDSGVOSettings::getDefault('spdsgvo_comments_checkbox_text'), ENT_IGNORE, 'UTF-8');
|
|
|
|
|
|
|
487 |
return $dsgvoText;
|
488 |
}
|
489 |
|
40 |
'name' => 'sp_dsgvo_cn_accepted',
|
41 |
'value' => 'TRUE'
|
42 |
);
|
43 |
+
|
44 |
+
private static $cookiePopup = array(
|
45 |
+
'name' => 'sp_dsgvo_popup',
|
46 |
+
'value' => '1'
|
47 |
+
);
|
48 |
|
49 |
/**
|
50 |
* Register the stylesheets for the public-facing side of the site.
|
70 |
'jquery'
|
71 |
), sp_dsgvo_VERSION, FALSE);
|
72 |
|
73 |
+
$cf7AccText = SPDSGVOSettings::get('spdsgvo_comments_checkbox_text');
|
74 |
+
if(function_exists('icl_translate')) {
|
75 |
+
$cf7AccText = icl_translate('shapepress-dsgvo', 'spdsgvo_comments_checkbox_text', $cf7AccText);
|
76 |
+
}
|
77 |
+
|
78 |
wp_localize_script(sp_dsgvo_NAME, 'cnArgs', array(
|
79 |
'ajaxurl' => admin_url('admin-ajax.php'),
|
80 |
'hideEffect' => SPDSGVOSettings::get('cn_animation'),
|
94 |
'declineNoCookie' => SPDSGVOSettings::get('cn_decline_no_cookie'),
|
95 |
'commentsCb'=> SPDSGVOSettings::get('sp_dsgvo_comments_checkbox'),
|
96 |
'cf7AccReplace' => SPDSGVOSettings::get('sp_dsgvo_cf7_acceptance_replace'),
|
97 |
+
'cf7AccText' => $cf7AccText,
|
98 |
));
|
99 |
|
100 |
/* i592995 */
|
147 |
*/
|
148 |
public static function cookies_accepted()
|
149 |
{
|
150 |
+
|
151 |
+
$noticeAccepted = isset($_COOKIE[self::$cookie['name']]) && strtoupper($_COOKIE[self::$cookie['name']]) === self::$cookie['value'];
|
152 |
+
$popupAccepted = isset($_COOKIE[self::$cookiePopup['name']]) && strtoupper($_COOKIE[self::$cookiePopup['name']]) === self::$cookiePopup['value'];
|
153 |
+
|
154 |
+
return apply_filters('cn_is_cookie_accepted', $noticeAccepted || $popupAccepted);
|
155 |
}
|
156 |
|
157 |
public function cookieNotice()
|
184 |
style="font-size:<?= SPDSGVOSettings::get('cn_size_text') ?>;"
|
185 |
><?= spdsgvoUseWpml() ? __('We use cookies to give you the best user experience. If you continue to use this site, we assume that you agree.','shapepress-dsgvo') : convDeChars(SPDSGVOSettings::get('cookie_notice_custom_text')) ?></span>
|
186 |
|
187 |
+
<?php
|
188 |
+
$button_ok = SPDSGVOSettings::get('cn_button_text_ok');
|
189 |
+
if(function_exists('icl_translate')) {
|
190 |
+
$button_ok = icl_translate('shapepress-dsgvo', 'cn_button_text_ok', $button_ok);
|
191 |
+
}
|
192 |
+
?>
|
193 |
+
|
194 |
<a href="#" id="cn-accept-cookie" data-cookie-set="accept"
|
195 |
class="cn-set-cookie button wp-default <?= SPDSGVOSettings::get('cn_custom_css_buttons') !== '' ? SPDSGVOSettings::get('cn_custom_css_buttons'):'' ?>"
|
196 |
style="background-color: <?= SPDSGVOSettings::get('cn_background_color_button') ?>;
|
197 |
color: <?= SPDSGVOSettings::get('cn_text_color_button') ?>;"
|
198 |
+
><?= spdsgvoUseWpml() ? __('Ok','shapepress-dsgvo') : $button_ok; ?></a>
|
199 |
+
|
200 |
+
<?php
|
201 |
+
$button_cancel = SPDSGVOSettings::get('cn_button_text_cancel');
|
202 |
+
if(function_exists('icl_translate')) {
|
203 |
+
$button_cancel = icl_translate('shapepress-dsgvo', 'cn_button_text_cancel', $button_cancel);
|
204 |
+
}
|
205 |
+
?>
|
206 |
|
207 |
<?php if(SPDSGVOSettings::get('cn_activate_cancel_btn') != '0'): ?>
|
208 |
<a href="#" id="cn-refuse-cookie"
|
209 |
data-cookie-set="refuse" class="cn-set-cookie button wp-default <?= SPDSGVOSettings::get('cn_custom_css_buttons') !== '' ? SPDSGVOSettings::get('cn_custom_css_buttons'):'' ?>"
|
210 |
style="background-color: <?= SPDSGVOSettings::get('cn_background_color_button') ?>;
|
211 |
color: <?= SPDSGVOSettings::get('cn_text_color_button') ?>;"
|
212 |
+
><?= spdsgvoUseWpml() ? __('Decline','shapepress-dsgvo') : $button_cancel; ?></a>
|
213 |
<?php endif; ?>
|
214 |
|
215 |
+
<?php
|
216 |
+
$button_more = SPDSGVOSettings::get('cn_button_text_more');
|
217 |
+
if(function_exists('icl_translate')) {
|
218 |
+
$button_more = icl_translate('shapepress-dsgvo', 'cn_button_text_more', $button_more);
|
219 |
+
}
|
220 |
+
?>
|
221 |
+
|
222 |
<?php if(SPDSGVOSettings::get('cn_activate_more_btn') != '0'): ?>
|
223 |
<a
|
224 |
href="<?= get_permalink(SPDSGVOSettings::get('cn_read_more_page')) ?>"
|
227 |
class="cn-more-info button wp-default <?= SPDSGVOSettings::get('cn_custom_css_buttons') !== '' ? SPDSGVOSettings::get('cn_custom_css_buttons'):'' ?>"
|
228 |
style="background-color: <?= SPDSGVOSettings::get('cn_background_color_button') ?> !important;
|
229 |
color: <?= SPDSGVOSettings::get('cn_text_color_button') ?> !important;"
|
230 |
+
><?= spdsgvoUseWpml() ? __('Read more','shapepress-dsgvo') : $button_more; ?></a>
|
231 |
<?php endif; ?>
|
232 |
|
233 |
</div>
|
309 |
$url = '#';
|
310 |
$additional_class = 'close';
|
311 |
}
|
312 |
+
if(function_exists('icl_translate')) {
|
313 |
+
$url = icl_translate('shapepress-dsgvo', 'close_button_url', $url);
|
314 |
+
}
|
315 |
?>
|
316 |
|
317 |
<a href="<?php echo $url; ?>" id="dsgvo_popup_close" class="dsgvo-popup-close <?php echo $additional_class; ?>">
|
334 |
if($accordion_top == '') {
|
335 |
$accordion_top = __('More options', 'shapepress-dsgvo');
|
336 |
}
|
337 |
+
if(function_exists('icl_translate')) {
|
338 |
+
$accordion_top = icl_translate('shapepress-dsgvo', 'accordion_top', $accordion_top);
|
339 |
+
}
|
340 |
?>
|
341 |
<span><?php echo $accordion_top; ?></span>
|
342 |
<div class="toggle">
|
364 |
if($more_text == '') {
|
365 |
$more_text = __('More options', 'shapepress-dsgvo');
|
366 |
}
|
367 |
+
if(function_exists('icl_translate')) {
|
368 |
+
$more_text = icl_translate('shapepress-dsgvo', 'more_options_button_text', $more_text);
|
369 |
+
}
|
370 |
echo $more_text;
|
371 |
?>
|
372 |
</a>
|
376 |
if($accept_text == '') {
|
377 |
$accept_text = __('Accept', 'shapepress-dsgvo');
|
378 |
}
|
379 |
+
if(function_exists('icl_translate')) {
|
380 |
+
$accept_text = icl_translate('shapepress-dsgvo', 'accept_button_text', $accept_text);
|
381 |
+
}
|
382 |
echo $accept_text;
|
383 |
?>
|
384 |
<svg class="dsgvo-accept-loader" width="30" height="30">
|
497 |
|
498 |
$validLicence = isValidBlogEdition() || isValidPremiumEdition();
|
499 |
$infoText = $validLicence ? SPDSGVOSettings::get('spdsgvo_comments_checkbox_info') : htmlentities(SPDSGVOSettings::getDefault('spdsgvo_comments_checkbox_info'), ENT_IGNORE, 'UTF-8');
|
500 |
+
if(function_exists('icl_translate')) {
|
501 |
+
$infoText = icl_translate('shapepress-dsgvo', 'spdsgvo_comments_checkbox_info', $infoText);
|
502 |
+
}
|
503 |
$checkboxText = $validLicence ? SPDSGVOSettings::get('spdsgvo_comments_checkbox_text') : htmlentities(SPDSGVOSettings::getDefault('spdsgvo_comments_checkbox_text'), ENT_IGNORE, 'UTF-8');
|
504 |
+
if(function_exists('icl_translate')) {
|
505 |
+
$checkboxText = icl_translate('shapepress-dsgvo', 'spdsgvo_comments_checkbox_text', $checkboxText);
|
506 |
+
}
|
507 |
$confirmText = $validLicence ? SPDSGVOSettings::get('spdsgvo_comments_checkbox_confirm') : htmlentities(SPDSGVOSettings::getDefault('spdsgvo_comments_checkbox_confirm'), ENT_IGNORE, 'UTF-8');
|
508 |
+
if(function_exists('icl_translate')) {
|
509 |
+
$confirmText = icl_translate('shapepress-dsgvo', 'spdsgvo_comments_checkbox_confirm', $confirmText);
|
510 |
+
}
|
511 |
|
512 |
if (spdsgvoUseWpml())
|
513 |
{
|
540 |
public function dsgvoTextTagHandler( $tag ) {
|
541 |
|
542 |
$dsgvoText = $validLicence ? htmlentities(SPDSGVOSettings::get('spdsgvo_comments_checkbox_text'), ENT_IGNORE, 'UTF-8') : htmlentities(SPDSGVOSettings::getDefault('spdsgvo_comments_checkbox_text'), ENT_IGNORE, 'UTF-8');
|
543 |
+
if(function_exists('icl_translate')) {
|
544 |
+
$dsgvoText = icl_translate('shapepress-dsgvo', 'spdsgvo_comments_checkbox_text', $dsgvoText);
|
545 |
+
}
|
546 |
return $dsgvoText;
|
547 |
}
|
548 |
|
public/js/sp-dsgvo-public.js
CHANGED
@@ -314,10 +314,32 @@ function getCookieValue(a) {
|
|
314 |
} );
|
315 |
} );
|
316 |
var d = new Date();
|
317 |
-
d.setTime(d.getTime() + (
|
318 |
var expires = "expires="+ d.toUTCString();
|
319 |
document.cookie = "sp_dsgvo_popup=1;" + expires + ";path=/";
|
320 |
$('.dsgvo-popup-overlay').remove();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
321 |
});
|
322 |
|
323 |
}
|
314 |
} );
|
315 |
} );
|
316 |
var d = new Date();
|
317 |
+
d.setTime(d.getTime() + parseInt( cnArgs.cookieTime ) * 1000);
|
318 |
var expires = "expires="+ d.toUTCString();
|
319 |
document.cookie = "sp_dsgvo_popup=1;" + expires + ";path=/";
|
320 |
$('.dsgvo-popup-overlay').remove();
|
321 |
+
|
322 |
+
// set the correct state of the ga opt-out tracker
|
323 |
+
window['ga-disable-'+cnArgs.gaTagNumber] = false;
|
324 |
+
|
325 |
+
// reload after confirm to init tracker
|
326 |
+
if (cnArgs.redirection === '1' ) {
|
327 |
+
var url = window.location.protocol + '//',
|
328 |
+
hostname = window.location.host + '/' + window.location.pathname;
|
329 |
+
|
330 |
+
if ( cnArgs.cache === '1' ) {
|
331 |
+
url = url + hostname.replace( '//', '/' ) + ( window.location.search === '' ? '?' : window.location.search + '&' ) + 'cn-reloaded=1' + window.location.hash;
|
332 |
+
|
333 |
+
window.location.href = url;
|
334 |
+
} else {
|
335 |
+
url = url + hostname.replace( '//', '/' ) + window.location.search + window.location.hash;
|
336 |
+
|
337 |
+
window.location.reload( true );
|
338 |
+
}
|
339 |
+
|
340 |
+
return;
|
341 |
+
}
|
342 |
+
|
343 |
});
|
344 |
|
345 |
}
|
public/shortcodes/display-services.php
CHANGED
@@ -7,7 +7,20 @@ function SPDSGVODisplayServicesShortcode(){
|
|
7 |
<?php foreach(SPDSGVOSettings::get('services') as $slug => $service): ?>
|
8 |
<li>
|
9 |
<strong><?= $service['name'] ?>: </strong>
|
10 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
11 |
|
12 |
<?php if($service['link']): ?>
|
13 |
<a href="<?= $service['link'] ?>"><?php _e('Open Terms of service','shapepress-dsgvo')?></a>
|
7 |
<?php foreach(SPDSGVOSettings::get('services') as $slug => $service): ?>
|
8 |
<li>
|
9 |
<strong><?= $service['name'] ?>: </strong>
|
10 |
+
|
11 |
+
<?php
|
12 |
+
$reason = $service['reason'];
|
13 |
+
if(function_exists('icl_translate')) {
|
14 |
+
if($slug == 'cookies') {
|
15 |
+
$reason = icl_translate('shapepress-dsgvo', 'services_cookies_reason', $reason);
|
16 |
+
} else if($slug == 'google-analytics') {
|
17 |
+
$reason = icl_translate('shapepress-dsgvo', 'services_google-analytics_reason', $reason);
|
18 |
+
} else if($slug == 'facebook-pixel') {
|
19 |
+
$reason = icl_translate('shapepress-dsgvo', 'services_facebook-pixel_reason', $reason);
|
20 |
+
}
|
21 |
+
}
|
22 |
+
echo $reason;
|
23 |
+
?>
|
24 |
|
25 |
<?php if($service['link']): ?>
|
26 |
<a href="<?= $service['link'] ?>"><?php _e('Open Terms of service','shapepress-dsgvo')?></a>
|
public/shortcodes/imprint.php
CHANGED
@@ -4,7 +4,10 @@ function SPDSGVOImprintShortcode(){
|
|
4 |
|
5 |
|
6 |
$imprint = SPDSGVOSettings::get('imprint');
|
7 |
-
|
|
|
|
|
|
|
8 |
if (spdsgvoUseWpml())
|
9 |
{
|
10 |
$imprint = file_get_contents(SPDSGVO::pluginDir('/templates/'.get_locale().'/imprint.txt'));
|
4 |
|
5 |
|
6 |
$imprint = SPDSGVOSettings::get('imprint');
|
7 |
+
if(function_exists('icl_translate')) {
|
8 |
+
$imprint = icl_translate('shapepress-dsgvo', 'imprint', $imprint);
|
9 |
+
}
|
10 |
+
|
11 |
if (spdsgvoUseWpml())
|
12 |
{
|
13 |
$imprint = file_get_contents(SPDSGVO::pluginDir('/templates/'.get_locale().'/imprint.txt'));
|
public/shortcodes/privacy-policy.php
CHANGED
@@ -11,7 +11,10 @@
|
|
11 |
function SPDSGVOPrivacyPolicyShortcode(){
|
12 |
|
13 |
$privacyPolicy = SPDSGVOSettings::get('privacy_policy');
|
14 |
-
|
|
|
|
|
|
|
15 |
if (spdsgvoUseWpml())
|
16 |
{
|
17 |
$privacyPolicy = file_get_contents(SPDSGVO::pluginDir('/templates/'.get_locale().'/privacy-policy.txt'));
|
11 |
function SPDSGVOPrivacyPolicyShortcode(){
|
12 |
|
13 |
$privacyPolicy = SPDSGVOSettings::get('privacy_policy');
|
14 |
+
if(function_exists('icl_translate')) {
|
15 |
+
$privacyPolicy = icl_translate('shapepress-dsgvo', 'privacy_policy', $privacyPolicy);
|
16 |
+
}
|
17 |
+
|
18 |
if (spdsgvoUseWpml())
|
19 |
{
|
20 |
$privacyPolicy = file_get_contents(SPDSGVO::pluginDir('/templates/'.get_locale().'/privacy-policy.txt'));
|
public/shortcodes/subject-access-request/subject-access-request.php
CHANGED
@@ -43,7 +43,15 @@ function SPDSGVODownloadMyDataShortcode($atts){
|
|
43 |
<div class="column">
|
44 |
<label for="dsgvo-checkbox">
|
45 |
<input required type="checkbox" id="dsgvo-checkbox" name="dsgvo_checkbox" value="1" />
|
46 |
-
<span style="font-weight:normal"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
47 |
</label>
|
48 |
</div>
|
49 |
</div>
|
43 |
<div class="column">
|
44 |
<label for="dsgvo-checkbox">
|
45 |
<input required type="checkbox" id="dsgvo-checkbox" name="dsgvo_checkbox" value="1" />
|
46 |
+
<span style="font-weight:normal">
|
47 |
+
<?php
|
48 |
+
$accepted_text = convDeChars(SPDSGVOSettings::get('sar_dsgvo_accepted_text'));
|
49 |
+
if(function_exists('icl_translate')) {
|
50 |
+
$accepted_text = icl_translate('shapepress-dsgvo', 'sar_dsgvo_accepted_text', $accepted_text);
|
51 |
+
}
|
52 |
+
?>
|
53 |
+
<?= spdsgvoUseWpml() ? __('I agree to the storage of the data for processing within the meaning of the GDPR.','shapepress-dsgvo') : $accepted_text; ?>
|
54 |
+
</span>
|
55 |
</label>
|
56 |
</div>
|
57 |
</div>
|
public/shortcodes/super-unsubscribe/unsubscribe-form.php
CHANGED
@@ -47,7 +47,13 @@ function SPDSGVOUnsubscribeShortcode($atts){
|
|
47 |
<div class="column">
|
48 |
<label for="dsgvo-checkbox">
|
49 |
<input required type="checkbox" id="dsgvo-checkbox" name="dsgvo_checkbox" value="1" />
|
50 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
51 |
</label>
|
52 |
</div>
|
53 |
</div>
|
47 |
<div class="column">
|
48 |
<label for="dsgvo-checkbox">
|
49 |
<input required type="checkbox" id="dsgvo-checkbox" name="dsgvo_checkbox" value="1" />
|
50 |
+
<?php
|
51 |
+
$accept_text = convDeChars(SPDSGVOSettings::get('su_dsgvo_accepted_text'));
|
52 |
+
if(function_exists('icl_translate')) {
|
53 |
+
$accept_text = icl_translate('shapepress-dsgvo', 'su_dsgvo_accepted_text', $accept_text);
|
54 |
+
}
|
55 |
+
?>
|
56 |
+
<span style="font-weight:normal"><?= spdsgvoUseWpml() ? __('I agree to the storage of the data for processing within the meaning of the GDPR.','shapepress-dsgvo') : $accept_text; ?></span>
|
57 |
</label>
|
58 |
</div>
|
59 |
</div>
|
sp-dsgvo.php
CHANGED
@@ -16,7 +16,7 @@
|
|
16 |
* Plugin Name: WP DSGVO Tools
|
17 |
* Plugin URI: https://wp-dsgvo.eu
|
18 |
* Description: WP DSGVO Tools helfen beim Erfüllen der Richtlinien der Datenschutzgrundverordnung (<a target="_blank" href="https://ico.org.uk/for-organisations/data-protection-reform/overview-of-the-gdpr/">DSGVO</a>), spezialisiert auf Österreich und Deutschland.
|
19 |
-
* Version: 2.1.
|
20 |
* Author: Shapepress eU
|
21 |
* Author URI: https://www.shapepress.com
|
22 |
* License URI: http://www.gnu.org/licenses/gpl-2.0.txt
|
@@ -28,7 +28,7 @@ if (! defined('WPINC')) {
|
|
28 |
die();
|
29 |
}
|
30 |
|
31 |
-
define('sp_dsgvo_VERSION', '2.1.
|
32 |
define('sp_dsgvo_NAME', 'sp-dsgvo');
|
33 |
/* i592995 */
|
34 |
define('sp_dsgvo_URL', plugin_dir_url( __FILE__ ));
|
16 |
* Plugin Name: WP DSGVO Tools
|
17 |
* Plugin URI: https://wp-dsgvo.eu
|
18 |
* Description: WP DSGVO Tools helfen beim Erfüllen der Richtlinien der Datenschutzgrundverordnung (<a target="_blank" href="https://ico.org.uk/for-organisations/data-protection-reform/overview-of-the-gdpr/">DSGVO</a>), spezialisiert auf Österreich und Deutschland.
|
19 |
+
* Version: 2.1.1
|
20 |
* Author: Shapepress eU
|
21 |
* Author URI: https://www.shapepress.com
|
22 |
* License URI: http://www.gnu.org/licenses/gpl-2.0.txt
|
28 |
die();
|
29 |
}
|
30 |
|
31 |
+
define('sp_dsgvo_VERSION', '2.1.1');
|
32 |
define('sp_dsgvo_NAME', 'sp-dsgvo');
|
33 |
/* i592995 */
|
34 |
define('sp_dsgvo_URL', plugin_dir_url( __FILE__ ));
|