<!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][5621] trunk/bp-activity: Update Activity Akismet support for user agent and CSS changes introduced in Akismet 2.5.4.</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, #logmsg > ol { margin-left: 0; 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/5621">5621</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2012-01-07 00:36:24 +0000 (Sat, 07 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Update Activity Akismet support for user agent and CSS changes introduced in Akismet 2.5.4. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3904">#3904</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivityadmincssadmincss">trunk/bp-activity/admin/css/admin.css</a></li>
<li><a href="#trunkbpactivityadmincssadmindevcss">trunk/bp-activity/admin/css/admin.dev.css</a></li>
<li><a href="#trunkbpactivitybpactivityakismetphp">trunk/bp-activity/bp-activity-akismet.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivityadmincssadmincss"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/admin/css/admin.css (5620 => 5621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/admin/css/admin.css 2012-01-03 22:11:17 UTC (rev 5620)
+++ trunk/bp-activity/admin/css/admin.css 2012-01-07 00:36:24 UTC (rev 5621)
</span><span class="lines">@@ -1 +1 @@
</span><del>-#wp-bp-activities-wrap{padding:5px 0;}#bp-activities{height:120px;}#bp-replyhead{font-size:1em;line-height:1.4em;margin:0;}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center;}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center;}#bp-replysubmit img.waiting{float:right;padding:4px 10px 0;vertical-align:top;}#bp-activities-form .column-response img{float:left;margin-right:10px;margin-top:1px;}.activity-errors{list-style-type:disc;margin-left:2em;}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0;}#bp_activity_action h3,#bp_activity_content h3{cursor:auto;}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:white;}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px;}#bp_activity_link input{width:99%;}#bp-activities-primaryid{margin-bottom:1em;}
</del><span class="cx">\ No newline at end of file
</span><ins>+.akismet-status{float:right;}.akismet-status a{color:#AAA;font-style:italic;}#wp-bp-activities-wrap{padding:5px 0;}#bp-activities{height:120px;}#bp-replyhead{font-size:1em;line-height:1.4em;margin:0;}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center;}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center;}#bp-replysubmit img.waiting{float:right;padding:4px 10px 0;vertical-align:top;}#bp-activities-form .column-response img{float:left;margin-right:10px;margin-top:1px;}.activity-errors{list-style-type:disc;margin-left:2em;}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0;}#bp_activity_action h3,#bp_activity_content h3{cursor:auto;}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:white;}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px;}#bp_activity_link input{width:99%;}#bp-activ
ities-primaryid{margin-bottom:1em;}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkbpactivityadmincssadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/admin/css/admin.dev.css (5620 => 5621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/admin/css/admin.dev.css 2012-01-03 22:11:17 UTC (rev 5620)
+++ trunk/bp-activity/admin/css/admin.dev.css 2012-01-07 00:36:24 UTC (rev 5621)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+.akismet-status {
+ float: right;
+}
+.akismet-status a {
+ color: #AAA;
+ font-style: italic;
+}
</ins><span class="cx"> #wp-bp-activities-wrap {
</span><span class="cx"> padding: 5px 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpactivitybpactivityakismetphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-akismet.php (5620 => 5621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-akismet.php 2012-01-03 22:11:17 UTC (rev 5620)
+++ trunk/bp-activity/bp-activity-akismet.php 2012-01-07 00:36:24 UTC (rev 5621)
</span><span class="lines">@@ -459,102 +459,23 @@
</span><span class="cx"> $path = '/1.1/submit-' . $spam;
</span><span class="cx">
</span><span class="cx"> // Send to Akismet
</span><del>- $response = $this->http_post( $query_string, $akismet_api_host, $path, $akismet_api_port );
</del><ins>+ add_filter( 'akismet_ua', array( $this, 'buddypress_ua' ) );
+ $response = akismet_http_post( $query_string, $akismet_api_host, $path, $akismet_api_port );
+ remove_filter( 'akismet_ua', array( $this, 'buddypress_ua' ) );
+
</ins><span class="cx"> $activity_data['bp_as_result'] = $response[1];
</span><span class="cx">
</span><span class="cx"> return $activity_data;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Submit data to the Akismet service with a unique user agent.
</del><ins>+ * Filters user agent when sending to Akismet.
</ins><span class="cx"> *
</span><del>- * Props to WordPress core Akismet plugin, and bbPress, for alot of this
- *
- * @param string $request The request we are sending
- * @param string $host The host to send our request to
- * @param string $path The path from the host
- * @param string $port The port to use
- * @param string $ip Optional Override $host with an IP address
- * @return mixed WP_Error on error, array on success, empty on failure
- * @since 1.6
</del><ins>+ * @param string $user_agent
+ * @since 1.0
</ins><span class="cx"> */
</span><del>- private function http_post( $request, $host, $path, $port = 80, $ip = '' ) {
- $blog_charset = bp_get_option( 'blog_charset' );
- $content_length = strlen( $request );
- $errno = null;
- $errstr = null;
- $http_host = $host;
- $response = '';
-
- // Unique User Agent
- $akismet_ua = 'BuddyPress/' . bp_get_version() . ' | Akismet/'. constant( 'AKISMET_VERSION' );
-
- // Use specific IP (if provided)
- if ( !empty( $ip ) && long2ip( ip2long( $ip ) ) )
- $http_host = $ip;
-
- // WP HTTP class is available
- if ( function_exists( 'wp_remote_post' ) ) {
-
- // Setup the arguments
- $http_args = array(
- 'body' => $request,
- 'headers' => array(
- 'Content-Type' => 'application/x-www-form-urlencoded; charset=' . $blog_charset,
- 'Host' => $host,
- 'User-Agent' => $akismet_ua
- ),
- 'httpversion' => '1.0',
- 'timeout' => 15
- );
-
- // Where we are sending our request
- $akismet_url = 'http://' . $http_host . $path;
-
- // Send the request
- $response = wp_remote_post( $akismet_url, $http_args );
-
- // Bail if the response is an error
- if ( is_wp_error( $response ) )
- return '';
-
- // No errors so return response
- return array( $response['headers'], $response['body'] );
-
- // WP HTTP class is not available (Why not?)
- } else {
-
- // Header info to use with our socket
- $http_request = "POST {$path} HTTP/1.0\r\n";
- $http_request .= "Host: {$host}\r\n";
- $http_request .= "Content-Type: application/x-www-form-urlencoded; charset={$blog_charset}\r\n";
- $http_request .= "Content-Length: {$content_length}\r\n";
- $http_request .= "User-Agent: {$akismet_ua}\r\n";
- $http_request .= "\r\n";
- $http_request .= $request;
-
- // Open a socket connection
- if ( false != ( $fs = @fsockopen( $http_host, $port, $errno, $errstr, 10 ) ) ) {
-
- // Write our request to the pointer
- fwrite( $fs, $http_request );
-
- // Loop through pointer and compile a response
- while ( !feof( $fs ) ) {
- // One TCP-IP packet at a time
- $response .= fgets( $fs, 1160 );
- }
-
- // Close our socket
- fclose( $fs );
-
- // Explode the response into usable data
- $response = explode( "\r\n\r\n", $response, 2 );
- }
-
- // Return the response ('' if error/empty)
- return $response;
- }
</del><ins>+ public function buddypress_ua( $user_agent ) {
+ return 'BuddyPress/' . bp_get_version() . ' | Akismet/'. constant( 'AKISMET_VERSION' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>