Changeset 2697591

Timestamp:

03/22/2022 10:05:58 AM (4 years ago)

Author:

consentmanager

Message:

added host/cdn fields [optional]

Location:

consent-manager

Files:

• tags/2.0.5 (added)
• tags/2.0.5/ConsentManagerMain.php (added)
• tags/2.0.5/assets (added)
• tags/2.0.5/assets/css (added)
• tags/2.0.5/assets/css/admin.css (added)
• tags/2.0.5/assets/images (added)
• tags/2.0.5/assets/images/cmpcdn.png (added)
• tags/2.0.5/assets/images/cmpcodeid.png (added)
• tags/2.0.5/assets/images/cmphost.png (added)
• tags/2.0.5/assets/images/cmpid.png (added)
• tags/2.0.5/assets/images/logo20.png (added)
• tags/2.0.5/assets/images/logo_neu.jpg (added)
• tags/2.0.5/assets/images/logo_neu.png (added)
• tags/2.0.5/consentmanager.php (added)
• tags/2.0.5/readme.txt (added)
• tags/2.0.5/views (added)
• tags/2.0.5/views/admin.php (added)
• trunk/ConsentManagerMain.php (modified) (3 diffs)
• trunk/assets/css/admin.css (modified) (3 diffs)
• trunk/assets/images/cmpcdn.png (added)
• trunk/assets/images/cmphost.png (added)
• trunk/consentmanager.php (modified) (8 diffs)
• trunk/readme.txt (modified) (1 diff)
• trunk/views/admin.php (modified) (4 diffs)

consent-manager/trunk/ConsentManagerMain.php

@@ -9 +9 @@
     const OPTION_ID = 'consent_manager_id';
     const OPTION_CODEID = 'consent_manager_code_id';
+    const OPTION_HOST = 'consent_manager_host';
+    const OPTION_CDN = 'consent_manager_cdn';
     const OPTION_MODE = 'consent_manager_mode';
     const OPTION_IGNORE_DOMAINS = 'consent_manager_ignore_domains';
