<!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][7049] branches/1.7/bp-activity/bp-activity-classes.php: Improved sanitization in Activity component database methods</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7049">7049</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-05-09 14:13:14 +0000 (Thu, 09 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improved sanitization in Activity component database methods
- All integer array parms are filtered through wp_parse_id_list()
- Standardized LIKE clause processing
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4995">#4995</a> for the 1.7 branch
Props DJPaul, johnjamesjacoby</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches17bpactivitybpactivityclassesphp">branches/1.7/bp-activity/bp-activity-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches17bpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: branches/1.7/bp-activity/bp-activity-classes.php (7048 => 7049)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.7/bp-activity/bp-activity-classes.php 2013-05-09 14:11:57 UTC (rev 7048)
+++ branches/1.7/bp-activity/bp-activity-classes.php 2013-05-09 14:13:14 UTC (rev 7049)
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> // Searching
</span><span class="cx"> if ( $search_terms ) {
</span><span class="cx"> $search_terms = $wpdb->escape( $search_terms );
</span><del>- $where_conditions['search_sql'] = "a.content LIKE '%%" . like_escape( $search_terms ) . "%%'";
</del><ins>+ $where_conditions['search_sql'] = "a.content LIKE '%%" . esc_sql( like_escape( $search_terms ) ) . "%%'";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Filtering
</span><span class="lines">@@ -238,15 +238,11 @@
</span><span class="cx"> $total_activities = $wpdb->get_var( $total_activities_sql );
</span><span class="cx">
</span><span class="cx"> // Get the fullnames of users so we don't have to query in the loop
</span><del>- $activity_user_ids = array();
- if ( bp_is_active( 'xprofile' ) && $activities ) {
- foreach ( (array) $activities as $activity ) {
- if ( (int) $activity->user_id )
- $activity_user_ids[] = $activity->user_id;
- }
</del><ins>+ if ( bp_is_active( 'xprofile' ) && !empty( $activities ) ) {
+ $activity_user_ids = wp_list_pluck( $activities, 'user_id' );
+ $activity_user_ids = implode( ',', wp_parse_id_list( $activity_user_ids ) );
</ins><span class="cx">
</span><del>- $activity_user_ids = implode( ',', array_unique( (array) $activity_user_ids ) );
- if ( !empty( $activity_user_ids ) ) {
</del><ins>+ if ( !empty( $activity_user_ids ) ) {
</ins><span class="cx"> if ( $names = $wpdb->get_results( "SELECT user_id, value AS user_fullname FROM {$bp->profile->table_name_data} WHERE field_id = 1 AND user_id IN ({$activity_user_ids})" ) ) {
</span><span class="cx"> foreach ( (array) $names as $name )
</span><span class="cx"> $tmp_names[$name->user_id] = $name->user_fullname;
</span><span class="lines">@@ -319,10 +315,10 @@
</span><span class="cx"> $where_args[] = $wpdb->prepare( "type = %s", $type );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $item_id ) )
</span><del>- $where_args[] = $wpdb->prepare( "item_id = %s", $item_id );
</del><ins>+ $where_args[] = $wpdb->prepare( "item_id = %d", $item_id );
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $secondary_item_id ) )
</span><del>- $where_args[] = $wpdb->prepare( "secondary_item_id = %s", $secondary_item_id );
</del><ins>+ $where_args[] = $wpdb->prepare( "secondary_item_id = %d", $secondary_item_id );
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $action ) )
</span><span class="cx"> $where_args[] = $wpdb->prepare( "action = %s", $action );
</span><span class="lines">@@ -384,10 +380,10 @@
</span><span class="cx"> $where_args[] = $wpdb->prepare( "primary_link = %s", $primary_link );
</span><span class="cx">
</span><span class="cx"> if ( !empty( $item_id ) )
</span><del>- $where_args[] = $wpdb->prepare( "item_id = %s", $item_id );
</del><ins>+ $where_args[] = $wpdb->prepare( "item_id = %d", $item_id );
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $secondary_item_id ) )
</span><del>- $where_args[] = $wpdb->prepare( "secondary_item_id = %s", $secondary_item_id );
</del><ins>+ $where_args[] = $wpdb->prepare( "secondary_item_id = %d", $secondary_item_id );
</ins><span class="cx">
</span><span class="cx"> if ( !empty( $date_recorded ) )
</span><span class="cx"> $where_args[] = $wpdb->prepare( "date_recorded = %s", $date_recorded );
</span><span class="lines">@@ -416,24 +412,18 @@
</span><span class="cx"> return $activity_ids;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function delete_activity_item_comments( $activity_ids ) {
</del><ins>+ function delete_activity_item_comments( $activity_ids = array() ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( is_array( $activity_ids ) )
- $activity_ids = implode ( ',', array_map( 'absint', $activity_ids ) );
- else
- $activity_ids = implode ( ',', array_map( 'absint', explode ( ',', $activity_ids ) ) );
</del><ins>+ $activity_ids = implode( ',', wp_parse_id_list( $activity_ids ) );
</ins><span class="cx">
</span><span class="cx"> return $wpdb->query( "DELETE FROM {$bp->activity->table_name} WHERE type = 'activity_comment' AND item_id IN ({$activity_ids})" );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function delete_activity_meta_entries( $activity_ids ) {
</del><ins>+ function delete_activity_meta_entries( $activity_ids = array() ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><del>- if ( is_array( $activity_ids ) )
- $activity_ids = implode ( ',', array_map( 'absint', $activity_ids ) );
- else
- $activity_ids = implode ( ',', array_map( 'absint', explode ( ',', $activity_ids ) ) );
</del><ins>+ $activity_ids = implode( ',', wp_parse_id_list( $activity_ids ) );
</ins><span class="cx">
</span><span class="cx"> return $wpdb->query( "DELETE FROM {$bp->activity->table_name_meta} WHERE activity_id IN ({$activity_ids})" );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>