Changeset 3145275

Timestamp:

09/02/2024 11:06:56 AM (19 months ago)

Author:

advancedads

Message:

Update to version 1.54.0 from GitHub

Location:

advanced-ads

Files:

• tags/1.54.0 (copied) (copied from advanced-ads/trunk)
• tags/1.54.0/admin/assets/css/admin.css (modified) (1 diff)
• tags/1.54.0/admin/class-advanced-ads-admin.php (modified) (3 diffs)
• tags/1.54.0/admin/includes/class-meta-box.php (modified) (2 diffs)
• tags/1.54.0/advanced-ads.php (modified) (3 diffs)
• tags/1.54.0/assets/css/app.css (modified) (1 diff)
• tags/1.54.0/assets/js/app.js (modified) (1 diff)
• tags/1.54.0/assets/scss/ui/_switch.scss (modified) (2 diffs)
• tags/1.54.0/assets/src/modules/oneclick/connect-button.js (modified) (2 diffs)
• tags/1.54.0/assets/src/modules/oneclick/connect-settings.js (added)
• tags/1.54.0/assets/src/modules/oneclick/index.js (modified) (1 diff)
• tags/1.54.0/assets/src/modules/oneclick/settings.js (deleted)
• tags/1.54.0/classes/ad-debug.php (modified) (1 diff)
• tags/1.54.0/classes/ad_group.php (modified) (1 diff)
• tags/1.54.0/classes/frontend_checks.php (modified) (2 diffs)
• tags/1.54.0/classes/in-content-injector.php (modified) (16 diffs)
• tags/1.54.0/classes/plugin.php (modified) (2 diffs)
• tags/1.54.0/includes/admin/class-assets.php (modified) (5 diffs)
• tags/1.54.0/includes/class-assets-registry.php (modified) (6 diffs)
• tags/1.54.0/includes/class-autoloader.php (modified) (5 diffs)
• tags/1.54.0/includes/class-constants.php (added)
• tags/1.54.0/includes/class-plugin.php (modified) (7 diffs)
• tags/1.54.0/includes/importers (added)
• tags/1.54.0/includes/importers/abstract-importer.php (added)
• tags/1.54.0/includes/importers/class-api-ads.php (added)
• tags/1.54.0/includes/importers/class-manager.php (added)
• tags/1.54.0/includes/interfaces/interface-importer.php (added)
• tags/1.54.0/languages/advanced-ads.pot (modified) (31 diffs)
• tags/1.54.0/lib/composer/autoload_classmap.php (modified) (3 diffs)
• tags/1.54.0/lib/composer/autoload_static.php (modified) (3 diffs)
• tags/1.54.0/modules/one-click/admin/class-admin.php (modified) (5 diffs)
• tags/1.54.0/modules/one-click/admin/class-ajax.php (modified) (4 diffs)
• tags/1.54.0/modules/one-click/class-helpers.php (modified) (6 diffs)
• tags/1.54.0/modules/one-click/class-options.php (modified) (1 diff)
• tags/1.54.0/modules/one-click/modules/adstxt/class-adstxt.php (modified) (3 diffs)
• tags/1.54.0/modules/one-click/modules/adstxt/class-detector.php (modified) (7 diffs)
• tags/1.54.0/modules/one-click/modules/class-auto-ads.php (deleted)
• tags/1.54.0/modules/one-click/modules/class-header-bidding.php (modified) (4 diffs)
• tags/1.54.0/modules/one-click/modules/class-traffic-cop.php (modified) (2 diffs)
• tags/1.54.0/modules/one-click/modules/class-workflow.php (modified) (5 diffs)
• tags/1.54.0/packages/composer/LICENSE (modified) (2 diffs)
• tags/1.54.0/packages/composer/autoload_classmap.php (modified) (3 diffs)
• tags/1.54.0/packages/composer/autoload_static.php (modified) (3 diffs)
• tags/1.54.0/readme.txt (modified) (18 diffs)
• tags/1.54.0/views/admin/metabox-pubguru-connect.php (modified) (8 diffs)
• trunk/admin/assets/css/admin.css (modified) (1 diff)
• trunk/admin/class-advanced-ads-admin.php (modified) (3 diffs)
• trunk/admin/includes/class-meta-box.php (modified) (2 diffs)
• trunk/advanced-ads.php (modified) (3 diffs)
• trunk/assets/css/app.css (modified) (1 diff)
• trunk/assets/js/app.js (modified) (1 diff)
• trunk/assets/scss/ui/_switch.scss (modified) (2 diffs)
• trunk/assets/src/modules/oneclick/connect-button.js (modified) (2 diffs)
• trunk/assets/src/modules/oneclick/connect-settings.js (added)
• trunk/assets/src/modules/oneclick/index.js (modified) (1 diff)
• trunk/assets/src/modules/oneclick/settings.js (deleted)
• trunk/classes/ad-debug.php (modified) (1 diff)
• trunk/classes/ad_group.php (modified) (1 diff)
• trunk/classes/frontend_checks.php (modified) (2 diffs)
• trunk/classes/in-content-injector.php (modified) (16 diffs)
• trunk/classes/plugin.php (modified) (2 diffs)
• trunk/includes/admin/class-assets.php (modified) (5 diffs)
• trunk/includes/class-assets-registry.php (modified) (6 diffs)
• trunk/includes/class-autoloader.php (modified) (5 diffs)
• trunk/includes/class-constants.php (added)
• trunk/includes/class-plugin.php (modified) (7 diffs)
• trunk/includes/importers (added)
• trunk/includes/importers/abstract-importer.php (added)
• trunk/includes/importers/class-api-ads.php (added)
• trunk/includes/importers/class-manager.php (added)
• trunk/includes/interfaces/interface-importer.php (added)
• trunk/languages/advanced-ads.pot (modified) (31 diffs)
• trunk/lib/composer/autoload_classmap.php (modified) (3 diffs)
• trunk/lib/composer/autoload_static.php (modified) (3 diffs)
• trunk/modules/one-click/admin/class-admin.php (modified) (5 diffs)
• trunk/modules/one-click/admin/class-ajax.php (modified) (4 diffs)
• trunk/modules/one-click/class-helpers.php (modified) (6 diffs)
• trunk/modules/one-click/class-options.php (modified) (1 diff)
• trunk/modules/one-click/modules/adstxt/class-adstxt.php (modified) (3 diffs)
• trunk/modules/one-click/modules/adstxt/class-detector.php (modified) (7 diffs)
• trunk/modules/one-click/modules/class-auto-ads.php (deleted)
• trunk/modules/one-click/modules/class-header-bidding.php (modified) (4 diffs)
• trunk/modules/one-click/modules/class-traffic-cop.php (modified) (2 diffs)
• trunk/modules/one-click/modules/class-workflow.php (modified) (5 diffs)
• trunk/packages/composer/LICENSE (modified) (2 diffs)
• trunk/packages/composer/autoload_classmap.php (modified) (3 diffs)
• trunk/packages/composer/autoload_static.php (modified) (3 diffs)
• trunk/readme.txt (modified) (18 diffs)
• trunk/views/admin/metabox-pubguru-connect.php (modified) (8 diffs)

advanced-ads/tags/1.54.0/admin/assets/css/admin.css

@@ -1435 +1435 @@
     text-decoration: underline;
 }
+
+.rollback-block header {
+    background-color: #f9f9f9;
+    border: solid #c3c4c7;
+    padding: 10px;
+    margin: 30px -12px 15px;
+    border-width: 1px 0;
+}

advanced-ads/tags/1.54.0/admin/class-advanced-ads-admin.php

@@ -2 +2 @@
 // phpcs:ignoreFile
 
+use AdvancedAds\Importers\Api_Ads;
+use AdvancedAds\Utilities\WordPress;
 use AdvancedAds\Utilities\Conditional;
-use AdvancedAds\Utilities\WordPress;
+use AdvancedAds\Framework\Utilities\Params;
 
 /**
@@ -106 +108 @@
         // update placements.
         add_action( 'admin_init', [ 'Advanced_Ads_Placements', 'update_placements' ] );
+        add_action( 'admin_init', [ $this, 'api_import_rollback' ] );
 
         // add Advanced Ads admin notices
@@ -483 +486 @@
         echo '</span>';
     }
+
+    public function api_import_rollback() {
+        if ( 'advads_import_delete' !== Params::get( 'action' ) ) {
+            return;
+        }
+
+        check_admin_referer( 'advads_import_delete' );
+
+        $session_key = Params::get( 'session_key' );
+        $db_session  = get_option( 'advanced-ads-importer-history' );
+
+        if ( $session_key !== $db_session ) {
+            add_action( 'all_admin_notices', [ $this, 'import_error' ] );
+            return;
+        }
+
+        ( new Api_Ads() )->rollback( $session_key);
+        delete_option( 'advanced-ads-importer-history' );
+        add_action( 'all_admin_notices', [ $this, 'import_success' ] );
+    }
+
+    public function import_error() {
+        ?>
+        <div class="notice notice-error">
+            <p><strong>Error:</strong> Session key not matched.</p>
+        </div>
+        <?php
+    }
+
+    public function import_success() {
+        ?>
+        <div class="notice notice-success">
+            <p><strong>Success:</strong> the rollback is completed.</p>
+        </div>
+        <?php
+    }
 }

advanced-ads/tags/1.54.0/admin/includes/class-meta-box.php

@@ -2 +2 @@
 // phpcs:ignoreFile
 
-use AdvancedAds\Assets_Registry;
 use AdvancedAds\Entities;
 use AdvancedAds\Utilities\WordPress;
@@ -70 +69 @@
 
         if ( 'index.php' === $pagenow ) {
-            Assets_Registry::enqueue_script( 'wp-widget-adsense' );
+            wp_advads()->registry->enqueue_script( 'wp-widget-adsense' );
         }
     }

advanced-ads/tags/1.54.0/advanced-ads.php

@@ -4 +4 @@
  *
  * @package   Advanced_Ads
- * @author    Advanced Ads GmbH <[email protected]>
+ * @author    Advanced Ads <[email protected]>
  * @license   GPL-2.0+
  * @link      https://wpadvancedads.com
@@ -13 +13 @@
  * Plugin URI:        https://wpadvancedads.com
  * Description:       Manage and optimize your ads in WordPress
- * Version:           1.53.2
- * Author:            Advanced Ads GmbH
+ * Version:           1.54.0
+ * Author:            Advanced Ads
  * Author URI:        https://wpadvancedads.com
  * Text Domain:       advanced-ads
@@ -34 +34 @@
 
 define( 'ADVADS_FILE', __FILE__ );
-define( 'ADVADS_VERSION', '1.53.2' );
+define( 'ADVADS_VERSION', '1.54.0' );
 
 // Load the autoloader.

advanced-ads/tags/1.54.0/assets/css/app.css

@@ -1 @@
-.sr-only{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.visible{visibility:visible}.static{position:static}.fixed{position:fixed}.\!mr-2{margin-right:.5rem!important}.\!mt-1{margin-top:.25rem!important}.mb-6{margin-bottom:1.5rem}.inline{display:inline}.flex{display:flex}.table{display:table}.grid{display:grid}.hidden{display:none}.w-full{width:100%}.items-center{align-items:center}.gap-x-4{column-gap:1rem}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1rem*var(--tw-space-y-reverse));margin-top:calc(1rem*(1 - var(--tw-space-y-reverse)))}.self-start{align-self:flex-start}.text-base{font-size:1rem;line-height:1.5rem}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.lds-ripple{display:none;height:40px;position:relative;width:40px}.lds-ripple.show{display:inline-block}.lds-ripple div{animation:lds-ripple 1s cubic-bezier(0,.2,.8,1) infinite;border:4px solid #ccc;border-radius:50%;opacity:1;position:absolute}.lds-ripple div:nth-child(2){animation-delay:-.5s}@keyframes lds-ripple{0%{height:0;left:20px;opacity:0;top:20px;width:0}4.9%{height:0;left:20px;opacity:0;top:20px;width:0}5%{height:0;left:20px;opacity:1;top:20px;width:0}to{height:40px;left:0;opacity:0;top:0;width:40px}}.advads-ui-switch{align-items:center;cursor:pointer;display:inline-flex;position:relative}.advads-ui-switch-list>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1.25rem*var(--tw-space-y-reverse));margin-top:calc(1.25rem*(1 - var(--tw-space-y-reverse)))}.advads-ui-switch input{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.advads-ui-switch input:checked~div{--tw-bg-opacity:1;background-color:rgb(4 116 162/var(--tw-bg-opacity))}.advads-ui-switch input:checked~div:after{--tw-translate-x:100%;--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity));content:var(--tw-content);transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.advads-ui-switch input:disabled~div:after{--tw-border-opacity:1;--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity));border-color:rgb(229 231 235/var(--tw-border-opacity));content:var(--tw-content)}.advads-ui-switch div{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity));border-radius:9999px;height:1.5rem;width:2.75rem}.advads-ui-switch div:after{--tw-border-opacity:1;--tw-bg-opacity:1;--tw-content:"";background-color:rgb(255 255 255/var(--tw-bg-opacity));border-color:rgb(209 213 219/var(--tw-border-opacity));border-radius:9999px;border-width:1px;content:var(--tw-content);height:1.25rem;left:2px;position:absolute;top:.125rem;transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);width:1.25rem}.advads-ui-switch span{font-size:.875rem;font-weight:500;line-height:1.25rem;margin-left:.75rem}#advads-m2-connect{display:none}#advads-m2-connect a{--tw-text-opacity:1;color:rgb(4 116 162/var(--tw-text-opacity))}
+.sr-only{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.visible{visibility:visible}.static{position:static}.fixed{position:fixed}.\!mr-2{margin-right:.5rem!important}.\!mt-1{margin-top:.25rem!important}.mb-6{margin-bottom:1.5rem}.inline{display:inline}.flex{display:flex}.table{display:table}.grid{display:grid}.hidden{display:none}.w-full{width:100%}.items-center{align-items:center}.gap-x-4{column-gap:1rem}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1rem*var(--tw-space-y-reverse));margin-top:calc(1rem*(1 - var(--tw-space-y-reverse)))}.self-start{align-self:flex-start}.text-base{font-size:1rem;line-height:1.5rem}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.lds-ripple{display:none;height:40px;position:relative;width:40px}.lds-ripple.show{display:inline-block}.lds-ripple div{animation:lds-ripple 1s cubic-bezier(0,.2,.8,1) infinite;border:4px solid #ccc;border-radius:50%;opacity:1;position:absolute}.lds-ripple div:nth-child(2){animation-delay:-.5s}@keyframes lds-ripple{0%{height:0;left:20px;opacity:0;top:20px;width:0}4.9%{height:0;left:20px;opacity:0;top:20px;width:0}5%{height:0;left:20px;opacity:1;top:20px;width:0}to{height:40px;left:0;opacity:0;top:0;width:40px}}.advads-ui-switch{align-items:center;cursor:pointer;display:inline-flex;position:relative}.advads-ui-switch-list>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1.25rem*var(--tw-space-y-reverse));margin-top:calc(1.25rem*(1 - var(--tw-space-y-reverse)))}.advads-ui-switch input{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.advads-ui-switch input:checked~div{--tw-bg-opacity:1;background-color:rgb(4 116 162/var(--tw-bg-opacity))}.advads-ui-switch input:checked~div:after{--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity));content:var(--tw-content);left:auto;right:2px}.advads-ui-switch input:disabled~div:after{--tw-border-opacity:1;--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity));border-color:rgb(229 231 235/var(--tw-border-opacity));content:var(--tw-content)}.advads-ui-switch div{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity));border-radius:9999px;border-width:1px;height:1.5rem;position:relative;width:2.75rem}.advads-ui-switch div:after{--tw-border-opacity:1;--tw-bg-opacity:1;--tw-content:"";background-color:rgb(255 255 255/var(--tw-bg-opacity));border-color:rgb(209 213 219/var(--tw-border-opacity));border-radius:9999px;border-width:1px;content:var(--tw-content);height:1.25rem;left:2px;position:absolute;top:.125rem;transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);width:1.25rem}.advads-ui-switch span{font-size:.875rem;font-weight:500;line-height:1.25rem;margin-left:.75rem}#advads-m2-connect{display:none}#advads-m2-connect a{--tw-text-opacity:1;color:rgb(4 116 162/var(--tw-text-opacity))}

advanced-ads/tags/1.54.0/assets/js/app.js

@@ -1 @@
-(()=>{"use strict";var t,e={570:(t,e,n)=>{const a=jQuery;var o=n.n(a);function s(){var t,e,n,a,s;t=o()(".js-pubguru-connect"),e=t.next(".aa-spinner"),n=o()("#advads-m2-connect"),o()(".js-m2-show-consent").on("click",".button",(function(t){t.preventDefault();var e=o()(this).closest("tr");n.show(),e.addClass("hidden"),e.next().removeClass("hidden")})),o()(".js-pubguru-disconnect").on("click",".button",(function(t){t.preventDefault();var e=o()(this).closest("tr");n.hide(),e.addClass("hidden"),e.prev().removeClass("hidden"),o().ajax({type:"POST",url:ajaxurl,data:{action:"pubguru_disconnect",nonce:advadsglobal.ajax_nonce},dataType:"json"}).done((function(t){if(t.success){var n=o()('<div class="notice notice-success" />');n.html("<p>"+t.data.message+"</p>"),e.closest(".postbox").after(n),setTimeout((function(){n.fadeOut(500,(function(){n.remove()}))}),3e3)}}))})),o()("#m2-connect-consent").on("change",(function(){var e=o()(this);t.prop("disabled",!e.is(":checked"))})),o()("#advads-overview").on("click",".notice-dismiss",(function(t){t.preventDefault();var e=o()(this).parent();e.fadeOut(500,(function(){e.remove()}))})),t.on("click",(function(n){n.preventDefault(),e.addClass("show"),o().ajax({type:"POST",url:ajaxurl,data:{action:"pubguru_connect",nonce:advadsglobal.ajax_nonce},dataType:"json"}).done((function(t){t.success&&(o()(".pubguru-not-connected").hide(),o()(".pubguru-connected").removeClass("hidden"),o()(".pg-tc-trail").toggle(!t.data.hasTrafficCop),o()(".pg-tc-install").toggle(t.data.hasTrafficCop))})).fail((function(e){var n=e.responseJSON,a=o()('<div class="notice notice-error is-dismissible" />');a.html("<p>"+n.data+'</p><button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span></button>'),t.closest(".postbox").after(a)})).complete((function(){return e.removeClass("show")}))})),a=o()("#pubguru-modules"),s=o()("#pubguru-notices"),a.on("input","input:checkbox",(function(){var t=o()(this),e=t.attr("name"),n=t.is(":checked");o().ajax({url:a.attr("action"),method:"POST",data:{action:"pubguru_module_change",security:a.data("security"),module:e,status:n}}).done((function(t){var e=t.data.notice,n=void 0===e?"":e;s.html(""),""!==n&&s.html(n)}))})),s.on("click",".js-btn-backup-adstxt",(function(){var t=o()(this);t.prop("disabled",!0),t.html(t.data("loading")),o().ajax({url:a.attr("action"),method:"POST",data:{action:"pubguru_backup_ads_txt",security:t.data("security")}}).done((function(e){e.success?(t.html(t.data("done")),setTimeout((function(){s.fadeOut("slow",(function(){s.html("")}))}),4e3)):t.html(t.data("text"))})).fail((function(){t.html(t.data("text"))}))}))}o()((function(){s()}))},576:()=>{}},n={};function a(t){var o=n[t];if(void 0!==o)return o.exports;var s=n[t]={exports:{}};return e[t](s,s.exports,a),s.exports}a.m=e,t=[],a.O=(e,n,o,s)=>{if(!n){var c=1/0;for(d=0;d<t.length;d++){for(var[n,o,s]=t[d],i=!0,r=0;r<n.length;r++)(!1&s||c>=s)&&Object.keys(a.O).every((t=>a.O[t](n[r])))?n.splice(r--,1):(i=!1,s<c&&(c=s));if(i){t.splice(d--,1);var u=o();void 0!==u&&(e=u)}}return e}s=s||0;for(var d=t.length;d>0&&t[d-1][2]>s;d--)t[d]=t[d-1];t[d]=[n,o,s]},a.n=t=>{var e=t&&t.__esModule?()=>t.default:()=>t;return a.d(e,{a:e}),e},a.d=(t,e)=>{for(var n in e)a.o(e,n)&&!a.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},a.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e),(()=>{var t={845:0,196:0};a.O.j=e=>0===t[e];var e=(e,n)=>{var o,s,[c,i,r]=n,u=0;if(c.some((e=>0!==t[e]))){for(o in i)a.o(i,o)&&(a.m[o]=i[o]);if(r)var d=r(a)}for(e&&e(n);u<c.length;u++)s=c[u],a.o(t,s)&&t[s]&&t[s][0](),t[s]=0;return a.O(d)},n=globalThis.webpackChunkadvanced_ads=globalThis.webpackChunkadvanced_ads||[];n.forEach(e.bind(null,0)),n.push=e.bind(null,n.push.bind(n))})(),a.O(void 0,[196],(()=>a(570)));var o=a.O(void 0,[196],(()=>a(576)));o=a.O(o)})();
+(()=>{"use strict";var e,t={612:(e,t,a)=>{const n=jQuery;var o=a.n(n);function s(e,t){var a=arguments.length>2&&void 0!==arguments[2]&&arguments[2],n=o()('<div class="notice notice-'.concat(t,' is-dismissible" />'));n.html("<p>"+e+'</p><button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span></button>'),o()("#pubguru-notices").append(n),a&&setTimeout((function(){n.fadeOut(500,(function(){n.remove()}))}),3e3)}function c(){var e,t,a,n,c,i,u,d,r,l;e=o()(".js-pubguru-connect"),t=o()(".js-pubguru-disconnect"),a=o()("#advads-m2-connect"),n=o()(".js-pubguru-connecting"),c=n.next(".aa-spinner"),i=o()(".pubguru-connected"),u=o()(".pubguru-not-connected"),e.on("click",".button",(function(e){e.preventDefault(),a.show()})),o()("#m2-connect-consent").on("change",(function(){var e=o()(this);n.prop("disabled",!e.is(":checked"))})),n.on("click",(function(a){a.preventDefault(),c.addClass("show"),o().ajax({type:"POST",url:ajaxurl,data:{action:"pubguru_connect",nonce:advadsglobal.ajax_nonce},dataType:"json"}).done((function(a){a.success&&(u.addClass("hidden"),e.addClass("hidden"),i.removeClass("hidden"),t.removeClass("hidden"),o()(".pg-tc-trail").toggle(!a.data.hasTrafficCop),o()(".pg-tc-install").toggle(a.data.hasTrafficCop),s(a.data.message,"success",!0))})).fail((function(e){s(e.responseJSON.data,"error")})).complete((function(){return c.removeClass("show")}))})),t.on("click",".button",(function(n){n.preventDefault(),a.hide(),u.removeClass("hidden"),e.removeClass("hidden"),i.addClass("hidden"),t.addClass("hidden"),o().ajax({type:"POST",url:ajaxurl,data:{action:"pubguru_disconnect",nonce:advadsglobal.ajax_nonce},dataType:"json"}).done((function(e){e.success&&s(e.data.message,"success",!0)}))})),d=o()("#pubguru-modules"),r=o()("#pubguru-notices"),l=o()("#pubguru-header-bidding-at-body").closest("div"),d.on("input","input:checkbox",(function(){var e=o()(this),t=e.attr("name"),a=e.is(":checked");"header_bidding"===t&&l.toggle(a),o().ajax({url:d.attr("action"),method:"POST",data:{action:"pubguru_module_change",security:d.data("security"),module:t,status:a}}).done((function(e){var t=e.data.notice,a=void 0===t?"":t;r.html(""),""!==a&&r.html(a)}))})),o()(document).on("click",".js-btn-backup-adstxt",(function(){var e=o()(this),t=e.closest(".notice");e.prop("disabled",!0),e.html(e.data("loading")),o().ajax({url:d.attr("action"),method:"POST",data:{action:"pubguru_backup_ads_txt",security:e.data("security")}}).always((function(){e.prop("disabled",!1),e.html(e.data("text"))})).done((function(e){if(e.success){var a=o()(e.data);r.html(a),t.after(a),t.remove(),setTimeout((function(){a.fadeOut("slow",(function(){a.html("")}))}),4e3)}else r.html(e.data),t.after(e.data)}))})),o()("#advads-overview").on("click",".notice-dismiss",(function(e){e.preventDefault();var t=o()(this).parent();t.fadeOut(500,(function(){t.remove()}))}))}o()((function(){c()}))},576:()=>{}},a={};function n(e){var o=a[e];if(void 0!==o)return o.exports;var s=a[e]={exports:{}};return t[e](s,s.exports,n),s.exports}n.m=t,e=[],n.O=(t,a,o,s)=>{if(!a){var c=1/0;for(r=0;r<e.length;r++){for(var[a,o,s]=e[r],i=!0,u=0;u<a.length;u++)(!1&s||c>=s)&&Object.keys(n.O).every((e=>n.O[e](a[u])))?a.splice(u--,1):(i=!1,s<c&&(c=s));if(i){e.splice(r--,1);var d=o();void 0!==d&&(t=d)}}return t}s=s||0;for(var r=e.length;r>0&&e[r-1][2]>s;r--)e[r]=e[r-1];e[r]=[a,o,s]},n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var a in t)n.o(t,a)&&!n.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:t[a]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={845:0,196:0};n.O.j=t=>0===e[t];var t=(t,a)=>{var o,s,[c,i,u]=a,d=0;if(c.some((t=>0!==e[t]))){for(o in i)n.o(i,o)&&(n.m[o]=i[o]);if(u)var r=u(n)}for(t&&t(a);d<c.length;d++)s=c[d],n.o(e,s)&&e[s]&&e[s][0](),e[s]=0;return n.O(r)},a=globalThis.webpackChunkadvanced_ads=globalThis.webpackChunkadvanced_ads||[];a.forEach(t.bind(null,0)),a.push=t.bind(null,a.push.bind(a))})(),n.O(void 0,[196],(()=>n(612)));var o=n.O(void 0,[196],(()=>n(576)));o=n.O(o)})();

advanced-ads/tags/1.54.0/assets/scss/ui/_switch.scss

@@ -10 +10 @@
 
         &:checked ~ div {
-            @apply after:translate-x-full after:border-white bg-primary;
+            @apply bg-primary after:left-auto after:right-[2px] after:border-white;
         }
 
@@ -19 +19 @@
 
     div {
-        @apply w-11 h-6 bg-gray-200 rounded-full;
+        @apply relative w-11 h-6 bg-gray-200 rounded-full border;
 
         &::after {

advanced-ads/tags/1.54.0/assets/src/modules/oneclick/connect-button.js

@@ -1 +1 @@
 import jQuery from 'jquery';
 
+function createNotice(message, type, fadeAway = false) {
+    const notice = jQuery(
+        `<div class="notice notice-${type} is-dismissible" />`
+    );
+    notice.html(
+        '<p>' +
+            message +
+            '</p>' +
+            '<button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span></button>'
+    );
+
+    jQuery('#pubguru-notices').append(notice);
+
+    if (fadeAway) {
+        setTimeout(() => {
+            notice.fadeOut(500, () => {
+                notice.remove();
+            });
+        }, 3000);
+    }
+}
+
 export default function () {
-    const pubguruConnectButton = jQuery('.js-pubguru-connect');
-    const spinner = pubguruConnectButton.next('.aa-spinner');
+    const connectWrap = jQuery('.js-pubguru-connect');
+    const disconnectWrap = jQuery('.js-pubguru-disconnect');
     const metabox = jQuery('#advads-m2-connect');
+    const connectButton = jQuery('.js-pubguru-connecting');
+    const spinner = connectButton.next('.aa-spinner');
+    const contentConnected = jQuery('.pubguru-connected');
+    const contentNotConnected = jQuery('.pubguru-not-connected');
 
-    jQuery('.js-m2-show-consent').on('click', '.button', function (event) {
+    // Show consent box.
+    connectWrap.on('click', '.button', function (event) {
         event.preventDefault();
-
-        const tr = jQuery(this).closest('tr');
-
         metabox.show();
-        tr.addClass('hidden');
-        tr.next().removeClass('hidden');
-    });
-
-    jQuery('.js-pubguru-disconnect').on('click', '.button', function (event) {
-        event.preventDefault();
-
-        const tr = jQuery(this).closest('tr');
-
-        metabox.hide();
-        tr.addClass('hidden');
-        tr.prev().removeClass('hidden');
-
-        jQuery
-            .ajax({
-                type: 'POST',
-                url: ajaxurl,
-                data: {
-                    action: 'pubguru_disconnect',
-                    nonce: advadsglobal.ajax_nonce,
-                },
-                dataType: 'json',
-            })
-            .done(function (response) {
-                if (!response.success) {
-                    return;
-                }
-
-                const notice = jQuery('<div class="notice notice-success" />');
-                notice.html('<p>' + response.data.message + '</p>');
-
-                tr.closest('.postbox').after(notice);
-                setTimeout(function () {
-                    notice.fadeOut(500, function () {
-                        notice.remove();
-                    });
-                }, 3000);
-            });
     });
 
     jQuery('#m2-connect-consent').on('change', function () {
         const checkbox = jQuery(this);
-        pubguruConnectButton.prop('disabled', !checkbox.is(':checked'));
+        connectButton.prop('disabled', !checkbox.is(':checked'));
     });
 
-    jQuery('#advads-overview').on('click', '.notice-dismiss', function (event) {
-        event.preventDefault();
-        const button = jQuery(this);
-        const notice = button.parent();
-        notice.fadeOut(500, function () {
-            notice.remove();
-        });
-    });
-
-    pubguruConnectButton.on('click', function (event) {
+    connectButton.on('click', function (event) {
         event.preventDefault();
 
@@ -85 +62 @@
                 }
 
-                jQuery('.pubguru-not-connected').hide();
-                jQuery('.pubguru-connected').removeClass('hidden');
+                contentNotConnected.addClass('hidden');
+                connectWrap.addClass('hidden');
+                contentConnected.removeClass('hidden');
+                disconnectWrap.removeClass('hidden');
 
                 jQuery('.pg-tc-trail').toggle(!response.data.hasTrafficCop);
                 jQuery('.pg-tc-install').toggle(response.data.hasTrafficCop);
+                createNotice(response.data.message, 'success');
             })
             .fail(function (jqXHR) {
                 const response = jqXHR.responseJSON;
-                const notice = jQuery(
-                    '<div class="notice notice-error is-dismissible" />'
-                );
-                notice.html(
-                    '<p>' +
-                        response.data +
-                        '</p>' +
-                        '<button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span></button>'
-                );
-
-                pubguruConnectButton.closest('.postbox').after(notice);
+                createNotice(response.data, 'error');
             })
             .complete(() => spinner.removeClass('show'));
     });
+
+    disconnectWrap.on('click', '.button', function (event) {
+        event.preventDefault();
+
+        metabox.hide();
+        contentNotConnected.removeClass('hidden');
+        connectWrap.removeClass('hidden');
+        contentConnected.addClass('hidden');
+        disconnectWrap.addClass('hidden');
+
+        jQuery
+            .ajax({
+                type: 'POST',
+                url: ajaxurl,
+                data: {
+                    action: 'pubguru_disconnect',
+                    nonce: advadsglobal.ajax_nonce,
+                },
+                dataType: 'json',
+            })
+            .done(function (response) {
+                if (!response.success) {
+                    return;
+                }
+
+                createNotice(response.data.message, 'success', true);
+            });
+    });
 }

advanced-ads/tags/1.54.0/assets/src/modules/oneclick/index.js

@@ +1 @@
+import jQuery from 'jquery';
+
 import connectButton from './connect-button';
-import settingsUi from './settings';
+import connectSettings from './connect-settings';
 
 export default function () {
     connectButton();
-    settingsUi();
+    connectSettings();
+
+    jQuery('#advads-overview').on('click', '.notice-dismiss', function (event) {
+        event.preventDefault();
+        const button = jQuery(this);
+        const notice = button.parent();
+        notice.fadeOut(500, function () {
+            notice.remove();
+        });
+    });
 }

advanced-ads/tags/1.54.0/classes/ad-debug.php

@@ -247 +247 @@
             $content = '';
             foreach ( $_condition as $_k => $_v ) {
-                $content .= esc_html( $_k ) . ': ' . esc_html( $_v ) . '<br>';
+                $content .= esc_html( $_k ) . ': ';
+                if ( is_array( $_v ) ) {
+                    $content .= esc_html( implode( ', ', $_v ) );
+                } else {
+                    $content .= esc_html( $_v );
+                }
+                $content .= '<br />';
             }
 

advanced-ads/tags/1.54.0/classes/ad_group.php

@@ -376 +376 @@
             'orderby'        => 'id', // Might want to avoid sorting as not needed for most calls and fast in PHP; slight I/O blocking concern.
         ];
+
+        if ( ! empty( $this->ad_args['post_status'] ) ) {
+            $args['post_status'] = array_unique( array_merge( (array) $args['post_status'], (array) $this->ad_args['post_status'] ) );
+        }
 
         $ads = new WP_Query( $args );

advanced-ads/tags/1.54.0/classes/frontend_checks.php

@@ -2 +2 @@
 // phpcs:ignoreFile
 
-use AdvancedAds\Assets_Registry;
 use AdvancedAds\Utilities\WordPress;
 
@@ -53 +52 @@
 
         if( $this->has_adblocker_placements() ) {
-            if ( ! Assets_Registry::script_is('find-adblocker', 'enqueued') ) {
-                Assets_Registry::enqueue_script('find-adblocker');
+            if ( ! wp_advads()->registry->is_script('find-adblocker', 'enqueued') ) {
+                wp_advads()->registry->enqueue_script('find-adblocker');
             }
         }

advanced-ads/tags/1.54.0/classes/in-content-injector.php

@@ -1 @@
-<?php
+<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
 
 use AdvancedAds\Utilities\WordPress;
@@ -80 +80 @@
         }
 
-        // handle tags that are empty by definition or could be empty ("custom" option)
+        // Handle tags that are empty by definition or could be empty ("custom" option).
         if ( in_array( $tag_option, [ 'img', 'iframe', 'custom' ], true ) ) {
             $defaults['allowEmpty'] = true;
@@ -116 +116 @@
         switch ( $tag_option ) {
             case 'p':
-                // exclude paragraphs within blockquote tags
+                // Exclude paragraphs within blockquote tags.
                 $tag = 'p[not(parent::blockquote)]';
                 break;
             case 'pwithoutimg':
-                // convert option name into correct path, exclude paragraphs within blockquote tags
+                // Convert option name into correct path, exclude paragraphs within blockquote tags.
                 $tag = 'p[not(descendant::img) and not(parent::blockquote)]';
                 break;
@@ -133 +133 @@
                         contains(concat(' ', normalize-space(@class), ' '), ' gallery-size') or
                         contains(concat(' ', normalize-space(@class), ' '), ' wp-caption ') )";
-                $tag = "*[self::img or self::figure or self::div[$shortcodes]]
+                $tag        = "*[self::img or self::figure or self::div[$shortcodes]]
                     [not(ancestor::table or ancestor::figure or ancestor::div[$shortcodes])]";
                 break;
-            // any headline. By default h2, h3, and h4
+            // Any headline. By default h2, h3, and h4.
             case 'headlines':
                 $headlines = apply_filters( 'advanced-ads-headlines-for-ad-injection', [ 'h2', 'h3', 'h4' ] );
@@ -145 +145 @@
                 $tag = '*[' . implode( ' or ', $headlines ) . ']'; // /html/body/*[self::h2 or self::h3 or self::h4]
                 break;
-            // any HTML element that makes sense in the content
+            // Any HTML element that makes sense in the content.
             case 'anyelement':
                 $exclude = [
@@ -186 +186 @@
                 break;
             case 'custom':
-                // get the path for the "custom" tag choice, use p as a fallback to prevent it from showing any ads if users left it empty
+                // Get the path for the "custom" tag choice, use p as a fallback to prevent it from showing any ads if users left it empty.
                 $tag = ! empty( $placement_opts['xpath'] ) ? stripslashes( $placement_opts['xpath'] ) : 'p';
                 break;
@@ -194 +194 @@
         $xpath = new DOMXPath( $dom );
 
-
-        if ( $options['itemLimit'] !== -1 ) {
+        if ( -1 !== $options['itemLimit'] ) {
             $items = $xpath->query( '/html/body/' . $tag );
 
@@ -254 +253 @@
                     }
 
-                    // make sure that the ad is injected outside the link
+                    // Make sure that the ad is injected outside the link.
                     if ( 'img' === $tag_option && 'a' === $node->parentNode->tagName ) {
                         if ( $options['before'] ) {
                             $node->parentNode;
                         } else {
-                            // go one level deeper if inserted after to not insert the ad into the link; probably after the paragraph
+                            // Go one level deeper if inserted after to not insert the ad into the link; probably after the paragraph.
                             $node->parentNode->parentNode;
                         }
@@ -274 +273 @@
                 $ad_content = self::filter_ad_content( $ad_content, $node->tagName, $options );
 
-                // convert HTML to XML!
-                $ad_dom = new DOMDocument( '1.0', $wp_charset );
+                // Convert HTML to XML!.
+                $ad_dom                     = new DOMDocument( '1.0', $wp_charset );
                 $libxml_use_internal_errors = libxml_use_internal_errors( true );
                 $ad_dom->loadHtml( '<!DOCTYPE html><html><meta http-equiv="Content-Type" content="text/html; charset=' . $wp_charset . '" /><body>' . $ad_content );
@@ -314 +313 @@
                             }
                         } else {
-                            // append to body; -TODO using here that we only select direct children of the body tag.
+                            // Append to body; -TODO using here that we only select direct children of the body tag.
                             foreach ( $ad_dom->getElementsByTagName( 'body' )->item( 0 )->childNodes as $importedNode ) {
                                 $importedNode = $dom->importNode( $importedNode, true );
@@ -341 +340 @@
              * * but there are enough elements on the site, but just in sub-containers
              */