@@ -45 +47 @@
     {
         return self::OPTION_CODEID;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getOptionHost()
+    {
+        return self::OPTION_HOST;
+    }
+
+    /**
+     * @return string
+     */
+    public static function getOptionCDN()
+    {
+        return self::OPTION_CDN;
     }
 
@@ -88 +106 @@
 
     /**
-     * @param int $id
-     * @param string $codeID
+     * @param $id
+     * @param $codeID
+     * @param $host
+     * @param $cdn
      * @return string
      */
-    static function getSemiBlockingCode($id, $codeID)
+    static function getSemiBlockingCode($id, $codeID, $host, $cdn)
     {
-        return '<script>window.gdprAppliesGlobally=true;if(!("cmp_id" in window)||window.cmp_id<1){window.cmp_id=' . $id . '}if(!("cmp_cdid" in window)){window.cmp_cdid="' . $codeID . '"}if(!("cmp_params" in window)){window.cmp_params=""}if(!("cmp_host" in window)){window.cmp_host="' . self::getHost() . '"}if(!("cmp_cdn" in window)){window.cmp_cdn="' . self::getCDN() . '"}if(!("cmp_proto" in window)){window.cmp_proto="https:"}if(!("cmp_codesrc" in window)){window.cmp_codesrc="10"}window.cmp_getsupportedLangs=function(){var b=["DE","EN","FR","IT","NO","DA","FI","ES","PT","RO","BG","ET","EL","GA","HR","LV","LT","MT","NL","PL","SV","SK","SL","CS","HU","RU","SR","ZH","TR","UK","AR","BS"];if("cmp_customlanguages" in window){for(var a=0;a<window.cmp_customlanguages.length;a++){b.push(window.cmp_customlanguages[a].l.toUpperCase())}}return b};window.cmp_getRTLLangs=function(){return["AR"]};window.cmp_getlang=function(j){if(typeof(j)!="boolean"){j=true}if(j&&typeof(cmp_getlang.usedlang)=="string"&&cmp_getlang.usedlang!==""){return cmp_getlang.usedlang}var g=window.cmp_getsupportedLangs();var c=[];var f=location.hash;var e=location.search;var a="languages" in navigator?navigator.languages:[];if(f.indexOf("cmplang=")!=-1){c.push(f.substr(f.indexOf("cmplang=")+8,2).toUpperCase())}else{if(e.indexOf("cmplang=")!=-1){c.push(e.substr(e.indexOf("cmplang=")+8,2).toUpperCase())}else{if("cmp_setlang" in window&&window.cmp_setlang!=""){c.push(window.cmp_setlang.toUpperCase())}else{if(a.length>0){for(var d=0;d<a.length;d++){c.push(a[d])}}}}}if("language" in navigator){c.push(navigator.language)}if("userLanguage" in navigator){c.push(navigator.userLanguage)}var h="";for(var d=0;d<c.length;d++){var b=c[d].toUpperCase();if(g.indexOf(b)!=-1){h=b;break}if(b.indexOf("-")!=-1){b=b.substr(0,2)}if(g.indexOf(b)!=-1){h=b;break}}if(h==""&&typeof(cmp_getlang.defaultlang)=="string"&&cmp_getlang.defaultlang!==""){return cmp_getlang.defaultlang}else{if(h==""){h="EN"}}h=h.toUpperCase();return h};(function(){var n=document;var p=window;var f="";var b="_en";if("cmp_getlang" in p){f=p.cmp_getlang().toLowerCase();if("cmp_customlanguages" in p){for(var h=0;h<p.cmp_customlanguages.length;h++){if(p.cmp_customlanguages[h].l.toUpperCase()==f.toUpperCase()){f="en";break}}}b="_"+f}function g(e,d){var l="";e+="=";var i=e.length;if(location.hash.indexOf(e)!=-1){l=location.hash.substr(location.hash.indexOf(e)+i,9999)}else{if(location.search.indexOf(e)!=-1){l=location.search.substr(location.search.indexOf(e)+i,9999)}else{return d}}if(l.indexOf("&")!=-1){l=l.substr(0,l.indexOf("&"))}return l}var j=("cmp_proto" in p)?p.cmp_proto:"https:";var o=["cmp_id","cmp_params","cmp_host","cmp_cdn","cmp_proto"];for(var h=0;h<o.length;h++){if(g(o[h],"%%%")!="%%%"){window[o[h]]=g(o[h],"")}}var k=("cmp_ref" in p)?p.cmp_ref:location.href;var q=n.createElement("script");q.setAttribute("data-cmp-ab","1");var c=g("cmpdesign","");var a=g("cmpregulationkey","");q.src=j+"//"+p.cmp_host+"/delivery/cmp.php?"+("cmp_id" in p&&p.cmp_id>0?"id="+p.cmp_id:"")+("cmp_cdid" in p?"cdid="+p.cmp_cdid:"")+"&h="+encodeURIComponent(k)+(c!=""?"&cmpdesign="+encodeURIComponent(c):"")+(a!=""?"&cmpregulationkey="+encodeURIComponent(a):"")+("cmp_params" in p?"&"+p.cmp_params:"")+(n.cookie.length>0?"&__cmpfcc=1":"")+"&l="+f.toLowerCase()+"&o="+(new Date()).getTime();q.type="text/javascript";q.async=true;if(n.currentScript){n.currentScript.parentElement.appendChild(q)}else{if(n.body){n.body.appendChild(q)}else{var m=n.getElementsByTagName("body");if(m.length==0){m=n.getElementsByTagName("div")}if(m.length==0){m=n.getElementsByTagName("span")}if(m.length==0){m=n.getElementsByTagName("ins")}if(m.length==0){m=n.getElementsByTagName("script")}if(m.length==0){m=n.getElementsByTagName("head")}if(m.length>0){m[0].appendChild(q)}}}var q=n.createElement("script");q.src=j+"//"+p.cmp_cdn+"/delivery/js/cmp"+b+".min.js";q.type="text/javascript";q.setAttribute("data-cmp-ab","1");q.async=true;if(n.currentScript){n.currentScript.parentElement.appendChild(q)}else{if(n.body){n.body.appendChild(q)}else{var m=n.getElementsByTagName("body");if(m.length==0){m=n.getElementsByTagName("div")}if(m.length==0){m=n.getElementsByTagName("span")}if(m.length==0){m=n.getElementsByTagName("ins")}if(m.length==0){m=n.getElementsByTagName("script")}if(m.length==0){m=n.getElementsByTagName("head")}if(m.length>0){m[0].appendChild(q)}}}})();window.cmp_addFrame=function(b){if(!window.frames[b]){if(document.body){var a=document.createElement("iframe");a.style.cssText="display:none";a.name=b;document.body.appendChild(a)}else{window.setTimeout(window.cmp_addFrame,10,b)}}};window.cmp_rc=function(h){var b=document.cookie;var f="";var d=0;while(b!=""&&d<100){d++;while(b.substr(0,1)==" "){b=b.substr(1,b.length)}var g=b.substring(0,b.indexOf("="));if(b.indexOf(";")!=-1){var c=b.substring(b.indexOf("=")+1,b.indexOf(";"))}else{var c=b.substr(b.indexOf("=")+1,b.length)}if(h==g){f=c}var e=b.indexOf(";")+1;if(e==0){e=b.length}b=b.substring(e,b.length)}return(f)};window.cmp_stub=function(){var a=arguments;__cmapi.a=__cmapi.a||[];if(!a.length){return __cmapi.a}else{if(a[0]==="ping"){if(a[1]===2){a[2]({gdprApplies:gdprAppliesGlobally,cmpLoaded:false,cmpStatus:"stub",displayStatus:"hidden",apiVersion:"2.0",cmpId:31},true)}else{a[2](false,true)}}else{if(a[0]==="getUSPData"){a[2]({version:1,uspString:window.cmp_rc("")},true)}else{if(a[0]==="getTCData"){__cmapi.a.push([].slice.apply(a))}else{if(a[0]==="addEventListener"||a[0]==="removeEventListener"){__cmapi.a.push([].slice.apply(a))}else{if(a.length==4&&a[3]===false){a[2]({},false)}else{__cmapi.a.push([].slice.apply(a))}}}}}}};window.cmp_msghandler=function(d){var a=typeof d.data==="string";try{var c=a?JSON.parse(d.data):d.data}catch(f){var c=null}if(typeof(c)==="object"&&c!==null&&"__cmpCall" in c){var b=c.__cmpCall;window.__cmp(b.command,b.parameter,function(h,g){var e={__cmpReturn:{returnValue:h,success:g,callId:b.callId}};d.source.postMessage(a?JSON.stringify(e):e,"*")})}if(typeof(c)==="object"&&c!==null&&"__cmapiCall" in c){var b=c.__cmapiCall;window.__cmapi(b.command,b.parameter,function(h,g){var e={__cmapiReturn:{returnValue:h,success:g,callId:b.callId}};d.source.postMessage(a?JSON.stringify(e):e,"*")})}if(typeof(c)==="object"&&c!==null&&"__uspapiCall" in c){var b=c.__uspapiCall;window.__uspapi(b.command,b.version,function(h,g){var e={__uspapiReturn:{returnValue:h,success:g,callId:b.callId}};d.source.postMessage(a?JSON.stringify(e):e,"*")})}if(typeof(c)==="object"&&c!==null&&"__tcfapiCall" in c){var b=c.__tcfapiCall;window.__tcfapi(b.command,b.version,function(h,g){var e={__tcfapiReturn:{returnValue:h,success:g,callId:b.callId}};d.source.postMessage(a?JSON.stringify(e):e,"*")},b.parameter)}};window.cmp_setStub=function(a){if(!(a in window)||(typeof(window[a])!=="function"&&typeof(window[a])!=="object"&&(typeof(window[a])==="undefined"||window[a]!==null))){window[a]=window.cmp_stub;window[a].msgHandler=window.cmp_msghandler;window.addEventListener("message",window.cmp_msghandler,false)}};window.cmp_addFrame("__cmapiLocator");window.cmp_addFrame("__cmpLocator");window.cmp_addFrame("__uspapiLocator");window.cmp_addFrame("__tcfapiLocator");window.cmp_setStub("__cmapi");window.cmp_setStub("__cmp");window.cmp_setStub("__tcfapi");window.cmp_setStub("__uspapi");</script>';
+        return '<script>window.gdprAppliesGlobally=true;if(!("cmp_id" in window)||window.cmp_id<1){window.cmp_id=' . $id . '}if(!("cmp_cdid" in window)){window.cmp_cdid="' . $codeID . '"}if(!("cmp_params" in window)){window.cmp_params=""}if(!("cmp_host" in window)){window.cmp_host="' . $host . '"}if(!("cmp_cdn" in window)){window.cmp_cdn="' . $cdn . '"}if(!("cmp_proto" in window)){window.cmp_proto="https:"}if(!("cmp_codesrc" in window)){window.cmp_codesrc="10"}window.cmp_getsupportedLangs=function(){var b=["DE","EN","FR","IT","NO","DA","FI","ES","PT","RO","BG","ET","EL","GA","HR","LV","LT","MT","NL","PL","SV","SK","SL","CS","HU","RU","SR","ZH","TR","UK","AR","BS"];if("cmp_customlanguages" in window){for(var a=0;a<window.cmp_customlanguages.length;a++){b.push(window.cmp_customlanguages[a].l.toUpperCase())}}return b};window.cmp_getRTLLangs=function(){return["AR"]};window.cmp_getlang=function(j){if(typeof(j)!="boolean"){j=true}if(j&&typeof(cmp_getlang.usedlang)=="string"&&cmp_getlang.usedlang!==""){return cmp_getlang.usedlang}var g=window.cmp_getsupportedLangs();var c=[];var f=location.hash;var e=location.search;var a="languages" in navigator?navigator.languages:[];if(f.indexOf("cmplang=")!=-1){c.push(f.substr(f.indexOf("cmplang=")+8,2).toUpperCase())}else{if(e.indexOf("cmplang=")!=-1){c.push(e.substr(e.indexOf("cmplang=")+8,2).toUpperCase())}else{if("cmp_setlang" in window&&window.cmp_setlang!=""){c.push(window.cmp_setlang.toUpperCase())}else{if(a.length>0){for(var d=0;d<a.length;d++){c.push(a[d])}}}}}if("language" in navigator){c.push(navigator.language)}if("userLanguage" in navigator){c.push(navigator.userLanguage)}var h="";for(var d=0;d<c.length;d++){var b=c[d].toUpperCase();if(g.indexOf(b)!=-1){h=b;break}if(b.indexOf("-")!=-1){b=b.substr(0,2)}if(g.indexOf(b)!=-1){h=b;break}}if(h==""&&typeof(cmp_getlang.defaultlang)=="string"&&cmp_getlang.defaultlang!==""){return cmp_getlang.defaultlang}else{if(h==""){h="EN"}}h=h.toUpperCase();return h};(function(){var n=document;var p=window;var f="";var b="_en";if("cmp_getlang" in p){f=p.cmp_getlang().toLowerCase();if("cmp_customlanguages" in p){for(var h=0;h<p.cmp_customlanguages.length;h++){if(p.cmp_customlanguages[h].l.toUpperCase()==f.toUpperCase()){f="en";break}}}b="_"+f}function g(e,d){var l="";e+="=";var i=e.length;if(location.hash.indexOf(e)!=-1){l=location.hash.substr(location.hash.indexOf(e)+i,9999)}else{if(location.search.indexOf(e)!=-1){l=location.search.substr(location.search.indexOf(e)+i,9999)}else{return d}}if(l.indexOf("&")!=-1){l=l.substr(0,l.indexOf("&"))}return l}var j=("cmp_proto" in p)?p.cmp_proto:"https:";var o=["cmp_id","cmp_params","cmp_host","cmp_cdn","cmp_proto"];for(var h=0;h<o.length;h++){if(g(o[h],"%%%")!="%%%"){window[o[h]]=g(o[h],"")}}var k=("cmp_ref" in p)?p.cmp_ref:location.href;var q=n.createElement("script");q.setAttribute("data-cmp-ab","1");var c=g("cmpdesign","");var a=g("cmpregulationkey","");q.src=j+"//"+p.cmp_host+"/delivery/cmp.php?"+("cmp_id" in p&&p.cmp_id>0?"id="+p.cmp_id:"")+("cmp_cdid" in p?"cdid="+p.cmp_cdid:"")+"&h="+encodeURIComponent(k)+(c!=""?"&cmpdesign="+encodeURIComponent(c):"")+(a!=""?"&cmpregulationkey="+encodeURIComponent(a):"")+("cmp_params" in p?"&"+p.cmp_params:"")+(n.cookie.length>0?"&__cmpfcc=1":"")+"&l="+f.toLowerCase()+"&o="+(new Date()).getTime();q.type="text/javascript";q.async=true;if(n.currentScript){n.currentScript.parentElement.appendChild(q)}else{if(n.body){n.body.appendChild(q)}else{var m=n.getElementsByTagName("body");if(m.length==0){m=n.getElementsByTagName("div")}if(m.length==0){m=n.getElementsByTagName("span")}if(m.length==0){m=n.getElementsByTagName("ins")}if(m.length==0){m=n.getElementsByTagName("script")}if(m.length==0){m=n.getElementsByTagName("head")}if(m.length>0){m[0].appendChild(q)}}}var q=n.createElement("script");q.src=j+"//"+p.cmp_cdn+"/delivery/js/cmp"+b+".min.js";q.type="text/javascript";q.setAttribute("data-cmp-ab","1");q.async=true;if(n.currentScript){n.currentScript.parentElement.appendChild(q)}else{if(n.body){n.body.appendChild(q)}else{var m=n.getElementsByTagName("body");if(m.length==0){m=n.getElementsByTagName("div")}if(m.length==0){m=n.getElementsByTagName("span")}if(m.length==0){m=n.getElementsByTagName("ins")}if(m.length==0){m=n.getElementsByTagName("script")}if(m.length==0){m=n.getElementsByTagName("head")}if(m.length>0){m[0].appendChild(q)}}}})();window.cmp_addFrame=function(b){if(!window.frames[b]){if(document.body){var a=document.createElement("iframe");a.style.cssText="display:none";a.name=b;document.body.appendChild(a)}else{window.setTimeout(window.cmp_addFrame,10,b)}}};window.cmp_rc=function(h){var b=document.cookie;var f="";var d=0;while(b!=""&&d<100){d++;while(b.substr(0,1)==" "){b=b.substr(1,b.length)}var g=b.substring(0,b.indexOf("="));if(b.indexOf(";")!=-1){var c=b.substring(b.indexOf("=")+1,b.indexOf(";"))}else{var c=b.substr(b.indexOf("=")+1,b.length)}if(h==g){f=c}var e=b.indexOf(";")+1;if(e==0){e=b.length}b=b.substring(e,b.length)}return(f)};window.cmp_stub=function(){var a=arguments;__cmapi.a=__cmapi.a||[];if(!a.length){return __cmapi.a}else{if(a[0]==="ping"){if(a[1]===2){a[2]({gdprApplies:gdprAppliesGlobally,cmpLoaded:false,cmpStatus:"stub",displayStatus:"hidden",apiVersion:"2.0",cmpId:31},true)}else{a[2](false,true)}}else{if(a[0]==="getUSPData"){a[2]({version:1,uspString:window.cmp_rc("")},true)}else{if(a[0]==="getTCData"){__cmapi.a.push([].slice.apply(a))}else{if(a[0]==="addEventListener"||a[0]==="removeEventListener"){__cmapi.a.push([].slice.apply(a))}else{if(a.length==4&&a[3]===false){a[2]({},false)}else{__cmapi.a.push([].slice.apply(a))}}}}}}};window.cmp_msghandler=function(d){var a=typeof d.data==="string";try{var c=a?JSON.parse(d.data):d.data}catch(f){var c=null}if(typeof(c)==="object"&&c!==null&&"__cmpCall" in c){var b=c.__cmpCall;window.__cmp(b.command,b.parameter,function(h,g){var e={__cmpReturn:{returnValue:h,success:g,callId:b.callId}};d.source.postMessage(a?JSON.stringify(e):e,"*")})}if(typeof(c)==="object"&&c!==null&&"__cmapiCall" in c){var b=c.__cmapiCall;window.__cmapi(b.command,b.parameter,function(h,g){var e={__cmapiReturn:{returnValue:h,success:g,callId:b.callId}};d.source.postMessage(a?JSON.stringify(e):e,"*")})}if(typeof(c)==="object"&&c!==null&&"__uspapiCall" in c){var b=c.__uspapiCall;window.__uspapi(b.command,b.version,function(h,g){var e={__uspapiReturn:{returnValue:h,success:g,callId:b.callId}};d.source.postMessage(a?JSON.stringify(e):e,"*")})}if(typeof(c)==="object"&&c!==null&&"__tcfapiCall" in c){var b=c.__tcfapiCall;window.__tcfapi(b.command,b.version,function(h,g){var e={__tcfapiReturn:{returnValue:h,success:g,callId:b.callId}};d.source.postMessage(a?JSON.stringify(e):e,"*")},b.parameter)}};window.cmp_setStub=function(a){if(!(a in window)||(typeof(window[a])!=="function"&&typeof(window[a])!=="object"&&(typeof(window[a])==="undefined"||window[a]!==null))){window[a]=window.cmp_stub;window[a].msgHandler=window.cmp_msghandler;window.addEventListener("message",window.cmp_msghandler,false)}};window.cmp_addFrame("__cmapiLocator");window.cmp_addFrame("__cmpLocator");window.cmp_addFrame("__uspapiLocator");window.cmp_addFrame("__tcfapiLocator");window.cmp_setStub("__cmapi");window.cmp_setStub("__cmp");window.cmp_setStub("__tcfapi");window.cmp_setStub("__uspapi");</script>';
     }
 

consent-manager/trunk/assets/css/admin.css

@@ -9 +9 @@
 .consentmanager_admin label {
     min-width: 175px;
-    max-width: 175px;
-    width: 175px;
+    max-width: 350px;
+    width: 100%;
     vertical-align: top;
     display: inline-block;
@@ -52 +52 @@
     background-color: #d5d5d5;
 }
-.consentmanager_admin #help_btn{
-    position: absolute;
-    bottom: 20px;
-    right: 20px;
-}
 .consentmanager_admin .container_half{
     width: calc(50% - 2px);
@@ -65 +60 @@
     vertical-align: top;
 }
