Changeset 3283205

Timestamp:

04/28/2025 08:28:54 AM (8 months ago)

Author:

advancedads

Message:

Update to version 2.0.8 from GitHub

Location:

advanced-ads

Files:

• tags/2.0.8 (copied) (copied from advanced-ads/trunk)
• tags/2.0.8/advanced-ads.php (modified) (2 diffs)
• tags/2.0.8/includes/abstracts/abstract-ad.php (modified) (4 diffs)
• tags/2.0.8/includes/admin/class-admin-menu.php (modified) (1 diff)
• tags/2.0.8/includes/admin/class-metabox-ad-settings.php (modified) (2 diffs)
• tags/2.0.8/includes/admin/class-quick-bulk-edit.php (modified) (3 diffs)
• tags/2.0.8/includes/admin/pages/class-ads-editing.php (modified) (2 diffs)
• tags/2.0.8/includes/ads/class-ad-group-relation.php (added)
• tags/2.0.8/includes/ads/class-ad-repository.php (modified) (3 diffs)
• tags/2.0.8/includes/class-constants.php (modified) (1 diff)
• tags/2.0.8/includes/class-upgrades.php (modified) (2 diffs)
• tags/2.0.8/includes/groups/class-group-ad-relation.php (added)
• tags/2.0.8/includes/groups/class-group-repository.php (modified) (2 diffs)
• tags/2.0.8/languages/advanced-ads.pot (modified) (7 diffs)
• tags/2.0.8/packages/composer/autoload_classmap.php (modified) (2 diffs)
• tags/2.0.8/packages/composer/autoload_static.php (modified) (2 diffs)
• tags/2.0.8/readme.txt (modified) (2 diffs)
• tags/2.0.8/upgrades/upgrade-2.0.8.php (added)
• tags/2.0.8/wp.advads (added)
• trunk/advanced-ads.php (modified) (2 diffs)
• trunk/includes/abstracts/abstract-ad.php (modified) (4 diffs)
• trunk/includes/admin/class-admin-menu.php (modified) (1 diff)
• trunk/includes/admin/class-metabox-ad-settings.php (modified) (2 diffs)
• trunk/includes/admin/class-quick-bulk-edit.php (modified) (3 diffs)
• trunk/includes/admin/pages/class-ads-editing.php (modified) (2 diffs)
• trunk/includes/ads/class-ad-group-relation.php (added)
• trunk/includes/ads/class-ad-repository.php (modified) (3 diffs)
• trunk/includes/class-constants.php (modified) (1 diff)
• trunk/includes/class-upgrades.php (modified) (2 diffs)
• trunk/includes/groups/class-group-ad-relation.php (added)
• trunk/includes/groups/class-group-repository.php (modified) (2 diffs)
• trunk/languages/advanced-ads.pot (modified) (7 diffs)
• trunk/packages/composer/autoload_classmap.php (modified) (2 diffs)
• trunk/packages/composer/autoload_static.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/upgrades/upgrade-2.0.8.php (added)
• trunk/wp.advads (added)

advanced-ads/tags/2.0.8/advanced-ads.php

@@ -11 +11 @@
  * @wordpress-plugin
  * Plugin Name:       Advanced Ads
- * Version:           2.0.7
+ * Version:           2.0.8
  * Description:       Manage and optimize your ads in WordPress
  * Plugin URI:        https://wpadvancedads.com
@@ -38 +38 @@
 
 define( 'ADVADS_FILE', __FILE__ );
-define( 'ADVADS_VERSION', '2.0.7' );
+define( 'ADVADS_VERSION', '2.0.8' );
 
 // Load the autoloader.

advanced-ads/tags/2.0.8/includes/abstracts/abstract-ad.php

@@ -14 +14 @@
 use Advanced_Ads_Utils;
 use Advanced_Ads_Visitor_Conditions;
-use AdvancedAds\Compatibility\Compatibility;
+use AdvancedAds\Traits;
 use AdvancedAds\Constants;
-use AdvancedAds\Framework\Utilities\Arr;
-use AdvancedAds\Framework\Utilities\Formatting;
-use AdvancedAds\Framework\Utilities\Str;
 use AdvancedAds\Frontend\Stats;
 use AdvancedAds\Interfaces\Ad_Type;
-use AdvancedAds\Traits;
+use AdvancedAds\Utilities\WordPress;
 use AdvancedAds\Utilities\Conditional;
-use AdvancedAds\Utilities\WordPress;
-use DateInterval;
-use DateTime;
+use AdvancedAds\Framework\Utilities\Arr;
+use AdvancedAds\Framework\Utilities\Str;
+use AdvancedAds\Compatibility\Compatibility;
+use AdvancedAds\Framework\Utilities\Formatting;
 
 defined( 'ABSPATH' ) || exit;
