Changeset 2665977 for shapepress-dsgvo

Timestamp:

01/26/2022 02:39:33 PM (4 years ago)

Author:

legalweb

Message:

3.1.29

Location:

shapepress-dsgvo/trunk

Files:

• README.txt (modified) (2 diffs)
• admin/class-sp-dsgvo-admin.php (modified) (5 diffs)
• admin/tabs/v3/common-settings/class-sp-dsgvo-common-settings-validate-license-action.php (modified) (1 diff)
• admin/tabs/v3/popup-notice/page.php (modified) (1 diff)
• includes/cron/do-check-privacy-policy-texts.php (modified) (1 diff)
• includes/cron/do-validate-license.php (modified) (2 diffs)
• includes/integrations/embeddings/facebook-feed/class-sp-dsgvo-facebook-feed-api.php (modified) (1 diff)
• includes/integrations/embeddings/instagram/class-sp-dsgvo-instagram-api.php (modified) (1 diff)
• includes/integrations/targeting/fbpixel/class-sp-dsgvo-fb-pixel-api.php (modified) (1 diff)
• public/class-sp-dsgvo-public.php (modified) (2 diffs)
• public/js/sp-dsgvo-public.js (modified) (1 diff)
• public/js/sp-dsgvo-public.min.js (added)
• public/shortcodes/privacy-policy.php (modified) (1 diff)
• sp-dsgvo.php (modified) (2 diffs)
• wpml-config.xml (modified) (1 diff)

shapepress-dsgvo/trunk/README.txt

@@ -4 +4 @@
 Tags: gdpr, dsgvo, datenschutz, privacy, privacy policy, imprint, impressum, wordpress, compliance, privacy, woocommerce, law
 Requires at least: 3.0.1
-Tested up to: 5.8.1
-Stable tag: 3.1.28
+Tested up to: 5.9.0
+Stable tag: 3.1.29
 Requires PHP: 5.6.0
 License: GPLv2 or later
@@ -202 +202 @@
 12. Settings for page operator which are used for privacy policy and imprint
 
+== Changelog ==
+= 3.1.29 =
+* changed company names of Facebook
+* added imprint url and privacy policy url to wpml-config.xml to support translationing of these urls
+* added secure cookie option on https
 
 == Changelog ==
 = 3.1.28 =
-* fixed wrong method called
+* fixed cookie notice preview images
 
 = 3.1.27 =

shapepress-dsgvo/trunk/admin/class-sp-dsgvo-admin.php

@@ -278 +278 @@
             printf( '<div class="%1$s"><p>%2$s</p></div>', esc_attr( $class ), $message );
         }
-
+/*
         if (SPDSGVOSettings::get('show_notice_update_check_settings') === '1')
         {
@@ -286 +286 @@
             printf( '<div class="%1$s"><p>%2$s</p></div>', esc_attr( $class ), $message );
         }
-
+*/
+/*
         if (SPDSGVOSettings::get('show_notice_update_310') === '1')
         {
@@ -294 +295 @@
             printf( '<div class="%1$s"><h4>WP DSGVO Tools (GDPR)</h4><p>%2$s</p></div>', esc_attr( $class ), $message );
         }
-
+*/
         if (SPDSGVOSettings::get('show_notice_webinars') === '1')
         {
@@ -303 +304 @@
             printf( '<div class="%1$s"><h4>WP DSGVO Tools (GDPR)</h4><p>%2$s</p></div>', esc_attr( $class ), $message );
         }
