<!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>[418] sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php: Profiles activity handler: add error message to error response</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://meta.trac.wordpress.org/changeset/418">418</a></dd>
<dt>Author</dt> <dd>coffee2code</dd>
<dt>Date</dt> <dd>2014-02-24 16:51:08 +0000 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Profiles activity handler: add error message to error response</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>Modified: sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php (417 => 418)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php 2014-02-24 16:34:40 UTC (rev 417)
+++ sites/trunk/profiles.wordpress.org/public_html/wp-content/plugins/wporg-profiles-activity-handler/wporg-profiles-activity-handler.php 2014-02-24 16:51:08 UTC (rev 418)
</span><span class="lines">@@ -98,12 +98,12 @@
</span><span class="cx"> public function handle_activity() {
</span><span class="cx"> // Return error if not a valid activity request.
</span><span class="cx"> if ( true !== apply_filters( 'wporg_is_valid_activity_request', false ) ) {
</span><del>- die( '-1' );
</del><ins>+ die( '-1 Not a valid activity request.' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Return error if activities are not enabled.
</span><span class="cx"> if ( ! bp_is_active( 'activity' ) ) {
</span><del>- die( '-1' );
</del><ins>+ die( '-1 Activity component not activated.' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $source = $_POST['source'];
</span><span class="lines">@@ -128,11 +128,15 @@
</span><span class="cx"> $activity_id = $this->handle_wordpress_activity();
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- $activity_id = false;
</del><ins>+ $activity_id = '-1 Unrecognized activity source.';
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $success = $activity_id ? '1' : '-1';
</del><ins>+ if ( false === $activity_id ) {
+ $error = '-1 Unable to save activity.';
+ }
+
+ $success = intval( $activity_id ) > 0 ? '1' : $error;
</ins><span class="cx"> die( $success );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -147,7 +151,7 @@
</span><span class="cx"> $user = get_user_by( 'login', $_POST['user'] );
</span><span class="cx">
</span><span class="cx"> if ( ! $user ) {
</span><del>- return false;
</del><ins>+ return "-1 Activity reported for unrecognized user ({$_POST['user']}).";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( '1' == $_POST['newTopic'] ) {
</span><span class="lines">@@ -195,7 +199,7 @@
</span><span class="cx"> $user = get_user_by( 'login', $_POST['user'] );
</span><span class="cx">
</span><span class="cx"> if ( ! $user ) {
</span><del>- return false;
</del><ins>+ return "-1 Activity reported for unrecognized user ({$_POST['user']}).";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $args = array(
</span><span class="lines">@@ -227,7 +231,7 @@
</span><span class="cx"> $user = get_user_by( 'login', $_POST['user'] );
</span><span class="cx">
</span><span class="cx"> if ( ! $user ) {
</span><del>- return false;
</del><ins>+ return "-1 Activity reported for unrecognized user ({$_POST['user']}).";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $args = array(
</span><span class="lines">@@ -264,7 +268,7 @@
</span><span class="cx"> $user = get_user_by( 'login', $_POST['user'] );
</span><span class="cx">
</span><span class="cx"> if ( ! $user ) {
</span><del>- return false;
</del><ins>+ return "-1 Activity reported for unrecognized user ({$_POST['user']}).";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $_POST['description'] ) ) {
</span><span class="lines">@@ -347,7 +351,7 @@
</span><span class="cx"> $type = '';
</span><span class="cx">
</span><span class="cx"> if ( ! $user ) {
</span><del>- return false;
</del><ins>+ return "-1 Activity reported for unrecognized user ({$_POST['user_id']}).";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset( $_POST['speaker_id'] ) && ! empty( $_POST['speaker_id'] ) ) {
</span><span class="lines">@@ -390,6 +394,7 @@
</span><span class="cx">
</span><span class="cx"> if ( empty( $type ) ) {
</span><span class="cx"> return false;
</span><ins>+ return "-1 Unrecognized WordCamp activity.";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $args = array(
</span><span class="lines">@@ -414,7 +419,7 @@
</span><span class="cx"> $user = get_user_by( 'login', $_POST['user'] );
</span><span class="cx">
</span><span class="cx"> if ( ! $user ) {
</span><del>- return false;
</del><ins>+ return "-1 Activity reported for unrecognized user ({$_POST['user']}).";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( isset( $_POST['comment_id'] ) && ! empty( $_POST['comment_id'] ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>