<!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][11470] branches/2.7: Nonce protection for XProfile group & field actions.</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/11470">11470</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/11470","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-03-08 22:16:27 +0000 (Wed, 08 Mar 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'>Nonce protection for XProfile group & field actions.
Merge of <a href="http://buddypress.trac.wordpress.org/changeset/11469">[11469]</a> for the 2.7 branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches27srcbpxprofilebpxprofileadminphp">branches/2.7/src/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#branches27srcbpxprofileclassesclassbpxprofilefieldphp">branches/2.7/src/bp-xprofile/classes/class-bp-xprofile-field.php</a></li>
<li><a href="#branches27srcbpxprofileclassesclassbpxprofilegroupphp">branches/2.7/src/bp-xprofile/classes/class-bp-xprofile-group.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches27">branches/2.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/2.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/2.7 2017-03-08 22:13:26 UTC (rev 11469)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/2.7 2017-03-08 22:16:27 UTC (rev 11470)
</ins><a id="branches27"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/2.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/1.5:5187,5203,5210-5216,5220,5225,5247,5635
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/2.4:10363
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:11230,11449,11459
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:11230,11449,11459,11468
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches27srcbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.7/src/bp-xprofile/bp-xprofile-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.7/src/bp-xprofile/bp-xprofile-admin.php 2017-03-08 22:13:26 UTC (rev 11469)
+++ branches/2.7/src/bp-xprofile/bp-xprofile-admin.php 2017-03-08 22:16:27 UTC (rev 11470)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,27 +44,73 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function xprofile_admin( $message = '', $type = 'error' ) {
</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 ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'add_field' == $_GET['mode'] ) {
- xprofile_admin_manage_field( $_GET['group_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // What mode?
+ $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">- } elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && isset( $_GET['field_id'] ) && 'edit_field' == $_GET['mode'] ) {
- xprofile_admin_manage_field( $_GET['group_id'], $_GET['field_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Group ID
+ $group_id = ! empty( $_GET['group_id'] )
+ ? intval( $_GET['group_id'] )
+ : 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">- } elseif ( isset( $_GET['mode'] ) && isset( $_GET['field_id'] ) && 'delete_field' == $_GET['mode'] ) {
- xprofile_admin_delete_field( $_GET['field_id'], 'field');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Field ID
+ $field_id = ! empty( $_GET['field_id'] )
+ ? intval( $_GET['field_id'] )
+ : 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">- } elseif ( isset( $_GET['mode'] ) && isset( $_GET['option_id'] ) && 'delete_option' == $_GET['mode'] ) {
- xprofile_admin_delete_field( $_GET['option_id'], 'option' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Option ID
+ $option_id = ! empty( $_GET['option_id'] )
+ ? intval( $_GET['option_id'] )
+ : 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">- } elseif ( isset( $_GET['mode'] ) && 'add_group' == $_GET['mode'] ) {
- xprofile_admin_manage_group();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Allowed modes
+ $allowed_modes = array(
+ 'add_group',
+ 'edit_group',
+ 'delete_group',
+ 'add_field',
+ 'edit_field',
+ 'delete_field',
+ 'delete_option'
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'delete_group' == $_GET['mode'] ) {
- xprofile_admin_delete_group( $_GET['group_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Is an allowed mode
+ if ( in_array( $mode, $allowed_modes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'edit_group' == $_GET['mode'] ) {
- xprofile_admin_manage_group( $_GET['group_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // All group actions
+ if ( false !== $group_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add field to group
+ if ( 'add_field' == $mode ) {
+ xprofile_admin_manage_field( $group_id );
+
+ // Edit field of group
+ } elseif ( ! empty( $field_id ) && 'edit_field' === $mode ) {
+ xprofile_admin_manage_field( $group_id, $field_id );
+
+ // Delete group
+ } elseif ( 'delete_group' === $mode ) {
+ xprofile_admin_delete_group( $group_id );
+
+ // Edit group
+ } elseif ( 'edit_group' === $mode ) {
+ xprofile_admin_manage_group( $group_id );
+ }
+
+ // Delete field
+ } elseif ( ( false !== $field_id ) && ( 'delete_field' === $mode ) ) {
+ xprofile_admin_delete_field( $field_id, 'field');
+
+ // Delete option
+ } elseif ( ! empty( $option_id ) && 'delete_option' === $mode ) {
+ xprofile_admin_delete_field( $option_id, 'option' );
+
+ // Add group
+ } elseif ( 'add_group' == $mode ) {
+ xprofile_admin_manage_group();
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> xprofile_admin_screen( $message, $type );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'bp_reorder_fields', '_wpnonce_reorder_fields' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'bp_reorder_groups', '_wpnonce_reorder_groups', false );
</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 ( !empty( $message ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $message ) ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = ( $type == 'error' ) ? 'error' : 'updated'; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="<?php echo $type; ?> fade">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,6 +303,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Updating.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['save_group'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check nonce
+ check_admin_referer( 'bp_xprofile_admin_group', 'bp_xprofile_admin_group' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Validate $_POSTed data.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( BP_XProfile_Group::admin_validate() ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,8 +344,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xprofile_groups_saved_group', $group );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $_GET['mode'] );
- xprofile_admin( $message, $type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ xprofile_admin_screen( $message, $type );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $group->render_admin_form( $message );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,8 +383,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xprofile_groups_deleted_group', $group );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $_GET['mode'] );
- xprofile_admin( $message, $type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ xprofile_admin_screen( $message, $type );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -361,6 +408,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $field->group_id = $group_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['saveField'] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Check nonce
+ check_admin_referer( 'bp_xprofile_admin_field', 'bp_xprofile_admin_field' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( BP_XProfile_Field::admin_validate() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $field->is_required = $_POST['required'];
</span><span class="cx" style="display: block; padding: 0 10px"> $field->type = $_POST['fieldtype'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -449,10 +500,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $groups = bp_xprofile_get_groups();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $_GET['mode'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ xprofile_admin_screen( $message, $type );
</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( $message, $type );
-
</del><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $field->render_admin_form( $message );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,8 +547,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xprofile_fields_deleted_field', $field );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $_GET['mode'] );
- xprofile_admin( $message, $type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ xprofile_admin_screen( $message, $type );
</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="branches27srcbpxprofileclassesclassbpxprofilefieldphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.7/src/bp-xprofile/classes/class-bp-xprofile-field.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/2.7/src/bp-xprofile/classes/class-bp-xprofile-field.php 2017-03-08 22:13:26 UTC (rev 11469)
+++ branches/2.7/src/bp-xprofile/classes/class-bp-xprofile-field.php 2017-03-08 22:16:27 UTC (rev 11470)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1553,6 +1553,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function default_field_hidden_inputs() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Nonce
+ wp_nonce_field( 'bp_xprofile_admin_field', 'bp_xprofile_admin_field' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Field 1 is the fullname field, which cannot have custom visibility.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $this->is_default_field() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></pre></div>
<a id="branches27srcbpxprofileclassesclassbpxprofilegroupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/2.7/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">--- branches/2.7/src/bp-xprofile/classes/class-bp-xprofile-group.php 2017-03-08 22:13:26 UTC (rev 11469)
+++ branches/2.7/src/bp-xprofile/classes/class-bp-xprofile-group.php 2017-03-08 22:16:27 UTC (rev 11470)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -796,6 +796,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Nonce fields
+ wp_nonce_field( 'bp_xprofile_admin_group', 'bp_xprofile_admin_group' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires at the beginning of the XProfile Group publishing actions section.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>