Merge branch 'update/custom-logs-table-PSMEL-303' into beta/custom-lo…

…gs-table
wpexpertsio · Mar 27, 2023 · ef3271a · ef3271a
2 parents 5af4267 + 69b5e3f
commit ef3271a
Showing 1 changed file with 63 additions and 0 deletions.
diff --git a/Postman/Postman-Email-Log/PostmanEmailLogMigration.php b/Postman/Postman-Email-Log/PostmanEmailLogMigration.php
@@ -255,6 +255,8 @@ public function migrate_logs() {
 
                         //Migrating Logs
                         foreach( $old_logs as $ID => $log ) {
+
+                            $log = $this->remove_extra_keys( $log );
 
                             $result = PostmanEmailLogs::get_instance()->save( $log );
 
@@ -344,6 +346,27 @@ public function get_old_logs( $limit = 500 ) {
             $logs_meta = $wpdb->get_results(
                 "SELECT post_id as ID, meta_key, meta_value FROM {$wpdb->postmeta} WHERE post_id IN ({$log_ids});"
             );
+
+            /**
+             * Filter to delete incomplete logs, force migration
+             * 
+             * @param bool
+             * @since 2.5.0
+             * @version 1.0.0
+             */
+            if( apply_filters( 'postman_delete_incomplete_logs', false ) && empty( $logs_meta ) ) {
+
+                $log_ids = explode( ',', $log_ids );
+
+                foreach( $log_ids as $ID ) {
+
+                    wp_delete_post( $ID, true );
+
+                }
+
+                return true;
+
+            }
 
             if( $logs_meta ) {
 
@@ -500,6 +523,46 @@ public function switch_to_new() {
 
     }
 
+
+    /**
+     * Remove Extra Keys
+     * 
+     * @param array $array
+     * @since 2.5.0
+     * @version 1.0.0
+     */
+    public function remove_extra_keys( $array ) {
+
+        $allowedKeys = array(
+            'solution',
+            'success',
+            'from_header',
+            'to_header',
+            'cc_header',
+            'bcc_header',
+            'reply_to_header',
+            'transport_uri',
+            'original_to',
+            'original_subject',
+            'original_message',
+            'original_headers',
+            'session_transcript'
+        );
+
+        foreach ( $array as $key => $value ) {
+
+            if ( !in_array( $key, $allowedKeys ) ) {
+
+                unset( $array[$key] );
+
+            }
+
+        }
+
+        return $array;
+
+    }
+
 }
 
 new PostmanEmailLogsMigration;