Changeset 3095958

hcaptcha-for-forms-and-more/tags/4.2.0/assets/css/settings-base.css

-                      r3086102
+                      r3095958
+}
+.hcaptcha-header-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 0;
+}
 #hcaptcha-options h2 {
     font-size: 1.5em;
 …
         z-index: 1;
+    }
+}
+    .hcaptcha-settings-tab {
+        margin-right: 15px;
+    }
+}

hcaptcha-for-forms-and-more/tags/4.2.0/assets/css/settings-base.min.css

r3086102	r3095958
1		body.settings_page_hcaptcha{background:#f0f2f5;color:#5c6f8a}.wrap h1.hcaptcha-settings-header{align-items:center;display:flex;font-size:34px;font-weight:700}.hcaptcha-logo{height:64px;margin:10px 5px 10px 0}.hcaptcha-settings-tabs{background:#fff;display:flex;flex-wrap:wrap;justify-content:space-between;line-height:4.5em;margin:10px -20px 0;padding:0 20px}.hcaptcha-settings-tab{border-bottom:2px solid transparent;color:#646970;display:inline-block;font-size:1.1em;margin-right:30px;text-decoration:none}.hcaptcha-settings-tab:hover{border-bottom-color:#025176!important;border-bottom:2px solid;color:#666}.hcaptcha-settings-tab.active{border-bottom:2px solid #0075ab}#hcaptcha-options h2{color:#5c6f8a;font-size:1.5em}#hcaptcha-options h3{color:#5c6f8a;margin:1.5em 0 1em}#hcaptcha-options .notice-dismiss:before{color:#5c6f8a}#hcaptcha-options table tbody tr td{margin:0;padding:0;position:relative}#hcaptcha-options table tr td input[type=checkbox]{border:none;box-shadow:none;display:inline;height:1.25rem;margin:-.125rem .5rem 0 0;width:2.3611rem}#hcaptcha-options table tr td input[type=checkbox]:before{background:url(../images/checkbox-off.svg);background-size:cover;content:"";display:inline-block;height:1.25rem;margin:0;width:2.3611rem}#hcaptcha-options table tr td input[type=checkbox]:checked:before{background:no-repeat url(../images/checkbox-on.svg);background-size:cover}#hcaptcha-options fieldset:disabled{color:#dadada}#hcaptcha-options .button-primary{background-color:#026593;border-color:#026593;color:#fff}#hcaptcha-options .button-primary:hover{background-color:#025176}#hcaptcha-options .button-secondary{background-color:#fff;border-color:#026593;color:#026593}#hcaptcha-options .button-secondary:hover{background-color:#ccc}#hcaptcha-options a{color:#0075ab}#hcaptcha-navigation a{border-color:#0075ab}#hcaptcha-options a.hcaptcha-settings-tab{color:#5c6f8a}#hcaptcha-options .helper:before{background:#5c6f8a;border-radius:1.2em;color:#fff;content:"?";height:1.2em;position:absolute;right:0;text-align:center;top:0;transform:translateY(-26px);width:1.2em}#hcaptcha-options fieldset+.helper:before{top:50%;transform:translate(25px,-.8em)}#hcaptcha-options .helper .helper-content{background:#5c6f8a;box-sizing:border-box;color:#f0f2f5;display:none;padding:.5em 1em;position:absolute;right:0;top:0;transform:translate(1px,10px);width:100%}#hcaptcha-options fieldset+.helper .helper-content{top:50%;transform:translate(25px,25px);width:calc(100% + 25px)}#hcaptcha-options .helper:hover{cursor:help}#hcaptcha-options .helper:hover .helper-content{display:block;z-index:1}#hcaptcha-options .helper .helper-content:after{border:10px solid transparent;border-bottom-color:#5c6f8a;content:"";position:absolute;right:0;top:0;transform:translateY(-100%)}#hcaptcha-options .helper .helper-content a{color:#fff}#hcaptcha-message{box-sizing:border-box}#hcaptcha-message p{font-size:13px;font-weight:600;line-height:1.5;margin:.5em 0}@keyframes blink{0%{opacity:1}16.7%{opacity:0}33.3%{opacity:1}50%{opacity:0}66.7%{opacity:1}83.3%{opacity:0}to{opacity:1}}.blink{animation:blink 3s linear}.hcaptcha-hide{display:none}.hcaptcha-excerpt{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.hcaptcha-excerpt:hover .hcaptcha-hide{background:#5c6f8a;border:1px solid #c3c4c7;border-radius:6px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);color:#f0f2f5;display:block;left:0;max-width:300px;padding:8px 10px;position:absolute;text-align:center;top:0;white-space:normal;width:max-content;z-index:1}@media (max-width:782px){.hcaptcha-settings-tabs{margin:10px -12px 0 -10px;padding:0 12px 0 10px}}@media (max-width:600px){#hcaptcha-options table tbody{grid-template-columns:1fr}#hcaptcha-options table tbody tr{position:relative}#hcaptcha-options fieldset+.helper:before{transform:translateY(-.7em)}#hcaptcha-options fieldset+.helper .helper-content{transform:translateY(25px);width:100%}#hcaptcha-options .helper{z-index:1}}
	1	body.settings_page_hcaptcha{background:#f0f2f5;color:#5c6f8a}.wrap h1.hcaptcha-settings-header{align-items:center;display:flex;font-size:34px;font-weight:700}.hcaptcha-logo{height:64px;margin:10px 5px 10px 0}.hcaptcha-settings-tabs{background:#fff;display:flex;flex-wrap:wrap;justify-content:space-between;line-height:4.5em;margin:10px -20px 0;padding:0 20px}.hcaptcha-settings-tab{border-bottom:2px solid transparent;color:#646970;display:inline-block;font-size:1.1em;margin-right:30px;text-decoration:none}.hcaptcha-settings-tab:hover{border-bottom-color:#025176!important;border-bottom:2px solid;color:#666}.hcaptcha-settings-tab.active{border-bottom:2px solid #0075ab}.hcaptcha-header-bar{align-items:center;display:flex;justify-content:space-between;margin:0}#hcaptcha-options h2{color:#5c6f8a;font-size:1.5em}#hcaptcha-options h3{color:#5c6f8a;margin:1.5em 0 1em}#hcaptcha-options .notice-dismiss:before{color:#5c6f8a}#hcaptcha-options table tbody tr td{margin:0;padding:0;position:relative}#hcaptcha-options table tr td input[type=checkbox]{border:none;box-shadow:none;display:inline;height:1.25rem;margin:-.125rem .5rem 0 0;width:2.3611rem}#hcaptcha-options table tr td input[type=checkbox]:before{background:url(../images/checkbox-off.svg);background-size:cover;content:"";display:inline-block;height:1.25rem;margin:0;width:2.3611rem}#hcaptcha-options table tr td input[type=checkbox]:checked:before{background:no-repeat url(../images/checkbox-on.svg);background-size:cover}#hcaptcha-options fieldset:disabled{color:#dadada}#hcaptcha-options .button-primary{background-color:#026593;border-color:#026593;color:#fff}#hcaptcha-options .button-primary:hover{background-color:#025176}#hcaptcha-options .button-secondary{background-color:#fff;border-color:#026593;color:#026593}#hcaptcha-options .button-secondary:hover{background-color:#ccc}#hcaptcha-options a{color:#0075ab}#hcaptcha-navigation a{border-color:#0075ab}#hcaptcha-options a.hcaptcha-settings-tab{color:#5c6f8a}#hcaptcha-options .helper:before{background:#5c6f8a;border-radius:1.2em;color:#fff;content:"?";height:1.2em;position:absolute;right:0;text-align:center;top:0;transform:translateY(-26px);width:1.2em}#hcaptcha-options fieldset+.helper:before{top:50%;transform:translate(25px,-.8em)}#hcaptcha-options .helper .helper-content{background:#5c6f8a;box-sizing:border-box;color:#f0f2f5;display:none;padding:.5em 1em;position:absolute;right:0;top:0;transform:translate(1px,10px);width:100%}#hcaptcha-options fieldset+.helper .helper-content{top:50%;transform:translate(25px,25px);width:calc(100% + 25px)}#hcaptcha-options .helper:hover{cursor:help}#hcaptcha-options .helper:hover .helper-content{display:block;z-index:1}#hcaptcha-options .helper .helper-content:after{border:10px solid transparent;border-bottom-color:#5c6f8a;content:"";position:absolute;right:0;top:0;transform:translateY(-100%)}#hcaptcha-options .helper .helper-content a{color:#fff}#hcaptcha-message{box-sizing:border-box}#hcaptcha-message p{font-size:13px;font-weight:600;line-height:1.5;margin:.5em 0}@keyframes blink{0%{opacity:1}16.7%{opacity:0}33.3%{opacity:1}50%{opacity:0}66.7%{opacity:1}83.3%{opacity:0}to{opacity:1}}.blink{animation:blink 3s linear}.hcaptcha-hide{display:none}.hcaptcha-excerpt{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.hcaptcha-excerpt:hover .hcaptcha-hide{background:#5c6f8a;border:1px solid #c3c4c7;border-radius:6px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);color:#f0f2f5;display:block;left:0;max-width:300px;padding:8px 10px;position:absolute;text-align:center;top:0;white-space:normal;width:max-content;z-index:1}@media (max-width:782px){.hcaptcha-settings-tabs{margin:10px -12px 0 -10px;padding:0 12px 0 10px}}@media (max-width:600px){#hcaptcha-options table tbody{grid-template-columns:1fr}#hcaptcha-options table tbody tr{position:relative}#hcaptcha-options fieldset+.helper:before{transform:translateY(-.7em)}#hcaptcha-options fieldset+.helper .helper-content{transform:translateY(25px);width:100%}#hcaptcha-options .helper{z-index:1}.hcaptcha-settings-tab{margin-right:15px}}

hcaptcha-for-forms-and-more/tags/4.2.0/assets/js/events.js

-                      r3086102
+                      r3095958
 /**
+ * @param HCaptchaEventsObject.failed
+ * @param HCaptchaEventsObject.failedLabel
  * @param HCaptchaEventsObject.succeed
- * @param HCaptchaEventsObject.failed
  * @param HCaptchaEventsObject.succeedLabel
  * @param HCaptchaEventsObject.failedLabel
+ * @param HCaptchaEventsObject.unit
  */
 document.addEventListener( 'DOMContentLoaded', function() {
 …
                         },
                         tooltipFormat: 'dd.MM.yyyy HH:mm',
+                        unit: HCaptchaEventsObject.unit,
                     },
                 },

hcaptcha-for-forms-and-more/tags/4.2.0/assets/js/events.min.js

r3086102	r3095958
1		document.addEventListener("DOMContentLoaded",(function(){var e=document.getElementById("eventsChart"),t=window.innerWidth>600?3:2;new Chart(e,{type:"bar",data:{datasets:[{label:HCaptchaEventsObject.succeedLabel,data:HCaptchaEventsObject.succeed,borderWidth:1},{label:HCaptchaEventsObject.failedLabel,data:HCaptchaEventsObject.failed,borderWidth:1}]},options:{responsive:!0,maintainAspectRatio:!0,aspectRatio:t,scales:{x:{type:"time",time:{displayFormats:{millisecond:"HH:mm:ss",second:"HH:mm:ss",minute:"HH:mm",hour:"HH:mm",day:"dd.MM.yyyy",week:"dd.MM.yyyy",month:"dd.MM.yyyy",quarter:"dd.MM.yyyy",year:"dd.MM.yyyy"},tooltipFormat:"dd.MM.yyyy HH:mm"}},y:{beginAtZero:!0,ticks:{precision:0}}}}})}));
	1	document.addEventListener("DOMContentLoaded",(function(){var e=document.getElementById("eventsChart"),t=window.innerWidth>600?3:2;new Chart(e,{type:"bar",data:{datasets:[{label:HCaptchaEventsObject.succeedLabel,data:HCaptchaEventsObject.succeed,borderWidth:1},{label:HCaptchaEventsObject.failedLabel,data:HCaptchaEventsObject.failed,borderWidth:1}]},options:{responsive:!0,maintainAspectRatio:!0,aspectRatio:t,scales:{x:{type:"time",time:{displayFormats:{millisecond:"HH:mm:ss",second:"HH:mm:ss",minute:"HH:mm",hour:"HH:mm",day:"dd.MM.yyyy",week:"dd.MM.yyyy",month:"dd.MM.yyyy",quarter:"dd.MM.yyyy",year:"dd.MM.yyyy"},tooltipFormat:"dd.MM.yyyy HH:mm",unit:HCaptchaEventsObject.unit}},y:{beginAtZero:!0,ticks:{precision:0}}}}})}));

hcaptcha-for-forms-and-more/tags/4.2.0/assets/js/forms.js

-                      r3086102
+                      r3095958
  * @param HCaptchaFormsObject.served
  * @param HCaptchaFormsObject.servedLabel
+ * @param HCaptchaFormsObject.unit
  */
 document.addEventListener( 'DOMContentLoaded', function() {
 …
                         },
                         tooltipFormat: 'dd.MM.yyyy HH:mm',
+                        unit: HCaptchaFormsObject.unit,
                     },
                 },

hcaptcha-for-forms-and-more/tags/4.2.0/assets/js/forms.min.js

r3086102	r3095958
1		document.addEventListener("DOMContentLoaded",(function(){var e=document.getElementById("formsChart"),t=window.innerWidth>600?3:2;new Chart(e,{type:"bar",data:{datasets:[{label:HCaptchaFormsObject.servedLabel,backgroundColor:"rgba(2,101,147,0.5)",data:HCaptchaFormsObject.served,borderWidth:1}]},options:{responsive:!0,maintainAspectRatio:!0,aspectRatio:t,scales:{x:{type:"time",time:{displayFormats:{millisecond:"HH:mm:ss",second:"HH:mm:ss",minute:"HH:mm",hour:"HH:mm",day:"dd.MM.yyyy",week:"dd.MM.yyyy",month:"dd.MM.yyyy",quarter:"dd.MM.yyyy",year:"dd.MM.yyyy"},tooltipFormat:"dd.MM.yyyy HH:mm"}},y:{beginAtZero:!0,ticks:{precision:0}}}}})}));
	1	document.addEventListener("DOMContentLoaded",(function(){var t=document.getElementById("formsChart"),e=window.innerWidth>600?3:2;new Chart(t,{type:"bar",data:{datasets:[{label:HCaptchaFormsObject.servedLabel,backgroundColor:"rgba(2,101,147,0.5)",data:HCaptchaFormsObject.served,borderWidth:1}]},options:{responsive:!0,maintainAspectRatio:!0,aspectRatio:e,scales:{x:{type:"time",time:{displayFormats:{millisecond:"HH:mm:ss",second:"HH:mm:ss",minute:"HH:mm",hour:"HH:mm",day:"dd.MM.yyyy",week:"dd.MM.yyyy",month:"dd.MM.yyyy",quarter:"dd.MM.yyyy",year:"dd.MM.yyyy"},tooltipFormat:"dd.MM.yyyy HH:mm",unit:HCaptchaFormsObject.unit}},y:{beginAtZero:!0,ticks:{precision:0}}}}})}));

hcaptcha-for-forms-and-more/tags/4.2.0/assets/js/general.js

