<!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][11556] trunk/src/bp-groups: Update group update form logic to handle slug changes.</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 { 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/11556">11556</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/11556","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dcavins</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-05-17 18:57:20 +0000 (Wed, 17 May 2017)</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'>Update group update form logic to handle slug changes.
Add error cases for handling form input that may include group slug
updates.
See <a href="http://buddypress.trac.wordpress.org/ticket/6014">#6014</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpgroupsadmincssadminrtlcss">trunk/src/bp-groups/admin/css/admin-rtl.css</a></li>
<li><a href="#trunksrcbpgroupsadmincssadmincss">trunk/src/bp-groups/admin/css/admin.css</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsadminphp">trunk/src/bp-groups/bp-groups-admin.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsscreensphp">trunk/src/bp-groups/bp-groups-screens.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpgroupsadmincssadminrtlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/admin/css/admin-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/admin/css/admin-rtl.css 2017-05-17 18:57:15 UTC (rev 11555)
+++ trunk/src/bp-groups/admin/css/admin-rtl.css 2017-05-17 18:57:20 UTC (rev 11556)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +46,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 24px;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #666;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#bp-groups-permalink {
+ margin-left: 24px;
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> .bp-groups-member-type {
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpgroupsadmincssadmincss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/admin/css/admin.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/admin/css/admin.css 2017-05-17 18:57:15 UTC (rev 11555)
+++ trunk/src/bp-groups/admin/css/admin.css 2017-05-17 18:57:20 UTC (rev 11556)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,6 +46,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 24px;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #666;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#bp-groups-permalink {
+ margin-right: 24px;
+}
</ins><span class="cx" style="display: block; padding: 0 10px"> .bp-groups-member-type {
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-admin.php 2017-05-17 18:57:15 UTC (rev 11555)
+++ trunk/src/bp-groups/bp-groups-admin.php 2017-05-17 18:57:20 UTC (rev 11556)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,19 +236,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $error = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $success_new = $error_new = $success_modified = $error_modified = array();
</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 name and description are handled with
- // groups_edit_base_group_details().
- if ( !groups_edit_base_group_details( $group_id, $_POST['bp-groups-name'], $_POST['bp-groups-description'], 0 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Name, description and slug must not be empty.
+ if ( empty( $_POST['bp-groups-name'] ) ) {
+ $error = $error - 1;
+ }
+ if ( empty( $_POST['bp-groups-description'] ) ) {
+ $error = $error - 2;
+ }
+ if ( empty( $_POST['bp-groups-slug'] ) ) {
+ $error = $error - 4;
+ }
+
+ /*
+ * Group name, slug, and description are handled with
+ * groups_edit_base_group_details().
+ */
+ if ( ! $error && ! groups_edit_base_group_details( array(
+ 'group_id' => $group_id,
+ 'name' => $_POST['bp-groups-name'],
+ 'slug' => $_POST['bp-groups-slug'],
+ 'description' => $_POST['bp-groups-description'],
+ 'notify_members' => false,
+ ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $error = $group_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Using negative integers for different error messages... eek!
- if ( empty( $_POST['bp-groups-name'] ) && empty( $_POST['bp-groups-description'] ) ) {
- $error = -3;
- } elseif ( empty( $_POST['bp-groups-name'] ) ) {
- $error = -1;
- } elseif ( empty( $_POST['bp-groups-description'] ) ) {
- $error = -2;
- }
</del><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"> // Enable discussion forum.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,22 +528,10 @@
</span><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"> if ( ! empty( $errors ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- switch ( $errors ) {
- case -1 :
- $messages[] = __( 'Group name cannot be empty.', 'buddypress' );
- break;
-
- case -2 :
- $messages[] = __( 'Group description cannot be empty.', 'buddypress' );
- break;
-
- case -3 :
- $messages[] = __( 'Group name and description cannot be empty.', 'buddypress' );
- break;
-
- default :
- $messages[] = __( 'An error occurred when trying to update your group details.', 'buddypress' );
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $errors < 0 ) {
+ $messages[] = __( 'Group name, slug, and description are all required fields.', 'buddypress' );
+ } else {
+ $messages[] = __( 'An error occurred when trying to update your group details.', 'buddypress' );
</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"> } elseif ( ! empty( $updated ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,7 +610,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="bp-groups-name" id="bp-groups-name" value="<?php echo esc_attr( stripslashes( $group_name ) ) ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="bp-groups-permalink-box">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <strong><?php esc_html_e( 'Permalink:', 'buddypress' ) ?></strong> <span id="sample-permalink"><?php bp_group_permalink( $group ) ?></span> <a href="<?php echo bp_group_permalink( $group ) ?>" class="button button-small" id="bp-groups-visit-group"><?php esc_html_e( 'Visit Group', 'buddypress' ) ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <strong><?php esc_html_e( 'Permalink:', 'buddypress' ) ?></strong>
+ <span id="bp-groups-permalink">
+ <?php bp_groups_directory_permalink(); ?> <input type="text" id="bp-groups-slug" name="bp-groups-slug" value="<?php bp_group_slug( $group ); ?>" autocomplete="off"> /
+ </span>
+ <a href="<?php echo bp_group_permalink( $group ) ?>" class="button button-small" id="bp-groups-visit-group"><?php esc_html_e( 'Visit Group', 'buddypress' ) ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="bp-groups-description" class="screen-reader-text"><?php
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-screens.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-screens.php 2017-05-17 18:57:15 UTC (rev 11555)
+++ trunk/src/bp-groups/bp-groups-screens.php 2017-05-17 18:57:20 UTC (rev 11556)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -839,7 +839,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $group_notify_members = isset( $_POST['group-notify-members'] ) ? (int) $_POST['group-notify-members'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !groups_edit_base_group_details( $_POST['group-id'], $_POST['group-name'], $_POST['group-desc'], $group_notify_members ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Name and description are required and may not be empty.
+ if ( empty( $_POST['group-name'] ) || empty( $_POST['group-desc'] ) ) {
+ bp_core_add_message( __( 'Groups must have a name and a description. Please try again.', 'buddypress' ), 'error' );
+ } elseif ( ! groups_edit_base_group_details( array(
+ 'group_id' => $_POST['group-id'],
+ 'name' => $_POST['group-name'],
+ 'slug' => null, // @TODO: Add to settings pane? If yes, editable by site admin only, or allow group admins to do this?
+ 'description' => $_POST['group-desc'],
+ 'notify_members' => $group_notify_members,
+ ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_core_add_message( __( 'There was an error updating group details. Please try again.', 'buddypress' ), 'error' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> bp_core_add_message( __( 'Group details were successfully updated.', 'buddypress' ) );
</span></span></pre>
</div>
</div>
</body>
</html>