<!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][9681] trunk/src/bp-xprofile: XProfile: Move field `save()` sanitization into filters for consistency between save method & saving via the admin UI.</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/9681">9681</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/9681","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>2015-04-02 00:51:51 +0000 (Thu, 02 Apr 2015)</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: Move field `save()` sanitization into filters for consistency between save method & saving via the admin UI. See <a href="http://buddypress.trac.wordpress.org/ticket/6340">#6340</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpxprofilebpxprofileadminphp">trunk/src/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofilefiltersphp">trunk/src/bp-xprofile/bp-xprofile-filters.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2015-04-02 00:21:08 UTC (rev 9680)
+++ trunk/src/bp-xprofile/bp-xprofile-admin.php 2015-04-02 00:51:51 UTC (rev 9681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,51 +326,50 @@
</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><span class="cx" style="display: block; padding: 0 10px"> if ( BP_XProfile_Field::admin_validate() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field->name = wp_filter_kses( $_POST['title'] );
- $field->description = !empty( $_POST['description'] ) ? wp_filter_kses( $_POST['description'] ) : '';
- $field->is_required = wp_filter_kses( $_POST['required'] );
- $field->type = wp_filter_kses( $_POST['fieldtype'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field->is_required = $_POST['required'];
+ $field->type = $_POST['fieldtype'];
+ $field->name = $_POST['title'];
</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 ( !empty( $_POST["sort_order_{$field->type}"] ) ) {
- $field->order_by = wp_filter_kses( $_POST["sort_order_{$field->type}"] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_POST['description'] ) ) {
+ $field->description = $_POST['description'];
+ } else {
+ $field->description = '';
</ins><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">+ if ( ! empty( $_POST["sort_order_{$field->type}"] ) ) {
+ $field->order_by = $_POST["sort_order_{$field->type}"];
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $field->field_order = $wpdb->get_var( $wpdb->prepare( "SELECT field_order FROM {$bp->profile->table_name_fields} WHERE id = %d", $field_id ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( !$field->field_order ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $field->field_order ) || is_wp_error( $field->field_order ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $field->field_order = (int) $wpdb->get_var( $wpdb->prepare( "SELECT max(field_order) FROM {$bp->profile->table_name_fields} WHERE group_id = %d", $group_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $field->field_order++;
</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">- // For new profile fields, set the $field_id. For existing profile fields,
- // this will overwrite $field_id with the same value.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // For new profile fields, set the $field_id. For existing profile
+ // fields, this will overwrite $field_id with the same value.
</ins><span class="cx" style="display: block; padding: 0 10px"> $field_id = $field->save();
</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 ( !$field_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $field_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'There was an error saving the field. Please try again.', 'buddypress' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = 'error';
-
- unset( $_GET['mode'] );
-
- xprofile_admin( $message, $type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $type = 'error';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'The field was saved successfully.', 'buddypress' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = 'success';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $type = 'success';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // @todo remove these old options
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $field_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> bp_update_option( 'bp-xprofile-fullname-field-name', $field->name );
</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">- if ( !empty( $_POST['default-visibility'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_POST['default-visibility'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_xprofile_update_field_meta( $field_id, 'default_visibility', $_POST['default-visibility'] );
</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">- if ( !empty( $_POST['allow-custom-visibility'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_POST['allow-custom-visibility'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> bp_xprofile_update_field_meta( $field_id, 'allow_custom_visibility', $_POST['allow-custom-visibility'] );
</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><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires at the end of the process to save a field for a user, if successful.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,8 +380,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xprofile_fields_saved_field', $field );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $groups = bp_xprofile_get_groups();
</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"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ unset( $_GET['mode'] );
+
+ xprofile_admin( $message, $type );
+
</ins><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">@@ -817,7 +820,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Now we've checked for required fields, let's save the values.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $posted_field_ids as $field_id ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Certain types of fields (checkboxes, multiselects) may come through empty. Save them as an empty array so that they don't get overwritten by the default on the next edit.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Certain types of fields (checkboxes, multiselects) may come
+ // through empty. Save them as an empty array so that they don't
+ // get overwritten by the default on the next edit.
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = isset( $_POST['field_' . $field_id] ) ? $_POST['field_' . $field_id] : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! xprofile_set_field_data( $field_id, $user_id, $value, $is_required[ $field_id ] ) ) {
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofilefiltersphp"></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-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-xprofile/bp-xprofile-filters.php 2015-04-02 00:21:08 UTC (rev 9680)
+++ trunk/src/bp-xprofile/bp-xprofile-filters.php 2015-04-02 00:51:51 UTC (rev 9681)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,10 +55,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'xprofile_data_value_before_save', 'xprofile_sanitize_data_value_before_save', 1, 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'xprofile_filtered_data_value_before_save', 'trim', 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Save filters
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Save field groups
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'xprofile_group_name_before_save', 'wp_filter_kses' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'xprofile_group_description_before_save', 'wp_filter_kses' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Save fields
+add_filter( 'xprofile_field_name_before_save', 'wp_filter_kses' );
+add_filter( 'xprofile_field_type_before_save', 'wp_filter_kses' );
+add_filter( 'xprofile_field_description_before_save', 'wp_filter_kses' );
+add_filter( 'xprofile_field_order_by_before_save', 'wp_filter_kses' );
+add_filter( 'xprofile_field_is_required_before_save', 'absint' );
+add_filter( 'xprofile_field_field_order_before_save', 'absint' );
+add_filter( 'xprofile_field_option_order_before_save', 'absint' );
+add_filter( 'xprofile_field_can_delete_before_save', 'absint' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * xprofile_filter_kses ( $content )
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>