@@ -789 +787 @@
      */
     public function get_ad_schedule_details(): array {
+        $status_strings     = [];
+        $html_classes       = 'advads-filter-timing';
+        $post_start         = get_post_time( 'U', true, $this->get_id() );
         $expiry_date_format = get_option( 'date_format' ) . ', ' . get_option( 'time_format' );
-        $status_strings     = [];
-        $post_start         = get_post_time( 'U', true, $this->get_id() );
-        $html_classes       = 'advads-filter-timing';
 
         $status_type = get_post_status( $this->get_id() ) ?? 'published';
@@ -810 +808 @@
             $expiry      = $this->get_expiry_date();
             $expiry_date = date_create( '@' . $expiry );
-            $expiry_date->setTimezone( WordPress::get_timezone() );
+            $expiry_date->setTimezone( new \DateTimeZone( 'UTC' ) );
             $html_classes .= ' advads-filter-any-exp-date';
 
@@ -900 +898 @@
         }
 
-        $wp_time = new DateTime( 'now', wp_timezone() );
-        $expiration_date->sub( new DateInterval( 'PT' . $wp_time->getOffset() . 'S' ) );
+        $expiration_date->setTimezone( new \DateTimeZone( 'UTC' ) );
         $gm_date = $expiration_date->format( 'Y-m-d-H-i' );
 

advanced-ads/tags/2.0.8/includes/admin/class-admin-menu.php

@@ -247 +247 @@
      * @return string
      */
-    public function add_body_class( string $classes ): string {
+    public function add_body_class( $classes ): string {
+        // Ensure $classes is always a string due to 3rd party plugins interfering with the filter.
+        $classes    = is_string( $classes ) ? $classes : '';
         $screen_ids = $this->get_screen_ids();
         $wp_screen  = get_current_screen();

advanced-ads/tags/2.0.8/includes/admin/class-metabox-ad-settings.php

@@ -40 +40 @@
         add_action( 'add_meta_boxes', [ $this, 'add_meta_box' ] );
         add_action( 'save_post', [ $this, 'save_settings' ], 10, 2 );
-        add_action( 'set_object_terms', [ $this, 'set_group_terms' ], 10, 6 );
     }
 
@@ -132 +131 @@
         update_post_meta( $post_id, self::SETTING_METAKEY, $data );
     }
-
-    /**
-     * Sets the group terms for an ad.
-     *
-     * Handles the removed and added groups accordingly.
-     *
-     * @param int    $ad_id      The ID of the ad.
-     * @param array  $terms      The terms to set for the ad.
-     * @param array  $tt_ids     The term taxonomy IDs to set for the ad.
-     * @param string $taxonomy   The taxonomy to set the terms for.
-     * @param bool   $append     Whether to append the terms or replace them.
-     * @param array  $old_tt_ids The old term taxonomy IDs for the ad.
-     * @return void
-     */
-    public function set_group_terms( $ad_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids ) {
-        if ( Constants::TAXONOMY_GROUP === $taxonomy ) {
-            $removed_terms = array_diff( $old_tt_ids, $tt_ids );
-            $added_terms   = array_diff( $tt_ids, $old_tt_ids );
-
-            $this->handle_removed_terms( $removed_terms, $ad_id );
-            $this->handle_added_terms( $added_terms, $ad_id );
-        }
-    }
-
-    /**
-     * Handles the removed terms for an ad.
-     *
-     * @param array $removed_terms An array of term IDs that have been removed.
-     * @param int   $ad_id         The ID of the ad.
-     * @return void
-     */
-    private function handle_removed_terms( $removed_terms, $ad_id ) {
-        foreach ( $removed_terms as $group_id ) {
-            $group = wp_advads_get_group( $group_id );
-            if ( ! $group ) {
-                continue;
-            }
-
-            $weights = $group->get_ad_weights();
-            if ( isset( $weights[ $ad_id ] ) ) {
-                unset( $weights[ $ad_id ] );
-                $group->set_ad_weights( $weights );
-                $group->save();
-            }
-        }
-    }
-
-    /**
-     * Handles the added terms for an ad.
-     *
-     * @param array $added_terms An array of term IDs that have been added.
-     * @param int   $ad_id       The ID of the ad.
-     * @return void
-     */
-    private function handle_added_terms( $added_terms, $ad_id ) {
-        foreach ( $added_terms as $group_id ) {
-            $group = wp_advads_get_group( $group_id );
-            if ( ! $group ) {
-                continue;
-            }
-
-            $weights = $group->get_ad_weights();
-            if ( ! isset( $weights[ $ad_id ] ) ) {
-                $weights[ $ad_id ] = Constants::GROUP_AD_DEFAULT_WEIGHT;
-                $group->set_ad_weights( $weights );
-                $group->save();
-            }
-        }
-    }
 }

advanced-ads/tags/2.0.8/includes/admin/class-quick-bulk-edit.php

