site_iri: comparison web/wp-includes/comment.php

equal deleted inserted replaced

-:a4642baaf829
+:4d4862461b8d
 * @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants.
 * @return object|array|null Depends on $output value.
 */
 function &get_comment(&$comment, $output = OBJECT) {
 	global $wpdb;
+	$null = null;
 	if ( empty($comment) ) {
 		if ( isset($GLOBALS['comment']) )
 			$_comment = & $GLOBALS['comment'];
 		else
 	} else {
 		if ( isset($GLOBALS['comment']) && ($GLOBALS['comment']->comment_ID == $comment) ) {
 			$_comment = & $GLOBALS['comment'];
 		} elseif ( ! $_comment = wp_cache_get($comment, 'comment') ) {
 			$_comment = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment));
+			if ( ! $_comment )
+				return $null;
 			wp_cache_add($_comment->comment_ID, $_comment, 'comment');
 		}
 	}
 	$_comment = apply_filters('get_comment', $_comment);
 		$approved = "comment_approved = '0'";
 	elseif ( 'approve' == $status )
 		$approved = "comment_approved = '1'";
 	elseif ( 'spam' == $status )
 		$approved = "comment_approved = 'spam'";
+	elseif ( 'trash' == $status )
+		$approved = "comment_approved = 'trash'";
 	else
 		$approved = "( comment_approved = '0' OR comment_approved = '1' )";
 	$order = ( 'ASC' == $order ) ? 'ASC' : 'DESC';
 	}
 	return $comment_count;
 }