-
+/*
         if (SPDSGVOSettings::get('show_notice_securityleak0921') === '1')
         {
@@ -311 +312 @@
             printf( '<div class="%1$s"><h4>WP DSGVO Tools (GDPR)</h4><p>%2$s</p></div>', esc_attr( $class ), $message );
         }
+*/
     }
 /*

shapepress-dsgvo/trunk/admin/tabs/v3/common-settings/class-sp-dsgvo-common-settings-validate-license-action.php

@@ -36 +36 @@
                 error_log('body: '.$body);
 
-                if ($body !== false)
+                if ($body != false && (strpos($body, 'INVALID_LICENCE_REQUEST') === false))
                 {
                     SPDSGVOSettings::set('licence_details_fetched', '1');

shapepress-dsgvo/trunk/admin/tabs/v3/popup-notice/page.php

@@ -218 +218 @@
 
                     <div class="form-group">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie1.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie1.png')) ?>"
                              class="cookie-style-admin-show--01">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie2.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie2.png')) ?>"
                              class="cookie-style-admin-show--02">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie3.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie3.png')) ?>"
                              class="cookie-style-admin-show--03">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie4.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie4.png')) ?>"
                              class="cookie-style-admin-show--04">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie5.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie5.png')) ?>"
                              class="cookie-style-admin-show--05">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie6.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie6.png')) ?>"
                              class="cookie-style-admin-show--06">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie7.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie7.png')) ?>"
                              class="cookie-style-admin-show--07">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie8.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie8.png')) ?>"
                              class="cookie-style-admin-show--08">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie9.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie9.png')) ?>"
                              class="cookie-style-admin-show--09">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie10.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie10.png')) ?>"
                              class="cookie-style-admin-show--10">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie11.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie11.png')) ?>"
                              class="cookie-style-admin-show--11">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie12.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie12.png')) ?>"
                              class="cookie-style-admin-show--12">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie13.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie13.png')) ?>"
                              class="cookie-style-admin-show--13">
-                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin\images\cookies\Cookie14.png')) ?>"
+                        <img src="<?php echo esc_url(SPDSGVO::pluginURI('admin/images/cookies/Cookie14.png')) ?>"
                              class="cookie-style-admin-show--14">
                     </div>

shapepress-dsgvo/trunk/includes/cron/do-check-privacy-policy-texts.php

@@ -5 +5 @@
 
     public $interval = array(
-        'days' => 1,
+        'days' => 2,
     );
 

shapepress-dsgvo/trunk/includes/cron/do-validate-license.php

@@ -4 +4 @@
 
     public $interval = array(
-        'days'     => 1,
+        'days'     => 2,
     );
 
@@ -35 +35 @@
                 $body = wp_remote_retrieve_body( $request );
                 //error_log('body: '.$body);
-                
-                if ($body !== false)
+
+                if ($body !== false && (strpos($body, 'INVALID_LICENCE_REQUEST') === false))
                 {
                     SPDSGVOSettings::set('licence_details_fetched', '1');

shapepress-dsgvo/trunk/includes/integrations/embeddings/facebook-feed/class-sp-dsgvo-facebook-feed-api.php

@@ -6 +6 @@
     {
         $this->name = "Facebook";
-        $this->company = "Facebook Inc.";
+        $this->company = "Meta Platforms Ireland Ltd.";
         $this->country = "Ireland, USA";
         $this->slug = 'facebook-feed';

shapepress-dsgvo/trunk/includes/integrations/embeddings/instagram/class-sp-dsgvo-instagram-api.php

@@ -6 +6 @@
     {
         $this->name = "Instagram";
-        $this->company = "Facebook Inc.";
+        $this->company = "Meta Platforms Ireland Ltd.";
         $this->country = "Ireland, USA";
         $this->slug = 'insta';

shapepress-dsgvo/trunk/includes/integrations/targeting/fbpixel/class-sp-dsgvo-fb-pixel-api.php

@@ -8 +8 @@
     {
         $this->name = "Facebook Pixel";
-        $this->company = "Facebook Inc.";
+        $this->company = "Meta Platforms Ireland Ltd.";
         $this->country = "Ireland, USA";
         $this->slug = 'facebook-pixel';

shapepress-dsgvo/trunk/public/class-sp-dsgvo-public.php

@@ -70 +70 @@
     public function enqueue_scripts()
     {
-        wp_enqueue_script(sp_dsgvo_NAME, plugin_dir_url(__FILE__) . 'js/sp-dsgvo-public.js', array(
+        wp_enqueue_script(sp_dsgvo_NAME, plugin_dir_url(__FILE__) . 'js/sp-dsgvo-public.min.js', array(
             'jquery'
         ), sp_dsgvo_VERSION, false);
@@ -304 +304 @@
         $overlay_class .= ' not-accepted'; //  todo check if needed
 
-        $imprintUrl = get_permalink($settings['imprint_page']);
-        $privacyPolicyUrl = get_permalink($settings['privacy_policy_page']);
+        $imprintUrl = get_permalink(SPDSGVOSettings::get('imprint_page'));//get_permalink($settings['imprint_page']);
+        $privacyPolicyUrl = get_permalink(SPDSGVOSettings::get('privacy_policy_page')); //get_permalink($settings['privacy_policy_page']);
 
         $allCategories = SPDSGVOCookieCategoryApi::getCookieCategories();

shapepress-dsgvo/trunk/public/js/sp-dsgvo-public.js

@@ -580 +580 @@
         cookieData.lastChangeOn = new Date().getTime();
 
+        var secure = location.protocol !== 'https:' ? "" : ';Secure;';
         var flatData = encodeURIComponent(JSON.stringify(cookieData));
         var d = new Date();
         d.setTime(d.getTime() + parseInt(lifeTime) * 1000);
         var expires = "expires=" + d.toUTCString();
-        document.cookie = spDsgvoGeneralConfig.cookieName + "=" + flatData + ";" + expires + ";path=/";
+        document.cookie = spDsgvoGeneralConfig.cookieName + "=" + flatData + ";" + expires + ";path=/" +secure;
 
     }

shapepress-dsgvo/trunk/public/shortcodes/privacy-policy.php

@@ -56 +56 @@
     $responsibleText .= SPDSGVOSettings::get('spdsgvo_company_info_zip') . " ";
     $responsibleText .= SPDSGVOSettings::get('spdsgvo_company_info_loc') .", ";
-    $responsibleText .= SPDSGVOSettings::get('spdsgvo_company_info_countrycode') .", ";
+
+    $countryCodeTemp = SPDSGVOSettings::get('spdsgvo_company_info_countrycode');
+    if ($countryCodeTemp == "AT") $countryCodeTemp = "Österreich";
+    if ($countryCodeTemp == "DE") $countryCodeTemp = "Deutschland";
+    if ($countryCodeTemp == "CH") $countryCodeTemp = "Schweiz";
+    if ($countryCodeTemp == "IT") $countryCodeTemp = "Italien";
+    $responsibleText .= $countryCodeTemp .", ";
     if (empty(SPDSGVOSettings::get('spdsgvo_company_info_email')) == false)
         $responsibleText .= '<a href="mailto:' . SPDSGVOSettings::get('spdsgvo_company_info_email').'">'.SPDSGVOSettings::get("spdsgvo_company_info_email").'</a>' .", ";
     if (empty(SPDSGVOSettings::get('spdsgvo_company_info_phone')) == false) $responsibleText .= SPDSGVOSettings::get('spdsgvo_company_info_phone');
+
+    $responsibleTextSeparator = apply_filters('spdsgvo_change_responsibleText_separator', ', ');
+    if (empty($responsibleTextSepartor) !== false) $responsibleText = str_replace( ", ", $responsibleTextSeparator,$responsibleText);
+
     $privacyPolicy[] = SPDSGVOGetFormatedHtmlTextArray('p', $responsibleText);
     // </editor-fold>

shapepress-dsgvo/trunk/sp-dsgvo.php

@@ -17 +17 @@
  * Plugin URI:        https://legalweb.io
  * 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>)
- * Version:           3.1.28
+ * Version:           3.1.29
  * Author:            legalweb
  * Author URI:        https://www.legalweb.io
@@ -29 +29 @@
 }
 
-define('sp_dsgvo_VERSION', '3.1.28');
+define('sp_dsgvo_VERSION', '3.1.29');
 define('sp_dsgvo_NAME', 'sp-dsgvo');
 define('sp_dsgvo_PLUGIN_NAME', 'shapepress-dsgvo');

shapepress-dsgvo/trunk/wpml-config.xml

@@ -16 +16 @@
         <key name="sp_dsgvo_woo_privacy_text"/>
         <key name="sp_dsgvo_imprint"/>
+        <key name="sp_dsgvo_imprint_page"/>
+        <key name="sp_dsgvo_privacy_policy_page"/>
         <key name="sp_dsgvo_privacy_policy_custom_header"/>
         <key name="sp_dsgvo_integration_ga">