<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12853] trunk/wp-includes: Integrate login_spam_check()
into wp_authenticate_username_password().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12853">12853</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-26 20:25:34 +0000 (Tue, 26 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Integrate login_spam_check() into wp_authenticate_username_password(). see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12852 => 12853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-01-26 20:15:43 UTC (rev 12852)
+++ trunk/wp-includes/ms-functions.php 2010-01-26 20:25:34 UTC (rev 12853)
</span><span class="lines">@@ -1887,13 +1887,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function login_spam_check( $user, $password ) {
- if ( is_user_spammy( $user->ID ) )
- return new WP_Error('invalid_username', __('<strong>ERROR</strong>: your account has been marked as a spammer.'));
- return $user;
-}
-add_action( 'wp_authenticate_user', 'login_spam_check', 10, 2 );
-
</del><span class="cx"> function update_blog_public( $old_value, $value ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx"> do_action('update_blog_public');
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (12852 => 12853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-01-26 20:15:43 UTC (rev 12852)
+++ trunk/wp-includes/user.php 2010-01-26 20:25:34 UTC (rev 12853)
</span><span class="lines">@@ -83,20 +83,20 @@
</span><span class="cx"> return $error;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $userdata = get_userdatabylogin($username);
</del><ins>+ $userdata = get_user_by('login', $username);
</ins><span class="cx">
</span><del>- if ( !$userdata ) {
</del><ins>+ if ( !$userdata )
</ins><span class="cx"> return new WP_Error('invalid_username', sprintf(__('<strong>ERROR</strong>: Invalid username. <a href="%s" title="Password Lost and Found">Lost your password</a>?'), site_url('wp-login.php?action=lostpassword', 'login')));
</span><del>- }
</del><span class="cx">
</span><ins>+ if ( is_multisite() && (1 == $userdata->spam) )
+ return new WP_Error('invalid_username', __('<strong>ERROR</strong>: Your account has been marked as a spammer.'));
+
</ins><span class="cx"> $userdata = apply_filters('wp_authenticate_user', $userdata, $password);
</span><del>- if ( is_wp_error($userdata) ) {
</del><ins>+ if ( is_wp_error($userdata) )
</ins><span class="cx"> return $userdata;
</span><del>- }
</del><span class="cx">
</span><del>- if ( !wp_check_password($password, $userdata->user_pass, $userdata->ID) ) {
</del><ins>+ if ( !wp_check_password($password, $userdata->user_pass, $userdata->ID) )
</ins><span class="cx"> return new WP_Error('incorrect_password', sprintf(__('<strong>ERROR</strong>: Incorrect password. <a href="%s" title="Password Lost and Found">Lost your password</a>?'), site_url('wp-login.php?action=lostpassword', 'login')));
</span><del>- }
</del><span class="cx">
</span><span class="cx"> $user = new WP_User($userdata->ID);
</span><span class="cx"> return $user;
</span></span></pre>
</div>
</div>
</body>
</html>