<!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][5528] trunk/bp-activity: Handle errors better with activity admin; don't bail out, keep on truckin'.</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/5528">5528</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-12-12 22:42:54 +0000 (Mon, 12 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Handle errors better with activity admin; don't bail out, keep on truckin'. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3845">#3845</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="#trunkbpactivitybpactivityadminphp">trunk/bp-activity/bp-activity-admin.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 (5527 => 5528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/admin/css/admin.css 2011-12-12 15:31:00 UTC (rev 5527)
+++ trunk/bp-activity/admin/css/admin.css 2011-12-12 22:42:54 UTC (rev 5528)
</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;}#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>+#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;}
</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 (5527 => 5528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/admin/css/admin.dev.css 2011-12-12 15:31:00 UTC (rev 5527)
+++ trunk/bp-activity/admin/css/admin.dev.css 2011-12-12 22:42:54 UTC (rev 5528)
</span><span class="lines">@@ -30,6 +30,10 @@
</span><span class="cx"> margin-right: 10px;
</span><span class="cx"> margin-top: 1px;
</span><span class="cx"> }
</span><ins>+.activity-errors {
+ list-style-type: disc;
+ margin-left: 2em;
+}
</ins><span class="cx">
</span><span class="cx"> #bp_activity_action div.inside,
</span><span class="cx"> #bp_activity_content div.inside {
</span></span></pre></div>
<a id="trunkbpactivitybpactivityadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-admin.php (5527 => 5528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-admin.php 2011-12-12 15:31:00 UTC (rev 5527)
+++ trunk/bp-activity/bp-activity-admin.php 2011-12-12 22:42:54 UTC (rev 5528)
</span><span class="lines">@@ -281,8 +281,8 @@
</span><span class="cx"> // Initialise counters for how many of each type of item we perform an action on
</span><span class="cx"> $deleted = $spammed = $unspammed = 0;
</span><span class="cx">
</span><del>- // Store any error that occurs when updating the database item
- $error = 0;
</del><ins>+ // Store any errors that occurs when updating the database items
+ $errors = array();
</ins><span class="cx">
</span><span class="cx"> // "We'd like to shoot the monster, could you move, please?"
</span><span class="cx"> foreach ( $activity_ids as $activity_id ) {
</span><span class="lines">@@ -292,8 +292,10 @@
</span><span class="cx">
</span><span class="cx"> // Get the activity from the database
</span><span class="cx"> $activity = new BP_Activity_Activity( $activity_id );
</span><del>- if ( empty( $activity->component ) )
</del><ins>+ if ( empty( $activity->component ) ) {
+ $errors[] = $activity_id;
</ins><span class="cx"> continue;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> switch ( $doaction ) {
</span><span class="cx"> case 'delete' :
</span><span class="lines">@@ -310,12 +312,10 @@
</span><span class="cx"> $result = $activity->save();
</span><span class="cx">
</span><span class="cx"> // Check for any error during activity save
</span><del>- if ( ! $result ) {
- $error = $activity->id;
- break;
- }
-
- $unspammed++;
</del><ins>+ if ( ! $result )
+ $errors[] = $activity->id;
+ else
+ $unspammed++;
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'spam' :
</span><span class="lines">@@ -323,28 +323,22 @@
</span><span class="cx"> $result = $activity->save();
</span><span class="cx">
</span><span class="cx"> // Check for any error during activity save
</span><del>- if ( ! $result ) {
- $error = $activity->id;
- break;
- }
-
- $spammed++;
</del><ins>+ if ( ! $result )
+ $errors[] = $activity->id;
+ else
+ $spammed++;
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If an error occured, don't bother looking at the other activities. Bail out of the foreach.
- if ( $error )
- break;
-
</del><span class="cx"> // Release memory
</span><span class="cx"> unset( $activity );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Call actions for plugins to do something before we redirect
</span><del>- do_action( 'bp_activity_admin_action_after', array( $spammed, $unspammed, $deleted, $error ), $redirect_to, $activity_ids );
</del><ins>+ do_action( 'bp_activity_admin_action_after', array( $spammed, $unspammed, $deleted, $errors ), $redirect_to, $activity_ids );
</ins><span class="cx">
</span><span class="cx"> // Add arguments to the redirect URL so that on page reload, we can easily display what we've just done.
</span><span class="cx"> if ( $spammed )
</span><span class="lines">@@ -357,8 +351,8 @@
</span><span class="cx"> $redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
</span><span class="cx">
</span><span class="cx"> // If an error occured, pass back the activity ID that failed
</span><del>- if ( $error )
- $redirect_to = add_query_arg( 'error', (int) $error, $redirect_to );
</del><ins>+ if ( ! empty( $errors ) )
+ $redirect_to = add_query_arg( 'error', implode ( ',', array_map( 'absint', $errors ) ), $redirect_to );
</ins><span class="cx">
</span><span class="cx"> // Redirect
</span><span class="cx"> wp_redirect( apply_filters( 'bp_activity_admin_action_redirect', $redirect_to ) );
</span><span class="lines">@@ -768,23 +762,41 @@
</span><span class="cx">
</span><span class="cx"> // If the user has just made a change to an activity item, build status messages
</span><span class="cx"> if ( ! empty( $_REQUEST['deleted'] ) || ! empty( $_REQUEST['spammed'] ) || ! empty( $_REQUEST['unspammed'] ) || ! empty( $_REQUEST['error'] ) || ! empty( $_REQUEST['updated'] ) ) {
</span><del>- $deleted = !empty( $_REQUEST['deleted'] ) ? (int) $_REQUEST['deleted'] : 0;
- $error = !empty( $_REQUEST['error'] ) ? (int) $_REQUEST['error'] : 0;
- $spammed = !empty( $_REQUEST['spammed'] ) ? (int) $_REQUEST['spammed'] : 0;
- $unspammed = !empty( $_REQUEST['unspammed'] ) ? (int) $_REQUEST['unspammed'] : 0;
- $updated = !empty( $_REQUEST['updated'] ) ? (int) $_REQUEST['updated'] : 0;
</del><ins>+ $deleted = ! empty( $_REQUEST['deleted'] ) ? (int) $_REQUEST['deleted'] : 0;
+ $errors = ! empty( $_REQUEST['error'] ) ? $_REQUEST['error'] : '';
+ $spammed = ! empty( $_REQUEST['spammed'] ) ? (int) $_REQUEST['spammed'] : 0;
+ $unspammed = ! empty( $_REQUEST['unspammed'] ) ? (int) $_REQUEST['unspammed'] : 0;
+ $updated = ! empty( $_REQUEST['updated'] ) ? (int) $_REQUEST['updated'] : 0;
</ins><span class="cx">
</span><ins>+ $errors = array_map( 'absint', explode( ',', $errors ) );
+
</ins><span class="cx"> if ( $deleted > 0 )
</span><span class="cx"> $messages[] = sprintf( _n( '%s activity was permanently deleted.', '%s activities were permanently deleted.', $deleted, 'buddypress' ), number_format_i18n( $deleted ) );
</span><span class="cx">
</span><del>- if ( $error > 0 )
- $messages[] = sprintf( __( 'An error occurred when updating Activity ID #%s.', 'buddypress' ), number_format_i18n( $error ) );
</del><ins>+ if ( ! empty( $errors ) ) {
+ if ( 1 == count( $errors ) ) {
+ $error_msg = __( 'An error occurred when updating activity ID #%s.', 'buddypress' );
</ins><span class="cx">
</span><ins>+ } else {
+ $error_msg = __( 'Errors occurred when updating activity IDs:', 'buddypress' );
+ $error_msg .= '<ul class="activity-errors">';
+
+ // Display each error as a list item
+ foreach ( $errors as $error ) {
+ // Translators: This is a bulleted list of item IDs
+ $error_msg .= '<li>' . sprintf( __( '#%s', 'buddypress' ), number_format_i18n( $error ) ) . '</li>';
+ }
+
+ $error_msg .= '</ul>';
+ $messages[] = $error_msg;
+ }
+ }
+
</ins><span class="cx"> if ( $spammed > 0 )
</span><del>- $messages[] = sprintf( _n( '%s activity marked as spam.', '%s activities marked as spam.', $spammed, 'buddypress' ), number_format_i18n( $spammed ) );
</del><ins>+ $messages[] = sprintf( _n( '%s activity has been marked as spam.', '%s activities have been marked as spam.', $spammed, 'buddypress' ), number_format_i18n( $spammed ) );
</ins><span class="cx">
</span><span class="cx"> if ( $unspammed > 0 )
</span><del>- $messages[] = sprintf( _n( '%s activity restored from the spam.', '%s activities restored from the spam.', $unspammed, 'buddypress' ), number_format_i18n( $unspammed ) );
</del><ins>+ $messages[] = sprintf( _n( '%s activity has been restored from the spam.', '%s activities have been restored from the spam.', $unspammed, 'buddypress' ), number_format_i18n( $unspammed ) );
</ins><span class="cx">
</span><span class="cx"> if ( $updated > 0 )
</span><span class="cx"> $messages[] = __( 'The activity has been updated succesfully.', 'buddypress' );
</span><span class="lines">@@ -813,7 +825,7 @@
</span><span class="cx">
</span><span class="cx"> <?php // If the user has just made a change to an activity item, display the status messages ?>
</span><span class="cx"> <?php if ( !empty( $messages ) ) : ?>
</span><del>- <div id="moderated" class="<?php echo ( ! empty( $_REQUEST['error'] ) ) ? 'error' : 'updated'; ?>"><p><?php echo implode( "<br/>\n", $messages ); ?></p></div>
</del><ins>+ <div id="moderated" class="<?php echo ( ! empty( $_REQUEST['errors'] ) ) ? 'error' : 'updated'; ?>"><p><?php echo implode( "<br/>\n", $messages ); ?></p></div>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php // Display each activity on its own row ?>
</span></span></pre>
</div>
</div>
</body>
</html>