Merge pull request #49 from RRZE-Webteam/dev

Dev

Author: rvdforst

data/consent-cookies.php

@@ -5,7 +5,7 @@
 defined('ABSPATH') || exit;
 
 $data = [
-    'version' => 1,
+    'version' => 2,
     'items' => [
         'default' => [
             'id' => 'default',
@@ -178,27 +178,6 @@
             'status' => true,
             'static' => true,
         ],
-        'instagram' => [
-            'id' => 'instagram',
-            'cookie_name' => 'pigeon_state',
-            'category' => 'external_media',
-            'name' => __('Instagram', 'rrze-legal'),
-            'provider' => __('Meta Platforms Ireland Limited, 4 Grand Canal Square, Dublin 2, Ireland', 'rrze-legal'),
-            'purpose' => __('Used to unblock Instagram content.', 'rrze-legal'),
-            'privacy_policy_url' => 'https://www.instagram.com/legal/privacy/',
-            'hosts' => 'instagram.com',
-            'cookie_expiry' => __('Session', 'rrze-legal'),
-            'enqueued_script_handles' => '',
-            'block_enqueued_script' => false,
-            'prioritize' => false,
-            'async_opt_out_code' => false,
-            'opt_in_js' => '<script>if(typeof window.RRZELegal === "object") { window.RRZELegal.unblockContentId("instagram"); }</script>',
-            'opt_out_js' => '',
-            'fallback_js' => '',
-            'position' => 2,
-            'status' => true,
-            'static' => true,
-        ],
         'youtube' => [
             'id' => 'youtube',
             'cookie_name' => 'NID',
@@ -220,7 +199,7 @@
             'opt_in_js' => '<script>if(typeof window.RRZELegal === "object") { window.RRZELegal.unblockContentId("youtube"); }</script>',
             'opt_out_js' => '',
             'fallback_js' => '',
-            'position' => 3,
+            'position' => 2,
             'status' => true,
             'static' => true,
         ],
@@ -241,7 +220,7 @@
             'opt_in_js' => '<script>if(typeof window.RRZELegal === "object") { window.RRZELegal.unblockContentId("vimeo"); }</script>',
             'opt_out_js' => '',
             'fallback_js' => '',
-            'position' => 4,
+            'position' => 3,
             'status' => true,
             'static' => true,
         ],
@@ -262,7 +241,7 @@
             'opt_in_js' => '<script>if(typeof window.RRZELegal === "object") { window.RRZELegal.unblockContentId("slideshare"); }</script>',
             'opt_out_js' => '',
             'fallback_js' => '',
-            'position' => 5,
+            'position' => 4,
             'status' => true,
             'static' => true,
         ],
@@ -285,7 +264,7 @@
             'opt_in_js' => '<script>if(typeof window.RRZELegal === "object") { window.RRZELegal.unblockContentId("brmediathek"); }</script>',
             'opt_out_js' => '',
             'fallback_js' => '',
-            'position' => 6,
+            'position' => 5,
             'status' => consent()->isServiceProviderActive('brmediathek'),
             'static' => true,
         ],
@@ -308,7 +287,7 @@
             'opt_in_js' => '<script>if(typeof window.RRZELegal === "object") { window.RRZELegal.unblockContentId("ardmediathek"); }</script>',
             'opt_out_js' => '',
             'fallback_js' => '',
-            'position' => 7,
+            'position' => 6,
             'status' => consent()->isServiceProviderActive('ardmediathek'),
             'static' => true,
         ],

includes/Update.php

@@ -19,6 +19,9 @@ public static function loaded()
         } elseif (version_compare($version, '1.0.0', '==')) {
             self::updateToVersion200();
             Utils::redirectToReferer();
+        } elseif (version_compare($version, '2.0.0', '==')) {
+            self::updateToVersion220();
+            Utils::redirectToReferer();
         }
     }
 
@@ -90,6 +93,28 @@ protected static function updateToVersion200()
         update_option($cookiesOptionsName, $cookiesOptions);
     }
 
