From dc10c1e1fae4f20b0c9e517d88824c8b2dd2bae6 Mon Sep 17 00:00:00 2001
From: Nick Green <nick.green@automattic.com>
Date: Wed, 3 May 2023 11:23:29 -0700
Subject: [PATCH 1/4] Add mailster and others to plugin denylist

Also editing other slugs to be more broad, since this list does partial matches
---
 assets/data/option_scrublist.txt |  1 +
 assets/data/plugin_denylist.txt  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/assets/data/option_scrublist.txt b/assets/data/option_scrublist.txt
index 86ccaab..b57e9c2 100644
--- a/assets/data/option_scrublist.txt
+++ b/assets/data/option_scrublist.txt
@@ -6,6 +6,7 @@ klaviyo_edd_license_key
 klaviyo_settings
 mailchimp-woocommerce
 mailchimp-woocommerce-cached-api-account-name
+mailster_options
 mc4wp
 shareasale_wc_tracker_options
 woocommerce_afterpay_settings
diff --git a/assets/data/plugin_denylist.txt b/assets/data/plugin_denylist.txt
index 3aaf1a3..5cf49a3 100644
--- a/assets/data/plugin_denylist.txt
+++ b/assets/data/plugin_denylist.txt
@@ -8,20 +8,23 @@ klaviyo
 mailchimp
 mailgun
 mailpoet
+mailster
 metorik
 paypal
+postmark
 postmatic
 referralcandy
+sendgrid
 sendinblue
 shareasale
 shipstation
 smtp
 socketlabs
+sparkpost
 stripe
 webgility
-wp-console
-wp-mail-bank
-wp-sendgrid-mailer
-wp-ses
+console
+mail-bank
+ses
 wpmandrill
-zapier
+zapier
\ No newline at end of file

From 72e7db1d24b75294056db35d4f445ee375534770 Mon Sep 17 00:00:00 2001
From: Nick Green <nick.green@automattic.com>
Date: Wed, 3 May 2023 13:38:49 -0700
Subject: [PATCH 2/4] Add Hubspot plugin to deny and scrub lists

---
 assets/data/option_scrublist.txt | 1 +
 assets/data/plugin_denylist.txt  | 2 ++
 safety-net.php                   | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/data/option_scrublist.txt b/assets/data/option_scrublist.txt
index b57e9c2..646635f 100644
--- a/assets/data/option_scrublist.txt
+++ b/assets/data/option_scrublist.txt
@@ -4,6 +4,7 @@ jetpack_secrets
 klaviyo_api_key
 klaviyo_edd_license_key
 klaviyo_settings
+leadin_access_token
 mailchimp-woocommerce
 mailchimp-woocommerce-cached-api-account-name
 mailster_options
diff --git a/assets/data/plugin_denylist.txt b/assets/data/plugin_denylist.txt
index 5cf49a3..d0db745 100644
--- a/assets/data/plugin_denylist.txt
+++ b/assets/data/plugin_denylist.txt
@@ -3,8 +3,10 @@ afterpay
 algolia
 automator
 avatax
+hubspot
 in-stock-mailer-for-wc
 klaviyo
+leadin
 mailchimp
 mailgun
 mailpoet
diff --git a/safety-net.php b/safety-net.php
index 1e2e040..95b17a0 100644
--- a/safety-net.php
+++ b/safety-net.php
@@ -2,7 +2,7 @@
 /*
  * Plugin Name: Safety Net
  * Description: For Team51 Development Sites. Deletes user data and more!
- * Version: 1.4.5
+ * Version: 1.4.6
  * Author: WordPress.com Special Projects
  * Author URI: https://wpspecialprojects.wordpress.com
  * Text Domain: safety-net

From da8ce4e7a4ae3c5d9412376766a82c6a77ce51df Mon Sep 17 00:00:00 2001
From: Nick Green <nick.green@automattic.com>
Date: Wed, 3 May 2023 13:57:35 -0700
Subject: [PATCH 3/4] Delete WP Mail logging logs

---
 includes/delete.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/includes/delete.php b/includes/delete.php
index 88cc9c5..0fa9c07 100644
--- a/includes/delete.php
+++ b/includes/delete.php
@@ -66,6 +66,12 @@ function delete_users_and_orders() {
 		$wpdb->query( "DELETE FROM {$wpdb->prefix}actionscheduler_actions WHERE hook IN ( 'woocommerce_scheduled_subscription_payment', 'woocommerce_scheduled_subscription_payment_retry', 'woocommerce_scheduled_subscription_end_of_prepaid_term' )" );
 	}
 
+	// Delete WP Mail Logging logs
+	$table_name = $wpdb->prefix . 'wpml_mails'; // check if table exists before purging 
+	if ( $wpdb->get_var( "SHOW TABLES LIKE '$table_name'") == $table_name ) {
+		$wpdb->query( "DELETE FROM {$wpdb->prefix}wpml_mails" );
+	}
+
 	// Reassigning all posts to the first admin user
 	reassign_all_posts();
 

From 4dbb1e85314b2b5a026ef4913eab712c0102277a Mon Sep 17 00:00:00 2001
From: Nick Green <nick.green@automattic.com>
Date: Wed, 3 May 2023 13:59:24 -0700
Subject: [PATCH 4/4] Update plugin_denylist.txt

---
 assets/data/plugin_denylist.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/data/plugin_denylist.txt b/assets/data/plugin_denylist.txt
index d0db745..0c1294c 100644
--- a/assets/data/plugin_denylist.txt
+++ b/assets/data/plugin_denylist.txt
@@ -27,6 +27,6 @@ stripe
 webgility
 console
 mail-bank
-ses
+wp-ses
 wpmandrill
 zapier
\ No newline at end of file