<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][12660] trunk/src/bp-xprofile: xProfile Group Admin: add confirmation screen for the delete action</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12660">12660</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12660","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-05-30 09:26:01 +0000 (Sat, 30 May 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>xProfile Group Admin: add confirmation screen for the delete action
Props oztaser
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8305">#8305</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofileadmincssadminrtlcss">trunk/src/bp-xprofile/admin/css/admin-rtl.css</a></li>
<li><a href="#trunksrcbpxprofileadmincssadmincss">trunk/src/bp-xprofile/admin/css/admin.css</a></li>
<li><a href="#trunksrcbpxprofilebpxprofileadminphp">trunk/src/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunksrcbpxprofileclassesclassbpxprofilegroupphp">trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpxprofileadmincssadminrtlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/admin/css/admin-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/admin/css/admin-rtl.css 2020-05-24 20:32:03 UTC (rev 12659)
+++ trunk/src/bp-xprofile/admin/css/admin-rtl.css 2020-05-30 09:26:01 UTC (rev 12660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,6 +322,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> word-break: break-all; /* e.g. Chinese, Japanese, Korean chars */
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ul.bp-xprofile-delete-group-list {
+ list-style-type: disc;
+ margin: 4px 26px;
+}
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> @media screen and (max-width: 782px) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .bp-date-formats .bp-date-format-option:first-of-type {
</span></span></pre></div>
<a id="trunksrcbpxprofileadmincssadmincss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/admin/css/admin.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/admin/css/admin.css 2020-05-24 20:32:03 UTC (rev 12659)
+++ trunk/src/bp-xprofile/admin/css/admin.css 2020-05-30 09:26:01 UTC (rev 12660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,6 +322,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> word-break: break-all; /* e.g. Chinese, Japanese, Korean chars */
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ul.bp-xprofile-delete-group-list {
+ list-style-type: disc;
+ margin: 4px 26px;
+}
+
+
</ins><span class="cx" style="display: block; padding: 0 10px"> @media screen and (max-width: 782px) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .bp-date-formats .bp-date-format-option:first-of-type {
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/bp-xprofile-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-admin.php 2020-05-24 20:32:03 UTC (rev 12659)
+++ trunk/src/bp-xprofile/bp-xprofile-admin.php 2020-05-30 09:26:01 UTC (rev 12660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,6 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_group',
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_group',
</span><span class="cx" style="display: block; padding: 0 10px"> 'delete_group',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'do_delete_group',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'add_field',
</span><span class="cx" style="display: block; padding: 0 10px"> 'edit_field',
</span><span class="cx" style="display: block; padding: 0 10px"> 'delete_field',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> xprofile_admin_manage_field( $group_id, $field_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete group.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'delete_group' === $mode ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $mode, array( 'delete_group', 'do_delete_group' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> xprofile_admin_delete_group( $group_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Edit group.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,26 +404,69 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bp_xprofile_delete_group' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $group = new BP_XProfile_Group( $group_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mode = ! empty( $_GET['mode'] )
+ ? sanitize_key( $_GET['mode'] )
+ : false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$group->delete() ) {
- $message = _x( 'There was an error deleting the group. Please try again.', 'Error when deleting profile fields group', 'buddypress' );
- $type = 'error';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Display the group delete confirmation screen.
+ if ( 'delete_group' === $mode ) {
+ xprofile_admin_delete_group_screen( $group_id );
+
+ // Handle the deletion of group.
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = _x( 'The group was deleted successfully.', 'Profile fields group was deleted successfully', 'buddypress' );
- $type = 'success';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $group = new BP_XProfile_Group( $group_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Fires at the end of group deletion process, if successful.
- *
- * @since 1.0.0
- *
- * @param BP_XProfile_Group $group Current BP_XProfile_Group object.
- */
- do_action( 'xprofile_groups_deleted_group', $group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $group->delete() ) {
+ $message = _x( 'There was an error deleting the group. Please try again.', 'Error when deleting profile fields group', 'buddypress' );
+ $type = 'error';
+ } else {
+ $message = _x( 'The group was deleted successfully.', 'Profile fields group was deleted successfully', 'buddypress' );
+ $type = 'success';
+
+ /**
+ * Fires at the end of group deletion process, if successful.
+ *
+ * @since 1.0.0
+ *
+ * @param BP_XProfile_Group $group Current BP_XProfile_Group object.
+ */
+ do_action( 'xprofile_groups_deleted_group', $group );
+ }
+
+ xprofile_admin_screen( $message, $type );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- xprofile_admin_screen( $message, $type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Display the delete confirmation screen of profile data groups.
+ *
+ * @since 7.0.0
+ */
+function xprofile_admin_delete_group_screen( $group_id ) {
+
+ if ( ! bp_current_user_can( 'bp_moderate' ) ) {
+ die( '-1' );
+ }
+
+ $group = new BP_XProfile_Group( $group_id );
+
+ $base_url = remove_query_arg( array( 'mode', 'group_id', '_wpnonce' ), $_SERVER['REQUEST_URI'] ); ?>
+
+ <div class="wrap">
+ <h1><?php esc_html_e( 'Delete Field Group', 'buddypress' ) ?></h1>
+ <p><?php esc_html_e( 'You are about to delete the following field group:', 'buddypress' ) ?></p>
+
+ <ul class="bp-xprofile-delete-group-list">
+ <li><?php echo esc_html( $group->name ); ?></li>
+ </ul>
+
+ <p><strong><?php esc_html_e( 'This action cannot be undone.', 'buddypress' ) ?></strong></p>
+
+ <a class="button-primary" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'mode' => 'do_delete_group', 'group_id' => $group_id ), $base_url ), 'bp_xprofile_delete_group' ) ); ?>"><?php esc_html_e( 'Delete Permanently', 'buddypress' ) ?></a>
+ <a class="button" href="<?php echo esc_attr( $base_url ); ?>"><?php esc_html_e( 'Cancel', 'buddypress' ) ?></a>
+ </div>
+
+ <?php
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcbpxprofileclassesclassbpxprofilegroupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php 2020-05-24 20:32:03 UTC (rev 12659)
+++ trunk/src/bp-xprofile/classes/class-bp-xprofile-group.php 2020-05-30 09:26:01 UTC (rev 12660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -831,6 +831,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'edit_group',
</span><span class="cx" style="display: block; padding: 0 10px"> 'group_id' => (int) $this->id
</span><span class="cx" style="display: block; padding: 0 10px"> ), $users_url );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $this->can_delete ) {
+ // Delete Group URL.
+ $delete_url = wp_nonce_url( add_query_arg( array(
+ 'page' => 'bp-profile-setup',
+ 'mode' => 'delete_group',
+ 'group_id' => (int) $this->id
+ ), $users_url ), 'bp_xprofile_delete_group' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -893,7 +902,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xprofile_group_before_submitbox', $this ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="submitdiv" class="postbox">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2><?php _e( 'Submit', 'buddypress' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php esc_html_e( 'Submit', 'buddypress' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="inside">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="submitcomment" class="submitbox">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="major-publishing-actions">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -917,7 +926,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="submit" name="save_group" value="<?php echo esc_attr( $button ); ?>" class="button-primary"/>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="delete-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="<?php echo esc_url( $cancel_url ); ?>" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! empty( $this->id ) && isset( $delete_url ) ) : ?>
+ <a href="<?php echo esc_url( $delete_url ); ?>" class="submitdelete deletion"><?php esc_html_e( 'Delete Group', 'buddypress' ); ?></a>
+ <?php endif; ?>
+
+ <div><a href="<?php echo esc_url( $cancel_url ); ?>" class="deletion"><?php esc_html_e( 'Cancel', 'buddypress' ); ?></a></div>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>