@@ -196 +196 @@
 
         try {
-            $date = new DateTime( 'now', wp_timezone() );
+            $date = new DateTime( 'now', new \DateTimeZone( 'UTC' ) );
             $date->setDate( $year, $month, $day );
             $date->setTime( $hours, $minutes );
@@ -276 +276 @@
     public static function print_date_time_inputs( $timestamp = 0, $prefix = '', $seconds = false ) {
         try {
-            $initial_date = (bool) $timestamp ? new \DateTimeImmutable( "@$timestamp", wp_timezone() ) : current_datetime();
+            $initial_date = (bool) $timestamp ? new \DateTimeImmutable( "@$timestamp", new \DateTimeZone( 'UTC' ) ) : current_datetime();
         } catch ( Exception $e ) {
             $initial_date = current_datetime();
@@ -341 +341 @@
         if ( $expiry ) {
             $expiry_date = array_combine(
-                [ 'year', 'month', 'day', 'hour', 'minutes' ],
-                explode( '-', wp_date( 'Y-m-d-H-i', $expiry ) )
+                [ 'year', 'month', 'day', 'hour', 'minute' ],
+                explode( '-', wp_date( 'Y-m-d-H-i', $expiry, new \DateTimeZone( 'UTC' ) ) )
             );
         }

advanced-ads/tags/2.0.8/includes/admin/pages/class-ads-editing.php

@@ -10 +10 @@
 namespace AdvancedAds\Admin\Pages;
 
+use DateTimeImmutable;
 use AdvancedAds\Constants;
+use AdvancedAds\Utilities\WordPress;
 use AdvancedAds\Framework\Utilities\Params;
-use AdvancedAds\Utilities\WordPress;
-use DateTime;
 
 defined( 'ABSPATH' ) || exit;
@@ -158 +158 @@
         // Get time set for ad or current timestamp (both GMT).
         $utc_ts   = $ad->get_expiry_date() ?: current_time( 'timestamp', true ); // phpcs:ignore
-        $utc_time = new DateTime( '@' . $utc_ts );
-        $utc_time->setTimezone( \Advanced_Ads_Utils::get_wp_timezone() );
+        $utc_time = new DateTimeImmutable( '@' . $utc_ts, new \DateTimeZone( 'UTC' ) );
         [ $curr_year, $curr_month, $curr_day, $curr_hour, $curr_minute ] = explode( '-', $utc_time->format( 'Y-m-d-H-i' ) );
         $enabled = 1 - empty( $ad->get_expiry_date() );

advanced-ads/tags/2.0.8/includes/ads/class-ad-repository.php

@@ -67 +67 @@
 
             $this->update_post_meta( $ad );
+            $this->update_post_term( $ad );
             $this->update_version( $ad );
 
@@ -164 +165 @@
 
         $this->update_post_meta( $ad );
+        $this->update_post_term( $ad );
 
         $ad->apply_changes();
@@ -419 +421 @@
 
     /**
+     * Update ad groups.
+     *
+     * @param Ad $ad Ad object.
+     *
+     * @return void
+     */
+    private function update_post_term( &$ad ): void {
+        ( new Ad_Group_Relation() )->relate( $ad );
+    }
+
+    /**
      * Make sure we store the ad version (to track data changes).
      *

advanced-ads/tags/2.0.8/includes/class-constants.php

@@ -118 +118 @@
     const AD_META_EXPIRATION_TIME = 'advanced_ads_expiration_time';
 
+    /**
+     * Ad metakey for group ids.
+     *
+     * @var string
+     */
+    const AD_META_GROUP_IDS = 'advanced_ads_ad_group_ids';
+
     /* User Meta Keys ------------------- */
 

advanced-ads/tags/2.0.8/includes/class-upgrades.php

@@ -20 +20 @@
 class Upgrades extends Updates implements Initializer_Interface {
 
-    const DB_VERSION = '1.53.0';
+    const DB_VERSION = '1.53.1';
 
     /**
@@ -35 +35 @@
             '1.52.1' => 'upgrade-1.52.1.php',
             '2.0.0'  => 'upgrade-2.0.0.php',
+            '2.0.8'  => 'upgrade-2.0.8.php',
         ];
     }

advanced-ads/tags/2.0.8/includes/groups/class-group-repository.php

@@ -113 +113 @@
         // Only update weights when there is a change.
         if ( in_array( 'ad_weights', $changed, true ) ) {
-            $this->update_ads_terms( $group );
+            ( new Group_Ad_Relation() )->relate( $group );
         }
 
@@ -273 +273 @@
 
     /**
-     * Update group ad terms.
-     *
-     * @param Group $group Group object.
-     *
-     * @return void
-     */
-    private function update_ads_terms( &$group ): void {
-        // Early bail!!
-        if ( empty( $group->get_ad_weights() ) ) {
-            return;
-        }
-
-        $data    = $group->get_data();
-        $changes = $group->get_changes();
-        $old_ads = $data['ad_weights'] ? array_keys( $data['ad_weights'] ) : [];
-        $new_ads = $changes['ad_weights'] ? array_keys( $changes['ad_weights'] ) : [];
-        $removed = array_diff( $old_ads, $new_ads );
-
-        foreach ( $removed as $ad_id ) {
-            $terms = wp_get_object_terms( $ad_id, Constants::TAXONOMY_GROUP );
-
-            if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
-                $term_ids = wp_list_pluck( $terms, 'term_id' );
-                $term_ids = array_diff( $term_ids, [ $group->get_id() ] );
-                wp_set_object_terms( $ad_id, $term_ids, Constants::TAXONOMY_GROUP );
-            }
-        }
-
-        $new_ads_final = $changes['ad_weights'] ?? [];
-
-        foreach ( $new_ads as $ad_id ) {
-            /**
-             * Check if this ad is representing the current group and remove it in this case
-             * could cause an infinite loop otherwise
-             */
-            $ad = wp_advads_get_ad( $ad_id );
-            if ( $ad && $ad->is_type( 'group' ) && $ad->get_group_id() === $group->get_id() ) {
-                unset( $new_ads_final[ $ad_id ] );
-                continue;
-            }
-
-            $terms = wp_get_object_terms( $ad_id, Constants::TAXONOMY_GROUP );
-
-            if ( ! is_wp_error( $terms ) ) {
-                $term_ids   = wp_list_pluck( $terms, 'term_id' );
-                $term_ids[] = $group->get_id();
-                $term_ids   = array_unique( $term_ids );
-                wp_set_object_terms( $ad_id, $term_ids, Constants::TAXONOMY_GROUP );
-            }
-        }
-
-        $group->set_ad_weights( $new_ads_final );
-    }
-
-    /**
      * Migrate values to new version
      *

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

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Advanced Ads 2.0.6\n"
+"Project-Id-Version: Advanced Ads 2.0.7\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: 2025-04-09T05:01:12+00:00\n"
+"POT-Creation-Date: 2025-04-28T07:32:04+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
@@ -1183 +1183 @@
 
 #: classes/display-conditions.php:729
-#: includes/abstracts/abstract-ad.php:832
+#: includes/abstracts/abstract-ad.php:830
 #: includes/admin/class-groups-list-table.php:362
 #: views/admin/placements/quick-edit.php:16
@@ -1551 +1551 @@
 
 #. translators: %s is a date.
-#: includes/abstracts/abstract-ad.php:806
+#: includes/abstracts/abstract-ad.php:804
 msgid "starts %s"
 msgstr ""
 
 #. translators: %s is a date.
-#: includes/abstracts/abstract-ad.php:820
+#: includes/abstracts/abstract-ad.php:818
 msgid "expires %s"
 msgstr ""
 
 #. translators: %s is a date.
-#: includes/abstracts/abstract-ad.php:826
+#: includes/abstracts/abstract-ad.php:824
 msgid "expired %s"
 msgstr ""
 
-#: includes/abstracts/abstract-ad.php:835
+#: includes/abstracts/abstract-ad.php:833
 #: includes/admin/class-placement-quick-edit.php:48
 #: views/admin/placements/edit-modal/fields/status.php:13
@@ -1573 +1573 @@
 msgstr ""
 
-#: includes/abstracts/abstract-ad.php:838
+#: includes/abstracts/abstract-ad.php:836
 msgid "Trashed"
 msgstr ""
 
 #. translators: %1$s is a placement name, %2$s is the ads name.
-#: includes/abstracts/abstract-ad.php:1216
+#: includes/abstracts/abstract-ad.php:1213
 msgid "Placement name: %1$s; Ads: %2$s"
 msgstr ""
@@ -2178 +2178 @@
 msgstr ""
 
-#: includes/admin/class-metabox-ad-settings.php:64
+#: includes/admin/class-metabox-ad-settings.php:63
 msgid "Ad Settings"
 msgstr ""
@@ -2961 +2961 @@
 msgstr ""
 
-#: includes/ads/class-ad-repository.php:90
+#: includes/ads/class-ad-repository.php:91
 msgid "Invalid ad."
 msgstr ""

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

@@ -73 +73 @@
     'AdvancedAds\\Ads\\Ad_Factory' => $baseDir . '/includes/ads/class-ad-factory.php',
     'AdvancedAds\\Ads\\Ad_Group' => $baseDir . '/includes/ads/class-ad-group.php',
+    'AdvancedAds\\Ads\\Ad_Group_Relation' => $baseDir . '/includes/ads/class-ad-group-relation.php',
     'AdvancedAds\\Ads\\Ad_Image' => $baseDir . '/includes/ads/class-ad-image.php',
     'AdvancedAds\\Ads\\Ad_Plain' => $baseDir . '/includes/ads/class-ad-plain.php',
@@ -132 +133 @@
     'AdvancedAds\\Frontend\\Scripts' => $baseDir . '/includes/frontend/class-scripts.php',
     'AdvancedAds\\Frontend\\Stats' => $baseDir . '/includes/frontend/class-stats.php',
+    'AdvancedAds\\Groups\\Group_Ad_Relation' => $baseDir . '/includes/groups/class-group-ad-relation.php',
     'AdvancedAds\\Groups\\Group_Factory' => $baseDir . '/includes/groups/class-group-factory.php',
     'AdvancedAds\\Groups\\Group_Ordered' => $baseDir . '/includes/groups/class-group-ordered.php',

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

@@ -100 +100 @@
         'AdvancedAds\\Ads\\Ad_Factory' => __DIR__ . '/../..' . '/includes/ads/class-ad-factory.php',
         'AdvancedAds\\Ads\\Ad_Group' => __DIR__ . '/../..' . '/includes/ads/class-ad-group.php',
+        'AdvancedAds\\Ads\\Ad_Group_Relation' => __DIR__ . '/../..' . '/includes/ads/class-ad-group-relation.php',
         'AdvancedAds\\Ads\\Ad_Image' => __DIR__ . '/../..' . '/includes/ads/class-ad-image.php',
         'AdvancedAds\\Ads\\Ad_Plain' => __DIR__ . '/../..' . '/includes/ads/class-ad-plain.php',
@@ -159 +160 @@
         'AdvancedAds\\Frontend\\Scripts' => __DIR__ . '/../..' . '/includes/frontend/class-scripts.php',
         'AdvancedAds\\Frontend\\Stats' => __DIR__ . '/../..' . '/includes/frontend/class-stats.php',
+        'AdvancedAds\\Groups\\Group_Ad_Relation' => __DIR__ . '/../..' . '/includes/groups/class-group-ad-relation.php',
         'AdvancedAds\\Groups\\Group_Factory' => __DIR__ . '/../..' . '/includes/groups/class-group-factory.php',
         'AdvancedAds\\Groups\\Group_Ordered' => __DIR__ . '/../..' . '/includes/groups/class-group-ordered.php',

advanced-ads/tags/2.0.8/readme.txt

@@ -5 +5 @@
 Tested up to: 6.7
 Requires PHP: 7.4
-Stable tag: 2.0.7
+Stable tag: 2.0.8
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -361 +361 @@
 == Changelog ==
 
+= 2.0.8 (April 28, 2025) =
+
+- Improvement: type safety in `add_body_class` to prevent issues from third-party filters
+- Improvement: improve the ad and group relation both way
+- Fix: expiry date not updating for ads that already had one set
+
 = 2.0.7 (April 9, 2025) =
 - Improvement: optimize MailPoet compatibility

advanced-ads/trunk/advanced-ads.php

@@ -11 +11 @@
  * @wordpress-plugin
  * Plugin Name:       Advanced Ads
- * Version:           2.0.7
+ * Version:           2.0.8
  * Description:       Manage and optimize your ads in WordPress
  * Plugin URI:        https://wpadvancedads.com
@@ -38 +38 @@
 
 define( 'ADVADS_FILE', __FILE__ );
-define( 'ADVADS_VERSION', '2.0.7' );
+define( 'ADVADS_VERSION', '2.0.8' );
 
 // Load the autoloader.

advanced-ads/trunk/includes/abstracts/abstract-ad.php

@@ -14 +14 @@
 use Advanced_Ads_Utils;
 use Advanced_Ads_Visitor_Conditions;
-use AdvancedAds\Compatibility\Compatibility;
+use AdvancedAds\Traits;
 use AdvancedAds\Constants;
-use AdvancedAds\Framework\Utilities\Arr;
-use AdvancedAds\Framework\Utilities\Formatting;
-use AdvancedAds\Framework\Utilities\Str;
 use AdvancedAds\Frontend\Stats;
 use AdvancedAds\Interfaces\Ad_Type;
-use AdvancedAds\Traits;
+use AdvancedAds\Utilities\WordPress;
 use AdvancedAds\Utilities\Conditional;
-use AdvancedAds\Utilities\WordPress;
-use DateInterval;
-use DateTime;
+use AdvancedAds\Framework\Utilities\Arr;
+use AdvancedAds\Framework\Utilities\Str;
+use AdvancedAds\Compatibility\Compatibility;
+use AdvancedAds\Framework\Utilities\Formatting;
 
 defined( 'ABSPATH' ) || exit;
@@ -789 +787 @@
      */
     public function get_ad_schedule_details(): array {
+        $status_strings     = [];
+        $html_classes       = 'advads-filter-timing';
+        $post_start         = get_post_time( 'U', true, $this->get_id() );
         $expiry_date_format = get_option( 'date_format' ) . ', ' . get_option( 'time_format' );
-        $status_strings     = [];
-        $post_start         = get_post_time( 'U', true, $this->get_id() );
-        $html_classes       = 'advads-filter-timing';
 
         $status_type = get_post_status( $this->get_id() ) ?? 'published';
@@ -810 +808 @@
             $expiry      = $this->get_expiry_date();
             $expiry_date = date_create( '@' . $expiry );
-            $expiry_date->setTimezone( WordPress::get_timezone() );
+            $expiry_date->setTimezone( new \DateTimeZone( 'UTC' ) );
             $html_classes .= ' advads-filter-any-exp-date';
 
@@ -900 +898 @@
         }
 
-        $wp_time = new DateTime( 'now', wp_timezone() );
-        $expiration_date->sub( new DateInterval( 'PT' . $wp_time->getOffset() . 'S' ) );
+        $expiration_date->setTimezone( new \DateTimeZone( 'UTC' ) );
         $gm_date = $expiration_date->format( 'Y-m-d-H-i' );
 

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

@@ -247 +247 @@
      * @return string
      */
-    public function add_body_class( string $classes ): string {
+    public function add_body_class( $classes ): string {
+        // Ensure $classes is always a string due to 3rd party plugins interfering with the filter.
+        $classes    = is_string( $classes ) ? $classes : '';
         $screen_ids = $this->get_screen_ids();
         $wp_screen  = get_current_screen();

advanced-ads/trunk/includes/admin/class-metabox-ad-settings.php

@@ -40 +40 @@
         add_action( 'add_meta_boxes', [ $this, 'add_meta_box' ] );
         add_action( 'save_post', [ $this, 'save_settings' ], 10, 2 );
-        add_action( 'set_object_terms', [ $this, 'set_group_terms' ], 10, 6 );
     }
 
@@ -132 +131 @@
         update_post_meta( $post_id, self::SETTING_METAKEY, $data );
     }
-
-    /**
-     * Sets the group terms for an ad.
-     *
-     * Handles the removed and added groups accordingly.
-     *
-     * @param int    $ad_id      The ID of the ad.
-     * @param array  $terms      The terms to set for the ad.
-     * @param array  $tt_ids     The term taxonomy IDs to set for the ad.
-     * @param string $taxonomy   The taxonomy to set the terms for.
-     * @param bool   $append     Whether to append the terms or replace them.
-     * @param array  $old_tt_ids The old term taxonomy IDs for the ad.
-     * @return void
-     */
-    public function set_group_terms( $ad_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids ) {
-        if ( Constants::TAXONOMY_GROUP === $taxonomy ) {
-            $removed_terms = array_diff( $old_tt_ids, $tt_ids );
-            $added_terms   = array_diff( $tt_ids, $old_tt_ids );
-
-            $this->handle_removed_terms( $removed_terms, $ad_id );
-            $this->handle_added_terms( $added_terms, $ad_id );
-        }
-    }
-
-    /**
-     * Handles the removed terms for an ad.
-     *
-     * @param array $removed_terms An array of term IDs that have been removed.
-     * @param int   $ad_id         The ID of the ad.
-     * @return void
-     */
-    private function handle_removed_terms( $removed_terms, $ad_id ) {
-        foreach ( $removed_terms as $group_id ) {
-            $group = wp_advads_get_group( $group_id );
-            if ( ! $group ) {
-                continue;
-            }
-
-            $weights = $group->get_ad_weights();
-            if ( isset( $weights[ $ad_id ] ) ) {
-                unset( $weights[ $ad_id ] );
-                $group->set_ad_weights( $weights );
-                $group->save();
-            }
-        }
-    }
-
-    /**
-     * Handles the added terms for an ad.
-     *
-     * @param array $added_terms An array of term IDs that have been added.
-     * @param int   $ad_id       The ID of the ad.
-     * @return void
-     */
-    private function handle_added_terms( $added_terms, $ad_id ) {
-        foreach ( $added_terms as $group_id ) {
-            $group = wp_advads_get_group( $group_id );
-            if ( ! $group ) {
-                continue;
-            }
-
-            $weights = $group->get_ad_weights();
-            if ( ! isset( $weights[ $ad_id ] ) ) {
-                $weights[ $ad_id ] = Constants::GROUP_AD_DEFAULT_WEIGHT;
-                $group->set_ad_weights( $weights );
-                $group->save();
-            }
-        }
-    }
 }

advanced-ads/trunk/includes/admin/class-quick-bulk-edit.php

@@ -196 +196 @@
 
         try {
-            $date = new DateTime( 'now', wp_timezone() );
+            $date = new DateTime( 'now', new \DateTimeZone( 'UTC' ) );
             $date->setDate( $year, $month, $day );
             $date->setTime( $hours, $minutes );
@@ -276 +276 @@
     public static function print_date_time_inputs( $timestamp = 0, $prefix = '', $seconds = false ) {
         try {
-            $initial_date = (bool) $timestamp ? new \DateTimeImmutable( "@$timestamp", wp_timezone() ) : current_datetime();
+            $initial_date = (bool) $timestamp ? new \DateTimeImmutable( "@$timestamp", new \DateTimeZone( 'UTC' ) ) : current_datetime();
         } catch ( Exception $e ) {
             $initial_date = current_datetime();
@@ -341 +341 @@
         if ( $expiry ) {
             $expiry_date = array_combine(
-                [ 'year', 'month', 'day', 'hour', 'minutes' ],
-                explode( '-', wp_date( 'Y-m-d-H-i', $expiry ) )
+                [ 'year', 'month', 'day', 'hour', 'minute' ],
+                explode( '-', wp_date( 'Y-m-d-H-i', $expiry, new \DateTimeZone( 'UTC' ) ) )
             );
         }

advanced-ads/trunk/includes/admin/pages/class-ads-editing.php

@@ -10 +10 @@
 namespace AdvancedAds\Admin\Pages;
 
+use DateTimeImmutable;
 use AdvancedAds\Constants;
+use AdvancedAds\Utilities\WordPress;
 use AdvancedAds\Framework\Utilities\Params;
-use AdvancedAds\Utilities\WordPress;
-use DateTime;
 
 defined( 'ABSPATH' ) || exit;
@@ -158 +158 @@
         // Get time set for ad or current timestamp (both GMT).
         $utc_ts   = $ad->get_expiry_date() ?: current_time( 'timestamp', true ); // phpcs:ignore
-        $utc_time = new DateTime( '@' . $utc_ts );
-        $utc_time->setTimezone( \Advanced_Ads_Utils::get_wp_timezone() );
+        $utc_time = new DateTimeImmutable( '@' . $utc_ts, new \DateTimeZone( 'UTC' ) );
         [ $curr_year, $curr_month, $curr_day, $curr_hour, $curr_minute ] = explode( '-', $utc_time->format( 'Y-m-d-H-i' ) );
         $enabled = 1 - empty( $ad->get_expiry_date() );

advanced-ads/trunk/includes/ads/class-ad-repository.php

@@ -67 +67 @@
 
             $this->update_post_meta( $ad );
+            $this->update_post_term( $ad );
             $this->update_version( $ad );
 
@@ -164 +165 @@
 
         $this->update_post_meta( $ad );
+        $this->update_post_term( $ad );
 
         $ad->apply_changes();
@@ -419 +421 @@
 
     /**
+     * Update ad groups.
+     *
+     * @param Ad $ad Ad object.
+     *
+     * @return void
+     */
+    private function update_post_term( &$ad ): void {
+        ( new Ad_Group_Relation() )->relate( $ad );
+    }
+
+    /**
      * Make sure we store the ad version (to track data changes).
      *

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

@@ -118 +118 @@
     const AD_META_EXPIRATION_TIME = 'advanced_ads_expiration_time';
 
+    /**
+     * Ad metakey for group ids.
+     *
+     * @var string
+     */
+    const AD_META_GROUP_IDS = 'advanced_ads_ad_group_ids';
+
     /* User Meta Keys ------------------- */
 

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

@@ -20 +20 @@
 class Upgrades extends Updates implements Initializer_Interface {
 
-    const DB_VERSION = '1.53.0';
+    const DB_VERSION = '1.53.1';
 
     /**
@@ -35 +35 @@
             '1.52.1' => 'upgrade-1.52.1.php',
             '2.0.0'  => 'upgrade-2.0.0.php',
+            '2.0.8'  => 'upgrade-2.0.8.php',
         ];
     }

advanced-ads/trunk/includes/groups/class-group-repository.php

@@ -113 +113 @@
         // Only update weights when there is a change.
         if ( in_array( 'ad_weights', $changed, true ) ) {
-            $this->update_ads_terms( $group );
+            ( new Group_Ad_Relation() )->relate( $group );
         }
 
@@ -273 +273 @@
 
     /**
-     * Update group ad terms.
-     *
-     * @param Group $group Group object.
-     *
-     * @return void
-     */
-    private function update_ads_terms( &$group ): void {
-        // Early bail!!
-        if ( empty( $group->get_ad_weights() ) ) {
-            return;
-        }
-
-        $data    = $group->get_data();
-        $changes = $group->get_changes();
-        $old_ads = $data['ad_weights'] ? array_keys( $data['ad_weights'] ) : [];
-        $new_ads = $changes['ad_weights'] ? array_keys( $changes['ad_weights'] ) : [];
-        $removed = array_diff( $old_ads, $new_ads );
-
-        foreach ( $removed as $ad_id ) {
-            $terms = wp_get_object_terms( $ad_id, Constants::TAXONOMY_GROUP );
-
-            if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {
-                $term_ids = wp_list_pluck( $terms, 'term_id' );
-                $term_ids = array_diff( $term_ids, [ $group->get_id() ] );
-                wp_set_object_terms( $ad_id, $term_ids, Constants::TAXONOMY_GROUP );
-            }
-        }
-
-        $new_ads_final = $changes['ad_weights'] ?? [];
-
-        foreach ( $new_ads as $ad_id ) {
-            /**
-             * Check if this ad is representing the current group and remove it in this case
-             * could cause an infinite loop otherwise
-             */
-            $ad = wp_advads_get_ad( $ad_id );
-            if ( $ad && $ad->is_type( 'group' ) && $ad->get_group_id() === $group->get_id() ) {
-                unset( $new_ads_final[ $ad_id ] );
-                continue;
-            }
-
-            $terms = wp_get_object_terms( $ad_id, Constants::TAXONOMY_GROUP );
-
-            if ( ! is_wp_error( $terms ) ) {
-                $term_ids   = wp_list_pluck( $terms, 'term_id' );
-                $term_ids[] = $group->get_id();
-                $term_ids   = array_unique( $term_ids );
-                wp_set_object_terms( $ad_id, $term_ids, Constants::TAXONOMY_GROUP );
-            }
-        }
-
-        $group->set_ad_weights( $new_ads_final );
-    }
-
-    /**
      * Migrate values to new version
      *

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

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Advanced Ads 2.0.6\n"
+"Project-Id-Version: Advanced Ads 2.0.7\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: 2025-04-09T05:01:12+00:00\n"
+"POT-Creation-Date: 2025-04-28T07:32:04+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.11.0\n"
@@ -1183 +1183 @@
 
 #: classes/display-conditions.php:729
-#: includes/abstracts/abstract-ad.php:832
+#: includes/abstracts/abstract-ad.php:830
 #: includes/admin/class-groups-list-table.php:362
 #: views/admin/placements/quick-edit.php:16
@@ -1551 +1551 @@
 
 #. translators: %s is a date.
-#: includes/abstracts/abstract-ad.php:806
+#: includes/abstracts/abstract-ad.php:804
 msgid "starts %s"
 msgstr ""
 
 #. translators: %s is a date.
-#: includes/abstracts/abstract-ad.php:820
+#: includes/abstracts/abstract-ad.php:818
 msgid "expires %s"
 msgstr ""
 
 #. translators: %s is a date.
-#: includes/abstracts/abstract-ad.php:826
+#: includes/abstracts/abstract-ad.php:824
 msgid "expired %s"
 msgstr ""
 
-#: includes/abstracts/abstract-ad.php:835
+#: includes/abstracts/abstract-ad.php:833
 #: includes/admin/class-placement-quick-edit.php:48
 #: views/admin/placements/edit-modal/fields/status.php:13
@@ -1573 +1573 @@
 msgstr ""
 
-#: includes/abstracts/abstract-ad.php:838
+#: includes/abstracts/abstract-ad.php:836
 msgid "Trashed"
 msgstr ""
 
 #. translators: %1$s is a placement name, %2$s is the ads name.
-#: includes/abstracts/abstract-ad.php:1216
+#: includes/abstracts/abstract-ad.php:1213
 msgid "Placement name: %1$s; Ads: %2$s"
 msgstr ""
@@ -2178 +2178 @@
 msgstr ""
 
-#: includes/admin/class-metabox-ad-settings.php:64
+#: includes/admin/class-metabox-ad-settings.php:63
 msgid "Ad Settings"
 msgstr ""
@@ -2961 +2961 @@
 msgstr ""
 
-#: includes/ads/class-ad-repository.php:90
+#: includes/ads/class-ad-repository.php:91
 msgid "Invalid ad."
 msgstr ""

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

@@ -73 +73 @@
     'AdvancedAds\\Ads\\Ad_Factory' => $baseDir . '/includes/ads/class-ad-factory.php',
     'AdvancedAds\\Ads\\Ad_Group' => $baseDir . '/includes/ads/class-ad-group.php',
+    'AdvancedAds\\Ads\\Ad_Group_Relation' => $baseDir . '/includes/ads/class-ad-group-relation.php',
     'AdvancedAds\\Ads\\Ad_Image' => $baseDir . '/includes/ads/class-ad-image.php',
     'AdvancedAds\\Ads\\Ad_Plain' => $baseDir . '/includes/ads/class-ad-plain.php',
@@ -132 +133 @@
     'AdvancedAds\\Frontend\\Scripts' => $baseDir . '/includes/frontend/class-scripts.php',
     'AdvancedAds\\Frontend\\Stats' => $baseDir . '/includes/frontend/class-stats.php',
+    'AdvancedAds\\Groups\\Group_Ad_Relation' => $baseDir . '/includes/groups/class-group-ad-relation.php',
     'AdvancedAds\\Groups\\Group_Factory' => $baseDir . '/includes/groups/class-group-factory.php',
     'AdvancedAds\\Groups\\Group_Ordered' => $baseDir . '/includes/groups/class-group-ordered.php',

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

@@ -100 +100 @@
         'AdvancedAds\\Ads\\Ad_Factory' => __DIR__ . '/../..' . '/includes/ads/class-ad-factory.php',
         'AdvancedAds\\Ads\\Ad_Group' => __DIR__ . '/../..' . '/includes/ads/class-ad-group.php',
+        'AdvancedAds\\Ads\\Ad_Group_Relation' => __DIR__ . '/../..' . '/includes/ads/class-ad-group-relation.php',
         'AdvancedAds\\Ads\\Ad_Image' => __DIR__ . '/../..' . '/includes/ads/class-ad-image.php',
         'AdvancedAds\\Ads\\Ad_Plain' => __DIR__ . '/../..' . '/includes/ads/class-ad-plain.php',
@@ -159 +160 @@
         'AdvancedAds\\Frontend\\Scripts' => __DIR__ . '/../..' . '/includes/frontend/class-scripts.php',
         'AdvancedAds\\Frontend\\Stats' => __DIR__ . '/../..' . '/includes/frontend/class-stats.php',
+        'AdvancedAds\\Groups\\Group_Ad_Relation' => __DIR__ . '/../..' . '/includes/groups/class-group-ad-relation.php',
         'AdvancedAds\\Groups\\Group_Factory' => __DIR__ . '/../..' . '/includes/groups/class-group-factory.php',
         'AdvancedAds\\Groups\\Group_Ordered' => __DIR__ . '/../..' . '/includes/groups/class-group-ordered.php',

advanced-ads/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.7
 Requires PHP: 7.4
-Stable tag: 2.0.7
+Stable tag: 2.0.8
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -361 +361 @@
 == Changelog ==
 
+= 2.0.8 (April 28, 2025) =
+
+- Improvement: type safety in `add_body_class` to prevent issues from third-party filters
+- Improvement: improve the ad and group relation both way
+- Fix: expiry date not updating for ads that already had one set
+
 = 2.0.7 (April 9, 2025) =
 - Improvement: optimize MailPoet compatibility