From 4f384fe3b4dc960d6ac8d27ecb794b6602490e4b Mon Sep 17 00:00:00 2001
From: Kim Coleman <kim@strangerstudios.com>
Date: Tue, 2 Jul 2024 07:42:10 -0400
Subject: [PATCH 1/2] Adding notice if we detect a custom frontend.css loaded
 via theme files

---
 includes/deprecated.php | 44 +++++++++++++++++++++++++++++++++++++++++
 js/pmpro-admin.js       |  8 ++++++--
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/includes/deprecated.php b/includes/deprecated.php
index 3b1c6ecca..d6ea46289 100644
--- a/includes/deprecated.php
+++ b/includes/deprecated.php
@@ -1017,3 +1017,47 @@ function pmpro_get_plugin_duplicates() {
 
 	return $multiple_installations;
 }
+
+/**
+ * Show admin notice if site was using a custom-loaded frontend.css file.
+ * We no longer enqueue the frontend.css override file by default.
+ *
+ * @since TBD
+ */
+function pmpro_was_loading_frontend_css_override_notice() {
+	global $current_user;
+
+	// Only show on PMPro admin pages.
+	if ( empty( $_REQUEST['page'] ) || strpos( $_REQUEST['page'], 'pmpro' ) === false ) {
+		return;
+	}
+
+	// Determine if this site was loading a custom frontend.css override file.
+	if ( ! file_exists( get_stylesheet_directory() . '/paid-memberships-pro/css/frontend.css' ) && ! file_exists( get_template_directory() . '/paid-memberships-pro/frontend.css' ) ) {
+		// No custom frontend.css override file was found.
+		return;
+	}
+
+	// Hide if the notice has been dismissed.
+	$archived_notifications = get_user_meta( $current_user->ID, 'pmpro_archived_notifications', true );
+	if ( ! empty( $archived_notifications ) && in_array( 'pmpro_was_loading_frontend_css_notice', array_keys( $archived_notifications ) ) ) {
+		return;
+	}
+
+	// Show a dismissable notice to the user.
+	?>
+	<div id="pmpro_was_loading_frontend_css_notice" class="notice notice-warning is-dismissible pmpro-notice">
+		<p>
+			<?php
+			printf(
+				wp_kses_post(
+					__( 'Paid Memberships Pro detected that you were using a custom override for the frontend stylesheet. As of v3.1 and later, we no longer load your custom stylesheet. For more information, read our <a href="%s">v3.1 release notes post here</a>.', 'paid-memberships-pro' )
+				),
+				esc_url( 'https://www.paidmembershipspro.com/pmpro-update-3-1/' )
+			);
+			?>
+		</p>
+	</div>
+	<?php
+}
+add_action( 'admin_notices', 'pmpro_was_loading_frontend_css_override_notice' );
diff --git a/js/pmpro-admin.js b/js/pmpro-admin.js
index 52c1f247e..394412433 100644
--- a/js/pmpro-admin.js
+++ b/js/pmpro-admin.js
@@ -97,8 +97,12 @@ jQuery(document).on('click', function (e) {
 
 /** JQuery to hide the notifications. */
 jQuery(document).ready(function () {
-	jQuery(document).on('click', '.pmpro-notice-button.notice-dismiss', function () {
-		var notification_id = jQuery(this).val();
+	jQuery(document).on('click', '.pmpro-notice-button.notice-dismiss,.pmpro-notice button', function () {
+		if ( jQuery(this).val().length > 0 ) {
+			var notification_id = jQuery(this).val();
+		} else {
+			var notification_id = jQuery(this).parent().attr('id');
+		}
 
 		var postData = {
 			action: 'pmpro_hide_notice',

From a6f40ca69920347afc726d041a1307ece5389e30 Mon Sep 17 00:00:00 2001
From: David Parker <dlparker1005@gmail.com>
Date: Fri, 5 Jul 2024 09:32:10 -0400
Subject: [PATCH 2/2] Using same pattern as spamprotection notice

---
 includes/deprecated.php | 54 +++++++++++++++++++++++------------------
 js/pmpro-admin.js       |  8 ++----
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/includes/deprecated.php b/includes/deprecated.php
index d6ea46289..404fff877 100644
--- a/includes/deprecated.php
+++ b/includes/deprecated.php
@@ -1024,40 +1024,46 @@ function pmpro_get_plugin_duplicates() {
  *
  * @since TBD
  */
-function pmpro_was_loading_frontend_css_override_notice() {
+function pmpro_was_loading_frontend_css_notice() {
 	global $current_user;
 
-	// Only show on PMPro admin pages.
-	if ( empty( $_REQUEST['page'] ) || strpos( $_REQUEST['page'], 'pmpro' ) === false ) {
+	// If we are not on a PMPro admin page, don't show the notice.
+	if ( ! isset( $_REQUEST['page'] ) || ( isset( $_REQUEST['page'] ) && 'pmpro-' !== substr( $_REQUEST['page'], 0, 6 ) ) ) {
 		return;
 	}
 
 	// Determine if this site was loading a custom frontend.css override file.
 	if ( ! file_exists( get_stylesheet_directory() . '/paid-memberships-pro/css/frontend.css' ) && ! file_exists( get_template_directory() . '/paid-memberships-pro/frontend.css' ) ) {
-		// No custom frontend.css override file was found.
+		// No custom frontend.css override file was found. Don't show the notice.
 		return;
 	}
 
-	// Hide if the notice has been dismissed.
+	// Get notifications that have been archived.
 	$archived_notifications = get_user_meta( $current_user->ID, 'pmpro_archived_notifications', true );
-	if ( ! empty( $archived_notifications ) && in_array( 'pmpro_was_loading_frontend_css_notice', array_keys( $archived_notifications ) ) ) {
-		return;
-	}
 
-	// Show a dismissable notice to the user.
-	?>
-	<div id="pmpro_was_loading_frontend_css_notice" class="notice notice-warning is-dismissible pmpro-notice">
-		<p>
-			<?php
-			printf(
-				wp_kses_post(
-					__( 'Paid Memberships Pro detected that you were using a custom override for the frontend stylesheet. As of v3.1 and later, we no longer load your custom stylesheet. For more information, read our <a href="%s">v3.1 release notes post here</a>.', 'paid-memberships-pro' )
-				),
-				esc_url( 'https://www.paidmembershipspro.com/pmpro-update-3-1/' )
-			);
-			?>
-		</p>
-	</div>
-	<?php
+	// If the user hasn't dismissed the notice, show it.
+	if ( ! is_array( $archived_notifications ) || ! array_key_exists( 'was_loading_frontend_css_notice', $archived_notifications ) ) {
+		?>
+		<div id="was_loading_frontend_css_notice" class="notice notice-error pmpro_notification pmpro_notification-error">
+			<button type="button" class="pmpro-notice-button notice-dismiss" value="was_loading_frontend_css_notice"><span class="screen-reader-text"><?php esc_html_e( 'Dismiss this notice.', 'paid-memberships-pro' ); ?></span></button>
+			<div class="pmpro_notification-icon">
+				<span class="dashicons dashicons-warning"></span>
+			</div>
+			<div class="pmpro_notification-content">
+				<h3><?php esc_html_e( 'Custom Frontend Stylesheet Detected', 'paid-memberships-pro' ); ?></h3>
+				<p>
+					<?php
+					printf(
+						wp_kses_post(
+							__( 'Paid Memberships Pro detected that you were using a custom override for the frontend stylesheet. As of v3.1 and later, we no longer load your custom stylesheet. For more information, read our <a href="%s">v3.1 release notes post here</a>.', 'paid-memberships-pro' )
+						),
+						esc_url( 'https://www.paidmembershipspro.com/pmpro-update-3-1/' )
+					);
+					?>
+				</p>
+			</div>
+		</div>
+		<?php
+	}
 }
-add_action( 'admin_notices', 'pmpro_was_loading_frontend_css_override_notice' );
+add_action( 'admin_notices', 'pmpro_was_loading_frontend_css_notice' );
diff --git a/js/pmpro-admin.js b/js/pmpro-admin.js
index 394412433..52c1f247e 100644
--- a/js/pmpro-admin.js
+++ b/js/pmpro-admin.js
@@ -97,12 +97,8 @@ jQuery(document).on('click', function (e) {
 
 /** JQuery to hide the notifications. */
 jQuery(document).ready(function () {
-	jQuery(document).on('click', '.pmpro-notice-button.notice-dismiss,.pmpro-notice button', function () {
-		if ( jQuery(this).val().length > 0 ) {
-			var notification_id = jQuery(this).val();
-		} else {
-			var notification_id = jQuery(this).parent().attr('id');
-		}
+	jQuery(document).on('click', '.pmpro-notice-button.notice-dismiss', function () {
+		var notification_id = jQuery(this).val();
 
 		var postData = {
 			action: 'pmpro_hide_notice',