<!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][6990] trunk/bp-members/bp-members-functions.php: Change logic of bp_stop_live_spammer().</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://buddypress.trac.wordpress.org/changeset/6990">6990</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2013-05-02 00:43:07 +0000 (Thu, 02 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Change logic of bp_stop_live_spammer().
Instead of using wp_die(), reauthorize the user by redirecting the logged-in
spammer to wp-login.php with the 'reauth' parameter.
bp_live_spammer_login_error() adds an error message for the logged-in
spammer on the wp-login.php page.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4814">#4814</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (6989 => 6990)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2013-05-02 00:42:52 UTC (rev 6989)
+++ trunk/bp-members/bp-members-functions.php 2013-05-02 00:43:07 UTC (rev 6990)
</span><span class="lines">@@ -1451,14 +1451,19 @@
</span><span class="cx"> add_action( 'bp_init', 'bp_core_wpsignup_redirect' );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Stop a logged-in spammer from being able to access the site.
</del><ins>+ * Stop a logged-in user who is marked as a spammer.
</ins><span class="cx"> *
</span><span class="cx"> * When an admin marks a live user as a spammer, that user can still surf
</span><span class="cx"> * around and cause havoc on the site until that person is logged out.
</span><span class="cx"> *
</span><span class="cx"> * This code checks to see if a logged-in user is marked as a spammer. If so,
</span><del>- * we kill access to the rest of the site.
</del><ins>+ * we redirect the user back to wp-login.php with the 'reauth' parameter.
</ins><span class="cx"> *
</span><ins>+ * This clears the logged-in spammer's cookies and will ask the spammer to
+ * reauthenticate.
+ *
+ * Note: A spammer cannot log back in - {@see bp_core_boot_spammer()}.
+ *
</ins><span class="cx"> * Runs on 'bp_init' at priority 5 so the members component globals are setup
</span><span class="cx"> * before we do our spammer checks.
</span><span class="cx"> *
</span><span class="lines">@@ -1467,17 +1472,48 @@
</span><span class="cx"> * @since BuddyPress (v1.8)
</span><span class="cx"> */
</span><span class="cx"> function bp_stop_live_spammer() {
</span><ins>+ // if we're on the login page, stop now to prevent redirect loop
+ if ( strpos( $GLOBALS['pagenow'], 'wp-login.php' ) !== false ) {
+ return;
+ }
+
</ins><span class="cx"> // user isn't logged in, so stop!
</span><span class="cx"> if ( ! is_user_logged_in() ) {
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // if spammer, kills access to the site
</del><ins>+ // if spammer, redirect to wp-login.php and reauthorize
</ins><span class="cx"> if ( bp_is_user_spammer( bp_loggedin_user_id() ) ) {
</span><del>- // the spammer will not be able to view any portion of the site whatsoever
- // this is a good detterent as the user cannot re-register to the site easily
- wp_die( __( '<strong>ERROR</strong>: Your account has been marked as a spammer.', 'buddypress' ) );
- exit;
</del><ins>+ // setup login args
+ $args = array(
+ // custom action used to throw an error message
+ 'action' => 'bp-spam',
+
+ // reauthorize user to login
+ 'reauth' => 1
+ );
+
+ // setup login URL
+ $login_url = apply_filters( 'bp_live_spammer_redirect', add_query_arg( $args, wp_login_url() ) );
+
+ // redirect user to login page
+ wp_redirect( $login_url );
+ die();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> add_action( 'bp_init', 'bp_stop_live_spammer', 5 );
</span><ins>+
+/**
+ * Show a custom error message when a logged-in user is marked as a spammer.
+ *
+ * @since BuddyPress (v1.8)
+ */
+function bp_live_spammer_login_error() {
+ global $error;
+
+ $error = __( '<strong>ERROR</strong>: Your account has been marked as a spammer.', 'buddypress' );
+
+ // shake shake shake!
+ add_action( 'login_head', 'wp_shake_js', 12 );
+}
+add_action( 'login_form_bp-spam', 'bp_live_spammer_login_error' );
</ins></span></pre>
</div>
</div>
</body>
</html>