<!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>[3893] sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php: Profiles Activity Handler: Improve forum activity handler.</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://meta.trac.wordpress.org/changeset/3893">3893</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3893","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coffee2code</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-31 18:16:14 +0000 (Wed, 31 Aug 2016)</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'>Profiles Activity Handler: Improve forum activity handler.
* Add explicit 'activity' argument and remove the limited 'newType' argument.
* Handle requests to remove activity related to a topic or reply (such as when trashed, unapproved, or marked as spam).
* Activity removal requests simply mark the activity as spam, which facilitate revival if untrashed/approved/unspammed.
* Check for existence of matching activity entry. For instances where activity was to be created but already exists, then simply unspam it.
* Check that all required request fields are supplied.
* More thorough sanitization of submitted data.
See <a href="http://meta.trac.wordpress.org/ticket/129">#129</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkprofileswordpressorgpublic_htmlwpcontentpluginswporgprofilesactivityhandlerwporgprofilesactivityhandlerphp">sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkprofileswordpressorgpublic_htmlwpcontentpluginswporgprofilesactivityhandlerwporgprofilesactivityhandlerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php 2016-08-31 16:58:29 UTC (rev 3892)
+++ sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php 2016-08-31 18:16:14 UTC (rev 3893)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,6 +115,27 @@
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Checks that required POST arguments are defined and have a value.
+ *
+ * Ends request and reports on any missing arguments, if necessary.
+ *
+ * @param array $args The array of required POST arguments.
+ */
+ protected function require_args( $args ) {
+ $missing = array();
+
+ foreach ( $args as $arg ) {
+ if ( empty( $_POST[ $arg ] ) ) {
+ $missing[] = $arg;
+ }
+ }
+
+ if ( $missing ) {
+ die( '-1 Required argument(s) are missing: ' . implode( ', ', $missing ) );
+ }
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Primary AJAX handler.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Funnels incoming requests to appropriate sub-handler based on
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -194,45 +215,118 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Recognized activities:
</span><span class="cx" style="display: block; padding: 0 10px"> * - Creating new topic
</span><span class="cx" style="display: block; padding: 0 10px"> * - Replying to a topic
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - Removing a topic
+ * - Removing a topic reply
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function handle_forum_activity() {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = $this->get_user( $_POST['user'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $type = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check for valid user.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return '-1 Activity reported for unrecognized user : ' . sanitize_text_field( $_POST['user'] );
</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 ( '1' == $_POST['newTopic'] ) {
- $action = sprintf(
- __( 'Created a topic, <a href="%s">%s</a>, on the site %s', 'wporg' ),
- esc_url( $_POST['url'] ),
- $_POST['title'],
- $_POST['site']
- );
- $type = 'forum_topic_create';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Check for valid forum activities.
+ $activities = array(
+ 'create-topic' => 'forum_topic_create',
+ 'remove-topic' => 'forum_topic_remove',
+ 'create-reply' => 'forum_reply_create',
+ 'remove-reply' => 'forum_reply_remove',
+ );
+ if ( ! empty( $_POST['activity'] ) && ! empty( $activities[ $_POST['activity'] ] ) ) {
+ $type = $activities[ $_POST['activity'] ];
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $action = sprintf(
- __( 'Posted a <a href="%s">reply</a> to %s, on the site %s', 'wporg' ),
- esc_url( $_POST['url'] ),
- $_POST['title'],
- $_POST['site']
- );
- $type = 'forum_reply_create';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return '-1 Unrecognized forum activity.';
</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">+ // Check for required args.
+ $required_args = array( 'forum_id' );
+ if ( in_array( $type, array( 'forum_topic_create', 'forum_reply_create' ) ) ) {
+ $required_args[] = 'message';
+ $required_args[] = 'url';
+ $required_args = array_merge( $required_args, array( 'title', 'site', 'message', 'url' ) );
+ }
+ if ( in_array( $type, array( 'forum_topic_create', 'forum_topic_remove' ) ) ) {
+ $required_args[] = 'topic_id';
+ } else {
+ $required_args[] = 'post_id';
+ }
+ $this->require_args( $required_args );
+
+ // Determine 'item_id' value based on context.
+ $item_id = in_array( $type, array( 'forum_topic_create', 'forum_topic_remove' ) ) ?
+ intval( $_POST['topic_id'] ) :
+ intval( $_POST['post_id'] );
+
+ // Find an existing activity uniquely identified by the reported criteria.
+ // For a creation, this prevents duplication and permits a previously
+ // trashed/spammed/unapproved activity to be restored.
+ // For a removal, this is used to find the activity to mark it as spam.
+ // Note: It's unlikely, but possible, that this is a non-unique request.
</ins><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user_id' => $user->ID,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'action' => $action,
- 'content' => $_POST['message'],
- 'primary_link' => $_POST['url'],
</del><span class="cx" style="display: block; padding: 0 10px"> 'component' => 'forums',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'type' => $type,
- 'item_id' => 'forum_topic_create' ? intval( $_POST['topic_id'] ) : intval( $_POST['post_id'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'type' => str_replace( 'remove', 'create', $type ),
+ 'item_id' => $item_id,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'secondary_item_id' => intval( $_POST['forum_id'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'hide_sitewide' => false,
</del><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $activity_id = bp_activity_get_activity_id( $args );
+ $activity_obj = $activity_id ? new BP_Activity_Activity( $activity_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">- return bp_activity_add( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Record the creation of a topic or reply.
+ if ( in_array( $type, array( 'forum_topic_create', 'forum_reply_create' ) ) ) {
+ if ( $activity_obj ) {
+ bp_activity_mark_as_ham( $activity_obj, 'by_source' );
+ $activity_obj->save();
+
+ return true;
+ }
+
+ // Action message for topic creation.
+ if ( 'forum_topic_create' === $type ) {
+ $action = sprintf(
+ __( 'Created a topic, <i><a href="%s">%s</a></i>, on the site %s', 'wporg' ),
+ esc_url( $_POST['url'] ),
+ esc_html( $_POST['title'] ),
+ esc_html( $_POST['site'] )
+ );
+ }
+ // Action message for reply creation.
+ else {
+ $action = sprintf(
+ __( 'Posted a <a href="%s">reply</a> to <i>%s</i>, on the site %s', 'wporg' ),
+ esc_url( $_POST['url'] ),
+ esc_html( $_POST['title'] ),
+ esc_html( $_POST['site'] )
+ );
+ }
+
+ $args = array(
+ 'user_id' => $user->ID,
+ 'action' => $action,
+ 'content' => esc_html( $_POST['message'] ),
+ 'primary_link' => esc_url( $_POST['url'] ),
+ 'component' => 'forums',
+ 'type' => $type,
+ 'item_id' => $item_id,
+ 'secondary_item_id' => intval( $_POST['forum_id'] ),
+ 'hide_sitewide' => false,
+ );
+
+ return bp_activity_add( $args );
+ }
+ // Remove activity related to a topic or reply.
+ elseif ( in_array( $type, array( 'forum_topic_remove', 'forum_reply_remove' ) ) ) {
+ if ( ! $activity_obj ) {
+ return '-1 Activity not previously reported.';
+ }
+
+ bp_activity_mark_as_spam( $activity_obj, 'by_source' );
+ $activity_obj->save();
+
+ return true;
+ }
</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>
</div>
</body>
</html>