Changeset 43071 for branches/4.9/src/wp-includes/user.php

Timestamp:

05/01/2018 11:41:37 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Privacy: add new wp-admin screens for exporting and removing of personal data.

Props melchoyce, mikejolley, allendav, xkon.
Merges [42967] to the 4.9 branch.
See #43481.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/user.php (modified) (4 diffs)

branches/4.9/src/wp-includes/user.php

@@ -2734 +2734 @@
 
 /**
+ * Get all user privacy request types.
+ *
+ * @since 5.0.0
+ * @access private
+ *
+ * @return array
+ */
+function _wp_privacy_action_request_types() {
+        return array(
+                'user_export_request',
+                'user_remove_request',
+        );
+}
+
+/**
+ * Update log when privacy request is confirmed.
+ *
+ * @since 5.0.0
+ * @access private
+ *
+ * @param array $result Result of the request from the user.
+ */
+function _wp_privacy_account_request_confirmed( $result ) {
+        if ( isset( $result['action'], $result['request_data'], $result['request_data']['privacy_request_id'] ) && in_array( $result['action'], _wp_privacy_action_request_types(), true ) ) {
+                $privacy_request_id = absint( $result['request_data']['privacy_request_id'] );
+                $privacy_request    = get_post( $privacy_request_id );
+
+                if ( ! $privacy_request || ! in_array( $privacy_request->post_type, _wp_privacy_action_request_types(), true ) ) {
+                        return;
+                }
+
+                update_post_meta( $privacy_request_id, '_confirmed_timestamp', time() );
+                wp_update_post( array(
+                        'ID'          => $privacy_request_id,
+                        'post_status' => 'request-confirmed',
+                ) );
+        }
+}
+add_action( 'account_action_confirmed', '_wp_privacy_account_request_confirmed' );
+
+/**
+ * Update log when privacy request fails.
+ *
+ * @since 5.0.0
+ * @access private
+ *
+ * @param array $result Result of the request from the user.
+ */
+function _wp_privacy_account_request_failed( $result ) {
+        if ( isset( $result['action'], $result['request_data'], $result['request_data']['privacy_request_id'] ) &&
+                in_array( $result['action'], _wp_privacy_action_request_types(), true ) ) {
+
+                $privacy_request_id = absint( $result['request_data']['privacy_request_id'] );
+                $privacy_request    = get_post( $privacy_request_id );
+
+                if ( ! $privacy_request || ! in_array( $privacy_request->post_type, _wp_privacy_action_request_types(), true ) ) {
+                        return;
+                }
+
+                wp_update_post( array(
+                        'ID'          => $privacy_request_id,
+                        'post_status' => 'request-failed',
+                ) );
+        }
+}
+
+/**
  * Send a confirmation request email to confirm an action.
  *
  * @since 5.0.0
  *
- * @param string $email              User email address. This can be the address of a registered or non-registered user. Defaults to logged in user email address. 
+ * @param string $email              User email address. This can be the address of a registered or non-registered user. Defaults to logged in user email address.
  * @param string $action_name        Name of the action that is being confirmed. Defaults to 'confirm_email'.
  * @param string $action_description User facing description of the action they will be confirming. Defaults to "confirm your email address".
@@ -2840 +2907 @@
          *
          * @since 5.0.0
-         * 
+         *
          * @param string $email_text     Text in the email.
          * @param array  $email_data {
@@ -2962 +3029 @@
                 $email    = $user->user_email;
 
-                if ( false !== strpos( $confirm_action_data, ':' ) ) {
-                        list( $key_request_time, $saved_key ) = explode( ':', $confirm_action_data, 2 );
+                if ( false !== strpos( $raw_data, ':' ) ) {
+                        list( $key_request_time, $saved_key ) = explode( ':', $raw_data, 2 );
                 }
         } else {
                 $raw_data = get_site_option( '_verify_action_' . $action_name . '_' . $uid, '' );
 
-                if ( false !== strpos( $confirm_action_data, ':' ) ) {
-                        list( $key_request_time, $saved_key, $email ) = explode( ':', $confirm_action_data, 3 );
+                if ( false !== strpos( $raw_data, ':' ) ) {
+                        list( $key_request_time, $saved_key, $email ) = explode( ':', $raw_data, 3 );
                 }
         }
@@ -2991 +3058 @@
          *
          * @since 5.0.0
-         * 
+         *
          * @param int $expiration The expiration time in seconds.
          */