+//
+// Comment meta functions
+//
+/**
+* Add meta data field to a comment.
+*
+* @since 2.9
+* @uses add_metadata
+* @link http://codex.wordpress.org/Function_Reference/add_comment_meta
+*
+* @param int $comment_id Comment ID.
+* @param string $key Metadata name.
+* @param mixed $value Metadata value.
+* @param bool $unique Optional, default is false. Whether the same key should not be added.
+* @return bool False for failure. True for success.
+*/
+function add_comment_meta($comment_id, $meta_key, $meta_value, $unique = false) {
+	return add_metadata('comment', $comment_id, $meta_key, $meta_value, $unique);
+}
+/**
+* Remove metadata matching criteria from a comment.
+*
+* You can match based on the key, or key and value. Removing based on key and
+* value, will keep from removing duplicate metadata with the same key. It also
+* allows removing all metadata matching key, if needed.
+*
+* @since 2.9
+* @uses delete_metadata
+* @link http://codex.wordpress.org/Function_Reference/delete_comment_meta
+*
+* @param int $comment_id comment ID
+* @param string $meta_key Metadata name.
+* @param mixed $meta_value Optional. Metadata value.
+* @return bool False for failure. True for success.
+*/
+function delete_comment_meta($comment_id, $meta_key, $meta_value = '') {
+	return delete_metadata('comment', $comment_id, $meta_key, $meta_value);
+}
+/**
+* Retrieve comment meta field for a comment.
+*
+* @since 2.9
+* @uses get_metadata
+* @link http://codex.wordpress.org/Function_Reference/get_comment_meta
+*
+* @param int $comment_id Comment ID.
+* @param string $key The meta key to retrieve.
+* @param bool $single Whether to return a single value.
+* @return mixed Will be an array if $single is false. Will be value of meta data field if $single
+*  is true.
+*/
+function get_comment_meta($comment_id, $key, $single = false) {
+	return get_metadata('comment', $comment_id, $key, $single);
+}
+/**
+* Update comment meta field based on comment ID.
+*
+* Use the $prev_value parameter to differentiate between meta fields with the
+* same key and comment ID.
+*
+* If the meta field for the comment does not exist, it will be added.
+*
+* @since 2.9
+* @uses update_metadata
+* @link http://codex.wordpress.org/Function_Reference/update_comment_meta
+*
+* @param int $comment_id Comment ID.
+* @param string $key Metadata key.
+* @param mixed $value Metadata value.
+* @param mixed $prev_value Optional. Previous value to check before removing.
+* @return bool False on failure, true if success.
+*/
+function update_comment_meta($comment_id, $meta_key, $meta_value, $prev_value = '') {
+	return update_metadata('comment', $comment_id, $meta_key, $meta_value, $prev_value);
+}
 /**
 * Sanitizes the cookies sent to the user already.
 *
 * Will only do anything if the cookies have already been created for the user.
 * Mostly used after cookies had been sent to use elsewhere.
 	global $wpdb;
 	extract($commentdata, EXTR_SKIP);
 	// Simple duplicate check
 	// expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
-	$dupe = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND ( comment_author = '$comment_author' ";
+	$dupe = "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = '$comment_post_ID' AND comment_approved != 'trash' AND ( comment_author = '$comment_author' ";
 	if ( $comment_author_email )
 		$dupe .= "OR comment_author_email = '$comment_author_email' ";
 	$dupe .= ") AND comment_content = '$comment_content' LIMIT 1";
 	if ( $wpdb->get_var($dupe) ) {
 		if ( defined('DOING_AJAX') )
 		wp_die( __('Duplicate comment detected; it looks as though you&#8217;ve already said that!') );
 	}
 	do_action( 'check_comment_flood', $comment_author_IP, $comment_author_email, $comment_date_gmt );
-	if ( $user_id ) {
+	if ( isset($user_id) && $user_id) {
 		$userdata = get_userdata($user_id);
 		$user = new WP_User($user_id);
 		$post_author = $wpdb->get_var($wpdb->prepare("SELECT post_author FROM $wpdb->posts WHERE ID = %d LIMIT 1", $comment_post_ID));
 	}
 */
 function check_comment_flood_db( $ip, $email, $date ) {
 	global $wpdb;
 	if ( current_user_can( 'manage_options' ) )
 		return; // don't throttle admins
-	if ( $lasttime = $wpdb->get_var( $wpdb->prepare("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_author_IP = %s OR comment_author_email = %s ORDER BY comment_date DESC LIMIT 1", $ip, $email) ) ) {
+	$hour_ago = gmdate( 'Y-m-d H:i:s', time() - 3600 );
+	if ( $lasttime = $wpdb->get_var( $wpdb->prepare( "SELECT `comment_date_gmt` FROM `$wpdb->comments` WHERE `comment_date_gmt` >= %s AND ( `comment_author_IP` = %s OR `comment_author_email` = %s ) ORDER BY `comment_date_gmt` DESC LIMIT 1", $hour_ago, $ip, $email ) ) ) {
 		$time_lastcomment = mysql2date('U', $lasttime, false);
 		$time_newcomment  = mysql2date('U', $date, false);
 		$flood_die = apply_filters('comment_flood_filter', false, $time_lastcomment, $time_newcomment);
 		if ( $flood_die ) {
 			do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
 * @return bool True if comment contains blacklisted content, false if comment does not
 */
 function wp_blacklist_check($author, $email, $url, $comment, $user_ip, $user_agent) {
 	do_action('wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent);
-	if ( preg_match_all('/&#(\d+);/', $comment . $author . $url, $chars) ) {
-		foreach ( (array) $chars[1] as $char ) {
-			// If it's an encoded char in the normal ASCII set, reject
-			if ( 38 == $char )
-				continue; // Unless it's &
-			if ( $char < 128 )
-				return true;
-		}
-	}
 	$mod_keys = trim( get_option('blacklist_keys') );
 	if ( '' == $mod_keys )
 		return false; // If moderation keys are empty
 	$words = explode("\n", $mod_keys );
 	if ( false !== $count )
 		return $count;
 	$where = '';
-	if( $post_id > 0 )
+	if ( $post_id > 0 )
 		$where = $wpdb->prepare( "WHERE comment_post_ID = %d", $post_id );
 	$count = $wpdb->get_results( "SELECT comment_approved, COUNT( * ) AS num_comments FROM {$wpdb->comments} {$where} GROUP BY comment_approved", ARRAY_A );
 	$total = 0;
-	$approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam');
+	$approved = array('0' => 'moderated', '1' => 'approved', 'spam' => 'spam', 'trash' => 'trash', 'post-trashed' => 'post-trashed');
 	$known_types = array_keys( $approved );
 	foreach( (array) $count as $row_num => $row ) {
-		$total += $row['num_comments'];
+		// Don't count post-trashed toward totals
+		if ( 'post-trashed' != $row['comment_approved'] && 'trash' != $row['comment_approved'] )
+			$total += $row['num_comments'];
 		if ( in_array( $row['comment_approved'], $known_types ) )
 			$stats[$approved[$row['comment_approved']]] = $row['num_comments'];
 	}
 	$stats['total_comments'] = $total;
 * post ID available.
 *
 * @since 2.0.0
 * @uses $wpdb
 * @uses do_action() Calls 'delete_comment' hook on comment ID
+* @uses do_action() Calls 'deleted_comment' hook on comment ID after deletion, on success
 * @uses do_action() Calls 'wp_set_comment_status' hook on comment ID with 'delete' set for the second parameter
 * @uses wp_transition_comment_status() Passes new and old comment status along with $comment object
 *
 * @param int $comment_id Comment ID
 * @return bool False if delete comment query failure, true on success.
 */
 function wp_delete_comment($comment_id) {
 	global $wpdb;
+	if (!$comment = get_comment($comment_id))
+		return false;
+	if (wp_get_comment_status($comment_id) != 'trash' && wp_get_comment_status($comment_id) != 'spam' && EMPTY_TRASH_DAYS > 0)
+		return wp_trash_comment($comment_id);
 	do_action('delete_comment', $comment_id);
-	$comment = get_comment($comment_id);
-	if ( ! $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id) ) )
-		return false;
 	// Move children up a level.
 	$children = $wpdb->get_col( $wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment_id) );
 	if ( !empty($children) ) {
 		$wpdb->update($wpdb->comments, array('comment_parent' => $comment->comment_parent), array('comment_parent' => $comment_id));
 		clean_comment_cache($children);
 	}
+	// Delete metadata
+	$meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d ", $comment_id ) );
+	if ( !empty($meta_ids) ) {
+		do_action( 'delete_commentmeta', $meta_ids );
+		$in_meta_ids = "'" . implode("', '", $meta_ids) . "'";
+		$wpdb->query( "DELETE FROM $wpdb->commentmeta WHERE meta_id IN ($in_meta_ids)" );
+		do_action( 'deleted_commentmeta', $meta_ids );
+	}
+	if ( ! $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id) ) )
+		return false;
+	do_action('deleted_comment', $comment_id);
 	$post_id = $comment->comment_post_ID;
 	if ( $post_id && $comment->comment_approved == 1 )
 		wp_update_comment_count($post_id);
 	clean_comment_cache($comment_id);
 	wp_transition_comment_status('delete', $comment->comment_approved, $comment);
 	return true;
 }
 /**
+* Moves a comment to the Trash
+*
+* @since 2.9.0
+* @uses do_action() on 'trash_comment' before trashing
+* @uses do_action() on 'trashed_comment' after trashing
+*
+* @param int $comment_id Comment ID.
+* @return mixed False on failure
+*/
+function wp_trash_comment($comment_id) {
+	if ( EMPTY_TRASH_DAYS == 0 )
+		return wp_delete_comment($comment_id);
+	if ( !$comment = get_comment($comment_id) )
+		return false;
+	do_action('trash_comment', $comment_id);
+	if ( wp_set_comment_status($comment_id, 'trash') ) {
+		add_comment_meta($comment_id, '_wp_trash_meta_status', $comment->comment_approved);
+		add_comment_meta($comment_id, '_wp_trash_meta_time', time() );
+		do_action('trashed_comment', $comment_id);
+		return true;
+	}
+	return false;
+}
+/**
+* Removes a comment from the Trash
+*
+* @since 2.9.0
+* @uses do_action() on 'untrash_comment' before untrashing
+* @uses do_action() on 'untrashed_comment' after untrashing
+*
+* @param int $comment_id Comment ID.
+* @return mixed False on failure
+*/
+function wp_untrash_comment($comment_id) {
+	if ( ! (int)$comment_id )
+		return false;
+	do_action('untrash_comment', $comment_id);
+	$status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
+	if ( empty($status) )
+		$status = '0';
+	if ( wp_set_comment_status($comment_id, $status) ) {
+		delete_comment_meta($comment_id, '_wp_trash_meta_time');
+		delete_comment_meta($comment_id, '_wp_trash_meta_status');
+		do_action('untrashed_comment', $comment_id);
+		return true;
+	}
+	return false;
+}
+/**
+* Marks a comment as Spam
+*
+* @since 2.9.0
+* @uses do_action() on 'spam_comment' before spamming
+* @uses do_action() on 'spammed_comment' after spamming
+*
+* @param int $comment_id Comment ID.
+* @return mixed False on failure
+*/
+function wp_spam_comment($comment_id) {
+	if ( !$comment = get_comment($comment_id) )
+		return false;
+	do_action('spam_comment', $comment_id);
+	if ( wp_set_comment_status($comment_id, 'spam') ) {
+		add_comment_meta($comment_id, '_wp_trash_meta_status', $comment->comment_approved);
+		do_action('spammed_comment', $comment_id);
+		return true;
+	}
+	return false;
+}
+/**
+* Removes a comment from the Spam
+*
+* @since 2.9.0
+* @uses do_action() on 'unspam_comment' before unspamming
+* @uses do_action() on 'unspammed_comment' after unspamming
+*
+* @param int $comment_id Comment ID.
+* @return mixed False on failure
+*/
+function wp_unspam_comment($comment_id) {
+	if ( ! (int)$comment_id )
+		return false;
+	do_action('unspam_comment', $comment_id);
+	$status = (string) get_comment_meta($comment_id, '_wp_trash_meta_status', true);
+	if ( empty($status) )
+		$status = '0';
+	if ( wp_set_comment_status($comment_id, $status) ) {
+		delete_comment_meta($comment_id, '_wp_trash_meta_status');
+		do_action('unspammed_comment', $comment_id);
+		return true;
+	}
+	return false;
+}
+/**
 * The status of a comment by ID.
 *
 * @since 1.0.0
 *
 * @param int $comment_id Comment ID
-* @return string|bool Status might be 'deleted', 'approved', 'unapproved', 'spam'. False on failure.
+* @return string|bool Status might be 'trash', 'approved', 'unapproved', 'spam'. False on failure.
 */
 function wp_get_comment_status($comment_id) {
 	$comment = get_comment($comment_id);
 	if ( !$comment )
 		return false;
 	$approved = $comment->comment_approved;
 	if ( $approved == NULL )
-		return 'deleted';
+		return false;
 	elseif ( $approved == '1' )
 		return 'approved';
 	elseif ( $approved == '0' )
 		return 'unapproved';
 	elseif ( $approved == 'spam' )
 		return 'spam';
+	elseif ( $approved == 'trash' )
+		return 'trash';
 	else
 		return false;
 }
 /**
 *
 * @param array $commentdata Contains information on the comment.
 * @return array Parsed comment information.
 */
 function wp_filter_comment($commentdata) {
-	$commentdata['user_id']              = apply_filters('pre_user_id', $commentdata['user_ID']);
+	if ( isset($commentdata['user_ID']) )
+		$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_ID']);
+	elseif ( isset($commentdata['user_id']) )
+		$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_id']);
 	$commentdata['comment_agent']        = apply_filters('pre_comment_user_agent', $commentdata['comment_agent']);
 	$commentdata['comment_author']       = apply_filters('pre_comment_author_name', $commentdata['comment_author']);
 	$commentdata['comment_content']      = apply_filters('pre_comment_content', $commentdata['comment_content']);
 	$commentdata['comment_author_IP']    = apply_filters('pre_comment_user_ip', $commentdata['comment_author_IP']);
 	$commentdata['comment_author_url']   = apply_filters('pre_comment_author_url', $commentdata['comment_author_url']);
 */
 function wp_new_comment( $commentdata ) {
 	$commentdata = apply_filters('preprocess_comment', $commentdata);
 	$commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
-	$commentdata['user_ID']         = (int) $commentdata['user_ID'];
+	if ( isset($commentdata['user_ID']) )
+		$commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
-	$commentdata['comment_parent'] = absint($commentdata['comment_parent']);
+	elseif ( isset($commentdata['user_id']) )
+		$commentdata['user_id'] = (int) $commentdata['user_id'];
+	$commentdata['comment_parent'] = isset($commentdata['comment_parent']) ? absint($commentdata['comment_parent']) : 0;
 	$parent_status = ( 0 < $commentdata['comment_parent'] ) ? wp_get_comment_status($commentdata['comment_parent']) : '';
 	$commentdata['comment_parent'] = ( 'approved' == $parent_status || 'unapproved' == $parent_status ) ? $commentdata['comment_parent'] : 0;
 	$commentdata['comment_author_IP'] = preg_replace( '/[^0-9a-fA-F:., ]/', '',$_SERVER['REMOTE_ADDR'] );
-	$commentdata['comment_agent']     = $_SERVER['HTTP_USER_AGENT'];
+	$commentdata['comment_agent']     = substr($_SERVER['HTTP_USER_AGENT'], 0, 254);
 	$commentdata['comment_date']     = current_time('mysql');
 	$commentdata['comment_date_gmt'] = current_time('mysql', 1);
 	$commentdata = wp_filter_comment($commentdata);
 		if ( '0' == $commentdata['comment_approved'] )
 			wp_notify_moderator($comment_ID);
 		$post = &get_post($commentdata['comment_post_ID']); // Don't notify if it's your own comment
-		if ( get_option('comments_notify') && $commentdata['comment_approved'] && $post->post_author != $commentdata['user_ID'] )
+		if ( get_option('comments_notify') && $commentdata['comment_approved'] && $post->post_author != $commentdata['user_id'] )
 			wp_notify_postauthor($comment_ID, $commentdata['comment_type']);
 	}
 	return $comment_ID;
 }
 	global $wpdb;
 	$status = '0';
 	switch ( $comment_status ) {
 		case 'hold':
+		case '0':
 			$status = '0';
 			break;
 		case 'approve':
+		case '1':
 			$status = '1';
 			if ( get_option('comments_notify') ) {
 				$comment = get_comment($comment_id);
 				wp_notify_postauthor($comment_id, $comment->comment_type);
 			}
 			break;
 		case 'spam':
 			$status = 'spam';
 			break;
-		case 'delete':
+		case 'trash':
-			return wp_delete_comment($comment_id);
+			$status = 'trash';
 			break;
 		default:
 			return false;
 	}
+	$comment_old = wp_clone(get_comment($comment_id));
 	if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_id) ) ) {
 		if ( $wp_error )
 			return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
 		else
 	clean_comment_cache($comment_id);
 	$comment = get_comment($comment_id);
 	do_action('wp_set_comment_status', $comment_id, $comment_status);
-	wp_transition_comment_status($comment_status, $comment->comment_approved, $comment);
+	wp_transition_comment_status($comment_status, $comment_old->comment_approved, $comment);
 	wp_update_comment_count($comment->comment_post_ID);
 	return true;
 }
 	// First, get all of the original fields
 	$comment = get_comment($commentarr['comment_ID'], ARRAY_A);
 	// Escape data pulled from DB.