-        } elseif ( WordPress::user_can( 'advanced_ads_manage_options' )
-                && $options['itemLimit'] !== -1
-                && empty( $plugin_options['content-injection-level-disabled'] ) ) {
+        } elseif (
+            WordPress::user_can( 'advanced_ads_manage_options' ) &&
+            -1 !== $options['itemLimit'] &&
+            empty( $plugin_options['content-injection-level-disabled'] )
+        ) {
 
             // Check if there are more elements without limitation.
@@ -363 +364 @@
 
         // phpcs:enable
-
         return $content;
     }
@@ -473 +473 @@
         // Add tags before/after which ad placehoders were injected.
         foreach ( $ads_for_placeholders as $ad_content ) {
-            $tag = $ad_content['tag'];
+            $alts = [];
+            $tag  = $ad_content['tag'];
 
             switch ( $ad_content['position'] ) {
@@ -492 +493 @@
             }
         }
+
         $alts       = array_unique( $alts );
         $tag_regexp = implode( '|', $alts );
@@ -527 +529 @@
                 }
             } else {
-                $count ++;
+                ++$count;
             }
         }
@@ -749 +751 @@
         return '//*[' . implode( ' or ', $query ) . ']';
     }
-
 }

advanced-ads/tags/1.54.0/classes/plugin.php

@@ -90 +90 @@
      */
     public function wp_plugins_loaded() {
-        // Load plugin text domain.
-        $this->load_plugin_textdomain();
-
         // Load public-facing style sheet and JavaScript.
         add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
@@ -267 +264 @@
 
     /**
-     * Load the plugin text domain for translation.
-     */
-    public function load_plugin_textdomain() {
-        load_plugin_textdomain( 'advanced-ads', false, ADVADS_BASE_DIR . '/languages' );
-    }
-
-    /**
      * Shortcode to include ad in frontend
      *

advanced-ads/tags/1.54.0/includes/admin/class-assets.php

@@ -10 +10 @@
 namespace AdvancedAds\Admin;
 
+use AdvancedAds\Entities;
 use Advanced_Ads_AdSense_Admin;
 use Advanced_Ads_Display_Conditions;
-use AdvancedAds\Assets_Registry;
-use AdvancedAds\Entities;
-use AdvancedAds\Utilities\Data;
 use AdvancedAds\Utilities\Conditional;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
@@ -43 +41 @@
         $screen = get_current_screen();
 
-        Assets_Registry::enqueue_style( 'ui' );
-        Assets_Registry::enqueue_style( 'admin' );
+        wp_advads()->registry->enqueue_style( 'ui' );
+        wp_advads()->registry->enqueue_style( 'admin' );
 
         if ( 'post' === $screen->base && Entities::POST_TYPE_AD === $screen->post_type ) {
-            Assets_Registry::enqueue_style( 'ad-positioning' );
+            wp_advads()->registry->enqueue_style( 'ad-positioning' );
         }
     }
@@ -63 +61 @@
 
         // TODO: add conditional loading.
-        Assets_Registry::enqueue_script( 'admin-global' );
-        Assets_Registry::enqueue_script( 'find-adblocker' );
+        wp_advads()->registry->enqueue_script( 'admin-global' );
+        wp_advads()->registry->enqueue_script( 'find-adblocker' );
 
         $params = [
@@ -77 +75 @@
 
         if ( Conditional::is_screen_advanced_ads() ) {
-            Assets_Registry::enqueue_script( 'admin' );
-            Assets_Registry::enqueue_script( 'conditions' );
-            Assets_Registry::enqueue_script( 'wizard' );
+            wp_advads()->registry->enqueue_script( 'admin' );
+            wp_advads()->registry->enqueue_script( 'conditions' );
+            wp_advads()->registry->enqueue_script( 'wizard' );
 
             $translation_array = [
@@ -118 +116 @@
         // Ad edit screen.
         if ( 'post' === $screen->base && Entities::POST_TYPE_AD === $screen->post_type ) {
-            Assets_Registry::enqueue_script( 'ad-positioning' );
+            wp_advads()->registry->enqueue_script( 'ad-positioning' );
         }
 
         if ( in_array( $screen->id, [ 'edit-post', 'edit-page' ], true ) && current_user_can( 'edit_posts' ) ) {
-            Assets_Registry::enqueue_script( 'page-quick-edit' );
+            wp_advads()->registry->enqueue_script( 'page-quick-edit' );
             wp_advads()->json->add( 'page_quick_edit', [ 'nonce' => wp_create_nonce( 'advads-post-quick-edit' ) ] );
         }

advanced-ads/tags/1.54.0/includes/class-assets-registry.php

@@ -10 +10 @@
 namespace AdvancedAds;
 
-use AdvancedAds\Framework\Interfaces\Integration_Interface;
-
 defined( 'ABSPATH' ) || exit;
 
@@ -17 +15 @@
  * Assets Registry.
  */
-class Assets_Registry implements Integration_Interface {
+class Assets_Registry extends \AdvancedAds\Framework\Assets_Registry {
 
     /**
-     * Enqueue stylesheet
+     * Version for plugin local assets.
      *
-     * @param string $handle Name of the stylesheet.
-     *
-     * @return void
+     * @return string
      */
-    public static function enqueue_style( $handle ): void {
-        wp_enqueue_style( self::prefix_it( $handle ) );
+    public function get_version(): string {
+        return ADVADS_VERSION;
     }
 
     /**
-     * Enqueue script
+     * Prefix to use in handle to make it unique.
      *
-     * @param string $handle Name of the script.
-     *
-     * @return void
+     * @return string
      */
-    public static function enqueue_script( $handle ): void {
-        wp_enqueue_script( self::prefix_it( $handle ) );
+    public function get_prefix(): string {
+        return ADVADS_SLUG;
     }
 
     /**
-     * Prefix the handle
-     *
-     * @param string $handle Name of the asset.
+     * Base URL for plugin local assets.
      *
      * @return string
      */
-    public static function prefix_it( $handle ): string {
-        return ADVADS_SLUG . '-' . $handle;
-    }
-
-    /**
-     * Determines whether a script has been added to the queue.
-     *
-     * @param string $handle Name of the script.
-     * @param string $status Optional. Status of the script to check. Default 'enqueued'.
-     *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
-     *
-     * @return bool
-     */
-    public static function script_is( $handle, $status = 'enqueued' ): bool {
-        return wp_script_is( self::prefix_it( $handle ), $status );
-    }
-
-    /**
-     * Hook into WordPress.
-     *
-     * @return void
-     */
-    public function hooks(): void {
-        add_action( 'admin_enqueue_scripts', [ $this, 'register_assets' ], 0 );
-        add_action( 'wp_enqueue_scripts', [ $this, 'register_assets' ], 0 );
-    }
-
-    /**
-     * Register assets
-     *
-     * @return void
-     */
-    public function register_assets(): void {
-        $this->register_styles();
-        $this->register_scripts();
+    public function get_base_url(): string {
+        return ADVADS_BASE_URL;
     }
 
@@ -94 +53 @@
             return;
         }
+
         $this->register_style( 'ui', 'admin/assets/css/ui.css' );
         $this->register_style( 'admin', 'admin/assets/css/admin.css' );
@@ -99 +59 @@
             $this->register_style( 'app', 'assets/css/app.css' );
         }
-        $this->register_style( 'ad-positioning', 'modules/ad-positioning/assets/css/ad-positioning.css', [ self::prefix_it( 'admin' ) ] );
+        $this->register_style( 'ad-positioning', 'modules/ad-positioning/assets/css/ad-positioning.css', [ $this->prefix_it( 'admin' ) ] );
     }
 
@@ -111 +71 @@
         $this->register_script( 'wp-widget-adsense', 'modules/gadsense/admin/assets/js/wp-widget.js', [ 'jquery' ], false, true );
         $this->register_script( 'app', 'assets/js/app.js', [ 'jquery' ], false, true );
+        $this->register_script( 'find-adblocker', 'admin/assets/js/advertisement.js' );
 
         if ( ! is_admin() ) {
@@ -117 +78 @@
 
         // Backend JS files go here.
-        $this->register_script( 'find-adblocker', 'admin/assets/js/advertisement.js' );
-        $this->register_script( 'conditions', 'admin/assets/js/conditions.js', [ 'jquery', self::prefix_it( 'ui' ) ] );
+        $this->register_script( 'conditions', 'admin/assets/js/conditions.js', [ 'jquery', $this->prefix_it( 'ui' ) ] );
         $this->register_script( 'wizard', 'admin/assets/js/wizard.js', [ 'jquery' ] );
         $this->register_script( 'inline-edit-group-ads', 'admin/assets/js/inline-edit-group-ads.js', [ 'jquery' ] );
-        $this->register_script( 'admin', 'admin/assets/js/admin.min.js', [ 'jquery', self::prefix_it( 'ui' ), 'jquery-ui-autocomplete', 'wp-util' ] );
+        $this->register_script( 'admin', 'admin/assets/js/admin.min.js', [ 'jquery', $this->prefix_it( 'ui' ), 'jquery-ui-autocomplete', 'wp-util' ] );
         $this->register_script( 'ui', 'admin/assets/js/ui.js', [ 'jquery' ] );
         $this->register_script( 'admin-global', 'admin/assets/js/admin-global.js', [ 'jquery' ], false, true );
         $this->register_script( 'page-quick-edit', 'assets/js/admin/page-quick-edit.js', [], false, true );
     }
-
-    /**
-     * Register stylesheet
-     *
-     * @param string           $handle Name of the stylesheet. Should be unique.
-     * @param string|bool      $src    URL of the stylesheet.
-     * @param string[]         $deps   Optional. An array of registered stylesheet handles this stylesheet depends on.
-     * @param string|bool|null $ver    Optional. String specifying stylesheet version number.
-     * @param string           $media  Optional. The media for which this stylesheet has been defined.
-     *
-     * @return void
-     */
-    private function register_style( $handle, $src, $deps = [], $ver = false, $media = 'all' ) {
-        if ( false === $ver ) {
-            $ver = ADVADS_VERSION;
-        }
-
-        wp_register_style( self::prefix_it( $handle ), ADVADS_BASE_URL . $src, $deps, $ver, $media );
-    }
-
-    /**
-     * Register script
-     *
-     * @param string           $handle    Name of the stylesheet. Should be unique.
-     * @param string|bool      $src       URL of the stylesheet.
-     * @param string[]         $deps      Optional. An array of registered stylesheet handles this stylesheet depends on.
-     * @param string|bool|null $ver       Optional. String specifying stylesheet version number.
-     * @param bool             $in_footer Optional. The media for which this stylesheet has been defined.
-     *
-     * @return void
-     */
-    private function register_script( $handle, $src, $deps = [], $ver = false, $in_footer = false ) {
-        if ( false === $ver ) {
-            $ver = ADVADS_VERSION;
-        }
-
-        $new_src = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? $src : str_replace( '.js', '.min.js', $src );
-        wp_register_script( self::prefix_it( $handle ), ADVADS_BASE_URL . $src, $deps, $ver, $in_footer );
-    }
 }

advanced-ads/tags/1.54.0/includes/class-autoloader.php

@@ -51 +51 @@
 
     /**
+     * Get plugin directory.
+     *
+     * @return string
+     */
+    public function get_directory(): string {
+        return dirname( ADVADS_FILE );
+    }
+
+    /**
      * Runs this initializer.
      *
@@ -63 +72 @@
         }
 
-        $this->autoloader = require_once $locate;
+        $this->autoloader = require $locate;
         $this->register_wordpress();
     }
@@ -75 +84 @@
      */
     private function locate() {
-        $directory   = dirname( ADVADS_FILE );
-        $packages    = $directory . '/packages/autoload.php';
-        $vendors     = $directory . '/vendor/autoload.php';
-        $is_debug    = 'local' === ( function_exists( 'wp_get_environment_type' ) ? wp_get_environment_type() : $this->get_environment_type() );
-        $is_packages = is_readable( $packages );
-        $is_vendors  = is_readable( $vendors );
-
-        if ( $is_packages && ( ! $is_debug || ! $is_vendors ) ) {
+        $directory = $this->get_directory();
+        $packages  = $directory . '/packages/autoload.php';
+        $vendors   = $directory . '/vendor/autoload.php';
+        $is_debug  = $this->is_debug() || 'local' === $this->get_environment_type();
+
+        if ( is_readable( $packages ) && ( ! $is_debug || ! is_readable( $vendors ) ) ) {
             return $packages;
         }
 
-        if ( $is_vendors ) {
+        if ( is_readable( $vendors ) ) {
             return $vendors;
         }
@@ -135 +142 @@
      */
     public function get_environment_type(): string {
+        return function_exists( 'wp_get_environment_type' )
+            ? wp_get_environment_type()
+            : $this->get_environment_type_fallback();
+    }
+
+    /**
+     * Retrieves the current environment type.
+     *
+     * @return string
+     */
+    private function get_environment_type_fallback(): string {
         static $current_env = '';
 
@@ -184 +202 @@
         return $current_env;
     }
+
+    /**
+     * Is WordPress debug mode enabled
+     *
+     * @return bool
+     */
+    private function is_debug(): bool {
+        return defined( 'WP_DEBUG' ) && WP_DEBUG;
+    }
 }

advanced-ads/tags/1.54.0/includes/class-plugin.php

@@ -11 +11 @@
 
 use AdvancedAds\Admin;
-use AdvancedAds\Groups;
 use AdvancedAds\Framework;
 use AdvancedAds\Framework\Loader;
@@ -20 +19 @@
 /**
  * Plugin.
+ *
+ * Containers:
+ *
+ * @property Shortcodes           $shortcodes Shortcodes handler.
+ * @property Assets_Registry      $registry   Assets registry.
+ * @property Framework\JSON       $json       JSON handler.
+ * @property Admin\Admin_Menu     $screens    Admin screens.
+ * @property Frontend\Ad_Renderer $renderer   Ads renderer.
+ * @property Frontend\Manager     $frontend   Frontend manager.
  */
 class Plugin extends Loader {
@@ -57 +65 @@
     private function setup(): void {
         $this->define_constants();
+        $this->includes_functions();
         $this->includes();
+        $this->includes_admin();
 
         /**
@@ -64 +74 @@
          * TODO: need to remove it in future.
          */
-
-        // Load public functions (might be used by modules, other plugins or theme).
-        require_once ADVADS_ABSPATH . 'includes/functions.php';
-        require_once ADVADS_ABSPATH . 'includes/cap_map.php';
-
         // Public-Facing and Core Functionality.
         \Advanced_Ads::get_instance();
@@ -78 +83 @@
         }
 
+        add_action( 'init', [ $this, 'load_textdomain' ] );
         add_action( 'plugins_loaded', [ $this, 'on_plugins_loaded' ], -1 );
+
+        // Load it all.
         $this->load();
     }
@@ -96 +104 @@
          */
         do_action( 'advanced-ads-loaded' );
+    }
+
+    /**
+     * Load the plugin text domain for translation.
+     *
+     * @return void
+     */
+    public function load_textdomain(): void {
+        $locale = get_user_locale();
+        $locale = apply_filters( 'plugin_locale', $locale, 'advanced-ads' );
+
+        unload_textdomain( 'advanced-ads' );
+        if ( false === load_textdomain( 'advanced-ads', WP_LANG_DIR . '/plugins/advanced-ads-' . $locale . '.mo' ) ) {
+            load_textdomain( 'advanced-ads', WP_LANG_DIR . '/advanced-ads/advanced-ads-' . $locale . '.mo' );
+        }
+
+        load_plugin_textdomain( 'advanced-ads', false, dirname( ADVADS_PLUGIN_BASENAME ) . '/languages' );
     }
 
@@ -145 +170 @@
      */
     private function includes(): void {
+        // Common.
         $this->register_initializer( Install::class );
         $this->register_integration( Entities::class );
-        $this->register_integration( Assets_Registry::class );
+        $this->register_integration( Assets_Registry::class, 'registry' );
         $this->register_integration( Framework\JSON::class, 'json', [ 'advancedAds' ] );
         $this->register_integration( Groups\Manager::class, 'group_manager' );
-
-        // Only in admin area.
-        if ( is_admin() ) {
-            $this->register_integration( Admin\Action_Links::class );
-            $this->register_integration( Admin\Assets::class );
-            $this->register_integration( Admin\Header::class );
-            $this->register_integration( Admin\TinyMCE::class );
-            $this->register_integration( Admin\Admin_Menu::class );
-            $this->register_integration( Admin\Page_Quick_Edit::class );
-        }
+    }
+
+    /**
+     * Includes files used in admin.
+     *
+     * @return void
+     */
+    private function includes_admin(): void {
+        // Early bail!!
+        if ( ! is_admin() ) {
+            return;
+        }
+
+        $this->register_integration( Admin\Action_Links::class );
+        $this->register_integration( Admin\Assets::class );
+        $this->register_integration( Admin\Header::class );
+        $this->register_integration( Admin\TinyMCE::class );
+        $this->register_integration( Admin\Admin_Menu::class );
+        $this->register_integration( Admin\Page_Quick_Edit::class );
+    }
+
+    /**
+     * Includes the necessary functions files.
+     *
+     * @return void
+     */
+    private function includes_functions(): void {
+        require_once ADVADS_ABSPATH . 'includes/functions.php';
+        require_once ADVADS_ABSPATH . 'includes/cap_map.php';
     }
 }

advanced-ads/tags/1.54.0/languages/advanced-ads.pot

@@ -1 @@
-# Copyright (C) 2024 Advanced Ads GmbH
+# Copyright (C) 2024 Advanced Ads
 # This file is distributed under the GPL-2.0+.
 msgid ""
 msgstr ""
-"Project-Id-Version: Advanced Ads 1.53.1\n"
+"Project-Id-Version: Advanced Ads 1.53.2\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/advanced-ads/\n"
 "Last-Translator: Thomas Maier <[email protected]>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-08-13T12:34:04+00:00\n"
+"POT-Creation-Date: 2024-09-02T11:05:48+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.6.0\n"
@@ -16 +16 @@
 
 #. Plugin Name of the plugin
-#: admin/includes/class-meta-box.php:565
+#. Author of the plugin
+#: admin/includes/class-meta-box.php:564
 #: modules/gutenberg/includes/class-gutenberg.php:136
 msgid "Advanced Ads"
@@ -28 +29 @@
 #. Description of the plugin
 msgid "Manage and optimize your ads in WordPress"
-msgstr ""
-
-#. Author of the plugin
-msgid "Advanced Ads GmbH"
 msgstr ""
 
@@ -86 +83 @@
 #. translators: %s is empty here, but the string will be followed by a name of an ad unit.
 #: admin/includes/ad-health-notices.php:112
-#: classes/frontend_checks.php:280
+#: classes/frontend_checks.php:279
 msgid "Visible ads should not use the Header placement: %s"
 msgstr ""
 
 #: admin/includes/ad-health-notices.php:123
-#: classes/ad-debug.php:272
-#: classes/frontend_checks.php:267
+#: classes/ad-debug.php:278
+#: classes/frontend_checks.php:266
 msgid "Your website is using HTTPS, but the ad code contains HTTP and might not work."
 msgstr ""
@@ -295 +292 @@
 
 #: admin/includes/class-ad-type.php:953
-#: classes/frontend_checks.php:547
+#: classes/frontend_checks.php:546
 msgid "Get help"
 msgstr ""
@@ -439 +436 @@
 msgstr ""
 
-#: admin/includes/class-meta-box.php:50
+#: admin/includes/class-meta-box.php:49
 #: admin/includes/class-overview-widgets.php:68
 msgid "AdSense Earnings"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:101
+#: admin/includes/class-meta-box.php:100
 msgid "Ad Type"
 msgstr ""
 
 #. translators: 1: Name of ad unit
-#: admin/includes/class-meta-box.php:119
+#: admin/includes/class-meta-box.php:118
 msgid "Earnings of  %1$s"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:137
+#: admin/includes/class-meta-box.php:136
 #: includes/admin/class-groups-list-table.php:451
 #: views/admin/screens/placements.php:351
@@ -459 +456 @@
 msgstr ""
 
-#: admin/includes/class-meta-box.php:146
+#: admin/includes/class-meta-box.php:145
 msgid "Ad Parameters"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:154
+#: admin/includes/class-meta-box.php:153
 #: admin/includes/class-settings.php:73
 msgid "Layout / Output"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:162
+#: admin/includes/class-meta-box.php:161
 msgid "Targeting"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:171
+#: admin/includes/class-meta-box.php:170
 msgid "Increase your ad revenue"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:181
+#: admin/includes/class-meta-box.php:180
 msgid "Statistics"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:252
-#: admin/includes/class-meta-box.php:266
+#: admin/includes/class-meta-box.php:251
+#: admin/includes/class-meta-box.php:265
 #: admin/includes/class-overview-widgets.php:181
 #: admin/views/ad-main-metabox.php:29
@@ -502 +499 @@
 msgstr ""
 
+#: admin/includes/class-meta-box.php:269
+msgid "Video"
+msgstr ""
+
 #: admin/includes/class-meta-box.php:270
-msgid "Video"
-msgstr ""
-
-#: admin/includes/class-meta-box.php:271
 #: admin/views/conditions/ad-targeting-metabox.php:18
 #: classes/ad-debug.php:152
@@ -514 +511 @@
 msgstr ""
 
-#: admin/includes/class-meta-box.php:272
+#: admin/includes/class-meta-box.php:271
 #: admin/views/conditions/ad-targeting-metabox.php:37
 #: classes/ad-debug.php:239
@@ -522 +519 @@
 msgstr ""
 
-#: admin/includes/class-meta-box.php:304
+#: admin/includes/class-meta-box.php:303
 #: admin/includes/class-overview-widgets.php:64
 #: views/admin/page-bulk-edit.php:20
@@ -529 +526 @@
 msgstr ""
 
-#: admin/includes/class-meta-box.php:466
+#: admin/includes/class-meta-box.php:465
 msgid "Ad Settings"
 msgstr ""
 
 #. translators: %1$d is the number of ads, %2$s and %3$s are URLs.
-#: admin/includes/class-meta-box.php:581
+#: admin/includes/class-meta-box.php:580
 msgid "%1$d ads – <a href=\"%2$s\">manage</a> - <a href=\"%3$s\">new</a>"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:594
+#: admin/includes/class-meta-box.php:593
 msgid "Get the tutorial via email"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:603
+#: admin/includes/class-meta-box.php:602
 msgid "Get AdSense tips via email"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:612
+#: admin/includes/class-meta-box.php:611
 msgid "Visit our blog for more articles about ad optimization"
 msgstr ""
 
 #. translators: %s is our URL.
-#: admin/includes/class-meta-box.php:667
+#: admin/includes/class-meta-box.php:666
 msgid "Latest posts on wpadvancedads.com"
 msgstr ""
@@ -585 +582 @@
 #: admin/views/notices/welcome-panel.php:15
 #: admin/views/placements-item.php:68
-#: includes/admin/class-assets.php:71
+#: includes/admin/class-assets.php:69
 #: views/admin/tables/groups/list-row-loop-none.php:17
 #: views/admin/tables/groups/list-row-option-ads.php:61
@@ -744 +741 @@
 #: admin/includes/class-overview-widgets.php:627
 #: admin/includes/class-overview-widgets.php:645
-#: classes/ad_group.php:650
+#: classes/ad_group.php:654
 msgid "Activate now"
 msgstr ""
@@ -778 +775 @@
 
 #: admin/includes/class-overview-widgets.php:733
-#: classes/ad_group.php:653
+#: classes/ad_group.php:657
 msgid "Get this add-on"
 msgstr ""
@@ -823 +820 @@
 
 #: admin/includes/class-settings.php:178
-#: classes/in-content-injector.php:609
+#: classes/in-content-injector.php:611
 msgid "Disable level limitation"
 msgstr ""
@@ -1703 +1700 @@
 
 #: admin/views/settings/general/block-bots.php:11
-#: classes/frontend_checks.php:138
+#: classes/frontend_checks.php:137
 msgid "You look like a bot"
 msgstr ""
@@ -2078 +2075 @@
 
 #. translators: %1$s is an URL, %2$s is a URL text
-#: classes/ad_group.php:659
+#: classes/ad_group.php:663
 msgid "It seems that a caching plugin is activated. Your ads might not rotate properly. The cache busting in Advanced Ads Pro will solve that. <a href=\"%1$s\" target=\"_blank\">%2$s.</a>"
 msgstr ""
@@ -2384 +2381 @@
 #: classes/display-conditions.php:318
 #: classes/visitor-conditions.php:317
-#: includes/admin/class-assets.php:84
+#: includes/admin/class-assets.php:82
 #: modules/gadsense/admin/views/external-ads-links.php:17
 #: modules/gadsense/admin/views/external-ads-links.php:22
@@ -2393 +2390 @@
 #: classes/display-conditions.php:318
 #: classes/visitor-conditions.php:317
-#: includes/admin/class-assets.php:85
+#: includes/admin/class-assets.php:83
 msgid "and"
 msgstr ""
@@ -2564 +2561 @@
 msgstr ""
 
-#: classes/frontend_checks.php:123
+#: classes/frontend_checks.php:122
 msgid "Random AdSense ads"
 msgstr ""
 
-#: classes/frontend_checks.php:152
+#: classes/frontend_checks.php:151
 msgid "Ad blocker enabled"
 msgstr ""
 
-#: classes/frontend_checks.php:164
+#: classes/frontend_checks.php:163
 msgid "<em>%s</em> filter does not exist"
 msgstr ""
 
-#: classes/frontend_checks.php:180
+#: classes/frontend_checks.php:179
 msgid "Ads are disabled in the content of this page"
 msgstr ""
 
-#: classes/frontend_checks.php:192
+#: classes/frontend_checks.php:191
 msgid "the current post ID is 0 "
 msgstr ""
 
-#: classes/frontend_checks.php:211
+#: classes/frontend_checks.php:210
 msgid "Ads are disabled on this page"
 msgstr ""
 
-#: classes/frontend_checks.php:225
+#: classes/frontend_checks.php:224
 msgid "Ads are disabled on all pages"
 msgstr ""
 
-#: classes/frontend_checks.php:240
+#: classes/frontend_checks.php:239
 msgid "Ads are disabled on 404 pages"
 msgstr ""
 
-#: classes/frontend_checks.php:254
+#: classes/frontend_checks.php:253
 msgid "Ads are disabled on non singular pages"
 msgstr ""
 
-#: classes/frontend_checks.php:268
+#: classes/frontend_checks.php:267
 msgid "Ad IDs: %s"
 msgstr ""
 
+#: classes/frontend_checks.php:295
+msgid "AdSense violation"
+msgstr ""
+
 #: classes/frontend_checks.php:296
-msgid "AdSense violation"
+msgid "Ad is hidden"
 msgstr ""
 
 #: classes/frontend_checks.php:297
-msgid "Ad is hidden"
-msgstr ""
-
-#: classes/frontend_checks.php:298
 msgid "IDs: %s"
 msgstr ""
 
-#: classes/frontend_checks.php:314
+#: classes/frontend_checks.php:313
 msgid "The following responsive AdSense ads are not showing up: %s"
 msgstr ""
 
-#: classes/frontend_checks.php:331
+#: classes/frontend_checks.php:330
 msgid "Consent not given"
 msgstr ""
 
-#: classes/frontend_checks.php:348
+#: classes/frontend_checks.php:347
 msgid "Enable TCF integration"
 msgstr ""
 
-#: classes/frontend_checks.php:363
+#: classes/frontend_checks.php:362
 msgid "Debug Google Ad Manager"
 msgstr ""
 
-#: classes/frontend_checks.php:380
+#: classes/frontend_checks.php:379
 msgid "highlight ads"
 msgstr ""
 
-#: classes/frontend_checks.php:500
+#: classes/frontend_checks.php:499
 msgid "Ad Health"
 msgstr ""
 
-#: classes/frontend_checks.php:515
+#: classes/frontend_checks.php:514
 msgid "Show %d more notifications"
 msgstr ""
 
-#: classes/frontend_checks.php:534
+#: classes/frontend_checks.php:533
 msgid "Everything is fine"
 msgstr ""
 
-#: classes/frontend_checks.php:605
+#: classes/frontend_checks.php:604
 msgid "the following code is used for automatic error detection and only visible to admins"
 msgstr ""
 
 #. translators: %s stands for the name of the "Disable level limitation" option and automatically translated as well
-#: classes/in-content-injector.php:608
+#: classes/in-content-injector.php:610
 msgid "Set <em>%s</em> to show more ads"
 msgstr ""
@@ -2761 +2758 @@
 msgstr ""
 
+#: includes/admin/class-assets.php:84
+msgid "After which paragraph?"
+msgstr ""
+
 #: includes/admin/class-assets.php:86
-msgid "After which paragraph?"
-msgstr ""
-
-#: includes/admin/class-assets.php:88
 #: modules/gadsense/includes/class-adsense-report.php:159
 msgid "Today"
 msgstr ""
 
-#: includes/admin/class-assets.php:89
+#: includes/admin/class-assets.php:87
 #: modules/gadsense/includes/class-adsense-report.php:160
 msgid "Yesterday"
 msgstr ""
 
-#: includes/admin/class-assets.php:90
+#: includes/admin/class-assets.php:88
 #: modules/gadsense/includes/class-adsense-report.php:163
 msgid "This Month"
@@ -2781 +2778 @@
 
 #. translators: 1: The number of days.
-#: includes/admin/class-assets.php:92
+#: includes/admin/class-assets.php:90
 #: modules/gadsense/includes/class-adsense-report.php:162
 #: modules/gadsense/includes/class-adsense-report.php:165
@@ -2788 +2785 @@
 
 #. translators: 1: An error message.
-#: includes/admin/class-assets.php:94
+#: includes/admin/class-assets.php:92
 msgid "An error occurred: %1$s"
 msgstr ""
 
-#: includes/admin/class-assets.php:95
+#: includes/admin/class-assets.php:93
 #: modules/gadsense/admin/views/adsense-report.php:24
 msgid "All"
 msgstr ""
 
+#: includes/admin/class-assets.php:94
+msgid "There were no results returned for this ad. Please make sure it is active, generating impressions and double check your ad parameters."
+msgstr ""
+
+#: includes/admin/class-assets.php:95
+msgid "Show inactive ads"
+msgstr ""
+
 #: includes/admin/class-assets.php:96
-msgid "There were no results returned for this ad. Please make sure it is active, generating impressions and double check your ad parameters."
-msgstr ""
-
-#: includes/admin/class-assets.php:97
-msgid "Show inactive ads"
+msgid "Hide inactive ads"
 msgstr ""
 
 #: includes/admin/class-assets.php:98
-msgid "Hide inactive ads"
+msgid "Permanently delete this placement?"
+msgstr ""
+
+#: includes/admin/class-assets.php:99
+msgid "Close"
 msgstr ""
 
 #: includes/admin/class-assets.php:100
-msgid "Permanently delete this placement?"
-msgstr ""
-
-#: includes/admin/class-assets.php:101
-msgid "Close"
-msgstr ""
-
-#: includes/admin/class-assets.php:102
 msgid "Data you have entered has not been saved. Are you sure you want to discard your changes?"
 msgstr ""
@@ -3011 +3008 @@
 
 #. translators: 1: is a link to a support document. 2: closing link
-#: includes/class-autoloader.php:121
+#: includes/class-autoloader.php:128
 msgid "Your installation of Advanced Ads is incomplete. If you installed Advanced Ads from GitHub, %1$s please refer to this document%2$s to set up your development environment."
 msgstr ""
 
 #. translators: %s: WP_ENVIRONMENT_TYPES
-#: includes/class-autoloader.php:154
+#: includes/class-autoloader.php:172
 msgid "The %s constant is no longer supported."
 msgstr ""
@@ -3128 +3125 @@
 #: includes/groups/types/type-unknown.php:60
 msgid "No description"
+msgstr ""
+
+#: includes/importers/class-api-ads.php:56
+msgid "Ads from API"
+msgstr ""
+
+#: includes/importers/class-api-ads.php:65
+msgid "For MonetizeMore clients using PubGuru, you will be able to create all of your new ads from api."
+msgstr ""
+
+#. translators: 1: counts 2: Importer title
+#: includes/importers/class-api-ads.php:192
+msgid "%1$d ads migrated from %2$s"
+msgstr ""
+
+#: includes/importers/class-manager.php:104
+msgid "History deleted successfully."
 msgstr ""
 
@@ -4138 +4152 @@
 msgstr ""
 
+#: modules/one-click/admin/class-admin.php:60
+msgid "MonetizeMore & PubGuru Integration"
+msgstr ""
+
 #: modules/one-click/admin/class-admin.php:61
-msgid "MonetizeMore & PubGuru Integration"
-msgstr ""
-
-#: modules/one-click/admin/class-admin.php:62
 msgid "Enables MonetizeMore users to link their settings with the PubGuru insights & analytics dashboard."
 msgstr ""
@@ -4150 +4164 @@
 msgstr ""
 
-#: modules/one-click/admin/class-admin.php:74
+#: modules/one-click/admin/class-admin.php:76
 msgid "Disconnect now"
 msgstr ""
 
-#: modules/one-click/admin/class-admin.php:100
+#: modules/one-click/admin/class-admin.php:101
 msgid "PubGuru OneClick Consent & Privacy Policy"
 msgstr ""
 
-#: modules/one-click/admin/class-admin.php:102
+#: modules/one-click/admin/class-admin.php:103
 msgid "Connecting Your With Your PubGuru Account Settings"
 msgstr ""
@@ -4167 +4181 @@
 
 #: modules/one-click/admin/class-ajax.php:78
-msgid "Pubguru successfully connected."
+msgid "We have successfully migrated your MonetizeMore Pubguru Ad Units to your WordPress site. The existing placements and ads have been paused."
 msgstr ""
 
@@ -4174 +4188 @@
 msgstr ""
 
+#: modules/one-click/admin/class-ajax.php:132
 #: modules/one-click/admin/class-ajax.php:167
 msgid "An error has occurred please try again."
 msgstr ""
 
-#: modules/one-click/modules/adstxt/class-detector.php:88
+#: modules/one-click/admin/class-ajax.php:139
+msgid "File successfully backed up."
+msgstr ""
+
+#: modules/one-click/modules/adstxt/class-detector.php:93
 msgid "File alert!"
 msgstr ""
 
-#: modules/one-click/modules/adstxt/class-detector.php:88
-msgid "Physical ads.txt found. In order to use PubGuru service you need to delete it."
-msgstr ""
-
-#: modules/one-click/modules/adstxt/class-detector.php:90
-#: modules/one-click/modules/adstxt/class-detector.php:91
+#: modules/one-click/modules/adstxt/class-detector.php:93
+msgid "Physical ads.txt found. In order to use PubGuru service you need to delete it or back it up."
+msgstr ""
+
+#: modules/one-click/modules/adstxt/class-detector.php:96
+#: modules/one-click/modules/adstxt/class-detector.php:97
 msgid "Backup the File"
 msgstr ""
 
-#: modules/one-click/modules/adstxt/class-detector.php:90
+#: modules/one-click/modules/adstxt/class-detector.php:96
 msgid "Backing Up"
 msgstr ""
 
-#: modules/one-click/modules/adstxt/class-detector.php:90
+#: modules/one-click/modules/adstxt/class-detector.php:96
 msgid "Backed Up"
 msgstr ""
@@ -4369 +4388 @@
 
 #. translators: %s link to privacy policy
-#: views/admin/metabox-pubguru-connect.php:21
+#: views/admin/metabox-pubguru-connect.php:23
 msgid "This form is designed exclusively for MonetizeMore customers who wish to integrate Advanced Ads with the PubGuru Dashboard. By selecting \"Connect PGHB,\" you agree to share your domain name to facilitate the connection with your PubGuru account, in alignment with our <a href=\"%s\">Privacy Policy</a>. Rest assured, no additional information is exchanged, and Advanced Ads does not engage in any tracking activities."
 msgstr ""
 
-#: views/admin/metabox-pubguru-connect.php:30
+#: views/admin/metabox-pubguru-connect.php:32
 msgid "Connect PGHB"
 msgstr ""
 
-#: views/admin/metabox-pubguru-connect.php:42
+#: views/admin/metabox-pubguru-connect.php:43
 msgid "To activate any of the settings with your PubGuru account, please select from the options below. Should you have any inquiries, feel free to <a href=\"https://www.monetizemore.com/contact/\">click here<a/> to reach out to us or send an email to <a href=\"mailto:[email protected]\">[email protected]</a>"
 msgstr ""
 
-#: views/admin/metabox-pubguru-connect.php:52
+#: views/admin/metabox-pubguru-connect.php:53
 msgid "Install PubGuru Header Bidding"
 msgstr ""
 
-#: views/admin/metabox-pubguru-connect.php:62
+#: views/admin/metabox-pubguru-connect.php:63
+msgid "Move the PubGuru Header Bidding script to the footer. Keep this option disabled to maximize revenue. Only enable it if PageSpeed is your priority."
+msgstr ""
+
+#: views/admin/metabox-pubguru-connect.php:75
+msgid "Enable ads.txt settings from the <a href=\"https://app.pubguru.com/ads-txt\" target=\"_blank\">PubGuru platform</a>"
+msgstr ""
+
+#: views/admin/metabox-pubguru-connect.php:94
+msgid "Install Traffic Cop. 7 days free trial"
+msgstr ""
+
+#: views/admin/metabox-pubguru-connect.php:97
+msgid "Install Traffic Cop."
+msgstr ""
+
+#: views/admin/metabox-pubguru-connect.php:107
 msgid "Activate Tag Conversion"
 msgstr ""
 
-#: views/admin/metabox-pubguru-connect.php:74
-msgid "Enable ads.txt settings from the <a href=\"https://app.pubguru.com/ads-txt\" target=\"_blank\">PubGuru platform</a>"
-msgstr ""
-
-#: views/admin/metabox-pubguru-connect.php:93
-msgid "Install Traffic Cop. 7 days free trial"
-msgstr ""
-
-#: views/admin/metabox-pubguru-connect.php:96
-msgid "Install Traffic Cop."
+#: views/admin/metabox-pubguru-connect.php:132
+msgid "Rollback"
+msgstr ""
+
+#: views/admin/metabox-pubguru-connect.php:133
+msgid "Rollback the api changes back to previous state."
 msgstr ""
 

advanced-ads/tags/1.54.0/lib/composer/autoload_classmap.php

@@ -55 +55 @@
     'AdvancedAds\\BuildTools\\Values\\SemanticVersion' => $vendorDir . '/advanced-ads/build-tools/src/Values/SemanticVersion.php',
     'AdvancedAds\\BuildTools\\Values\\Translation' => $vendorDir . '/advanced-ads/build-tools/src/Values/Translation.php',
+    'AdvancedAds\\Constants' => $baseDir . '/includes/class-constants.php',
     'AdvancedAds\\Entities' => $baseDir . '/includes/class-entities.php',
     'AdvancedAds\\Groups\\Manager' => $baseDir . '/includes/groups/class-manager.php',
@@ -62 +63 @@
     'AdvancedAds\\Groups\\Types\\Standard' => $baseDir . '/includes/groups/types/type-standard.php',
     'AdvancedAds\\Groups\\Types\\Unknown' => $baseDir . '/includes/groups/types/type-unknown.php',
+    'AdvancedAds\\Importers\\Api_Ads' => $baseDir . '/includes/importers/class-api-ads.php',
+    'AdvancedAds\\Importers\\Importer' => $baseDir . '/includes/importers/abstract-importer.php',
+    'AdvancedAds\\Importers\\Manager' => $baseDir . '/includes/importers/class-manager.php',
     'AdvancedAds\\Installation\\Capabilities' => $baseDir . '/includes/installation/class-capabilities.php',
     'AdvancedAds\\Installation\\Install' => $baseDir . '/includes/installation/class-install.php',
     'AdvancedAds\\Installation\\Uninstall' => $baseDir . '/includes/installation/class-uninstall.php',
     'AdvancedAds\\Interfaces\\Group_Type' => $baseDir . '/includes/interfaces/interface-group-type.php',
+    'AdvancedAds\\Interfaces\\Importer' => $baseDir . '/includes/interfaces/interface-importer.php',
     'AdvancedAds\\Interfaces\\Screen_Interface' => $baseDir . '/includes/interfaces/interface-screen.php',
     'AdvancedAds\\Modules\\OneClick\\Admin\\Admin' => $baseDir . '/modules/one-click/admin/class-admin.php',
@@ -71 +76 @@
     'AdvancedAds\\Modules\\OneClick\\AdsTxt\\AdsTxt' => $baseDir . '/modules/one-click/modules/adstxt/class-adstxt.php',
     'AdvancedAds\\Modules\\OneClick\\AdsTxt\\Detector' => $baseDir . '/modules/one-click/modules/adstxt/class-detector.php',
-    'AdvancedAds\\Modules\\OneClick\\Auto_Ads' => $baseDir . '/modules/one-click/modules/class-auto-ads.php',
     'AdvancedAds\\Modules\\OneClick\\Header_Bidding' => $baseDir . '/modules/one-click/modules/class-header-bidding.php',
     'AdvancedAds\\Modules\\OneClick\\Helpers' => $baseDir . '/modules/one-click/class-helpers.php',

advanced-ads/tags/1.54.0/lib/composer/autoload_static.php

@@ -85 +85 @@
         'AdvancedAds\\BuildTools\\Values\\SemanticVersion' => __DIR__ . '/..' . '/advanced-ads/build-tools/src/Values/SemanticVersion.php',
         'AdvancedAds\\BuildTools\\Values\\Translation' => __DIR__ . '/..' . '/advanced-ads/build-tools/src/Values/Translation.php',
+        'AdvancedAds\\Constants' => __DIR__ . '/../..' . '/includes/class-constants.php',
         'AdvancedAds\\Entities' => __DIR__ . '/../..' . '/includes/class-entities.php',
         'AdvancedAds\\Groups\\Manager' => __DIR__ . '/../..' . '/includes/groups/class-manager.php',
@@ -92 +93 @@
         'AdvancedAds\\Groups\\Types\\Standard' => __DIR__ . '/../..' . '/includes/groups/types/type-standard.php',
         'AdvancedAds\\Groups\\Types\\Unknown' => __DIR__ . '/../..' . '/includes/groups/types/type-unknown.php',
+        'AdvancedAds\\Importers\\Api_Ads' => __DIR__ . '/../..' . '/includes/importers/class-api-ads.php',
+        'AdvancedAds\\Importers\\Importer' => __DIR__ . '/../..' . '/includes/importers/abstract-importer.php',
+        'AdvancedAds\\Importers\\Manager' => __DIR__ . '/../..' . '/includes/importers/class-manager.php',
         'AdvancedAds\\Installation\\Capabilities' => __DIR__ . '/../..' . '/includes/installation/class-capabilities.php',
         'AdvancedAds\\Installation\\Install' => __DIR__ . '/../..' . '/includes/installation/class-install.php',
         'AdvancedAds\\Installation\\Uninstall' => __DIR__ . '/../..' . '/includes/installation/class-uninstall.php',
         'AdvancedAds\\Interfaces\\Group_Type' => __DIR__ . '/../..' . '/includes/interfaces/interface-group-type.php',
+        'AdvancedAds\\Interfaces\\Importer' => __DIR__ . '/../..' . '/includes/interfaces/interface-importer.php',
         'AdvancedAds\\Interfaces\\Screen_Interface' => __DIR__ . '/../..' . '/includes/interfaces/interface-screen.php',
         'AdvancedAds\\Modules\\OneClick\\Admin\\Admin' => __DIR__ . '/../..' . '/modules/one-click/admin/class-admin.php',
@@ -101 +106 @@
         'AdvancedAds\\Modules\\OneClick\\AdsTxt\\AdsTxt' => __DIR__ . '/../..' . '/modules/one-click/modules/adstxt/class-adstxt.php',
         'AdvancedAds\\Modules\\OneClick\\AdsTxt\\Detector' => __DIR__ . '/../..' . '/modules/one-click/modules/adstxt/class-detector.php',
-        'AdvancedAds\\Modules\\OneClick\\Auto_Ads' => __DIR__ . '/../..' . '/modules/one-click/modules/class-auto-ads.php',
         'AdvancedAds\\Modules\\OneClick\\Header_Bidding' => __DIR__ . '/../..' . '/modules/one-click/modules/class-header-bidding.php',
         'AdvancedAds\\Modules\\OneClick\\Helpers' => __DIR__ . '/../..' . '/modules/one-click/class-helpers.php',

advanced-ads/tags/1.54.0/modules/one-click/admin/class-admin.php

@@ -10 +10 @@
 namespace AdvancedAds\Modules\OneClick\Admin;
 
-use AdvancedAds\Assets_Registry;
 use AdvancedAds\Utilities\Conditional;
 use AdvancedAds\Modules\OneClick\Helpers;
@@ -44 +43 @@
         }
 
-        Assets_Registry::enqueue_style( 'app' );
-        Assets_Registry::enqueue_script( 'app' );
+        wp_advads()->registry->enqueue_style( 'app' );
+        wp_advads()->registry->enqueue_script( 'app' );
     }
 