+.consentmanager_flex{
+    display: flex;
+}
+.consentmanager_img{
+    width: 100%;
+    max-width: 400px;
+}

consent-manager/trunk/consentmanager.php

@@ -5 +5 @@
 Plugin Name: consentmanager
 Description: consentmanager is the easiest way to reach the new privacy standard | GDPR/CCPA/PIPEDA/LGPD/PIPA Cookie Solution | Consent Management Provider
-Version: 2.0.4
+Version: 2.0.5
 Author: consentmanager
 Author URI: https://www.consentmanager.net
@@ -16 +16 @@
     function consentmanager_add_autoblocking()
     {
-
         $cmpID = intval(get_option(ConsentManagerMain::getOptionID(), 0));
         $cmpCodeID = esc_attr(get_option(ConsentManagerMain::getOptionCodeID(), ''));
 
-        if (!empty($cmpCodeID)) {
-            $src = 'https://' . ConsentManagerMain::getCDN() . '/delivery/autoblocking/' . $cmpCodeID . '.js';
+        $removeProtocol = ['http://', 'https://'];
+
+        $host = esc_attr(get_option(ConsentManagerMain::getOptionHost(), ''));
+        if ($host == '') {
+            $host = esc_attr(get_option(ConsentManagerMain::getHost(), 'delivery.consentmanager.net'));
         } else {
-            $src = 'https://' . ConsentManagerMain::getCDN() . '/delivery/autoblock/' . $cmpID . '.js';
-        }
-
-        if (empty($cmpCodeID)) {
+            $host = str_replace($removeProtocol, '', $host);
+        }
+
+        $cdn = esc_attr(get_option(ConsentManagerMain::getOptionCDN(), ''));
+        if ($cdn == '') {
+            $cdn = esc_attr(get_option(ConsentManagerMain::getCDN(), 'cdn.consentmanager.net'));
+        } else {
+            $cdn = str_replace($removeProtocol, '', $cdn);
+        }
+
+        if ($cmpCodeID != '') {
+            $src = 'https://' . $cdn . '/delivery/autoblocking/' . $cmpCodeID . '.js';
+        } else {
+            $src = 'https://' . $cdn . '/delivery/autoblock/' . $cmpID . '.js';
+        }
+
+        if ($cmpCodeID == '') {
             $dataCmpID = 'data-cmp-id="' . $cmpID . '"';
         } else {
@@ -32 +47 @@
         }
         ?>
-        <script type="text/javascript" src="<?php echo esc_url($src); ?>" data-cmp-ab="1" data-cmp-host="<?php echo esc_attr(ConsentManagerMain::getHost()) ?>" data-cmp-cdn="<?php echo esc_attr(ConsentManagerMain::getCDN()); ?>" data-cmp-codesrc="10" <?php echo $dataCmpID ?>></script>
+        <script type="text/javascript" src="<?php echo esc_url($src); ?>" data-cmp-ab="1"
+                data-cmp-host="<?php echo $host; ?>"
+                data-cmp-cdn="<?php echo $cdn; ?>"
+                data-cmp-codesrc="10" <?php echo $dataCmpID ?>></script>
         <?php
     }
@@ -74 +92 @@
                  */
 
-                wp_enqueue_style('consentmanager_registerStyle', esc_url('https://' . ConsentManagerMain::getCDN() . '/delivery/cmp.min.css'));
                 add_action('wp_print_scripts', 'consentmanager_semiblocking');
             }