-	$comment = $wpdb->escape($comment);
+	$comment = esc_sql($comment);
 	$old_status = $comment['comment_approved'];
 	// Merge old and new fields with new fields overwriting old ones.
 	$commentarr = array_merge($comment, $commentarr);
 function do_all_pings() {
 	global $wpdb;
 	// Do pingbacks
 	while ($ping = $wpdb->get_row("SELECT * FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme' LIMIT 1")) {
-		$wpdb->query("DELETE FROM {$wpdb->postmeta} WHERE post_id = {$ping->ID} AND meta_key = '_pingme';");
+		$mid = $wpdb->get_var( "SELECT meta_id FROM {$wpdb->postmeta} WHERE post_id = {$ping->ID} AND meta_key = '_pingme' LIMIT 1");
+		do_action( 'delete_postmeta', $mid );
+		$wpdb->query( $wpdb->prepare( "DELETE FROM {$wpdb->postmeta} WHERE meta_id = %d", $mid ) );
+		do_action( 'deleted_postmeta', $mid );
 		pingback($ping->post_content, $ping->ID);
 	}
 	// Do Enclosures
 	while ($enclosure = $wpdb->get_row("SELECT * FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme' LIMIT 1")) {
-		$wpdb->query( $wpdb->prepare("DELETE FROM {$wpdb->postmeta} WHERE post_id = %d AND meta_key = '_encloseme';", $enclosure->ID) );
+		$mid = $wpdb->get_var( $wpdb->prepare("SELECT meta_id FROM {$wpdb->postmeta} WHERE post_id = %d AND meta_key = '_encloseme'", $enclosure->ID) );
+		do_action( 'delete_postmeta', $mid );
+		$wpdb->query( $wpdb->prepare("DELETE FROM {$wpdb->postmeta} WHERE meta_id =  %d", $mid) );
+		do_action( 'deleted_postmeta', $mid );
 		do_enclose($enclosure->post_content, $enclosure->ID);
 	}
 	// Do Trackbacks
 	$trackbacks = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'");
 			$pagelinkedfrom = get_permalink($post_ID);
 			// using a timeout of 3 seconds should be enough to cover slow servers
 			$client = new IXR_Client($pingback_server_url);
 			$client->timeout = 3;
-			$client->useragent .= ' -- WordPress/' . $wp_version;
+			$client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . $wp_version, $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom);
 			// when set to true, this outputs debug messages by itself
 			$client->debug = false;
 			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
 				add_ping( $post_ID, $pagelinkedto );

branch	wordpress
changeset 132	4d4862461b8d
parent 109	03b0d1493584