From fcb2f9286a7d0b4cb63cb91122588e863e581a4a Mon Sep 17 00:00:00 2001
From: Theuns Coetzee <ipokkel@gmail.com>
Date: Mon, 28 Oct 2024 17:11:54 +0200
Subject: [PATCH 1/3] Add email confirmation status column

---
 .../add-email-confirmation-column.php         | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 add-ons/pmpro-approvals/add-email-confirmation-column.php

diff --git a/add-ons/pmpro-approvals/add-email-confirmation-column.php b/add-ons/pmpro-approvals/add-email-confirmation-column.php
new file mode 100644
index 0000000..8b03c4d
--- /dev/null
+++ b/add-ons/pmpro-approvals/add-email-confirmation-column.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * This recipe adds an "Email Confirmation" column to the Approvals admin screen when using PMPro Approvals.
+ *
+ * The recipe assumes the Email Confirmation Add On is active.
+ *
+ * title: Add Email Confirmation status to Approvals admin screen.
+ * layout: snippet
+ * collection: add-ons
+ * category: pmpro-approvals
+ *
+ * You can add this recipe to your site by creating a custom plugin
+ * or using the Code Snippets plugin available for free in the WordPress repository.
+ * Read this companion article for step-by-step directions on either method.
+ * https://www.paidmembershipspro.com/create-a-plugin-for-pmpro-customizations/
+ */
+
+ // Add column header
+function my_pmpro_approvals_list_extra_cols_header_email_confirmation( $theusers ) {
+	?>
+	<th><?php esc_html_e( 'Email Confirmation', 'pmpro-email-confirmation' ); ?></th>
+	<?php
+}
+add_action( 'pmpro_approvals_list_extra_cols_header', 'my_pmpro_approvals_list_extra_cols_header_email_confirmation' );
+
+//Add 'Email Confirmation' status to Approved List Rows
+function my_pmpro_approvals_list_extra_cols_body_email_confirmation( $theuser ) {
+	?>
+	<td>
+		<?php
+		// Show pending if the email confirmation key is set in user meta, otherwise show confirmed.
+		if ( ! empty( $theuser->pmpro_email_confirmation_key ) ) {
+			esc_html_e( 'Pending' );
+		} else {
+			esc_html_e( 'Confirmed' );
+		}
+		?>
+	</td>
+	<?php
+}
+add_action( 'pmpro_approvals_list_extra_cols_body', 'my_pmpro_approvals_list_extra_cols_body_email_confirmation' );

From 7c0f59630bb1129847f0a47fc1949924f0fc57b5 Mon Sep 17 00:00:00 2001
From: Theuns Coetzee <ipokkel@gmail.com>
Date: Thu, 31 Oct 2024 09:21:47 +0200
Subject: [PATCH 2/3] refactor and enhance snippet

---
 .../add-email-confirmation-column.php         | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/add-ons/pmpro-approvals/add-email-confirmation-column.php b/add-ons/pmpro-approvals/add-email-confirmation-column.php
index 8b03c4d..78abc41 100644
--- a/add-ons/pmpro-approvals/add-email-confirmation-column.php
+++ b/add-ons/pmpro-approvals/add-email-confirmation-column.php
@@ -15,26 +15,28 @@
  * https://www.paidmembershipspro.com/create-a-plugin-for-pmpro-customizations/
  */
 
- // Add column header
-function my_pmpro_approvals_list_extra_cols_header_email_confirmation( $theusers ) {
+// Add column header
+function my_pmpro_approvals_list_extra_cols_header_email_confirmation( $the_user ) {
 	?>
 	<th><?php esc_html_e( 'Email Confirmation', 'pmpro-email-confirmation' ); ?></th>
 	<?php
 }
 add_action( 'pmpro_approvals_list_extra_cols_header', 'my_pmpro_approvals_list_extra_cols_header_email_confirmation' );
 
-//Add 'Email Confirmation' status to Approved List Rows
-function my_pmpro_approvals_list_extra_cols_body_email_confirmation( $theuser ) {
+// Add column body
+function my_pmpro_approvals_list_extra_cols_body_email_confirmation( $the_user ) {
 	?>
 	<td>
-		<?php
-		// Show pending if the email confirmation key is set in user meta, otherwise show confirmed.
-		if ( ! empty( $theuser->pmpro_email_confirmation_key ) ) {
-			esc_html_e( 'Pending' );
-		} else {
-			esc_html_e( 'Confirmed' );
-		}
-		?>
+	<?php
+	$email_confirmation_key = get_user_meta( $the_user->ID, 'pmpro_email_confirmation_key', true );
+	if ( empty( $email_confirmation_key ) ) {
+		esc_html_e( 'Not requested' );
+	} elseif ( 'validated' == $email_confirmation_key ) {
+		esc_html_e( 'Validated' );
+	} else {
+		esc_html_e( 'Not validated' );
+	}
+	?>
 	</td>
 	<?php
 }

From 00b28455865e95ed2b6453f7c98ccab07e00796d Mon Sep 17 00:00:00 2001
From: Andrew Lima <andrew@arctek.co.za>
Date: Wed, 5 Feb 2025 16:09:30 +0200
Subject: [PATCH 3/3] Add category

---
 add-ons/pmpro-approvals/add-email-confirmation-column.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/add-ons/pmpro-approvals/add-email-confirmation-column.php b/add-ons/pmpro-approvals/add-email-confirmation-column.php
index 78abc41..1546ba4 100644
--- a/add-ons/pmpro-approvals/add-email-confirmation-column.php
+++ b/add-ons/pmpro-approvals/add-email-confirmation-column.php
@@ -7,7 +7,7 @@
  * title: Add Email Confirmation status to Approvals admin screen.
  * layout: snippet
  * collection: add-ons
- * category: pmpro-approvals
+ * category: pmpro-approvals, pmpro-email-confirmation
  *
  * You can add this recipe to your site by creating a custom plugin
  * or using the Code Snippets plugin available for free in the WordPress repository.