@@ -91 +108 @@
         $cmpCodeID = esc_attr(get_option(ConsentManagerMain::getOptionCodeID(), ''));
         $mode = intval(get_option(ConsentManagerMain::getOptionMode(), 0));
-
-        if ($cmpID > 0 || !empty($cmpCodeID)) {
+        $host = esc_attr(get_option(ConsentManagerMain::getOptionHost(), ''));
+        if ($host == '') {
+            $host = esc_attr(get_option(ConsentManagerMain::getHost(), 'delivery.consentmanager.net'));
+        }
+        $cdn = esc_attr(get_option(ConsentManagerMain::getOptionCDN(), ''));
+        if ($cdn == '') {
+            $cdn = esc_attr(get_option(ConsentManagerMain::getCDN(), 'cdn.consentmanager.net'));
+        }
+
+        if ($cmpID > 0 || $cmpCodeID != '') {
             //serverside automatic & clientside semi automatic
             if ($mode != 1) {
-                echo ConsentManagerMain::getSemiBlockingCode($cmpID, $cmpCodeID);
+                echo ConsentManagerMain::getSemiBlockingCode($cmpID, $cmpCodeID, $host, $cdn);
             }
         }
@@ -113 +138 @@
         $cmpID = intval(get_option(ConsentManagerMain::getOptionID(), 0));
         $cmpCodeID = esc_attr(get_option(ConsentManagerMain::getOptionCodeID(), ''));
-
-        if (!empty($cmpCodeID)) {
-            $src = esc_url('https://' . ConsentManagerMain::getHost() . '/delivery/vendorlist.php?cdid=' . $cmpCodeID);
+        $host = esc_attr(get_option(ConsentManagerMain::getOptionHost(), ''));
+        if ($host == '') {
+            $host = esc_attr(get_option(ConsentManagerMain::getHost(), 'delivery.consentmanager.net'));
+        }
+
+        if ($cmpCodeID != '') {
+            $src = esc_url('https://' . $host . '/delivery/vendorlist.php?cdid=' . $cmpCodeID);
             return esc_html('<div id="cmpvendorlist"></div><script src="' . $src . '" type="text/javascript" async></script>');
         } else if ($cmpID > 0) {
-            $src = esc_url('https://' . ConsentManagerMain::getHost() . '/delivery/vendorlist.php?id=' . $cmpID);
+            $src = esc_url('https://' . $host . '/delivery/vendorlist.php?id=' . $cmpID);
             return esc_html('<div id="cmpvendorlist"></div><script src="' . $src . '" type="text/javascript" async></script>');
         }
@@ -134 +163 @@
         $cmpID = intval(get_option(ConsentManagerMain::getOptionID(), 0));
         $cmpCodeID = esc_attr(get_option(ConsentManagerMain::getOptionCodeID(), ''));
-
-        if (!empty($cmpCodeID)) {
-            $src = esc_url('https://' . ConsentManagerMain::getHost() . '/delivery/cookieinfo.php?cdid=' . $cmpCodeID);
+        $host = esc_attr(get_option(ConsentManagerMain::getOptionHost(), ''));
+        if ($host == '') {
+            $host = esc_attr(get_option(ConsentManagerMain::getHost(), 'delivery.consentmanager.net'));
+        }
+
+        if ($cmpCodeID != '') {
+            $src = esc_url('https://' . $host . '/delivery/cookieinfo.php?cdid=' . $cmpCodeID);
             return esc_html('<div id="cmpcookieinfo"></div><script src="' . $src . '" type="text/javascript" async></script>');
         } else if ($cmpID > 0) {
-            $src = esc_url('https://' . ConsentManagerMain::getHost() . '/delivery/cookieinfo.php?id=' . $cmpID);
+            $src = esc_url('https://' . $host . '/delivery/cookieinfo.php?id=' . $cmpID);
             return esc_html('<div id="cmpcookieinfo"></div><script src="' . $src . '" type="text/javascript" async></script>');
         }
@@ -247 +280 @@
      }
     }
+
+
 
 

consent-manager/trunk/readme.txt

@@ -1 +1 @@
 === consentmanager ===
-Contributors: andrelange
+Contributors: Falko Berg
 Donate link: no donate-link provided
 Tags: privacy, DSGVO, GDPR, IAB, CMP, consent, advertising, cookie, banner, CCPA, data protection, eprivacy, TCF
 Requires at least: 3.0
 Tested up to: 5.9
-Stable tag: 2.0.4
+Stable tag: 2.0.5
 Requires PHP: 5.4
 License: GPLv2

consent-manager/trunk/views/admin.php

@@ -15 +15 @@
     check_admin_referer(ConsentManagerMain::getAdminUrl())
 ) {
+    //      temporary deactivated until found perfomance solution for serverside blocking
+//    $ignoreDomains = isset($_POST['consent_manager_ignore_domains']) ? sanitize_text_field($_POST['consent_manager_ignore_domains']) : '';
     $mode = intval($_POST['consent_manager_mode']);
     $cmpID = intval($_POST['consent_manager_id']);
     $cmpCodeID = sanitize_text_field($_POST['consent_manager_code_id']);
-//      temporary deactivated until found perfomance solution for serverside blocking
-//    $ignoreDomains = isset($_POST['consent_manager_ignore_domains']) ? sanitize_text_field($_POST['consent_manager_ignore_domains']) : '';
-
+    $host = isset($_POST['consent_manager_host']) ? sanitize_text_field($_POST['consent_manager_host']) : '';
+    $cdn = isset($_POST['consent_manager_cdn']) ? sanitize_text_field($_POST['consent_manager_cdn']) : '';
     $hideOnEditor = isset($_POST['consent_manager_hide_on_editor']) ? intval($_POST['consent_manager_hide_on_editor']) : 0;
 
@@ -27 +28 @@
         update_option(ConsentManagerMain::getOptionCodeID(), $cmpCodeID);
         update_option(ConsentManagerMain::getOptionMode(), $mode);
-//temporary deactivated until found perfomance solution for serverside blocking
+        update_option(ConsentManagerMain::getHideOnEditor(), $hideOnEditor);
+        update_option(ConsentManagerMain::getOptionHost(), $host);
+        update_option(ConsentManagerMain::getOptionCDN(), $cdn);
+        //temporary deactivated until found perfomance solution for serverside blocking
 //        update_option(ConsentManagerMain::getOptionIgnoreDomains(), $ignoreDomains);
-        update_option(ConsentManagerMain::getHideOnEditor(), $hideOnEditor);
     } catch (Exception $e) {
         $error = $e->getMessage();
@@ -65 +68 @@
 <?php endif; ?>
 <div clasS="wrapper">
-    <div class="container_half">
+    <div>
         <p><i>Please insert your consentmanager Credentials here:</i></p>
 
@@ -72 +75 @@
             <?php echo wp_nonce_field(esc_url(ConsentManagerMain::getAdminUrl())) ?>
 
-            <p>
-                <label>CMP ID:<br><i>(consentmanager account => CMPs => get Code => ID)</i></label>
-                <input placeholder="Example: 123456" type="text" name="consent_manager_id" id="consent_manager_id"
-                       value="<?php echo intval(get_option(ConsentManagerMain::OPTION_ID, 0)); ?>"/>
-                <br>
-                <br>
-                <img width="430px"
+            <div class="consentmanager_flex">
+                <div>
+                    <label>CMP ID:</label>
+                    <input placeholder="Example: 123456" type="text" name="consent_manager_id" id="consent_manager_id"
+                           value="<?php echo intval(get_option(ConsentManagerMain::OPTION_ID, 0)); ?>"/>
+                    <br>
+                    <i>(consentmanager account => CMPs => get Code => ID)</i>
+                </div>
+                <img class="consentmanager_img"
                      src="<?php echo esc_url(plugin_dir_url(__DIR__) . '/assets/images/cmpid.png', '__FILE__'); ?>"
                      alt="CMP ID"/>
-            </p>
-            <p>
-                <label>CMP Code-ID:<i>(consentmanager account => CMPs => get Code => Code-ID)</i></label>
-                <input placeholder="Example: asdf5hk783" type="text" name="consent_manager_code_id"
-                       id="consent_manager_code_id"
-                       value="<?php echo esc_attr(get_option(ConsentManagerMain::OPTION_CODEID, '')); ?>"/>
-                <br>
-                <br>
-                <img width="430px"
+            </div>
+            <hr>
+            <div class="consentmanager_flex">
+                <div>
+                    <label>CMP Code-ID:</label>
+                    <input placeholder="Example: asdf5hk783" type="text" name="consent_manager_code_id"
+                           id="consent_manager_code_id"
+                           value="<?php echo esc_attr(get_option(ConsentManagerMain::OPTION_CODEID, '')); ?>"/>
+                    <br>
+                    <i>(consentmanager account => CMPs => get Code => Code-ID)</i>
+                </div>
+                <img class="consentmanager_img"
                      src="<?php echo esc_url(plugin_dir_url(__DIR__) . 'assets/images/cmpcodeid.png', '__FILE__'); ?>"
                      alt="CMP Code ID"/>
-            </p>
-            <p>
-                <label>Blocking Mode:</label>
-                <select name="consent_manager_mode" id="consent_manager_mode">
-                    <option value="1" <?php echo intval(get_option(ConsentManagerMain::getOptionMode(), 0)) == 1 ? 'selected' : ''; ?>><?php _e("Automatic clientside blocking"); ?></option>
-                    <option value="3" <?php echo intval(get_option(ConsentManagerMain::getOptionMode(), 0)) == 3 ? 'selected' : ''; ?>><?php _e("Semiautomatic Code"); ?></option>
-                </select>
-            </p>
-            <p>
-                <label for="consent_manager_hide_on_editor">Hide for logged-in users?</label>
-                <input value="1" type="checkbox" id="consent_manager_hide_on_editor"
-                       name="consent_manager_hide_on_editor" <?php echo((intval(get_option(ConsentManagerMain::getHideOnEditor(), 0)) == 1) ? 'checked="checked"' : ''); ?>>
-            </p>
+            </div>
+            <hr>
+            <div class="consentmanager_flex">
+                <div>
+                    <label>Host:</label>
+                    <input placeholder="Example: delivery.consentmanager.net" type="text" name="consent_manager_host"
+                           id="consent_manager_host"
+                           value="<?php echo esc_attr(get_option(ConsentManagerMain::OPTION_HOST, '')); ?>"/>
+                    <br>
+                    <i>(consentmanager account => CMPs => get Code => Host)</i>
+                </div>
+                <img class="consentmanager_img"
+                     src="<?php echo esc_url(plugin_dir_url(__DIR__) . 'assets/images/cmphost.png', '__FILE__'); ?>"
+                     alt="CMP host"/>
+            </div>
+            <hr>
+            <div class="consentmanager_flex">
+                <div>
+                    <label>CDN:</label>
+                    <input placeholder="Example: cdn.consentmanager.net" type="text" name="consent_manager_cdn"
+                           id="consent_manager_cdn"
+                           value="<?php echo esc_attr(get_option(ConsentManagerMain::OPTION_CDN, '')); ?>"/>
+                    <br>
+                    <i>(consentmanager account => CMPs => get Code => CDN)</i>
+                </div>
+                <img class="consentmanager_img"
+                     src="<?php echo esc_url(plugin_dir_url(__DIR__) . 'assets/images/cmpcdn.png', '__FILE__'); ?>"
+                     alt="CMP CDN"/>
+            </div>
+            <hr>
+            <div class="consentmanager_flex">
+                <div>
+                    <label>Blocking Mode:</label>
+                    <select name="consent_manager_mode" id="consent_manager_mode">
+                        <option value="1" <?php echo intval(get_option(ConsentManagerMain::getOptionMode(), 0)) == 1 ? 'selected' : ''; ?>><?php _e("Automatic clientside blocking"); ?></option>
+                        <option value="3" <?php echo intval(get_option(ConsentManagerMain::getOptionMode(), 0)) == 3 ? 'selected' : ''; ?>><?php _e("Semiautomatic Code"); ?></option>
+                    </select>
+                </div>
+                <div>
+                    <h4>Automatic Clientside</h4>
+                    <p>Javascript based blocking of 3rd party scripts listed in your consentmanager account.</p>
+                    <h4>Semiautomatic Clientside</h4>
+                    <p>Blocks all scripts that you marked in your code.</p>
+                    <a target="_blank"
+                       href="https://help.consentmanager.net/books/cmp/page/how-to-block-third-party-codes-cookies-if-no-consent-is-given">Difference
+                        between blocking modes</a>
+                </div>
+            </div>
+            <hr>
+            <div class="consentmanager_flex">
+                <div>
+                    <label for="consent_manager_hide_on_editor">Hide for logged-in users?</label>
+                    <input value="1" type="checkbox" id="consent_manager_hide_on_editor"
+                           name="consent_manager_hide_on_editor" <?php echo((intval(get_option(ConsentManagerMain::getHideOnEditor(), 0)) == 1) ? 'checked="checked"' : ''); ?>>
+                </div>
+            </div>
 
             <?php submit_button(); ?>
 
         </form>
-        <p>
+        <div>
             <i>If you don’t yet have an ID, please get in touch with us at: <a target="_blank"
                                                                                href="mailto:[email protected]">[email protected]</a></i>
-        </p>
+            <br>
+            <a target="_blank"
+               href="https://help.consentmanager.net/">consentmanager documentation & Help</a>
+        </div>
     </div>
-    <div class="container_half">
-        <h4>Automatic Clientside</h4>
-        <p>Javascript based blocking of 3rd party scripts listed in your consentmanager account.</p>
-        <h4>Semiautomatic Clientside</h4>
-        <p>Blocks all scripts that you marked in your code.</p>
-    </div>
-    <a target="_blank"
-       href="https://help.consentmanager.net/books/cmp/page/how-to-integrate-the-cmp-into-a-wordpress-website"
-       id="help_btn" class="btn">consentmanager Wordpress Integration Help</a><br>
-    <a target="_blank"
-       href="https://help.consentmanager.net/books/cmp/page/how-to-block-third-party-codes-cookies-if-no-consent-is-given"
-       id="help_btn" class="btn">Difference between blocking modes</a><br>
 </div>