WP DSGVO Tools - Version 2.2.3

Version Description

  • Little improvements and fixes
Download this release

Release Info

Developer shapepress
Plugin Icon 128x128 WP DSGVO Tools
Version 2.2.3
Comparing to
See all releases

Code changes from version 2.2.2 to 2.2.3

Files changed (8) hide show
  1. README.txt +4 -1
  2. admin/tabs/cookie-notice/class-sp-dsgvo-cookie-notice-action.php +2 -1
  3. admin/tabs/cookie-notice/page.php +4 -4
  4. includes/class-sp-dsgvo-settings.php +1 -0
  5. includes/helpers.php +2 -0
  6. public/class-sp-dsgvo-public.php +1 -0
  7. public/js/sp-dsgvo-public.js +1 -1
  8. 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, privacy, woocommerce,
5
  Requires at least: 3.0.1
6
  Tested up to: 5.0.0
7
- Stable tag: 2.2.2
8
  Requires PHP: 5.6.0
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -80,6 +80,9 @@ Important: Disable other cookie notice plugins and Google Analytics or FB Pixel
80
 
81
  == Changelog ==
82
 
 
 
 
83
  = 2.2.2 =
84
  * Bugfix Comments Checkbox Backend
85
 
4
  Tags: gdpr, dsgvo, datenschutz, wordpress, compliance, data, privacy, woocommerce,
5
  Requires at least: 3.0.1
6
  Tested up to: 5.0.0
7
+ Stable tag: 2.2.3
8
  Requires PHP: 5.6.0
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
80
 
81
  == Changelog ==
82
 
83
+ = 2.2.3 =
84
+ * Little improvements and fixes
85
+
86
  = 2.2.2 =
87
  * Bugfix Comments Checkbox Backend
88
 
admin/tabs/cookie-notice/class-sp-dsgvo-cookie-notice-action.php CHANGED
@@ -20,7 +20,7 @@ Class SPDSGVOCookieNoticeAction extends SPDSGVOAjaxAction{
20
  SPDSGVOSettings::set('cn_cookie_validity', $this->get('cn_cookie_validity', '86400'));
21
 
22
  SPDSGVOSettings::set('cn_button_text_ok', $this->get('cn_button_text_ok', ''));
23
- SPDSGVOSettings::set('cn_reload_on_confirm', $this->get('cn_reload_on_confirm', '0'));
24
 
25
  SPDSGVOSettings::set('cn_activate_cancel_btn', $this->get('cn_activate_cancel_btn', '0'));
26
  SPDSGVOSettings::set('cn_button_text_cancel', $this->get('cn_button_text_cancel', ''));
@@ -74,6 +74,7 @@ Class SPDSGVOCookieNoticeAction extends SPDSGVOAjaxAction{
74
  SPDSGVOSettings::set('links_color_hover', $this->get('links_color_hover', '#4285f'));
75
  SPDSGVOSettings::set('accept_button_text_color', $this->get('accept_button_text_color', '#ffffff'));
76
  SPDSGVOSettings::set('accept_button_bg_color', $this->get('accept_button_bg_color', '#4285f'));
 
77
  /* i592995 */
78
  }
79
 
20
  SPDSGVOSettings::set('cn_cookie_validity', $this->get('cn_cookie_validity', '86400'));
21
 
22
  SPDSGVOSettings::set('cn_button_text_ok', $this->get('cn_button_text_ok', ''));
23
+ SPDSGVOSettings::set('cn_reload_on_confirm', $this->get('cn_reload_on_confirm', '0'));
24
 
25
  SPDSGVOSettings::set('cn_activate_cancel_btn', $this->get('cn_activate_cancel_btn', '0'));
26
  SPDSGVOSettings::set('cn_button_text_cancel', $this->get('cn_button_text_cancel', ''));
74
  SPDSGVOSettings::set('links_color_hover', $this->get('links_color_hover', '#4285f'));
75
  SPDSGVOSettings::set('accept_button_text_color', $this->get('accept_button_text_color', '#ffffff'));
76
  SPDSGVOSettings::set('accept_button_bg_color', $this->get('accept_button_bg_color', '#4285f'));
77
+ SPDSGVOSettings::set('cn_reload_on_confirm_popup', $this->get('cn_reload_on_confirm_popup', '0'));
78
  /* i592995 */
79
  }
80
 
admin/tabs/cookie-notice/page.php CHANGED
@@ -445,10 +445,10 @@
445
  <tr>
446
  <td><?php _e('Reload after confirm:','shapepress-dsgvo')?></td>
447
 
448
- <td><label for="cn_reload_on_confirm"> <input
449
- name="cn_reload_on_confirm" type="checkbox"
450
- id="cn_reload_on_confirm" value="1"
451
- <?= (SPDSGVOSettings::get('cn_reload_on_confirm') === '1')? ' checked ' : ''; ?>>
452
  </label><span class="info-text"><?php _e('Enable this option to reload the page after accepting cookies.','shapepress-dsgvo')?></span></td>
453
 
454
  </tr>
445
  <tr>
446
  <td><?php _e('Reload after confirm:','shapepress-dsgvo')?></td>
447
 
448
+ <td><label for="cn_reload_on_confirm_popup"> <input
449
+ name="cn_reload_on_confirm_popup" type="checkbox"
450
+ id="cn_reload_on_confirm_popup" value="1"
451
+ <?= (SPDSGVOSettings::get('cn_reload_on_confirm_popup') === '1')? ' checked ' : ''; ?>>
452
  </label><span class="info-text"><?php _e('Enable this option to reload the page after accepting cookies.','shapepress-dsgvo')?></span></td>
