Alpha release Feb 05 (#4458)

Author: laurelfulford

includes/bylines/class-bylines.php

@@ -251,7 +251,7 @@ public static function get_authors_avatars( $byline ) {
 	 * @param string $byline  Byline with author shortcodes on it.
 	 */
 	public static function extract_author_ids_from_shortcode( $byline ) {
-		preg_match_all( '/\[Author id=(\d+)\]/', $byline, $matches );
+		preg_match_all( '/\[Author\s+id\s*=\s*(\d+)\]/i', $byline, $matches );
 		return array_map( 'intval', $matches[1] );
 	}
 

includes/class-blocks.php

@@ -21,6 +21,7 @@ final class Blocks {
 	 */
 	public static function init() {
 		require_once NEWSPACK_ABSPATH . 'src/blocks/reader-registration/index.php';
+		require_once NEWSPACK_ABSPATH . 'src/blocks/my-account-button/class-my-account-button-block.php';
 		require_once NEWSPACK_ABSPATH . 'src/blocks/content-gate/countdown/class-content-gate-countdown-block.php';
 		require_once NEWSPACK_ABSPATH . 'src/blocks/content-gate/countdown-box/class-content-gate-countdown-box-block.php';
 		require_once NEWSPACK_ABSPATH . 'src/blocks/contribution-meter/index.php';

includes/class-newspack-ui-icons.php

@@ -428,7 +428,7 @@ public static function return_demo_content() {
 				<div class="newspack-ui__dropdown">
 					<button class="newspack-ui__dropdown__toggle newspack-ui__button newspack-ui__button--icon newspack-ui__button--ghost">
 						<?php Newspack_UI_Icons::print_svg( 'more' ); ?>
-						<span class="screen-reader-text">More</span>
+						<span class="screen-reader-text"><?php esc_html_e( 'More', 'newspack-plugin' ); ?></span>
 					</button>
 					<div class="newspack-ui__dropdown__content">
 						<ul>
@@ -448,7 +448,7 @@ public static function return_demo_content() {
 					<div class="newspack-ui__dropdown">
 						<button class="newspack-ui__dropdown__toggle newspack-ui__button newspack-ui__button--icon newspack-ui__button--ghost">
 							<?php Newspack_UI_Icons::print_svg( 'more' ); ?>
-							<span class="screen-reader-text">More</span>
+							<span class="screen-reader-text"><?php esc_html_e( 'More', 'newspack-plugin' ); ?></span>
 						</button>
 						<div class="newspack-ui__dropdown__content">
 							<ul>
@@ -518,15 +518,17 @@ public static function return_demo_content() {
 				</div>
 			</div>
 			<button id="show-snackbar-example" class="newspack-ui__button newspack-ui__button--primary">Show snackbar</button>
-			<div id="snackbar-example" class="newspack-ui__snackbar newspack-ui__snackbar--top-right newspack-ui__snackbar--success">
-				This is a snackbar message
+			<div class="newspack-ui__snackbar newspack-ui__snackbar--top-right">
+				<div id="snackbar-example" class="newspack-ui__snackbar__item newspack-ui__snackbar__item--success" data-autohide="true">
+					<div class="newspack-ui__snackbar__content">This is a snackbar message</div>
+				</div>
 			</div>
 			<script>
 				( function() {
 					const snackbar = document.getElementById( 'snackbar-example' );
 					const button = document.getElementById( 'show-snackbar-example' );
 					button.addEventListener( 'click', function() {
-						snackbar.classList.add( 'active' );
+						newspackUI.notices.openNotice( snackbar, false );
 					} );
 				} )();
 			</script>
@@ -761,7 +763,7 @@ public static function return_demo_content() {
 			<h3>Dropdown buttons</h3>
 			<div class="newspack-ui__dropdown">
 				<button class="newspack-ui__button newspack-ui__button--secondary newspack-ui__dropdown__toggle">
-					<span>More</span>
+					<span><?php esc_html_e( 'More', 'newspack-plugin' ); ?></span>
 					<?php Newspack_UI_Icons::print_svg( 'more' ); ?>
 				</button>
 				<div class="newspack-ui__dropdown__content">

includes/class-newspack-ui.php

@@ -64,7 +64,13 @@ public static function check_if_post_is_in_collection() {
 			return;
 		}
 
-		$collections = Query_Helper::get_post_collections( $post );
+		// Only show indicators for published collections.
+		$collections = array_filter(
+			Query_Helper::get_post_collections( $post ),
+			function ( $collection_id ) {
+				return 'publish' === get_post_status( $collection_id );
+			}
+		);
 		if ( empty( $collections ) ) {
 			return;
 		}

includes/collections/class-content-inserter.php

@@ -168,6 +168,87 @@ public static function evaluate_rule( $rule_slug, $args = null, $user_id = null
 		return call_user_func( $rule['callback'], $user_id, $args );
 	}
 
+	/**
+	 * Evaluate access rules with OR logic between groups and AND logic within groups.
+	 *
+	 * Rules structure: [ [ rule1, rule2 ], [ rule3, rule4 ] ]
+	 * - Groups use OR logic: reader must pass at least one group
+	 * - Rules within a group use AND logic: reader must pass all rules in the group
+	 *
+	 * @param array $access_rules The access rules (array of groups, each group is an array of rules).
+	 *
+	 * @return bool True if access is granted, false if restricted.
+	 */
+	public static function evaluate_rules( $access_rules ) {
+		if ( empty( $access_rules ) ) {
+			return true;
+		}
+
+		// Normalize legacy flat rules structure to grouped format.
+		$access_rules = self::normalize_rules( $access_rules );
+
+		// Evaluate each group with OR logic - if any group passes, grant access.
+		foreach ( $access_rules as $group ) {
+			if ( self::evaluate_rules_group( $group ) ) {
+				return true;
+			}
+		}
+
+		// No group passed - restrict access.
+		return false;
+	}
+
+	/**
+	 * Evaluate a single group of access rules with AND logic.
+	 *
+	 * @param array $group Array of rules in the group.
+	 *
+	 * @return bool True if all rules in the group pass, false otherwise.
+	 */
+	private static function evaluate_rules_group( $group ) {
+		if ( empty( $group ) || ! is_array( $group ) ) {
+			return true;
+		}
+
+		foreach ( $group as $rule ) {
+			if ( ! isset( $rule['slug'] ) ) {
+				continue;
+			}
+			if ( ! self::evaluate_rule( $rule['slug'], $rule['value'] ?? null ) ) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Normalize access rules to grouped format.
+	 *
+	 * Converts legacy flat rules [ rule1, rule2 ] to grouped format [ [ rule1, rule2 ] ].
+	 *
+	 * @param array $access_rules The access rules.
+	 *
+	 * @return array Normalized access rules in grouped format.
+	 */
+	public static function normalize_rules( $access_rules ) {
+		if ( empty( $access_rules ) ) {
+			return [];
+		}
+
+		// Check if already in grouped format (array of arrays with rules).
+		// A grouped format has arrays as first-level elements.
+		// A flat format has rule objects (with 'slug' key) as first-level elements.
+		$first_element = reset( $access_rules );
+		if ( is_array( $first_element ) && ! isset( $first_element['slug'] ) ) {
+			// Already in grouped format.
+			return $access_rules;
+		}
+
+		// Convert flat format to single group.
+		return [ $access_rules ];
+	}
+
 	/**
 	 * Get subscriptions eligible for access rules.
 	 *
@@ -195,13 +276,50 @@ public static function get_subscription_products_options() {
 
 	/**
 	 * Whether the user has an active subscription for one of the given products.
+	 * Also checks if the user is a member of a group subscription with the required products.
 	 *
 	 * @param int   $user_id User ID.
 	 * @param array $product_ids Required product IDs.
 	 * @return bool
 	 */
 	public static function has_active_subscription( $user_id, $product_ids ) {
-		return ! empty( WooCommerce_Connection::get_active_subscriptions_for_user( $user_id, $product_ids ) );
+		$has_subscription = false;
+
+		// Check user's own subscriptions.
+		if ( ! empty( WooCommerce_Connection::get_active_subscriptions_for_user( $user_id, $product_ids ) ) ) {
+			$has_subscription = true;
+		}
+
+		// Check group subscriptions the user is a member of.
+		if ( ! $has_subscription && function_exists( 'wcs_get_subscription' ) ) {
+			$group_subscriptions = Group_Subscription::get_group_subscriptions_for_user( $user_id );
+			foreach ( $group_subscriptions as $subscription ) {
+				if ( ! $subscription || ! $subscription->has_status( WooCommerce_Connection::ACTIVE_SUBSCRIPTION_STATUSES ) ) {
+					continue;
+				}
+				// If no product filter, any active group subscription grants access.
+				if ( empty( $product_ids ) ) {
+					$has_subscription = true;
+					break;
+				}
+				// Check if the subscription has any of the required products.
+				foreach ( $product_ids as $product_id ) {
+					if ( $subscription->has_product( $product_id ) ) {
+						$has_subscription = true;
+						break 2;
+					}
+				}
+			}
+		}
+
+		/**
+		 * Filters whether a user has an active subscription for the given products.
+		 *
+		 * @param bool  $has_subscription Whether the user has an active subscription.
+		 * @param int   $user_id          User ID.
+		 * @param array $product_ids      Required product IDs.
+		 */
+		return apply_filters( 'newspack_access_rules_has_active_subscription', $has_subscription, $user_id, $product_ids );
 	}
 
 	/**