Changeset 2584667

Timestamp:

08/18/2021 08:28:10 AM (5 years ago)

Author:

legalweb

Message:

3.1.21

Location:

shapepress-dsgvo/trunk

Files:

• README.txt (modified) (3 diffs)
• includes/class-sp-dsgvo-language-tools.php (modified) (1 diff)
• includes/class-sp-dsgvo.php (modified) (1 diff)
• includes/integrations/statistics/mautic (added)
• includes/integrations/statistics/mautic/class-sp-dsgvo-mautic-api.php (added)
• includes/integrations/statistics/mautic/class-sp-dsgvo-mautic-integration.php (added)
• includes/integrations/statistics/mautic/page.php (added)
• languages/shapepress-dsgvo-de_DE.mo (modified) (previous)
• languages/shapepress-dsgvo-de_DE.po (modified) (3 diffs)
• public/actions/legal-web-text-action.php (modified) (2 diffs)
• public/class-sp-dsgvo-public.php (modified) (10 diffs)
• public/js/sp-dsgvo-public.js (modified) (2 diffs)
• public/shortcodes/privacy-policy.php (modified) (1 diff)
• sp-dsgvo.php (modified) (2 diffs)

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.7.0
-Stable tag: 3.1.20
+Tested up to: 5.8.2
+Stable tag: 3.1.21
 Requires PHP: 5.6.0
 License: GPLv2 or later
@@ -118 +118 @@
 
 #### **Statistics / analysis**
-* WP Statistics, Matomo (On ​​Premise / Agentur / Cloud), Piwik (On Premise / Agentur / Cloud), E-Tracker, Google Analytics, Clicky, Hotjar
+* WP Statistics, Matomo (On ​​Premise / Agentur / Cloud), Piwik (On Premise / Agentur / Cloud), E-Tracker, Google Analytics, Clicky, Hotjar, Mautic
 * (from cloud version: freely configurable statstics)
 
@@ -204 +204 @@
 
 == Changelog ==
+
+= 3.1.21 =
+* added mautic
+* fixed bug with forcing cookie popup
+* translation updates
+* fixed path of roboto font
+
 = 3.1.20 =
 * translation updates

shapepress-dsgvo/trunk/includes/class-sp-dsgvo-language-tools.php

@@ -180 +180 @@
 
                 if ($xmlTextsJson != null) {
-                    $xmlTextsBase64 = base64_encode($xmlTextsJson['Texts']);
+
+                    $xmlTextsBase64 = $xmlTextsJson['Texts'];
+                    if (strtoupper($lang) == 'CH') { // ch does not use an ß
+                        $xmlTextsBase64 = str_replace("ß", "ss",$xmlTextsBase64);
+                        $xmlTextsBase64 = str_replace("ß", "ss",$xmlTextsBase64);
+                    }
+                    $xmlTextsBase64 = base64_encode($xmlTextsBase64);
                     $version = $xmlTextsJson['Version'];
                     $lang = $xmlTextsJson['Language'];

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

@@ -208 +208 @@
             SPDSGVO::pluginDir('includes/integrations/statistics/hotjar/class-sp-dsgvo-hotjar-api.php'),
             SPDSGVO::pluginDir('includes/integrations/statistics/hotjar/class-sp-dsgvo-hotjar-integration.php'),
+            SPDSGVO::pluginDir('includes/integrations/statistics/mautic/class-sp-dsgvo-mautic-api.php'),
+            SPDSGVO::pluginDir('includes/integrations/statistics/mautic/class-sp-dsgvo-mautic-integration.php'),
 
             // targeting

shapepress-dsgvo/trunk/languages/shapepress-dsgvo-de_DE.po

@@ -3 +3 @@
 "Project-Id-Version: \n"
 "POT-Creation-Date: 2021-03-11 11:04+0100\n"
-"PO-Revision-Date: 2021-03-12 07:29+0100\n"
+"PO-Revision-Date: 2021-06-23 14:09+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.3\n"
+"X-Generator: Poedit 3.0\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -1586 +1586 @@
 #: admin/tabs/v3/operator/page.php:266 public/shortcodes/imprint.php:125
 msgid "Responsible for content"
-msgstr "Verantwortlich für Inhalt"
+msgstr "Verantwortlich für den Inhalt"
 
 #: admin/tabs/v3/operator/page.php:268

shapepress-dsgvo/trunk/public/actions/legal-web-text-action.php

@@ -31 +31 @@
         }
 
-        //special case for matomo and piwik. only in cloud mode they are in popup, so attach -cloud to get correct popup text
-        $specialIntegrations = array('matomo', 'piwik');
+        //special case for matomo, piwik, mautic. only in cloud mode they are in popup, so attach -cloud to get correct popup text
+        $specialIntegrations = array('matomo', 'piwik', 'mautic');
         $webAgencyText = "";
         if (in_array($slug, $specialIntegrations)) {
@@ -43 +43 @@
                 case SPDSGVOPiwikApi::getInstance()->getSlug():
                     $settings = SPDSGVOPiwikApi::getInstance()->getSettings();
+                    break;
+                case SPDSGVOMauticApi::getInstance()->getSlug():
+                    $settings = SPDSGVOMauticApi::getInstance()->getSettings();
                     break;
             }

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

@@ -924 +924 @@
                     src: local('Roboto Light Italic'),
                     local('Roboto-LightItalic'),
-                    url(fonts/roboto/Roboto-LightItalic-webfont.woff) format('woff');
+                    url(/wp-content/plugins/shapepress-dsgvo/public/css/fonts/roboto/Roboto-LightItalic-webfont.woff) format('woff');
                     font-display: swap;
 
@@ -936 +936 @@
                     src: local('Roboto Italic'),
                     local('Roboto-Italic'),