@@ -63 +62 @@
             'order' => 1000,
             'link'  => '#',
+            'icon'  => ADVADS_BASE_URL . 'assets/img/add-ons/aa-addons-icons-m2pg.svg',
         ];
 
         $addons['monetizemore-connect'] = $defaults + [
-            'class'      => 'js-m2-show-consent',
-            'link_title' => __( 'Connect now', 'advanced-ads' ),
+            'class'        => 'js-pubguru-connect',
+            'link_title'   => __( 'Connect now', 'advanced-ads' ),
+            'link_icon'    => 'dashicons-plus',
+            'link_primary' => true,
         ];
 
@@ -73 +75 @@
             'class'      => 'js-pubguru-disconnect',
             'link_title' => __( 'Disconnect now', 'advanced-ads' ),
+            'link_icon'  => 'dashicons-dismiss',
         ];
 
-        if ( $is_connected ) {
-            $addons['monetizemore-connect']['class'] .= ' hidden';
-        } else {
-            $addons['monetizemore-disconnect']['class'] .= ' hidden';
-        }
+        $key = $is_connected ? 'monetizemore-connect' : 'monetizemore-disconnect';
+
+        $addons[ $key ]['class'] .= ' hidden';
 
         return $addons;
@@ -111 +112 @@
             </div>
         </div>
+        <div id="pubguru-notices"></div>
 
         <?php

advanced-ads/tags/1.54.0/modules/one-click/admin/class-ajax.php

@@ -14 +14 @@
 use AdvancedAds\Modules\OneClick\Helpers;
 use AdvancedAds\Modules\OneClick\Options;
+use AdvancedAds\Framework\Utilities\Params;
 use AdvancedAds\Modules\OneClick\AdsTxt\Detector;
-use AdvancedAds\Framework\Utilities\Params;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
 
@@ -76 +76 @@
         wp_send_json_success(
             [
-                'message'       => esc_html__( 'Pubguru successfully connected.', 'advanced-ads' ),
+                'message'       => esc_html__( 'We have successfully migrated your MonetizeMore Pubguru Ad Units to your WordPress site. The existing placements and ads have been paused.', 'advanced-ads' ),
                 'hasTrafficCop' => Helpers::has_traffic_cop( $config ),
             ]
@@ -107 +107 @@
         check_ajax_referer( 'pubguru_module_changed', 'security' );
 
-        $module     = Params::post( 'module', [] );
-        $status     = Params::post( 'status', false, FILTER_VALIDATE_BOOLEAN );
-        $option_key = 'pubguru_module_' . $module;
+        $module = Params::post( 'module', [] );
+        $status = Params::post( 'status', false, FILTER_VALIDATE_BOOLEAN );
 
-        update_option( $option_key, $status );
+        Options::module( $module, $status );
 
-        do_action( 'pubguru_module_status_changed', $module, $status );
+        $data = apply_filters( 'pubguru_module_status_changed', [], $module, $status );
 
-        $notice = '';
-
-        if ( 'ads_txt' === $module && $status ) {
-            $detector = new Detector();
-            if ( $detector->detect_files() ) {
-                ob_start();
-                $detector->show_notice();
-                $notice = ob_get_clean();
-            }
-        }
-
-        wp_send_json_success( [ 'notice' => $notice ] );
+        wp_send_json_success( $data );
     }
 
@@ -137 +125 @@
         check_ajax_referer( 'pubguru_backup_adstxt', 'security' );
 
-        ( new Detector() )->backup_file();
+        $notice = '';
+        $result = ( new Detector() )->backup_file();
+        if ( false === $result ) {
+            $notice = sprintf(
+                '<div class="notice notice-error flex items-center p-4">%s</div>',
+                esc_html__( 'An error has occurred please try again.', 'advanced-ads' )
+            );
+            wp_send_json_error( $notice );
+        }
 
-        wp_send_json_success();
+        $notice = sprintf(
+            '<div class="notice notice-success flex items-center p-4">%s</div>',
+            esc_html__( 'File successfully backed up.', 'advanced-ads' )
+        );
+        wp_send_json_success( $notice );
     }
 

advanced-ads/tags/1.54.0/modules/one-click/class-helpers.php

@@ -10 +10 @@
 namespace AdvancedAds\Modules\OneClick;
 
-use AdvancedAds\Utilities\Str;
+use AdvancedAds\Constants;
 use AdvancedAds\Utilities\WordPress;
+use AdvancedAds\Framework\Utilities\Str;
 
 defined( 'ABSPATH' ) || exit;
@@ -19 +20 @@
  */
 class Helpers {
-
-    /**
-     * Is module enabled.
-     *
-     * @param string $name name of module.
-     *
-     * @return bool
-     */
-    public static function is_module_enabled( $name ): bool {
-        return boolval( get_option( "pubguru_module_{$name}" ) );
-    }
 
     /**
@@ -96 +86 @@
 
         foreach ( $configs['configs'] as $config ) {
-            if ( Str::str_contains( $needle, $config['name'] ) ) {
+            if ( Str::contains( $needle, $config['name'] ) ) {
                 return $config['name'];
             }
@@ -112 +102 @@
         $ads = self::get_ads_from_config();
 
-        if ( $ads && ! wp_next_scheduled( 'advanced-ads-pghb-auto-ad-creation' ) ) {
-            wp_schedule_single_event( current_datetime()->getTimestamp() + MINUTE_IN_SECONDS, 'advanced-ads-pghb-auto-ad-creation' );
+        if ( $ads && ! wp_next_scheduled( Constants::CRON_API_ADS_CREATION ) ) {
+            wp_schedule_single_event( current_datetime()->getTimestamp() + 5, Constants::CRON_API_ADS_CREATION );
         }
     }
@@ -140 +130 @@
                 }
             }
+        } else {
+            $domain             = WordPress::get_site_domain();
+            $pubguru_config_ads = [
+                $domain . '_leaderboard'  => [
+                    'ad_unit'              => $domain . '_leaderboard',
+                    'slot'                 => $domain . '_leaderboard',
+                    'device'               => 'All',
+                    'placement'            => 'Before Content',
+                    'placement_conditions' => 'All',
+                    'in_content_position'  => 'Before',
+                    'in_content_count'     => 1,
+                    'in_content_element'   => 'p',
+                    'in_content_repeat'    => false,
+                ],
+                $domain . '_in_content_1' => [
+                    'ad_unit'              => $domain . '_in_content_1',
+                    'slot'                 => $domain . '_in_content_1',
+                    'device'               => 'All',
+                    'placement'            => 'Before Content',
+                    'placement_conditions' => 'All',
+                    'in_content_position'  => 'Before',
+                    'in_content_count'     => 1,
+                    'in_content_element'   => 'p',
+                    'in_content_repeat'    => false,
+                ],
+                $domain . '_in_content_2' => [
+                    'ad_unit'              => $domain . '_in_content_2',
+                    'slot'                 => $domain . '_in_content_2',
+                    'device'               => 'All',
+                    'placement'            => 'After Content',
+                    'placement_conditions' => 'All',
+                    'in_content_position'  => 'Aefore',
+                    'in_content_count'     => 3,
+                    'in_content_element'   => 'p',
+                    'in_content_repeat'    => true,
+                ],
+            ];
         }
 
@@ -155 +182 @@
         global $post;
 
+        if ( ! $post ) {
+            return false;
+        }
+
         if ( ! $post_id ) {
             $post_id = $post->ID;

advanced-ads/tags/1.54.0/modules/one-click/class-options.php

@@ -37 +37 @@
         return update_option( self::CONFIG_KEY, $data );
     }
+
+    /**
+     * Read and Write pubguru module status
+     *
+     * @param string $module Module name.
+     * @param bool   $status Module status.
+     *
+     * @return bool
+     */
+    public static function module( $module, $status = null ): bool {
+        $option_key = 'pubguru_module_' . $module;
+
+        if ( null === $status ) {
+            return boolval( get_option( $option_key, false ) );
+        }
+
+        update_option( $option_key, $status );
+
+        return $status;
+    }
 }

advanced-ads/tags/1.54.0/modules/one-click/modules/adstxt/class-adstxt.php

@@ -12 +12 @@
 use AdvancedAds\Utilities\WordPress;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
+use AdvancedAds\Framework\Utilities\Params;
+use AdvancedAds\Framework\Utilities\Str;
 
 defined( 'ABSPATH' ) || exit;
@@ -28 +30 @@
         remove_action( 'advanced-ads-plugin-loaded', 'advanced_ads_ads_txt_init' );
 
-        add_action( 'init', [ $this, 'add_rewrite_rules' ] );
-        add_filter( 'query_vars', [ $this, 'add_query_vars' ] );
         add_action( 'template_redirect', [ $this, 'handle_redirect' ] );
         add_filter( 'allowed_redirect_hosts', [ $this, 'allowed_redirect_hosts' ] );
-
-        if ( is_admin() ) {
-            ( new Detector() )->hooks();
-        }
-    }
-
-    /**
-     * Add rewrite rules
-     *
-     * @return void
-     */
-    public function add_rewrite_rules(): void {
-        global $wp_rewrite;
-
-        if ( ! $wp_rewrite->using_permalinks() ) {
-            return;
-        }
-
-        add_rewrite_rule( 'ads\.txt$', $wp_rewrite->index . '?adstxt=1', 'top' );
-    }
-
-    /**
-     * Add query var
-     *
-     * @param array $vars Array to hold query variables.
-     *
-     * @return array
-     */
-    public function add_query_vars( $vars ): array {
-        $vars[] = 'adstxt';
-        return $vars;
     }
 