453
 
454
  </tr>
includes/class-sp-dsgvo-settings.php CHANGED
@@ -133,6 +133,7 @@ class SPDSGVOSettings{
133
  'cn_cookie_validity' => '86400',
134
  'cn_button_text_ok' => __('OK','shapepress-dsgvo'),
135
  'cn_reload_on_confirm' => '0',
 
136
  'cn_activate_cancel_btn' => '1',
137
  'cn_button_text_cancel' => __('Deny','shapepress-dsgvo'),
138
  'cn_decline_target_url' => '',
133
  'cn_cookie_validity' => '86400',
134
  'cn_button_text_ok' => __('OK','shapepress-dsgvo'),
135
  'cn_reload_on_confirm' => '0',
136
+ 'cn_reload_on_confirm_popup' => '0',
137
  'cn_activate_cancel_btn' => '1',
138
  'cn_button_text_cancel' => __('Deny','shapepress-dsgvo'),
139
  'cn_decline_target_url' => '',
includes/helpers.php CHANGED
@@ -253,6 +253,8 @@ if (! function_exists('spDsgvoGetLocale')) {
253
  $locale = get_locale();
254
  if (substr( $locale, 0, 5 ) === 'de_DE') $locale = 'de_DE';
255
  if (substr( $locale, 0, 2 ) !== 'de' && substr( $locale, 0, 2 ) !== 'en') $locale = "en_US";
 
 
256
  } catch (Exception $e) {
257
  return 'en_US';
258
  }
253
  $locale = get_locale();
254
  if (substr( $locale, 0, 5 ) === 'de_DE') $locale = 'de_DE';
255
  if (substr( $locale, 0, 2 ) !== 'de' && substr( $locale, 0, 2 ) !== 'en') $locale = "en_US";
256
+ if ($locale === "") $locale = "en_US";
257
+ return $locale;
258
  } catch (Exception $e) {
259
  return 'en_US';
260
  }
public/class-sp-dsgvo-public.php CHANGED
@@ -87,6 +87,7 @@ class SPDSGVOPublic
87
  'cookieDomain' => (defined('COOKIE_DOMAIN') ? COOKIE_DOMAIN : ''),
88
  'redirection' => SPDSGVOSettings::get('cn_reload_on_confirm'),
89
  'reloadOnConfirm' => SPDSGVOSettings::get('cn_reload_on_confirm'),
 
90
  'trackerInitMoment' => SPDSGVOSettings::get('cn_tracker_init'),
91
  'gaTagNumber' => SPDSGVOSettings::get('ga_tag_number'),
92
  'cache' => defined('WP_CACHE') && WP_CACHE,
87
  'cookieDomain' => (defined('COOKIE_DOMAIN') ? COOKIE_DOMAIN : ''),
88
  'redirection' => SPDSGVOSettings::get('cn_reload_on_confirm'),
89
  'reloadOnConfirm' => SPDSGVOSettings::get('cn_reload_on_confirm'),
90
+ 'reloadOnConfirmPopup' => SPDSGVOSettings::get('cn_reload_on_confirm_popup'),
91
  'trackerInitMoment' => SPDSGVOSettings::get('cn_tracker_init'),
92
  'gaTagNumber' => SPDSGVOSettings::get('ga_tag_number'),
93
  'cache' => defined('WP_CACHE') && WP_CACHE,
public/js/sp-dsgvo-public.js CHANGED
@@ -344,7 +344,7 @@ function getCookieValue(a) {
344
  window['ga-disable-'+cnArgs.gaTagNumber] = false;
345
 
346
  // reload after confirm to init tracker
347
- if (cnArgs.redirection === '1' ) {
348
  var url = window.location.protocol + '//',
349
  hostname = window.location.host + '/' + window.location.pathname;
350
 
344
  window['ga-disable-'+cnArgs.gaTagNumber] = false;
345
 
346
  // reload after confirm to init tracker
347
+ if (cnArgs.reloadOnConfirmPopup === '1' ) {
348
  var url = window.location.protocol + '//',
349
  hostname = window.location.host + '/' + window.location.pathname;
350
 
sp-dsgvo.php CHANGED
@@ -16,7 +16,7 @@
16
  * Plugin Name: WP DSGVO Tools (GDPR)
17
  * Plugin URI: https://wp-dsgvo.eu
18
  * Description: WP DSGVO Tools (GDPR) help you to fulfill the GDPR (DGSVO) compliance guidance (<a target="_blank" href="https://ico.org.uk/for-organisations/data-protection-reform/overview-of-the-gdpr/">GDPR</a>)
19
- * Version: 2.2.2
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.2.2');
32
  define('sp_dsgvo_NAME', 'sp-dsgvo');
33
  /* i592995 */
34
  define('sp_dsgvo_URL', plugin_dir_url( __FILE__ ));
16
  * Plugin Name: WP DSGVO Tools (GDPR)
17
  * Plugin URI: https://wp-dsgvo.eu
18
  * Description: WP DSGVO Tools (GDPR) help you to fulfill the GDPR (DGSVO) compliance guidance (<a target="_blank" href="https://ico.org.uk/for-organisations/data-protection-reform/overview-of-the-gdpr/">GDPR</a>)
19
+ * Version: 2.2.3
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.2.3');
32
  define('sp_dsgvo_NAME', 'sp-dsgvo');
33
  /* i592995 */
34
  define('sp_dsgvo_URL', plugin_dir_url( __FILE__ ));