+    /**
+     * Update to version 2.2.0.
+     * @return void
+     */
+    protected static function updateToVersion220()
+    {
+        $tosOptionName = tos()->getOptionName();
+        $cookiesOptionsName = consentCookies()->getOptionName();
+        $cookiesOptions = consentCookies()->getOptions();
+
+        foreach ($cookiesOptions as $key => $value) {
+            $id = $value['id'] ?? '';
+            $category = $value['category'] ?? '';
+            if ($category === 'external_media' && $id === 'instagram') {
+                unset($cookiesOptions[$key]);
+                break;
+            }
+        }
+        update_option($cookiesOptionsName, $cookiesOptions);
+        update_option($tosOptionName . '_version', '2.2.0');
+    }
+
     /**
      * Options map (v1.0.0).
      * @return array

languages/rrze-legal-de_DE.mo

@@ -4,8 +4,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: RRZE Legal 1.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/rrze-legal\n"
-"POT-Creation-Date: 2022-07-14T08:52:40+00:00\n"
-"PO-Revision-Date: 2022-07-14 10:53+0200\n"
+"POT-Creation-Date: 2022-07-14T12:53:48+00:00\n"
+"PO-Revision-Date: 2022-07-14 14:54+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -102,7 +102,7 @@ msgstr ""
 "ausgewählt wurden."
 
 #: data/consent-cookies.php:19 data/consent-cookies.php:124
-#: data/consent-cookies.php:280 data/consent-cookies.php:303
+#: data/consent-cookies.php:259 data/consent-cookies.php:282
 msgid "1 Year"
 msgstr "1 Jahr"
 
@@ -122,7 +122,6 @@ msgstr "Teste, ob ein Cookie gesetzt werden kann. Benutzersitzung speichern."
 
 #: data/consent-cookies.php:40 data/consent-cookies.php:61
 #: data/consent-cookies.php:82 data/consent-cookies.php:103
-#: data/consent-cookies.php:190
 msgid "Session"
 msgstr "Session"
 
@@ -196,82 +195,70 @@ msgid "Unlimited"
 msgstr "Unbegrenzt"
 
 #: data/consent-cookies.php:185
-msgid "Instagram"
-msgstr "Instagram"
-
-#: data/consent-cookies.php:186
-msgid "Meta Platforms Ireland Limited, 4 Grand Canal Square, Dublin 2, Ireland"
-msgstr "Meta Platforms Ireland Limited, 4 Grand Canal Square, Dublin 2, Irland"
-
-#: data/consent-cookies.php:187
-msgid "Used to unblock Instagram content."
-msgstr "Wird verwendet, um Instagram-Inhalte zu entsperren."
-
-#: data/consent-cookies.php:206
 msgid "YouTube"
 msgstr "YouTube"
 
-#: data/consent-cookies.php:207
+#: data/consent-cookies.php:186
 msgid "Google Ireland Limited, Gordon House, Barrow Street, Dublin 4, Ireland"
 msgstr "Google Ireland Limited, Gordon House, Barrow Street, Dublin 4, Irland"
 
-#: data/consent-cookies.php:208
+#: data/consent-cookies.php:187
 msgid "Used to unblock YouTube content."
 msgstr "Wird verwendet, um Youtube-Inhalte zu entsperren."
 
-#: data/consent-cookies.php:215
+#: data/consent-cookies.php:194
 msgid "6 Months"
 msgstr "6 Monate"
 
-#: data/consent-cookies.php:231
+#: data/consent-cookies.php:210
 msgid "Vimeo"
 msgstr "Vimeo"
 
-#: data/consent-cookies.php:232
+#: data/consent-cookies.php:211
 msgid "Vimeo Inc., 555 West 18th Street, New York, New York 10011, USA"
 msgstr ""
 "Vimeo Inc., 555 West 18th Street, New York, New York 10011, Vereinigte "
 "Staaten"
 
-#: data/consent-cookies.php:233
+#: data/consent-cookies.php:212
 msgid "Used to unblock Vimeo content."
 msgstr "Wird verwendet, um Vimeo-Inhalte zu entsperren."
 
-#: data/consent-cookies.php:236 data/consent-cookies.php:257
+#: data/consent-cookies.php:215 data/consent-cookies.php:236
 msgid "2 Years"
 msgstr "2 Jahre"
 
-#: data/consent-cookies.php:252
+#: data/consent-cookies.php:231
 msgid "Slideshare"
 msgstr "Slideshare"
 
-#: data/consent-cookies.php:253
+#: data/consent-cookies.php:232
 msgid "Scribd, Inc., 460 Bryant St, 100, San Francisco, CA 94107-2594 USA"
 msgstr ""
 "Scribd, Inc., 460 Bryant St, 100, San Francisco, CA 94107-2594 Vereinigten "
 "Staten"
 
-#: data/consent-cookies.php:254
+#: data/consent-cookies.php:233
 msgid "Used to unblock Slideshare content."
 msgstr "Wird verwendet, um Slideshare-Inhalte zu entsperren."
 
-#: data/consent-cookies.php:273
+#: data/consent-cookies.php:252
 msgid "BR Mediathek"
 msgstr "BR Mediathek"
 
-#: data/consent-cookies.php:274 data/consent-cookies.php:297
+#: data/consent-cookies.php:253 data/consent-cookies.php:276
 msgid "Bayerischer Rundfunk, Rundfunkplatz 1, 80335 Munich, Germany"
 msgstr "Bayerischer Rundfunk, Rundfunkplatz 1, 80335 München, Deutschland"
 
-#: data/consent-cookies.php:275
+#: data/consent-cookies.php:254
 msgid "Used to unblock BR content."
 msgstr "Wird verwendet, um BR-Inhalte zu entsperren."
 
-#: data/consent-cookies.php:296
+#: data/consent-cookies.php:275
 msgid "ARD Mediathek"
 msgstr "ARD Mediathek"
 
-#: data/consent-cookies.php:298
+#: data/consent-cookies.php:277
 msgid "Used to unblock ARD content."
 msgstr "Wird verwendet, um ARD-Inhalte zu entsperren."
 
@@ -1972,6 +1959,17 @@ msgstr "Adresse"
 msgid "Postal address as an alternative to email address."
 msgstr "Postanschrift als Alternative zur E-Mail-Adresse."
 
+#~ msgid "Instagram"
+#~ msgstr "Instagram"
+
+#~ msgid ""
+#~ "Meta Platforms Ireland Limited, 4 Grand Canal Square, Dublin 2, Ireland"
+#~ msgstr ""
+#~ "Meta Platforms Ireland Limited, 4 Grand Canal Square, Dublin 2, Irland"
+
+#~ msgid "Used to unblock Instagram content."
+#~ msgstr "Wird verwendet, um Instagram-Inhalte zu entsperren."
+
 #~ msgid "Facebook"
 #~ msgstr "Facebook"