fix cronjob that checks update details reminder on spam check

Author: hugosolar

plugins/cc-global-network/cc-global-network.php

@@ -381,6 +381,19 @@ function ccgn_sanitize_user_not_strict($user, $raw_user, $strict)
     'ccgn_schedule_remove_email_update_details_reminders'
 );
 
+add_action(
+    'ccgn_check_accounts_to_be_removed',
+    'ccgn_check_accounts_to_be_removed'
+);
+register_activation_hook(
+    __FILE__,
+    'ccgn_schedule_add_retention_data'
+);
+register_deactivation_hook(
+    __FILE__,
+    'ccgn_schedule_remove_retention_data'
+);
+
 ////////////////////////////////////////////////////////////////////////////////
 // Admin script && styles
 ////////////////////////////////////////////////////////////////////////////////

plugins/cc-global-network/cron/email-update-details-reminders.php

@@ -20,7 +20,6 @@
 // Also beware any knock-on effect on CCGN_CLOSE_UPDATE_VOUCHERS_AFTER_DAYS
 define('CCGN_FIRST_REMINDER_UPDATE_DETAILS_AFTER_DAYS', 7);
 define('CCGN_SECOND_REMINDER_UPDATE_DETAILS_AFTER_DAYS', CCGN_FIRST_REMINDER_UPDATE_DETAILS_AFTER_DAYS + 7);
-//define('CCGN_SEND_SECOND_REMINDER_UPDATE_DETAILS_AFTER_DAYS', CCGN_SEND_REMINDER_UPDATE_DETAILS_AFTER_DAYS + 3 );
 define( 'CCGN_CLOSE_UPDATE_DETAILS_AFTER_DAYS', CCGN_SECOND_REMINDER_UPDATE_DETAILS_AFTER_DAYS + 10 );
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -61,7 +60,7 @@ function ccgn_update_details_set_second_reminder( $applicant_id ) {
     update_user_meta($applicant_id, 'ccgn_applicant_update_details_state', $update_details_meta);
 }
 
-// Send reminders to those that need them
+// Send reminders to those who need them
 
 function ccgn_email_update_details_reminders()
 {
@@ -70,6 +69,7 @@ function ccgn_email_update_details_reminders()
         CCGN_APPLICATION_STATE_UPDATE_DETAILS
     );
     foreach ($applicants as $applicant_id) {
+        $now = new DateTime( 'now' );
         $status = get_user_meta($applicant_id, 'ccgn_applicant_update_details_state', true);
         $state_date = new DateTime($status['date']);
         $days_in_state = $state_date->diff($now)->days;
@@ -90,12 +90,12 @@ function ccgn_email_update_details_reminders()
             }
         } elseif ( ($days_in_state > CCGN_FIRST_REMINDER_UPDATE_DETAILS_AFTER_DAYS) && ($days_in_state <= CCGN_SECOND_REMINDER_UPDATE_DETAILS_AFTER_DAYS) ) {
             // Send first reminder
-            if (empty($status['state'])) {
+            if (empty($status['state']) || ($status['state'] == 'none') ) {
                 ccgn_update_details_set_first_reminder($applicant_id);
             }
         } elseif ( ($days_in_state > CCGN_SECOND_REMINDER_UPDATE_DETAILS_AFTER_DAYS) && ($days_in_state <= CCGN_CLOSE_UPDATE_DETAILS_AFTER_DAYS) ) {
             // Send second reminder
-            if (($status['state'] == 'first-reminer') && ($status['done'])) {
+            if (($status['state'] == 'first-reminder') && ($status['done'])) {
                 ccgn_update_details_set_second_reminder($applicant_id);
             }
         }

plugins/cc-global-network/includes/application-state.php

@@ -106,6 +106,9 @@ function ccgn_applicant_type_desc ( $user_id ) {
 );
 // This application state happens when a member reject the applicant who asked for vouch, voting 'NO'
 define( 'CCGN_APPLICATION_STATE_REVIEW', 'to-be-reviewed' );
+// This state applies to the new data retention policy, which should retain the data for no more than 30 days
+define('CCGN_APPLICATION_STATE_DELETE', 'to-be-deleted' );
+
 define(
     'CCGN_APPLICATION_STATE_CAN_BE_PRE_APPROVED',
     [

plugins/cc-global-network/includes/buddypress-integration.php

@@ -772,12 +772,11 @@ function _ccgn_user_level_set_autouvouched_interim_membership_council (
 /* Rejected account should be deleted. There's no need to keep this data on the website **/
 function ccgn_user_level_set_rejected ( $user_id ) {
 
-    _ccgn_application_delete_entries_created_by($user_id);
-    delete_user_meta($user_id, CCGN_APPLICATION_TYPE);
-    delete_user_meta($user_id, CCGN_APPLICATION_STATE);
-    delete_user_meta($user_id, CCGN_USER_IS_AUTOVOUCHED);
-
-    $delete = wp_delete_user($user_id);
+    //regarding to the new rejection policy and the data retencion period this is changed to this state which should be deleted after 30 days
+    ccgn_registration_user_set_stage(
+        $user_id,
+        CCGN_APPLICATION_STATE_DELETE
+    );
 }
 
 function ccgn_user_level_set_didnt_update_vouchers ( $user_id ) {