Ignore disableCookie setting when giving consent / removing consent (#15309)

1 files changed, 6 insertions, 7 deletions

diff --git a/matomo.js b/matomo.js
index 11a3e9044c..72f905f87f 100644
--- a/matomo.js
+++ b/matomo.js
@@ -69,12 +69,11 @@ if(!di||aT(di)){return}di=k(di,av);var dj=bp();di=F(di,av,dj);ae.setAnyAttribute
 })};this.getNumTrackedPageViews=function(){return cq};this.trackPageView=function(dh,dj,di){b8=[];cH=[];if(N(b4)){cf(function(){Z(aD,bF,b4)})}else{cf(function(){cq++;bY(dh,dj,di)})}};this.trackAllContentImpressions=function(){if(N(b4)){return}cf(function(){q(function(){var dh=v.findContentNodes();var di=cx(dh);dd(di,bH)})})};this.trackVisibleContentImpressions=function(dh,di){if(N(b4)){return}if(!J(dh)){dh=true}if(!J(di)){di=750}aR(dh,di,this);cf(function(){n(function(){var dj=v.findContentNodes();var dk=a8(dj);dd(dk,bH)})})};this.trackContentImpression=function(dj,dh,di){if(N(b4)){return}dj=a(dj);dh=a(dh);di=a(di);if(!dj){return}dh=dh||"Unknown";cf(function(){var dk=aF(dj,dh,di);bD(dk,bH)})};this.trackContentImpressionsWithinNode=function(dh){if(N(b4)||!dh){return}cf(function(){if(cd){n(function(){var di=v.findContentNodesWithinNode(dh);var dj=a8(di);dd(dj,bH)})}else{q(function(){var di=v.findContentNodesWithinNode(dh);var dj=cx(di);dd(dj,bH)})}})};this.trackContentInteraction=function(dj,dk,dh,di){if(N(b4)){return
 }dj=a(dj);dk=a(dk);dh=a(dh);di=a(di);if(!dj||!dk){return}dh=dh||"Unknown";cf(function(){var dl=aO(dj,dk,dh,di);if(dl){bD(dl,bH)}})};this.trackContentInteractionNode=function(di,dh){if(N(b4)||!di){return}cf(function(){var dj=c9(di,dh);if(dj){bD(dj,bH)}})};this.logAllContentBlocksOnPage=function(){var dj=v.findContentNodes();var dh=v.collectContent(dj);var di=typeof console;if(di!=="undefined"&&console&&console.log){console.log(dh)}};this.trackEvent=function(di,dk,dh,dj,dm,dl){cf(function(){at(di,dk,dh,dj,dm,dl)})};this.trackSiteSearch=function(dh,dj,di,dk){b8=[];cf(function(){b6(dh,dj,di,dk)})};this.setEcommerceView=function(dk,dh,dj,di){if(Y(dj)){dj=String(dj)}if(!J(dj)||dj===null||dj===false||!dj.length){dj=""}else{if(dj instanceof Array){dj=JSON_PIWIK.stringify(dj)}}bU[5]=["_pkc",dj];if(J(di)&&di!==null&&di!==false&&String(di).length){bU[2]=["_pkp",di]}if(!Y(dk)&&!Y(dh)){return}if(Y(dk)){bU[3]=["_pks",dk]}if(!Y(dh)){dh=""}bU[4]=["_pkn",dh]};this.getEcommerceItems=function(){return JSON.parse(JSON.stringify(cY))
 };this.addEcommerceItem=function(dl,dh,dj,di,dk){if(Y(dl)){cY[dl]=[String(dl),dh,dj,di,dk]}};this.removeEcommerceItem=function(dh){if(Y(dh)){dh=String(dh);delete cY[dh]}};this.clearEcommerceCart=function(){cY={}};this.trackEcommerceOrder=function(dh,dl,dk,dj,di,dm){bX(dh,dl,dk,dj,di,dm)};this.trackEcommerceCartUpdate=function(dh){bq(dh)};this.trackRequest=function(di,dk,dj,dh){cf(function(){var dl=cr(di,dk,dh);bD(dl,bH,dj)})};this.ping=function(){this.trackRequest("ping=1",null,null,"ping")};this.disableQueueRequest=function(){bA.enabled=false};this.setRequestQueueInterval=function(dh){if(dh<1000){throw new Error("Request queue interval needs to be at least 1000ms")}bA.interval=dh};this.queueRequest=function(dh){cf(function(){var di=cr(dh);bA.push(di)})};this.getRememberedConsent=function(){var dh=aC(bc);if(aC(cJ)){if(dh){bW(bc,bn,cV)}return null}if(!dh||dh===0){return null}return dh};this.hasRememberedConsent=function(){return !!this.getRememberedConsent()};this.requireConsent=function(){cy=true;
-bz=this.hasRememberedConsent();x++;b["CoreConsent"+x]={unload:function(){if(!bz){aE()}}}};this.setConsentGiven=function(){bz=true;bW(cJ,bn,cV);var di,dh;for(di=0;di<cH.length;di++){dh=typeof cH[di];if(dh==="string"){bD(cH[di],bH)}else{if(dh==="object"){dd(cH[di],bH)}}}cH=[]};this.rememberConsentGiven=function(di){if(bj){ak("rememberConsentGiven is called but cookies are disabled, consent will not be remembered");return}if(di){di=di*60*60*1000}this.setConsentGiven();var dh=new Date().getTime();dc(bc,dh,di,bn,cV,bQ)};this.forgetConsentGiven=function(){if(bj){ak("forgetConsentGiven is called but cookies are disabled, consent will not be forgotten");return}var dh=30*365*24*60*60*1000;bW(bc,bn,cV);dc(cJ,new Date().getTime(),dh,bn,cV,bQ);this.requireConsent()};this.isUserOptedOut=function(){return !bz};this.optUserOut=this.forgetConsentGiven;this.forgetUserOptOut=this.rememberConsentGiven;e.trigger("TrackerSetup",[this])}function H(){return{push:af}}function c(au,at){var av={};var aq,ar;for(aq=0;
-aq<at.length;aq++){var ao=at[aq];av[ao]=1;for(ar=0;ar<au.length;ar++){if(au[ar]&&au[ar][0]){var ap=au[ar][0];if(ao===ap){af(au[ar]);delete au[ar];if(av[ap]>1&&ap!=="addTracker"){ak("The method "+ap+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}av[ap]++}}}}return au}var C=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setSessionCookieTimeout","setVisitorCookieTimeout","setSecureCookie","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","alwaysUseSendBeacon","enableLinkTracking","requireConsent","setConsentGiven"];function ad(ao,aq){var ap=new Q(ao,aq);I.push(ap);_paq=c(_paq,C);for(E=0;E<_paq.length;E++){if(_paq[E]){af(_paq[E])}}_paq=new H();e.trigger("TrackerAdded",[ap]);return ap}an(T,"beforeunload",ai,false);
-Date.prototype.getTimeAlias=Date.prototype.getTime;e={initialized:false,JSON:JSON_PIWIK,DOM:{addEventListener:function(ar,aq,ap,ao){var at=typeof ao;if(at==="undefined"){ao=false}an(ar,aq,ap,ao)},onLoad:n,onReady:q,isNodeVisible:j,isOrWasNodeVisible:v.isNodeVisible},on:function(ap,ao){if(!y[ap]){y[ap]=[]}y[ap].push(ao)},off:function(aq,ap){if(!y[aq]){return}var ao=0;for(ao;ao<y[aq].length;ao++){if(y[aq][ao]===ap){y[aq].splice(ao,1)}}},trigger:function(aq,ar,ap){if(!y[aq]){return}var ao=0;for(ao;ao<y[aq].length;ao++){y[aq][ao].apply(ap||T,ar)}},addPlugin:function(ao,ap){b[ao]=ap},getTracker:function(ao,ap){if(!J(ap)){ap=this.getAsyncTracker().getSiteId()}if(!J(ao)){ao=this.getAsyncTracker().getTrackerUrl()}return new Q(ao,ap)},getAsyncTrackers:function(){return I},addTracker:function(ao,aq){var ap;if(!I.length){ap=ad(ao,aq)}else{ap=I[0].addTracker(ao,aq)}return ap},getAsyncTracker:function(ap,at){var ar;if(I&&I.length&&I[0]){ar=I[0]}else{return ad(ap,at)}if(!at&&!ap){return ar}if((!J(at)||null===at)&&ar){at=ar.getSiteId()
-}if((!J(ap)||null===ap)&&ar){ap=ar.getTrackerUrl()}var aq,ao=0;for(ao;ao<I.length;ao++){aq=I[ao];if(aq&&String(aq.getSiteId())===String(at)&&aq.getTrackerUrl()===ap){return aq}}},retryMissedPluginCalls:function(){var ap=ah;ah=[];var ao=0;for(ao;ao<ap.length;ao++){af(ap[ao])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return e});define("matomo",[],function(){return e})}return e}())}
+bz=this.hasRememberedConsent();x++;b["CoreConsent"+x]={unload:function(){if(!bz){aE()}}}};this.setConsentGiven=function(){bz=true;bW(cJ,bn,cV);var di,dh;for(di=0;di<cH.length;di++){dh=typeof cH[di];if(dh==="string"){bD(cH[di],bH)}else{if(dh==="object"){dd(cH[di],bH)}}}cH=[]};this.rememberConsentGiven=function(di){if(di){di=di*60*60*1000}this.setConsentGiven();var dh=new Date().getTime();dc(bc,dh,di,bn,cV,bQ)};this.forgetConsentGiven=function(){var dh=30*365*24*60*60*1000;bW(bc,bn,cV);dc(cJ,new Date().getTime(),dh,bn,cV,bQ);this.requireConsent()};this.isUserOptedOut=function(){return !bz};this.optUserOut=this.forgetConsentGiven;this.forgetUserOptOut=this.rememberConsentGiven;e.trigger("TrackerSetup",[this])}function H(){return{push:af}}function c(au,at){var av={};var aq,ar;for(aq=0;aq<at.length;aq++){var ao=at[aq];av[ao]=1;for(ar=0;ar<au.length;ar++){if(au[ar]&&au[ar][0]){var ap=au[ar][0];if(ao===ap){af(au[ar]);delete au[ar];if(av[ap]>1&&ap!=="addTracker"){ak("The method "+ap+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')
+}av[ap]++}}}}return au}var C=["addTracker","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setSessionCookieTimeout","setVisitorCookieTimeout","setSecureCookie","setCookiePath","setCookieDomain","setDomains","setUserId","setSiteId","alwaysUseSendBeacon","enableLinkTracking","requireConsent","setConsentGiven"];function ad(ao,aq){var ap=new Q(ao,aq);I.push(ap);_paq=c(_paq,C);for(E=0;E<_paq.length;E++){if(_paq[E]){af(_paq[E])}}_paq=new H();e.trigger("TrackerAdded",[ap]);return ap}an(T,"beforeunload",ai,false);Date.prototype.getTimeAlias=Date.prototype.getTime;e={initialized:false,JSON:JSON_PIWIK,DOM:{addEventListener:function(ar,aq,ap,ao){var at=typeof ao;if(at==="undefined"){ao=false}an(ar,aq,ap,ao)},onLoad:n,onReady:q,isNodeVisible:j,isOrWasNodeVisible:v.isNodeVisible},on:function(ap,ao){if(!y[ap]){y[ap]=[]}y[ap].push(ao)},off:function(aq,ap){if(!y[aq]){return}var ao=0;for(ao;ao<y[aq].length;ao++){if(y[aq][ao]===ap){y[aq].splice(ao,1)
+}}},trigger:function(aq,ar,ap){if(!y[aq]){return}var ao=0;for(ao;ao<y[aq].length;ao++){y[aq][ao].apply(ap||T,ar)}},addPlugin:function(ao,ap){b[ao]=ap},getTracker:function(ao,ap){if(!J(ap)){ap=this.getAsyncTracker().getSiteId()}if(!J(ao)){ao=this.getAsyncTracker().getTrackerUrl()}return new Q(ao,ap)},getAsyncTrackers:function(){return I},addTracker:function(ao,aq){var ap;if(!I.length){ap=ad(ao,aq)}else{ap=I[0].addTracker(ao,aq)}return ap},getAsyncTracker:function(ap,at){var ar;if(I&&I.length&&I[0]){ar=I[0]}else{return ad(ap,at)}if(!at&&!ap){return ar}if((!J(at)||null===at)&&ar){at=ar.getSiteId()}if((!J(ap)||null===ap)&&ar){ap=ar.getTrackerUrl()}var aq,ao=0;for(ao;ao<I.length;ao++){aq=I[ao];if(aq&&String(aq.getSiteId())===String(at)&&aq.getTrackerUrl()===ap){return aq}}},retryMissedPluginCalls:function(){var ap=ah;ah=[];var ao=0;for(ao;ao<ap.length;ao++){af(ap[ao])}}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return e});define("matomo",[],function(){return e})
+}return e}())}
 /*!!! pluginTrackerHook */
-(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}else{_paq={push:function(c){var d=typeof console;
-if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Matomo tracker was not initialized before the matomo.js file was loaded. Make sure to configure the tracker via _paq.push before loading matomo.js. Alternatively, you can create a tracker via Matomo.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");
-if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}}
+(function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0;for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Matomo tracker was not initialized before the matomo.js file was loaded. Make sure to configure the tracker via _paq.push before loading matomo.js. Alternatively, you can create a tracker via Matomo.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)
+}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h]}}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}}
 /*!! @license-end */;
\ No newline at end of file