-                    url(fonts/roboto/Roboto-Italic-webfont.woff) format('woff');
+                    url(/wp-content/plugins/shapepress-dsgvo/public/css/fonts/roboto/Roboto-Italic-webfont.woff) format('woff');
                     font-display: swap;
                 }
@@ -947 +947 @@
                     src: local('Roboto Bold Italic'),
                     local('Roboto-BoldItalic'),
-                    url(fonts/roboto/Roboto-BoldItalic-webfont.woff) format('woff');
+                    url(/wp-content/plugins/shapepress-dsgvo/public/css/fonts/roboto/Roboto-BoldItalic-webfont.woff) format('woff');
                     font-display: swap;
                 }
@@ -958 +958 @@
                     src: local('Roboto Black Italic'),
                     local('Roboto-BlackItalic'),
-                    url(fonts/roboto/Roboto-BlackItalic-webfont.woff) format('woff');
+                    url(/wp-content/plugins/shapepress-dsgvo/public/css/fonts/roboto/Roboto-BlackItalic-webfont.woff) format('woff');
                     font-display: swap;
                 }
@@ -969 +969 @@
                     src: local('Roboto Light'),
                     local('Roboto-Light'),
-                    url(fonts/roboto/Roboto-Light-webfont.woff) format('woff');
+                    url(/wp-content/plugins/shapepress-dsgvo/public/css/fonts/roboto/Roboto-Light-webfont.woff) format('woff');
                     font-display: swap;
                 }
@@ -980 +980 @@
                     src: local('Roboto Regular'),
                     local('Roboto-Regular'),
-                    url(fonts/roboto/Roboto-Regular-webfont.woff) format('woff');
+                    url(/wp-content/plugins/shapepress-dsgvo/public/css/fonts/roboto/Roboto-Regular-webfont.woff) format('woff');
                     font-display: swap;
                 }
@@ -991 +991 @@
                     src: local('Roboto Bold'),
                     local('Roboto-Bold'),
-                    url(fonts/roboto/Roboto-Bold-webfont.woff) format('woff');
+                    url(/wp-content/plugins/shapepress-dsgvo/public/css/fonts/roboto/Roboto-Bold-webfont.woff) format('woff');
                     font-display: swap;
                 }
@@ -1002 +1002 @@
                     src: local('Roboto Black'),
                     local('Roboto-Black'),
-                    url(fonts/roboto/Roboto-Black-webfont.woff) format('woff');
+                    url(/wp-content/plugins/shapepress-dsgvo/public/css/fonts/roboto/Roboto-Black-webfont.woff) format('woff');
                     font-display: swap;
                 }
@@ -1128 +1128 @@
         }
 
-        //special case for matomo and piwik. only in cloud mode they are in popup, so attach -cloud to get correct popup text
-        $specialIntegrations = array('matomo', 'piwik');
+        //special case for matomo, piwik and mautic. only in cloud mode they are in popup, so attach -cloud to get correct popup text
+        $specialIntegrations = array('matomo', 'piwik', 'mautic');
         $webAgencyText = "";
         if (in_array($slug, $specialIntegrations)) {
@@ -1140 +1140 @@
                 case SPDSGVOPiwikApi::getInstance()->getSlug():
                     $settings = SPDSGVOPiwikApi::getInstance()->getSettings();
+                    break;
+                case SPDSGVOMauticApi::getInstance()->getSlug():
+                    $settings = SPDSGVOMauticApi::getInstance()->getSettings();
                     break;
             }

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

@@ -362 +362 @@
         if (spDsgvoIntegrationConfig == null) return;
 
-        if (spDsgvoIntegrationConfig.length == 0 && spDsgvoGeneralConfig.forceCookieInfo == 0) return;
+        if (getNonMandatoryIntegrations(spDsgvoIntegrationConfig).length == 0 && spDsgvoGeneralConfig.forceCookieInfo == 0) return;
 
         if (spDsgvoGeneralConfig.currentPageId == spDsgvoGeneralConfig.privacyPolicyPageId ||
@@ -1033 +1033 @@
     }
 
+    function getNonMandatoryIntegrations(integrationsArray)
+    {
+        var result = [];
+        integrationsArray.forEach(function(integration) {
+
+            if (integration.category != CATEGORY_SLUG_MANDATORY)
+            {
+                result.push(integration);
+            }
+        });
+
+        return result;
+    }
+
     function isIntegrationAllowedByCookieSettings(slug)
     {

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

@@ -371 +371 @@
     $integrations = SPDSGVOIntegrationApiBase::getAllIntegrationApis(SPDSGVOConstants::CATEGORY_SLUG_STATISTICS, FALSE);
 
-    // add techn. required too (wp stats, matomo, piwik) because the have another catin the filter
+    // add techn. required too (wp stats, matomo, piwik, mautic) because the have another catin the filter
     if (SPDSGVOMatomoApi::getInstance()->getIsEnabled()) $integrations[SPDSGVOMatomoApi::getInstance()->getSlug()] =SPDSGVOMatomoApi::getInstance();
     if (SPDSGVOWpStatisticsApi::getInstance()->getIsEnabled()) $integrations[SPDSGVOWpStatisticsApi::getInstance()->getSlug()] = SPDSGVOWpStatisticsApi::getInstance();
     if (SPDSGVOPiwikApi::getInstance()->getIsEnabled()) $integrations[SPDSGVOPiwikApi::getInstance()->getSlug()] = SPDSGVOPiwikApi::getInstance();
+    if (SPDSGVOMauticApi::getInstance()->getIsEnabled()) $integrations[SPDSGVOMauticApi::getInstance()->getSlug()] = SPDSGVOMauticApi::getInstance();
 
     $enabledIntegrationCount = 0;

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