Merge branch 3.x-dev into 4.x-dev (#15543)

* Updates search engine and social definitions (#15384)

* updates device detector to latest release (#15388)

* updates device detector to latest release

* updates tests

* translation update (#15389)

* Fix Could not get the lock for ID, when creating a site (#15401)

* Lock key start

* do not empty key lock

Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>

* 3.13.1

* submodule updates

* Use correct name in update available message (#15423)

* Fix removing user capabilities (#15422)

* Order of implode() args, avoid E_NOTICE in PHP7.4 (#15428)

* Fixes possible php warning in visitor log (#15442)

* silence is_executable call (#15446)

* Make sure geolocation admin experience is consistent if user is not using GeoIp2 plugin. (#15447)

* Fix referrers test. (#15448)

* Ensure to close visitor popover correctly (#15443)

* Fixes possible warning (#15453)

* Forward instance_id from local config when reseting config during tests. (#15445)

* Add event that allows plugins to disable archiving for certain periods/sites if they want. (#15457)

* Add event that allows plugins to disable archiving for certain periods/sites if they want.

* apply review feedback

* Fix possible warning for columns without index (#15467)

* Day range archiving issue (#15462)

* Improve lock ID check for max length (#15407)

Better patch for https://github.com/matomo-org/matomo/pull/15401 which was merged last minute...

This way it always works even when someone calls `acquireLock` directly instead of `execute`

Pushing this for now into 3.x-dev but can also put it into 4.x-dev directly but then there might be merge conflicts when merging 3.x-dev into 4.x-dev

* Use SameSite none for session token when embedded into iframe (#15439)

* Make sure tracking works in IE9 and lower (#15480)

* Mention Joomla install FAQ (#15481)

* Make sparklines work when mbstring extension is not installed (#15489)

1) Too few arguments to function mb_strtolower(), 1 passed in matomo/vendor/davaxi/sparkline/src/Sparkline/StyleTrait.php on line 129 and exactly 2 expected

2) mb_strlen is not defined

* update screenshots (#15488)

* 3.13.2-rc1

* Use safemode when running CLI commands (#15472)

* update icons submodule (#15490)

* update icons submodule

* update UI tests

* Fix possible undefined index notice (#15502)

* Use latest davaxi/sparkline release (#15464)

* translation update

* submodule updates

* Fix deprecation notice (#15530)

see https://github.com/matomo-org/matomo/pull/15467#issuecomment-583283444

* 3.13.2-rc2

* update cache component (#15536)

*  fixes copy dashboard to user for more than 100 users (#15538)

cherry picking  #15424  to fix #15420 in 3.x-dev

* Add missing return statement. (#15539)

* 3.13.2

* update tests

* update tests

Co-authored-by: Matthieu Aubry <mattab@users.noreply.github.com>
Co-authored-by: Thomas Steur <tsteur@users.noreply.github.com>
Co-authored-by: Peter Upfold <pgithub@upfold.org.uk>
Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Co-authored-by: Lukas Winkler <github@lw1.at>

1 files changed, 17 insertions, 3 deletions

diff --git a/plugins/CoreAdminHome/javascripts/optOut.js b/plugins/CoreAdminHome/javascripts/optOut.js
index cbca7a8181..03ba11d927 100644
--- a/plugins/CoreAdminHome/javascripts/optOut.js
+++ b/plugins/CoreAdminHome/javascripts/optOut.js
@@ -4,6 +4,20 @@ function getDomain(url)
     return url.replace(/^http[s]?:\/\//, '').replace(/\/.*/, '');
 }
 
+function addEventListener(element, eventType, eventHandler) {
+    if (element.addEventListener) {
+        element.addEventListener(eventType, eventHandler, false);
+
+        return true;
+    }
+
+    if (element.attachEvent) {
+        return element.attachEvent('on' + eventType, eventHandler);
+    }
+
+    element['on' + eventType] = eventHandler;
+}
+
 // Strips off protocol and trailing path and URL params
 function getHostName(url)
 {
@@ -72,7 +86,7 @@ function submitForm(e, form) {
     // Send a message to the parent window so that it can set a first-party cookie (a fallback in case
     // third-party cookies are not permitted by the browser).
     if (typeof parent === 'object' && typeof parent.postMessage !== 'undefined') {
-        window.addEventListener('message', function(e) {
+        addEventListener(window, 'message', function(e) {
             var data = getDataIfMessageIsForThisFrame(e);
             if (!data || typeof data.maq_confirm_opted_in === 'undefined') {
                 return;
@@ -172,7 +186,7 @@ function showWarningIfCookiesDisabled() {
 
 var initializationTimer = null;
 
-document.addEventListener('DOMContentLoaded', function() {
+addEventListener(document, 'DOMContentLoaded', function() {
     showWarningIfCookiesDisabled();
     
     var trackVisitsCheckbox = document.getElementById('trackVisits');
@@ -200,7 +214,7 @@ document.addEventListener('DOMContentLoaded', function() {
 // Listener for initialization message from parent window
 // This will tell us the initial state the form should be in
 // based on the first-party cookie value (which we can't access directly)
-window.addEventListener('message', function(e) {
+addEventListener(window, 'message', function(e) {
     var data = getDataIfMessageIsForThisFrame(e);
     if (!data) {
         return;