@@ -71 +40 @@
      */
     public function handle_redirect(): void {
-        if ( empty( get_query_var( 'adstxt' ) ) ) {
+        if (
+            'ads-txt' !== get_query_var( 'name' ) ||
+            Str::contains( Params::server( 'REQUEST_URI' ), 'ads.txt' )
+        ) {
             return;
         }
 
-        $redirect = sprintf( 'https://adstxt.pubguru.net/%s/ads.txt', WordPress::get_site_domain() );
+        $redirect = sprintf( 'https://adstxt.pubguru.net/pg/%s/ads.txt', WordPress::get_site_domain() );
         wp_safe_redirect( $redirect, 301 );
         exit;

advanced-ads/tags/1.54.0/modules/one-click/modules/adstxt/class-detector.php

@@ -40 +40 @@
 
         if ( $this->detect_files() ) {
-            add_action( 'pubguru_notices', [ $this, 'show_notice' ] );
+            add_action( 'all_admin_notices', [ $this, 'show_notice' ] );
         }
     }
@@ -47 +47 @@
      * Detect file exists
      *
+     * @param string $file file name.
+     *
      * @return bool
      */
-    public function detect_files(): bool {
+    public function detect_files( $file = 'ads.txt' ): bool {
         $wp_filesystem = $this->get_filesystem();
         if ( null === $wp_filesystem ) {
@@ -55 +57 @@
         }
 
-        return $wp_filesystem->exists( ABSPATH . '/ads.txt' );
+        return $wp_filesystem->exists( ABSPATH . '/' . $file );
     }
 
@@ -64 +66 @@
      */
     public function backup_file(): bool {
-        $wp_filesystem = $this->get_filesystem();
-        if ( null === $wp_filesystem ) {
-            return false;
-        }
+        $source      = ABSPATH . '/ads.txt';
+        $destination = $source . '.bak';
+        return $this->move_file( $source, $destination );
+    }
 
-        return $wp_filesystem->move( ABSPATH . '/ads.txt', ABSPATH . '/ads.txt.bak' );
+    /**
+     * Revert file
+     *
+     * @return bool
+     */
+    public function revert_file(): bool {
+        $source      = ABSPATH . '/ads.txt.bak';
+        $destination = ABSPATH . 'ads.txt';
+        return $this->move_file( $source, $destination );
     }
 
@@ -79 +89 @@
     public function show_notice(): void {
         ?>
-        <div class="flex shadow-lg rounded">
-            <div class="bg-red-600 p-3 rounded-l flex items-center">
-                <svg focusable="false" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" class="fill-current text-white w-5" viewBox="0 0 32 32" aria-hidden="true"><path d="M2,16H2A14,14,0,1,0,16,2,14,14,0,0,0,2,16Zm23.15,7.75L8.25,6.85a12,12,0,0,1,16.9,16.9ZM8.24,25.16A12,12,0,0,1,6.84,8.27L23.73,25.16a12,12,0,0,1-15.49,0Z"></path><title>Error</title></svg>
+        <div class="notice notice-error flex items-center p-4">
+            <div>
+                <strong><?php esc_html_e( 'File alert!', 'advanced-ads' ); ?></strong> <?php esc_html_e( 'Physical ads.txt found. In order to use PubGuru service you need to delete it or back it up.', 'advanced-ads' ); ?>
             </div>
 
-            <div class="p-3 bg-white rounded-r w-full flex justify-between items-center">
-                <div>
-                    <span class="font-medium"><?php esc_html_e( 'File alert!', 'advanced-ads' ); ?></span> <?php esc_html_e( 'Physical ads.txt found. In order to use PubGuru service you need to delete it.', 'advanced-ads' ); ?>
-                </div>
-                <button class="js-btn-backup-adstxt px-3 py-2 rounded text-xs bg-blue-600 text-white hover:bg-blue-700" data-text="<?php esc_attr_e( 'Backup the File', 'advanced-ads' ); ?>" data-loading="<?php esc_attr_e( 'Backing Up', 'advanced-ads' ); ?>" data-done="<?php esc_attr_e( 'Backed Up', 'advanced-ads' ); ?>" data-security="<?php echo wp_create_nonce( 'pubguru_backup_adstxt' ); // phpcs:ignore ?>">
-                    <?php esc_html_e( 'Backup the File', 'advanced-ads' ); ?>
-                </button>
-            </div>
+            <button class="!ml-auto button button-primary js-btn-backup-adstxt" data-text="<?php esc_attr_e( 'Backup the File', 'advanced-ads' ); ?>" data-loading="<?php esc_attr_e( 'Backing Up', 'advanced-ads' ); ?>" data-done="<?php esc_attr_e( 'Backed Up', 'advanced-ads' ); ?>" data-security="<?php echo wp_create_nonce( 'pubguru_backup_adstxt' ); // phpcs:ignore ?>">
+                <?php esc_html_e( 'Backup the File', 'advanced-ads' ); ?>
+            </button>
         </div>
         <?php
@@ -101 +106 @@
      * @return object
      */
-    public function get_filesystem() {
+    private function get_filesystem() {
         global $wp_filesystem;
 
@@ -111 +116 @@
         return $wp_filesystem;
     }
+
+    /**
+     * Handle file operations (backup or revert)
+     *
+     * @param string $source      Source file path.
+     * @param string $destination Destination file path.
+     *
+     * @return bool
+     */
+    private function move_file( string $source, string $destination ): bool {
+        $wp_filesystem = $this->get_filesystem();
+
+        if ( null === $wp_filesystem || ! $wp_filesystem->is_writable( $source ) ) {
+            return false;
+        }
+
+        return $wp_filesystem->move( $source, $destination );
+    }
 }

advanced-ads/tags/1.54.0/modules/one-click/modules/class-header-bidding.php

@@ -10 +10 @@
 namespace AdvancedAds\Modules\OneClick;
 
-use AdvancedAds\Utilities\Str;
+use AdvancedAds\Framework\Utilities\Str;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
 
@@ -19 +19 @@
  */
 class Header_Bidding implements Integration_Interface {
-
-    /**
-     * Check if has gpt
-     *
-     * @var bool
-     */
-    private $has_gpt = false;
-
-    /**
-     * Check if has pubguru tag
-     *
-     * @var bool
-     */
-    private $has_pubguru = false;
-
-    /**
-     * Check if has traffic cop atq
-     *
-     * @var bool
-     */
-    private $has_traffic_cop = false;
 
     /**
@@ -72 +51 @@
     public function remove_tags( $script ): string {
 
-        if ( Str::str_contains( '/gpt.js', $script ) ) {
-            $script        = '';
-            $this->has_gpt = true;
+        if ( Str::contains( '/gpt.js', $script ) ) {
+            $script = '';
         }
 
-        if ( Str::str_contains( '//m2d.m2.ai/', $script ) || Str::str_contains( '//c.pubguru.net/', $script ) ) {
-            $script            = '';
-            $this->has_gpt     = true;
-            $this->has_pubguru = true;
+        if ( Str::contains( '//m2d.m2.ai/', $script ) || Str::contains( '//c.pubguru.net/', $script ) ) {
+            $script = '';
         }
 
-        if ( Str::str_contains( 'window.pg.atq = window.pg.atq || [];', $script ) ) {
-            $script                = '';
-            $this->has_traffic_cop = true;
+        if ( Str::contains( 'window.pg.atq = window.pg.atq || [];', $script ) ) {
+            $script = '';
         }
 
@@ -99 +74 @@
      */
     private function add_script_tag( $page ): string {
-        $name = Helpers::get_config_file();
+        $name    = Helpers::get_config_file();
+        $at_body = Options::module( 'header_bidding_at_body' );
 
         if ( $name ) {
-            $script = [ '<head>' ];
-
-            if ( $this->has_gpt ) {
-                $script[] = '<script src="https://securepubads.g.doubleclick.net/tag/js/gpt.js" async></script>'; // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
-                $script[] = '<script type="text/javascript">window.googletag=window.googletag||{};window.googletag.cmd=window.googletag.cmd||[];';
-                $script[] = 'window.googletag.cmd.push(function(){window.__onpageGptEmbed=(new Date()).getTime()})</script>';
+            $script = [];
+            if ( ! $at_body ) {
+                $script[] = '<head>';
             }
 
-            if ( $this->has_pubguru ) {
-                $script[] = sprintf( '<script src="//c.pubguru.net/%s" async> </script>', $name ); // phpcs:ignore
-            }
+            $script[] = '<script src="https://securepubads.g.doubleclick.net/tag/js/gpt.js" async></script>'; // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+            $script[] = '<script type="text/javascript">window.googletag=window.googletag||{};window.googletag.cmd=window.googletag.cmd||[];';
+            $script[] = 'window.googletag.cmd.push(function(){window.__onpageGptEmbed=(new Date()).getTime()})</script>';
+            $script[] = sprintf( '<script src="//c.pubguru.net/%s" async> </script>', $name ); // phpcs:ignore
 
-            if ( Helpers::is_module_enabled( 'traffic_cop' ) && Helpers::has_traffic_cop() && $this->has_traffic_cop ) {
+            if ( Options::module( 'traffic_cop' ) && Helpers::has_traffic_cop() ) {
                 $script[] = '<script>window.pg = window.pg || {};window.pg.atq = window.pg.atq || [];</script>';
             }
 
-            $page = str_replace( '<head>', join( "\n", $script ), $page );
+            if ( $at_body ) {
+                $page = $page . join( "\n", $script );
+            } else {
+                $page = str_replace(
+                    '<head>',
+                    join( "\n", $script ),
+                    $page
+                );
+            }
         }
 

advanced-ads/tags/1.54.0/modules/one-click/modules/class-traffic-cop.php

@@ -10 +10 @@
 namespace AdvancedAds\Modules\OneClick;
 
-use AdvancedAds\Utilities\Str;
+use AdvancedAds\Framework\Utilities\Str;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
 
@@ -38 +38 @@
     public function modify_script_tag( $content ) {
         // Early bail!!
-        if ( ! Str::str_contains( 'googletag.display', $content ) ) {
+        if ( ! Str::contains( 'googletag.display', $content ) ) {
             return false;
         }

advanced-ads/tags/1.54.0/modules/one-click/modules/class-workflow.php

@@ -10 +10 @@
 namespace AdvancedAds\Modules\OneClick;
 
+use AdvancedAds\Constants;
+use AdvancedAds\Importers\Api_Ads;
 use AdvancedAds\Modules\OneClick\Helpers;
 use AdvancedAds\Modules\OneClick\Options;
+use AdvancedAds\Framework\Utilities\Params;
+use AdvancedAds\Modules\OneClick\Traffic_Cop;
+use AdvancedAds\Modules\OneClick\AdsTxt\AdsTxt;
+use AdvancedAds\Modules\OneClick\AdsTxt\Detector;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
-use AdvancedAds\Framework\Utilities\Params;
-use AdvancedAds\Modules\OneClick\AdsTxt\AdsTxt;
-use AdvancedAds\Modules\OneClick\Traffic_Cop;
 
 defined( 'ABSPATH' ) || exit;
@@ -38 +41 @@
     public function hooks(): void {
         add_action( 'init', [ $this, 'flush_rewrite_rules' ], 999 );
-        add_action( 'pubguru_module_status_changed', [ $this, 'module_status_changed' ], 10, 1 );
-        add_action( 'advanced-ads-pghb-auto-ad-creation', [ $this, 'auto_ad_creation' ], 10, 0 );
+        add_filter( 'pubguru_module_status_changed', [ $this, 'module_status_changed' ], 10, 3 );
+        add_action( Constants::CRON_API_ADS_CREATION, [ $this, 'auto_ad_creation' ], 10, 0 );
 
         if ( false !== Options::pubguru_config() && ! is_admin() ) {
             add_action( 'wp', [ $this, 'init' ] );
 
-            if ( Helpers::is_module_enabled( 'ads_txt' ) ) {
+            if ( Options::module( 'ads_txt' ) ) {
                 ( new AdsTxt() )->hooks();
             }
+        }
+
+        if ( Options::module( 'ads_txt' ) ) {
+            if ( is_admin() ) {
+                ( new Detector() )->hooks();
+            }
+            remove_action( 'advanced-ads-plugin-loaded', 'advanced_ads_ads_txt_init' );
         }
     }
@@ -64 +74 @@
         Page_Parser::get_instance();
 
-        if ( $is_debugging || Helpers::is_module_enabled( 'header_bidding' ) ) {
+        if ( $is_debugging || Options::module( 'header_bidding' ) ) {
             ( new Header_Bidding() )->hooks();
         }
 
-        if ( $is_debugging || Helpers::is_module_enabled( 'tag_conversion' ) ) {
+        if ( $is_debugging || Options::module( 'tag_conversion' ) ) {
             ( new Tags_Conversion() )->hooks();
         }
 
-        if ( Helpers::is_module_enabled( 'traffic_cop' ) && Helpers::has_traffic_cop() ) {
-            if ( ! Helpers::is_module_enabled( 'header_bidding' ) ) {
+        if ( Options::module( 'traffic_cop' ) && Helpers::has_traffic_cop() ) {
+            if ( ! Options::module( 'header_bidding' ) ) {
                 ( new Header_Bidding() )->hooks();
             }
@@ -84 +94 @@
      * Handle module status change
      *
+     * @param array  $data   Data to send back to ajax request.
      * @param string $module Module name.
+     * @param bool   $status Module status.
      *
-     * @return void
+     * @return array
      */
-    public function module_status_changed( $module ): void {
+    public function module_status_changed( $data, $module, $status ): array {
         if ( 'ads_txt' === $module ) {
+            $detector = new Detector();
+            if ( $status && $detector->detect_files() ) {
+                ob_start();
+                $detector->show_notice();
+                $notice = ob_get_clean();
+                if ( $notice ) {
+                    $data['notice'] = $notice;
+                }
+            }
+
+            if ( ! $status && $detector->detect_files( 'ads.txt.bak' ) ) {
+                $detector->revert_file();
+            }
+
             update_option( self::FLUSH_KEY, 1 );
         }
+
+        return $data;
     }
 
@@ -112 +140 @@
      */
     public function auto_ad_creation(): void {
-        $ads = Helpers::get_ads_from_config();
-        // ( new Auto_Ads() )->run( $ads );
+        ( new Api_Ads() )->import();
     }
 }

advanced-ads/tags/1.54.0/packages/composer/LICENSE

@@ +1 @@
+
 Copyright (c) Nils Adermann, Jordi Boggiano
 
@@ -18 +19 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+

advanced-ads/tags/1.54.0/packages/composer/autoload_classmap.php

@@ -24 +24 @@
     'AdvancedAds\\Assets_Registry' => $baseDir . '/includes/class-assets-registry.php',
     'AdvancedAds\\Autoloader' => $baseDir . '/includes/class-autoloader.php',
+    'AdvancedAds\\Constants' => $baseDir . '/includes/class-constants.php',
     'AdvancedAds\\Entities' => $baseDir . '/includes/class-entities.php',
     'AdvancedAds\\Framework\\Assets_Registry' => $vendorDir . '/advanced-ads/framework/src/class-assets-registry.php',
@@ -58 +59 @@
     'AdvancedAds\\Groups\\Types\\Standard' => $baseDir . '/includes/groups/types/type-standard.php',
     'AdvancedAds\\Groups\\Types\\Unknown' => $baseDir . '/includes/groups/types/type-unknown.php',
+    'AdvancedAds\\Importers\\Api_Ads' => $baseDir . '/includes/importers/class-api-ads.php',
+    'AdvancedAds\\Importers\\Importer' => $baseDir . '/includes/importers/abstract-importer.php',
+    'AdvancedAds\\Importers\\Manager' => $baseDir . '/includes/importers/class-manager.php',
     'AdvancedAds\\Installation\\Capabilities' => $baseDir . '/includes/installation/class-capabilities.php',
     'AdvancedAds\\Installation\\Install' => $baseDir . '/includes/installation/class-install.php',
     'AdvancedAds\\Installation\\Uninstall' => $baseDir . '/includes/installation/class-uninstall.php',
     'AdvancedAds\\Interfaces\\Group_Type' => $baseDir . '/includes/interfaces/interface-group-type.php',
+    'AdvancedAds\\Interfaces\\Importer' => $baseDir . '/includes/interfaces/interface-importer.php',
     'AdvancedAds\\Interfaces\\Screen_Interface' => $baseDir . '/includes/interfaces/interface-screen.php',
     'AdvancedAds\\Modules\\OneClick\\Admin\\Admin' => $baseDir . '/modules/one-click/admin/class-admin.php',
@@ -67 +72 @@
     'AdvancedAds\\Modules\\OneClick\\AdsTxt\\AdsTxt' => $baseDir . '/modules/one-click/modules/adstxt/class-adstxt.php',
     'AdvancedAds\\Modules\\OneClick\\AdsTxt\\Detector' => $baseDir . '/modules/one-click/modules/adstxt/class-detector.php',
-    'AdvancedAds\\Modules\\OneClick\\Auto_Ads' => $baseDir . '/modules/one-click/modules/class-auto-ads.php',
     'AdvancedAds\\Modules\\OneClick\\Header_Bidding' => $baseDir . '/modules/one-click/modules/class-header-bidding.php',
     'AdvancedAds\\Modules\\OneClick\\Helpers' => $baseDir . '/modules/one-click/class-helpers.php',

advanced-ads/tags/1.54.0/packages/composer/autoload_static.php

@@ -53 +53 @@
         'AdvancedAds\\Assets_Registry' => __DIR__ . '/../..' . '/includes/class-assets-registry.php',
         'AdvancedAds\\Autoloader' => __DIR__ . '/../..' . '/includes/class-autoloader.php',
+        'AdvancedAds\\Constants' => __DIR__ . '/../..' . '/includes/class-constants.php',
         'AdvancedAds\\Entities' => __DIR__ . '/../..' . '/includes/class-entities.php',
         'AdvancedAds\\Framework\\Assets_Registry' => __DIR__ . '/..' . '/advanced-ads/framework/src/class-assets-registry.php',
@@ -87 +88 @@
         'AdvancedAds\\Groups\\Types\\Standard' => __DIR__ . '/../..' . '/includes/groups/types/type-standard.php',
         'AdvancedAds\\Groups\\Types\\Unknown' => __DIR__ . '/../..' . '/includes/groups/types/type-unknown.php',
+        'AdvancedAds\\Importers\\Api_Ads' => __DIR__ . '/../..' . '/includes/importers/class-api-ads.php',
+        'AdvancedAds\\Importers\\Importer' => __DIR__ . '/../..' . '/includes/importers/abstract-importer.php',
+        'AdvancedAds\\Importers\\Manager' => __DIR__ . '/../..' . '/includes/importers/class-manager.php',
         'AdvancedAds\\Installation\\Capabilities' => __DIR__ . '/../..' . '/includes/installation/class-capabilities.php',
         'AdvancedAds\\Installation\\Install' => __DIR__ . '/../..' . '/includes/installation/class-install.php',
         'AdvancedAds\\Installation\\Uninstall' => __DIR__ . '/../..' . '/includes/installation/class-uninstall.php',
         'AdvancedAds\\Interfaces\\Group_Type' => __DIR__ . '/../..' . '/includes/interfaces/interface-group-type.php',
+        'AdvancedAds\\Interfaces\\Importer' => __DIR__ . '/../..' . '/includes/interfaces/interface-importer.php',
         'AdvancedAds\\Interfaces\\Screen_Interface' => __DIR__ . '/../..' . '/includes/interfaces/interface-screen.php',
         'AdvancedAds\\Modules\\OneClick\\Admin\\Admin' => __DIR__ . '/../..' . '/modules/one-click/admin/class-admin.php',
@@ -96 +101 @@
         'AdvancedAds\\Modules\\OneClick\\AdsTxt\\AdsTxt' => __DIR__ . '/../..' . '/modules/one-click/modules/adstxt/class-adstxt.php',
         'AdvancedAds\\Modules\\OneClick\\AdsTxt\\Detector' => __DIR__ . '/../..' . '/modules/one-click/modules/adstxt/class-detector.php',
-        'AdvancedAds\\Modules\\OneClick\\Auto_Ads' => __DIR__ . '/../..' . '/modules/one-click/modules/class-auto-ads.php',
         'AdvancedAds\\Modules\\OneClick\\Header_Bidding' => __DIR__ . '/../..' . '/modules/one-click/modules/class-header-bidding.php',
         'AdvancedAds\\Modules\\OneClick\\Helpers' => __DIR__ . '/../..' . '/modules/one-click/class-helpers.php',

advanced-ads/tags/1.54.0/readme.txt

@@ -1 +1 @@
 === Advanced Ads – Ad Manager & AdSense ===
 Contributors: webzunft, advancedads
-Tags: ads, adsense, amp, ads.txt, ad rotations, ad blocker, amazon, banner, click fraud protection, google ad manager, header code, lazy loading,
+Tags: ads, adsense, amazon, affiliate, ad manager
 Requires at least: 5.0
 Tested up to: 6.5
 Requires PHP: 7.2
-Stable tag: 1.53.2
+Stable tag: 1.54.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-Manage and optimize all ad types. Support for Google AdSense Auto ads, Amazon, image banners, HTML, page builder, ad widget, ad rotations, ads.txt
+The only complete toolkit for all ad types. Grow your revenue with AdSense, Amazon—or any affiliate network. Get pinpoint targeting and best support!
 
 == Description ==
@@ -31 +31 @@
 This is what our users are saying about Advanced Ads:
 
-> We use this plugin to deliver rotating ads on a community news site, and it’s great. We’ve delivered over a million ad impressions since we launched less than a year ago, using a combination of sidebar, top, sticky and in-content placements — both HTML5 and images. Advanced Ads makes it easy for our small team to deliver a good experience to our users and our advertisers.
+> We use this plugin to deliver rotating ads on a community news site, and it’s great. We’ve delivered over a million ad impressions since we launched less than a year ago, using a combination of sidebar, top, sticky and in-content placements — both HTML5 ads and images. Advanced Ads makes it easy for our small team to deliver a good experience to our users and our advertisers.
 > <i>mytown304 on wp.org</i>
 
@@ -37 +37 @@
 
 = Premium Features =
-This plugin is the lite version of the Advanced Ads plugin that comes with all the features you will ever need to optimize your ads and increase your revenues, including performance tracking, advanced ad targeting, split tests, click fraud protection, lazy loading, background ads, popups and sticky ads, full AMP support, adblocker detection, the most comfortable Google Ad Manager integration, and tons more. [Click here to purchase the best premium WordPress ad management plugin now!](https://wpadvancedads.com/add-ons/all-access/?utm_source=wporg&utm_medium=link&utm_campaign=wp-all-access)
+This plugin is the lite version of the Advanced Ads plugin that comes with all the features you will ever need to optimize your ads and increase your revenues, including performance tracking, advanced ad targeting, split tests, click fraud protection, lazy loading, background ads, floating ads, popups and sticky ads, full AMP support, adblocker detection, the most comfortable Google Ad Manager integration, and tons more. [Click here to purchase the best premium WordPress ad management plugin now!](https://wpadvancedads.com/add-ons/all-access/?utm_source=wporg&utm_medium=link&utm_campaign=wp-all-access)
 
 [Full Feature List](https://wpadvancedads.com/features/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features)
 
-= ad management =
+= Ad Management =
 
 * create and display **unlimited** ad units
@@ -49 +49 @@
 * inject ads into posts and pages automatically without coding
 
-= ad types =
+= Ad Types =
 
 Choose between different ad types that enable you to:
 
-* insert ads and banners from all ad and affiliate networks (e.g., [Google AdSense](https://wpadvancedads.com/adsense-ads/), [Amazon Affiliate Program](https://wpadvancedads.com/amazon-affiliate-program-wordpress/), BuySellAds, Google Ad Manager (formerly Google DoubleClick for Publishers, DFP), Ezoic, media.net, [Booking.com](https://wpadvancedads.com/booking-com-ads-wordpress/), Tradedoubler, Awin, Getyourguide, The Moneytizer, Infolinks...)
+* insert ads and banners from all ad and affiliate networks (e.g., [Google AdSense](https://wpadvancedads.com/adsense-ads/), [Amazon Affiliate Program Amazon Associates](https://wpadvancedads.com/amazon-affiliate-program-wordpress/), BuySellAds, Google Ad Manager (formerly Google DoubleClick for Publishers, DFP), Ezoic, media.net, [Booking.com](https://wpadvancedads.com/booking-com-ads-wordpress/), Tradedoubler, Awin, GetYourGuide, The Moneytizer, Infolinks...)
 * dedicated support for all types of Google AdSense ads, including text and display ads, native ads (In-article, In-feed, Multiplex ads), Auto ads, and Auto ads for AMP
 * display images and image banners
 * create content-rich ads with the WordPress TinyMCE editor
 * insert contextual Amazon Native Shopping Ads
-* inject HTML, CSS, Javascript or PHP code
-* use shortcodes within ads (to also deliver advertisements from another ad plugin like Ad Inserter, AdRotate, Quick AdSense, Ads for WP, or the Google AdSense Plugin WP QUADS)
-
-= display ads for WordPress =
+* inject HTML, CSS, Javascript, or PHP code
+* use shortcodes within ads (to also deliver advertisements from another ad plugin like Ad Inserter, AdRotate, Quick AdSense, AdSanity, Ads for WP, or the Google AdSense plugin WP QUADS)
+
+= Display Ads for WordPress =
 
 * auto-inject ads via placements
 * use functions to display ads in template files
-* use shortcodes to place ads manually in post content
+* use shortcodes to place ads manually
 * show ads in the sidebar and in widgets
 * disable all ads on specific pages
-* display multiple ads (ad grids)
 * display a customizable ad label, e.g., “Advertisements” above each banner ad
-
-= display conditions =
+* display multiple ads in ad grids ([Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-5))
+
+= Display Conditions =
 
 Show ads based on content. [List of all display conditions](https://wpadvancedads.com/manual/display-conditions/)
@@ -79 +79 @@
 * archive pages by category, tags, taxonomies
 * special page types like 404, attachment and front page
-* posts and pages by contained keywords [(keyword targeting)](https://wpadvancedads.com/manual/ads-based-on-keywords/?utm_source=wporg&utm_medium=link&utm_campaign=features) or URL parameters, included in [Advanced Ads Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-1)
 * hide ads on secondary queries (e.g., posts in sidebars)
 * display or hide banners within the post feed
 * hide all ads from specific page types, e.g., 404 pages, feed
 * hide ads from bots and web crawlers
-
-= visitor conditions =
+* posts and pages by contained keywords [(keyword targeting)](https://wpadvancedads.com/manual/ads-based-on-keywords/?utm_source=wporg&utm_medium=link&utm_campaign=features) or URL parameters, included in [Advanced Ads Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-1)
+
+= Visitor Conditions =
 
 Serve ads by conditions based on the visitor. [List of all visitor conditions](https://wpadvancedads.com/manual/visitor-conditions/)
@@ -92 +92 @@
 * display or hide a banner by role and for logged-in visitors
 * advanced visitor conditions: geolocation, previously visited URL (referrer), user capability, browser language, browser, and browser width included in [Advanced Ads Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-2)
+* frequency capping ([Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-6))
 
 > **Fantastic plugin and outstanding support**
@@ -97 +98 @@
 > djsawyer on wp.org
 
-= ad injection | placements =
+= Ad Injection | Placements =
 
 Placements to insert ads in pre-defined positions in your theme and content. [List of all placements](https://wpadvancedads.com/manual/placements/)
@@ -107 +108 @@
 * [Page peel banners](https://wpadvancedads.com/page-peel-ads/)
 * create [split tests and A/B testing](https://wpadvancedads.com/ab-testing-wordpress/)
-* many more ad positions with [add-ons](https://wpadvancedads.com/add-ons/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features)
 * automatic insertion of any kind of footer and header code, not only advertising
 * use the [ad server](https://wpadvancedads.com/ad-server-wordpress/) placement to display ads on other sites
-
-= mobile devices =
+* many more ad positions with [add-ons](https://wpadvancedads.com/add-ons/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features)
+
+= Mobile Devices =
 
 * target ads to mobile devices, or tablets, or desktops
 * display responsive image ads
-* ads only for specific browser sizes using [Advanced Ads Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-3)
-* insert ads on AMP pages with [AMP Ads](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-1)
+* ads only for specific browser sizes [Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-3)
+* insert ads on AMP pages [AMP Ads add-on](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-1)
 
 = Google AdSense =
@@ -133 +134 @@
 * easy Ad Health integration and Google AdSense violation checks
 * option to remove the Google AdSense background color
-* place Google AdSense In-feed ads using the also free [In-feed add-on](https://wordpress.org/plugins/advanced-ads-adsense-in-feed/)
-* assistant for exact sizes of responsive Google AdSense ads with the [AMP Ads add-on](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-2)
-* convert Google AdSense ads into AMP ads automatically with the [AMP Ads add-on](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-3)
 * ads.txt generated with the correct AdSense information automatically
 * works along with Google Site Kit or can replace it if you want to [control your ad placements](https://wpadvancedads.com/place-adsense-ad-unit-manually/)
+* place Google AdSense In-feed ads [free In-feed add-on](https://wordpress.org/plugins/advanced-ads-adsense-in-feed/)
+* assistant for exact sizes of responsive Google AdSense ads [AMP Ads add-on](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-2)
+* convert Google AdSense ads into AMP ads automatically [AMP Ads add-on](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-3)
 
 https://vimeo.com/577120971
@@ -145 +146 @@
 > Your app is awesome, congratulations! Google Adsense suggests using your app on its official website, it’s incredible!
 
-= ads.txt =
+= Affiliate Marketing =
+
+Easily integrate affiliate marketing with a comprehensive toolkit.
+
+* unlimited affiliate ads and banners
+* text link support
+* affiliate disclosure
+* automatic affiliate ad insertion
+* advanced targeting
+* dedicated AAWP ad type (Amazon Affiliate WordPress Plugin)
+* integrates with other affiliate plugins like Pretty Links, Thirsty Affiliates, Lasso, and many more
+* support for all Amazon ad formats
+* compatible with all affiliate networks
+* link masking and link cloaking ([Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-7))
+* affiliate ad tracking ([Tracking add-on](https://wpadvancedads.com/add-ons/tracking/?utm_source=wporg&utm_medium=link&utm_campaign=affiliate-tracking))
+
+
+= Ads.txt =
 
 * generates an ads.txt with custom content
@@ -156 +174 @@
 * all add-ons include priority email support
 * [All Access](https://wpadvancedads.com/add-ons/all-access/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons) – includes all available add-ons
-* [Advanced Ads Pro](https://wpadvancedads.com/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons) – powerful tools for ad optimizations: cache-busting, more placements, [lazy loading](https://wpadvancedads.com/lazy-load-ads/?utm_source=wporg&utm_medium=link&utm_campaign=features), ad blocker module, [click fraud protection](https://wpadvancedads.com/manual/click-fraud-protection/?utm_source=wporg&utm_medium=link&utm_campaign=features), [geo targeting](https://wpadvancedads.com/add-ons/geo-targeting/?utm_source=wporg&utm_medium=link&utm_campaign=features), [parallax ads](https://wpadvancedads.com/parallax-ads/?utm_source=wporg&utm_medium=link&utm_campaign=features) and many more
+* [Advanced Ads Pro](https://wpadvancedads.com/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons) – powerful tools for ad optimizations: cache-busting, more placements, [lazy loading](https://wpadvancedads.com/lazy-load-ads/?utm_source=wporg&utm_medium=link&utm_campaign=features), ad blocker module, ad refresh, [click fraud protection](https://wpadvancedads.com/manual/click-fraud-protection/?utm_source=wporg&utm_medium=link&utm_campaign=features), [geo targeting](https://wpadvancedads.com/add-ons/geo-targeting/?utm_source=wporg&utm_medium=link&utm_campaign=features), [parallax ads](https://wpadvancedads.com/parallax-ads/?utm_source=wporg&utm_medium=link&utm_campaign=features) and many more
 * [Tracking](https://wpadvancedads.com/add-ons/tracking/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons) – track ad impressions and ad clicks with local methods or Google Analytics
 * [AMP Ads](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons) – make your ads compatible with AMP and convert Google AdSense ads automatically
@@ -167 +185 @@
 * [Full Feature List](https://wpadvancedads.com/features/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons)
 
-= ad blocker =
+= Ad Blocker =
 
 * basic features to prevent ads from being removed by AdBlock and other ad blockers
 * prevent ad blockers from breaking sites where plugin scripts are running
-* ad blocking detection: show alternative content to ad block users with [Advanced Ads Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-3) and improve the monetization of your website
+* ad blocker detection: show alternative content to ad block users and improve the monetization of your website [Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-4) 
 
 Learn more on the [plugin homepage](https://wpadvancedads.com).
@@ -188 +206 @@
 - BuddyPress – [How to add ads on BuddyPress pages](https://wpadvancedads.com/ads-on-buddypress-pages/)
 - bbPress – [How to show ads on bbPress pages?](https://wpadvancedads.com/ads-in-bbpress/)
-- Cookie Consent, Borlabs Cookies, Complianz, GDPR Cookie Consent, and other content manager – [How to show ads based on visitors’ consent](https://wpadvancedads.com/manual/ad-cookie-consent/)
+- Cookie Consent, Borlabs Cookies, Complianz, GDPR Cookie Consent, and other privacy and consent manager – [How to show ads based on visitors’ consent](https://wpadvancedads.com/manual/ad-cookie-consent/)
 - Elementor - [How to create and implement ads in Elementor](https://wpadvancedads.com/elementor-ads/)
 - GamiPress – [How to target ads on GamiPress websites](https://wpadvancedads.com/manual/gamipress-ads/)
 - Genesis – [Genesis Ads add-on](https://wpadvancedads.com/add-ons/genesis-ads/)
-- [IAB TCF 2.0 consent](https://wpadvancedads.com/manual/tcf-consent-wordpress/) – hide ads until users give their consent. Integrating with any CMP, Quantcast Choices, iubenda, Google Funding Choices, cookiebot, etc.
+- [IAB TCF 2.0 consent](https://wpadvancedads.com/manual/tcf-consent-wordpress/) – hide ads until users give their consent. Integrating with any CMP, InMobi, iubenda, Google Funding Choices, cookiebot, etc.
 - LearnDash - [How to integrate ads into LearnDash](https://wpadvancedads.com/learndash-ads/)
 - MailPoet - [How to integrate Advanced Ads in MailPoet Newsletters](https://wpadvancedads.com/mailpoet-newsletters/)
@@ -201 +219 @@
 - WPBakery Page Builder – [Displaying Ads with WPBakery Page Builder](https://wpadvancedads.com/visual-composer-ads/)
 - WPML – [Showing different ads per language with WPML](https://wpadvancedads.com/translating-ads-wpml/)
+- Youzify – [How to integrate ads in Youzify](https://wpadvancedads.com/how-to-integrate-ads-in-youzify/)
 
 == Installation ==
@@ -241 +260 @@
 * Ads not showing up? Take a look [here](https://wpadvancedads.com/manual/ads-not-showing-up).
 
-= What about my users’ privacy and GDPR? =
+= What about my users’ privacy and GDPR compliance? =
 
 The plugin comes with Privacy settings that help you gather consent from users before showing ads to them. The feature works for any ads managed with the plugin, including AdSense Auto ads.
@@ -257 +276 @@
 = Which ad networks are supported? =
 
-Advanced Ads is compatible with all ad networks and banners from affiliate programs like AWin, Google AdSense, Chitika, Clickbank, Amazon, and also Google Ad Manager (formerly Google DoubleClick for Publishers, DFP), media.net.
-
-You can also use it to insert additional ad network tags into header or footer of your site without coding.
-
-AdSense has even a dedicated ad type leveling the specific options this ad network provides.
+Advanced Ads is compatible with all ad networks and banners from affiliate programs like Awin, Google AdSense, Chitika, Clickbank, CJ Affiliate, Amazon, ShareASale, Impact, Rakuten, Booking.com, GetYourGuide, media.net, and also Google Ad Manager (formerly Google DoubleClick for Publishers, DFP).
+
+You can also use it to insert additional ad network tags into your site's header or footer without coding to integrate header bidding.
+Advanced Ads even provides a dedicated AdSense ad type to leverage this ad network's specific options.
 
 = PHP functions and shortcodes =
@@ -284 +302 @@
 `<?php the_ad_placement('header-left'); ?>`
 
-= Is there a revenue share? =
-
-There is no revenue share. Advanced Ads doesn’t alter your ad codes in a way that you earn less than you would directly including the ad code in your template.
+= Is there an ad revenue share? =
+
+There is no revenue sharing. Advanced Ads doesn’t alter your ad codes in a way that you earn less than you would directly including the ad code in your template. To implement revenue sharing between multiple authors, follow the instructions of [this tutorial](https://wpadvancedads.com/publisher-revenue-share/).
 
 = Can I place ads directly in my theme files? =
@@ -339 +357 @@
 == Changelog ==
 
-= 1.53.2 (August 13, 2024) =
-
-- Fix: ensure content from a group shows in all content placements
-
-= 1.53.1 (August 13, 2024) =
-
-- Fix: resolve issue with deleting data on uninstall
-- Fix: resolve JavaScript error when uninstall
-
-= 1.53.0 (August 6, 2024) =
-
-- Improvement: add quick & bulk edit for "disable" ads on post/pages
-- Fix: correct handling of conditions array when no conditions are set for an ad
-- Fix: add drafted ads to group statistics on the statistic page
+= 1.54.0 (September 2, 2024) =
+
+- Improvement: enhance PubGuru one click integration
+- Fix: prevent PHP warning when using ad debug
+- Fix: readd drafted ads to group statistics on the statistic page
+- Fix: resolve issue with ad blocker detection

advanced-ads/tags/1.54.0/views/admin/metabox-pubguru-connect.php

@@ -7 +7 @@
  */
 
-if ( false === $pubguru_config ) : ?>
+use AdvancedAds\Modules\OneClick\Options;
 
-<div class="pubguru-not-connected space-y-4">
+$header_bidding = Options::module( 'header_bidding' );
+?>
+<div class="pubguru-not-connected space-y-4<?php echo false === $pubguru_config ? '' : ' hidden'; ?>">
     <label for="m2-connect-consent" class="flex items-center w-full">
         <span class="self-start">
@@ -28 +30 @@
 
     <div class="flex items-center gap-x-4">
-        <button class="button button-primary js-pubguru-connect" disabled type="button"><?php esc_html_e( 'Connect PGHB', 'advanced-ads' ); ?></button>
+        <button class="button button-primary js-pubguru-connecting" disabled type="button"><?php esc_html_e( 'Connect PGHB', 'advanced-ads' ); ?></button>
         <div class="lds-ripple aa-spinner"><div></div><div></div></div>
     </div>
 </div>
-<?php endif; ?>
 
 <div class="pubguru-connected<?php echo false === $pubguru_config ? ' hidden' : ''; ?>">
@@ -47 +48 @@
             <div>
                 <label for="pubguru-header-bidding" class="advads-ui-switch">
-                    <input type="checkbox" name="header_bidding" id="pubguru-header-bidding" class="sr-only peer" <?php checked( boolval( get_option( 'pubguru_module_header_bidding', false ) ) ); ?>>
+                    <input type="checkbox" name="header_bidding" id="pubguru-header-bidding" class="sr-only peer" <?php checked( $header_bidding ); ?>>
                     <div></div>
                     <span>
@@ -55 +56 @@
             </div>
 
-            <div>
-                <label for="pubguru-tag-conversion" class="advads-ui-switch">
-                    <input type="checkbox" name="tag_conversion" id="pubguru-tag-conversion" <?php checked( boolval( get_option( 'pubguru_module_tag_conversion', false ) ) ); ?> />
+            <div<?php echo $header_bidding ? ' style="margin-left: 20px;"' : ' style="display: none;"'; ?>>
+                <label for="pubguru-header-bidding-at-body" class="advads-ui-switch">
+                    <input type="checkbox" name="header_bidding_at_body" id="pubguru-header-bidding-at-body" class="sr-only peer" <?php checked( Options::module( 'header_bidding_at_body' ) ); ?>>
                     <div></div>
                     <span>
-                        <?php esc_html_e( 'Activate Tag Conversion', 'advanced-ads' ); ?>
+                        <?php esc_html_e( 'Move the PubGuru Header Bidding script to the footer. Keep this option disabled to maximize revenue. Only enable it if PageSpeed is your priority.', 'advanced-ads' ); ?>
                     </span>
                 </label>
@@ -67 +68 @@
             <div>
                 <label for="pubguru-adstxt" class="advads-ui-switch">
-                    <input type="checkbox" name="ads_txt" id="pubguru-adstxt" <?php checked( boolval( get_option( 'pubguru_module_ads_txt', false ) ) ); ?> />
+                    <input type="checkbox" name="ads_txt" id="pubguru-adstxt" <?php checked( Options::module( 'ads_txt' ) ); ?> />
                     <div></div>
                     <span>
@@ -86 +87 @@
             </div>
 
-            <div>
+            <div class="hidden">
                 <label for="pubguru-traffic-cop" class="advads-ui-switch">
-                    <input type="checkbox" name="traffic_cop" id="pubguru-traffic-cop" <?php checked( boolval( get_option( 'pubguru_module_traffic_cop', false ) ) ); ?> />
+                    <input type="checkbox" name="traffic_cop" id="pubguru-traffic-cop" <?php checked( Options::module( 'traffic_cop' ) ); ?> />
                     <div></div>
                     <span class="pg-tc-trail <?php echo $has_traffic_cop ? 'hidden' : ''; ?>">
@@ -99 +100 @@
             </div>
 
+            <div class="hidden">
+                <label for="pubguru-tag-conversion" class="advads-ui-switch">
+                    <input type="checkbox" name="tag_conversion" id="pubguru-tag-conversion" <?php checked( Options::module( 'tag_conversion' ) ); ?> />
+                    <div></div>
+                    <span>
+                        <?php esc_html_e( 'Activate Tag Conversion', 'advanced-ads' ); ?>
+                    </span>
+                </label>
+            </div>
+
         </div>
 
@@ -104 +115 @@
 
 </div>
+
+<?php
+$session_key = get_option( 'advanced-ads-importer-history' );
+if ( $session_key ) :
+    $delete_link = wp_nonce_url(
+        add_query_arg(
+            [
+                'action'      => 'advads_import_delete',
+                'session_key' => $session_key,
+            ]
+        ),
+        'advads_import_delete'
+    );
+    ?>
+<div class="rollback-block">
+    <header><?php esc_html_e( 'Rollback', 'advanced-ads' ); ?></header>
+    <a href="<?php echo esc_url( $delete_link ); ?>" class="button-link !text-red-500"><?php esc_html_e( 'Rollback the api changes back to previous state.', 'advanced-ads' ); ?></a>
+</div>
+<?php endif; ?>

advanced-ads/trunk/admin/assets/css/admin.css

@@ -1435 +1435 @@
     text-decoration: underline;
 }
+
+.rollback-block header {
+    background-color: #f9f9f9;
+    border: solid #c3c4c7;
+    padding: 10px;
+    margin: 30px -12px 15px;
+    border-width: 1px 0;
+}

advanced-ads/trunk/admin/class-advanced-ads-admin.php

@@ -2 +2 @@
 // phpcs:ignoreFile
 
+use AdvancedAds\Importers\Api_Ads;
+use AdvancedAds\Utilities\WordPress;
 use AdvancedAds\Utilities\Conditional;
-use AdvancedAds\Utilities\WordPress;
+use AdvancedAds\Framework\Utilities\Params;
 
 /**
@@ -106 +108 @@
         // update placements.
         add_action( 'admin_init', [ 'Advanced_Ads_Placements', 'update_placements' ] );
+        add_action( 'admin_init', [ $this, 'api_import_rollback' ] );
 
         // add Advanced Ads admin notices
@@ -483 +486 @@
         echo '</span>';
     }
+
+    public function api_import_rollback() {
+        if ( 'advads_import_delete' !== Params::get( 'action' ) ) {
+            return;
+        }
+
+        check_admin_referer( 'advads_import_delete' );
+
+        $session_key = Params::get( 'session_key' );
+        $db_session  = get_option( 'advanced-ads-importer-history' );
+
+        if ( $session_key !== $db_session ) {
+            add_action( 'all_admin_notices', [ $this, 'import_error' ] );
+            return;
+        }
+
+        ( new Api_Ads() )->rollback( $session_key);
+        delete_option( 'advanced-ads-importer-history' );
+        add_action( 'all_admin_notices', [ $this, 'import_success' ] );
+    }
+
+    public function import_error() {
+        ?>
+        <div class="notice notice-error">
+            <p><strong>Error:</strong> Session key not matched.</p>
+        </div>
+        <?php
+    }
+
+    public function import_success() {
+        ?>
+        <div class="notice notice-success">
+            <p><strong>Success:</strong> the rollback is completed.</p>
+        </div>
+        <?php
+    }
 }

advanced-ads/trunk/admin/includes/class-meta-box.php

@@ -2 +2 @@
 // phpcs:ignoreFile
 
-use AdvancedAds\Assets_Registry;
 use AdvancedAds\Entities;
 use AdvancedAds\Utilities\WordPress;
@@ -70 +69 @@
 
         if ( 'index.php' === $pagenow ) {
-            Assets_Registry::enqueue_script( 'wp-widget-adsense' );
+            wp_advads()->registry->enqueue_script( 'wp-widget-adsense' );
         }
     }

advanced-ads/trunk/advanced-ads.php

@@ -4 +4 @@
  *
  * @package   Advanced_Ads
- * @author    Advanced Ads GmbH <[email protected]>
+ * @author    Advanced Ads <[email protected]>
  * @license   GPL-2.0+
  * @link      https://wpadvancedads.com
@@ -13 +13 @@
  * Plugin URI:        https://wpadvancedads.com
  * Description:       Manage and optimize your ads in WordPress
- * Version:           1.53.2
- * Author:            Advanced Ads GmbH
+ * Version:           1.54.0
+ * Author:            Advanced Ads
  * Author URI:        https://wpadvancedads.com
  * Text Domain:       advanced-ads
@@ -34 +34 @@
 
 define( 'ADVADS_FILE', __FILE__ );
-define( 'ADVADS_VERSION', '1.53.2' );
+define( 'ADVADS_VERSION', '1.54.0' );
 
 // Load the autoloader.

advanced-ads/trunk/assets/css/app.css

@@ -1 @@
-.sr-only{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.visible{visibility:visible}.static{position:static}.fixed{position:fixed}.\!mr-2{margin-right:.5rem!important}.\!mt-1{margin-top:.25rem!important}.mb-6{margin-bottom:1.5rem}.inline{display:inline}.flex{display:flex}.table{display:table}.grid{display:grid}.hidden{display:none}.w-full{width:100%}.items-center{align-items:center}.gap-x-4{column-gap:1rem}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1rem*var(--tw-space-y-reverse));margin-top:calc(1rem*(1 - var(--tw-space-y-reverse)))}.self-start{align-self:flex-start}.text-base{font-size:1rem;line-height:1.5rem}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.lds-ripple{display:none;height:40px;position:relative;width:40px}.lds-ripple.show{display:inline-block}.lds-ripple div{animation:lds-ripple 1s cubic-bezier(0,.2,.8,1) infinite;border:4px solid #ccc;border-radius:50%;opacity:1;position:absolute}.lds-ripple div:nth-child(2){animation-delay:-.5s}@keyframes lds-ripple{0%{height:0;left:20px;opacity:0;top:20px;width:0}4.9%{height:0;left:20px;opacity:0;top:20px;width:0}5%{height:0;left:20px;opacity:1;top:20px;width:0}to{height:40px;left:0;opacity:0;top:0;width:40px}}.advads-ui-switch{align-items:center;cursor:pointer;display:inline-flex;position:relative}.advads-ui-switch-list>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1.25rem*var(--tw-space-y-reverse));margin-top:calc(1.25rem*(1 - var(--tw-space-y-reverse)))}.advads-ui-switch input{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.advads-ui-switch input:checked~div{--tw-bg-opacity:1;background-color:rgb(4 116 162/var(--tw-bg-opacity))}.advads-ui-switch input:checked~div:after{--tw-translate-x:100%;--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity));content:var(--tw-content);transform:translate(var(--tw-translate-x),var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))}.advads-ui-switch input:disabled~div:after{--tw-border-opacity:1;--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity));border-color:rgb(229 231 235/var(--tw-border-opacity));content:var(--tw-content)}.advads-ui-switch div{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity));border-radius:9999px;height:1.5rem;width:2.75rem}.advads-ui-switch div:after{--tw-border-opacity:1;--tw-bg-opacity:1;--tw-content:"";background-color:rgb(255 255 255/var(--tw-bg-opacity));border-color:rgb(209 213 219/var(--tw-border-opacity));border-radius:9999px;border-width:1px;content:var(--tw-content);height:1.25rem;left:2px;position:absolute;top:.125rem;transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);width:1.25rem}.advads-ui-switch span{font-size:.875rem;font-weight:500;line-height:1.25rem;margin-left:.75rem}#advads-m2-connect{display:none}#advads-m2-connect a{--tw-text-opacity:1;color:rgb(4 116 162/var(--tw-text-opacity))}
+.sr-only{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.visible{visibility:visible}.static{position:static}.fixed{position:fixed}.\!mr-2{margin-right:.5rem!important}.\!mt-1{margin-top:.25rem!important}.mb-6{margin-bottom:1.5rem}.inline{display:inline}.flex{display:flex}.table{display:table}.grid{display:grid}.hidden{display:none}.w-full{width:100%}.items-center{align-items:center}.gap-x-4{column-gap:1rem}.space-y-4>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1rem*var(--tw-space-y-reverse));margin-top:calc(1rem*(1 - var(--tw-space-y-reverse)))}.self-start{align-self:flex-start}.text-base{font-size:1rem;line-height:1.5rem}.filter{filter:var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow)}.lds-ripple{display:none;height:40px;position:relative;width:40px}.lds-ripple.show{display:inline-block}.lds-ripple div{animation:lds-ripple 1s cubic-bezier(0,.2,.8,1) infinite;border:4px solid #ccc;border-radius:50%;opacity:1;position:absolute}.lds-ripple div:nth-child(2){animation-delay:-.5s}@keyframes lds-ripple{0%{height:0;left:20px;opacity:0;top:20px;width:0}4.9%{height:0;left:20px;opacity:0;top:20px;width:0}5%{height:0;left:20px;opacity:1;top:20px;width:0}to{height:40px;left:0;opacity:0;top:0;width:40px}}.advads-ui-switch{align-items:center;cursor:pointer;display:inline-flex;position:relative}.advads-ui-switch-list>:not([hidden])~:not([hidden]){--tw-space-y-reverse:0;margin-bottom:calc(1.25rem*var(--tw-space-y-reverse));margin-top:calc(1.25rem*(1 - var(--tw-space-y-reverse)))}.advads-ui-switch input{clip:rect(0,0,0,0);border-width:0;height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;white-space:nowrap;width:1px}.advads-ui-switch input:checked~div{--tw-bg-opacity:1;background-color:rgb(4 116 162/var(--tw-bg-opacity))}.advads-ui-switch input:checked~div:after{--tw-border-opacity:1;border-color:rgb(255 255 255/var(--tw-border-opacity));content:var(--tw-content);left:auto;right:2px}.advads-ui-switch input:disabled~div:after{--tw-border-opacity:1;--tw-bg-opacity:1;background-color:rgb(243 244 246/var(--tw-bg-opacity));border-color:rgb(229 231 235/var(--tw-border-opacity));content:var(--tw-content)}.advads-ui-switch div{--tw-bg-opacity:1;background-color:rgb(229 231 235/var(--tw-bg-opacity));border-radius:9999px;border-width:1px;height:1.5rem;position:relative;width:2.75rem}.advads-ui-switch div:after{--tw-border-opacity:1;--tw-bg-opacity:1;--tw-content:"";background-color:rgb(255 255 255/var(--tw-bg-opacity));border-color:rgb(209 213 219/var(--tw-border-opacity));border-radius:9999px;border-width:1px;content:var(--tw-content);height:1.25rem;left:2px;position:absolute;top:.125rem;transition-duration:.15s;transition-property:all;transition-timing-function:cubic-bezier(.4,0,.2,1);width:1.25rem}.advads-ui-switch span{font-size:.875rem;font-weight:500;line-height:1.25rem;margin-left:.75rem}#advads-m2-connect{display:none}#advads-m2-connect a{--tw-text-opacity:1;color:rgb(4 116 162/var(--tw-text-opacity))}

advanced-ads/trunk/assets/js/app.js

@@ -1 @@
-(()=>{"use strict";var t,e={570:(t,e,n)=>{const a=jQuery;var o=n.n(a);function s(){var t,e,n,a,s;t=o()(".js-pubguru-connect"),e=t.next(".aa-spinner"),n=o()("#advads-m2-connect"),o()(".js-m2-show-consent").on("click",".button",(function(t){t.preventDefault();var e=o()(this).closest("tr");n.show(),e.addClass("hidden"),e.next().removeClass("hidden")})),o()(".js-pubguru-disconnect").on("click",".button",(function(t){t.preventDefault();var e=o()(this).closest("tr");n.hide(),e.addClass("hidden"),e.prev().removeClass("hidden"),o().ajax({type:"POST",url:ajaxurl,data:{action:"pubguru_disconnect",nonce:advadsglobal.ajax_nonce},dataType:"json"}).done((function(t){if(t.success){var n=o()('<div class="notice notice-success" />');n.html("<p>"+t.data.message+"</p>"),e.closest(".postbox").after(n),setTimeout((function(){n.fadeOut(500,(function(){n.remove()}))}),3e3)}}))})),o()("#m2-connect-consent").on("change",(function(){var e=o()(this);t.prop("disabled",!e.is(":checked"))})),o()("#advads-overview").on("click",".notice-dismiss",(function(t){t.preventDefault();var e=o()(this).parent();e.fadeOut(500,(function(){e.remove()}))})),t.on("click",(function(n){n.preventDefault(),e.addClass("show"),o().ajax({type:"POST",url:ajaxurl,data:{action:"pubguru_connect",nonce:advadsglobal.ajax_nonce},dataType:"json"}).done((function(t){t.success&&(o()(".pubguru-not-connected").hide(),o()(".pubguru-connected").removeClass("hidden"),o()(".pg-tc-trail").toggle(!t.data.hasTrafficCop),o()(".pg-tc-install").toggle(t.data.hasTrafficCop))})).fail((function(e){var n=e.responseJSON,a=o()('<div class="notice notice-error is-dismissible" />');a.html("<p>"+n.data+'</p><button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span></button>'),t.closest(".postbox").after(a)})).complete((function(){return e.removeClass("show")}))})),a=o()("#pubguru-modules"),s=o()("#pubguru-notices"),a.on("input","input:checkbox",(function(){var t=o()(this),e=t.attr("name"),n=t.is(":checked");o().ajax({url:a.attr("action"),method:"POST",data:{action:"pubguru_module_change",security:a.data("security"),module:e,status:n}}).done((function(t){var e=t.data.notice,n=void 0===e?"":e;s.html(""),""!==n&&s.html(n)}))})),s.on("click",".js-btn-backup-adstxt",(function(){var t=o()(this);t.prop("disabled",!0),t.html(t.data("loading")),o().ajax({url:a.attr("action"),method:"POST",data:{action:"pubguru_backup_ads_txt",security:t.data("security")}}).done((function(e){e.success?(t.html(t.data("done")),setTimeout((function(){s.fadeOut("slow",(function(){s.html("")}))}),4e3)):t.html(t.data("text"))})).fail((function(){t.html(t.data("text"))}))}))}o()((function(){s()}))},576:()=>{}},n={};function a(t){var o=n[t];if(void 0!==o)return o.exports;var s=n[t]={exports:{}};return e[t](s,s.exports,a),s.exports}a.m=e,t=[],a.O=(e,n,o,s)=>{if(!n){var c=1/0;for(d=0;d<t.length;d++){for(var[n,o,s]=t[d],i=!0,r=0;r<n.length;r++)(!1&s||c>=s)&&Object.keys(a.O).every((t=>a.O[t](n[r])))?n.splice(r--,1):(i=!1,s<c&&(c=s));if(i){t.splice(d--,1);var u=o();void 0!==u&&(e=u)}}return e}s=s||0;for(var d=t.length;d>0&&t[d-1][2]>s;d--)t[d]=t[d-1];t[d]=[n,o,s]},a.n=t=>{var e=t&&t.__esModule?()=>t.default:()=>t;return a.d(e,{a:e}),e},a.d=(t,e)=>{for(var n in e)a.o(e,n)&&!a.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:e[n]})},a.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e),(()=>{var t={845:0,196:0};a.O.j=e=>0===t[e];var e=(e,n)=>{var o,s,[c,i,r]=n,u=0;if(c.some((e=>0!==t[e]))){for(o in i)a.o(i,o)&&(a.m[o]=i[o]);if(r)var d=r(a)}for(e&&e(n);u<c.length;u++)s=c[u],a.o(t,s)&&t[s]&&t[s][0](),t[s]=0;return a.O(d)},n=globalThis.webpackChunkadvanced_ads=globalThis.webpackChunkadvanced_ads||[];n.forEach(e.bind(null,0)),n.push=e.bind(null,n.push.bind(n))})(),a.O(void 0,[196],(()=>a(570)));var o=a.O(void 0,[196],(()=>a(576)));o=a.O(o)})();
+(()=>{"use strict";var e,t={612:(e,t,a)=>{const n=jQuery;var o=a.n(n);function s(e,t){var a=arguments.length>2&&void 0!==arguments[2]&&arguments[2],n=o()('<div class="notice notice-'.concat(t,' is-dismissible" />'));n.html("<p>"+e+'</p><button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span></button>'),o()("#pubguru-notices").append(n),a&&setTimeout((function(){n.fadeOut(500,(function(){n.remove()}))}),3e3)}function c(){var e,t,a,n,c,i,u,d,r,l;e=o()(".js-pubguru-connect"),t=o()(".js-pubguru-disconnect"),a=o()("#advads-m2-connect"),n=o()(".js-pubguru-connecting"),c=n.next(".aa-spinner"),i=o()(".pubguru-connected"),u=o()(".pubguru-not-connected"),e.on("click",".button",(function(e){e.preventDefault(),a.show()})),o()("#m2-connect-consent").on("change",(function(){var e=o()(this);n.prop("disabled",!e.is(":checked"))})),n.on("click",(function(a){a.preventDefault(),c.addClass("show"),o().ajax({type:"POST",url:ajaxurl,data:{action:"pubguru_connect",nonce:advadsglobal.ajax_nonce},dataType:"json"}).done((function(a){a.success&&(u.addClass("hidden"),e.addClass("hidden"),i.removeClass("hidden"),t.removeClass("hidden"),o()(".pg-tc-trail").toggle(!a.data.hasTrafficCop),o()(".pg-tc-install").toggle(a.data.hasTrafficCop),s(a.data.message,"success",!0))})).fail((function(e){s(e.responseJSON.data,"error")})).complete((function(){return c.removeClass("show")}))})),t.on("click",".button",(function(n){n.preventDefault(),a.hide(),u.removeClass("hidden"),e.removeClass("hidden"),i.addClass("hidden"),t.addClass("hidden"),o().ajax({type:"POST",url:ajaxurl,data:{action:"pubguru_disconnect",nonce:advadsglobal.ajax_nonce},dataType:"json"}).done((function(e){e.success&&s(e.data.message,"success",!0)}))})),d=o()("#pubguru-modules"),r=o()("#pubguru-notices"),l=o()("#pubguru-header-bidding-at-body").closest("div"),d.on("input","input:checkbox",(function(){var e=o()(this),t=e.attr("name"),a=e.is(":checked");"header_bidding"===t&&l.toggle(a),o().ajax({url:d.attr("action"),method:"POST",data:{action:"pubguru_module_change",security:d.data("security"),module:t,status:a}}).done((function(e){var t=e.data.notice,a=void 0===t?"":t;r.html(""),""!==a&&r.html(a)}))})),o()(document).on("click",".js-btn-backup-adstxt",(function(){var e=o()(this),t=e.closest(".notice");e.prop("disabled",!0),e.html(e.data("loading")),o().ajax({url:d.attr("action"),method:"POST",data:{action:"pubguru_backup_ads_txt",security:e.data("security")}}).always((function(){e.prop("disabled",!1),e.html(e.data("text"))})).done((function(e){if(e.success){var a=o()(e.data);r.html(a),t.after(a),t.remove(),setTimeout((function(){a.fadeOut("slow",(function(){a.html("")}))}),4e3)}else r.html(e.data),t.after(e.data)}))})),o()("#advads-overview").on("click",".notice-dismiss",(function(e){e.preventDefault();var t=o()(this).parent();t.fadeOut(500,(function(){t.remove()}))}))}o()((function(){c()}))},576:()=>{}},a={};function n(e){var o=a[e];if(void 0!==o)return o.exports;var s=a[e]={exports:{}};return t[e](s,s.exports,n),s.exports}n.m=t,e=[],n.O=(t,a,o,s)=>{if(!a){var c=1/0;for(r=0;r<e.length;r++){for(var[a,o,s]=e[r],i=!0,u=0;u<a.length;u++)(!1&s||c>=s)&&Object.keys(n.O).every((e=>n.O[e](a[u])))?a.splice(u--,1):(i=!1,s<c&&(c=s));if(i){e.splice(r--,1);var d=o();void 0!==d&&(t=d)}}return t}s=s||0;for(var r=e.length;r>0&&e[r-1][2]>s;r--)e[r]=e[r-1];e[r]=[a,o,s]},n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var a in t)n.o(t,a)&&!n.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:t[a]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),(()=>{var e={845:0,196:0};n.O.j=t=>0===e[t];var t=(t,a)=>{var o,s,[c,i,u]=a,d=0;if(c.some((t=>0!==e[t]))){for(o in i)n.o(i,o)&&(n.m[o]=i[o]);if(u)var r=u(n)}for(t&&t(a);d<c.length;d++)s=c[d],n.o(e,s)&&e[s]&&e[s][0](),e[s]=0;return n.O(r)},a=globalThis.webpackChunkadvanced_ads=globalThis.webpackChunkadvanced_ads||[];a.forEach(t.bind(null,0)),a.push=t.bind(null,a.push.bind(a))})(),n.O(void 0,[196],(()=>n(612)));var o=n.O(void 0,[196],(()=>n(576)));o=n.O(o)})();

advanced-ads/trunk/assets/scss/ui/_switch.scss

@@ -10 +10 @@
 
         &:checked ~ div {
-            @apply after:translate-x-full after:border-white bg-primary;
+            @apply bg-primary after:left-auto after:right-[2px] after:border-white;
         }
 
@@ -19 +19 @@
 
     div {
-        @apply w-11 h-6 bg-gray-200 rounded-full;
+        @apply relative w-11 h-6 bg-gray-200 rounded-full border;
 
         &::after {

advanced-ads/trunk/assets/src/modules/oneclick/connect-button.js

@@ -1 +1 @@
 import jQuery from 'jquery';
 
+function createNotice(message, type, fadeAway = false) {
+    const notice = jQuery(
+        `<div class="notice notice-${type} is-dismissible" />`
+    );
+    notice.html(
+        '<p>' +
+            message +
+            '</p>' +
+            '<button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span></button>'
+    );
+
+    jQuery('#pubguru-notices').append(notice);
+
+    if (fadeAway) {
+        setTimeout(() => {
+            notice.fadeOut(500, () => {
+                notice.remove();
+            });
+        }, 3000);
+    }
+}
+
 export default function () {
-    const pubguruConnectButton = jQuery('.js-pubguru-connect');
-    const spinner = pubguruConnectButton.next('.aa-spinner');
+    const connectWrap = jQuery('.js-pubguru-connect');
+    const disconnectWrap = jQuery('.js-pubguru-disconnect');
     const metabox = jQuery('#advads-m2-connect');
+    const connectButton = jQuery('.js-pubguru-connecting');
+    const spinner = connectButton.next('.aa-spinner');
+    const contentConnected = jQuery('.pubguru-connected');
+    const contentNotConnected = jQuery('.pubguru-not-connected');
 
-    jQuery('.js-m2-show-consent').on('click', '.button', function (event) {
+    // Show consent box.
+    connectWrap.on('click', '.button', function (event) {
         event.preventDefault();
-
-        const tr = jQuery(this).closest('tr');
-
         metabox.show();
-        tr.addClass('hidden');
-        tr.next().removeClass('hidden');
-    });
-
-    jQuery('.js-pubguru-disconnect').on('click', '.button', function (event) {
-        event.preventDefault();
-
-        const tr = jQuery(this).closest('tr');
-
-        metabox.hide();
-        tr.addClass('hidden');
-        tr.prev().removeClass('hidden');
-
-        jQuery
-            .ajax({
-                type: 'POST',
-                url: ajaxurl,
-                data: {
-                    action: 'pubguru_disconnect',
-                    nonce: advadsglobal.ajax_nonce,
-                },
-                dataType: 'json',
-            })
-            .done(function (response) {
-                if (!response.success) {
-                    return;
-                }
-
-                const notice = jQuery('<div class="notice notice-success" />');
-                notice.html('<p>' + response.data.message + '</p>');
-
-                tr.closest('.postbox').after(notice);
-                setTimeout(function () {
-                    notice.fadeOut(500, function () {
-                        notice.remove();
-                    });
-                }, 3000);
-            });
     });
 
     jQuery('#m2-connect-consent').on('change', function () {
         const checkbox = jQuery(this);
-        pubguruConnectButton.prop('disabled', !checkbox.is(':checked'));
+        connectButton.prop('disabled', !checkbox.is(':checked'));
     });
 
-    jQuery('#advads-overview').on('click', '.notice-dismiss', function (event) {
-        event.preventDefault();
-        const button = jQuery(this);
-        const notice = button.parent();
-        notice.fadeOut(500, function () {
-            notice.remove();
-        });
-    });
-
-    pubguruConnectButton.on('click', function (event) {
+    connectButton.on('click', function (event) {
         event.preventDefault();
 
@@ -85 +62 @@
                 }
 
-                jQuery('.pubguru-not-connected').hide();
-                jQuery('.pubguru-connected').removeClass('hidden');
+                contentNotConnected.addClass('hidden');
+                connectWrap.addClass('hidden');
+                contentConnected.removeClass('hidden');
+                disconnectWrap.removeClass('hidden');
 
                 jQuery('.pg-tc-trail').toggle(!response.data.hasTrafficCop);
                 jQuery('.pg-tc-install').toggle(response.data.hasTrafficCop);
+                createNotice(response.data.message, 'success');
             })
             .fail(function (jqXHR) {
                 const response = jqXHR.responseJSON;
-                const notice = jQuery(
-                    '<div class="notice notice-error is-dismissible" />'
-                );
-                notice.html(
-                    '<p>' +
-                        response.data +
-                        '</p>' +
-                        '<button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span></button>'
-                );
-
-                pubguruConnectButton.closest('.postbox').after(notice);
+                createNotice(response.data, 'error');
             })
             .complete(() => spinner.removeClass('show'));
     });
+
+    disconnectWrap.on('click', '.button', function (event) {
+        event.preventDefault();
+
+        metabox.hide();
+        contentNotConnected.removeClass('hidden');
+        connectWrap.removeClass('hidden');
+        contentConnected.addClass('hidden');
+        disconnectWrap.addClass('hidden');
+
+        jQuery
+            .ajax({
+                type: 'POST',
+                url: ajaxurl,
+                data: {
+                    action: 'pubguru_disconnect',
+                    nonce: advadsglobal.ajax_nonce,
+                },
+                dataType: 'json',
+            })
+            .done(function (response) {
+                if (!response.success) {
+                    return;
+                }
+
+                createNotice(response.data.message, 'success', true);
+            });
+    });
 }

advanced-ads/trunk/assets/src/modules/oneclick/index.js

@@ +1 @@
+import jQuery from 'jquery';
+
 import connectButton from './connect-button';
-import settingsUi from './settings';
+import connectSettings from './connect-settings';
 
 export default function () {
     connectButton();
-    settingsUi();
+    connectSettings();
+
+    jQuery('#advads-overview').on('click', '.notice-dismiss', function (event) {
+        event.preventDefault();
+        const button = jQuery(this);
+        const notice = button.parent();
+        notice.fadeOut(500, function () {
+            notice.remove();
+        });
+    });
 }

advanced-ads/trunk/classes/ad-debug.php

@@ -247 +247 @@
             $content = '';
             foreach ( $_condition as $_k => $_v ) {
-                $content .= esc_html( $_k ) . ': ' . esc_html( $_v ) . '<br>';
+                $content .= esc_html( $_k ) . ': ';
+                if ( is_array( $_v ) ) {
+                    $content .= esc_html( implode( ', ', $_v ) );
+                } else {
+                    $content .= esc_html( $_v );
+                }
+                $content .= '<br />';
             }
 

advanced-ads/trunk/classes/ad_group.php

@@ -376 +376 @@
             'orderby'        => 'id', // Might want to avoid sorting as not needed for most calls and fast in PHP; slight I/O blocking concern.
         ];
+
+        if ( ! empty( $this->ad_args['post_status'] ) ) {
+            $args['post_status'] = array_unique( array_merge( (array) $args['post_status'], (array) $this->ad_args['post_status'] ) );
+        }
 
         $ads = new WP_Query( $args );

advanced-ads/trunk/classes/frontend_checks.php

@@ -2 +2 @@
 // phpcs:ignoreFile
 
-use AdvancedAds\Assets_Registry;
 use AdvancedAds\Utilities\WordPress;
 
@@ -53 +52 @@
 
         if( $this->has_adblocker_placements() ) {
-            if ( ! Assets_Registry::script_is('find-adblocker', 'enqueued') ) {
-                Assets_Registry::enqueue_script('find-adblocker');
+            if ( ! wp_advads()->registry->is_script('find-adblocker', 'enqueued') ) {
+                wp_advads()->registry->enqueue_script('find-adblocker');
             }
         }

advanced-ads/trunk/classes/in-content-injector.php

@@ -1 @@
-<?php
+<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName
 
 use AdvancedAds\Utilities\WordPress;
@@ -80 +80 @@
         }
 
-        // handle tags that are empty by definition or could be empty ("custom" option)
+        // Handle tags that are empty by definition or could be empty ("custom" option).
         if ( in_array( $tag_option, [ 'img', 'iframe', 'custom' ], true ) ) {
             $defaults['allowEmpty'] = true;
@@ -116 +116 @@
         switch ( $tag_option ) {
             case 'p':
-                // exclude paragraphs within blockquote tags
+                // Exclude paragraphs within blockquote tags.
                 $tag = 'p[not(parent::blockquote)]';
                 break;
             case 'pwithoutimg':
-                // convert option name into correct path, exclude paragraphs within blockquote tags
+                // Convert option name into correct path, exclude paragraphs within blockquote tags.
                 $tag = 'p[not(descendant::img) and not(parent::blockquote)]';
                 break;
@@ -133 +133 @@
                         contains(concat(' ', normalize-space(@class), ' '), ' gallery-size') or
                         contains(concat(' ', normalize-space(@class), ' '), ' wp-caption ') )";
-                $tag = "*[self::img or self::figure or self::div[$shortcodes]]
+                $tag        = "*[self::img or self::figure or self::div[$shortcodes]]
                     [not(ancestor::table or ancestor::figure or ancestor::div[$shortcodes])]";
                 break;
-            // any headline. By default h2, h3, and h4
+            // Any headline. By default h2, h3, and h4.
             case 'headlines':
                 $headlines = apply_filters( 'advanced-ads-headlines-for-ad-injection', [ 'h2', 'h3', 'h4' ] );
@@ -145 +145 @@
                 $tag = '*[' . implode( ' or ', $headlines ) . ']'; // /html/body/*[self::h2 or self::h3 or self::h4]
                 break;
-            // any HTML element that makes sense in the content
+            // Any HTML element that makes sense in the content.
             case 'anyelement':
                 $exclude = [
@@ -186 +186 @@
                 break;
             case 'custom':
-                // get the path for the "custom" tag choice, use p as a fallback to prevent it from showing any ads if users left it empty
+                // Get the path for the "custom" tag choice, use p as a fallback to prevent it from showing any ads if users left it empty.
                 $tag = ! empty( $placement_opts['xpath'] ) ? stripslashes( $placement_opts['xpath'] ) : 'p';
                 break;
@@ -194 +194 @@
         $xpath = new DOMXPath( $dom );
 
-
-        if ( $options['itemLimit'] !== -1 ) {
+        if ( -1 !== $options['itemLimit'] ) {
             $items = $xpath->query( '/html/body/' . $tag );
 
@@ -254 +253 @@
                     }
 
-                    // make sure that the ad is injected outside the link
+                    // Make sure that the ad is injected outside the link.
                     if ( 'img' === $tag_option && 'a' === $node->parentNode->tagName ) {
                         if ( $options['before'] ) {
                             $node->parentNode;
                         } else {
-                            // go one level deeper if inserted after to not insert the ad into the link; probably after the paragraph
+                            // Go one level deeper if inserted after to not insert the ad into the link; probably after the paragraph.
                             $node->parentNode->parentNode;
                         }
@@ -274 +273 @@
                 $ad_content = self::filter_ad_content( $ad_content, $node->tagName, $options );
 
-                // convert HTML to XML!
-                $ad_dom = new DOMDocument( '1.0', $wp_charset );
+                // Convert HTML to XML!.
+                $ad_dom                     = new DOMDocument( '1.0', $wp_charset );
                 $libxml_use_internal_errors = libxml_use_internal_errors( true );
                 $ad_dom->loadHtml( '<!DOCTYPE html><html><meta http-equiv="Content-Type" content="text/html; charset=' . $wp_charset . '" /><body>' . $ad_content );
@@ -314 +313 @@
                             }
                         } else {
-                            // append to body; -TODO using here that we only select direct children of the body tag.
+                            // Append to body; -TODO using here that we only select direct children of the body tag.
                             foreach ( $ad_dom->getElementsByTagName( 'body' )->item( 0 )->childNodes as $importedNode ) {
                                 $importedNode = $dom->importNode( $importedNode, true );
@@ -341 +340 @@
              * * but there are enough elements on the site, but just in sub-containers
              */
-        } elseif ( WordPress::user_can( 'advanced_ads_manage_options' )
-                && $options['itemLimit'] !== -1
-                && empty( $plugin_options['content-injection-level-disabled'] ) ) {
+        } elseif (
+            WordPress::user_can( 'advanced_ads_manage_options' ) &&
+            -1 !== $options['itemLimit'] &&
+            empty( $plugin_options['content-injection-level-disabled'] )
+        ) {
 
             // Check if there are more elements without limitation.
@@ -363 +364 @@
 
         // phpcs:enable
-
         return $content;
     }
@@ -473 +473 @@
         // Add tags before/after which ad placehoders were injected.
         foreach ( $ads_for_placeholders as $ad_content ) {
-            $tag = $ad_content['tag'];
+            $alts = [];
+            $tag  = $ad_content['tag'];
 
             switch ( $ad_content['position'] ) {
@@ -492 +493 @@
             }
         }
+
         $alts       = array_unique( $alts );
         $tag_regexp = implode( '|', $alts );
@@ -527 +529 @@
                 }
             } else {
-                $count ++;
+                ++$count;
             }
         }
@@ -749 +751 @@
         return '//*[' . implode( ' or ', $query ) . ']';
     }
-
 }

advanced-ads/trunk/classes/plugin.php

@@ -90 +90 @@
      */
     public function wp_plugins_loaded() {
-        // Load plugin text domain.
-        $this->load_plugin_textdomain();
-
         // Load public-facing style sheet and JavaScript.
         add_action( 'wp_enqueue_scripts', [ $this, 'enqueue_scripts' ] );
@@ -267 +264 @@
 
     /**
-     * Load the plugin text domain for translation.
-     */
-    public function load_plugin_textdomain() {
-        load_plugin_textdomain( 'advanced-ads', false, ADVADS_BASE_DIR . '/languages' );
-    }
-
-    /**
      * Shortcode to include ad in frontend
      *

advanced-ads/trunk/includes/admin/class-assets.php

@@ -10 +10 @@
 namespace AdvancedAds\Admin;
 
+use AdvancedAds\Entities;
 use Advanced_Ads_AdSense_Admin;
 use Advanced_Ads_Display_Conditions;
-use AdvancedAds\Assets_Registry;
-use AdvancedAds\Entities;
-use AdvancedAds\Utilities\Data;
 use AdvancedAds\Utilities\Conditional;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
@@ -43 +41 @@
         $screen = get_current_screen();
 
-        Assets_Registry::enqueue_style( 'ui' );
-        Assets_Registry::enqueue_style( 'admin' );
+        wp_advads()->registry->enqueue_style( 'ui' );
+        wp_advads()->registry->enqueue_style( 'admin' );
 
         if ( 'post' === $screen->base && Entities::POST_TYPE_AD === $screen->post_type ) {
-            Assets_Registry::enqueue_style( 'ad-positioning' );
+            wp_advads()->registry->enqueue_style( 'ad-positioning' );
         }
     }
@@ -63 +61 @@
 
         // TODO: add conditional loading.
-        Assets_Registry::enqueue_script( 'admin-global' );
-        Assets_Registry::enqueue_script( 'find-adblocker' );
+        wp_advads()->registry->enqueue_script( 'admin-global' );
+        wp_advads()->registry->enqueue_script( 'find-adblocker' );
 
         $params = [
@@ -77 +75 @@
 
         if ( Conditional::is_screen_advanced_ads() ) {
-            Assets_Registry::enqueue_script( 'admin' );
-            Assets_Registry::enqueue_script( 'conditions' );
-            Assets_Registry::enqueue_script( 'wizard' );
+            wp_advads()->registry->enqueue_script( 'admin' );
+            wp_advads()->registry->enqueue_script( 'conditions' );
+            wp_advads()->registry->enqueue_script( 'wizard' );
 
             $translation_array = [
@@ -118 +116 @@
         // Ad edit screen.
         if ( 'post' === $screen->base && Entities::POST_TYPE_AD === $screen->post_type ) {
-            Assets_Registry::enqueue_script( 'ad-positioning' );
+            wp_advads()->registry->enqueue_script( 'ad-positioning' );
         }
 
         if ( in_array( $screen->id, [ 'edit-post', 'edit-page' ], true ) && current_user_can( 'edit_posts' ) ) {
-            Assets_Registry::enqueue_script( 'page-quick-edit' );
+            wp_advads()->registry->enqueue_script( 'page-quick-edit' );
             wp_advads()->json->add( 'page_quick_edit', [ 'nonce' => wp_create_nonce( 'advads-post-quick-edit' ) ] );
         }

advanced-ads/trunk/includes/class-assets-registry.php

@@ -10 +10 @@
 namespace AdvancedAds;
 
-use AdvancedAds\Framework\Interfaces\Integration_Interface;
-
 defined( 'ABSPATH' ) || exit;
 
@@ -17 +15 @@
  * Assets Registry.
  */
-class Assets_Registry implements Integration_Interface {
+class Assets_Registry extends \AdvancedAds\Framework\Assets_Registry {
 
     /**
-     * Enqueue stylesheet
+     * Version for plugin local assets.
      *
-     * @param string $handle Name of the stylesheet.
-     *
-     * @return void
+     * @return string
      */
-    public static function enqueue_style( $handle ): void {
-        wp_enqueue_style( self::prefix_it( $handle ) );
+    public function get_version(): string {
+        return ADVADS_VERSION;
     }
 
     /**
-     * Enqueue script
+     * Prefix to use in handle to make it unique.
      *
-     * @param string $handle Name of the script.
-     *
-     * @return void
+     * @return string
      */
-    public static function enqueue_script( $handle ): void {
-        wp_enqueue_script( self::prefix_it( $handle ) );
+    public function get_prefix(): string {
+        return ADVADS_SLUG;
     }
 
     /**
-     * Prefix the handle
-     *
-     * @param string $handle Name of the asset.
+     * Base URL for plugin local assets.
      *
      * @return string
      */
-    public static function prefix_it( $handle ): string {
-        return ADVADS_SLUG . '-' . $handle;
-    }
-
-    /**
-     * Determines whether a script has been added to the queue.
-     *
-     * @param string $handle Name of the script.
-     * @param string $status Optional. Status of the script to check. Default 'enqueued'.
-     *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
-     *
-     * @return bool
-     */
-    public static function script_is( $handle, $status = 'enqueued' ): bool {
-        return wp_script_is( self::prefix_it( $handle ), $status );
-    }
-
-    /**
-     * Hook into WordPress.
-     *
-     * @return void
-     */
-    public function hooks(): void {
-        add_action( 'admin_enqueue_scripts', [ $this, 'register_assets' ], 0 );
-        add_action( 'wp_enqueue_scripts', [ $this, 'register_assets' ], 0 );
-    }
-
-    /**
-     * Register assets
-     *
-     * @return void
-     */
-    public function register_assets(): void {
-        $this->register_styles();
-        $this->register_scripts();
+    public function get_base_url(): string {
+        return ADVADS_BASE_URL;
     }
 
@@ -94 +53 @@
             return;
         }
+
         $this->register_style( 'ui', 'admin/assets/css/ui.css' );
         $this->register_style( 'admin', 'admin/assets/css/admin.css' );
@@ -99 +59 @@
             $this->register_style( 'app', 'assets/css/app.css' );
         }
-        $this->register_style( 'ad-positioning', 'modules/ad-positioning/assets/css/ad-positioning.css', [ self::prefix_it( 'admin' ) ] );
+        $this->register_style( 'ad-positioning', 'modules/ad-positioning/assets/css/ad-positioning.css', [ $this->prefix_it( 'admin' ) ] );
     }
 
@@ -111 +71 @@
         $this->register_script( 'wp-widget-adsense', 'modules/gadsense/admin/assets/js/wp-widget.js', [ 'jquery' ], false, true );
         $this->register_script( 'app', 'assets/js/app.js', [ 'jquery' ], false, true );
+        $this->register_script( 'find-adblocker', 'admin/assets/js/advertisement.js' );
 
         if ( ! is_admin() ) {
@@ -117 +78 @@
 
         // Backend JS files go here.
-        $this->register_script( 'find-adblocker', 'admin/assets/js/advertisement.js' );
-        $this->register_script( 'conditions', 'admin/assets/js/conditions.js', [ 'jquery', self::prefix_it( 'ui' ) ] );
+        $this->register_script( 'conditions', 'admin/assets/js/conditions.js', [ 'jquery', $this->prefix_it( 'ui' ) ] );
         $this->register_script( 'wizard', 'admin/assets/js/wizard.js', [ 'jquery' ] );
         $this->register_script( 'inline-edit-group-ads', 'admin/assets/js/inline-edit-group-ads.js', [ 'jquery' ] );
-        $this->register_script( 'admin', 'admin/assets/js/admin.min.js', [ 'jquery', self::prefix_it( 'ui' ), 'jquery-ui-autocomplete', 'wp-util' ] );
+        $this->register_script( 'admin', 'admin/assets/js/admin.min.js', [ 'jquery', $this->prefix_it( 'ui' ), 'jquery-ui-autocomplete', 'wp-util' ] );
         $this->register_script( 'ui', 'admin/assets/js/ui.js', [ 'jquery' ] );
         $this->register_script( 'admin-global', 'admin/assets/js/admin-global.js', [ 'jquery' ], false, true );
         $this->register_script( 'page-quick-edit', 'assets/js/admin/page-quick-edit.js', [], false, true );
     }
-
-    /**
-     * Register stylesheet
-     *
-     * @param string           $handle Name of the stylesheet. Should be unique.
-     * @param string|bool      $src    URL of the stylesheet.
-     * @param string[]         $deps   Optional. An array of registered stylesheet handles this stylesheet depends on.
-     * @param string|bool|null $ver    Optional. String specifying stylesheet version number.
-     * @param string           $media  Optional. The media for which this stylesheet has been defined.
-     *
-     * @return void
-     */
-    private function register_style( $handle, $src, $deps = [], $ver = false, $media = 'all' ) {
-        if ( false === $ver ) {
-            $ver = ADVADS_VERSION;
-        }
-
-        wp_register_style( self::prefix_it( $handle ), ADVADS_BASE_URL . $src, $deps, $ver, $media );
-    }
-
-    /**
-     * Register script
-     *
-     * @param string           $handle    Name of the stylesheet. Should be unique.
-     * @param string|bool      $src       URL of the stylesheet.
-     * @param string[]         $deps      Optional. An array of registered stylesheet handles this stylesheet depends on.
-     * @param string|bool|null $ver       Optional. String specifying stylesheet version number.
-     * @param bool             $in_footer Optional. The media for which this stylesheet has been defined.
-     *
-     * @return void
-     */
-    private function register_script( $handle, $src, $deps = [], $ver = false, $in_footer = false ) {
-        if ( false === $ver ) {
-            $ver = ADVADS_VERSION;
-        }
-
-        $new_src = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? $src : str_replace( '.js', '.min.js', $src );
-        wp_register_script( self::prefix_it( $handle ), ADVADS_BASE_URL . $src, $deps, $ver, $in_footer );
-    }
 }

advanced-ads/trunk/includes/class-autoloader.php

@@ -51 +51 @@
 
     /**
+     * Get plugin directory.
+     *
+     * @return string
+     */
+    public function get_directory(): string {
+        return dirname( ADVADS_FILE );
+    }
+
+    /**
      * Runs this initializer.
      *
@@ -63 +72 @@
         }
 
-        $this->autoloader = require_once $locate;
+        $this->autoloader = require $locate;
         $this->register_wordpress();
     }
@@ -75 +84 @@
      */
     private function locate() {
-        $directory   = dirname( ADVADS_FILE );
-        $packages    = $directory . '/packages/autoload.php';
-        $vendors     = $directory . '/vendor/autoload.php';
-        $is_debug    = 'local' === ( function_exists( 'wp_get_environment_type' ) ? wp_get_environment_type() : $this->get_environment_type() );
-        $is_packages = is_readable( $packages );
-        $is_vendors  = is_readable( $vendors );
-
-        if ( $is_packages && ( ! $is_debug || ! $is_vendors ) ) {
+        $directory = $this->get_directory();
+        $packages  = $directory . '/packages/autoload.php';
+        $vendors   = $directory . '/vendor/autoload.php';
+        $is_debug  = $this->is_debug() || 'local' === $this->get_environment_type();
+
+        if ( is_readable( $packages ) && ( ! $is_debug || ! is_readable( $vendors ) ) ) {
             return $packages;
         }
 
-        if ( $is_vendors ) {
+        if ( is_readable( $vendors ) ) {
             return $vendors;
         }
@@ -135 +142 @@
      */
     public function get_environment_type(): string {
+        return function_exists( 'wp_get_environment_type' )
+            ? wp_get_environment_type()
+            : $this->get_environment_type_fallback();
+    }
+
+    /**
+     * Retrieves the current environment type.
+     *
+     * @return string
+     */
+    private function get_environment_type_fallback(): string {
         static $current_env = '';
 
@@ -184 +202 @@
         return $current_env;
     }
+
+    /**
+     * Is WordPress debug mode enabled
+     *
+     * @return bool
+     */
+    private function is_debug(): bool {
+        return defined( 'WP_DEBUG' ) && WP_DEBUG;
+    }
 }

advanced-ads/trunk/includes/class-plugin.php

@@ -11 +11 @@
 
 use AdvancedAds\Admin;
-use AdvancedAds\Groups;
 use AdvancedAds\Framework;
 use AdvancedAds\Framework\Loader;
@@ -20 +19 @@
 /**
  * Plugin.
+ *
+ * Containers:
+ *
+ * @property Shortcodes           $shortcodes Shortcodes handler.
+ * @property Assets_Registry      $registry   Assets registry.
+ * @property Framework\JSON       $json       JSON handler.
+ * @property Admin\Admin_Menu     $screens    Admin screens.
+ * @property Frontend\Ad_Renderer $renderer   Ads renderer.
+ * @property Frontend\Manager     $frontend   Frontend manager.
  */
 class Plugin extends Loader {
@@ -57 +65 @@
     private function setup(): void {
         $this->define_constants();
+        $this->includes_functions();
         $this->includes();
+        $this->includes_admin();
 
         /**
@@ -64 +74 @@
          * TODO: need to remove it in future.
          */
-
-        // Load public functions (might be used by modules, other plugins or theme).
-        require_once ADVADS_ABSPATH . 'includes/functions.php';
-        require_once ADVADS_ABSPATH . 'includes/cap_map.php';
-
         // Public-Facing and Core Functionality.
         \Advanced_Ads::get_instance();
@@ -78 +83 @@
         }
 
+        add_action( 'init', [ $this, 'load_textdomain' ] );
         add_action( 'plugins_loaded', [ $this, 'on_plugins_loaded' ], -1 );
+
+        // Load it all.
         $this->load();
     }
@@ -96 +104 @@
          */
         do_action( 'advanced-ads-loaded' );
+    }
+
+    /**
+     * Load the plugin text domain for translation.
+     *
+     * @return void
+     */
+    public function load_textdomain(): void {
+        $locale = get_user_locale();
+        $locale = apply_filters( 'plugin_locale', $locale, 'advanced-ads' );
+
+        unload_textdomain( 'advanced-ads' );
+        if ( false === load_textdomain( 'advanced-ads', WP_LANG_DIR . '/plugins/advanced-ads-' . $locale . '.mo' ) ) {
+            load_textdomain( 'advanced-ads', WP_LANG_DIR . '/advanced-ads/advanced-ads-' . $locale . '.mo' );
+        }
+
+        load_plugin_textdomain( 'advanced-ads', false, dirname( ADVADS_PLUGIN_BASENAME ) . '/languages' );
     }
 
@@ -145 +170 @@
      */
     private function includes(): void {
+        // Common.
         $this->register_initializer( Install::class );
         $this->register_integration( Entities::class );
-        $this->register_integration( Assets_Registry::class );
+        $this->register_integration( Assets_Registry::class, 'registry' );
         $this->register_integration( Framework\JSON::class, 'json', [ 'advancedAds' ] );
         $this->register_integration( Groups\Manager::class, 'group_manager' );
-
-        // Only in admin area.
-        if ( is_admin() ) {
-            $this->register_integration( Admin\Action_Links::class );
-            $this->register_integration( Admin\Assets::class );
-            $this->register_integration( Admin\Header::class );
-            $this->register_integration( Admin\TinyMCE::class );
-            $this->register_integration( Admin\Admin_Menu::class );
-            $this->register_integration( Admin\Page_Quick_Edit::class );
-        }
+    }
+
+    /**
+     * Includes files used in admin.
+     *
+     * @return void
+     */
+    private function includes_admin(): void {
+        // Early bail!!
+        if ( ! is_admin() ) {
+            return;
+        }
+
+        $this->register_integration( Admin\Action_Links::class );
+        $this->register_integration( Admin\Assets::class );
+        $this->register_integration( Admin\Header::class );
+        $this->register_integration( Admin\TinyMCE::class );
+        $this->register_integration( Admin\Admin_Menu::class );
+        $this->register_integration( Admin\Page_Quick_Edit::class );
+    }
+
+    /**
+     * Includes the necessary functions files.
+     *
+     * @return void
+     */
+    private function includes_functions(): void {
+        require_once ADVADS_ABSPATH . 'includes/functions.php';
+        require_once ADVADS_ABSPATH . 'includes/cap_map.php';
     }
 }

advanced-ads/trunk/languages/advanced-ads.pot

@@ -1 @@
-# Copyright (C) 2024 Advanced Ads GmbH
+# Copyright (C) 2024 Advanced Ads
 # This file is distributed under the GPL-2.0+.
 msgid ""
 msgstr ""
-"Project-Id-Version: Advanced Ads 1.53.1\n"
+"Project-Id-Version: Advanced Ads 1.53.2\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/advanced-ads/\n"
 "Last-Translator: Thomas Maier <[email protected]>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2024-08-13T12:34:04+00:00\n"
+"POT-Creation-Date: 2024-09-02T11:05:48+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.6.0\n"
@@ -16 +16 @@
 
 #. Plugin Name of the plugin
-#: admin/includes/class-meta-box.php:565
+#. Author of the plugin
+#: admin/includes/class-meta-box.php:564
 #: modules/gutenberg/includes/class-gutenberg.php:136
 msgid "Advanced Ads"
@@ -28 +29 @@
 #. Description of the plugin
 msgid "Manage and optimize your ads in WordPress"
-msgstr ""
-
-#. Author of the plugin
-msgid "Advanced Ads GmbH"
 msgstr ""
 
@@ -86 +83 @@
 #. translators: %s is empty here, but the string will be followed by a name of an ad unit.
 #: admin/includes/ad-health-notices.php:112
-#: classes/frontend_checks.php:280
+#: classes/frontend_checks.php:279
 msgid "Visible ads should not use the Header placement: %s"
 msgstr ""
 
 #: admin/includes/ad-health-notices.php:123
-#: classes/ad-debug.php:272
-#: classes/frontend_checks.php:267
+#: classes/ad-debug.php:278
+#: classes/frontend_checks.php:266
 msgid "Your website is using HTTPS, but the ad code contains HTTP and might not work."
 msgstr ""
@@ -295 +292 @@
 
 #: admin/includes/class-ad-type.php:953
-#: classes/frontend_checks.php:547
+#: classes/frontend_checks.php:546
 msgid "Get help"
 msgstr ""
@@ -439 +436 @@
 msgstr ""
 
-#: admin/includes/class-meta-box.php:50
+#: admin/includes/class-meta-box.php:49
 #: admin/includes/class-overview-widgets.php:68
 msgid "AdSense Earnings"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:101
+#: admin/includes/class-meta-box.php:100
 msgid "Ad Type"
 msgstr ""
 
 #. translators: 1: Name of ad unit
-#: admin/includes/class-meta-box.php:119
+#: admin/includes/class-meta-box.php:118
 msgid "Earnings of  %1$s"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:137
+#: admin/includes/class-meta-box.php:136
 #: includes/admin/class-groups-list-table.php:451
 #: views/admin/screens/placements.php:351
@@ -459 +456 @@
 msgstr ""
 
-#: admin/includes/class-meta-box.php:146
+#: admin/includes/class-meta-box.php:145
 msgid "Ad Parameters"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:154
+#: admin/includes/class-meta-box.php:153
 #: admin/includes/class-settings.php:73
 msgid "Layout / Output"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:162
+#: admin/includes/class-meta-box.php:161
 msgid "Targeting"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:171
+#: admin/includes/class-meta-box.php:170
 msgid "Increase your ad revenue"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:181
+#: admin/includes/class-meta-box.php:180
 msgid "Statistics"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:252
-#: admin/includes/class-meta-box.php:266
+#: admin/includes/class-meta-box.php:251
+#: admin/includes/class-meta-box.php:265
 #: admin/includes/class-overview-widgets.php:181
 #: admin/views/ad-main-metabox.php:29
@@ -502 +499 @@
 msgstr ""
 
+#: admin/includes/class-meta-box.php:269
+msgid "Video"
+msgstr ""
+
 #: admin/includes/class-meta-box.php:270
-msgid "Video"
-msgstr ""
-
-#: admin/includes/class-meta-box.php:271
 #: admin/views/conditions/ad-targeting-metabox.php:18
 #: classes/ad-debug.php:152
@@ -514 +511 @@
 msgstr ""
 
-#: admin/includes/class-meta-box.php:272
+#: admin/includes/class-meta-box.php:271
 #: admin/views/conditions/ad-targeting-metabox.php:37
 #: classes/ad-debug.php:239
@@ -522 +519 @@
 msgstr ""
 
-#: admin/includes/class-meta-box.php:304
+#: admin/includes/class-meta-box.php:303
 #: admin/includes/class-overview-widgets.php:64
 #: views/admin/page-bulk-edit.php:20
@@ -529 +526 @@
 msgstr ""
 
-#: admin/includes/class-meta-box.php:466
+#: admin/includes/class-meta-box.php:465
 msgid "Ad Settings"
 msgstr ""
 
 #. translators: %1$d is the number of ads, %2$s and %3$s are URLs.
-#: admin/includes/class-meta-box.php:581
+#: admin/includes/class-meta-box.php:580
 msgid "%1$d ads – <a href=\"%2$s\">manage</a> - <a href=\"%3$s\">new</a>"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:594
+#: admin/includes/class-meta-box.php:593
 msgid "Get the tutorial via email"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:603
+#: admin/includes/class-meta-box.php:602
 msgid "Get AdSense tips via email"
 msgstr ""
 
-#: admin/includes/class-meta-box.php:612
+#: admin/includes/class-meta-box.php:611
 msgid "Visit our blog for more articles about ad optimization"
 msgstr ""
 
 #. translators: %s is our URL.
-#: admin/includes/class-meta-box.php:667
+#: admin/includes/class-meta-box.php:666
 msgid "Latest posts on wpadvancedads.com"
 msgstr ""
@@ -585 +582 @@
 #: admin/views/notices/welcome-panel.php:15
 #: admin/views/placements-item.php:68
-#: includes/admin/class-assets.php:71
+#: includes/admin/class-assets.php:69
 #: views/admin/tables/groups/list-row-loop-none.php:17
 #: views/admin/tables/groups/list-row-option-ads.php:61
@@ -744 +741 @@
 #: admin/includes/class-overview-widgets.php:627
 #: admin/includes/class-overview-widgets.php:645
-#: classes/ad_group.php:650
+#: classes/ad_group.php:654
 msgid "Activate now"
 msgstr ""
@@ -778 +775 @@
 
 #: admin/includes/class-overview-widgets.php:733
-#: classes/ad_group.php:653
+#: classes/ad_group.php:657
 msgid "Get this add-on"
 msgstr ""
@@ -823 +820 @@
 
 #: admin/includes/class-settings.php:178
-#: classes/in-content-injector.php:609
+#: classes/in-content-injector.php:611
 msgid "Disable level limitation"
 msgstr ""
@@ -1703 +1700 @@
 
 #: admin/views/settings/general/block-bots.php:11
-#: classes/frontend_checks.php:138
+#: classes/frontend_checks.php:137
 msgid "You look like a bot"
 msgstr ""
@@ -2078 +2075 @@
 
 #. translators: %1$s is an URL, %2$s is a URL text
-#: classes/ad_group.php:659
+#: classes/ad_group.php:663
 msgid "It seems that a caching plugin is activated. Your ads might not rotate properly. The cache busting in Advanced Ads Pro will solve that. <a href=\"%1$s\" target=\"_blank\">%2$s.</a>"
 msgstr ""
@@ -2384 +2381 @@
 #: classes/display-conditions.php:318
 #: classes/visitor-conditions.php:317
-#: includes/admin/class-assets.php:84
+#: includes/admin/class-assets.php:82
 #: modules/gadsense/admin/views/external-ads-links.php:17
 #: modules/gadsense/admin/views/external-ads-links.php:22
@@ -2393 +2390 @@
 #: classes/display-conditions.php:318
 #: classes/visitor-conditions.php:317
-#: includes/admin/class-assets.php:85
+#: includes/admin/class-assets.php:83
 msgid "and"
 msgstr ""
@@ -2564 +2561 @@
 msgstr ""
 
-#: classes/frontend_checks.php:123
+#: classes/frontend_checks.php:122
 msgid "Random AdSense ads"
 msgstr ""
 
-#: classes/frontend_checks.php:152
+#: classes/frontend_checks.php:151
 msgid "Ad blocker enabled"
 msgstr ""
 
-#: classes/frontend_checks.php:164
+#: classes/frontend_checks.php:163
 msgid "<em>%s</em> filter does not exist"
 msgstr ""
 
-#: classes/frontend_checks.php:180
+#: classes/frontend_checks.php:179
 msgid "Ads are disabled in the content of this page"
 msgstr ""
 
-#: classes/frontend_checks.php:192
+#: classes/frontend_checks.php:191
 msgid "the current post ID is 0 "
 msgstr ""
 
-#: classes/frontend_checks.php:211
+#: classes/frontend_checks.php:210
 msgid "Ads are disabled on this page"
 msgstr ""
 
-#: classes/frontend_checks.php:225
+#: classes/frontend_checks.php:224
 msgid "Ads are disabled on all pages"
 msgstr ""
 
-#: classes/frontend_checks.php:240
+#: classes/frontend_checks.php:239
 msgid "Ads are disabled on 404 pages"
 msgstr ""
 
-#: classes/frontend_checks.php:254
+#: classes/frontend_checks.php:253
 msgid "Ads are disabled on non singular pages"
 msgstr ""
 
-#: classes/frontend_checks.php:268
+#: classes/frontend_checks.php:267
 msgid "Ad IDs: %s"
 msgstr ""
 
+#: classes/frontend_checks.php:295
+msgid "AdSense violation"
+msgstr ""
+
 #: classes/frontend_checks.php:296
-msgid "AdSense violation"
+msgid "Ad is hidden"
 msgstr ""
 
 #: classes/frontend_checks.php:297
-msgid "Ad is hidden"
-msgstr ""
-
-#: classes/frontend_checks.php:298
 msgid "IDs: %s"
 msgstr ""
 
-#: classes/frontend_checks.php:314
+#: classes/frontend_checks.php:313
 msgid "The following responsive AdSense ads are not showing up: %s"
 msgstr ""
 
-#: classes/frontend_checks.php:331
+#: classes/frontend_checks.php:330
 msgid "Consent not given"
 msgstr ""
 
-#: classes/frontend_checks.php:348
+#: classes/frontend_checks.php:347
 msgid "Enable TCF integration"
 msgstr ""
 
-#: classes/frontend_checks.php:363
+#: classes/frontend_checks.php:362
 msgid "Debug Google Ad Manager"
 msgstr ""
 
-#: classes/frontend_checks.php:380
+#: classes/frontend_checks.php:379
 msgid "highlight ads"
 msgstr ""
 
-#: classes/frontend_checks.php:500
+#: classes/frontend_checks.php:499
 msgid "Ad Health"
 msgstr ""
 
-#: classes/frontend_checks.php:515
+#: classes/frontend_checks.php:514
 msgid "Show %d more notifications"
 msgstr ""
 
-#: classes/frontend_checks.php:534
+#: classes/frontend_checks.php:533
 msgid "Everything is fine"
 msgstr ""
 
-#: classes/frontend_checks.php:605
+#: classes/frontend_checks.php:604
 msgid "the following code is used for automatic error detection and only visible to admins"
 msgstr ""
 
 #. translators: %s stands for the name of the "Disable level limitation" option and automatically translated as well
-#: classes/in-content-injector.php:608
+#: classes/in-content-injector.php:610
 msgid "Set <em>%s</em> to show more ads"
 msgstr ""
@@ -2761 +2758 @@
 msgstr ""
 
+#: includes/admin/class-assets.php:84
+msgid "After which paragraph?"
+msgstr ""
+
 #: includes/admin/class-assets.php:86
-msgid "After which paragraph?"
-msgstr ""
-
-#: includes/admin/class-assets.php:88
 #: modules/gadsense/includes/class-adsense-report.php:159
 msgid "Today"
 msgstr ""
 
-#: includes/admin/class-assets.php:89
+#: includes/admin/class-assets.php:87
 #: modules/gadsense/includes/class-adsense-report.php:160
 msgid "Yesterday"
 msgstr ""
 
-#: includes/admin/class-assets.php:90
+#: includes/admin/class-assets.php:88
 #: modules/gadsense/includes/class-adsense-report.php:163
 msgid "This Month"
@@ -2781 +2778 @@
 
 #. translators: 1: The number of days.
-#: includes/admin/class-assets.php:92
+#: includes/admin/class-assets.php:90
 #: modules/gadsense/includes/class-adsense-report.php:162
 #: modules/gadsense/includes/class-adsense-report.php:165
@@ -2788 +2785 @@
 
 #. translators: 1: An error message.
-#: includes/admin/class-assets.php:94
+#: includes/admin/class-assets.php:92
 msgid "An error occurred: %1$s"
 msgstr ""
 
-#: includes/admin/class-assets.php:95
+#: includes/admin/class-assets.php:93
 #: modules/gadsense/admin/views/adsense-report.php:24
 msgid "All"
 msgstr ""
 
+#: includes/admin/class-assets.php:94
+msgid "There were no results returned for this ad. Please make sure it is active, generating impressions and double check your ad parameters."
+msgstr ""
+
+#: includes/admin/class-assets.php:95
+msgid "Show inactive ads"
+msgstr ""
+
 #: includes/admin/class-assets.php:96
-msgid "There were no results returned for this ad. Please make sure it is active, generating impressions and double check your ad parameters."
-msgstr ""
-
-#: includes/admin/class-assets.php:97
-msgid "Show inactive ads"
+msgid "Hide inactive ads"
 msgstr ""
 
 #: includes/admin/class-assets.php:98
-msgid "Hide inactive ads"
+msgid "Permanently delete this placement?"
+msgstr ""
+
+#: includes/admin/class-assets.php:99
+msgid "Close"
 msgstr ""
 
 #: includes/admin/class-assets.php:100
-msgid "Permanently delete this placement?"
-msgstr ""
-
-#: includes/admin/class-assets.php:101
-msgid "Close"
-msgstr ""
-
-#: includes/admin/class-assets.php:102
 msgid "Data you have entered has not been saved. Are you sure you want to discard your changes?"
 msgstr ""
@@ -3011 +3008 @@
 
 #. translators: 1: is a link to a support document. 2: closing link
-#: includes/class-autoloader.php:121
+#: includes/class-autoloader.php:128
 msgid "Your installation of Advanced Ads is incomplete. If you installed Advanced Ads from GitHub, %1$s please refer to this document%2$s to set up your development environment."
 msgstr ""
 
 #. translators: %s: WP_ENVIRONMENT_TYPES
-#: includes/class-autoloader.php:154
+#: includes/class-autoloader.php:172
 msgid "The %s constant is no longer supported."
 msgstr ""
@@ -3128 +3125 @@
 #: includes/groups/types/type-unknown.php:60
 msgid "No description"
+msgstr ""
+
+#: includes/importers/class-api-ads.php:56
+msgid "Ads from API"
+msgstr ""
+
+#: includes/importers/class-api-ads.php:65
+msgid "For MonetizeMore clients using PubGuru, you will be able to create all of your new ads from api."
+msgstr ""
+
+#. translators: 1: counts 2: Importer title
+#: includes/importers/class-api-ads.php:192
+msgid "%1$d ads migrated from %2$s"
+msgstr ""
+
+#: includes/importers/class-manager.php:104
+msgid "History deleted successfully."
 msgstr ""
 
@@ -4138 +4152 @@
 msgstr ""
 
+#: modules/one-click/admin/class-admin.php:60
+msgid "MonetizeMore & PubGuru Integration"
+msgstr ""
+
 #: modules/one-click/admin/class-admin.php:61
-msgid "MonetizeMore & PubGuru Integration"
-msgstr ""
-
-#: modules/one-click/admin/class-admin.php:62
 msgid "Enables MonetizeMore users to link their settings with the PubGuru insights & analytics dashboard."
 msgstr ""
@@ -4150 +4164 @@
 msgstr ""
 
-#: modules/one-click/admin/class-admin.php:74
+#: modules/one-click/admin/class-admin.php:76
 msgid "Disconnect now"
 msgstr ""
 
-#: modules/one-click/admin/class-admin.php:100
+#: modules/one-click/admin/class-admin.php:101
 msgid "PubGuru OneClick Consent & Privacy Policy"
 msgstr ""
 
-#: modules/one-click/admin/class-admin.php:102
+#: modules/one-click/admin/class-admin.php:103
 msgid "Connecting Your With Your PubGuru Account Settings"
 msgstr ""
@@ -4167 +4181 @@
 
 #: modules/one-click/admin/class-ajax.php:78
-msgid "Pubguru successfully connected."
+msgid "We have successfully migrated your MonetizeMore Pubguru Ad Units to your WordPress site. The existing placements and ads have been paused."
 msgstr ""
 
@@ -4174 +4188 @@
 msgstr ""
 
+#: modules/one-click/admin/class-ajax.php:132
 #: modules/one-click/admin/class-ajax.php:167
 msgid "An error has occurred please try again."
 msgstr ""
 
-#: modules/one-click/modules/adstxt/class-detector.php:88
+#: modules/one-click/admin/class-ajax.php:139
+msgid "File successfully backed up."
+msgstr ""
+
+#: modules/one-click/modules/adstxt/class-detector.php:93
 msgid "File alert!"
 msgstr ""
 
-#: modules/one-click/modules/adstxt/class-detector.php:88
-msgid "Physical ads.txt found. In order to use PubGuru service you need to delete it."
-msgstr ""
-
-#: modules/one-click/modules/adstxt/class-detector.php:90
-#: modules/one-click/modules/adstxt/class-detector.php:91
+#: modules/one-click/modules/adstxt/class-detector.php:93
+msgid "Physical ads.txt found. In order to use PubGuru service you need to delete it or back it up."
+msgstr ""
+
+#: modules/one-click/modules/adstxt/class-detector.php:96
+#: modules/one-click/modules/adstxt/class-detector.php:97
 msgid "Backup the File"
 msgstr ""
 
-#: modules/one-click/modules/adstxt/class-detector.php:90
+#: modules/one-click/modules/adstxt/class-detector.php:96
 msgid "Backing Up"
 msgstr ""
 
-#: modules/one-click/modules/adstxt/class-detector.php:90
+#: modules/one-click/modules/adstxt/class-detector.php:96
 msgid "Backed Up"
 msgstr ""
@@ -4369 +4388 @@
 
 #. translators: %s link to privacy policy
-#: views/admin/metabox-pubguru-connect.php:21
+#: views/admin/metabox-pubguru-connect.php:23
 msgid "This form is designed exclusively for MonetizeMore customers who wish to integrate Advanced Ads with the PubGuru Dashboard. By selecting \"Connect PGHB,\" you agree to share your domain name to facilitate the connection with your PubGuru account, in alignment with our <a href=\"%s\">Privacy Policy</a>. Rest assured, no additional information is exchanged, and Advanced Ads does not engage in any tracking activities."
 msgstr ""
 
-#: views/admin/metabox-pubguru-connect.php:30
+#: views/admin/metabox-pubguru-connect.php:32
 msgid "Connect PGHB"
 msgstr ""
 
-#: views/admin/metabox-pubguru-connect.php:42
+#: views/admin/metabox-pubguru-connect.php:43
 msgid "To activate any of the settings with your PubGuru account, please select from the options below. Should you have any inquiries, feel free to <a href=\"https://www.monetizemore.com/contact/\">click here<a/> to reach out to us or send an email to <a href=\"mailto:[email protected]\">[email protected]</a>"
 msgstr ""
 
-#: views/admin/metabox-pubguru-connect.php:52
+#: views/admin/metabox-pubguru-connect.php:53
 msgid "Install PubGuru Header Bidding"
 msgstr ""
 
-#: views/admin/metabox-pubguru-connect.php:62
+#: views/admin/metabox-pubguru-connect.php:63
+msgid "Move the PubGuru Header Bidding script to the footer. Keep this option disabled to maximize revenue. Only enable it if PageSpeed is your priority."
+msgstr ""
+
+#: views/admin/metabox-pubguru-connect.php:75
+msgid "Enable ads.txt settings from the <a href=\"https://app.pubguru.com/ads-txt\" target=\"_blank\">PubGuru platform</a>"
+msgstr ""
+
+#: views/admin/metabox-pubguru-connect.php:94
+msgid "Install Traffic Cop. 7 days free trial"
+msgstr ""
+
+#: views/admin/metabox-pubguru-connect.php:97
+msgid "Install Traffic Cop."
+msgstr ""
+
+#: views/admin/metabox-pubguru-connect.php:107
 msgid "Activate Tag Conversion"
 msgstr ""
 
-#: views/admin/metabox-pubguru-connect.php:74
-msgid "Enable ads.txt settings from the <a href=\"https://app.pubguru.com/ads-txt\" target=\"_blank\">PubGuru platform</a>"
-msgstr ""
-
-#: views/admin/metabox-pubguru-connect.php:93
-msgid "Install Traffic Cop. 7 days free trial"
-msgstr ""
-
-#: views/admin/metabox-pubguru-connect.php:96
-msgid "Install Traffic Cop."
+#: views/admin/metabox-pubguru-connect.php:132
+msgid "Rollback"
+msgstr ""
+
+#: views/admin/metabox-pubguru-connect.php:133
+msgid "Rollback the api changes back to previous state."
 msgstr ""
 

advanced-ads/trunk/lib/composer/autoload_classmap.php

@@ -55 +55 @@
     'AdvancedAds\\BuildTools\\Values\\SemanticVersion' => $vendorDir . '/advanced-ads/build-tools/src/Values/SemanticVersion.php',
     'AdvancedAds\\BuildTools\\Values\\Translation' => $vendorDir . '/advanced-ads/build-tools/src/Values/Translation.php',
+    'AdvancedAds\\Constants' => $baseDir . '/includes/class-constants.php',
     'AdvancedAds\\Entities' => $baseDir . '/includes/class-entities.php',
     'AdvancedAds\\Groups\\Manager' => $baseDir . '/includes/groups/class-manager.php',
@@ -62 +63 @@
     'AdvancedAds\\Groups\\Types\\Standard' => $baseDir . '/includes/groups/types/type-standard.php',
     'AdvancedAds\\Groups\\Types\\Unknown' => $baseDir . '/includes/groups/types/type-unknown.php',
+    'AdvancedAds\\Importers\\Api_Ads' => $baseDir . '/includes/importers/class-api-ads.php',
+    'AdvancedAds\\Importers\\Importer' => $baseDir . '/includes/importers/abstract-importer.php',
+    'AdvancedAds\\Importers\\Manager' => $baseDir . '/includes/importers/class-manager.php',
     'AdvancedAds\\Installation\\Capabilities' => $baseDir . '/includes/installation/class-capabilities.php',
     'AdvancedAds\\Installation\\Install' => $baseDir . '/includes/installation/class-install.php',
     'AdvancedAds\\Installation\\Uninstall' => $baseDir . '/includes/installation/class-uninstall.php',
     'AdvancedAds\\Interfaces\\Group_Type' => $baseDir . '/includes/interfaces/interface-group-type.php',
+    'AdvancedAds\\Interfaces\\Importer' => $baseDir . '/includes/interfaces/interface-importer.php',
     'AdvancedAds\\Interfaces\\Screen_Interface' => $baseDir . '/includes/interfaces/interface-screen.php',
     'AdvancedAds\\Modules\\OneClick\\Admin\\Admin' => $baseDir . '/modules/one-click/admin/class-admin.php',
@@ -71 +76 @@
     'AdvancedAds\\Modules\\OneClick\\AdsTxt\\AdsTxt' => $baseDir . '/modules/one-click/modules/adstxt/class-adstxt.php',
     'AdvancedAds\\Modules\\OneClick\\AdsTxt\\Detector' => $baseDir . '/modules/one-click/modules/adstxt/class-detector.php',
-    'AdvancedAds\\Modules\\OneClick\\Auto_Ads' => $baseDir . '/modules/one-click/modules/class-auto-ads.php',
     'AdvancedAds\\Modules\\OneClick\\Header_Bidding' => $baseDir . '/modules/one-click/modules/class-header-bidding.php',
     'AdvancedAds\\Modules\\OneClick\\Helpers' => $baseDir . '/modules/one-click/class-helpers.php',

advanced-ads/trunk/lib/composer/autoload_static.php

@@ -85 +85 @@
         'AdvancedAds\\BuildTools\\Values\\SemanticVersion' => __DIR__ . '/..' . '/advanced-ads/build-tools/src/Values/SemanticVersion.php',
         'AdvancedAds\\BuildTools\\Values\\Translation' => __DIR__ . '/..' . '/advanced-ads/build-tools/src/Values/Translation.php',
+        'AdvancedAds\\Constants' => __DIR__ . '/../..' . '/includes/class-constants.php',
         'AdvancedAds\\Entities' => __DIR__ . '/../..' . '/includes/class-entities.php',
         'AdvancedAds\\Groups\\Manager' => __DIR__ . '/../..' . '/includes/groups/class-manager.php',
@@ -92 +93 @@
         'AdvancedAds\\Groups\\Types\\Standard' => __DIR__ . '/../..' . '/includes/groups/types/type-standard.php',
         'AdvancedAds\\Groups\\Types\\Unknown' => __DIR__ . '/../..' . '/includes/groups/types/type-unknown.php',
+        'AdvancedAds\\Importers\\Api_Ads' => __DIR__ . '/../..' . '/includes/importers/class-api-ads.php',
+        'AdvancedAds\\Importers\\Importer' => __DIR__ . '/../..' . '/includes/importers/abstract-importer.php',
+        'AdvancedAds\\Importers\\Manager' => __DIR__ . '/../..' . '/includes/importers/class-manager.php',
         'AdvancedAds\\Installation\\Capabilities' => __DIR__ . '/../..' . '/includes/installation/class-capabilities.php',
         'AdvancedAds\\Installation\\Install' => __DIR__ . '/../..' . '/includes/installation/class-install.php',
         'AdvancedAds\\Installation\\Uninstall' => __DIR__ . '/../..' . '/includes/installation/class-uninstall.php',
         'AdvancedAds\\Interfaces\\Group_Type' => __DIR__ . '/../..' . '/includes/interfaces/interface-group-type.php',
+        'AdvancedAds\\Interfaces\\Importer' => __DIR__ . '/../..' . '/includes/interfaces/interface-importer.php',
         'AdvancedAds\\Interfaces\\Screen_Interface' => __DIR__ . '/../..' . '/includes/interfaces/interface-screen.php',
         'AdvancedAds\\Modules\\OneClick\\Admin\\Admin' => __DIR__ . '/../..' . '/modules/one-click/admin/class-admin.php',
@@ -101 +106 @@
         'AdvancedAds\\Modules\\OneClick\\AdsTxt\\AdsTxt' => __DIR__ . '/../..' . '/modules/one-click/modules/adstxt/class-adstxt.php',
         'AdvancedAds\\Modules\\OneClick\\AdsTxt\\Detector' => __DIR__ . '/../..' . '/modules/one-click/modules/adstxt/class-detector.php',
-        'AdvancedAds\\Modules\\OneClick\\Auto_Ads' => __DIR__ . '/../..' . '/modules/one-click/modules/class-auto-ads.php',
         'AdvancedAds\\Modules\\OneClick\\Header_Bidding' => __DIR__ . '/../..' . '/modules/one-click/modules/class-header-bidding.php',
         'AdvancedAds\\Modules\\OneClick\\Helpers' => __DIR__ . '/../..' . '/modules/one-click/class-helpers.php',

advanced-ads/trunk/modules/one-click/admin/class-admin.php

@@ -10 +10 @@
 namespace AdvancedAds\Modules\OneClick\Admin;
 
-use AdvancedAds\Assets_Registry;
 use AdvancedAds\Utilities\Conditional;
 use AdvancedAds\Modules\OneClick\Helpers;
@@ -44 +43 @@
         }
 
-        Assets_Registry::enqueue_style( 'app' );
-        Assets_Registry::enqueue_script( 'app' );
+        wp_advads()->registry->enqueue_style( 'app' );
+        wp_advads()->registry->enqueue_script( 'app' );
     }
 
@@ -63 +62 @@
             'order' => 1000,
             'link'  => '#',
+            'icon'  => ADVADS_BASE_URL . 'assets/img/add-ons/aa-addons-icons-m2pg.svg',
         ];
 
         $addons['monetizemore-connect'] = $defaults + [
-            'class'      => 'js-m2-show-consent',
-            'link_title' => __( 'Connect now', 'advanced-ads' ),
+            'class'        => 'js-pubguru-connect',
+            'link_title'   => __( 'Connect now', 'advanced-ads' ),
+            'link_icon'    => 'dashicons-plus',
+            'link_primary' => true,
         ];
 
@@ -73 +75 @@
             'class'      => 'js-pubguru-disconnect',
             'link_title' => __( 'Disconnect now', 'advanced-ads' ),
+            'link_icon'  => 'dashicons-dismiss',
         ];
 
-        if ( $is_connected ) {
-            $addons['monetizemore-connect']['class'] .= ' hidden';
-        } else {
-            $addons['monetizemore-disconnect']['class'] .= ' hidden';
-        }
+        $key = $is_connected ? 'monetizemore-connect' : 'monetizemore-disconnect';
+
+        $addons[ $key ]['class'] .= ' hidden';
 
         return $addons;
@@ -111 +112 @@
             </div>
         </div>
+        <div id="pubguru-notices"></div>
 
         <?php

advanced-ads/trunk/modules/one-click/admin/class-ajax.php

@@ -14 +14 @@
 use AdvancedAds\Modules\OneClick\Helpers;
 use AdvancedAds\Modules\OneClick\Options;
+use AdvancedAds\Framework\Utilities\Params;
 use AdvancedAds\Modules\OneClick\AdsTxt\Detector;
-use AdvancedAds\Framework\Utilities\Params;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
 
@@ -76 +76 @@
         wp_send_json_success(
             [
-                'message'       => esc_html__( 'Pubguru successfully connected.', 'advanced-ads' ),
+                'message'       => esc_html__( 'We have successfully migrated your MonetizeMore Pubguru Ad Units to your WordPress site. The existing placements and ads have been paused.', 'advanced-ads' ),
                 'hasTrafficCop' => Helpers::has_traffic_cop( $config ),
             ]
@@ -107 +107 @@
         check_ajax_referer( 'pubguru_module_changed', 'security' );
 
-        $module     = Params::post( 'module', [] );
-        $status     = Params::post( 'status', false, FILTER_VALIDATE_BOOLEAN );
-        $option_key = 'pubguru_module_' . $module;
+        $module = Params::post( 'module', [] );
+        $status = Params::post( 'status', false, FILTER_VALIDATE_BOOLEAN );
 
-        update_option( $option_key, $status );
+        Options::module( $module, $status );
 
-        do_action( 'pubguru_module_status_changed', $module, $status );
+        $data = apply_filters( 'pubguru_module_status_changed', [], $module, $status );
 
-        $notice = '';
-
-        if ( 'ads_txt' === $module && $status ) {
-            $detector = new Detector();
-            if ( $detector->detect_files() ) {
-                ob_start();
-                $detector->show_notice();
-                $notice = ob_get_clean();
-            }
-        }
-
-        wp_send_json_success( [ 'notice' => $notice ] );
+        wp_send_json_success( $data );
     }
 
@@ -137 +125 @@
         check_ajax_referer( 'pubguru_backup_adstxt', 'security' );
 
-        ( new Detector() )->backup_file();
+        $notice = '';
+        $result = ( new Detector() )->backup_file();
+        if ( false === $result ) {
+            $notice = sprintf(
+                '<div class="notice notice-error flex items-center p-4">%s</div>',
+                esc_html__( 'An error has occurred please try again.', 'advanced-ads' )
+            );
+            wp_send_json_error( $notice );
+        }
 
-        wp_send_json_success();
+        $notice = sprintf(
+            '<div class="notice notice-success flex items-center p-4">%s</div>',
+            esc_html__( 'File successfully backed up.', 'advanced-ads' )
+        );
+        wp_send_json_success( $notice );
     }
 

advanced-ads/trunk/modules/one-click/class-helpers.php

@@ -10 +10 @@
 namespace AdvancedAds\Modules\OneClick;
 
-use AdvancedAds\Utilities\Str;
+use AdvancedAds\Constants;
 use AdvancedAds\Utilities\WordPress;
+use AdvancedAds\Framework\Utilities\Str;
 
 defined( 'ABSPATH' ) || exit;
@@ -19 +20 @@
  */
 class Helpers {
-
-    /**
-     * Is module enabled.
-     *
-     * @param string $name name of module.
-     *
-     * @return bool
-     */
-    public static function is_module_enabled( $name ): bool {
-        return boolval( get_option( "pubguru_module_{$name}" ) );
-    }
 
     /**
@@ -96 +86 @@
 
         foreach ( $configs['configs'] as $config ) {
-            if ( Str::str_contains( $needle, $config['name'] ) ) {
+            if ( Str::contains( $needle, $config['name'] ) ) {
                 return $config['name'];
             }
@@ -112 +102 @@
         $ads = self::get_ads_from_config();
 
-        if ( $ads && ! wp_next_scheduled( 'advanced-ads-pghb-auto-ad-creation' ) ) {
-            wp_schedule_single_event( current_datetime()->getTimestamp() + MINUTE_IN_SECONDS, 'advanced-ads-pghb-auto-ad-creation' );
+        if ( $ads && ! wp_next_scheduled( Constants::CRON_API_ADS_CREATION ) ) {
+            wp_schedule_single_event( current_datetime()->getTimestamp() + 5, Constants::CRON_API_ADS_CREATION );
         }
     }
@@ -140 +130 @@
                 }
             }
+        } else {
+            $domain             = WordPress::get_site_domain();
+            $pubguru_config_ads = [
+                $domain . '_leaderboard'  => [
+                    'ad_unit'              => $domain . '_leaderboard',
+                    'slot'                 => $domain . '_leaderboard',
+                    'device'               => 'All',
+                    'placement'            => 'Before Content',
+                    'placement_conditions' => 'All',
+                    'in_content_position'  => 'Before',
+                    'in_content_count'     => 1,
+                    'in_content_element'   => 'p',
+                    'in_content_repeat'    => false,
+                ],
+                $domain . '_in_content_1' => [
+                    'ad_unit'              => $domain . '_in_content_1',
+                    'slot'                 => $domain . '_in_content_1',
+                    'device'               => 'All',
+                    'placement'            => 'Before Content',
+                    'placement_conditions' => 'All',
+                    'in_content_position'  => 'Before',
+                    'in_content_count'     => 1,
+                    'in_content_element'   => 'p',
+                    'in_content_repeat'    => false,
+                ],
+                $domain . '_in_content_2' => [
+                    'ad_unit'              => $domain . '_in_content_2',
+                    'slot'                 => $domain . '_in_content_2',
+                    'device'               => 'All',
+                    'placement'            => 'After Content',
+                    'placement_conditions' => 'All',
+                    'in_content_position'  => 'Aefore',
+                    'in_content_count'     => 3,
+                    'in_content_element'   => 'p',
+                    'in_content_repeat'    => true,
+                ],
+            ];
         }
 
@@ -155 +182 @@
         global $post;
 
+        if ( ! $post ) {
+            return false;
+        }
+
         if ( ! $post_id ) {
             $post_id = $post->ID;

advanced-ads/trunk/modules/one-click/class-options.php

@@ -37 +37 @@
         return update_option( self::CONFIG_KEY, $data );
     }
+
+    /**
+     * Read and Write pubguru module status
+     *
+     * @param string $module Module name.
+     * @param bool   $status Module status.
+     *
+     * @return bool
+     */
+    public static function module( $module, $status = null ): bool {
+        $option_key = 'pubguru_module_' . $module;
+
+        if ( null === $status ) {
+            return boolval( get_option( $option_key, false ) );
+        }
+
+        update_option( $option_key, $status );
+
+        return $status;
+    }
 }

advanced-ads/trunk/modules/one-click/modules/adstxt/class-adstxt.php

@@ -12 +12 @@
 use AdvancedAds\Utilities\WordPress;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
+use AdvancedAds\Framework\Utilities\Params;
+use AdvancedAds\Framework\Utilities\Str;
 
 defined( 'ABSPATH' ) || exit;
@@ -28 +30 @@
         remove_action( 'advanced-ads-plugin-loaded', 'advanced_ads_ads_txt_init' );
 
-        add_action( 'init', [ $this, 'add_rewrite_rules' ] );
-        add_filter( 'query_vars', [ $this, 'add_query_vars' ] );
         add_action( 'template_redirect', [ $this, 'handle_redirect' ] );
         add_filter( 'allowed_redirect_hosts', [ $this, 'allowed_redirect_hosts' ] );
-
-        if ( is_admin() ) {
-            ( new Detector() )->hooks();
-        }
-    }
-
-    /**
-     * Add rewrite rules
-     *
-     * @return void
-     */
-    public function add_rewrite_rules(): void {
-        global $wp_rewrite;
-
-        if ( ! $wp_rewrite->using_permalinks() ) {
-            return;
-        }
-
-        add_rewrite_rule( 'ads\.txt$', $wp_rewrite->index . '?adstxt=1', 'top' );
-    }
-
-    /**
-     * Add query var
-     *
-     * @param array $vars Array to hold query variables.
-     *
-     * @return array
-     */
-    public function add_query_vars( $vars ): array {
-        $vars[] = 'adstxt';
-        return $vars;
     }
 
@@ -71 +40 @@
      */
     public function handle_redirect(): void {
-        if ( empty( get_query_var( 'adstxt' ) ) ) {
+        if (
+            'ads-txt' !== get_query_var( 'name' ) ||
+            Str::contains( Params::server( 'REQUEST_URI' ), 'ads.txt' )
+        ) {
             return;
         }
 
-        $redirect = sprintf( 'https://adstxt.pubguru.net/%s/ads.txt', WordPress::get_site_domain() );
+        $redirect = sprintf( 'https://adstxt.pubguru.net/pg/%s/ads.txt', WordPress::get_site_domain() );
         wp_safe_redirect( $redirect, 301 );
         exit;

advanced-ads/trunk/modules/one-click/modules/adstxt/class-detector.php

@@ -40 +40 @@
 
         if ( $this->detect_files() ) {
-            add_action( 'pubguru_notices', [ $this, 'show_notice' ] );
+            add_action( 'all_admin_notices', [ $this, 'show_notice' ] );
         }
     }
@@ -47 +47 @@
      * Detect file exists
      *
+     * @param string $file file name.
+     *
      * @return bool
      */
-    public function detect_files(): bool {
+    public function detect_files( $file = 'ads.txt' ): bool {
         $wp_filesystem = $this->get_filesystem();
         if ( null === $wp_filesystem ) {
@@ -55 +57 @@
         }
 
-        return $wp_filesystem->exists( ABSPATH . '/ads.txt' );
+        return $wp_filesystem->exists( ABSPATH . '/' . $file );
     }
 
@@ -64 +66 @@
      */
     public function backup_file(): bool {
-        $wp_filesystem = $this->get_filesystem();
-        if ( null === $wp_filesystem ) {
-            return false;
-        }
+        $source      = ABSPATH . '/ads.txt';
+        $destination = $source . '.bak';
+        return $this->move_file( $source, $destination );
+    }
 
-        return $wp_filesystem->move( ABSPATH . '/ads.txt', ABSPATH . '/ads.txt.bak' );
+    /**
+     * Revert file
+     *
+     * @return bool
+     */
+    public function revert_file(): bool {
+        $source      = ABSPATH . '/ads.txt.bak';
+        $destination = ABSPATH . 'ads.txt';
+        return $this->move_file( $source, $destination );
     }
 
@@ -79 +89 @@
     public function show_notice(): void {
         ?>
-        <div class="flex shadow-lg rounded">
-            <div class="bg-red-600 p-3 rounded-l flex items-center">
-                <svg focusable="false" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" class="fill-current text-white w-5" viewBox="0 0 32 32" aria-hidden="true"><path d="M2,16H2A14,14,0,1,0,16,2,14,14,0,0,0,2,16Zm23.15,7.75L8.25,6.85a12,12,0,0,1,16.9,16.9ZM8.24,25.16A12,12,0,0,1,6.84,8.27L23.73,25.16a12,12,0,0,1-15.49,0Z"></path><title>Error</title></svg>
+        <div class="notice notice-error flex items-center p-4">
+            <div>
+                <strong><?php esc_html_e( 'File alert!', 'advanced-ads' ); ?></strong> <?php esc_html_e( 'Physical ads.txt found. In order to use PubGuru service you need to delete it or back it up.', 'advanced-ads' ); ?>
             </div>
 
-            <div class="p-3 bg-white rounded-r w-full flex justify-between items-center">
-                <div>
-                    <span class="font-medium"><?php esc_html_e( 'File alert!', 'advanced-ads' ); ?></span> <?php esc_html_e( 'Physical ads.txt found. In order to use PubGuru service you need to delete it.', 'advanced-ads' ); ?>
-                </div>
-                <button class="js-btn-backup-adstxt px-3 py-2 rounded text-xs bg-blue-600 text-white hover:bg-blue-700" data-text="<?php esc_attr_e( 'Backup the File', 'advanced-ads' ); ?>" data-loading="<?php esc_attr_e( 'Backing Up', 'advanced-ads' ); ?>" data-done="<?php esc_attr_e( 'Backed Up', 'advanced-ads' ); ?>" data-security="<?php echo wp_create_nonce( 'pubguru_backup_adstxt' ); // phpcs:ignore ?>">
-                    <?php esc_html_e( 'Backup the File', 'advanced-ads' ); ?>
-                </button>
-            </div>
+            <button class="!ml-auto button button-primary js-btn-backup-adstxt" data-text="<?php esc_attr_e( 'Backup the File', 'advanced-ads' ); ?>" data-loading="<?php esc_attr_e( 'Backing Up', 'advanced-ads' ); ?>" data-done="<?php esc_attr_e( 'Backed Up', 'advanced-ads' ); ?>" data-security="<?php echo wp_create_nonce( 'pubguru_backup_adstxt' ); // phpcs:ignore ?>">
+                <?php esc_html_e( 'Backup the File', 'advanced-ads' ); ?>
+            </button>
         </div>
         <?php
@@ -101 +106 @@
      * @return object
      */
-    public function get_filesystem() {
+    private function get_filesystem() {
         global $wp_filesystem;
 
@@ -111 +116 @@
         return $wp_filesystem;
     }
+
+    /**
+     * Handle file operations (backup or revert)
+     *
+     * @param string $source      Source file path.
+     * @param string $destination Destination file path.
+     *
+     * @return bool
+     */
+    private function move_file( string $source, string $destination ): bool {
+        $wp_filesystem = $this->get_filesystem();
+
+        if ( null === $wp_filesystem || ! $wp_filesystem->is_writable( $source ) ) {
+            return false;
+        }
+
+        return $wp_filesystem->move( $source, $destination );
+    }
 }

advanced-ads/trunk/modules/one-click/modules/class-header-bidding.php

@@ -10 +10 @@
 namespace AdvancedAds\Modules\OneClick;
 
-use AdvancedAds\Utilities\Str;
+use AdvancedAds\Framework\Utilities\Str;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
 
@@ -19 +19 @@
  */
 class Header_Bidding implements Integration_Interface {
-
-    /**
-     * Check if has gpt
-     *
-     * @var bool
-     */
-    private $has_gpt = false;
-
-    /**
-     * Check if has pubguru tag
-     *
-     * @var bool
-     */
-    private $has_pubguru = false;
-
-    /**
-     * Check if has traffic cop atq
-     *
-     * @var bool
-     */
-    private $has_traffic_cop = false;
 
     /**
@@ -72 +51 @@
     public function remove_tags( $script ): string {
 
-        if ( Str::str_contains( '/gpt.js', $script ) ) {
-            $script        = '';
-            $this->has_gpt = true;
+        if ( Str::contains( '/gpt.js', $script ) ) {
+            $script = '';
         }
 
-        if ( Str::str_contains( '//m2d.m2.ai/', $script ) || Str::str_contains( '//c.pubguru.net/', $script ) ) {
-            $script            = '';
-            $this->has_gpt     = true;
-            $this->has_pubguru = true;
+        if ( Str::contains( '//m2d.m2.ai/', $script ) || Str::contains( '//c.pubguru.net/', $script ) ) {
+            $script = '';
         }
 
-        if ( Str::str_contains( 'window.pg.atq = window.pg.atq || [];', $script ) ) {
-            $script                = '';
-            $this->has_traffic_cop = true;
+        if ( Str::contains( 'window.pg.atq = window.pg.atq || [];', $script ) ) {
+            $script = '';
         }
 
@@ -99 +74 @@
      */
     private function add_script_tag( $page ): string {
-        $name = Helpers::get_config_file();
+        $name    = Helpers::get_config_file();
+        $at_body = Options::module( 'header_bidding_at_body' );
 
         if ( $name ) {
-            $script = [ '<head>' ];
-
-            if ( $this->has_gpt ) {
-                $script[] = '<script src="https://securepubads.g.doubleclick.net/tag/js/gpt.js" async></script>'; // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
-                $script[] = '<script type="text/javascript">window.googletag=window.googletag||{};window.googletag.cmd=window.googletag.cmd||[];';
-                $script[] = 'window.googletag.cmd.push(function(){window.__onpageGptEmbed=(new Date()).getTime()})</script>';
+            $script = [];
+            if ( ! $at_body ) {
+                $script[] = '<head>';
             }
 
-            if ( $this->has_pubguru ) {
-                $script[] = sprintf( '<script src="//c.pubguru.net/%s" async> </script>', $name ); // phpcs:ignore
-            }
+            $script[] = '<script src="https://securepubads.g.doubleclick.net/tag/js/gpt.js" async></script>'; // phpcs:ignore WordPress.WP.EnqueuedResources.NonEnqueuedScript
+            $script[] = '<script type="text/javascript">window.googletag=window.googletag||{};window.googletag.cmd=window.googletag.cmd||[];';
+            $script[] = 'window.googletag.cmd.push(function(){window.__onpageGptEmbed=(new Date()).getTime()})</script>';
+            $script[] = sprintf( '<script src="//c.pubguru.net/%s" async> </script>', $name ); // phpcs:ignore
 
-            if ( Helpers::is_module_enabled( 'traffic_cop' ) && Helpers::has_traffic_cop() && $this->has_traffic_cop ) {
+            if ( Options::module( 'traffic_cop' ) && Helpers::has_traffic_cop() ) {
                 $script[] = '<script>window.pg = window.pg || {};window.pg.atq = window.pg.atq || [];</script>';
             }
 
-            $page = str_replace( '<head>', join( "\n", $script ), $page );
+            if ( $at_body ) {
+                $page = $page . join( "\n", $script );
+            } else {
+                $page = str_replace(
+                    '<head>',
+                    join( "\n", $script ),
+                    $page
+                );
+            }
         }
 

advanced-ads/trunk/modules/one-click/modules/class-traffic-cop.php

@@ -10 +10 @@
 namespace AdvancedAds\Modules\OneClick;
 
-use AdvancedAds\Utilities\Str;
+use AdvancedAds\Framework\Utilities\Str;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
 
@@ -38 +38 @@
     public function modify_script_tag( $content ) {
         // Early bail!!
-        if ( ! Str::str_contains( 'googletag.display', $content ) ) {
+        if ( ! Str::contains( 'googletag.display', $content ) ) {
             return false;
         }

advanced-ads/trunk/modules/one-click/modules/class-workflow.php

@@ -10 +10 @@
 namespace AdvancedAds\Modules\OneClick;
 
+use AdvancedAds\Constants;
+use AdvancedAds\Importers\Api_Ads;
 use AdvancedAds\Modules\OneClick\Helpers;
 use AdvancedAds\Modules\OneClick\Options;
+use AdvancedAds\Framework\Utilities\Params;
+use AdvancedAds\Modules\OneClick\Traffic_Cop;
+use AdvancedAds\Modules\OneClick\AdsTxt\AdsTxt;
+use AdvancedAds\Modules\OneClick\AdsTxt\Detector;
 use AdvancedAds\Framework\Interfaces\Integration_Interface;
-use AdvancedAds\Framework\Utilities\Params;
-use AdvancedAds\Modules\OneClick\AdsTxt\AdsTxt;
-use AdvancedAds\Modules\OneClick\Traffic_Cop;
 
 defined( 'ABSPATH' ) || exit;
@@ -38 +41 @@
     public function hooks(): void {
         add_action( 'init', [ $this, 'flush_rewrite_rules' ], 999 );
-        add_action( 'pubguru_module_status_changed', [ $this, 'module_status_changed' ], 10, 1 );
-        add_action( 'advanced-ads-pghb-auto-ad-creation', [ $this, 'auto_ad_creation' ], 10, 0 );
+        add_filter( 'pubguru_module_status_changed', [ $this, 'module_status_changed' ], 10, 3 );
+        add_action( Constants::CRON_API_ADS_CREATION, [ $this, 'auto_ad_creation' ], 10, 0 );
 
         if ( false !== Options::pubguru_config() && ! is_admin() ) {
             add_action( 'wp', [ $this, 'init' ] );
 
-            if ( Helpers::is_module_enabled( 'ads_txt' ) ) {
+            if ( Options::module( 'ads_txt' ) ) {
                 ( new AdsTxt() )->hooks();
             }
+        }
+
+        if ( Options::module( 'ads_txt' ) ) {
+            if ( is_admin() ) {
+                ( new Detector() )->hooks();
+            }
+            remove_action( 'advanced-ads-plugin-loaded', 'advanced_ads_ads_txt_init' );
         }
     }
@@ -64 +74 @@
         Page_Parser::get_instance();
 
-        if ( $is_debugging || Helpers::is_module_enabled( 'header_bidding' ) ) {
+        if ( $is_debugging || Options::module( 'header_bidding' ) ) {
             ( new Header_Bidding() )->hooks();
         }
 
-        if ( $is_debugging || Helpers::is_module_enabled( 'tag_conversion' ) ) {
+        if ( $is_debugging || Options::module( 'tag_conversion' ) ) {
             ( new Tags_Conversion() )->hooks();
         }
 
-        if ( Helpers::is_module_enabled( 'traffic_cop' ) && Helpers::has_traffic_cop() ) {
-            if ( ! Helpers::is_module_enabled( 'header_bidding' ) ) {
+        if ( Options::module( 'traffic_cop' ) && Helpers::has_traffic_cop() ) {
+            if ( ! Options::module( 'header_bidding' ) ) {
                 ( new Header_Bidding() )->hooks();
             }
@@ -84 +94 @@
      * Handle module status change
      *
+     * @param array  $data   Data to send back to ajax request.
      * @param string $module Module name.
+     * @param bool   $status Module status.
      *
-     * @return void
+     * @return array
      */
-    public function module_status_changed( $module ): void {
+    public function module_status_changed( $data, $module, $status ): array {
         if ( 'ads_txt' === $module ) {
+            $detector = new Detector();
+            if ( $status && $detector->detect_files() ) {
+                ob_start();
+                $detector->show_notice();
+                $notice = ob_get_clean();
+                if ( $notice ) {
+                    $data['notice'] = $notice;
+                }
+            }
+
+            if ( ! $status && $detector->detect_files( 'ads.txt.bak' ) ) {
+                $detector->revert_file();
+            }
+
             update_option( self::FLUSH_KEY, 1 );
         }
+
+        return $data;
     }
 
@@ -112 +140 @@
      */
     public function auto_ad_creation(): void {
-        $ads = Helpers::get_ads_from_config();
-        // ( new Auto_Ads() )->run( $ads );
+        ( new Api_Ads() )->import();
     }
 }

advanced-ads/trunk/packages/composer/LICENSE

@@ +1 @@
+
 Copyright (c) Nils Adermann, Jordi Boggiano
 
@@ -18 +19 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+

advanced-ads/trunk/packages/composer/autoload_classmap.php

@@ -24 +24 @@
     'AdvancedAds\\Assets_Registry' => $baseDir . '/includes/class-assets-registry.php',
     'AdvancedAds\\Autoloader' => $baseDir . '/includes/class-autoloader.php',
+    'AdvancedAds\\Constants' => $baseDir . '/includes/class-constants.php',
     'AdvancedAds\\Entities' => $baseDir . '/includes/class-entities.php',
     'AdvancedAds\\Framework\\Assets_Registry' => $vendorDir . '/advanced-ads/framework/src/class-assets-registry.php',
@@ -58 +59 @@
     'AdvancedAds\\Groups\\Types\\Standard' => $baseDir . '/includes/groups/types/type-standard.php',
     'AdvancedAds\\Groups\\Types\\Unknown' => $baseDir . '/includes/groups/types/type-unknown.php',
+    'AdvancedAds\\Importers\\Api_Ads' => $baseDir . '/includes/importers/class-api-ads.php',
+    'AdvancedAds\\Importers\\Importer' => $baseDir . '/includes/importers/abstract-importer.php',
+    'AdvancedAds\\Importers\\Manager' => $baseDir . '/includes/importers/class-manager.php',
     'AdvancedAds\\Installation\\Capabilities' => $baseDir . '/includes/installation/class-capabilities.php',
     'AdvancedAds\\Installation\\Install' => $baseDir . '/includes/installation/class-install.php',
     'AdvancedAds\\Installation\\Uninstall' => $baseDir . '/includes/installation/class-uninstall.php',
     'AdvancedAds\\Interfaces\\Group_Type' => $baseDir . '/includes/interfaces/interface-group-type.php',
+    'AdvancedAds\\Interfaces\\Importer' => $baseDir . '/includes/interfaces/interface-importer.php',
     'AdvancedAds\\Interfaces\\Screen_Interface' => $baseDir . '/includes/interfaces/interface-screen.php',
     'AdvancedAds\\Modules\\OneClick\\Admin\\Admin' => $baseDir . '/modules/one-click/admin/class-admin.php',
@@ -67 +72 @@
     'AdvancedAds\\Modules\\OneClick\\AdsTxt\\AdsTxt' => $baseDir . '/modules/one-click/modules/adstxt/class-adstxt.php',
     'AdvancedAds\\Modules\\OneClick\\AdsTxt\\Detector' => $baseDir . '/modules/one-click/modules/adstxt/class-detector.php',
-    'AdvancedAds\\Modules\\OneClick\\Auto_Ads' => $baseDir . '/modules/one-click/modules/class-auto-ads.php',
     'AdvancedAds\\Modules\\OneClick\\Header_Bidding' => $baseDir . '/modules/one-click/modules/class-header-bidding.php',
     'AdvancedAds\\Modules\\OneClick\\Helpers' => $baseDir . '/modules/one-click/class-helpers.php',

advanced-ads/trunk/packages/composer/autoload_static.php

@@ -53 +53 @@
         'AdvancedAds\\Assets_Registry' => __DIR__ . '/../..' . '/includes/class-assets-registry.php',
         'AdvancedAds\\Autoloader' => __DIR__ . '/../..' . '/includes/class-autoloader.php',
+        'AdvancedAds\\Constants' => __DIR__ . '/../..' . '/includes/class-constants.php',
         'AdvancedAds\\Entities' => __DIR__ . '/../..' . '/includes/class-entities.php',
         'AdvancedAds\\Framework\\Assets_Registry' => __DIR__ . '/..' . '/advanced-ads/framework/src/class-assets-registry.php',
@@ -87 +88 @@
         'AdvancedAds\\Groups\\Types\\Standard' => __DIR__ . '/../..' . '/includes/groups/types/type-standard.php',
         'AdvancedAds\\Groups\\Types\\Unknown' => __DIR__ . '/../..' . '/includes/groups/types/type-unknown.php',
+        'AdvancedAds\\Importers\\Api_Ads' => __DIR__ . '/../..' . '/includes/importers/class-api-ads.php',
+        'AdvancedAds\\Importers\\Importer' => __DIR__ . '/../..' . '/includes/importers/abstract-importer.php',
+        'AdvancedAds\\Importers\\Manager' => __DIR__ . '/../..' . '/includes/importers/class-manager.php',
         'AdvancedAds\\Installation\\Capabilities' => __DIR__ . '/../..' . '/includes/installation/class-capabilities.php',
         'AdvancedAds\\Installation\\Install' => __DIR__ . '/../..' . '/includes/installation/class-install.php',
         'AdvancedAds\\Installation\\Uninstall' => __DIR__ . '/../..' . '/includes/installation/class-uninstall.php',
         'AdvancedAds\\Interfaces\\Group_Type' => __DIR__ . '/../..' . '/includes/interfaces/interface-group-type.php',
+        'AdvancedAds\\Interfaces\\Importer' => __DIR__ . '/../..' . '/includes/interfaces/interface-importer.php',
         'AdvancedAds\\Interfaces\\Screen_Interface' => __DIR__ . '/../..' . '/includes/interfaces/interface-screen.php',
         'AdvancedAds\\Modules\\OneClick\\Admin\\Admin' => __DIR__ . '/../..' . '/modules/one-click/admin/class-admin.php',
@@ -96 +101 @@
         'AdvancedAds\\Modules\\OneClick\\AdsTxt\\AdsTxt' => __DIR__ . '/../..' . '/modules/one-click/modules/adstxt/class-adstxt.php',
         'AdvancedAds\\Modules\\OneClick\\AdsTxt\\Detector' => __DIR__ . '/../..' . '/modules/one-click/modules/adstxt/class-detector.php',
-        'AdvancedAds\\Modules\\OneClick\\Auto_Ads' => __DIR__ . '/../..' . '/modules/one-click/modules/class-auto-ads.php',
         'AdvancedAds\\Modules\\OneClick\\Header_Bidding' => __DIR__ . '/../..' . '/modules/one-click/modules/class-header-bidding.php',
         'AdvancedAds\\Modules\\OneClick\\Helpers' => __DIR__ . '/../..' . '/modules/one-click/class-helpers.php',

advanced-ads/trunk/readme.txt

@@ -1 +1 @@
 === Advanced Ads – Ad Manager & AdSense ===
 Contributors: webzunft, advancedads
-Tags: ads, adsense, amp, ads.txt, ad rotations, ad blocker, amazon, banner, click fraud protection, google ad manager, header code, lazy loading,
+Tags: ads, adsense, amazon, affiliate, ad manager
 Requires at least: 5.0
 Tested up to: 6.5
 Requires PHP: 7.2
-Stable tag: 1.53.2
+Stable tag: 1.54.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-Manage and optimize all ad types. Support for Google AdSense Auto ads, Amazon, image banners, HTML, page builder, ad widget, ad rotations, ads.txt
+The only complete toolkit for all ad types. Grow your revenue with AdSense, Amazon—or any affiliate network. Get pinpoint targeting and best support!
 
 == Description ==
@@ -31 +31 @@
 This is what our users are saying about Advanced Ads:
 
-> We use this plugin to deliver rotating ads on a community news site, and it’s great. We’ve delivered over a million ad impressions since we launched less than a year ago, using a combination of sidebar, top, sticky and in-content placements — both HTML5 and images. Advanced Ads makes it easy for our small team to deliver a good experience to our users and our advertisers.
+> We use this plugin to deliver rotating ads on a community news site, and it’s great. We’ve delivered over a million ad impressions since we launched less than a year ago, using a combination of sidebar, top, sticky and in-content placements — both HTML5 ads and images. Advanced Ads makes it easy for our small team to deliver a good experience to our users and our advertisers.
 > <i>mytown304 on wp.org</i>
 
@@ -37 +37 @@
 
 = Premium Features =
-This plugin is the lite version of the Advanced Ads plugin that comes with all the features you will ever need to optimize your ads and increase your revenues, including performance tracking, advanced ad targeting, split tests, click fraud protection, lazy loading, background ads, popups and sticky ads, full AMP support, adblocker detection, the most comfortable Google Ad Manager integration, and tons more. [Click here to purchase the best premium WordPress ad management plugin now!](https://wpadvancedads.com/add-ons/all-access/?utm_source=wporg&utm_medium=link&utm_campaign=wp-all-access)
+This plugin is the lite version of the Advanced Ads plugin that comes with all the features you will ever need to optimize your ads and increase your revenues, including performance tracking, advanced ad targeting, split tests, click fraud protection, lazy loading, background ads, floating ads, popups and sticky ads, full AMP support, adblocker detection, the most comfortable Google Ad Manager integration, and tons more. [Click here to purchase the best premium WordPress ad management plugin now!](https://wpadvancedads.com/add-ons/all-access/?utm_source=wporg&utm_medium=link&utm_campaign=wp-all-access)
 
 [Full Feature List](https://wpadvancedads.com/features/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features)
 
-= ad management =
+= Ad Management =
 
 * create and display **unlimited** ad units
@@ -49 +49 @@
 * inject ads into posts and pages automatically without coding
 
-= ad types =
+= Ad Types =
 
 Choose between different ad types that enable you to:
 
-* insert ads and banners from all ad and affiliate networks (e.g., [Google AdSense](https://wpadvancedads.com/adsense-ads/), [Amazon Affiliate Program](https://wpadvancedads.com/amazon-affiliate-program-wordpress/), BuySellAds, Google Ad Manager (formerly Google DoubleClick for Publishers, DFP), Ezoic, media.net, [Booking.com](https://wpadvancedads.com/booking-com-ads-wordpress/), Tradedoubler, Awin, Getyourguide, The Moneytizer, Infolinks...)
+* insert ads and banners from all ad and affiliate networks (e.g., [Google AdSense](https://wpadvancedads.com/adsense-ads/), [Amazon Affiliate Program Amazon Associates](https://wpadvancedads.com/amazon-affiliate-program-wordpress/), BuySellAds, Google Ad Manager (formerly Google DoubleClick for Publishers, DFP), Ezoic, media.net, [Booking.com](https://wpadvancedads.com/booking-com-ads-wordpress/), Tradedoubler, Awin, GetYourGuide, The Moneytizer, Infolinks...)
 * dedicated support for all types of Google AdSense ads, including text and display ads, native ads (In-article, In-feed, Multiplex ads), Auto ads, and Auto ads for AMP
 * display images and image banners
 * create content-rich ads with the WordPress TinyMCE editor
 * insert contextual Amazon Native Shopping Ads
-* inject HTML, CSS, Javascript or PHP code
-* use shortcodes within ads (to also deliver advertisements from another ad plugin like Ad Inserter, AdRotate, Quick AdSense, Ads for WP, or the Google AdSense Plugin WP QUADS)
-
-= display ads for WordPress =
+* inject HTML, CSS, Javascript, or PHP code
+* use shortcodes within ads (to also deliver advertisements from another ad plugin like Ad Inserter, AdRotate, Quick AdSense, AdSanity, Ads for WP, or the Google AdSense plugin WP QUADS)
+
+= Display Ads for WordPress =
 
 * auto-inject ads via placements
 * use functions to display ads in template files
-* use shortcodes to place ads manually in post content
+* use shortcodes to place ads manually
 * show ads in the sidebar and in widgets
 * disable all ads on specific pages
-* display multiple ads (ad grids)
 * display a customizable ad label, e.g., “Advertisements” above each banner ad
-
-= display conditions =
+* display multiple ads in ad grids ([Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-5))
+
+= Display Conditions =
 
 Show ads based on content. [List of all display conditions](https://wpadvancedads.com/manual/display-conditions/)
@@ -79 +79 @@
 * archive pages by category, tags, taxonomies
 * special page types like 404, attachment and front page
-* posts and pages by contained keywords [(keyword targeting)](https://wpadvancedads.com/manual/ads-based-on-keywords/?utm_source=wporg&utm_medium=link&utm_campaign=features) or URL parameters, included in [Advanced Ads Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-1)
 * hide ads on secondary queries (e.g., posts in sidebars)
 * display or hide banners within the post feed
 * hide all ads from specific page types, e.g., 404 pages, feed
 * hide ads from bots and web crawlers
-
-= visitor conditions =
+* posts and pages by contained keywords [(keyword targeting)](https://wpadvancedads.com/manual/ads-based-on-keywords/?utm_source=wporg&utm_medium=link&utm_campaign=features) or URL parameters, included in [Advanced Ads Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-1)
+
+= Visitor Conditions =
 
 Serve ads by conditions based on the visitor. [List of all visitor conditions](https://wpadvancedads.com/manual/visitor-conditions/)
@@ -92 +92 @@
 * display or hide a banner by role and for logged-in visitors
 * advanced visitor conditions: geolocation, previously visited URL (referrer), user capability, browser language, browser, and browser width included in [Advanced Ads Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-2)
+* frequency capping ([Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-6))
 
 > **Fantastic plugin and outstanding support**
@@ -97 +98 @@
 > djsawyer on wp.org
 
-= ad injection | placements =
+= Ad Injection | Placements =
 
 Placements to insert ads in pre-defined positions in your theme and content. [List of all placements](https://wpadvancedads.com/manual/placements/)
@@ -107 +108 @@
 * [Page peel banners](https://wpadvancedads.com/page-peel-ads/)
 * create [split tests and A/B testing](https://wpadvancedads.com/ab-testing-wordpress/)
-* many more ad positions with [add-ons](https://wpadvancedads.com/add-ons/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features)
 * automatic insertion of any kind of footer and header code, not only advertising
 * use the [ad server](https://wpadvancedads.com/ad-server-wordpress/) placement to display ads on other sites
-
-= mobile devices =
+* many more ad positions with [add-ons](https://wpadvancedads.com/add-ons/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features)
+
+= Mobile Devices =
 
 * target ads to mobile devices, or tablets, or desktops
 * display responsive image ads
-* ads only for specific browser sizes using [Advanced Ads Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-3)
-* insert ads on AMP pages with [AMP Ads](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-1)
+* ads only for specific browser sizes [Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-3)
+* insert ads on AMP pages [AMP Ads add-on](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-1)
 
 = Google AdSense =
@@ -133 +134 @@
 * easy Ad Health integration and Google AdSense violation checks
 * option to remove the Google AdSense background color
-* place Google AdSense In-feed ads using the also free [In-feed add-on](https://wordpress.org/plugins/advanced-ads-adsense-in-feed/)
-* assistant for exact sizes of responsive Google AdSense ads with the [AMP Ads add-on](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-2)
-* convert Google AdSense ads into AMP ads automatically with the [AMP Ads add-on](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-3)
 * ads.txt generated with the correct AdSense information automatically
 * works along with Google Site Kit or can replace it if you want to [control your ad placements](https://wpadvancedads.com/place-adsense-ad-unit-manually/)
+* place Google AdSense In-feed ads [free In-feed add-on](https://wordpress.org/plugins/advanced-ads-adsense-in-feed/)
+* assistant for exact sizes of responsive Google AdSense ads [AMP Ads add-on](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-2)
+* convert Google AdSense ads into AMP ads automatically [AMP Ads add-on](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-amp-ads-3)
 
 https://vimeo.com/577120971
@@ -145 +146 @@
 > Your app is awesome, congratulations! Google Adsense suggests using your app on its official website, it’s incredible!
 
-= ads.txt =
+= Affiliate Marketing =
+
+Easily integrate affiliate marketing with a comprehensive toolkit.
+
+* unlimited affiliate ads and banners
+* text link support
+* affiliate disclosure
+* automatic affiliate ad insertion
+* advanced targeting
+* dedicated AAWP ad type (Amazon Affiliate WordPress Plugin)
+* integrates with other affiliate plugins like Pretty Links, Thirsty Affiliates, Lasso, and many more
+* support for all Amazon ad formats
+* compatible with all affiliate networks
+* link masking and link cloaking ([Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-7))
+* affiliate ad tracking ([Tracking add-on](https://wpadvancedads.com/add-ons/tracking/?utm_source=wporg&utm_medium=link&utm_campaign=affiliate-tracking))
+
+
+= Ads.txt =
 
 * generates an ads.txt with custom content
@@ -156 +174 @@
 * all add-ons include priority email support
 * [All Access](https://wpadvancedads.com/add-ons/all-access/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons) – includes all available add-ons
-* [Advanced Ads Pro](https://wpadvancedads.com/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons) – powerful tools for ad optimizations: cache-busting, more placements, [lazy loading](https://wpadvancedads.com/lazy-load-ads/?utm_source=wporg&utm_medium=link&utm_campaign=features), ad blocker module, [click fraud protection](https://wpadvancedads.com/manual/click-fraud-protection/?utm_source=wporg&utm_medium=link&utm_campaign=features), [geo targeting](https://wpadvancedads.com/add-ons/geo-targeting/?utm_source=wporg&utm_medium=link&utm_campaign=features), [parallax ads](https://wpadvancedads.com/parallax-ads/?utm_source=wporg&utm_medium=link&utm_campaign=features) and many more
+* [Advanced Ads Pro](https://wpadvancedads.com/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons) – powerful tools for ad optimizations: cache-busting, more placements, [lazy loading](https://wpadvancedads.com/lazy-load-ads/?utm_source=wporg&utm_medium=link&utm_campaign=features), ad blocker module, ad refresh, [click fraud protection](https://wpadvancedads.com/manual/click-fraud-protection/?utm_source=wporg&utm_medium=link&utm_campaign=features), [geo targeting](https://wpadvancedads.com/add-ons/geo-targeting/?utm_source=wporg&utm_medium=link&utm_campaign=features), [parallax ads](https://wpadvancedads.com/parallax-ads/?utm_source=wporg&utm_medium=link&utm_campaign=features) and many more
 * [Tracking](https://wpadvancedads.com/add-ons/tracking/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons) – track ad impressions and ad clicks with local methods or Google Analytics
 * [AMP Ads](https://wpadvancedads.com/add-ons/amp-ads/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons) – make your ads compatible with AMP and convert Google AdSense ads automatically
@@ -167 +185 @@
 * [Full Feature List](https://wpadvancedads.com/features/?utm_source=wporg&utm_medium=link&utm_campaign=wp-add-ons)
 
-= ad blocker =
+= Ad Blocker =
 
 * basic features to prevent ads from being removed by AdBlock and other ad blockers
 * prevent ad blockers from breaking sites where plugin scripts are running
-* ad blocking detection: show alternative content to ad block users with [Advanced Ads Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-3) and improve the monetization of your website
+* ad blocker detection: show alternative content to ad block users and improve the monetization of your website [Pro](https://wpadvancedads.com/add-ons/advanced-ads-pro/?utm_source=wporg&utm_medium=link&utm_campaign=wp-features-pro-4) 
 
 Learn more on the [plugin homepage](https://wpadvancedads.com).
@@ -188 +206 @@
 - BuddyPress – [How to add ads on BuddyPress pages](https://wpadvancedads.com/ads-on-buddypress-pages/)
 - bbPress – [How to show ads on bbPress pages?](https://wpadvancedads.com/ads-in-bbpress/)
-- Cookie Consent, Borlabs Cookies, Complianz, GDPR Cookie Consent, and other content manager – [How to show ads based on visitors’ consent](https://wpadvancedads.com/manual/ad-cookie-consent/)
+- Cookie Consent, Borlabs Cookies, Complianz, GDPR Cookie Consent, and other privacy and consent manager – [How to show ads based on visitors’ consent](https://wpadvancedads.com/manual/ad-cookie-consent/)
 - Elementor - [How to create and implement ads in Elementor](https://wpadvancedads.com/elementor-ads/)
 - GamiPress – [How to target ads on GamiPress websites](https://wpadvancedads.com/manual/gamipress-ads/)
 - Genesis – [Genesis Ads add-on](https://wpadvancedads.com/add-ons/genesis-ads/)
-- [IAB TCF 2.0 consent](https://wpadvancedads.com/manual/tcf-consent-wordpress/) – hide ads until users give their consent. Integrating with any CMP, Quantcast Choices, iubenda, Google Funding Choices, cookiebot, etc.
+- [IAB TCF 2.0 consent](https://wpadvancedads.com/manual/tcf-consent-wordpress/) – hide ads until users give their consent. Integrating with any CMP, InMobi, iubenda, Google Funding Choices, cookiebot, etc.
 - LearnDash - [How to integrate ads into LearnDash](https://wpadvancedads.com/learndash-ads/)
 - MailPoet - [How to integrate Advanced Ads in MailPoet Newsletters](https://wpadvancedads.com/mailpoet-newsletters/)
@@ -201 +219 @@
 - WPBakery Page Builder – [Displaying Ads with WPBakery Page Builder](https://wpadvancedads.com/visual-composer-ads/)
 - WPML – [Showing different ads per language with WPML](https://wpadvancedads.com/translating-ads-wpml/)
+- Youzify – [How to integrate ads in Youzify](https://wpadvancedads.com/how-to-integrate-ads-in-youzify/)
 
 == Installation ==
@@ -241 +260 @@
 * Ads not showing up? Take a look [here](https://wpadvancedads.com/manual/ads-not-showing-up).
 
-= What about my users’ privacy and GDPR? =
+= What about my users’ privacy and GDPR compliance? =
 
 The plugin comes with Privacy settings that help you gather consent from users before showing ads to them. The feature works for any ads managed with the plugin, including AdSense Auto ads.
@@ -257 +276 @@
 = Which ad networks are supported? =
 
-Advanced Ads is compatible with all ad networks and banners from affiliate programs like AWin, Google AdSense, Chitika, Clickbank, Amazon, and also Google Ad Manager (formerly Google DoubleClick for Publishers, DFP), media.net.
-
-You can also use it to insert additional ad network tags into header or footer of your site without coding.
-
-AdSense has even a dedicated ad type leveling the specific options this ad network provides.
+Advanced Ads is compatible with all ad networks and banners from affiliate programs like Awin, Google AdSense, Chitika, Clickbank, CJ Affiliate, Amazon, ShareASale, Impact, Rakuten, Booking.com, GetYourGuide, media.net, and also Google Ad Manager (formerly Google DoubleClick for Publishers, DFP).
+
+You can also use it to insert additional ad network tags into your site's header or footer without coding to integrate header bidding.
+Advanced Ads even provides a dedicated AdSense ad type to leverage this ad network's specific options.
 
 = PHP functions and shortcodes =
@@ -284 +302 @@
 `<?php the_ad_placement('header-left'); ?>`
 
-= Is there a revenue share? =
-
-There is no revenue share. Advanced Ads doesn’t alter your ad codes in a way that you earn less than you would directly including the ad code in your template.
+= Is there an ad revenue share? =
+
+There is no revenue sharing. Advanced Ads doesn’t alter your ad codes in a way that you earn less than you would directly including the ad code in your template. To implement revenue sharing between multiple authors, follow the instructions of [this tutorial](https://wpadvancedads.com/publisher-revenue-share/).
 
 = Can I place ads directly in my theme files? =
@@ -339 +357 @@
 == Changelog ==
 
-= 1.53.2 (August 13, 2024) =
-
-- Fix: ensure content from a group shows in all content placements
-
-= 1.53.1 (August 13, 2024) =
-
-- Fix: resolve issue with deleting data on uninstall
-- Fix: resolve JavaScript error when uninstall
-
-= 1.53.0 (August 6, 2024) =
-
-- Improvement: add quick & bulk edit for "disable" ads on post/pages
-- Fix: correct handling of conditions array when no conditions are set for an ad
-- Fix: add drafted ads to group statistics on the statistic page
+= 1.54.0 (September 2, 2024) =
+
+- Improvement: enhance PubGuru one click integration
+- Fix: prevent PHP warning when using ad debug
+- Fix: readd drafted ads to group statistics on the statistic page
+- Fix: resolve issue with ad blocker detection

advanced-ads/trunk/views/admin/metabox-pubguru-connect.php

@@ -7 +7 @@
  */
 
-if ( false === $pubguru_config ) : ?>
+use AdvancedAds\Modules\OneClick\Options;
 
-<div class="pubguru-not-connected space-y-4">
+$header_bidding = Options::module( 'header_bidding' );
+?>
+<div class="pubguru-not-connected space-y-4<?php echo false === $pubguru_config ? '' : ' hidden'; ?>">
     <label for="m2-connect-consent" class="flex items-center w-full">
         <span class="self-start">
@@ -28 +30 @@
 
     <div class="flex items-center gap-x-4">
-        <button class="button button-primary js-pubguru-connect" disabled type="button"><?php esc_html_e( 'Connect PGHB', 'advanced-ads' ); ?></button>
+        <button class="button button-primary js-pubguru-connecting" disabled type="button"><?php esc_html_e( 'Connect PGHB', 'advanced-ads' ); ?></button>
         <div class="lds-ripple aa-spinner"><div></div><div></div></div>
     </div>
 </div>
-<?php endif; ?>
 
 <div class="pubguru-connected<?php echo false === $pubguru_config ? ' hidden' : ''; ?>">
@@ -47 +48 @@
             <div>
                 <label for="pubguru-header-bidding" class="advads-ui-switch">
-                    <input type="checkbox" name="header_bidding" id="pubguru-header-bidding" class="sr-only peer" <?php checked( boolval( get_option( 'pubguru_module_header_bidding', false ) ) ); ?>>
+                    <input type="checkbox" name="header_bidding" id="pubguru-header-bidding" class="sr-only peer" <?php checked( $header_bidding ); ?>>
                     <div></div>
                     <span>
@@ -55 +56 @@
             </div>
 
-            <div>
-                <label for="pubguru-tag-conversion" class="advads-ui-switch">
-                    <input type="checkbox" name="tag_conversion" id="pubguru-tag-conversion" <?php checked( boolval( get_option( 'pubguru_module_tag_conversion', false ) ) ); ?> />
+            <div<?php echo $header_bidding ? ' style="margin-left: 20px;"' : ' style="display: none;"'; ?>>
+                <label for="pubguru-header-bidding-at-body" class="advads-ui-switch">
+                    <input type="checkbox" name="header_bidding_at_body" id="pubguru-header-bidding-at-body" class="sr-only peer" <?php checked( Options::module( 'header_bidding_at_body' ) ); ?>>
                     <div></div>
                     <span>
-                        <?php esc_html_e( 'Activate Tag Conversion', 'advanced-ads' ); ?>
+                        <?php esc_html_e( 'Move the PubGuru Header Bidding script to the footer. Keep this option disabled to maximize revenue. Only enable it if PageSpeed is your priority.', 'advanced-ads' ); ?>
                     </span>
                 </label>
@@ -67 +68 @@
             <div>
                 <label for="pubguru-adstxt" class="advads-ui-switch">
-                    <input type="checkbox" name="ads_txt" id="pubguru-adstxt" <?php checked( boolval( get_option( 'pubguru_module_ads_txt', false ) ) ); ?> />
+                    <input type="checkbox" name="ads_txt" id="pubguru-adstxt" <?php checked( Options::module( 'ads_txt' ) ); ?> />
                     <div></div>
                     <span>
@@ -86 +87 @@
             </div>
 
-            <div>
+            <div class="hidden">
                 <label for="pubguru-traffic-cop" class="advads-ui-switch">
-                    <input type="checkbox" name="traffic_cop" id="pubguru-traffic-cop" <?php checked( boolval( get_option( 'pubguru_module_traffic_cop', false ) ) ); ?> />
+                    <input type="checkbox" name="traffic_cop" id="pubguru-traffic-cop" <?php checked( Options::module( 'traffic_cop' ) ); ?> />
                     <div></div>
                     <span class="pg-tc-trail <?php echo $has_traffic_cop ? 'hidden' : ''; ?>">
@@ -99 +100 @@
             </div>
 
+            <div class="hidden">
+                <label for="pubguru-tag-conversion" class="advads-ui-switch">
+                    <input type="checkbox" name="tag_conversion" id="pubguru-tag-conversion" <?php checked( Options::module( 'tag_conversion' ) ); ?> />
+                    <div></div>
+                    <span>
+                        <?php esc_html_e( 'Activate Tag Conversion', 'advanced-ads' ); ?>
+                    </span>
+                </label>
+            </div>
+
         </div>
 
@@ -104 +115 @@
 
 </div>
+
+<?php
+$session_key = get_option( 'advanced-ads-importer-history' );
+if ( $session_key ) :
+    $delete_link = wp_nonce_url(
+        add_query_arg(
+            [
+                'action'      => 'advads_import_delete',
+                'session_key' => $session_key,
+            ]
+        ),
+        'advads_import_delete'
+    );
+    ?>
+<div class="rollback-block">
+    <header><?php esc_html_e( 'Rollback', 'advanced-ads' ); ?></header>
+    <a href="<?php echo esc_url( $delete_link ); ?>" class="button-link !text-red-500"><?php esc_html_e( 'Rollback the api changes back to previous state.', 'advanced-ads' ); ?></a>
+</div>
+<?php endif; ?>