-                      r3081325
+                      r3095958
     function getCleanConsoleLogs() {
+        const ignore = [ 'recaptchacompat disabled' ];
+        const ignore = [
+            'recaptchacompat disabled',
+            'Missing sitekey - https://hcaptcha.com/docs/configuration#jsapi',
+        ];
         const logs = [];
 …
         const sampleHCaptcha = document.querySelector( '#hcaptcha-options .h-captcha' );
         sampleHCaptcha.innerHTML = '';
+        // Map the theme to the palette mode.
+        params.theme = params?.theme?.palette?.mode;
+        if ( ! params.theme ) {
+            // Remove the theme if it's not set.
+            delete params.theme;
+        }
         for ( const key in params ) {

hcaptcha-for-forms-and-more/tags/4.2.0/assets/js/general.min.js

r3081325	r3095958
1		(()=>{var t={};function e(t){return e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},e(t)}t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this\|\|new Function("return this")()}catch(t){if("object"==typeof window)return window}}();var a=function(a){var n="#hcaptcha-message",c=a(n),o=a("form.hcaptcha-general"),r=a('[name="hcaptcha_settings[site_key]"]'),i=a('[name="hcaptcha_settings[secret_key]"]'),s=a("#check_config"),l=a("#reset_notifications"),h=a('[name="hcaptcha_settings[theme]"]'),p=a('[name="hcaptcha_settings[size]"]'),u=a('[name="hcaptcha_settings[language]"]'),d=a('[name="hcaptcha_settings[mode]"]'),f=a('[name="hcaptcha_settings[custom_themes][]"]'),v=a(".hcaptcha-general-custom-prop select"),m=a(".hcaptcha-general-custom-value input"),g=a('[name="hcaptcha_settings[config_params]"]'),b=a(".hcaptcha-section-enterprise + table input"),y=a('[name="hcaptcha_settings[recaptcha_compat_off][]"]'),C=o.find("#submit"),j={},O=r.val(),H=i.val(),k=T();j[HCaptchaGeneralObject.modeLive]=HCaptchaGeneralObject.siteKey,j[HCaptchaGeneralObject.modeTestPublisher]=HCaptchaGeneralObject.modeTestPublisherSiteKey,j[HCaptchaGeneralObject.modeTestEnterpriseSafeEndUser]=HCaptchaGeneralObject.modeTestEnterpriseSafeEndUserSiteKey,j[HCaptchaGeneralObject.modeTestEnterpriseBotDetected]=HCaptchaGeneralObject.modeTestEnterpriseBotDetectedSiteKey;var G=!1,S=!1,_=[];function w(t){var e={};return t.each((function(){var t=a(this),n=t.attr("name").replace(/hcaptcha_settings\[(.+)]/,"$1");e[n]=t.val()})),e}function T(){return w(b)}function A(){c.remove(),a('<div id="hcaptcha-message"></div>').insertAfter("#hcaptcha-options h2"),c=a(n)}function E(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(t=void 0===t?"":String(t),t=(t+="\n"+function(){for(var t=["recaptchacompat disabled"],e=[],a=0;a<_.length;a++){for(var n=_[a],c=n[0],o=n[1],r=Object.keys(o),i=[],s=0;s<r.length;s++){var l=o[s];"string"==typeof l&&-1===t.indexOf(l)&&i.push([c,l].join(" "))}e.push(i.join("\n"))}return _=[],e.join("\n")}()).trim()){c.removeClass(),c.addClass(e+" notice is-dismissible");var n=t.split("\n").map((function(t){return"<p>".concat(t,"</p>")}));c.html(n.join("")),a(document).trigger("wp-updates-notice-added");var o=a("#wpwrap").position().top;a("html, body").animate({scrollTop:c.offset().top-o-parseInt(c.css("margin-bottom"))},1e3)}}function x(){E(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"","notice-success")}function N(){E(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"","notice-error")}function L(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=Object.assign(hCaptcha.getParams(),t);hCaptcha.setParams(e);var a=document.querySelector("#hcaptcha-options .h-captcha");for(var n in a.innerHTML="",t)a.setAttribute("data-".concat(n),"".concat(t[n]));hCaptcha.bindEvents()}function K(t,a){var n=function(t){return t&&"object"===e(t)};return n(t)&&n(a)?(Object.keys(a).forEach((function(e){var c=t[e],o=a[e];Array.isArray(c)&&Array.isArray(o)?t[e]=c.concat(o):n(c)&&n(o)?t[e]=K(Object.assign({},c),o):t[e]=o})),t):a}function U(t){var a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";for(var n in t){var c=a?"".concat(a,"--").concat(n):n;if("object"===e(t[n])&&null!==t[n])U(t[n],c);else{var o=t[n],r=c.replace(/theme--/g,""),i="".concat(r,"=").concat(o),s=v.find('option[value*="'.concat(r,'="]'));1===s.length&&(s.attr("value",i),s.is(":selected")&&m.val(o))}}}function B(){var t,e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},a=g.val().trim();a=a\|\|null;try{t=JSON.parse(a)}catch(t){return g.css("background-color","#ffabaf"),C.attr("disabled",!0),void N("Bad JSON!")}t=K(t,e),g.val(JSON.stringify(t,null,2)),U(t),f.prop("checked")\|\|(t={sitekey:r.val(),theme:h.val(),size:p.val(),hl:u.val()}),L(t)}function P(){r.val()===O&&i.val()===H?(G=!1,A(),C.attr("disabled",!1)):G\|\|(G=!0,N(HCaptchaGeneralObject.checkConfigNotice),C.attr("disabled",!0))}function J(t){return t=t.replace(/(http\|https):\/\//,""),"https://"+new URL("https://"+t).host}!function(){_=[];var t=console.log,e=console.warn,a=console.info,n=console.error,c=console.clear;console.log=function(e){_.push(["Console log:",arguments]),t.apply(console,arguments)},console.warn=function(t){_.push(["Console warn:",arguments]),e.apply(console,arguments)},console.info=function(t){_.push(["Console info:",arguments]),a.apply(console,arguments)},console.error=function(t){_.push(["Console error:",arguments]),n.apply(console,arguments)},console.clear=function(){_=[],c()}}(),document.addEventListener("hCaptchaLoaded",(function(){N()})),s.on("click",(function(t){t.preventDefault(),""!==a(".hcaptcha-general-sample-hcaptcha iframe").attr("data-hcaptcha-response")?function(){A(),C.attr("disabled",!0);var t={action:HCaptchaGeneralObject.checkConfigAction,nonce:HCaptchaGeneralObject.checkConfigNonce,mode:d.val(),siteKey:r.val(),secretKey:i.val(),"h-captcha-response":a('textarea[name="h-captcha-response"]').val()};a.post({url:HCaptchaGeneralObject.ajaxUrl,data:t,beforeSend:function(){return x(HCaptchaGeneralObject.checkingConfigMsg)}}).done((function(t){t.success?(O=r.val(),H=i.val(),k=w(b),S=!1,x(t.data),C.attr("disabled",!1)):N(t.data)})).fail((function(t){N(t.statusText)})).always((function(){L()}))}():kaggDialog.confirm({title:HCaptchaGeneralObject.completeHCaptchaTitle,content:HCaptchaGeneralObject.completeHCaptchaContent,type:"info",buttons:{ok:{text:HCaptchaGeneralObject.OKBtnText}},onAction:function(){return window.hCaptchaReset(document.querySelector(".hcaptcha-general-sample-hcaptcha"))}})})),r.on("change",(function(t){L({sitekey:a(t.target).val()}),P()})),i.on("change",(function(){P()})),h.on("change",(function(t){L({theme:a(t.target).val()})})),p.on("change",(function(t){var e=a("#hcaptcha-invisible-notice"),n=a(t.target).val();"invisible"===n?e.show():e.hide(),L({size:n})})),u.on("change",(function(t){L({hl:a(t.target).val()})})),d.on("change",(function(t){var e=a(t.target).val();j.hasOwnProperty(e)&&(e===HCaptchaGeneralObject.modeLive?(r.attr("disabled",!1),i.attr("disabled",!1)):(r.attr("disabled",!0),i.attr("disabled",!0)),L({sitekey:j[e]}))})),f.on("change",(function(){B()})),g.on("blur",(function(){B()})),g.on("focus",(function(){g.css("background-color","unset"),C.attr("disabled",!1)})),b.on("change",(function(){!function(){var e={onload:"hCaptchaOnLoad",render:"explicit"};y.prop("checked")&&(e.recaptchacompat="off"),f.prop("checked")&&(e.custom="true");var a={asset_host:"assethost",endpoint:"endpoint",host:"host",image_host:"imghost",report_api:"reportapi",sentry:"sentry"},n=T();for(var c in a){var o=n[c].trim();o&&(e[a[c]]=encodeURIComponent(J(o)))}var r=n.api_host.trim();r=J(r=r\|\|"js.hcaptcha.com")+"/1/api.js";var i=new URL(r);for(var s in e)i.searchParams.append(s,e[s]);document.getElementById("hcaptcha-api").remove(),delete t.g.hcaptcha,document.querySelector("#hcaptcha-options .h-captcha").innerHTML="";var l=document.getElementsByTagName("head")[0],h=document.createElement("script");h.type="text/javascript",h.id="hcaptcha-api",h.src=i.href,l.appendChild(h)}(),JSON.stringify(T())===JSON.stringify(k)?(S=!1,A(),C.attr("disabled",!1)):S\|\|(S=!0,N(HCaptchaGeneralObject.checkConfigNotice),C.attr("disabled",!0))})),a(".hcaptcha-general h3").on("click",(function(t){var e=a(t.currentTarget);e.toggleClass("closed");var n={action:HCaptchaGeneralObject.toggleSectionAction,nonce:HCaptchaGeneralObject.toggleSectionNonce,section:e.attr("class").replaceAll(/(hcaptcha-section-\|closed)/g,"").trim(),status:!e.hasClass("closed")};a.post({url:HCaptchaGeneralObject.ajaxUrl,data:n}).done((function(t){t.success\|\|N(t.data)})).fail((function(t){N(t.statusText)}))})),s.removeAttr("name"),l.removeAttr("name"),v.removeAttr("name"),m.removeAttr("name"),v.find("option").each((function(){var t=a(this);t.val().split("=")[1]\|\|t.attr("disabled",!0)})),m.val(""),v.on("change",(function(){var t=a(this).find("option:selected").val().split("="),e=t[0],n=t[1];"palette--mode"===e?(m.attr("type","text"),m.val(n)):(m.val(n),m.attr("type","color"))})),m.on("change",(function(t){var e=a(t.target).val(),n=v.find("option:selected"),c=n.val().split("="),o=c[0],r=e;n.val(o+"="+e),B(r=(o="theme--"+c[0]).split("--").reverse().reduce((function(t,e){var a={};return a[e]=t,a}),r))}))};window.hCaptchaGeneral=a,jQuery(document).ready(a)})();
	1	(()=>{var e={};function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},t(e)}e.g=function(){if("object"==typeof globalThis)return globalThis;try{return this\|\|new Function("return this")()}catch(e){if("object"==typeof window)return window}}();var a=function(a){var n="#hcaptcha-message",c=a(n),o=a("form.hcaptcha-general"),r=a('[name="hcaptcha_settings[site_key]"]'),i=a('[name="hcaptcha_settings[secret_key]"]'),s=a("#check_config"),l=a("#reset_notifications"),h=a('[name="hcaptcha_settings[theme]"]'),p=a('[name="hcaptcha_settings[size]"]'),u=a('[name="hcaptcha_settings[language]"]'),d=a('[name="hcaptcha_settings[mode]"]'),f=a('[name="hcaptcha_settings[custom_themes][]"]'),v=a(".hcaptcha-general-custom-prop select"),m=a(".hcaptcha-general-custom-value input"),g=a('[name="hcaptcha_settings[config_params]"]'),b=a(".hcaptcha-section-enterprise + table input"),y=a('[name="hcaptcha_settings[recaptcha_compat_off][]"]'),C=o.find("#submit"),j={},O=r.val(),H=i.val(),k=T();j[HCaptchaGeneralObject.modeLive]=HCaptchaGeneralObject.siteKey,j[HCaptchaGeneralObject.modeTestPublisher]=HCaptchaGeneralObject.modeTestPublisherSiteKey,j[HCaptchaGeneralObject.modeTestEnterpriseSafeEndUser]=HCaptchaGeneralObject.modeTestEnterpriseSafeEndUserSiteKey,j[HCaptchaGeneralObject.modeTestEnterpriseBotDetected]=HCaptchaGeneralObject.modeTestEnterpriseBotDetectedSiteKey;var G=!1,S=!1,_=[];function w(e){var t={};return e.each((function(){var e=a(this),n=e.attr("name").replace(/hcaptcha_settings\[(.+)]/,"$1");t[n]=e.val()})),t}function T(){return w(b)}function A(){c.remove(),a('<div id="hcaptcha-message"></div>').insertAfter("#hcaptcha-options h2"),c=a(n)}function E(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(e=void 0===e?"":String(e),e=(e+="\n"+function(){for(var e=["recaptchacompat disabled","Missing sitekey - https://hcaptcha.com/docs/configuration#jsapi"],t=[],a=0;a<_.length;a++){for(var n=_[a],c=n[0],o=n[1],r=Object.keys(o),i=[],s=0;s<r.length;s++){var l=o[s];"string"==typeof l&&-1===e.indexOf(l)&&i.push([c,l].join(" "))}t.push(i.join("\n"))}return _=[],t.join("\n")}()).trim()){c.removeClass(),c.addClass(t+" notice is-dismissible");var n=e.split("\n").map((function(e){return"<p>".concat(e,"</p>")}));c.html(n.join("")),a(document).trigger("wp-updates-notice-added");var o=a("#wpwrap").position().top;a("html, body").animate({scrollTop:c.offset().top-o-parseInt(c.css("margin-bottom"))},1e3)}}function x(){E(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"","notice-success")}function N(){E(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"","notice-error")}function L(){var e,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},a=Object.assign(hCaptcha.getParams(),t);hCaptcha.setParams(a);var n=document.querySelector("#hcaptcha-options .h-captcha");for(var c in n.innerHTML="",t.theme=null==t\|\|null===(e=t.theme)\|\|void 0===e\|\|null===(e=e.palette)\|\|void 0===e?void 0:e.mode,t.theme\|\|delete t.theme,t)n.setAttribute("data-".concat(c),"".concat(t[c]));hCaptcha.bindEvents()}function K(e,a){var n=function(e){return e&&"object"===t(e)};return n(e)&&n(a)?(Object.keys(a).forEach((function(t){var c=e[t],o=a[t];Array.isArray(c)&&Array.isArray(o)?e[t]=c.concat(o):n(c)&&n(o)?e[t]=K(Object.assign({},c),o):e[t]=o})),e):a}function U(e){var a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";for(var n in e){var c=a?"".concat(a,"--").concat(n):n;if("object"===t(e[n])&&null!==e[n])U(e[n],c);else{var o=e[n],r=c.replace(/theme--/g,""),i="".concat(r,"=").concat(o),s=v.find('option[value*="'.concat(r,'="]'));1===s.length&&(s.attr("value",i),s.is(":selected")&&m.val(o))}}}function B(){var e,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},a=g.val().trim();a=a\|\|null;try{e=JSON.parse(a)}catch(e){return g.css("background-color","#ffabaf"),C.attr("disabled",!0),void N("Bad JSON!")}e=K(e,t),g.val(JSON.stringify(e,null,2)),U(e),f.prop("checked")\|\|(e={sitekey:r.val(),theme:h.val(),size:p.val(),hl:u.val()}),L(e)}function P(){r.val()===O&&i.val()===H?(G=!1,A(),C.attr("disabled",!1)):G\|\|(G=!0,N(HCaptchaGeneralObject.checkConfigNotice),C.attr("disabled",!0))}function J(e){return e=e.replace(/(http\|https):\/\//,""),"https://"+new URL("https://"+e).host}!function(){_=[];var e=console.log,t=console.warn,a=console.info,n=console.error,c=console.clear;console.log=function(t){_.push(["Console log:",arguments]),e.apply(console,arguments)},console.warn=function(e){_.push(["Console warn:",arguments]),t.apply(console,arguments)},console.info=function(e){_.push(["Console info:",arguments]),a.apply(console,arguments)},console.error=function(e){_.push(["Console error:",arguments]),n.apply(console,arguments)},console.clear=function(){_=[],c()}}(),document.addEventListener("hCaptchaLoaded",(function(){N()})),s.on("click",(function(e){e.preventDefault(),""!==a(".hcaptcha-general-sample-hcaptcha iframe").attr("data-hcaptcha-response")?function(){A(),C.attr("disabled",!0);var e={action:HCaptchaGeneralObject.checkConfigAction,nonce:HCaptchaGeneralObject.checkConfigNonce,mode:d.val(),siteKey:r.val(),secretKey:i.val(),"h-captcha-response":a('textarea[name="h-captcha-response"]').val()};a.post({url:HCaptchaGeneralObject.ajaxUrl,data:e,beforeSend:function(){return x(HCaptchaGeneralObject.checkingConfigMsg)}}).done((function(e){e.success?(O=r.val(),H=i.val(),k=w(b),S=!1,x(e.data),C.attr("disabled",!1)):N(e.data)})).fail((function(e){N(e.statusText)})).always((function(){L()}))}():kaggDialog.confirm({title:HCaptchaGeneralObject.completeHCaptchaTitle,content:HCaptchaGeneralObject.completeHCaptchaContent,type:"info",buttons:{ok:{text:HCaptchaGeneralObject.OKBtnText}},onAction:function(){return window.hCaptchaReset(document.querySelector(".hcaptcha-general-sample-hcaptcha"))}})})),r.on("change",(function(e){L({sitekey:a(e.target).val()}),P()})),i.on("change",(function(){P()})),h.on("change",(function(e){L({theme:a(e.target).val()})})),p.on("change",(function(e){var t=a("#hcaptcha-invisible-notice"),n=a(e.target).val();"invisible"===n?t.show():t.hide(),L({size:n})})),u.on("change",(function(e){L({hl:a(e.target).val()})})),d.on("change",(function(e){var t=a(e.target).val();j.hasOwnProperty(t)&&(t===HCaptchaGeneralObject.modeLive?(r.attr("disabled",!1),i.attr("disabled",!1)):(r.attr("disabled",!0),i.attr("disabled",!0)),L({sitekey:j[t]}))})),f.on("change",(function(){B()})),g.on("blur",(function(){B()})),g.on("focus",(function(){g.css("background-color","unset"),C.attr("disabled",!1)})),b.on("change",(function(){!function(){var t={onload:"hCaptchaOnLoad",render:"explicit"};y.prop("checked")&&(t.recaptchacompat="off"),f.prop("checked")&&(t.custom="true");var a={asset_host:"assethost",endpoint:"endpoint",host:"host",image_host:"imghost",report_api:"reportapi",sentry:"sentry"},n=T();for(var c in a){var o=n[c].trim();o&&(t[a[c]]=encodeURIComponent(J(o)))}var r=n.api_host.trim();r=J(r=r\|\|"js.hcaptcha.com")+"/1/api.js";var i=new URL(r);for(var s in t)i.searchParams.append(s,t[s]);document.getElementById("hcaptcha-api").remove(),delete e.g.hcaptcha,document.querySelector("#hcaptcha-options .h-captcha").innerHTML="";var l=document.getElementsByTagName("head")[0],h=document.createElement("script");h.type="text/javascript",h.id="hcaptcha-api",h.src=i.href,l.appendChild(h)}(),JSON.stringify(T())===JSON.stringify(k)?(S=!1,A(),C.attr("disabled",!1)):S\|\|(S=!0,N(HCaptchaGeneralObject.checkConfigNotice),C.attr("disabled",!0))})),a(".hcaptcha-general h3").on("click",(function(e){var t=a(e.currentTarget);t.toggleClass("closed");var n={action:HCaptchaGeneralObject.toggleSectionAction,nonce:HCaptchaGeneralObject.toggleSectionNonce,section:t.attr("class").replaceAll(/(hcaptcha-section-\|closed)/g,"").trim(),status:!t.hasClass("closed")};a.post({url:HCaptchaGeneralObject.ajaxUrl,data:n}).done((function(e){e.success\|\|N(e.data)})).fail((function(e){N(e.statusText)}))})),s.removeAttr("name"),l.removeAttr("name"),v.removeAttr("name"),m.removeAttr("name"),v.find("option").each((function(){var e=a(this);e.val().split("=")[1]\|\|e.attr("disabled",!0)})),m.val(""),v.on("change",(function(){var e=a(this).find("option:selected").val().split("="),t=e[0],n=e[1];"palette--mode"===t?(m.attr("type","text"),m.val(n)):(m.val(n),m.attr("type","color"))})),m.on("change",(function(e){var t=a(e.target).val(),n=v.find("option:selected"),c=n.val().split("="),o=c[0],r=t;n.val(o+"="+t),B(r=(o="theme--"+c[0]).split("--").reverse().reduce((function(e,t){var a={};return a[t]=e,a}),r))}))};window.hCaptchaGeneral=a,jQuery(document).ready(a)})();

hcaptcha-for-forms-and-more/tags/4.2.0/assets/js/integrations.js

-                      r3064004
+                      r3095958
+        }
+        function updateActivationStati( stati ) {
+            const $tables = $( '.form-table' );
+            for ( const [ key, status ] of Object.entries( stati ) ) {
+                const statusClass = 'hcaptcha-integrations-' + key.replace( /_/g, '-' );
+                const $tr = $( `tr.${ statusClass }` );
+                const currStatus = isActiveTable( $tr.closest( '.form-table' ) );
+                if ( currStatus !== status ) {
+                    const $toTable = $tables.eq( status ? 0 : 1 );
+                    const alt = $tr.find( '.hcaptcha-integrations-logo img' ).attr( 'alt' );
+                    insertIntoTable( $toTable, alt, $tr );
+                }
+            }
+        }
         function toggleActivation() {
             const activateClass = activate ? 'on' : 'off';
 …
                 data,
             } )
+                /**
+                 * @param {Object} response.data
+                 * @param {Object} response.data.defaultTheme
+                 * @param {Object} response.data.message
+                 * @param {Object} response.data.stati
+                 * @param {Object} response.data.themes
+                 * @param {Object} response.success
+                 */
                 .done( function( response ) {
                     if ( response.success === undefined ) {
 …
                     insertIntoTable( $table, alt, $tr );
                     showSuccessMessage( response.data.message );
+                    updateActivationStati( response.data.stati );
                     $( 'html, body' ).animate(
 …
             const search = $search.val().trim().toLowerCase();
             const $logo = $( '.hcaptcha-integrations-logo img' );
+            let $trFirst = null;
             $logo.each( function( i, el ) {
 …
                 if ( $el.data( 'label' ).toLowerCase().includes( search ) ) {
                     $tr.show();
+                    $trFirst = $trFirst ?? $tr;
                 } else {
                     $tr.hide();
+                }
             } );
+            if ( ! $trFirst ) {
+                return;
+            }
+            const scrollTop = $trFirst.offset().top + $trFirst.outerHeight() - $( window ).height() + 5;
+            $( 'html' ).stop().animate(
+                { scrollTop },
+            );
         },

hcaptcha-for-forms-and-more/tags/4.2.0/assets/js/integrations.min.js

r3064004	r3095958
1		(()=>{var t=function(t){var e="#hcaptcha-message",a=t(e),n=t("#wpwrap"),i=t("#adminmenuwrap"),o=t("#hcaptcha-integrations-search");function c(e,o){a.removeClass(),a.addClass(o+" notice settings-error is-dismissible"),a.html("<p>".concat(e,"</p>")),t(document).trigger("wp-updates-notice-added");var c=a.clone();a.css("visibility","hidden"),c.css("margin","0px"),c.css("top",n.position().top),c.css("z-index","999999");var s="block"===i.css("display")?i.width():0;c.css("left",s),c.width(t(window).width()-s),c.css("position","fixed"),t("body").append(c),setTimeout((function(){a.css("visibility","unset"),c.remove()}),3e3)}function s(t){c(t,"notice-error")}function r(e,a,n){var i=!1,o=a.toLowerCase(),c=!function(t){return t.is(jQuery(".form-table").eq(0))}(e),s=n.find("fieldset");s.attr("disabled",c),s.find("input").attr("disabled",c),e.find("tbody").children().each((function(e,a){var c=t(a).find(".hcaptcha-integrations-logo img").attr("alt");if((c=(c=c\|\|"").replace(" Logo","")).toLowerCase()>o)return n.insertBefore(t(a)),i=!0,!1})),i\|\|e.find("tbody").append(n)}t(".form-table img").on("click",(function(i){function o(){var e,i,o=u?"on":"off",l=(i=document.querySelector(".kagg-dialog select"))&&null!==(e=i.value)&&void 0!==e?e:"",f={action:HCaptchaIntegrationsObject.action,nonce:HCaptchaIntegrationsObject.nonce,activate:u,entity:d,status:g,newTheme:l};p.addClass(o),t.post({url:HCaptchaIntegrationsObject.ajaxUrl,data:f}).done((function(e){if(void 0!==e.success)if(void 0!==e.data.themes&&(window.HCaptchaIntegrationsObject.themes=e.data.themes,window.HCaptchaIntegrationsObject.defaultTheme=e.data.defaultTheme),e.success){var i=t(".form-table").eq(u?0:1),o=n.position().top;!function(e,a,n){if("theme"===a){var i=t(".form-table"),o=e?"":'[data-label="'+n+'"]',c=i.eq(e?0:1).find('.hcaptcha-integrations-logo img[data-entity="theme"]'+o);if(c.length){var s=i.eq(e?1:0),l=c.closest("tr");r(s,c.attr("data-label"),l)}}}(u,d,l),r(i,h,p),function(t){c(t,"notice-success")}(e.data.message),t("html, body").animate({scrollTop:p.offset().top-o-a.outerHeight()},1e3)}else{var g,f;s(null!==(g=null===(f=e.data)\|\|void 0===f?void 0:f.message)&&void 0!==g?g:e.data)}else c(HCaptchaIntegrationsObject.unexpectedErrorMsg,"notice-error")})).fail((function(t){s(t.statusText)})).always((function(){p.removeClass("on off")}))}i.preventDefault(),a.remove(),t('<div id="hcaptcha-message"></div>').insertAfter("#hcaptcha-options h2"),a=t(e);var l=t(i.target),d=l.data("entity");if(d=d\|\|"",-1!==t.inArray(d,["core","theme","plugin"])&&-1===t.inArray(d,["core"])){var h=l.attr("alt");h=(h=h\|\|"").replace(" Logo","");var p=l.closest("tr"),g=p.attr("class");g=g.replace("hcaptcha-integrations-","");var f,u,m="";if(p.find("fieldset").attr("disabled"))f="plugin"===d?HCaptchaIntegrationsObject.activateMsg:HCaptchaIntegrationsObject.activateThemeMsg,u=!0;else{if("plugin"===d)f=HCaptchaIntegrationsObject.deactivateMsg;else{for(var v in f=HCaptchaIntegrationsObject.deactivateThemeMsg,m="<p>"+HCaptchaIntegrationsObject.selectThemeMsg+"</p>",m+="<select>",HCaptchaIntegrationsObject.themes){var b=v===HCaptchaIntegrationsObject.defaultTheme?' selected="selected"':"";m+='<option value="'.concat(v,'"').concat(b,">").concat(HCaptchaIntegrationsObject.themes[v],"</option>")}m+="</select>"}u=!1}-1===t.inArray(d,["theme"])\|\|u\|\|0!==Object.keys(HCaptchaIntegrationsObject.themes).length?(f=f.replace("%s",h),i.ctrlKey?o():kaggDialog.confirm({title:f,content:m,type:u?"activate":"deactivate",buttons:{ok:{text:HCaptchaIntegrationsObject.OKBtnText},cancel:{text:HCaptchaIntegrationsObject.CancelBtnText}},onAction:function(t){t&&o()}})):kaggDialog.confirm({title:HCaptchaIntegrationsObject.onlyOneThemeMsg,content:"",type:"info",buttons:{ok:{text:HCaptchaIntegrationsObject.OKBtnText}}})}}));var l,d,h;o.on("input",(l=function(){var e=o.val().trim().toLowerCase();t(".hcaptcha-integrations-logo img").each((function(a,n){var i=t(n);if("core"!==i.data("entity")){var o=i.closest("tr");i.data("label").toLowerCase().includes(e)?o.show():o.hide()}}))},d=100,function(){var t=this,e=arguments;clearTimeout(h),h=setTimeout((function(){return l.apply(t,e)}),d)})),t("#hcaptcha-options").keydown((function(e){t(e.target).is(o)&&13===e.which&&e.preventDefault()}))};window.hCaptchaIntegrations=t,jQuery(document).ready(t)})();
	1	(()=>{function t(t,a){return function(t){if(Array.isArray(t))return t}(t)\|\|function(t,e){var a=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]\|\|t["@@iterator"];if(null!=a){var n,i,o,r,c=[],s=!0,l=!1;try{if(o=(a=a.call(t)).next,0===e){if(Object(a)!==a)return;s=!1}else for(;!(s=(n=o.call(a)).done)&&(c.push(n.value),c.length!==e);s=!0);}catch(t){l=!0,i=t}finally{try{if(!s&&null!=a.return&&(r=a.return(),Object(r)!==r))return}finally{if(l)throw i}}return c}}(t,a)\|\|function(t,a){if(!t)return;if("string"==typeof t)return e(t,a);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n\|\|"Set"===n)return Array.from(t);if("Arguments"===n\|\|/^(?:Ui\|I)nt(?:8\|16\|32)(?:Clamped)?Array$/.test(n))return e(t,a)}(t,a)\|\|function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function e(t,e){(null==e\|\|e>t.length)&&(e=t.length);for(var a=0,n=new Array(e);a<e;a++)n[a]=t[a];return n}var a=function(e){var a="#hcaptcha-message",n=e(a),i=e("#wpwrap"),o=e("#adminmenuwrap"),r=e("#hcaptcha-integrations-search");function c(t,a){n.removeClass(),n.addClass(a+" notice settings-error is-dismissible"),n.html("<p>".concat(t,"</p>")),e(document).trigger("wp-updates-notice-added");var r=n.clone();n.css("visibility","hidden"),r.css("margin","0px"),r.css("top",i.position().top),r.css("z-index","999999");var c="block"===o.css("display")?o.width():0;r.css("left",c),r.width(e(window).width()-c),r.css("position","fixed"),e("body").append(r),setTimeout((function(){n.css("visibility","unset"),r.remove()}),3e3)}function s(t){c(t,"notice-error")}function l(t){return t.is(jQuery(".form-table").eq(0))}function u(t,a,n){var i=!1,o=a.toLowerCase(),r=!l(t),c=n.find("fieldset");c.attr("disabled",r),c.find("input").attr("disabled",r),t.find("tbody").children().each((function(t,a){var r=e(a).find(".hcaptcha-integrations-logo img").attr("alt");if((r=(r=r\|\|"").replace(" Logo","")).toLowerCase()>o)return n.insertBefore(e(a)),i=!0,!1})),i\|\|t.find("tbody").append(n)}e(".form-table img").on("click",(function(o){function r(){var a,o,r=v?"on":"off",d=(o=document.querySelector(".kagg-dialog select"))&&null!==(a=o.value)&&void 0!==a?a:"",m={action:HCaptchaIntegrationsObject.action,nonce:HCaptchaIntegrationsObject.nonce,activate:v,entity:f,status:g,newTheme:d};p.addClass(r),e.post({url:HCaptchaIntegrationsObject.ajaxUrl,data:m}).done((function(a){if(void 0!==a.success)if(void 0!==a.data.themes&&(window.HCaptchaIntegrationsObject.themes=a.data.themes,window.HCaptchaIntegrationsObject.defaultTheme=a.data.defaultTheme),a.success){var o=e(".form-table").eq(v?0:1),r=i.position().top;!function(t,a,n){if("theme"===a){var i=e(".form-table"),o=t?"":'[data-label="'+n+'"]',r=i.eq(t?0:1).find('.hcaptcha-integrations-logo img[data-entity="theme"]'+o);if(r.length){var c=i.eq(t?1:0),s=r.closest("tr");u(c,r.attr("data-label"),s)}}}(v,f,d),u(o,h,p),function(t){c(t,"notice-success")}(a.data.message),function(a){for(var n=e(".form-table"),i=0,o=Object.entries(a);i<o.length;i++){var r=t(o[i],2),c=r[0],s=r[1],d="hcaptcha-integrations-"+c.replace(/_/g,"-"),f=e("tr.".concat(d));l(f.closest(".form-table"))!==s&&u(n.eq(s?0:1),f.find(".hcaptcha-integrations-logo img").attr("alt"),f)}}(a.data.stati),e("html, body").animate({scrollTop:p.offset().top-r-n.outerHeight()},1e3)}else{var g,m;s(null!==(g=null===(m=a.data)\|\|void 0===m?void 0:m.message)&&void 0!==g?g:a.data)}else c(HCaptchaIntegrationsObject.unexpectedErrorMsg,"notice-error")})).fail((function(t){s(t.statusText)})).always((function(){p.removeClass("on off")}))}o.preventDefault(),n.remove(),e('<div id="hcaptcha-message"></div>').insertAfter("#hcaptcha-options h2"),n=e(a);var d=e(o.target),f=d.data("entity");if(f=f\|\|"",-1!==e.inArray(f,["core","theme","plugin"])&&-1===e.inArray(f,["core"])){var h=d.attr("alt");h=(h=h\|\|"").replace(" Logo","");var p=d.closest("tr"),g=p.attr("class");g=g.replace("hcaptcha-integrations-","");var m,v,b="";if(p.find("fieldset").attr("disabled"))m="plugin"===f?HCaptchaIntegrationsObject.activateMsg:HCaptchaIntegrationsObject.activateThemeMsg,v=!0;else{if("plugin"===f)m=HCaptchaIntegrationsObject.deactivateMsg;else{for(var y in m=HCaptchaIntegrationsObject.deactivateThemeMsg,b="<p>"+HCaptchaIntegrationsObject.selectThemeMsg+"</p>",b+="<select>",HCaptchaIntegrationsObject.themes){var w=y===HCaptchaIntegrationsObject.defaultTheme?' selected="selected"':"";b+='<option value="'.concat(y,'"').concat(w,">").concat(HCaptchaIntegrationsObject.themes[y],"</option>")}b+="</select>"}v=!1}-1===e.inArray(f,["theme"])\|\|v\|\|0!==Object.keys(HCaptchaIntegrationsObject.themes).length?(m=m.replace("%s",h),o.ctrlKey?r():kaggDialog.confirm({title:m,content:b,type:v?"activate":"deactivate",buttons:{ok:{text:HCaptchaIntegrationsObject.OKBtnText},cancel:{text:HCaptchaIntegrationsObject.CancelBtnText}},onAction:function(t){t&&r()}})):kaggDialog.confirm({title:HCaptchaIntegrationsObject.onlyOneThemeMsg,content:"",type:"info",buttons:{ok:{text:HCaptchaIntegrationsObject.OKBtnText}}})}}));var d,f,h;r.on("input",(d=function(){var t=r.val().trim().toLowerCase(),a=e(".hcaptcha-integrations-logo img"),n=null;if(a.each((function(a,i){var o=e(i);if("core"!==o.data("entity")){var r,c=o.closest("tr");o.data("label").toLowerCase().includes(t)?(c.show(),n=null!==(r=n)&&void 0!==r?r:c):c.hide()}})),n){var i=n.offset().top+n.outerHeight()-e(window).height()+5;e("html").stop().animate({scrollTop:i},1e3)}},f=100,function(){var t=this,e=arguments;clearTimeout(h),h=setTimeout((function(){return d.apply(t,e)}),f)})),e("#hcaptcha-options").keydown((function(t){e(t.target).is(r)&&13===t.which&&t.preventDefault()}))};window.hCaptchaIntegrations=a,jQuery(document).ready(a)})();

hcaptcha-for-forms-and-more/tags/4.2.0/changelog.txt

-                      r3086102
+                      r3095958
+= 4.2.0 =
+* The minimum required WordPress version is now 5.3.
+* Added support for Multisite Network Admin synced with network-wide plugin options.
+* Added selection by date range on Forms and Events pages.
+* Added automatic activation of dependent plugins on the Integrations page.
+* Added scrolling on the Integrations page during the search.
+* Fixed color flickering of hCaptcha placeholder with custom themes.
+* Fixed JS error on the Lost Password page.
+* Fixed missing site key notification on the General page.
+* Fixed fatal error on some sites during migration to 4.0.0.
 = 4.1.2 =
 * Added option to have the hCaptcha admin menu under Settings.

hcaptcha-for-forms-and-more/tags/4.2.0/hcaptcha.php

-                      r3086102
+                      r3095958
  * Plugin URI:           https://www.hcaptcha.com/
  * Description:          hCaptcha keeps out bots and spam while putting privacy first. It is a drop-in replacement for reCAPTCHA.
  * Version:              4.1.2
+ * Version:              4.2.0
  * Requires at least:    5.1
  * Requires PHP:         7.0
 …
+ *
  * WC requires at least: 3.0
  * WC tested up to:      8.8
+ * WC tested up to:      8.9
  */
 …
  * Plugin version.
  */
 const HCAPTCHA_VERSION = '4.1.2';
+const HCAPTCHA_VERSION = '4.2.0';
 /**

hcaptcha-for-forms-and-more/tags/4.2.0/readme.txt

-                      r3086102
+                      r3095958
 Contributors: hcaptcha, kaggdesign
 Tags: captcha, hcaptcha, antispam, abuse, protect form
 Requires at least: 5.1
+Requires at least: 5.3
 Tested up to: 6.5
 Requires PHP: 7.0.0
 Stable tag: 4.1.2
+Stable tag: 4.2.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 * Filters delay time for hCaptcha API script.
+*
 * Any negative value will prevent API script from loading at all,
+* Any negative value will prevent the API script from loading at all,
 * until user interaction: mouseenter, click, scroll or touch.
 * This significantly improves Google Pagespeed Insights score.
 …
 `parent`: a string — the parent menu item. Default '' for 'pages' mode and 'options-general.php' for 'tabs' mode;
 `position`: a number — the position of the menu item. Default 58.990225 for 'pages' mode. It Has no effect on 'tabs' mode;
-= Why isn't my WPForms Lite installation working? =
-Please make sure you have removed the reCAPTCHA keys under WPForms > Settings > reCAPTCHA to avoid a conflict.
 = Where can I get more information about hCaptcha? =
 …
 We also suggest emailing the authors of plugins you'd like to support hCaptcha: it will usually take them only an hour or two to add native support. This will simplify your use of hCaptcha, and is the best solution in the long run.
+Some plugins listed have been superseded by native support, and are included only for legacy purposes.
+You should always use native hCaptcha support if available for your plugin.
+Please check with your plugin author if native support is not yet available.
+You may use native hCaptcha support if available for your plugin. Please check with your plugin author if native support is not yet available.
+However, the hCaptcha plugin provides a broader set of options and features so that you can use it with any form on your site.
 Instructions for popular native integrations are below:
 …
 == Changelog ==
+= 4.2.0 =
+* The minimum required WordPress version is now 5.3.
+* Added support for Multisite Network Admin synced with network-wide plugin options.
+* Added selection by date range on Forms and Events pages.
+* Added automatic activation of dependent plugins on the Integrations page.
+* Added scrolling on the Integrations page during the search.
+* Fixed color flickering of hCaptcha placeholder with custom themes.
+* Fixed JS error on the Lost Password page.
+* Fixed missing site key notification on the General page.
+* Fixed fatal error on some sites during migration to 4.0.0.
 = 4.1.2 =

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Admin/Events/Events.php

-                      r3072795
+                      r3095958
+        }
         add_action( 'hcap_verify_request', [ $this, 'save_event' ], - PHP_INT_MAX, 2 );
+        add_action( 'hcap_verify_request', [ $this, 'save_event' ], -PHP_INT_MAX, 2 );
+    }
 …
      * @param array             $error_codes Error codes.
+     *
      * @return string|null|mixed
+     * @return void
      */
     public function save_event( $result, array $error_codes ) {
 …
         if ( ! ( is_string( $result ) || is_null( $result ) ) ) {
             return $result;
+            return;
+        }
 …
+            ]
         );
-        return $result;
+    }
 …
         global $wpdb;
         $args    = wp_parse_args(
+        $args          = wp_parse_args(
             $args,
+            [
 …
                 'order'   => 'ASC',
                 'orderby' => '',
+                'dates'   => [],
+            ]
         );
+        $columns = implode( ',', $args['columns'] );
+        $columns = $columns ?: '*';
+        $order   = strtoupper( $args['order'] );
+        $order   = 'ASC' === $order ? '' : $order;
+        $orderby = $args['orderby'] ? 'ORDER BY ' . $args['orderby'] . ' ' . $order : '';
+        $offset  = absint( $args['offset'] );
+        $limit   = absint( $args['limit'] );
+        $args['dates'] = $args['dates'] ?: self::get_default_dates();
+        $columns    = implode( ',', $args['columns'] );
+        $columns    = $columns ?: '*';
         $table_name = $wpdb->prefix . self::TABLE_NAME;
+        $where_date = self::get_where_date_gmt( $args );
+        $orderby    = self::get_order_by( $args );
+        $offset     = absint( $args['offset'] );
+        $limit      = absint( $args['limit'] );
         // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
         $results = (array) $wpdb->get_results(
             $wpdb->prepare(
+            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+                "SELECT SQL_CALC_FOUND_ROWS $columns FROM $table_name $orderby LIMIT %d, %d",
+            // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+                "SELECT
+                        SQL_CALC_FOUND_ROWS
+                        $columns
+                        FROM $table_name
+                        WHERE $where_date
+                        $orderby
+                        LIMIT %d, %d",
                 $offset,
                 $limit
+            // phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            )
         );
         $total = (int) $wpdb->get_var( 'SELECT FOUND_ROWS()' );
         // phpcs:enable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 …
         global $wpdb;
         $args    = wp_parse_args(
+        $args          = wp_parse_args(
             $args,
+            [
 …
                 'order'   => 'ASC',
                 'orderby' => '',
+                'dates'   => [],
+            ]
         );
+        $order   = strtoupper( $args['order'] );
+        $order   = 'ASC' === $order ? '' : $order;
+        $orderby = $args['orderby'] ? 'ORDER BY ' . $args['orderby'] . ' ' . $order : '';
+        $offset  = absint( $args['offset'] );
+        $limit   = absint( $args['limit'] );
+        $args['dates'] = $args['dates'] ?: self::get_default_dates();
         $table_name = $wpdb->prefix . self::TABLE_NAME;
+        $where_date = self::get_where_date_gmt( $args );
+        $orderby    = self::get_order_by( $args );
+        $offset     = absint( $args['offset'] );
+        $limit      = absint( $args['limit'] );
         // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
         $results = (array) $wpdb->get_results(
             $wpdb->prepare(
+            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+                "SELECT SQL_CALC_FOUND_ROWS id, source, form_id, COUNT(*) as served FROM $table_name GROUP BY source, form_id $orderby LIMIT %d, %d",
+            // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+                "SELECT
+                        SQL_CALC_FOUND_ROWS
+                        source, form_id, COUNT(*) as served
+                        FROM $table_name
+                        WHERE $where_date
+                        GROUP BY source, form_id
+                        $orderby
+                        LIMIT %d, %d",
                 $offset,
                 $limit
+            // phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            )
         );
 …
         // phpcs:enable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
         $where = 'WHERE 1=0';
+        $where = '1=0';
         foreach ( $results as $result ) {
 …
+        }
+        $where = "($where) AND " . $where_date;
         // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
         $served = (array) $wpdb->get_results(
+            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            "SELECT date_gmt FROM $table_name $where"
+        );
+        // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            "SELECT date_gmt FROM $table_name WHERE $where"
+        // phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+        );
+        // phpcs:enable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
         return [
 …
         global $wpdb;
+        $table_name = self::TABLE_NAME;
+        if ( self::table_exists( $wpdb->prefix . $table_name ) ) {
+            // @codeCoverageIgnoreStart
+            return;
+            // @codeCoverageIgnoreEnd
+        }
         require_once ABSPATH . 'wp-admin/includes/upgrade.php';
         $charset_collate = $wpdb->get_charset_collate();
+        $table_name      = self::TABLE_NAME;
+        $sql = "CREATE TABLE IF NOT EXISTS $wpdb->prefix$table_name (
+        $sql = "CREATE TABLE $wpdb->prefix$table_name (
             id          BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
             source      VARCHAR(256)    NOT NULL,
 …
             KEY uuid (uuid),
             KEY date_gmt (date_gmt)
         ) $charset_collate;";
+        ) $charset_collate";
         dbDelta( $sql );
+    }
+    /**
+     * Get where date GMT.
+     *
+     * @param array $args Arguments.
+     *
+     * @return string
+     */
+    public static function get_where_date_gmt( array $args ): string {
+        $dates = $args['dates'];
+        if ( $dates ) {
+            $dates[1] = $dates[1] ?? $dates[0];
+            $dates[0] .= ' 00:00:00';
+            $dates[1] .= ' 23:59:59';
+            foreach ( $dates as &$date ) {
+                $date = wp_date( 'Y-m-d H:i:s', strtotime( $date ) );
+            }
+            unset( $date );
+            $where_date = sprintf(
+                "date_gmt BETWEEN '%s' AND '%s'",
+                esc_sql( $dates[0] ),
+                esc_sql( $dates[1] )
+            );
+        } else {
+            $where_date = '1=1';
+        }
+        return $where_date;
+    }
+    /**
+     * Get ODER BY / ORDER clause
+     *
+     * @param array $args Arguments.
+     *
+     * @return string
+     */
+    private static function get_order_by( array $args ): string {
+        $order = strtoupper( $args['order'] );
+        $order = 'ASC' === $order ? '' : $order;
+        return $args['orderby'] ? 'ORDER BY ' . $args['orderby'] . ' ' . $order : '';
+    }
+    /**
+     * Get default dates.
+     *
+     * @return array
+     */
+    private static function get_default_dates(): array {
+        $end_date   = date_create_immutable( 'now', wp_timezone() );
+        $start_date = $end_date;
+        $start_date = $start_date->modify( '-30 day' );
+        $start_date = $start_date->setTime( 0, 0 );
+        $end_date   = $end_date->setTime( 23, 59, 59 );
+        $format     = 'Y-m-d';
+        return [ $start_date->format( $format ), $end_date->format( $format ) ];
+    }
+    /**
+     * Check if the database table exists and cache the result.
+     *
+     * @param string $table_name Table name. Can have SQL wildcard.
+     *
+     * @return bool
+     */
+    private static function table_exists( string $table_name ): bool {
+        foreach ( self::get_existing_tables( $table_name ) as $existing_table ) {
+            if ( self::wildcard_match( $table_name, $existing_table ) ) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /**
+     * Get the list of existing tables and cache the result.
+     *
+     * @param string $table_name Table name. Can have SQL wildcard.
+     *
+     * @return array List of table names.
+     */
+    private static function get_existing_tables( string $table_name ): array {
+        global $wpdb;
+        // phpcs:disable WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.DirectDatabaseQuery.DirectQuery
+        $tables = $wpdb->get_results(
+            $wpdb->prepare( 'SHOW TABLES LIKE %s', $table_name ),
+            'ARRAY_N'
+        );
+        // phpcs:enable WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.DirectDatabaseQuery.DirectQuery
+        return ! empty( $tables ) ? wp_list_pluck( $tables, 0 ) : [];
+    }
+    /**
+     * Wildcard match.
+     * Works as MySQL LIKE match.
+     *
+     * @param string $pattern Pattern.
+     * @param string $subject String to search into.
+     *
+     * @return false|int
+     */
+    private static function wildcard_match( string $pattern, string $subject ) {
+        $regex = str_replace(
+            [ '%', '_' ], // MySQL wildcard chars.
+            [ '.*', '.' ],  // Regexp chars.
+            preg_quote( $pattern, '/' )
+        );
+        return preg_match( '/^' . $regex . '$/is', $subject );
+    }
+}

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Admin/Events/EventsTable.php

-                      r3080217
+                      r3095958
 namespace HCaptcha\Admin\Events;
+use HCaptcha\Settings\ListPageBase;
 use WP_List_Table;
 …
         $order   = isset( $_GET['order'] ) ? sanitize_key( $_GET['order'] ) : 'DESC';
         $orderby = isset( $_GET['orderby'] ) ? sanitize_key( $_GET['orderby'] ) : 'date_gmt';
+        $date    = isset( $_GET['date'] )
+            ? filter_input( INPUT_GET, 'date', FILTER_SANITIZE_FULL_SPECIAL_CHARS )
+            : ''; // We need filter_input here to keep delimiter intact.
         // phpcs:enable WordPress.Security.NonceVerification.Recommended
+        $dates        = explode( ListPageBase::TIMESPAN_DELIMITER, $date );
+        $dates        = array_filter( array_map( 'trim', $dates ) );
         $column_slugs = str_replace( 'name', 'source', array_keys( $this->columns ) );
         $per_page     = $this->get_items_per_page( self::EVENTS_PER_PAGE, $this->per_page_default );
 …
             'order'   => $order,
             'orderby' => $orderby,
+            'dates'   => $dates,
         ];

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Admin/Events/FormsTable.php

-                      r3080217
+                      r3095958
 namespace HCaptcha\Admin\Events;
+use HCaptcha\Settings\ListPageBase;
 use WP_List_Table;
 …
     public function get_sortable_columns(): array {
         return [
+            'name'    => [ 'name', false, __( 'Source', 'hcaptcha-for-forms-and-more' ), __( 'Table ordered by Source.' ) ],
+            'form_id' => [ 'form_id', false, __( 'Form Id', 'hcaptcha-for-forms-and-more' ), __( 'Table ordered by Form Id.' ) ],
+            'served'  => [ 'served', false, __( 'Served', 'hcaptcha-for-forms-and-more' ), __( 'Table ordered by Served Count.' ) ],
+            'name'    => [
+                'name',
+                false,
+                __( 'Source', 'hcaptcha-for-forms-and-more' ),
+                __( 'Table ordered by Source.' ),
+            ],
+            'form_id' => [
+                'form_id',
+                false,
+                __( 'Form Id', 'hcaptcha-for-forms-and-more' ),
+                __( 'Table ordered by Form Id.' ),
+            ],
+            'served'  => [
+                'served',
+                false,
+                __( 'Served', 'hcaptcha-for-forms-and-more' ),
+                __( 'Table ordered by Served Count.' ),
+            ],
         ];
+    }
 …
         $order   = isset( $_GET['order'] ) ? sanitize_key( $_GET['order'] ) : 'ASC';
         $orderby = isset( $_GET['orderby'] ) ? sanitize_key( $_GET['orderby'] ) : 'source';
+        $date    = isset( $_GET['date'] )
+            ? filter_input( INPUT_GET, 'date', FILTER_SANITIZE_FULL_SPECIAL_CHARS )
+            : ''; // We need filter_input here to keep delimiter intact.
         // phpcs:enable WordPress.Security.NonceVerification.Recommended
+        $dates    = explode( ListPageBase::TIMESPAN_DELIMITER, $date );
+        $dates    = array_filter( array_map( 'trim', $dates ) );
         $per_page = $this->get_items_per_page( self::FORMS_PER_PAGE, $this->per_page_default );
         $offset   = ( $paged - 1 ) * $per_page;
 …
             'order'   => $order,
             'orderby' => $orderby,
+            'dates'   => $dates,
         ];

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Admin/Notifications.php

-                      r3081325
+                      r3095958
+        }
         if ( hcaptcha()->is_pro() ) {
+        if ( $settings->is_pro() ) {
             unset( $this->notifications['pro-free-trial'] );
+        }
 …
             if ( $this->shuffle ) {
                 $notifications = $this->shuffle_assoc( $notifications );
+                $notifications = $this->make_key_first( $notifications, 'register' );
+            }
 …
         return $new_arr;
+    }
+    /**
+     * Make a key the first element in an associative array.
+     *
+     * @param array  $arr An array.
+     * @param string $key Key.
+     *
+     * @return array
+     */
+    protected function make_key_first( array $arr, string $key ): array {
+        if ( ! array_key_exists( $key, $arr ) ) {
+            return $arr;
+        }
+        // Remove the key-value pair from the original array.
+        $value = $arr[ $key ];
+        unset( $arr[ $key ] );
+        // Merge the key-value pair back into the array at the beginning.
+        return array_merge( [ $key => $value ], $arr );
+    }
+}

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Admin/PluginStats.php

r3080217	r3095958
145	145
146	146	$settings = hcaptcha()->settings();
147		$license = (int) ~~hcaptcha()~~->is_pro() ? 'Pro' : 'Publisher';
	147	$license = (int) $settings->is_pro() ? 'Pro' : 'Publisher';
148	148	$api_host = $settings->get( 'api_host' );
149	149	$backend = $settings->get( 'backend' );

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/BeaverBuilder/Base.php

r3064004	r3095958
80	80	self::HANDLE,
81	81	HCAPTCHA_URL . "/assets/js/hcaptcha-beaver-builder$min.js",
82		[ 'jquery'~~, 'wp-hooks'~~ ],
	82	[ 'jquery' ],
83	83	HCAPTCHA_VERSION,
84	84	true

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Main.php

-                      r3086102
+                      r3095958
 use HCaptcha\Settings\General;
 use HCaptcha\Settings\Integrations;
+use HCaptcha\Settings\PluginSettingsBase;
 use HCaptcha\Settings\Settings;
 use HCaptcha\Settings\SystemInfo;
 …
     /**
+     * WP hooks handle.
+     */
+    const WP_HOOKS_HANDLE = 'wp-hooks';
+    /**
      * Main script localization object.
      */
 …
     public function init_hooks() {
         $this->load_textdomain();
-        $settings      = get_option( 'hcaptcha_settings', [] );
-        $menu_position = $settings['menu_position'] ?? [];
-        $args          = [
-            'mode' => [ 'on' ] === $menu_position ? SettingsBase::MODE_TABS : SettingsBase::MODE_PAGES,
-        ];
         /**
 …
          * @param array $args Settings system initialization arguments.
          */
         $args = (array) apply_filters( 'hcap_settings_init_args', $args );
+        $args = (array) apply_filters( 'hcap_settings_init_args', [] );
         $this->settings = new Settings(
 …
     /**
-     * Check if it is a Pro account.
+     *
-     * @return false
-     */
-    public function is_pro(): bool {
-        return 'pro' === $this->settings->get_license();
+    }
-    /**
      * Whether we are on the Elementor Pro edit post/page and hCaptcha for Elementor Pro is active.
+     *
 …
 CSS;
+        $settings = $this->settings();
+        if ( $settings->is_on( 'custom_themes' ) && $settings->is_pro_or_general() ) {
+            $bg = $settings->get_config_params()['theme']['component']['checkbox']['main']['fill'] ?? '';
+            if ( $bg ) {
+                $css .= <<<CSS
+    .h-captcha::before {
+        background-color: $bg !important;
+    }
+CSS;
+            }
+        }
         HCaptcha::css_display( $css );
+    }
 …
+        }
         if ( $settings->is_on( 'custom_themes' ) && $this->is_pro_or_general() ) {
+        if ( $settings->is_on( 'custom_themes' ) && $settings->is_pro_or_general() ) {
             $params['custom'] = 'true';
+        }
 …
         DelayedScript::launch( [ 'src' => $this->get_api_src() ], $delay );
+        wp_enqueue_script( self::WP_HOOKS_HANDLE );
         wp_enqueue_script(
             self::HANDLE,
             HCAPTCHA_URL . '/assets/js/apps/hcaptcha.js',
             [ 'wp-hooks' ],
+            [ self::WP_HOOKS_HANDLE ],
             HCAPTCHA_VERSION,
             true
 …
+        }
+        $config_params = [];
+        if ( $settings->is_on( 'custom_themes' ) && $this->is_pro_or_general() ) {
+            $config_params = $settings->get_config_params();
+        }
+        $config_params = $settings->is_on( 'custom_themes' ) && $settings->is_pro_or_general()
+            ? $settings->get_config_params()
+            : [];
         $params = array_merge( $params, $config_params );
 …
             'Affiliates Login'                     => [
                 [ 'affiliates_status', 'login' ],
                 [ 'affiliates/affiliates.php' ],
+                'affiliates/affiliates.php',
                 Affiliates\Login::class,
             ],
             'Affiliates Register'                  => [
                 [ 'affiliates_status', 'register' ],
                 [ 'affiliates/affiliates.php' ],
+                'affiliates/affiliates.php',
                 Affiliates\Register::class,
             ],
 …
      * @return bool
      */
     private function plugin_or_theme_active( $plugin_or_theme_names ): bool {
+    public function plugin_or_theme_active( $plugin_or_theme_names ): bool {
         foreach ( (array) $plugin_or_theme_names as $plugin_or_theme_name ) {
             if ( '' === $plugin_or_theme_name ) {
 …
         return defined( 'XMLRPC_REQUEST' ) && constant( 'XMLRPC_REQUEST' );
+    }
-    /**
-     * Whether option is allowed to use.
+     *
-     * @return bool
-     */
-    private function is_pro_or_general(): bool {
-        return $this->is_pro() || ( is_admin() && 'General' === $this->settings->get_active_tab_name() );
+    }
+}

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Migrations/Migrations.php

-                      r3064004
+                      r3095958
 use HCaptcha\Admin\Events\Events;
+use HCaptcha\Settings\PluginSettingsBase;
 /**
 …
+        }
         update_option( 'hcaptcha_settings', $new_options );
+        update_option( PluginSettingsBase::OPTION_NAME, $new_options );
         foreach ( array_keys( $options_map ) as $old_option_name ) {
 …
      */
     protected function migrate_360() {
         $option         = get_option( 'hcaptcha_settings', [] );
+        $option         = get_option( PluginSettingsBase::OPTION_NAME, [] );
         $wpforms_status = $option['wpforms_status'] ?? [];
 …
         $option['wpforms_status'] = [ 'form' ];
         update_option( 'hcaptcha_settings', $option );
+        update_option( PluginSettingsBase::OPTION_NAME, $option );
         return true;
 …
         $pro               = $result['features']['custom_theme'] ?? false;
         $license           = $pro ? 'pro' : 'free';
         $option            = get_option( 'hcaptcha_settings', [] );
+        $option            = get_option( PluginSettingsBase::OPTION_NAME, [] );
         $option['license'] = $license;
         // Save license level in settings.
         update_option( 'hcaptcha_settings', $option );
+        update_option( PluginSettingsBase::OPTION_NAME, $option );
+    }
+}

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/NF/NF.php

r3080217	r3095958
295	295	self::HANDLE,
296	296	HCAPTCHA_URL . "/assets/js/hcaptcha-nf$min.js",
297		[ 'jquery', Main::HANDLE, 'nf-front-end', 'nf-front-end-deps'~~, 'wp-hooks'~~ ],
	297	[ 'jquery', Main::HANDLE, 'nf-front-end', 'nf-front-end-deps' ],
298	298	HCAPTCHA_VERSION,
299	299	true

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Otter/Form.php

r3064004	r3095958
155	155	self::HANDLE,
156	156	HCAPTCHA_URL . "/assets/js/hcaptcha-otter$min.js",
157		[ ~~'wp-hooks'~~ ],
	157	[],
158	158	HCAPTCHA_VERSION,
159	159	true

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Passster/Protect.php

r3064004	r3095958
130	130	self::HANDLE,
131	131	HCAPTCHA_URL . "/assets/js/hcaptcha-passster$min.js",
132		[ 'jquery'~~, 'wp-hooks'~~ ],
	132	[ 'jquery' ],
133	133	HCAPTCHA_VERSION,
134	134	true

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Settings/Abstracts/SettingsBase.php

-                      r3081325
+                      r3095958
     /**
+     * Network-wide menu position.
+     *
+     * A number before 25 (Settings) to avoid conflicts with other plugins.
+     */
+    const NETWORK_WIDE_POSITION = 24.99;
+    /**
      * Form fields.
+     *
 …
         $this->tabs = $tabs;
+        $args = wp_parse_args(
+            $args,
+            [
+                'mode'     => self::MODE_PAGES,
+                'parent'   => null,
+                'position' => null,
+            ]
+        );
+        $this->admin_mode = in_array( $args['mode'], [ self::MODE_PAGES, self::MODE_TABS ], true ) ?
+            $args['mode'] :
+            self::MODE_PAGES;
+        if ( null === $args['parent'] ) {
+            $this->parent_slug = self::MODE_PAGES === $this->admin_mode ? '' : 'options-general.php';
+        } else {
+            $this->parent_slug = $args['parent'];
+        }
+        if ( null === $args['position'] ) {
+            $hash           = hexdec( sha1( self::PREFIX ) );
+            $pow            = floor( log10( $hash ) );
+            $this->position = round( self::POSITION + $hash / 10 ** ( $pow + 4 ), 6 );
+        } else {
+            $this->position = (float) $args['position'];
+        }
+        $this->process_args( $args );
         $this->fields = [
 …
         if ( self::MODE_PAGES === $this->admin_mode || ! $this->is_tab() ) {
             add_action( 'current_screen', [ $this, 'setup_tabs_section' ], 9 );
+            add_action( 'admin_menu', [ $this, 'add_settings_page' ] );
+            $tag = $this->is_network_wide() ? 'network_admin_menu' : 'admin_menu';
+            add_action( $tag, [ $this, 'add_settings_page' ] );
+        }
 …
     protected function init_hooks() {
         add_action( 'admin_enqueue_scripts', [ $this, 'base_admin_enqueue_scripts' ] );
+        add_action( 'admin_page_access_denied', [ $this, 'base_admin_page_access_denied' ] );
         if ( $this->is_main_menu_page() ) {
 …
     /**
+     * Process arguments.
+     *
+     * @param array $args Arguments.
+     *
+     * @return void
+     */
+    protected function process_args( array $args ) {
+        $args = wp_parse_args(
+            $args,
+            [
+                'mode'     => $this->get_menu_position(),
+                'parent'   => null,
+                'position' => null,
+            ]
+        );
+        $this->admin_mode = in_array( $args['mode'], [ self::MODE_PAGES, self::MODE_TABS ], true ) ?
+            $args['mode'] :
+            self::MODE_PAGES;
+        if ( null === $args['parent'] ) {
+            $wp_settings_slug  = is_multisite() && $this->is_network_wide() ? 'settings.php' : 'options-general.php';
+            $this->parent_slug = self::MODE_PAGES === $this->admin_mode ? '' : $wp_settings_slug;
+        } else {
+            $this->parent_slug = $args['parent'];
+        }
+        if ( null === $args['position'] ) {
+            $hash           = hexdec( sha1( self::PREFIX ) );
+            $pow            = floor( log10( $hash ) );
+            $position       = is_multisite() && $this->is_network_wide() ? self::NETWORK_WIDE_POSITION : self::POSITION;
+            $this->position = round( $position + $hash / 10 ** ( $pow + 4 ), 6 );
+        } else {
+            $this->position = (float) $args['position'];
+        }
+    }
+    /**
      * Is this the main menu page?
+     *
 …
      */
     protected function init_settings() {
         $network_wide = get_site_option( $this->option_name() . self::NETWORK_WIDE, [] );
         if ( empty( $network_wide ) ) {
+        if ( $this->is_network_wide() ) {
+            $this->settings = get_site_option( $this->option_name(), null );
+        } else {
             $this->settings = get_option( $this->option_name(), null );
-        } else {
-            $this->settings = get_site_option( $this->option_name(), null );
+        }
 …
         $network_wide_setting                 = array_key_exists( self::NETWORK_WIDE, $this->settings ) ?
             $this->settings[ self::NETWORK_WIDE ] :
             $network_wide;
+            $this->get_network_wide();
         $this->settings[ self::NETWORK_WIDE ] = $network_wide_setting;
 …
     /**
+     * Filter denied access to the settings page.
+     * It is needed when switching network_wide option.
+     *
+     * @return void
+     */
+    public function base_admin_page_access_denied() {
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $page = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : '';
+        if ( static::PREFIX !== $page ) {
+            return;
+        }
+        $url = is_multisite() && $this->is_network_wide() ?
+            network_admin_url( 'admin.php?page=' . $this->option_page() ) :
+            admin_url( 'admin.php?page=' . $this->option_page() );
+        if ( wp_get_raw_referer() === $url ) {
+            // Prevent infinite loop.
+            return;
+        }
+        wp_safe_redirect( $url );
+        $this->exit();
+    }
+    /**
+     * Exit wrapper for test purposes.
+     *
+     * @return void
+     */
+    protected function exit() {
+        // @codeCoverageIgnoreStart
+        exit();
+        // @codeCoverageIgnoreEnd
+    }
+    /**
      * Setup settings sections.
+     *
 …
      */
     private function tab_link( SettingsBase $tab ) {
+        $url = menu_page_url( $tab->option_page(), false );
+        $url = is_multisite() && $this->is_network_wide() ?
+            network_admin_url( 'admin.php?page=' . $tab->option_page() ) :
+            menu_page_url( $tab->option_page(), false );
         if ( self::MODE_TABS === $this->admin_mode ) {
 …
         $current_suffix = preg_replace( '/.+_page_/', '', $current_screen->id );
+        if ( is_multisite() && $this->is_network_wide() ) {
+            $current_suffix = preg_replace( '/-network$/', '', $current_suffix );
+        }
         return $this->option_page() === $current_suffix || in_array( $current_suffix, $ids, true );
+    }
 …
     /**
      * Print supplemental id it exists.
+     * Print supplemental id if it exists.
+     *
      * @param string $supplemental Supplemental.
 …
         );
+    }
+    /**
+     * Get network_wide setting.
+     *
+     * @return array
+     */
+    protected function get_network_wide(): array {
+        static $network_wide = null;
+        if ( null === $network_wide ) {
+            $network_wide = (array) get_site_option( $this->option_name() . self::NETWORK_WIDE, [] );
+        }
+        return $network_wide;
+    }
+    /**
+     * Whether network_wide setting is on.
+     *
+     * @return bool
+     */
+    protected function is_network_wide(): bool {
+        return ! empty( $this->get_network_wide() );
+    }
+    /**
+     * Get menu position.
+     *
+     * @return string
+     */
+    protected function get_menu_position(): string {
+        return [ 'on' ] === $this->get( 'menu_position' ) ? self::MODE_TABS : self::MODE_PAGES;
+    }
+    /**
+     * Print header.
+     *
+     * @return void
+     */
+    protected function print_header() {
+        ?>
+        <div class="<?php echo esc_attr( static::PREFIX . '-header-bar' ); ?>">
+            <div class="<?php echo esc_attr( static::PREFIX . '-header' ); ?>">
+                <h2>
+                    <?php echo esc_html( $this->page_title() ); ?>
+                </h2>
+            </div>
+            <?php
+            /**
+             * Fires before settings tab closing tag.
+             */
+            do_action( 'kagg_settings_header' );
+            ?>
+        </div>
+        <?php
+    }
+}

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Settings/EventsPage.php

-                      r3081325
+                      r3095958
     /**
-     * The page is allowed to be shown.
+     *
-     * @var bool
-     */
-    protected $allowed = false;
-    /**
      * Get page title.
+     *
 …
         add_action( 'admin_init', [ $this, 'admin_init' ] );
+        add_action( 'kagg_settings_header', [ $this, 'date_picker_display' ] );
+    }
 …
      */
     public function admin_init() {
+        $this->allowed = ( hcaptcha()->settings()->is_on( 'statistics' ) && hcaptcha()->is_pro() );
+        $settings = hcaptcha()->settings();
+        $this->allowed = ( $settings->is_on( 'statistics' ) && $settings->is_pro() );
         if ( ! $this->allowed ) {
 …
+        }
+        wp_enqueue_script(
+            'chart',
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chart.umd.min.js',
+            [],
+            'v4.4.2',
+            true
+        );
+        wp_enqueue_script(
+            'chart-adapter-date-fns',
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chartjs-adapter-date-fns.bundle.min.js',
+            [ 'chart' ],
+            'v3.0.0',
+            true
+        );
+        parent::admin_enqueue_scripts();
         wp_enqueue_script(
 …
                 'succeedLabel' => __( 'Succeed', 'hcaptcha-for-forms-and-more' ),
                 'failedLabel'  => __( 'Failed', 'hcaptcha-for-forms-and-more' ),
+                'unit'         => $this->unit,
+            ]
         );
 …
      */
     public function section_callback( array $arguments ) {
+        ?>
+        <h2>
+            <?php echo esc_html( $this->page_title() ); ?>
+        </h2>
+        <?php
+        $this->print_header();
         if ( ! $this->allowed ) {

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Settings/FormsPage.php

-                      r3081325
+                      r3095958
     /**
-     * The page is allowed to be shown.
+     *
-     * @var bool
-     */
-    protected $allowed = false;
-    /**
      * Get page title.
+     *
 …
         add_action( 'admin_init', [ $this, 'admin_init' ] );
+        add_action( 'kagg_settings_header', [ $this, 'date_picker_display' ] );
+    }
 …
+        }
+        wp_enqueue_script(
+            'chart',
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chart.umd.min.js',
+            [],
+            'v4.4.2',
+            true
+        );
+        wp_enqueue_script(
+            'chart-adapter-date-fns',
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chartjs-adapter-date-fns.bundle.min.js',
+            [ 'chart' ],
+            'v3.0.0',
+            true
+        );
+        parent::admin_enqueue_scripts();
         wp_enqueue_script(
 …
                 'served'      => $this->served,
                 'servedLabel' => __( 'Served', 'hcaptcha-for-forms-and-more' ),
+                'unit'        => $this->unit,
+            ]
         );
 …
      */
     public function section_callback( array $arguments ) {
+        ?>
+        <h2>
+            <?php echo esc_html( $this->page_title() ); ?>
+        </h2>
+        <?php
+        $this->print_header();
         if ( ! $this->allowed ) {

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Settings/General.php

-                      r3086102
+                      r3095958
         switch ( $arguments['id'] ) {
             case self::SECTION_KEYS:
+                ?>
+                <h2>
+                    <?php echo esc_html( $this->page_title() ); ?>
+                </h2>
+                <div id="hcaptcha-message"></div>
+                <?php
+                $this->print_header();
                 $this->notifications->show();
                 $this->print_section_header( $arguments['id'], __( 'Keys', 'hcaptcha-for-forms-and-more' ) );

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Settings/Integrations.php

-                      r3081325
+                      r3095958
 use KAGG\Settings\Abstracts\SettingsBase;
+use WP_Error;
 use WP_Theme;
 …
     /**
+     * Plugin dependencies not specified in their headers.
+     * Key is a plugin slug.
+     * Value is a plugin slug or an array of slugs.
+     */
+    const PLUGIN_DEPENDENCIES = [
+        // phpcs:disable WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned
+        'back-in-stock-notifier-for-woocommerce/cwginstocknotifier.php' => 'woocommerce/woocommerce.php',
+        'elementor-pro/elementor-pro.php'                               => 'elementor/elementor.php',
+        'woocommerce-wishlists/woocommerce-wishlists.php'               => 'woocommerce/woocommerce.php',
+        // phpcs:enable WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned
+    ];
+    /**
      * Entity name to activate/deactivate. Can be 'plugin' or 'theme'.
+     *
 …
      */
     protected $entity = '';
+    /**
+     * Plugins tree.
+     *
+     * @var array
+     */
+    protected $plugins_tree;
     /**
 …
         parent::init_hooks();
         add_action( 'kagg_settings_tab', [ $this, 'search_box' ] );
+        add_action( 'kagg_settings_header', [ $this, 'search_box' ] );
         add_action( 'wp_ajax_' . self::ACTIVATE_ACTION, [ $this, 'activate' ] );
+    }
 …
     public function search_box() {
         ?>
         <span id="hcaptcha-integrations-search-wrap">
+        <div id="hcaptcha-integrations-search-wrap">
             <label for="hcaptcha-integrations-search"></label>
             <input
                     type="search" id="hcaptcha-integrations-search"
                     placeholder="<?php esc_html_e( 'Search plugins and themes...', 'hcaptcha-for-forms-and-more' ); ?>">
         </span>
+        </div>
         <?php
+    }
 …
+        }
+        $this->print_header();
         ?>
-        <h2>
-            <?php echo esc_html( $this->page_title() ); ?>
-        </h2>
         <div id="hcaptcha-message"></div>
         <p>
 …
+            }
+            $message = sprintf(
+            $plugin_names = $this->plugin_names_from_tree( $this->plugins_tree );
+            $message      = sprintf(
             /* translators: 1: Plugin name. */
+                __( '%s plugin is activated.', 'hcaptcha-for-forms-and-more' ),
+                $plugin_name
+                _n(
+                    '%s plugin is activated.',
+                    '%s plugins are activated.',
+                    count( $plugin_names ),
+                    'hcaptcha-for-forms-and-more'
+                ),
+                implode( ', ', $plugin_names )
             );
 …
     protected function activate_plugins( array $plugins ): bool {
         foreach ( $plugins as $plugin ) {
+            ob_start();
+            $result = activate_plugin( $plugin );
+            ob_end_clean();
+            $this->plugins_tree = $this->build_plugins_tree( $plugin );
+            $result             = $this->activate_plugin_tree( $this->plugins_tree );
             if ( null === $result ) {
 …
     /**
+     * Activate plugins.
+     *
+     * @param array $node Node of the plugin tree.
+     *
+     * @return int|null|true|WP_Error
+     */
+    protected function activate_plugin_tree( array &$node ) {
+        if ( $node['children'] ) {
+            foreach ( $node['children'] as $child ) {
+                $result = $this->activate_plugin_tree( $child );
+                if ( null !== $result ) {
+                    return $result;
+                }
+            }
+        }
+        ob_start();
+        $result = activate_plugin( $node['plugin'] );
+        ob_end_clean();
+        $node['result'] = $result;
+        return $result;
+    }
+    /**
+     * Get plugins' tree.
+     *
+     * @param string $plugin Plugin slug.
+     *
+     * @return array
+     */
+    protected function build_plugins_tree( string $plugin ): array {
+        $dependencies = $this->plugin_dependencies( $plugin );
+        $tree         = [
+            'plugin'   => $plugin,
+            'children' => [],
+        ];
+        foreach ( $dependencies as $dependency ) {
+            $tree['children'][] = $this->build_plugins_tree( $dependency );
+        }
+        return $tree;
+    }
+    /**
+     * Get plugin dependencies.
+     *
+     * @param string $plugin Plugin slug.
+     *
+     * @return array
+     */
+    private function plugin_dependencies( string $plugin ): array {
+        $plugin_headers   = get_plugin_data( constant( 'WP_PLUGIN_DIR' ) . '/' . $plugin );
+        $requires_plugins = $plugin_headers['RequiresPlugins'] ?? '';
+        $wp_dependencies  = $this->plugin_dirs_to_slugs(
+            array_filter( array_map( 'trim', explode( ',', $requires_plugins ) ) )
+        );
+        $dependencies     = (array) ( self::PLUGIN_DEPENDENCIES[ $plugin ] ?? [] );
+        return array_merge( $wp_dependencies, $dependencies );
+    }
+    /**
+     * Convert plugin directories to slugs.
+     *
+     * @param array $dirs Plugin directories.
+     *
+     * @return array
+     */
+    protected function plugin_dirs_to_slugs( array $dirs ): array {
+        if ( ! $dirs ) {
+            return $dirs;
+        }
+        $slugs = array_keys( get_plugins() );
+        foreach ( $dirs as &$dir ) {
+            $slug = preg_grep( "#^$dir/#", $slugs );
+            if ( $slug ) {
+                $dir = reset( $slug );
+            }
+        }
+        return $dirs;
+    }
+    /**
+     * Get plugin names from the tree.
+     *
+     * @param array $node Node of the plugin tree.
+     *
+     * @return array
+     */
+    protected function plugin_names_from_tree( array $node ): array {
+        $plugin_names = [];
+        if ( $node['children'] ) {
+            foreach ( $node['children'] as $child ) {
+                $plugin_names[] = $this->plugin_names_from_tree( $child );
+            }
+            $plugin_names = array_merge( [], ...$plugin_names );
+        }
+        $status = '';
+        foreach ( hcaptcha()->modules as $module ) {
+            if ( $module[1] === $node['plugin'] ) {
+                $status = $module[0][0];
+                break;
+            }
+        }
+        $plugin_name = $this->form_fields[ $status ]['label'] ?? '';
+        if ( ! $plugin_name ) {
+            $plugin_data = get_plugin_data( constant( 'WP_PLUGIN_DIR' ) . '/' . $node['plugin'] );
+            $plugin_name = $plugin_data['Name'] ?? '';
+        }
+        return array_unique( array_merge( [ $plugin_name ], $plugin_names ) );
+    }
+    /**
      * Activate theme.
+     *
 …
         $data = [ 'message' => esc_html( $message ) ];
+        if ( 'plugin' === $this->entity ) {
+            $data['stati'] = $this->get_activation_stati();
+        }
         if ( 'theme' === $this->entity ) {
             $data['themes']       = $this->get_themes();
 …
         return $data;
+    }
+    /**
+     * Get activation stati of all integrated plugins and themes.
+     *
+     * @return array
+     */
+    protected function get_activation_stati(): array {
+        $stati = [];
+        foreach ( hcaptcha()->modules as $module ) {
+            $stati[ $module[0][0] ] = hcaptcha()->plugin_or_theme_active( $module[1] );
+        }
+        return $stati;
+    }

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Settings/ListPageBase.php

-                      r3072795
+                      r3095958
 namespace HCaptcha\Settings;
+use DateTimeImmutable;
 /**
  * Class ListPageBase.
 …
     /**
+     * Chart handle.
+     */
+    const CHART_HANDLE = 'chart';
+    /**
+     * Flatpickr handle.
+     */
+    const FLATPICKR_HANDLE = 'flatpickr';
+    /**
+     * Base handle.
+     */
+    const HANDLE = 'settings-list-page-base';
+    /**
+     * Base object.
+     */
+    const OBJECT = 'HCaptchaFlatPickerObject';
+    /**
+     * Number of timespan days by default.
+     * "Last 30 Days", by default.
+     */
+    const DEFAULT_TIMESPAN_DAYS = '30';
+    /**
+     * Timespan (date range) delimiter.
+     */
+    const TIMESPAN_DELIMITER = ' - ';
+    /**
+     * Default date format.
+     */
+    const DATE_FORMAT = 'Y-m-d';
+    /**
+     * Chart time unit.
+     *
+     * @var string
+     */
+    protected $unit;
+    /**
+     * The page is allowed to be shown.
+     *
+     * @var bool
+     */
+    protected $allowed = false;
+    /**
      * Get suggested data format from items array.
+     *
 …
         $time_diff = $max_time - $min_time;
+        $time_units = [
+            [ 1, 'second' ],
+            [ constant( 'MINUTE_IN_SECONDS' ), 'minute' ],
+            [ constant( 'HOUR_IN_SECONDS' ), 'hour' ],
+            [ constant( 'DAY_IN_SECONDS' ), 'day' ],
+            [ constant( 'WEEK_IN_SECONDS' ), 'week' ],
+            [ constant( 'MONTH_IN_SECONDS' ), 'month' ],
+            [ constant( 'YEAR_IN_SECONDS' ), 'year' ],
+        ];
+        foreach ( $time_units as $index => $time_unit ) {
+            $i          = max( 0, $index - 1 );
+            $this->unit = $time_units[ $i ][1];
+            if ( $time_diff < $time_unit[0] * 2 ) {
+                break;
+            }
+        }
         if ( $time_diff < constant( 'MINUTE_IN_SECONDS' ) ) {
 …
         return $date_format;
+    }
+    /**
+     * Enqueue class scripts.
+     */
+    public function admin_enqueue_scripts() {
+        $min = hcap_min_suffix();
+        wp_enqueue_script(
+            self::CHART_HANDLE,
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chartjs/chart.umd.min.js',
+            [],
+            'v4.4.2',
+            true
+        );
+        wp_enqueue_script(
+            'chart-adapter-date-fns',
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chartjs/chartjs-adapter-date-fns.bundle.min.js',
+            [ self::CHART_HANDLE ],
+            'v3.0.0',
+            true
+        );
+        wp_enqueue_style(
+            self::FLATPICKR_HANDLE,
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/flatpickr/flatpickr.min.css',
+            [],
+            '4.6.13'
+        );
+        wp_enqueue_script(
+            self::FLATPICKR_HANDLE,
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/flatpickr/flatpickr.min.js',
+            [],
+            '4.6.13',
+            true
+        );
+        wp_enqueue_style(
+            self::HANDLE,
+            constant( 'HCAPTCHA_URL' ) . "/assets/css/settings-list-page-base$min.css",
+            [ self::FLATPICKR_HANDLE ],
+            constant( 'HCAPTCHA_VERSION' )
+        );
+        wp_enqueue_script(
+            self::HANDLE,
+            constant( 'HCAPTCHA_URL' ) . "/assets/js/settings-list-page-base$min.js",
+            [ self::FLATPICKR_HANDLE ],
+            constant( 'HCAPTCHA_VERSION' ),
+            true
+        );
+        wp_localize_script(
+            self::HANDLE,
+            self::OBJECT,
+            [
+                'delimiter' => self::TIMESPAN_DELIMITER,
+                'locale'    => $this->get_language_code(),
+            ]
+        );
+    }
+    /**
+     * Display datepicker element.
+     *
+     * @return void
+     */
+    public function date_picker_display() {
+        if ( ! $this->allowed ) {
+            return;
+        }
+        list( $choices, $chosen_filter, $value ) = $this->process_datepicker_choices();
+        // An array of allowed HTML elements and attributes for the datepicker choices.
+        $choices_allowed_html = [
+            'li'    => [],
+            'label' => [],
+            'input' => [
+                'type'         => [],
+                'name'         => [],
+                'value'        => [],
+                'checked'      => [],
+                'aria-hidden'  => [],
+                'data-default' => [],
+            ],
+        ];
+        ?>
+        <div class="hcaptcha-filter">
+            <button id="hcaptcha-datepicker-popover-button" class="button" role="button" aria-haspopup="true">
+                <?php echo esc_html( $chosen_filter ); ?>
+            </button>
+            <div class="hcaptcha-datepicker-popover">
+                <div class="hcaptcha-datepicker-popover-content">
+                    <ul class="hcaptcha-datepicker-choices"
+                        aria-label="<?php esc_attr_e( 'Datepicker options', 'hcaptcha-for-forms-and-more' ); ?>"
+                        aria-orientation="vertical">
+                        <?php echo wp_kses( '<li>' . implode( '</li><li>', $choices ) . '</li>', $choices_allowed_html ); ?>
+                    </ul>
+                    <div class="hcaptcha-datepicker-calendar">
+                        <label for="hcaptcha-datepicker">
+                            <input
+                                type="text"
+                                name="date"
+                                tabindex="-1"
+                                aria-hidden="true"
+                                id="hcaptcha-datepicker"
+                                value="<?php echo esc_attr( $value ); ?>">
+                        </label>
+                    </div>
+                    <div class="hcaptcha-datepicker-action">
+                        <button class="button-secondary" type="reset">
+                            <?php esc_html_e( 'Cancel', 'hcaptcha-for-forms-and-more' ); ?>
+                        </button>
+                        <button class="button-primary hcaptcha-btn-blue" type="submit">
+                            <?php esc_html_e( 'Apply', 'hcaptcha-for-forms-and-more' ); ?>
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php
+    }
+    /**
+     * Sets the timespan (or date range) for performing mysql queries.
+     *
+     * Includes:
+     * 1. A list of date filter options for the datepicker module.
+     * 2. Currently selected filter or date range values. Last "X" days, or i.e. Feb 8, 2023 - Mar 9, 2023.
+     * 3. Assigned timespan dates.
+     *
+     * @param array|null $timespan Given timespan (dates) preferably in WP timezone.
+     *
+     * @return array
+     * @noinspection PhpMissingParamTypeInspection
+     * @noinspection HtmlUnknownAttribute
+     */
+    protected function process_datepicker_choices( $timespan = null ): array {
+        // Retrieve and validate timespan if none is given.
+        if ( empty( $timespan ) || ! is_array( $timespan ) ) {
+            $timespan = $this->process_timespan();
+        }
+        list( $start_date, $end_date, $days ) = $timespan;
+        $filters       = $this->get_date_filter_choices();
+        $selected      = isset( $filters[ $days ] ) ? $days : 'custom';
+        $value         = $this->concat_dates( $start_date, $end_date );
+        $chosen_filter = 'custom' === $selected ? $value : $filters[ $selected ];
+        $choices       = [];
+        foreach ( $filters as $choice => $label ) {
+            $timespan_dates = $this->get_timespan_dates( $choice );
+            $checked        = checked( $selected, $choice, false );
+            $default        = (int) self::DEFAULT_TIMESPAN_DAYS === $choice ? 'data-default' : '';
+            $choices[]      = sprintf(
+                '<label %s>%s<input type="radio" aria-hidden="true" name="timespan" value="%s" %s %s></label>',
+                $checked ? 'class="is-selected"' : '',
+                esc_html( $label ),
+                esc_attr( $this->concat_dates( ...$timespan_dates ) ),
+                esc_attr( $checked ),
+                esc_attr( $default )
+            );
+        }
+        return [ $choices, $chosen_filter, $value ];
+    }
+    /**
+     * Sets the timespan (or date range) selected.
+     *
+     * Includes:
+     * 1. Start date object in WP timezone.
+     * 2. End date object in WP timezone.
+     * 3. Number of "Last X days", if applicable, otherwise returns "custom".
+     * 4. Label associated with the selected date filter choice. @see "get_date_filter_choices".
+     *
+     * @return array
+     */
+    protected function process_timespan(): array {
+        $dates = (string) filter_input( INPUT_GET, 'date', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
+        // Return default timespan if dates are empty.
+        if ( empty( $dates ) ) {
+            return $this->get_timespan_dates( self::DEFAULT_TIMESPAN_DAYS );
+        }
+        $dates = $this->maybe_validate_string_timespan( $dates );
+        list( $start_date, $end_date ) = explode( self::TIMESPAN_DELIMITER, $dates );
+        // Return default timespan if the start date is more recent than the end date.
+        if ( strtotime( $start_date ) > strtotime( $end_date ) ) {
+            return $this->get_timespan_dates( self::DEFAULT_TIMESPAN_DAYS );
+        }
+        $timezone   = wp_timezone(); // Retrieve the timezone string for the site.
+        $start_date = date_create_immutable( $start_date, $timezone );
+        $end_date   = date_create_immutable( $end_date, $timezone );
+        // Return default timespan if date creation fails.
+        if ( ! $start_date || ! $end_date ) {
+            // @codeCoverageIgnoreStart
+            return $this->get_timespan_dates( self::DEFAULT_TIMESPAN_DAYS );
+            // @codeCoverageIgnoreEnd
+        }
+        // Set time to 0:0:0 for start date and 23:59:59 for end date.
+        $start_date = $start_date->setTime( 0, 0 );
+        $end_date   = $end_date->setTime( 23, 59, 59 );
+        $days_diff    = '';
+        $current_date = date_create_immutable( 'now', $timezone )->setTime( 23, 59, 59 );
+        // Calculate day difference only if the end date is equal to the current date.
+        if ( ! $current_date->diff( $end_date )->format( '%a' ) ) {
+            $days_diff = $end_date->diff( $start_date )->format( '%a' );
+        }
+        list( $days, $timespan_label ) = $this->get_date_filter_choices( $days_diff );
+        return [
+            $start_date,     // WP timezone.
+            $end_date,       // WP timezone.
+            $days,           // e.g., 22.
+            $timespan_label, // e.g., Custom.
+        ];
+    }
+    /**
+     * Check the delimiter to see if the end date is specified.
+     * We can assume that the start and end dates are the same if the end date is missing.
+     *
+     * @param string $dates Given timespan (dates) in string. i.e. "2024-04-16 - 2024-05-16" or "2024-04-16".
+     *
+     * @return string
+     */
+    protected function maybe_validate_string_timespan( string $dates ): string {
+        // The '-' is used as a delimiter for the datepicker module.
+        if ( false !== strpos( $dates, self::TIMESPAN_DELIMITER ) ) {
+            return $dates;
+        }
+        return $dates . self::TIMESPAN_DELIMITER . $dates;
+    }
+    /**
+     * The number of days is converted to the start and end date range.
+     *
+     * @param string $days Timespan days.
+     *
+     * @return array
+     */
+    protected function get_timespan_dates( string $days ): array {
+        list( $timespan_key, $timespan_label ) = $this->get_date_filter_choices( $days );
+        // Bail early, if the given number of days is NOT a number nor a numeric string.
+        if ( ! is_numeric( $days ) ) {
+            return [ '', '', $timespan_key, $timespan_label ];
+        }
+        $end_date   = date_create_immutable( 'now', wp_timezone() );
+        $start_date = $end_date;
+        if ( (int) $days > 0 ) {
+            $start_date = $start_date->modify( "-$days day" );
+        }
+        $start_date = $start_date->setTime( 0, 0 );
+        $end_date   = $end_date->setTime( 23, 59, 59 );
+        return [
+            $start_date,     // WP timezone.
+            $end_date,       // WP timezone.
+            $timespan_key,   // i.e. 30.
+            $timespan_label, // i.e. Last 30 days.
+        ];
+    }
+    /**
+     * Returns a list of date filter options for the datepicker module.
+     *
+     * @param string|null $key Optional. Key associated with available filters.
+     *
+     * @return array
+     * @noinspection PhpMissingParamTypeInspection
+     */
+    protected function get_date_filter_choices( $key = null ): array {
+        // Available date filters.
+        $choices = [
+            '0'      => esc_html__( 'Today', 'wpforms-lite' ),
+            '1'      => esc_html__( 'Yesterday', 'wpforms-lite' ),
+            '7'      => esc_html__( 'Last 7 days', 'wpforms-lite' ),
+            '30'     => esc_html__( 'Last 30 days', 'wpforms-lite' ),
+            '90'     => esc_html__( 'Last 90 days', 'wpforms-lite' ),
+            '365'    => esc_html__( 'Last 1 year', 'wpforms-lite' ),
+            'custom' => esc_html__( 'Custom', 'wpforms-lite' ),
+        ];
+        // Bail early, and return the full list of options.
+        if ( is_null( $key ) ) {
+            return $choices;
+        }
+        // Return the "Custom" filter if the given key is not found.
+        $key = isset( $choices[ $key ] ) ? $key : 'custom';
+        return [ $key, $choices[ $key ] ];
+    }
+    /**
+     * Concatenate given dates into a single string. i.e. "2024-04-16 - 2024-05-16".
+     *
+     * @param DateTimeImmutable|mixed $start_date Start date.
+     * @param DateTimeImmutable|mixed $end_date   End date.
+     * @param int|string              $fallback   Fallback value if dates are not valid.
+     *
+     * @return string
+     */
+    private function concat_dates( $start_date, $end_date, $fallback = '' ) {
+        // Bail early, if the given dates are not valid.
+        if ( ! ( $start_date instanceof DateTimeImmutable ) || ! ( $end_date instanceof DateTimeImmutable ) ) {
+            return $fallback;
+        }
+        return implode(
+            self::TIMESPAN_DELIMITER,
+            [
+                $start_date->format( self::DATE_FORMAT ),
+                $end_date->format( self::DATE_FORMAT ),
+            ]
+        );
+    }
+    /**
+     * Get the ISO 639-2 Language Code from user/site locale.
+     *
+     * @see   http://www.loc.gov/standards/iso639-2/php/code_list.php
+     *
+     * @return string
+     */
+    private function get_language_code(): string {
+        $default_lang = 'en';
+        $locale       = get_user_locale();
+        if ( ! empty( $locale ) ) {
+            $lang = explode( '_', $locale );
+            if ( ! empty( $lang ) && is_array( $lang ) ) {
+                $default_lang = strtolower( $lang[0] );
+            }
+        }
+        return $default_lang;
+    }
+}

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Settings/PluginSettingsBase.php

-                      r3080217
+                      r3095958
     /**
+     * Settings option name.
+     */
+    const OPTION_NAME = 'hcaptcha_settings';
+    /**
      * The 'submit' button was shown.
+     *
 …
      */
     protected function option_name(): string {
         return 'hcaptcha_settings';
+        return self::OPTION_NAME;
+    }

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Settings/Settings.php

-                      r3081325
+                      r3095958
         return $first_tab ? $first_tab->get_active_tab()->tab_name() : '';
+    }
+    /**
+     * Check if it is a Pro account.
+     *
+     * @return false
+     */
+    public function is_pro(): bool {
+        return 'pro' === $this->get_license();
+    }
+    /**
+     * Check if it is a Pro account or General admin page.
+     *
+     * @return bool
+     */
+    public function is_pro_or_general(): bool {
+        return $this->is_pro() || ( is_admin() && 'General' === $this->get_active_tab_name() );
+    }
 …
      */
     public function get_theme(): string {
+        $theme = $this->get( 'theme' );
+        if ( $this->is_on( 'custom_themes' ) && $this->is_pro_or_general() ) {
+            $theme = $this->get_config_params()['theme']['palette']['mode'] ?? $theme;
+        }
         /**
 …
          * @param string $mode Current theme.
          */
         return (string) apply_filters( 'hcap_theme', $this->get( 'theme' ) );
+        return (string) apply_filters( 'hcap_theme', $theme );
+    }

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/Settings/SystemInfo.php

-                      r3081325
+                      r3095958
      */
     public function section_callback( array $arguments ) {
+        $this->print_header();
         ?>
-        <h2>
-            <?php echo esc_html__( 'System Information', 'hcaptcha-for-forms-and-more' ); ?>
-        </h2>
         <div id="hcaptcha-system-info-wrap">
             <span class="helper">

hcaptcha-for-forms-and-more/tags/4.2.0/src/php/WPDiscuz/Comment.php

r3064004	r3095958
115	115	self::HANDLE,
116	116	HCAPTCHA_URL . "/assets/js/hcaptcha-wpdiscuz-comment$min.js",
117		[ ~~'wp-hooks'~~ ],
	117	[],
118	118	HCAPTCHA_VERSION,
119	119	true

hcaptcha-for-forms-and-more/tags/4.2.0/vendor/composer/installed.php

-                      r3086102
+                      r3095958
     'root' => array(
         'name' => 'hcaptcha/hcaptcha-wordpress-plugin',
         'pretty_version' => '4.1.2',
         'version' => '4.1.2.0',
         'reference' => '77825b68c9bf0dee38f9da73b634861e79f9e69b',
+        'pretty_version' => '4.2.0',
+        'version' => '4.2.0.0',
+        'reference' => 'aa580b1c05ee0aff974fbf1d99e92341a6f82094',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
 …
     'versions' => array(
         'hcaptcha/hcaptcha-wordpress-plugin' => array(
             'pretty_version' => '4.1.2',
             'version' => '4.1.2.0',
             'reference' => '77825b68c9bf0dee38f9da73b634861e79f9e69b',
+            'pretty_version' => '4.2.0',
+            'version' => '4.2.0.0',
+            'reference' => 'aa580b1c05ee0aff974fbf1d99e92341a6f82094',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

hcaptcha-for-forms-and-more/trunk/assets/css/settings-base.css

-                      r3086102
+                      r3095958
+}
+.hcaptcha-header-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin: 0;
+}
 #hcaptcha-options h2 {
     font-size: 1.5em;
 …
         z-index: 1;
+    }
+}
+    .hcaptcha-settings-tab {
+        margin-right: 15px;
+    }
+}

hcaptcha-for-forms-and-more/trunk/assets/css/settings-base.min.css

r3086102	r3095958
1		body.settings_page_hcaptcha{background:#f0f2f5;color:#5c6f8a}.wrap h1.hcaptcha-settings-header{align-items:center;display:flex;font-size:34px;font-weight:700}.hcaptcha-logo{height:64px;margin:10px 5px 10px 0}.hcaptcha-settings-tabs{background:#fff;display:flex;flex-wrap:wrap;justify-content:space-between;line-height:4.5em;margin:10px -20px 0;padding:0 20px}.hcaptcha-settings-tab{border-bottom:2px solid transparent;color:#646970;display:inline-block;font-size:1.1em;margin-right:30px;text-decoration:none}.hcaptcha-settings-tab:hover{border-bottom-color:#025176!important;border-bottom:2px solid;color:#666}.hcaptcha-settings-tab.active{border-bottom:2px solid #0075ab}#hcaptcha-options h2{color:#5c6f8a;font-size:1.5em}#hcaptcha-options h3{color:#5c6f8a;margin:1.5em 0 1em}#hcaptcha-options .notice-dismiss:before{color:#5c6f8a}#hcaptcha-options table tbody tr td{margin:0;padding:0;position:relative}#hcaptcha-options table tr td input[type=checkbox]{border:none;box-shadow:none;display:inline;height:1.25rem;margin:-.125rem .5rem 0 0;width:2.3611rem}#hcaptcha-options table tr td input[type=checkbox]:before{background:url(../images/checkbox-off.svg);background-size:cover;content:"";display:inline-block;height:1.25rem;margin:0;width:2.3611rem}#hcaptcha-options table tr td input[type=checkbox]:checked:before{background:no-repeat url(../images/checkbox-on.svg);background-size:cover}#hcaptcha-options fieldset:disabled{color:#dadada}#hcaptcha-options .button-primary{background-color:#026593;border-color:#026593;color:#fff}#hcaptcha-options .button-primary:hover{background-color:#025176}#hcaptcha-options .button-secondary{background-color:#fff;border-color:#026593;color:#026593}#hcaptcha-options .button-secondary:hover{background-color:#ccc}#hcaptcha-options a{color:#0075ab}#hcaptcha-navigation a{border-color:#0075ab}#hcaptcha-options a.hcaptcha-settings-tab{color:#5c6f8a}#hcaptcha-options .helper:before{background:#5c6f8a;border-radius:1.2em;color:#fff;content:"?";height:1.2em;position:absolute;right:0;text-align:center;top:0;transform:translateY(-26px);width:1.2em}#hcaptcha-options fieldset+.helper:before{top:50%;transform:translate(25px,-.8em)}#hcaptcha-options .helper .helper-content{background:#5c6f8a;box-sizing:border-box;color:#f0f2f5;display:none;padding:.5em 1em;position:absolute;right:0;top:0;transform:translate(1px,10px);width:100%}#hcaptcha-options fieldset+.helper .helper-content{top:50%;transform:translate(25px,25px);width:calc(100% + 25px)}#hcaptcha-options .helper:hover{cursor:help}#hcaptcha-options .helper:hover .helper-content{display:block;z-index:1}#hcaptcha-options .helper .helper-content:after{border:10px solid transparent;border-bottom-color:#5c6f8a;content:"";position:absolute;right:0;top:0;transform:translateY(-100%)}#hcaptcha-options .helper .helper-content a{color:#fff}#hcaptcha-message{box-sizing:border-box}#hcaptcha-message p{font-size:13px;font-weight:600;line-height:1.5;margin:.5em 0}@keyframes blink{0%{opacity:1}16.7%{opacity:0}33.3%{opacity:1}50%{opacity:0}66.7%{opacity:1}83.3%{opacity:0}to{opacity:1}}.blink{animation:blink 3s linear}.hcaptcha-hide{display:none}.hcaptcha-excerpt{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.hcaptcha-excerpt:hover .hcaptcha-hide{background:#5c6f8a;border:1px solid #c3c4c7;border-radius:6px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);color:#f0f2f5;display:block;left:0;max-width:300px;padding:8px 10px;position:absolute;text-align:center;top:0;white-space:normal;width:max-content;z-index:1}@media (max-width:782px){.hcaptcha-settings-tabs{margin:10px -12px 0 -10px;padding:0 12px 0 10px}}@media (max-width:600px){#hcaptcha-options table tbody{grid-template-columns:1fr}#hcaptcha-options table tbody tr{position:relative}#hcaptcha-options fieldset+.helper:before{transform:translateY(-.7em)}#hcaptcha-options fieldset+.helper .helper-content{transform:translateY(25px);width:100%}#hcaptcha-options .helper{z-index:1}}
	1	body.settings_page_hcaptcha{background:#f0f2f5;color:#5c6f8a}.wrap h1.hcaptcha-settings-header{align-items:center;display:flex;font-size:34px;font-weight:700}.hcaptcha-logo{height:64px;margin:10px 5px 10px 0}.hcaptcha-settings-tabs{background:#fff;display:flex;flex-wrap:wrap;justify-content:space-between;line-height:4.5em;margin:10px -20px 0;padding:0 20px}.hcaptcha-settings-tab{border-bottom:2px solid transparent;color:#646970;display:inline-block;font-size:1.1em;margin-right:30px;text-decoration:none}.hcaptcha-settings-tab:hover{border-bottom-color:#025176!important;border-bottom:2px solid;color:#666}.hcaptcha-settings-tab.active{border-bottom:2px solid #0075ab}.hcaptcha-header-bar{align-items:center;display:flex;justify-content:space-between;margin:0}#hcaptcha-options h2{color:#5c6f8a;font-size:1.5em}#hcaptcha-options h3{color:#5c6f8a;margin:1.5em 0 1em}#hcaptcha-options .notice-dismiss:before{color:#5c6f8a}#hcaptcha-options table tbody tr td{margin:0;padding:0;position:relative}#hcaptcha-options table tr td input[type=checkbox]{border:none;box-shadow:none;display:inline;height:1.25rem;margin:-.125rem .5rem 0 0;width:2.3611rem}#hcaptcha-options table tr td input[type=checkbox]:before{background:url(../images/checkbox-off.svg);background-size:cover;content:"";display:inline-block;height:1.25rem;margin:0;width:2.3611rem}#hcaptcha-options table tr td input[type=checkbox]:checked:before{background:no-repeat url(../images/checkbox-on.svg);background-size:cover}#hcaptcha-options fieldset:disabled{color:#dadada}#hcaptcha-options .button-primary{background-color:#026593;border-color:#026593;color:#fff}#hcaptcha-options .button-primary:hover{background-color:#025176}#hcaptcha-options .button-secondary{background-color:#fff;border-color:#026593;color:#026593}#hcaptcha-options .button-secondary:hover{background-color:#ccc}#hcaptcha-options a{color:#0075ab}#hcaptcha-navigation a{border-color:#0075ab}#hcaptcha-options a.hcaptcha-settings-tab{color:#5c6f8a}#hcaptcha-options .helper:before{background:#5c6f8a;border-radius:1.2em;color:#fff;content:"?";height:1.2em;position:absolute;right:0;text-align:center;top:0;transform:translateY(-26px);width:1.2em}#hcaptcha-options fieldset+.helper:before{top:50%;transform:translate(25px,-.8em)}#hcaptcha-options .helper .helper-content{background:#5c6f8a;box-sizing:border-box;color:#f0f2f5;display:none;padding:.5em 1em;position:absolute;right:0;top:0;transform:translate(1px,10px);width:100%}#hcaptcha-options fieldset+.helper .helper-content{top:50%;transform:translate(25px,25px);width:calc(100% + 25px)}#hcaptcha-options .helper:hover{cursor:help}#hcaptcha-options .helper:hover .helper-content{display:block;z-index:1}#hcaptcha-options .helper .helper-content:after{border:10px solid transparent;border-bottom-color:#5c6f8a;content:"";position:absolute;right:0;top:0;transform:translateY(-100%)}#hcaptcha-options .helper .helper-content a{color:#fff}#hcaptcha-message{box-sizing:border-box}#hcaptcha-message p{font-size:13px;font-weight:600;line-height:1.5;margin:.5em 0}@keyframes blink{0%{opacity:1}16.7%{opacity:0}33.3%{opacity:1}50%{opacity:0}66.7%{opacity:1}83.3%{opacity:0}to{opacity:1}}.blink{animation:blink 3s linear}.hcaptcha-hide{display:none}.hcaptcha-excerpt{display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.hcaptcha-excerpt:hover .hcaptcha-hide{background:#5c6f8a;border:1px solid #c3c4c7;border-radius:6px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.1);color:#f0f2f5;display:block;left:0;max-width:300px;padding:8px 10px;position:absolute;text-align:center;top:0;white-space:normal;width:max-content;z-index:1}@media (max-width:782px){.hcaptcha-settings-tabs{margin:10px -12px 0 -10px;padding:0 12px 0 10px}}@media (max-width:600px){#hcaptcha-options table tbody{grid-template-columns:1fr}#hcaptcha-options table tbody tr{position:relative}#hcaptcha-options fieldset+.helper:before{transform:translateY(-.7em)}#hcaptcha-options fieldset+.helper .helper-content{transform:translateY(25px);width:100%}#hcaptcha-options .helper{z-index:1}.hcaptcha-settings-tab{margin-right:15px}}

hcaptcha-for-forms-and-more/trunk/assets/js/events.js

-                      r3086102
+                      r3095958
 /**
+ * @param HCaptchaEventsObject.failed
+ * @param HCaptchaEventsObject.failedLabel
  * @param HCaptchaEventsObject.succeed
- * @param HCaptchaEventsObject.failed
  * @param HCaptchaEventsObject.succeedLabel
  * @param HCaptchaEventsObject.failedLabel
+ * @param HCaptchaEventsObject.unit
  */
 document.addEventListener( 'DOMContentLoaded', function() {
 …
                         },
                         tooltipFormat: 'dd.MM.yyyy HH:mm',
+                        unit: HCaptchaEventsObject.unit,
                     },
                 },

hcaptcha-for-forms-and-more/trunk/assets/js/events.min.js

r3086102	r3095958
1		document.addEventListener("DOMContentLoaded",(function(){var e=document.getElementById("eventsChart"),t=window.innerWidth>600?3:2;new Chart(e,{type:"bar",data:{datasets:[{label:HCaptchaEventsObject.succeedLabel,data:HCaptchaEventsObject.succeed,borderWidth:1},{label:HCaptchaEventsObject.failedLabel,data:HCaptchaEventsObject.failed,borderWidth:1}]},options:{responsive:!0,maintainAspectRatio:!0,aspectRatio:t,scales:{x:{type:"time",time:{displayFormats:{millisecond:"HH:mm:ss",second:"HH:mm:ss",minute:"HH:mm",hour:"HH:mm",day:"dd.MM.yyyy",week:"dd.MM.yyyy",month:"dd.MM.yyyy",quarter:"dd.MM.yyyy",year:"dd.MM.yyyy"},tooltipFormat:"dd.MM.yyyy HH:mm"}},y:{beginAtZero:!0,ticks:{precision:0}}}}})}));
	1	document.addEventListener("DOMContentLoaded",(function(){var e=document.getElementById("eventsChart"),t=window.innerWidth>600?3:2;new Chart(e,{type:"bar",data:{datasets:[{label:HCaptchaEventsObject.succeedLabel,data:HCaptchaEventsObject.succeed,borderWidth:1},{label:HCaptchaEventsObject.failedLabel,data:HCaptchaEventsObject.failed,borderWidth:1}]},options:{responsive:!0,maintainAspectRatio:!0,aspectRatio:t,scales:{x:{type:"time",time:{displayFormats:{millisecond:"HH:mm:ss",second:"HH:mm:ss",minute:"HH:mm",hour:"HH:mm",day:"dd.MM.yyyy",week:"dd.MM.yyyy",month:"dd.MM.yyyy",quarter:"dd.MM.yyyy",year:"dd.MM.yyyy"},tooltipFormat:"dd.MM.yyyy HH:mm",unit:HCaptchaEventsObject.unit}},y:{beginAtZero:!0,ticks:{precision:0}}}}})}));

hcaptcha-for-forms-and-more/trunk/assets/js/forms.js

-                      r3086102
+                      r3095958
  * @param HCaptchaFormsObject.served
  * @param HCaptchaFormsObject.servedLabel
+ * @param HCaptchaFormsObject.unit
  */
 document.addEventListener( 'DOMContentLoaded', function() {
 …
                         },
                         tooltipFormat: 'dd.MM.yyyy HH:mm',
+                        unit: HCaptchaFormsObject.unit,
                     },
                 },

hcaptcha-for-forms-and-more/trunk/assets/js/forms.min.js

r3086102	r3095958
1		document.addEventListener("DOMContentLoaded",(function(){var e=document.getElementById("formsChart"),t=window.innerWidth>600?3:2;new Chart(e,{type:"bar",data:{datasets:[{label:HCaptchaFormsObject.servedLabel,backgroundColor:"rgba(2,101,147,0.5)",data:HCaptchaFormsObject.served,borderWidth:1}]},options:{responsive:!0,maintainAspectRatio:!0,aspectRatio:t,scales:{x:{type:"time",time:{displayFormats:{millisecond:"HH:mm:ss",second:"HH:mm:ss",minute:"HH:mm",hour:"HH:mm",day:"dd.MM.yyyy",week:"dd.MM.yyyy",month:"dd.MM.yyyy",quarter:"dd.MM.yyyy",year:"dd.MM.yyyy"},tooltipFormat:"dd.MM.yyyy HH:mm"}},y:{beginAtZero:!0,ticks:{precision:0}}}}})}));
	1	document.addEventListener("DOMContentLoaded",(function(){var t=document.getElementById("formsChart"),e=window.innerWidth>600?3:2;new Chart(t,{type:"bar",data:{datasets:[{label:HCaptchaFormsObject.servedLabel,backgroundColor:"rgba(2,101,147,0.5)",data:HCaptchaFormsObject.served,borderWidth:1}]},options:{responsive:!0,maintainAspectRatio:!0,aspectRatio:e,scales:{x:{type:"time",time:{displayFormats:{millisecond:"HH:mm:ss",second:"HH:mm:ss",minute:"HH:mm",hour:"HH:mm",day:"dd.MM.yyyy",week:"dd.MM.yyyy",month:"dd.MM.yyyy",quarter:"dd.MM.yyyy",year:"dd.MM.yyyy"},tooltipFormat:"dd.MM.yyyy HH:mm",unit:HCaptchaFormsObject.unit}},y:{beginAtZero:!0,ticks:{precision:0}}}}})}));

hcaptcha-for-forms-and-more/trunk/assets/js/general.js

-                      r3081325
+                      r3095958
     function getCleanConsoleLogs() {
+        const ignore = [ 'recaptchacompat disabled' ];
+        const ignore = [
+            'recaptchacompat disabled',
+            'Missing sitekey - https://hcaptcha.com/docs/configuration#jsapi',
+        ];
         const logs = [];
 …
         const sampleHCaptcha = document.querySelector( '#hcaptcha-options .h-captcha' );
         sampleHCaptcha.innerHTML = '';
+        // Map the theme to the palette mode.
+        params.theme = params?.theme?.palette?.mode;
+        if ( ! params.theme ) {
+            // Remove the theme if it's not set.
+            delete params.theme;
+        }
         for ( const key in params ) {

hcaptcha-for-forms-and-more/trunk/assets/js/general.min.js

r3081325	r3095958
1		(()=>{var t={};function e(t){return e="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},e(t)}t.g=function(){if("object"==typeof globalThis)return globalThis;try{return this\|\|new Function("return this")()}catch(t){if("object"==typeof window)return window}}();var a=function(a){var n="#hcaptcha-message",c=a(n),o=a("form.hcaptcha-general"),r=a('[name="hcaptcha_settings[site_key]"]'),i=a('[name="hcaptcha_settings[secret_key]"]'),s=a("#check_config"),l=a("#reset_notifications"),h=a('[name="hcaptcha_settings[theme]"]'),p=a('[name="hcaptcha_settings[size]"]'),u=a('[name="hcaptcha_settings[language]"]'),d=a('[name="hcaptcha_settings[mode]"]'),f=a('[name="hcaptcha_settings[custom_themes][]"]'),v=a(".hcaptcha-general-custom-prop select"),m=a(".hcaptcha-general-custom-value input"),g=a('[name="hcaptcha_settings[config_params]"]'),b=a(".hcaptcha-section-enterprise + table input"),y=a('[name="hcaptcha_settings[recaptcha_compat_off][]"]'),C=o.find("#submit"),j={},O=r.val(),H=i.val(),k=T();j[HCaptchaGeneralObject.modeLive]=HCaptchaGeneralObject.siteKey,j[HCaptchaGeneralObject.modeTestPublisher]=HCaptchaGeneralObject.modeTestPublisherSiteKey,j[HCaptchaGeneralObject.modeTestEnterpriseSafeEndUser]=HCaptchaGeneralObject.modeTestEnterpriseSafeEndUserSiteKey,j[HCaptchaGeneralObject.modeTestEnterpriseBotDetected]=HCaptchaGeneralObject.modeTestEnterpriseBotDetectedSiteKey;var G=!1,S=!1,_=[];function w(t){var e={};return t.each((function(){var t=a(this),n=t.attr("name").replace(/hcaptcha_settings\[(.+)]/,"$1");e[n]=t.val()})),e}function T(){return w(b)}function A(){c.remove(),a('<div id="hcaptcha-message"></div>').insertAfter("#hcaptcha-options h2"),c=a(n)}function E(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(t=void 0===t?"":String(t),t=(t+="\n"+function(){for(var t=["recaptchacompat disabled"],e=[],a=0;a<_.length;a++){for(var n=_[a],c=n[0],o=n[1],r=Object.keys(o),i=[],s=0;s<r.length;s++){var l=o[s];"string"==typeof l&&-1===t.indexOf(l)&&i.push([c,l].join(" "))}e.push(i.join("\n"))}return _=[],e.join("\n")}()).trim()){c.removeClass(),c.addClass(e+" notice is-dismissible");var n=t.split("\n").map((function(t){return"<p>".concat(t,"</p>")}));c.html(n.join("")),a(document).trigger("wp-updates-notice-added");var o=a("#wpwrap").position().top;a("html, body").animate({scrollTop:c.offset().top-o-parseInt(c.css("margin-bottom"))},1e3)}}function x(){E(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"","notice-success")}function N(){E(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"","notice-error")}function L(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=Object.assign(hCaptcha.getParams(),t);hCaptcha.setParams(e);var a=document.querySelector("#hcaptcha-options .h-captcha");for(var n in a.innerHTML="",t)a.setAttribute("data-".concat(n),"".concat(t[n]));hCaptcha.bindEvents()}function K(t,a){var n=function(t){return t&&"object"===e(t)};return n(t)&&n(a)?(Object.keys(a).forEach((function(e){var c=t[e],o=a[e];Array.isArray(c)&&Array.isArray(o)?t[e]=c.concat(o):n(c)&&n(o)?t[e]=K(Object.assign({},c),o):t[e]=o})),t):a}function U(t){var a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";for(var n in t){var c=a?"".concat(a,"--").concat(n):n;if("object"===e(t[n])&&null!==t[n])U(t[n],c);else{var o=t[n],r=c.replace(/theme--/g,""),i="".concat(r,"=").concat(o),s=v.find('option[value*="'.concat(r,'="]'));1===s.length&&(s.attr("value",i),s.is(":selected")&&m.val(o))}}}function B(){var t,e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},a=g.val().trim();a=a\|\|null;try{t=JSON.parse(a)}catch(t){return g.css("background-color","#ffabaf"),C.attr("disabled",!0),void N("Bad JSON!")}t=K(t,e),g.val(JSON.stringify(t,null,2)),U(t),f.prop("checked")\|\|(t={sitekey:r.val(),theme:h.val(),size:p.val(),hl:u.val()}),L(t)}function P(){r.val()===O&&i.val()===H?(G=!1,A(),C.attr("disabled",!1)):G\|\|(G=!0,N(HCaptchaGeneralObject.checkConfigNotice),C.attr("disabled",!0))}function J(t){return t=t.replace(/(http\|https):\/\//,""),"https://"+new URL("https://"+t).host}!function(){_=[];var t=console.log,e=console.warn,a=console.info,n=console.error,c=console.clear;console.log=function(e){_.push(["Console log:",arguments]),t.apply(console,arguments)},console.warn=function(t){_.push(["Console warn:",arguments]),e.apply(console,arguments)},console.info=function(t){_.push(["Console info:",arguments]),a.apply(console,arguments)},console.error=function(t){_.push(["Console error:",arguments]),n.apply(console,arguments)},console.clear=function(){_=[],c()}}(),document.addEventListener("hCaptchaLoaded",(function(){N()})),s.on("click",(function(t){t.preventDefault(),""!==a(".hcaptcha-general-sample-hcaptcha iframe").attr("data-hcaptcha-response")?function(){A(),C.attr("disabled",!0);var t={action:HCaptchaGeneralObject.checkConfigAction,nonce:HCaptchaGeneralObject.checkConfigNonce,mode:d.val(),siteKey:r.val(),secretKey:i.val(),"h-captcha-response":a('textarea[name="h-captcha-response"]').val()};a.post({url:HCaptchaGeneralObject.ajaxUrl,data:t,beforeSend:function(){return x(HCaptchaGeneralObject.checkingConfigMsg)}}).done((function(t){t.success?(O=r.val(),H=i.val(),k=w(b),S=!1,x(t.data),C.attr("disabled",!1)):N(t.data)})).fail((function(t){N(t.statusText)})).always((function(){L()}))}():kaggDialog.confirm({title:HCaptchaGeneralObject.completeHCaptchaTitle,content:HCaptchaGeneralObject.completeHCaptchaContent,type:"info",buttons:{ok:{text:HCaptchaGeneralObject.OKBtnText}},onAction:function(){return window.hCaptchaReset(document.querySelector(".hcaptcha-general-sample-hcaptcha"))}})})),r.on("change",(function(t){L({sitekey:a(t.target).val()}),P()})),i.on("change",(function(){P()})),h.on("change",(function(t){L({theme:a(t.target).val()})})),p.on("change",(function(t){var e=a("#hcaptcha-invisible-notice"),n=a(t.target).val();"invisible"===n?e.show():e.hide(),L({size:n})})),u.on("change",(function(t){L({hl:a(t.target).val()})})),d.on("change",(function(t){var e=a(t.target).val();j.hasOwnProperty(e)&&(e===HCaptchaGeneralObject.modeLive?(r.attr("disabled",!1),i.attr("disabled",!1)):(r.attr("disabled",!0),i.attr("disabled",!0)),L({sitekey:j[e]}))})),f.on("change",(function(){B()})),g.on("blur",(function(){B()})),g.on("focus",(function(){g.css("background-color","unset"),C.attr("disabled",!1)})),b.on("change",(function(){!function(){var e={onload:"hCaptchaOnLoad",render:"explicit"};y.prop("checked")&&(e.recaptchacompat="off"),f.prop("checked")&&(e.custom="true");var a={asset_host:"assethost",endpoint:"endpoint",host:"host",image_host:"imghost",report_api:"reportapi",sentry:"sentry"},n=T();for(var c in a){var o=n[c].trim();o&&(e[a[c]]=encodeURIComponent(J(o)))}var r=n.api_host.trim();r=J(r=r\|\|"js.hcaptcha.com")+"/1/api.js";var i=new URL(r);for(var s in e)i.searchParams.append(s,e[s]);document.getElementById("hcaptcha-api").remove(),delete t.g.hcaptcha,document.querySelector("#hcaptcha-options .h-captcha").innerHTML="";var l=document.getElementsByTagName("head")[0],h=document.createElement("script");h.type="text/javascript",h.id="hcaptcha-api",h.src=i.href,l.appendChild(h)}(),JSON.stringify(T())===JSON.stringify(k)?(S=!1,A(),C.attr("disabled",!1)):S\|\|(S=!0,N(HCaptchaGeneralObject.checkConfigNotice),C.attr("disabled",!0))})),a(".hcaptcha-general h3").on("click",(function(t){var e=a(t.currentTarget);e.toggleClass("closed");var n={action:HCaptchaGeneralObject.toggleSectionAction,nonce:HCaptchaGeneralObject.toggleSectionNonce,section:e.attr("class").replaceAll(/(hcaptcha-section-\|closed)/g,"").trim(),status:!e.hasClass("closed")};a.post({url:HCaptchaGeneralObject.ajaxUrl,data:n}).done((function(t){t.success\|\|N(t.data)})).fail((function(t){N(t.statusText)}))})),s.removeAttr("name"),l.removeAttr("name"),v.removeAttr("name"),m.removeAttr("name"),v.find("option").each((function(){var t=a(this);t.val().split("=")[1]\|\|t.attr("disabled",!0)})),m.val(""),v.on("change",(function(){var t=a(this).find("option:selected").val().split("="),e=t[0],n=t[1];"palette--mode"===e?(m.attr("type","text"),m.val(n)):(m.val(n),m.attr("type","color"))})),m.on("change",(function(t){var e=a(t.target).val(),n=v.find("option:selected"),c=n.val().split("="),o=c[0],r=e;n.val(o+"="+e),B(r=(o="theme--"+c[0]).split("--").reverse().reduce((function(t,e){var a={};return a[e]=t,a}),r))}))};window.hCaptchaGeneral=a,jQuery(document).ready(a)})();
	1	(()=>{var e={};function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},t(e)}e.g=function(){if("object"==typeof globalThis)return globalThis;try{return this\|\|new Function("return this")()}catch(e){if("object"==typeof window)return window}}();var a=function(a){var n="#hcaptcha-message",c=a(n),o=a("form.hcaptcha-general"),r=a('[name="hcaptcha_settings[site_key]"]'),i=a('[name="hcaptcha_settings[secret_key]"]'),s=a("#check_config"),l=a("#reset_notifications"),h=a('[name="hcaptcha_settings[theme]"]'),p=a('[name="hcaptcha_settings[size]"]'),u=a('[name="hcaptcha_settings[language]"]'),d=a('[name="hcaptcha_settings[mode]"]'),f=a('[name="hcaptcha_settings[custom_themes][]"]'),v=a(".hcaptcha-general-custom-prop select"),m=a(".hcaptcha-general-custom-value input"),g=a('[name="hcaptcha_settings[config_params]"]'),b=a(".hcaptcha-section-enterprise + table input"),y=a('[name="hcaptcha_settings[recaptcha_compat_off][]"]'),C=o.find("#submit"),j={},O=r.val(),H=i.val(),k=T();j[HCaptchaGeneralObject.modeLive]=HCaptchaGeneralObject.siteKey,j[HCaptchaGeneralObject.modeTestPublisher]=HCaptchaGeneralObject.modeTestPublisherSiteKey,j[HCaptchaGeneralObject.modeTestEnterpriseSafeEndUser]=HCaptchaGeneralObject.modeTestEnterpriseSafeEndUserSiteKey,j[HCaptchaGeneralObject.modeTestEnterpriseBotDetected]=HCaptchaGeneralObject.modeTestEnterpriseBotDetectedSiteKey;var G=!1,S=!1,_=[];function w(e){var t={};return e.each((function(){var e=a(this),n=e.attr("name").replace(/hcaptcha_settings\[(.+)]/,"$1");t[n]=e.val()})),t}function T(){return w(b)}function A(){c.remove(),a('<div id="hcaptcha-message"></div>').insertAfter("#hcaptcha-options h2"),c=a(n)}function E(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"",t=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";if(e=void 0===e?"":String(e),e=(e+="\n"+function(){for(var e=["recaptchacompat disabled","Missing sitekey - https://hcaptcha.com/docs/configuration#jsapi"],t=[],a=0;a<_.length;a++){for(var n=_[a],c=n[0],o=n[1],r=Object.keys(o),i=[],s=0;s<r.length;s++){var l=o[s];"string"==typeof l&&-1===e.indexOf(l)&&i.push([c,l].join(" "))}t.push(i.join("\n"))}return _=[],t.join("\n")}()).trim()){c.removeClass(),c.addClass(t+" notice is-dismissible");var n=e.split("\n").map((function(e){return"<p>".concat(e,"</p>")}));c.html(n.join("")),a(document).trigger("wp-updates-notice-added");var o=a("#wpwrap").position().top;a("html, body").animate({scrollTop:c.offset().top-o-parseInt(c.css("margin-bottom"))},1e3)}}function x(){E(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"","notice-success")}function N(){E(arguments.length>0&&void 0!==arguments[0]?arguments[0]:"","notice-error")}function L(){var e,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},a=Object.assign(hCaptcha.getParams(),t);hCaptcha.setParams(a);var n=document.querySelector("#hcaptcha-options .h-captcha");for(var c in n.innerHTML="",t.theme=null==t\|\|null===(e=t.theme)\|\|void 0===e\|\|null===(e=e.palette)\|\|void 0===e?void 0:e.mode,t.theme\|\|delete t.theme,t)n.setAttribute("data-".concat(c),"".concat(t[c]));hCaptcha.bindEvents()}function K(e,a){var n=function(e){return e&&"object"===t(e)};return n(e)&&n(a)?(Object.keys(a).forEach((function(t){var c=e[t],o=a[t];Array.isArray(c)&&Array.isArray(o)?e[t]=c.concat(o):n(c)&&n(o)?e[t]=K(Object.assign({},c),o):e[t]=o})),e):a}function U(e){var a=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";for(var n in e){var c=a?"".concat(a,"--").concat(n):n;if("object"===t(e[n])&&null!==e[n])U(e[n],c);else{var o=e[n],r=c.replace(/theme--/g,""),i="".concat(r,"=").concat(o),s=v.find('option[value*="'.concat(r,'="]'));1===s.length&&(s.attr("value",i),s.is(":selected")&&m.val(o))}}}function B(){var e,t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},a=g.val().trim();a=a\|\|null;try{e=JSON.parse(a)}catch(e){return g.css("background-color","#ffabaf"),C.attr("disabled",!0),void N("Bad JSON!")}e=K(e,t),g.val(JSON.stringify(e,null,2)),U(e),f.prop("checked")\|\|(e={sitekey:r.val(),theme:h.val(),size:p.val(),hl:u.val()}),L(e)}function P(){r.val()===O&&i.val()===H?(G=!1,A(),C.attr("disabled",!1)):G\|\|(G=!0,N(HCaptchaGeneralObject.checkConfigNotice),C.attr("disabled",!0))}function J(e){return e=e.replace(/(http\|https):\/\//,""),"https://"+new URL("https://"+e).host}!function(){_=[];var e=console.log,t=console.warn,a=console.info,n=console.error,c=console.clear;console.log=function(t){_.push(["Console log:",arguments]),e.apply(console,arguments)},console.warn=function(e){_.push(["Console warn:",arguments]),t.apply(console,arguments)},console.info=function(e){_.push(["Console info:",arguments]),a.apply(console,arguments)},console.error=function(e){_.push(["Console error:",arguments]),n.apply(console,arguments)},console.clear=function(){_=[],c()}}(),document.addEventListener("hCaptchaLoaded",(function(){N()})),s.on("click",(function(e){e.preventDefault(),""!==a(".hcaptcha-general-sample-hcaptcha iframe").attr("data-hcaptcha-response")?function(){A(),C.attr("disabled",!0);var e={action:HCaptchaGeneralObject.checkConfigAction,nonce:HCaptchaGeneralObject.checkConfigNonce,mode:d.val(),siteKey:r.val(),secretKey:i.val(),"h-captcha-response":a('textarea[name="h-captcha-response"]').val()};a.post({url:HCaptchaGeneralObject.ajaxUrl,data:e,beforeSend:function(){return x(HCaptchaGeneralObject.checkingConfigMsg)}}).done((function(e){e.success?(O=r.val(),H=i.val(),k=w(b),S=!1,x(e.data),C.attr("disabled",!1)):N(e.data)})).fail((function(e){N(e.statusText)})).always((function(){L()}))}():kaggDialog.confirm({title:HCaptchaGeneralObject.completeHCaptchaTitle,content:HCaptchaGeneralObject.completeHCaptchaContent,type:"info",buttons:{ok:{text:HCaptchaGeneralObject.OKBtnText}},onAction:function(){return window.hCaptchaReset(document.querySelector(".hcaptcha-general-sample-hcaptcha"))}})})),r.on("change",(function(e){L({sitekey:a(e.target).val()}),P()})),i.on("change",(function(){P()})),h.on("change",(function(e){L({theme:a(e.target).val()})})),p.on("change",(function(e){var t=a("#hcaptcha-invisible-notice"),n=a(e.target).val();"invisible"===n?t.show():t.hide(),L({size:n})})),u.on("change",(function(e){L({hl:a(e.target).val()})})),d.on("change",(function(e){var t=a(e.target).val();j.hasOwnProperty(t)&&(t===HCaptchaGeneralObject.modeLive?(r.attr("disabled",!1),i.attr("disabled",!1)):(r.attr("disabled",!0),i.attr("disabled",!0)),L({sitekey:j[t]}))})),f.on("change",(function(){B()})),g.on("blur",(function(){B()})),g.on("focus",(function(){g.css("background-color","unset"),C.attr("disabled",!1)})),b.on("change",(function(){!function(){var t={onload:"hCaptchaOnLoad",render:"explicit"};y.prop("checked")&&(t.recaptchacompat="off"),f.prop("checked")&&(t.custom="true");var a={asset_host:"assethost",endpoint:"endpoint",host:"host",image_host:"imghost",report_api:"reportapi",sentry:"sentry"},n=T();for(var c in a){var o=n[c].trim();o&&(t[a[c]]=encodeURIComponent(J(o)))}var r=n.api_host.trim();r=J(r=r\|\|"js.hcaptcha.com")+"/1/api.js";var i=new URL(r);for(var s in t)i.searchParams.append(s,t[s]);document.getElementById("hcaptcha-api").remove(),delete e.g.hcaptcha,document.querySelector("#hcaptcha-options .h-captcha").innerHTML="";var l=document.getElementsByTagName("head")[0],h=document.createElement("script");h.type="text/javascript",h.id="hcaptcha-api",h.src=i.href,l.appendChild(h)}(),JSON.stringify(T())===JSON.stringify(k)?(S=!1,A(),C.attr("disabled",!1)):S\|\|(S=!0,N(HCaptchaGeneralObject.checkConfigNotice),C.attr("disabled",!0))})),a(".hcaptcha-general h3").on("click",(function(e){var t=a(e.currentTarget);t.toggleClass("closed");var n={action:HCaptchaGeneralObject.toggleSectionAction,nonce:HCaptchaGeneralObject.toggleSectionNonce,section:t.attr("class").replaceAll(/(hcaptcha-section-\|closed)/g,"").trim(),status:!t.hasClass("closed")};a.post({url:HCaptchaGeneralObject.ajaxUrl,data:n}).done((function(e){e.success\|\|N(e.data)})).fail((function(e){N(e.statusText)}))})),s.removeAttr("name"),l.removeAttr("name"),v.removeAttr("name"),m.removeAttr("name"),v.find("option").each((function(){var e=a(this);e.val().split("=")[1]\|\|e.attr("disabled",!0)})),m.val(""),v.on("change",(function(){var e=a(this).find("option:selected").val().split("="),t=e[0],n=e[1];"palette--mode"===t?(m.attr("type","text"),m.val(n)):(m.val(n),m.attr("type","color"))})),m.on("change",(function(e){var t=a(e.target).val(),n=v.find("option:selected"),c=n.val().split("="),o=c[0],r=t;n.val(o+"="+t),B(r=(o="theme--"+c[0]).split("--").reverse().reduce((function(e,t){var a={};return a[t]=e,a}),r))}))};window.hCaptchaGeneral=a,jQuery(document).ready(a)})();

hcaptcha-for-forms-and-more/trunk/assets/js/integrations.js

-                      r3064004
+                      r3095958
+        }
+        function updateActivationStati( stati ) {
+            const $tables = $( '.form-table' );
+            for ( const [ key, status ] of Object.entries( stati ) ) {
+                const statusClass = 'hcaptcha-integrations-' + key.replace( /_/g, '-' );
+                const $tr = $( `tr.${ statusClass }` );
+                const currStatus = isActiveTable( $tr.closest( '.form-table' ) );
+                if ( currStatus !== status ) {
+                    const $toTable = $tables.eq( status ? 0 : 1 );
+                    const alt = $tr.find( '.hcaptcha-integrations-logo img' ).attr( 'alt' );
+                    insertIntoTable( $toTable, alt, $tr );
+                }
+            }
+        }
         function toggleActivation() {
             const activateClass = activate ? 'on' : 'off';
 …
                 data,
             } )
+                /**
+                 * @param {Object} response.data
+                 * @param {Object} response.data.defaultTheme
+                 * @param {Object} response.data.message
+                 * @param {Object} response.data.stati
+                 * @param {Object} response.data.themes
+                 * @param {Object} response.success
+                 */
                 .done( function( response ) {
                     if ( response.success === undefined ) {
 …
                     insertIntoTable( $table, alt, $tr );
                     showSuccessMessage( response.data.message );
+                    updateActivationStati( response.data.stati );
                     $( 'html, body' ).animate(
 …
             const search = $search.val().trim().toLowerCase();
             const $logo = $( '.hcaptcha-integrations-logo img' );
+            let $trFirst = null;
             $logo.each( function( i, el ) {
 …
                 if ( $el.data( 'label' ).toLowerCase().includes( search ) ) {
                     $tr.show();
+                    $trFirst = $trFirst ?? $tr;
                 } else {
                     $tr.hide();
+                }
             } );
+            if ( ! $trFirst ) {
+                return;
+            }
+            const scrollTop = $trFirst.offset().top + $trFirst.outerHeight() - $( window ).height() + 5;
+            $( 'html' ).stop().animate(
+                { scrollTop },
+            );
         },

hcaptcha-for-forms-and-more/trunk/assets/js/integrations.min.js

r3064004	r3095958
1		(()=>{var t=function(t){var e="#hcaptcha-message",a=t(e),n=t("#wpwrap"),i=t("#adminmenuwrap"),o=t("#hcaptcha-integrations-search");function c(e,o){a.removeClass(),a.addClass(o+" notice settings-error is-dismissible"),a.html("<p>".concat(e,"</p>")),t(document).trigger("wp-updates-notice-added");var c=a.clone();a.css("visibility","hidden"),c.css("margin","0px"),c.css("top",n.position().top),c.css("z-index","999999");var s="block"===i.css("display")?i.width():0;c.css("left",s),c.width(t(window).width()-s),c.css("position","fixed"),t("body").append(c),setTimeout((function(){a.css("visibility","unset"),c.remove()}),3e3)}function s(t){c(t,"notice-error")}function r(e,a,n){var i=!1,o=a.toLowerCase(),c=!function(t){return t.is(jQuery(".form-table").eq(0))}(e),s=n.find("fieldset");s.attr("disabled",c),s.find("input").attr("disabled",c),e.find("tbody").children().each((function(e,a){var c=t(a).find(".hcaptcha-integrations-logo img").attr("alt");if((c=(c=c\|\|"").replace(" Logo","")).toLowerCase()>o)return n.insertBefore(t(a)),i=!0,!1})),i\|\|e.find("tbody").append(n)}t(".form-table img").on("click",(function(i){function o(){var e,i,o=u?"on":"off",l=(i=document.querySelector(".kagg-dialog select"))&&null!==(e=i.value)&&void 0!==e?e:"",f={action:HCaptchaIntegrationsObject.action,nonce:HCaptchaIntegrationsObject.nonce,activate:u,entity:d,status:g,newTheme:l};p.addClass(o),t.post({url:HCaptchaIntegrationsObject.ajaxUrl,data:f}).done((function(e){if(void 0!==e.success)if(void 0!==e.data.themes&&(window.HCaptchaIntegrationsObject.themes=e.data.themes,window.HCaptchaIntegrationsObject.defaultTheme=e.data.defaultTheme),e.success){var i=t(".form-table").eq(u?0:1),o=n.position().top;!function(e,a,n){if("theme"===a){var i=t(".form-table"),o=e?"":'[data-label="'+n+'"]',c=i.eq(e?0:1).find('.hcaptcha-integrations-logo img[data-entity="theme"]'+o);if(c.length){var s=i.eq(e?1:0),l=c.closest("tr");r(s,c.attr("data-label"),l)}}}(u,d,l),r(i,h,p),function(t){c(t,"notice-success")}(e.data.message),t("html, body").animate({scrollTop:p.offset().top-o-a.outerHeight()},1e3)}else{var g,f;s(null!==(g=null===(f=e.data)\|\|void 0===f?void 0:f.message)&&void 0!==g?g:e.data)}else c(HCaptchaIntegrationsObject.unexpectedErrorMsg,"notice-error")})).fail((function(t){s(t.statusText)})).always((function(){p.removeClass("on off")}))}i.preventDefault(),a.remove(),t('<div id="hcaptcha-message"></div>').insertAfter("#hcaptcha-options h2"),a=t(e);var l=t(i.target),d=l.data("entity");if(d=d\|\|"",-1!==t.inArray(d,["core","theme","plugin"])&&-1===t.inArray(d,["core"])){var h=l.attr("alt");h=(h=h\|\|"").replace(" Logo","");var p=l.closest("tr"),g=p.attr("class");g=g.replace("hcaptcha-integrations-","");var f,u,m="";if(p.find("fieldset").attr("disabled"))f="plugin"===d?HCaptchaIntegrationsObject.activateMsg:HCaptchaIntegrationsObject.activateThemeMsg,u=!0;else{if("plugin"===d)f=HCaptchaIntegrationsObject.deactivateMsg;else{for(var v in f=HCaptchaIntegrationsObject.deactivateThemeMsg,m="<p>"+HCaptchaIntegrationsObject.selectThemeMsg+"</p>",m+="<select>",HCaptchaIntegrationsObject.themes){var b=v===HCaptchaIntegrationsObject.defaultTheme?' selected="selected"':"";m+='<option value="'.concat(v,'"').concat(b,">").concat(HCaptchaIntegrationsObject.themes[v],"</option>")}m+="</select>"}u=!1}-1===t.inArray(d,["theme"])\|\|u\|\|0!==Object.keys(HCaptchaIntegrationsObject.themes).length?(f=f.replace("%s",h),i.ctrlKey?o():kaggDialog.confirm({title:f,content:m,type:u?"activate":"deactivate",buttons:{ok:{text:HCaptchaIntegrationsObject.OKBtnText},cancel:{text:HCaptchaIntegrationsObject.CancelBtnText}},onAction:function(t){t&&o()}})):kaggDialog.confirm({title:HCaptchaIntegrationsObject.onlyOneThemeMsg,content:"",type:"info",buttons:{ok:{text:HCaptchaIntegrationsObject.OKBtnText}}})}}));var l,d,h;o.on("input",(l=function(){var e=o.val().trim().toLowerCase();t(".hcaptcha-integrations-logo img").each((function(a,n){var i=t(n);if("core"!==i.data("entity")){var o=i.closest("tr");i.data("label").toLowerCase().includes(e)?o.show():o.hide()}}))},d=100,function(){var t=this,e=arguments;clearTimeout(h),h=setTimeout((function(){return l.apply(t,e)}),d)})),t("#hcaptcha-options").keydown((function(e){t(e.target).is(o)&&13===e.which&&e.preventDefault()}))};window.hCaptchaIntegrations=t,jQuery(document).ready(t)})();
	1	(()=>{function t(t,a){return function(t){if(Array.isArray(t))return t}(t)\|\|function(t,e){var a=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]\|\|t["@@iterator"];if(null!=a){var n,i,o,r,c=[],s=!0,l=!1;try{if(o=(a=a.call(t)).next,0===e){if(Object(a)!==a)return;s=!1}else for(;!(s=(n=o.call(a)).done)&&(c.push(n.value),c.length!==e);s=!0);}catch(t){l=!0,i=t}finally{try{if(!s&&null!=a.return&&(r=a.return(),Object(r)!==r))return}finally{if(l)throw i}}return c}}(t,a)\|\|function(t,a){if(!t)return;if("string"==typeof t)return e(t,a);var n=Object.prototype.toString.call(t).slice(8,-1);"Object"===n&&t.constructor&&(n=t.constructor.name);if("Map"===n\|\|"Set"===n)return Array.from(t);if("Arguments"===n\|\|/^(?:Ui\|I)nt(?:8\|16\|32)(?:Clamped)?Array$/.test(n))return e(t,a)}(t,a)\|\|function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function e(t,e){(null==e\|\|e>t.length)&&(e=t.length);for(var a=0,n=new Array(e);a<e;a++)n[a]=t[a];return n}var a=function(e){var a="#hcaptcha-message",n=e(a),i=e("#wpwrap"),o=e("#adminmenuwrap"),r=e("#hcaptcha-integrations-search");function c(t,a){n.removeClass(),n.addClass(a+" notice settings-error is-dismissible"),n.html("<p>".concat(t,"</p>")),e(document).trigger("wp-updates-notice-added");var r=n.clone();n.css("visibility","hidden"),r.css("margin","0px"),r.css("top",i.position().top),r.css("z-index","999999");var c="block"===o.css("display")?o.width():0;r.css("left",c),r.width(e(window).width()-c),r.css("position","fixed"),e("body").append(r),setTimeout((function(){n.css("visibility","unset"),r.remove()}),3e3)}function s(t){c(t,"notice-error")}function l(t){return t.is(jQuery(".form-table").eq(0))}function u(t,a,n){var i=!1,o=a.toLowerCase(),r=!l(t),c=n.find("fieldset");c.attr("disabled",r),c.find("input").attr("disabled",r),t.find("tbody").children().each((function(t,a){var r=e(a).find(".hcaptcha-integrations-logo img").attr("alt");if((r=(r=r\|\|"").replace(" Logo","")).toLowerCase()>o)return n.insertBefore(e(a)),i=!0,!1})),i\|\|t.find("tbody").append(n)}e(".form-table img").on("click",(function(o){function r(){var a,o,r=v?"on":"off",d=(o=document.querySelector(".kagg-dialog select"))&&null!==(a=o.value)&&void 0!==a?a:"",m={action:HCaptchaIntegrationsObject.action,nonce:HCaptchaIntegrationsObject.nonce,activate:v,entity:f,status:g,newTheme:d};p.addClass(r),e.post({url:HCaptchaIntegrationsObject.ajaxUrl,data:m}).done((function(a){if(void 0!==a.success)if(void 0!==a.data.themes&&(window.HCaptchaIntegrationsObject.themes=a.data.themes,window.HCaptchaIntegrationsObject.defaultTheme=a.data.defaultTheme),a.success){var o=e(".form-table").eq(v?0:1),r=i.position().top;!function(t,a,n){if("theme"===a){var i=e(".form-table"),o=t?"":'[data-label="'+n+'"]',r=i.eq(t?0:1).find('.hcaptcha-integrations-logo img[data-entity="theme"]'+o);if(r.length){var c=i.eq(t?1:0),s=r.closest("tr");u(c,r.attr("data-label"),s)}}}(v,f,d),u(o,h,p),function(t){c(t,"notice-success")}(a.data.message),function(a){for(var n=e(".form-table"),i=0,o=Object.entries(a);i<o.length;i++){var r=t(o[i],2),c=r[0],s=r[1],d="hcaptcha-integrations-"+c.replace(/_/g,"-"),f=e("tr.".concat(d));l(f.closest(".form-table"))!==s&&u(n.eq(s?0:1),f.find(".hcaptcha-integrations-logo img").attr("alt"),f)}}(a.data.stati),e("html, body").animate({scrollTop:p.offset().top-r-n.outerHeight()},1e3)}else{var g,m;s(null!==(g=null===(m=a.data)\|\|void 0===m?void 0:m.message)&&void 0!==g?g:a.data)}else c(HCaptchaIntegrationsObject.unexpectedErrorMsg,"notice-error")})).fail((function(t){s(t.statusText)})).always((function(){p.removeClass("on off")}))}o.preventDefault(),n.remove(),e('<div id="hcaptcha-message"></div>').insertAfter("#hcaptcha-options h2"),n=e(a);var d=e(o.target),f=d.data("entity");if(f=f\|\|"",-1!==e.inArray(f,["core","theme","plugin"])&&-1===e.inArray(f,["core"])){var h=d.attr("alt");h=(h=h\|\|"").replace(" Logo","");var p=d.closest("tr"),g=p.attr("class");g=g.replace("hcaptcha-integrations-","");var m,v,b="";if(p.find("fieldset").attr("disabled"))m="plugin"===f?HCaptchaIntegrationsObject.activateMsg:HCaptchaIntegrationsObject.activateThemeMsg,v=!0;else{if("plugin"===f)m=HCaptchaIntegrationsObject.deactivateMsg;else{for(var y in m=HCaptchaIntegrationsObject.deactivateThemeMsg,b="<p>"+HCaptchaIntegrationsObject.selectThemeMsg+"</p>",b+="<select>",HCaptchaIntegrationsObject.themes){var w=y===HCaptchaIntegrationsObject.defaultTheme?' selected="selected"':"";b+='<option value="'.concat(y,'"').concat(w,">").concat(HCaptchaIntegrationsObject.themes[y],"</option>")}b+="</select>"}v=!1}-1===e.inArray(f,["theme"])\|\|v\|\|0!==Object.keys(HCaptchaIntegrationsObject.themes).length?(m=m.replace("%s",h),o.ctrlKey?r():kaggDialog.confirm({title:m,content:b,type:v?"activate":"deactivate",buttons:{ok:{text:HCaptchaIntegrationsObject.OKBtnText},cancel:{text:HCaptchaIntegrationsObject.CancelBtnText}},onAction:function(t){t&&r()}})):kaggDialog.confirm({title:HCaptchaIntegrationsObject.onlyOneThemeMsg,content:"",type:"info",buttons:{ok:{text:HCaptchaIntegrationsObject.OKBtnText}}})}}));var d,f,h;r.on("input",(d=function(){var t=r.val().trim().toLowerCase(),a=e(".hcaptcha-integrations-logo img"),n=null;if(a.each((function(a,i){var o=e(i);if("core"!==o.data("entity")){var r,c=o.closest("tr");o.data("label").toLowerCase().includes(t)?(c.show(),n=null!==(r=n)&&void 0!==r?r:c):c.hide()}})),n){var i=n.offset().top+n.outerHeight()-e(window).height()+5;e("html").stop().animate({scrollTop:i},1e3)}},f=100,function(){var t=this,e=arguments;clearTimeout(h),h=setTimeout((function(){return d.apply(t,e)}),f)})),e("#hcaptcha-options").keydown((function(t){e(t.target).is(r)&&13===t.which&&t.preventDefault()}))};window.hCaptchaIntegrations=a,jQuery(document).ready(a)})();

hcaptcha-for-forms-and-more/trunk/changelog.txt

-                      r3086102
+                      r3095958
+= 4.2.0 =
+* The minimum required WordPress version is now 5.3.
+* Added support for Multisite Network Admin synced with network-wide plugin options.
+* Added selection by date range on Forms and Events pages.
+* Added automatic activation of dependent plugins on the Integrations page.
+* Added scrolling on the Integrations page during the search.
+* Fixed color flickering of hCaptcha placeholder with custom themes.
+* Fixed JS error on the Lost Password page.
+* Fixed missing site key notification on the General page.
+* Fixed fatal error on some sites during migration to 4.0.0.
 = 4.1.2 =
 * Added option to have the hCaptcha admin menu under Settings.

hcaptcha-for-forms-and-more/trunk/hcaptcha.php

-                      r3086102
+                      r3095958
  * Plugin URI:           https://www.hcaptcha.com/
  * Description:          hCaptcha keeps out bots and spam while putting privacy first. It is a drop-in replacement for reCAPTCHA.
  * Version:              4.1.2
+ * Version:              4.2.0
  * Requires at least:    5.1
  * Requires PHP:         7.0
 …
+ *
  * WC requires at least: 3.0
  * WC tested up to:      8.8
+ * WC tested up to:      8.9
  */
 …
  * Plugin version.
  */
 const HCAPTCHA_VERSION = '4.1.2';
+const HCAPTCHA_VERSION = '4.2.0';
 /**

hcaptcha-for-forms-and-more/trunk/readme.txt

-                      r3086102
+                      r3095958
 Contributors: hcaptcha, kaggdesign
 Tags: captcha, hcaptcha, antispam, abuse, protect form
 Requires at least: 5.1
+Requires at least: 5.3
 Tested up to: 6.5
 Requires PHP: 7.0.0
 Stable tag: 4.1.2
+Stable tag: 4.2.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 …
 * Filters delay time for hCaptcha API script.
+*
 * Any negative value will prevent API script from loading at all,
+* Any negative value will prevent the API script from loading at all,
 * until user interaction: mouseenter, click, scroll or touch.
 * This significantly improves Google Pagespeed Insights score.
 …
 `parent`: a string — the parent menu item. Default '' for 'pages' mode and 'options-general.php' for 'tabs' mode;
 `position`: a number — the position of the menu item. Default 58.990225 for 'pages' mode. It Has no effect on 'tabs' mode;
-= Why isn't my WPForms Lite installation working? =
-Please make sure you have removed the reCAPTCHA keys under WPForms > Settings > reCAPTCHA to avoid a conflict.
 = Where can I get more information about hCaptcha? =
 …
 We also suggest emailing the authors of plugins you'd like to support hCaptcha: it will usually take them only an hour or two to add native support. This will simplify your use of hCaptcha, and is the best solution in the long run.
+Some plugins listed have been superseded by native support, and are included only for legacy purposes.
+You should always use native hCaptcha support if available for your plugin.
+Please check with your plugin author if native support is not yet available.
+You may use native hCaptcha support if available for your plugin. Please check with your plugin author if native support is not yet available.
+However, the hCaptcha plugin provides a broader set of options and features so that you can use it with any form on your site.
 Instructions for popular native integrations are below:
 …
 == Changelog ==
+= 4.2.0 =
+* The minimum required WordPress version is now 5.3.
+* Added support for Multisite Network Admin synced with network-wide plugin options.
+* Added selection by date range on Forms and Events pages.
+* Added automatic activation of dependent plugins on the Integrations page.
+* Added scrolling on the Integrations page during the search.
+* Fixed color flickering of hCaptcha placeholder with custom themes.
+* Fixed JS error on the Lost Password page.
+* Fixed missing site key notification on the General page.
+* Fixed fatal error on some sites during migration to 4.0.0.
 = 4.1.2 =

hcaptcha-for-forms-and-more/trunk/src/php/Admin/Events/Events.php

-                      r3072795
+                      r3095958
+        }
         add_action( 'hcap_verify_request', [ $this, 'save_event' ], - PHP_INT_MAX, 2 );
+        add_action( 'hcap_verify_request', [ $this, 'save_event' ], -PHP_INT_MAX, 2 );
+    }
 …
      * @param array             $error_codes Error codes.
+     *
      * @return string|null|mixed
+     * @return void
      */
     public function save_event( $result, array $error_codes ) {
 …
         if ( ! ( is_string( $result ) || is_null( $result ) ) ) {
             return $result;
+            return;
+        }
 …
+            ]
         );
-        return $result;
+    }
 …
         global $wpdb;
         $args    = wp_parse_args(
+        $args          = wp_parse_args(
             $args,
+            [
 …
                 'order'   => 'ASC',
                 'orderby' => '',
+                'dates'   => [],
+            ]
         );
+        $columns = implode( ',', $args['columns'] );
+        $columns = $columns ?: '*';
+        $order   = strtoupper( $args['order'] );
+        $order   = 'ASC' === $order ? '' : $order;
+        $orderby = $args['orderby'] ? 'ORDER BY ' . $args['orderby'] . ' ' . $order : '';
+        $offset  = absint( $args['offset'] );
+        $limit   = absint( $args['limit'] );
+        $args['dates'] = $args['dates'] ?: self::get_default_dates();
+        $columns    = implode( ',', $args['columns'] );
+        $columns    = $columns ?: '*';
         $table_name = $wpdb->prefix . self::TABLE_NAME;
+        $where_date = self::get_where_date_gmt( $args );
+        $orderby    = self::get_order_by( $args );
+        $offset     = absint( $args['offset'] );
+        $limit      = absint( $args['limit'] );
         // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
         $results = (array) $wpdb->get_results(
             $wpdb->prepare(
+            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+                "SELECT SQL_CALC_FOUND_ROWS $columns FROM $table_name $orderby LIMIT %d, %d",
+            // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+                "SELECT
+                        SQL_CALC_FOUND_ROWS
+                        $columns
+                        FROM $table_name
+                        WHERE $where_date
+                        $orderby
+                        LIMIT %d, %d",
                 $offset,
                 $limit
+            // phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            )
         );
         $total = (int) $wpdb->get_var( 'SELECT FOUND_ROWS()' );
         // phpcs:enable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
 …
         global $wpdb;
         $args    = wp_parse_args(
+        $args          = wp_parse_args(
             $args,
+            [
 …
                 'order'   => 'ASC',
                 'orderby' => '',
+                'dates'   => [],
+            ]
         );
+        $order   = strtoupper( $args['order'] );
+        $order   = 'ASC' === $order ? '' : $order;
+        $orderby = $args['orderby'] ? 'ORDER BY ' . $args['orderby'] . ' ' . $order : '';
+        $offset  = absint( $args['offset'] );
+        $limit   = absint( $args['limit'] );
+        $args['dates'] = $args['dates'] ?: self::get_default_dates();
         $table_name = $wpdb->prefix . self::TABLE_NAME;
+        $where_date = self::get_where_date_gmt( $args );
+        $orderby    = self::get_order_by( $args );
+        $offset     = absint( $args['offset'] );
+        $limit      = absint( $args['limit'] );
         // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
         $results = (array) $wpdb->get_results(
             $wpdb->prepare(
+            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+                "SELECT SQL_CALC_FOUND_ROWS id, source, form_id, COUNT(*) as served FROM $table_name GROUP BY source, form_id $orderby LIMIT %d, %d",
+            // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+                "SELECT
+                        SQL_CALC_FOUND_ROWS
+                        source, form_id, COUNT(*) as served
+                        FROM $table_name
+                        WHERE $where_date
+                        GROUP BY source, form_id
+                        $orderby
+                        LIMIT %d, %d",
                 $offset,
                 $limit
+            // phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            )
         );
 …
         // phpcs:enable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
         $where = 'WHERE 1=0';
+        $where = '1=0';
         foreach ( $results as $result ) {
 …
+        }
+        $where = "($where) AND " . $where_date;
         // phpcs:disable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
         $served = (array) $wpdb->get_results(
+            // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            "SELECT date_gmt FROM $table_name $where"
+        );
+        // phpcs:disable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+            "SELECT date_gmt FROM $table_name WHERE $where"
+        // phpcs:enable WordPress.DB.PreparedSQL.InterpolatedNotPrepared
+        );
+        // phpcs:enable WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
         return [
 …
         global $wpdb;
+        $table_name = self::TABLE_NAME;
+        if ( self::table_exists( $wpdb->prefix . $table_name ) ) {
+            // @codeCoverageIgnoreStart
+            return;
+            // @codeCoverageIgnoreEnd
+        }
         require_once ABSPATH . 'wp-admin/includes/upgrade.php';
         $charset_collate = $wpdb->get_charset_collate();
+        $table_name      = self::TABLE_NAME;
+        $sql = "CREATE TABLE IF NOT EXISTS $wpdb->prefix$table_name (
+        $sql = "CREATE TABLE $wpdb->prefix$table_name (
             id          BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
             source      VARCHAR(256)    NOT NULL,
 …
             KEY uuid (uuid),
             KEY date_gmt (date_gmt)
         ) $charset_collate;";
+        ) $charset_collate";
         dbDelta( $sql );
+    }
+    /**
+     * Get where date GMT.
+     *
+     * @param array $args Arguments.
+     *
+     * @return string
+     */
+    public static function get_where_date_gmt( array $args ): string {
+        $dates = $args['dates'];
+        if ( $dates ) {
+            $dates[1] = $dates[1] ?? $dates[0];
+            $dates[0] .= ' 00:00:00';
+            $dates[1] .= ' 23:59:59';
+            foreach ( $dates as &$date ) {
+                $date = wp_date( 'Y-m-d H:i:s', strtotime( $date ) );
+            }
+            unset( $date );
+            $where_date = sprintf(
+                "date_gmt BETWEEN '%s' AND '%s'",
+                esc_sql( $dates[0] ),
+                esc_sql( $dates[1] )
+            );
+        } else {
+            $where_date = '1=1';
+        }
+        return $where_date;
+    }
+    /**
+     * Get ODER BY / ORDER clause
+     *
+     * @param array $args Arguments.
+     *
+     * @return string
+     */
+    private static function get_order_by( array $args ): string {
+        $order = strtoupper( $args['order'] );
+        $order = 'ASC' === $order ? '' : $order;
+        return $args['orderby'] ? 'ORDER BY ' . $args['orderby'] . ' ' . $order : '';
+    }
+    /**
+     * Get default dates.
+     *
+     * @return array
+     */
+    private static function get_default_dates(): array {
+        $end_date   = date_create_immutable( 'now', wp_timezone() );
+        $start_date = $end_date;
+        $start_date = $start_date->modify( '-30 day' );
+        $start_date = $start_date->setTime( 0, 0 );
+        $end_date   = $end_date->setTime( 23, 59, 59 );
+        $format     = 'Y-m-d';
+        return [ $start_date->format( $format ), $end_date->format( $format ) ];
+    }
+    /**
+     * Check if the database table exists and cache the result.
+     *
+     * @param string $table_name Table name. Can have SQL wildcard.
+     *
+     * @return bool
+     */
+    private static function table_exists( string $table_name ): bool {
+        foreach ( self::get_existing_tables( $table_name ) as $existing_table ) {
+            if ( self::wildcard_match( $table_name, $existing_table ) ) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /**
+     * Get the list of existing tables and cache the result.
+     *
+     * @param string $table_name Table name. Can have SQL wildcard.
+     *
+     * @return array List of table names.
+     */
+    private static function get_existing_tables( string $table_name ): array {
+        global $wpdb;
+        // phpcs:disable WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.DirectDatabaseQuery.DirectQuery
+        $tables = $wpdb->get_results(
+            $wpdb->prepare( 'SHOW TABLES LIKE %s', $table_name ),
+            'ARRAY_N'
+        );
+        // phpcs:enable WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.DirectDatabaseQuery.DirectQuery
+        return ! empty( $tables ) ? wp_list_pluck( $tables, 0 ) : [];
+    }
+    /**
+     * Wildcard match.
+     * Works as MySQL LIKE match.
+     *
+     * @param string $pattern Pattern.
+     * @param string $subject String to search into.
+     *
+     * @return false|int
+     */
+    private static function wildcard_match( string $pattern, string $subject ) {
+        $regex = str_replace(
+            [ '%', '_' ], // MySQL wildcard chars.
+            [ '.*', '.' ],  // Regexp chars.
+            preg_quote( $pattern, '/' )
+        );
+        return preg_match( '/^' . $regex . '$/is', $subject );
+    }
+}

hcaptcha-for-forms-and-more/trunk/src/php/Admin/Events/EventsTable.php

-                      r3080217
+                      r3095958
 namespace HCaptcha\Admin\Events;
+use HCaptcha\Settings\ListPageBase;
 use WP_List_Table;
 …
         $order   = isset( $_GET['order'] ) ? sanitize_key( $_GET['order'] ) : 'DESC';
         $orderby = isset( $_GET['orderby'] ) ? sanitize_key( $_GET['orderby'] ) : 'date_gmt';
+        $date    = isset( $_GET['date'] )
+            ? filter_input( INPUT_GET, 'date', FILTER_SANITIZE_FULL_SPECIAL_CHARS )
+            : ''; // We need filter_input here to keep delimiter intact.
         // phpcs:enable WordPress.Security.NonceVerification.Recommended
+        $dates        = explode( ListPageBase::TIMESPAN_DELIMITER, $date );
+        $dates        = array_filter( array_map( 'trim', $dates ) );
         $column_slugs = str_replace( 'name', 'source', array_keys( $this->columns ) );
         $per_page     = $this->get_items_per_page( self::EVENTS_PER_PAGE, $this->per_page_default );
 …
             'order'   => $order,
             'orderby' => $orderby,
+            'dates'   => $dates,
         ];

hcaptcha-for-forms-and-more/trunk/src/php/Admin/Events/FormsTable.php

-                      r3080217
+                      r3095958
 namespace HCaptcha\Admin\Events;
+use HCaptcha\Settings\ListPageBase;
 use WP_List_Table;
 …
     public function get_sortable_columns(): array {
         return [
+            'name'    => [ 'name', false, __( 'Source', 'hcaptcha-for-forms-and-more' ), __( 'Table ordered by Source.' ) ],
+            'form_id' => [ 'form_id', false, __( 'Form Id', 'hcaptcha-for-forms-and-more' ), __( 'Table ordered by Form Id.' ) ],
+            'served'  => [ 'served', false, __( 'Served', 'hcaptcha-for-forms-and-more' ), __( 'Table ordered by Served Count.' ) ],
+            'name'    => [
+                'name',
+                false,
+                __( 'Source', 'hcaptcha-for-forms-and-more' ),
+                __( 'Table ordered by Source.' ),
+            ],
+            'form_id' => [
+                'form_id',
+                false,
+                __( 'Form Id', 'hcaptcha-for-forms-and-more' ),
+                __( 'Table ordered by Form Id.' ),
+            ],
+            'served'  => [
+                'served',
+                false,
+                __( 'Served', 'hcaptcha-for-forms-and-more' ),
+                __( 'Table ordered by Served Count.' ),
+            ],
         ];
+    }
 …
         $order   = isset( $_GET['order'] ) ? sanitize_key( $_GET['order'] ) : 'ASC';
         $orderby = isset( $_GET['orderby'] ) ? sanitize_key( $_GET['orderby'] ) : 'source';
+        $date    = isset( $_GET['date'] )
+            ? filter_input( INPUT_GET, 'date', FILTER_SANITIZE_FULL_SPECIAL_CHARS )
+            : ''; // We need filter_input here to keep delimiter intact.
         // phpcs:enable WordPress.Security.NonceVerification.Recommended
+        $dates    = explode( ListPageBase::TIMESPAN_DELIMITER, $date );
+        $dates    = array_filter( array_map( 'trim', $dates ) );
         $per_page = $this->get_items_per_page( self::FORMS_PER_PAGE, $this->per_page_default );
         $offset   = ( $paged - 1 ) * $per_page;
 …
             'order'   => $order,
             'orderby' => $orderby,
+            'dates'   => $dates,
         ];

hcaptcha-for-forms-and-more/trunk/src/php/Admin/Notifications.php

-                      r3081325
+                      r3095958
+        }
         if ( hcaptcha()->is_pro() ) {
+        if ( $settings->is_pro() ) {
             unset( $this->notifications['pro-free-trial'] );
+        }
 …
             if ( $this->shuffle ) {
                 $notifications = $this->shuffle_assoc( $notifications );
+                $notifications = $this->make_key_first( $notifications, 'register' );
+            }
 …
         return $new_arr;
+    }
+    /**
+     * Make a key the first element in an associative array.
+     *
+     * @param array  $arr An array.
+     * @param string $key Key.
+     *
+     * @return array
+     */
+    protected function make_key_first( array $arr, string $key ): array {
+        if ( ! array_key_exists( $key, $arr ) ) {
+            return $arr;
+        }
+        // Remove the key-value pair from the original array.
+        $value = $arr[ $key ];
+        unset( $arr[ $key ] );
+        // Merge the key-value pair back into the array at the beginning.
+        return array_merge( [ $key => $value ], $arr );
+    }
+}

hcaptcha-for-forms-and-more/trunk/src/php/Admin/PluginStats.php

r3080217	r3095958
145	145
146	146	$settings = hcaptcha()->settings();
147		$license = (int) ~~hcaptcha()~~->is_pro() ? 'Pro' : 'Publisher';
	147	$license = (int) $settings->is_pro() ? 'Pro' : 'Publisher';
148	148	$api_host = $settings->get( 'api_host' );
149	149	$backend = $settings->get( 'backend' );

hcaptcha-for-forms-and-more/trunk/src/php/BeaverBuilder/Base.php

r3064004	r3095958
80	80	self::HANDLE,
81	81	HCAPTCHA_URL . "/assets/js/hcaptcha-beaver-builder$min.js",
82		[ 'jquery'~~, 'wp-hooks'~~ ],
	82	[ 'jquery' ],
83	83	HCAPTCHA_VERSION,
84	84	true

hcaptcha-for-forms-and-more/trunk/src/php/Main.php

-                      r3086102
+                      r3095958
 use HCaptcha\Settings\General;
 use HCaptcha\Settings\Integrations;
+use HCaptcha\Settings\PluginSettingsBase;
 use HCaptcha\Settings\Settings;
 use HCaptcha\Settings\SystemInfo;
 …
     /**
+     * WP hooks handle.
+     */
+    const WP_HOOKS_HANDLE = 'wp-hooks';
+    /**
      * Main script localization object.
      */
 …
     public function init_hooks() {
         $this->load_textdomain();
-        $settings      = get_option( 'hcaptcha_settings', [] );
-        $menu_position = $settings['menu_position'] ?? [];
-        $args          = [
-            'mode' => [ 'on' ] === $menu_position ? SettingsBase::MODE_TABS : SettingsBase::MODE_PAGES,
-        ];
         /**
 …
          * @param array $args Settings system initialization arguments.
          */
         $args = (array) apply_filters( 'hcap_settings_init_args', $args );
+        $args = (array) apply_filters( 'hcap_settings_init_args', [] );
         $this->settings = new Settings(
 …
     /**
-     * Check if it is a Pro account.
+     *
-     * @return false
-     */
-    public function is_pro(): bool {
-        return 'pro' === $this->settings->get_license();
+    }
-    /**
      * Whether we are on the Elementor Pro edit post/page and hCaptcha for Elementor Pro is active.
+     *
 …
 CSS;
+        $settings = $this->settings();
+        if ( $settings->is_on( 'custom_themes' ) && $settings->is_pro_or_general() ) {
+            $bg = $settings->get_config_params()['theme']['component']['checkbox']['main']['fill'] ?? '';
+            if ( $bg ) {
+                $css .= <<<CSS
+    .h-captcha::before {
+        background-color: $bg !important;
+    }
+CSS;
+            }
+        }
         HCaptcha::css_display( $css );
+    }
 …
+        }
         if ( $settings->is_on( 'custom_themes' ) && $this->is_pro_or_general() ) {
+        if ( $settings->is_on( 'custom_themes' ) && $settings->is_pro_or_general() ) {
             $params['custom'] = 'true';
+        }
 …
         DelayedScript::launch( [ 'src' => $this->get_api_src() ], $delay );
+        wp_enqueue_script( self::WP_HOOKS_HANDLE );
         wp_enqueue_script(
             self::HANDLE,
             HCAPTCHA_URL . '/assets/js/apps/hcaptcha.js',
             [ 'wp-hooks' ],
+            [ self::WP_HOOKS_HANDLE ],
             HCAPTCHA_VERSION,
             true
 …
+        }
+        $config_params = [];
+        if ( $settings->is_on( 'custom_themes' ) && $this->is_pro_or_general() ) {
+            $config_params = $settings->get_config_params();
+        }
+        $config_params = $settings->is_on( 'custom_themes' ) && $settings->is_pro_or_general()
+            ? $settings->get_config_params()
+            : [];
         $params = array_merge( $params, $config_params );
 …
             'Affiliates Login'                     => [
                 [ 'affiliates_status', 'login' ],
                 [ 'affiliates/affiliates.php' ],
+                'affiliates/affiliates.php',
                 Affiliates\Login::class,
             ],
             'Affiliates Register'                  => [
                 [ 'affiliates_status', 'register' ],
                 [ 'affiliates/affiliates.php' ],
+                'affiliates/affiliates.php',
                 Affiliates\Register::class,
             ],
 …
      * @return bool
      */
     private function plugin_or_theme_active( $plugin_or_theme_names ): bool {
+    public function plugin_or_theme_active( $plugin_or_theme_names ): bool {
         foreach ( (array) $plugin_or_theme_names as $plugin_or_theme_name ) {
             if ( '' === $plugin_or_theme_name ) {
 …
         return defined( 'XMLRPC_REQUEST' ) && constant( 'XMLRPC_REQUEST' );
+    }
-    /**
-     * Whether option is allowed to use.
+     *
-     * @return bool
-     */
-    private function is_pro_or_general(): bool {
-        return $this->is_pro() || ( is_admin() && 'General' === $this->settings->get_active_tab_name() );
+    }
+}

hcaptcha-for-forms-and-more/trunk/src/php/Migrations/Migrations.php

-                      r3064004
+                      r3095958
 use HCaptcha\Admin\Events\Events;
+use HCaptcha\Settings\PluginSettingsBase;
 /**
 …
+        }
         update_option( 'hcaptcha_settings', $new_options );
+        update_option( PluginSettingsBase::OPTION_NAME, $new_options );
         foreach ( array_keys( $options_map ) as $old_option_name ) {
 …
      */
     protected function migrate_360() {
         $option         = get_option( 'hcaptcha_settings', [] );
+        $option         = get_option( PluginSettingsBase::OPTION_NAME, [] );
         $wpforms_status = $option['wpforms_status'] ?? [];
 …
         $option['wpforms_status'] = [ 'form' ];
         update_option( 'hcaptcha_settings', $option );
+        update_option( PluginSettingsBase::OPTION_NAME, $option );
         return true;
 …
         $pro               = $result['features']['custom_theme'] ?? false;
         $license           = $pro ? 'pro' : 'free';
         $option            = get_option( 'hcaptcha_settings', [] );
+        $option            = get_option( PluginSettingsBase::OPTION_NAME, [] );
         $option['license'] = $license;
         // Save license level in settings.
         update_option( 'hcaptcha_settings', $option );
+        update_option( PluginSettingsBase::OPTION_NAME, $option );
+    }
+}

hcaptcha-for-forms-and-more/trunk/src/php/NF/NF.php

r3080217	r3095958
295	295	self::HANDLE,
296	296	HCAPTCHA_URL . "/assets/js/hcaptcha-nf$min.js",
297		[ 'jquery', Main::HANDLE, 'nf-front-end', 'nf-front-end-deps'~~, 'wp-hooks'~~ ],
	297	[ 'jquery', Main::HANDLE, 'nf-front-end', 'nf-front-end-deps' ],
298	298	HCAPTCHA_VERSION,
299	299	true

hcaptcha-for-forms-and-more/trunk/src/php/Otter/Form.php

r3064004	r3095958
155	155	self::HANDLE,
156	156	HCAPTCHA_URL . "/assets/js/hcaptcha-otter$min.js",
157		[ ~~'wp-hooks'~~ ],
	157	[],
158	158	HCAPTCHA_VERSION,
159	159	true

hcaptcha-for-forms-and-more/trunk/src/php/Passster/Protect.php

r3064004	r3095958
130	130	self::HANDLE,
131	131	HCAPTCHA_URL . "/assets/js/hcaptcha-passster$min.js",
132		[ 'jquery'~~, 'wp-hooks'~~ ],
	132	[ 'jquery' ],
133	133	HCAPTCHA_VERSION,
134	134	true

hcaptcha-for-forms-and-more/trunk/src/php/Settings/Abstracts/SettingsBase.php

-                      r3081325
+                      r3095958
     /**
+     * Network-wide menu position.
+     *
+     * A number before 25 (Settings) to avoid conflicts with other plugins.
+     */
+    const NETWORK_WIDE_POSITION = 24.99;
+    /**
      * Form fields.
+     *
 …
         $this->tabs = $tabs;
+        $args = wp_parse_args(
+            $args,
+            [
+                'mode'     => self::MODE_PAGES,
+                'parent'   => null,
+                'position' => null,
+            ]
+        );
+        $this->admin_mode = in_array( $args['mode'], [ self::MODE_PAGES, self::MODE_TABS ], true ) ?
+            $args['mode'] :
+            self::MODE_PAGES;
+        if ( null === $args['parent'] ) {
+            $this->parent_slug = self::MODE_PAGES === $this->admin_mode ? '' : 'options-general.php';
+        } else {
+            $this->parent_slug = $args['parent'];
+        }
+        if ( null === $args['position'] ) {
+            $hash           = hexdec( sha1( self::PREFIX ) );
+            $pow            = floor( log10( $hash ) );
+            $this->position = round( self::POSITION + $hash / 10 ** ( $pow + 4 ), 6 );
+        } else {
+            $this->position = (float) $args['position'];
+        }
+        $this->process_args( $args );
         $this->fields = [
 …
         if ( self::MODE_PAGES === $this->admin_mode || ! $this->is_tab() ) {
             add_action( 'current_screen', [ $this, 'setup_tabs_section' ], 9 );
+            add_action( 'admin_menu', [ $this, 'add_settings_page' ] );
+            $tag = $this->is_network_wide() ? 'network_admin_menu' : 'admin_menu';
+            add_action( $tag, [ $this, 'add_settings_page' ] );
+        }
 …
     protected function init_hooks() {
         add_action( 'admin_enqueue_scripts', [ $this, 'base_admin_enqueue_scripts' ] );
+        add_action( 'admin_page_access_denied', [ $this, 'base_admin_page_access_denied' ] );
         if ( $this->is_main_menu_page() ) {
 …
     /**
+     * Process arguments.
+     *
+     * @param array $args Arguments.
+     *
+     * @return void
+     */
+    protected function process_args( array $args ) {
+        $args = wp_parse_args(
+            $args,
+            [
+                'mode'     => $this->get_menu_position(),
+                'parent'   => null,
+                'position' => null,
+            ]
+        );
+        $this->admin_mode = in_array( $args['mode'], [ self::MODE_PAGES, self::MODE_TABS ], true ) ?
+            $args['mode'] :
+            self::MODE_PAGES;
+        if ( null === $args['parent'] ) {
+            $wp_settings_slug  = is_multisite() && $this->is_network_wide() ? 'settings.php' : 'options-general.php';
+            $this->parent_slug = self::MODE_PAGES === $this->admin_mode ? '' : $wp_settings_slug;
+        } else {
+            $this->parent_slug = $args['parent'];
+        }
+        if ( null === $args['position'] ) {
+            $hash           = hexdec( sha1( self::PREFIX ) );
+            $pow            = floor( log10( $hash ) );
+            $position       = is_multisite() && $this->is_network_wide() ? self::NETWORK_WIDE_POSITION : self::POSITION;
+            $this->position = round( $position + $hash / 10 ** ( $pow + 4 ), 6 );
+        } else {
+            $this->position = (float) $args['position'];
+        }
+    }
+    /**
      * Is this the main menu page?
+     *
 …
      */
     protected function init_settings() {
         $network_wide = get_site_option( $this->option_name() . self::NETWORK_WIDE, [] );
         if ( empty( $network_wide ) ) {
+        if ( $this->is_network_wide() ) {
+            $this->settings = get_site_option( $this->option_name(), null );
+        } else {
             $this->settings = get_option( $this->option_name(), null );
-        } else {
-            $this->settings = get_site_option( $this->option_name(), null );
+        }
 …
         $network_wide_setting                 = array_key_exists( self::NETWORK_WIDE, $this->settings ) ?
             $this->settings[ self::NETWORK_WIDE ] :
             $network_wide;
+            $this->get_network_wide();
         $this->settings[ self::NETWORK_WIDE ] = $network_wide_setting;
 …
     /**
+     * Filter denied access to the settings page.
+     * It is needed when switching network_wide option.
+     *
+     * @return void
+     */
+    public function base_admin_page_access_denied() {
+        // phpcs:ignore WordPress.Security.NonceVerification.Recommended
+        $page = isset( $_GET['page'] ) ? sanitize_text_field( wp_unslash( $_GET['page'] ) ) : '';
+        if ( static::PREFIX !== $page ) {
+            return;
+        }
+        $url = is_multisite() && $this->is_network_wide() ?
+            network_admin_url( 'admin.php?page=' . $this->option_page() ) :
+            admin_url( 'admin.php?page=' . $this->option_page() );
+        if ( wp_get_raw_referer() === $url ) {
+            // Prevent infinite loop.
+            return;
+        }
+        wp_safe_redirect( $url );
+        $this->exit();
+    }
+    /**
+     * Exit wrapper for test purposes.
+     *
+     * @return void
+     */
+    protected function exit() {
+        // @codeCoverageIgnoreStart
+        exit();
+        // @codeCoverageIgnoreEnd
+    }
+    /**
      * Setup settings sections.
+     *
 …
      */
     private function tab_link( SettingsBase $tab ) {
+        $url = menu_page_url( $tab->option_page(), false );
+        $url = is_multisite() && $this->is_network_wide() ?
+            network_admin_url( 'admin.php?page=' . $tab->option_page() ) :
+            menu_page_url( $tab->option_page(), false );
         if ( self::MODE_TABS === $this->admin_mode ) {
 …
         $current_suffix = preg_replace( '/.+_page_/', '', $current_screen->id );
+        if ( is_multisite() && $this->is_network_wide() ) {
+            $current_suffix = preg_replace( '/-network$/', '', $current_suffix );
+        }
         return $this->option_page() === $current_suffix || in_array( $current_suffix, $ids, true );
+    }
 …
     /**
      * Print supplemental id it exists.
+     * Print supplemental id if it exists.
+     *
      * @param string $supplemental Supplemental.
 …
         );
+    }
+    /**
+     * Get network_wide setting.
+     *
+     * @return array
+     */
+    protected function get_network_wide(): array {
+        static $network_wide = null;
+        if ( null === $network_wide ) {
+            $network_wide = (array) get_site_option( $this->option_name() . self::NETWORK_WIDE, [] );
+        }
+        return $network_wide;
+    }
+    /**
+     * Whether network_wide setting is on.
+     *
+     * @return bool
+     */
+    protected function is_network_wide(): bool {
+        return ! empty( $this->get_network_wide() );
+    }
+    /**
+     * Get menu position.
+     *
+     * @return string
+     */
+    protected function get_menu_position(): string {
+        return [ 'on' ] === $this->get( 'menu_position' ) ? self::MODE_TABS : self::MODE_PAGES;
+    }
+    /**
+     * Print header.
+     *
+     * @return void
+     */
+    protected function print_header() {
+        ?>
+        <div class="<?php echo esc_attr( static::PREFIX . '-header-bar' ); ?>">
+            <div class="<?php echo esc_attr( static::PREFIX . '-header' ); ?>">
+                <h2>
+                    <?php echo esc_html( $this->page_title() ); ?>
+                </h2>
+            </div>
+            <?php
+            /**
+             * Fires before settings tab closing tag.
+             */
+            do_action( 'kagg_settings_header' );
+            ?>
+        </div>
+        <?php
+    }
+}

hcaptcha-for-forms-and-more/trunk/src/php/Settings/EventsPage.php

-                      r3081325
+                      r3095958
     /**
-     * The page is allowed to be shown.
+     *
-     * @var bool
-     */
-    protected $allowed = false;
-    /**
      * Get page title.
+     *
 …
         add_action( 'admin_init', [ $this, 'admin_init' ] );
+        add_action( 'kagg_settings_header', [ $this, 'date_picker_display' ] );
+    }
 …
      */
     public function admin_init() {
+        $this->allowed = ( hcaptcha()->settings()->is_on( 'statistics' ) && hcaptcha()->is_pro() );
+        $settings = hcaptcha()->settings();
+        $this->allowed = ( $settings->is_on( 'statistics' ) && $settings->is_pro() );
         if ( ! $this->allowed ) {
 …
+        }
+        wp_enqueue_script(
+            'chart',
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chart.umd.min.js',
+            [],
+            'v4.4.2',
+            true
+        );
+        wp_enqueue_script(
+            'chart-adapter-date-fns',
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chartjs-adapter-date-fns.bundle.min.js',
+            [ 'chart' ],
+            'v3.0.0',
+            true
+        );
+        parent::admin_enqueue_scripts();
         wp_enqueue_script(
 …
                 'succeedLabel' => __( 'Succeed', 'hcaptcha-for-forms-and-more' ),
                 'failedLabel'  => __( 'Failed', 'hcaptcha-for-forms-and-more' ),
+                'unit'         => $this->unit,
+            ]
         );
 …
      */
     public function section_callback( array $arguments ) {
+        ?>
+        <h2>
+            <?php echo esc_html( $this->page_title() ); ?>
+        </h2>
+        <?php
+        $this->print_header();
         if ( ! $this->allowed ) {

hcaptcha-for-forms-and-more/trunk/src/php/Settings/FormsPage.php

-                      r3081325
+                      r3095958
     /**
-     * The page is allowed to be shown.
+     *
-     * @var bool
-     */
-    protected $allowed = false;
-    /**
      * Get page title.
+     *
 …
         add_action( 'admin_init', [ $this, 'admin_init' ] );
+        add_action( 'kagg_settings_header', [ $this, 'date_picker_display' ] );
+    }
 …
+        }
+        wp_enqueue_script(
+            'chart',
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chart.umd.min.js',
+            [],
+            'v4.4.2',
+            true
+        );
+        wp_enqueue_script(
+            'chart-adapter-date-fns',
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chartjs-adapter-date-fns.bundle.min.js',
+            [ 'chart' ],
+            'v3.0.0',
+            true
+        );
+        parent::admin_enqueue_scripts();
         wp_enqueue_script(
 …
                 'served'      => $this->served,
                 'servedLabel' => __( 'Served', 'hcaptcha-for-forms-and-more' ),
+                'unit'        => $this->unit,
+            ]
         );
 …
      */
     public function section_callback( array $arguments ) {
+        ?>
+        <h2>
+            <?php echo esc_html( $this->page_title() ); ?>
+        </h2>
+        <?php
+        $this->print_header();
         if ( ! $this->allowed ) {

hcaptcha-for-forms-and-more/trunk/src/php/Settings/General.php

-                      r3086102
+                      r3095958
         switch ( $arguments['id'] ) {
             case self::SECTION_KEYS:
+                ?>
+                <h2>
+                    <?php echo esc_html( $this->page_title() ); ?>
+                </h2>
+                <div id="hcaptcha-message"></div>
+                <?php
+                $this->print_header();
                 $this->notifications->show();
                 $this->print_section_header( $arguments['id'], __( 'Keys', 'hcaptcha-for-forms-and-more' ) );

hcaptcha-for-forms-and-more/trunk/src/php/Settings/Integrations.php

-                      r3081325
+                      r3095958
 use KAGG\Settings\Abstracts\SettingsBase;
+use WP_Error;
 use WP_Theme;
 …
     /**
+     * Plugin dependencies not specified in their headers.
+     * Key is a plugin slug.
+     * Value is a plugin slug or an array of slugs.
+     */
+    const PLUGIN_DEPENDENCIES = [
+        // phpcs:disable WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned
+        'back-in-stock-notifier-for-woocommerce/cwginstocknotifier.php' => 'woocommerce/woocommerce.php',
+        'elementor-pro/elementor-pro.php'                               => 'elementor/elementor.php',
+        'woocommerce-wishlists/woocommerce-wishlists.php'               => 'woocommerce/woocommerce.php',
+        // phpcs:enable WordPress.Arrays.MultipleStatementAlignment.DoubleArrowNotAligned
+    ];
+    /**
      * Entity name to activate/deactivate. Can be 'plugin' or 'theme'.
+     *
 …
      */
     protected $entity = '';
+    /**
+     * Plugins tree.
+     *
+     * @var array
+     */
+    protected $plugins_tree;
     /**
 …
         parent::init_hooks();
         add_action( 'kagg_settings_tab', [ $this, 'search_box' ] );
+        add_action( 'kagg_settings_header', [ $this, 'search_box' ] );
         add_action( 'wp_ajax_' . self::ACTIVATE_ACTION, [ $this, 'activate' ] );
+    }
 …
     public function search_box() {
         ?>
         <span id="hcaptcha-integrations-search-wrap">
+        <div id="hcaptcha-integrations-search-wrap">
             <label for="hcaptcha-integrations-search"></label>
             <input
                     type="search" id="hcaptcha-integrations-search"
                     placeholder="<?php esc_html_e( 'Search plugins and themes...', 'hcaptcha-for-forms-and-more' ); ?>">
         </span>
+        </div>
         <?php
+    }
 …
+        }
+        $this->print_header();
         ?>
-        <h2>
-            <?php echo esc_html( $this->page_title() ); ?>
-        </h2>
         <div id="hcaptcha-message"></div>
         <p>
 …
+            }
+            $message = sprintf(
+            $plugin_names = $this->plugin_names_from_tree( $this->plugins_tree );
+            $message      = sprintf(
             /* translators: 1: Plugin name. */
+                __( '%s plugin is activated.', 'hcaptcha-for-forms-and-more' ),
+                $plugin_name
+                _n(
+                    '%s plugin is activated.',
+                    '%s plugins are activated.',
+                    count( $plugin_names ),
+                    'hcaptcha-for-forms-and-more'
+                ),
+                implode( ', ', $plugin_names )
             );
 …
     protected function activate_plugins( array $plugins ): bool {
         foreach ( $plugins as $plugin ) {
+            ob_start();
+            $result = activate_plugin( $plugin );
+            ob_end_clean();
+            $this->plugins_tree = $this->build_plugins_tree( $plugin );
+            $result             = $this->activate_plugin_tree( $this->plugins_tree );
             if ( null === $result ) {
 …
     /**
+     * Activate plugins.
+     *
+     * @param array $node Node of the plugin tree.
+     *
+     * @return int|null|true|WP_Error
+     */
+    protected function activate_plugin_tree( array &$node ) {
+        if ( $node['children'] ) {
+            foreach ( $node['children'] as $child ) {
+                $result = $this->activate_plugin_tree( $child );
+                if ( null !== $result ) {
+                    return $result;
+                }
+            }
+        }
+        ob_start();
+        $result = activate_plugin( $node['plugin'] );
+        ob_end_clean();
+        $node['result'] = $result;
+        return $result;
+    }
+    /**
+     * Get plugins' tree.
+     *
+     * @param string $plugin Plugin slug.
+     *
+     * @return array
+     */
+    protected function build_plugins_tree( string $plugin ): array {
+        $dependencies = $this->plugin_dependencies( $plugin );
+        $tree         = [
+            'plugin'   => $plugin,
+            'children' => [],
+        ];
+        foreach ( $dependencies as $dependency ) {
+            $tree['children'][] = $this->build_plugins_tree( $dependency );
+        }
+        return $tree;
+    }
+    /**
+     * Get plugin dependencies.
+     *
+     * @param string $plugin Plugin slug.
+     *
+     * @return array
+     */
+    private function plugin_dependencies( string $plugin ): array {
+        $plugin_headers   = get_plugin_data( constant( 'WP_PLUGIN_DIR' ) . '/' . $plugin );
+        $requires_plugins = $plugin_headers['RequiresPlugins'] ?? '';
+        $wp_dependencies  = $this->plugin_dirs_to_slugs(
+            array_filter( array_map( 'trim', explode( ',', $requires_plugins ) ) )
+        );
+        $dependencies     = (array) ( self::PLUGIN_DEPENDENCIES[ $plugin ] ?? [] );
+        return array_merge( $wp_dependencies, $dependencies );
+    }
+    /**
+     * Convert plugin directories to slugs.
+     *
+     * @param array $dirs Plugin directories.
+     *
+     * @return array
+     */
+    protected function plugin_dirs_to_slugs( array $dirs ): array {
+        if ( ! $dirs ) {
+            return $dirs;
+        }
+        $slugs = array_keys( get_plugins() );
+        foreach ( $dirs as &$dir ) {
+            $slug = preg_grep( "#^$dir/#", $slugs );
+            if ( $slug ) {
+                $dir = reset( $slug );
+            }
+        }
+        return $dirs;
+    }
+    /**
+     * Get plugin names from the tree.
+     *
+     * @param array $node Node of the plugin tree.
+     *
+     * @return array
+     */
+    protected function plugin_names_from_tree( array $node ): array {
+        $plugin_names = [];
+        if ( $node['children'] ) {
+            foreach ( $node['children'] as $child ) {
+                $plugin_names[] = $this->plugin_names_from_tree( $child );
+            }
+            $plugin_names = array_merge( [], ...$plugin_names );
+        }
+        $status = '';
+        foreach ( hcaptcha()->modules as $module ) {
+            if ( $module[1] === $node['plugin'] ) {
+                $status = $module[0][0];
+                break;
+            }
+        }
+        $plugin_name = $this->form_fields[ $status ]['label'] ?? '';
+        if ( ! $plugin_name ) {
+            $plugin_data = get_plugin_data( constant( 'WP_PLUGIN_DIR' ) . '/' . $node['plugin'] );
+            $plugin_name = $plugin_data['Name'] ?? '';
+        }
+        return array_unique( array_merge( [ $plugin_name ], $plugin_names ) );
+    }
+    /**
      * Activate theme.
+     *
 …
         $data = [ 'message' => esc_html( $message ) ];
+        if ( 'plugin' === $this->entity ) {
+            $data['stati'] = $this->get_activation_stati();
+        }
         if ( 'theme' === $this->entity ) {
             $data['themes']       = $this->get_themes();
 …
         return $data;
+    }
+    /**
+     * Get activation stati of all integrated plugins and themes.
+     *
+     * @return array
+     */
+    protected function get_activation_stati(): array {
+        $stati = [];
+        foreach ( hcaptcha()->modules as $module ) {
+            $stati[ $module[0][0] ] = hcaptcha()->plugin_or_theme_active( $module[1] );
+        }
+        return $stati;
+    }

hcaptcha-for-forms-and-more/trunk/src/php/Settings/ListPageBase.php

-                      r3072795
+                      r3095958
 namespace HCaptcha\Settings;
+use DateTimeImmutable;
 /**
  * Class ListPageBase.
 …
     /**
+     * Chart handle.
+     */
+    const CHART_HANDLE = 'chart';
+    /**
+     * Flatpickr handle.
+     */
+    const FLATPICKR_HANDLE = 'flatpickr';
+    /**
+     * Base handle.
+     */
+    const HANDLE = 'settings-list-page-base';
+    /**
+     * Base object.
+     */
+    const OBJECT = 'HCaptchaFlatPickerObject';
+    /**
+     * Number of timespan days by default.
+     * "Last 30 Days", by default.
+     */
+    const DEFAULT_TIMESPAN_DAYS = '30';
+    /**
+     * Timespan (date range) delimiter.
+     */
+    const TIMESPAN_DELIMITER = ' - ';
+    /**
+     * Default date format.
+     */
+    const DATE_FORMAT = 'Y-m-d';
+    /**
+     * Chart time unit.
+     *
+     * @var string
+     */
+    protected $unit;
+    /**
+     * The page is allowed to be shown.
+     *
+     * @var bool
+     */
+    protected $allowed = false;
+    /**
      * Get suggested data format from items array.
+     *
 …
         $time_diff = $max_time - $min_time;
+        $time_units = [
+            [ 1, 'second' ],
+            [ constant( 'MINUTE_IN_SECONDS' ), 'minute' ],
+            [ constant( 'HOUR_IN_SECONDS' ), 'hour' ],
+            [ constant( 'DAY_IN_SECONDS' ), 'day' ],
+            [ constant( 'WEEK_IN_SECONDS' ), 'week' ],
+            [ constant( 'MONTH_IN_SECONDS' ), 'month' ],
+            [ constant( 'YEAR_IN_SECONDS' ), 'year' ],
+        ];
+        foreach ( $time_units as $index => $time_unit ) {
+            $i          = max( 0, $index - 1 );
+            $this->unit = $time_units[ $i ][1];
+            if ( $time_diff < $time_unit[0] * 2 ) {
+                break;
+            }
+        }
         if ( $time_diff < constant( 'MINUTE_IN_SECONDS' ) ) {
 …
         return $date_format;
+    }
+    /**
+     * Enqueue class scripts.
+     */
+    public function admin_enqueue_scripts() {
+        $min = hcap_min_suffix();
+        wp_enqueue_script(
+            self::CHART_HANDLE,
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chartjs/chart.umd.min.js',
+            [],
+            'v4.4.2',
+            true
+        );
+        wp_enqueue_script(
+            'chart-adapter-date-fns',
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/chartjs/chartjs-adapter-date-fns.bundle.min.js',
+            [ self::CHART_HANDLE ],
+            'v3.0.0',
+            true
+        );
+        wp_enqueue_style(
+            self::FLATPICKR_HANDLE,
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/flatpickr/flatpickr.min.css',
+            [],
+            '4.6.13'
+        );
+        wp_enqueue_script(
+            self::FLATPICKR_HANDLE,
+            constant( 'HCAPTCHA_URL' ) . '/assets/lib/flatpickr/flatpickr.min.js',
+            [],
+            '4.6.13',
+            true
+        );
+        wp_enqueue_style(
+            self::HANDLE,
+            constant( 'HCAPTCHA_URL' ) . "/assets/css/settings-list-page-base$min.css",
+            [ self::FLATPICKR_HANDLE ],
+            constant( 'HCAPTCHA_VERSION' )
+        );
+        wp_enqueue_script(
+            self::HANDLE,
+            constant( 'HCAPTCHA_URL' ) . "/assets/js/settings-list-page-base$min.js",
+            [ self::FLATPICKR_HANDLE ],
+            constant( 'HCAPTCHA_VERSION' ),
+            true
+        );
+        wp_localize_script(
+            self::HANDLE,
+            self::OBJECT,
+            [
+                'delimiter' => self::TIMESPAN_DELIMITER,
+                'locale'    => $this->get_language_code(),
+            ]
+        );
+    }
+    /**
+     * Display datepicker element.
+     *
+     * @return void
+     */
+    public function date_picker_display() {
+        if ( ! $this->allowed ) {
+            return;
+        }
+        list( $choices, $chosen_filter, $value ) = $this->process_datepicker_choices();
+        // An array of allowed HTML elements and attributes for the datepicker choices.
+        $choices_allowed_html = [
+            'li'    => [],
+            'label' => [],
+            'input' => [
+                'type'         => [],
+                'name'         => [],
+                'value'        => [],
+                'checked'      => [],
+                'aria-hidden'  => [],
+                'data-default' => [],
+            ],
+        ];
+        ?>
+        <div class="hcaptcha-filter">
+            <button id="hcaptcha-datepicker-popover-button" class="button" role="button" aria-haspopup="true">
+                <?php echo esc_html( $chosen_filter ); ?>
+            </button>
+            <div class="hcaptcha-datepicker-popover">
+                <div class="hcaptcha-datepicker-popover-content">
+                    <ul class="hcaptcha-datepicker-choices"
+                        aria-label="<?php esc_attr_e( 'Datepicker options', 'hcaptcha-for-forms-and-more' ); ?>"
+                        aria-orientation="vertical">
+                        <?php echo wp_kses( '<li>' . implode( '</li><li>', $choices ) . '</li>', $choices_allowed_html ); ?>
+                    </ul>
+                    <div class="hcaptcha-datepicker-calendar">
+                        <label for="hcaptcha-datepicker">
+                            <input
+                                type="text"
+                                name="date"
+                                tabindex="-1"
+                                aria-hidden="true"
+                                id="hcaptcha-datepicker"
+                                value="<?php echo esc_attr( $value ); ?>">
+                        </label>
+                    </div>
+                    <div class="hcaptcha-datepicker-action">
+                        <button class="button-secondary" type="reset">
+                            <?php esc_html_e( 'Cancel', 'hcaptcha-for-forms-and-more' ); ?>
+                        </button>
+                        <button class="button-primary hcaptcha-btn-blue" type="submit">
+                            <?php esc_html_e( 'Apply', 'hcaptcha-for-forms-and-more' ); ?>
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <?php
+    }
+    /**
+     * Sets the timespan (or date range) for performing mysql queries.
+     *
+     * Includes:
+     * 1. A list of date filter options for the datepicker module.
+     * 2. Currently selected filter or date range values. Last "X" days, or i.e. Feb 8, 2023 - Mar 9, 2023.
+     * 3. Assigned timespan dates.
+     *
+     * @param array|null $timespan Given timespan (dates) preferably in WP timezone.
+     *
+     * @return array
+     * @noinspection PhpMissingParamTypeInspection
+     * @noinspection HtmlUnknownAttribute
+     */
+    protected function process_datepicker_choices( $timespan = null ): array {
+        // Retrieve and validate timespan if none is given.
+        if ( empty( $timespan ) || ! is_array( $timespan ) ) {
+            $timespan = $this->process_timespan();
+        }
+        list( $start_date, $end_date, $days ) = $timespan;
+        $filters       = $this->get_date_filter_choices();
+        $selected      = isset( $filters[ $days ] ) ? $days : 'custom';
+        $value         = $this->concat_dates( $start_date, $end_date );
+        $chosen_filter = 'custom' === $selected ? $value : $filters[ $selected ];
+        $choices       = [];
+        foreach ( $filters as $choice => $label ) {
+            $timespan_dates = $this->get_timespan_dates( $choice );
+            $checked        = checked( $selected, $choice, false );
+            $default        = (int) self::DEFAULT_TIMESPAN_DAYS === $choice ? 'data-default' : '';
+            $choices[]      = sprintf(
+                '<label %s>%s<input type="radio" aria-hidden="true" name="timespan" value="%s" %s %s></label>',
+                $checked ? 'class="is-selected"' : '',
+                esc_html( $label ),
+                esc_attr( $this->concat_dates( ...$timespan_dates ) ),
+                esc_attr( $checked ),
+                esc_attr( $default )
+            );
+        }
+        return [ $choices, $chosen_filter, $value ];
+    }
+    /**
+     * Sets the timespan (or date range) selected.
+     *
+     * Includes:
+     * 1. Start date object in WP timezone.
+     * 2. End date object in WP timezone.
+     * 3. Number of "Last X days", if applicable, otherwise returns "custom".
+     * 4. Label associated with the selected date filter choice. @see "get_date_filter_choices".
+     *
+     * @return array
+     */
+    protected function process_timespan(): array {
+        $dates = (string) filter_input( INPUT_GET, 'date', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
+        // Return default timespan if dates are empty.
+        if ( empty( $dates ) ) {
+            return $this->get_timespan_dates( self::DEFAULT_TIMESPAN_DAYS );
+        }
+        $dates = $this->maybe_validate_string_timespan( $dates );
+        list( $start_date, $end_date ) = explode( self::TIMESPAN_DELIMITER, $dates );
+        // Return default timespan if the start date is more recent than the end date.
+        if ( strtotime( $start_date ) > strtotime( $end_date ) ) {
+            return $this->get_timespan_dates( self::DEFAULT_TIMESPAN_DAYS );
+        }
+        $timezone   = wp_timezone(); // Retrieve the timezone string for the site.
+        $start_date = date_create_immutable( $start_date, $timezone );
+        $end_date   = date_create_immutable( $end_date, $timezone );
+        // Return default timespan if date creation fails.
+        if ( ! $start_date || ! $end_date ) {
+            // @codeCoverageIgnoreStart
+            return $this->get_timespan_dates( self::DEFAULT_TIMESPAN_DAYS );
+            // @codeCoverageIgnoreEnd
+        }
+        // Set time to 0:0:0 for start date and 23:59:59 for end date.
+        $start_date = $start_date->setTime( 0, 0 );
+        $end_date   = $end_date->setTime( 23, 59, 59 );
+        $days_diff    = '';
+        $current_date = date_create_immutable( 'now', $timezone )->setTime( 23, 59, 59 );
+        // Calculate day difference only if the end date is equal to the current date.
+        if ( ! $current_date->diff( $end_date )->format( '%a' ) ) {
+            $days_diff = $end_date->diff( $start_date )->format( '%a' );
+        }
+        list( $days, $timespan_label ) = $this->get_date_filter_choices( $days_diff );
+        return [
+            $start_date,     // WP timezone.
+            $end_date,       // WP timezone.
+            $days,           // e.g., 22.
+            $timespan_label, // e.g., Custom.
+        ];
+    }
+    /**
+     * Check the delimiter to see if the end date is specified.
+     * We can assume that the start and end dates are the same if the end date is missing.
+     *
+     * @param string $dates Given timespan (dates) in string. i.e. "2024-04-16 - 2024-05-16" or "2024-04-16".
+     *
+     * @return string
+     */
+    protected function maybe_validate_string_timespan( string $dates ): string {
+        // The '-' is used as a delimiter for the datepicker module.
+        if ( false !== strpos( $dates, self::TIMESPAN_DELIMITER ) ) {
+            return $dates;
+        }
+        return $dates . self::TIMESPAN_DELIMITER . $dates;
+    }
+    /**
+     * The number of days is converted to the start and end date range.
+     *
+     * @param string $days Timespan days.
+     *
+     * @return array
+     */
+    protected function get_timespan_dates( string $days ): array {
+        list( $timespan_key, $timespan_label ) = $this->get_date_filter_choices( $days );
+        // Bail early, if the given number of days is NOT a number nor a numeric string.
+        if ( ! is_numeric( $days ) ) {
+            return [ '', '', $timespan_key, $timespan_label ];
+        }
+        $end_date   = date_create_immutable( 'now', wp_timezone() );
+        $start_date = $end_date;
+        if ( (int) $days > 0 ) {
+            $start_date = $start_date->modify( "-$days day" );
+        }
+        $start_date = $start_date->setTime( 0, 0 );
+        $end_date   = $end_date->setTime( 23, 59, 59 );
+        return [
+            $start_date,     // WP timezone.
+            $end_date,       // WP timezone.
+            $timespan_key,   // i.e. 30.
+            $timespan_label, // i.e. Last 30 days.
+        ];
+    }
+    /**
+     * Returns a list of date filter options for the datepicker module.
+     *
+     * @param string|null $key Optional. Key associated with available filters.
+     *
+     * @return array
+     * @noinspection PhpMissingParamTypeInspection
+     */
+    protected function get_date_filter_choices( $key = null ): array {
+        // Available date filters.
+        $choices = [
+            '0'      => esc_html__( 'Today', 'wpforms-lite' ),
+            '1'      => esc_html__( 'Yesterday', 'wpforms-lite' ),
+            '7'      => esc_html__( 'Last 7 days', 'wpforms-lite' ),
+            '30'     => esc_html__( 'Last 30 days', 'wpforms-lite' ),
+            '90'     => esc_html__( 'Last 90 days', 'wpforms-lite' ),
+            '365'    => esc_html__( 'Last 1 year', 'wpforms-lite' ),
+            'custom' => esc_html__( 'Custom', 'wpforms-lite' ),
+        ];
+        // Bail early, and return the full list of options.
+        if ( is_null( $key ) ) {
+            return $choices;
+        }
+        // Return the "Custom" filter if the given key is not found.
+        $key = isset( $choices[ $key ] ) ? $key : 'custom';
+        return [ $key, $choices[ $key ] ];
+    }
+    /**
+     * Concatenate given dates into a single string. i.e. "2024-04-16 - 2024-05-16".
+     *
+     * @param DateTimeImmutable|mixed $start_date Start date.
+     * @param DateTimeImmutable|mixed $end_date   End date.
+     * @param int|string              $fallback   Fallback value if dates are not valid.
+     *
+     * @return string
+     */
+    private function concat_dates( $start_date, $end_date, $fallback = '' ) {
+        // Bail early, if the given dates are not valid.
+        if ( ! ( $start_date instanceof DateTimeImmutable ) || ! ( $end_date instanceof DateTimeImmutable ) ) {
+            return $fallback;
+        }
+        return implode(
+            self::TIMESPAN_DELIMITER,
+            [
+                $start_date->format( self::DATE_FORMAT ),
+                $end_date->format( self::DATE_FORMAT ),
+            ]
+        );
+    }
+    /**
+     * Get the ISO 639-2 Language Code from user/site locale.
+     *
+     * @see   http://www.loc.gov/standards/iso639-2/php/code_list.php
+     *
+     * @return string
+     */
+    private function get_language_code(): string {
+        $default_lang = 'en';
+        $locale       = get_user_locale();
+        if ( ! empty( $locale ) ) {
+            $lang = explode( '_', $locale );
+            if ( ! empty( $lang ) && is_array( $lang ) ) {
+                $default_lang = strtolower( $lang[0] );
+            }
+        }
+        return $default_lang;
+    }
+}

hcaptcha-for-forms-and-more/trunk/src/php/Settings/PluginSettingsBase.php

-                      r3080217
+                      r3095958
     /**
+     * Settings option name.
+     */
+    const OPTION_NAME = 'hcaptcha_settings';
+    /**
      * The 'submit' button was shown.
+     *
 …
      */
     protected function option_name(): string {
         return 'hcaptcha_settings';
+        return self::OPTION_NAME;
+    }

hcaptcha-for-forms-and-more/trunk/src/php/Settings/Settings.php

-                      r3081325
+                      r3095958
         return $first_tab ? $first_tab->get_active_tab()->tab_name() : '';
+    }
+    /**
+     * Check if it is a Pro account.
+     *
+     * @return false
+     */
+    public function is_pro(): bool {
+        return 'pro' === $this->get_license();
+    }
+    /**
+     * Check if it is a Pro account or General admin page.
+     *
+     * @return bool
+     */
+    public function is_pro_or_general(): bool {
+        return $this->is_pro() || ( is_admin() && 'General' === $this->get_active_tab_name() );
+    }
 …
      */
     public function get_theme(): string {
+        $theme = $this->get( 'theme' );
+        if ( $this->is_on( 'custom_themes' ) && $this->is_pro_or_general() ) {
+            $theme = $this->get_config_params()['theme']['palette']['mode'] ?? $theme;
+        }
         /**
 …
          * @param string $mode Current theme.
          */
         return (string) apply_filters( 'hcap_theme', $this->get( 'theme' ) );
+        return (string) apply_filters( 'hcap_theme', $theme );
+    }

hcaptcha-for-forms-and-more/trunk/src/php/Settings/SystemInfo.php

-                      r3081325
+                      r3095958
      */
     public function section_callback( array $arguments ) {
+        $this->print_header();
         ?>
-        <h2>
-            <?php echo esc_html__( 'System Information', 'hcaptcha-for-forms-and-more' ); ?>
-        </h2>
         <div id="hcaptcha-system-info-wrap">
             <span class="helper">

hcaptcha-for-forms-and-more/trunk/src/php/WPDiscuz/Comment.php

r3064004	r3095958
115	115	self::HANDLE,
116	116	HCAPTCHA_URL . "/assets/js/hcaptcha-wpdiscuz-comment$min.js",
117		[ ~~'wp-hooks'~~ ],
	117	[],
118	118	HCAPTCHA_VERSION,
119	119	true

hcaptcha-for-forms-and-more/trunk/vendor/composer/installed.php

-                      r3086102
+                      r3095958
     'root' => array(
         'name' => 'hcaptcha/hcaptcha-wordpress-plugin',
         'pretty_version' => '4.1.2',
         'version' => '4.1.2.0',
         'reference' => '77825b68c9bf0dee38f9da73b634861e79f9e69b',
+        'pretty_version' => '4.2.0',
+        'version' => '4.2.0.0',
+        'reference' => 'aa580b1c05ee0aff974fbf1d99e92341a6f82094',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
 …
     'versions' => array(
         'hcaptcha/hcaptcha-wordpress-plugin' => array(
             'pretty_version' => '4.1.2',
             'version' => '4.1.2.0',
             'reference' => '77825b68c9bf0dee38f9da73b634861e79f9e69b',
+            'pretty_version' => '4.2.0',
+            'version' => '4.2.0.0',
+            'reference' => 'aa580b1c05ee0aff974fbf1d99e92341a6f82094',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

Context Navigation

Legend:

Download in other formats: