Changeset 13327 for trunk/src/bp-templates/bp-legacy/buddypress/members/single/settings/data.php

Timestamp:

09/20/2022 08:10:19 AM (3 years ago)

Author:

imath

Message:

Settings: put the Legacy template pack’s in line with Nouveau’s one

Makes sure, just like the BP Nouveau template pack, the BP Legacy’s members/single/settings/data.php template contains a section to inform how the user can completely remove their data. This commit also brings some complementary improvements:

• Avoid is_super_admin( $user_id ) usage in favor of a capability check.
• Remove some commented code which was duplicated from a previous section into the legacy settings/data template.
• Escape URLs and translated strings.
• Improve `/* Translators: */ inline comment.
• Do not show the link to delete an account to an administrator viewing their account as they are redirected to the member's home page when trying to reach the delete-account screen (Admins cannot delete their account form front end).

Props Venutius, tahmidulkarim

Closes ​https://github.com/buddypress/buddypress/pull/23
Fixes #8021

File:

• trunk/src/bp-templates/bp-legacy/buddypress/members/single/settings/data.php (modified) (3 diffs)

trunk/src/bp-templates/bp-legacy/buddypress/members/single/settings/data.php

@@ -5 +5 @@
  * @package BuddyPress
  * @subpackage bp-legacy
- * @version 4.0.0
+ * @version 11.0.0
  */
 
@@ -11 +11 @@
 do_action( 'bp_before_member_settings_template' ); ?>
 
-<h2><?php _e( 'Data Export', 'buddypress' );?></h2>
+<h2><?php esc_html_e( 'Data Export', 'buddypress' );?></h2>
 
 <?php $request = bp_settings_get_personal_data_request(); ?>
@@ -69 +69 @@
 <?php endif; ?>
 
-<!--
-<h2 class="bp-screen-reader-text"><?php
-    /* translators: accessibility text */
-    _e( 'Data Erase', 'buddypress' );
-?></h2>
+<?php if ( ! user_can( bp_displayed_user_id(), 'delete_users' ) ) : ?>
+    <h2><?php esc_html_e( 'Data Erase', 'buddypress' ); ?></h2>
+    <p>
+        <?php
+        esc_html_e( 'To erase all data associated with your account, your user account must be completely deleted.', 'buddypress' );
 
-<p>You can make a request to erase the following type of data from the site:</p>
+        if ( bp_disable_account_deletion() ) {
+            esc_html_e( 'Please contact the site administrator to request account deletion.', 'buddypress' );
+        } else {
+            echo '&nbsp;';
 
-<p>If you want to make a request, please click on the button below:</p>
-
-    <form id="bp-data-erase" method="post">
-        <button type="submit" name="bp-data-erase-nonce" value="<?php echo wp_create_nonce( 'bp-data-erase' ); ?>">Request data erasure</button>
-    </form>
--->
-
+            printf(
+                /* translators: %s the link to Delete Account Settings page */
+                esc_html__( 'You may delete your account by visiting the %s page.', 'buddypress' ),
+                sprintf(
+                    '<a href="%1$s">%2$s</a>',
+                    esc_url( bp_displayed_user_domain() . bp_get_settings_slug() . '/delete-account/' ),
+                    esc_html__( 'Delete Account', 'buddypress' )
+                )
+            );
+        }
+        ?>
+    </p>
 <?php
+endif;
 
 /** This action is documented in bp-templates/bp-legacy/buddypress/members/single/settings/profile.php */