<!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>[12879] trunk/wp-includes: Integrate wordpressmu_authenticate_siteadmin()
into wp_authenticate_username_password().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12879">12879</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-27 18:11:17 +0000 (Wed, 27 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Integrate wordpressmu_authenticate_siteadmin() 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="#trunkwpincludesmsdefaultfiltersphp">trunk/wp-includes/ms-default-filters.php</a></li>
<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="trunkwpincludesmsdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-default-filters.php (12878 => 12879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-default-filters.php 2010-01-27 17:55:39 UTC (rev 12878)
+++ trunk/wp-includes/ms-default-filters.php 2010-01-27 18:11:17 UTC (rev 12879)
</span><span class="lines">@@ -2,7 +2,6 @@
</span><span class="cx"> // Users
</span><span class="cx"> add_filter ( 'wpmu_validate_user_signup', 'signup_nonce_check' );
</span><span class="cx"> add_action ( 'init', 'maybe_add_existing_user_to_blog' );
</span><del>-add_filter ( 'wp_authenticate_user', 'wordpressmu_authenticate_siteadmin', 10, 2 );
</del><span class="cx"> add_action ( 'wpmu_new_user', 'newuser_notify_siteadmin' );
</span><span class="cx"> add_action ( 'wpmu_activate_user', 'add_new_user_to_blog', 10, 3 );
</span><span class="cx"> add_action ( 'sanitize_user', 'strtolower_usernames', 10, 3 );
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (12878 => 12879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-01-27 17:55:39 UTC (rev 12878)
+++ trunk/wp-includes/ms-functions.php 2010-01-27 18:11:17 UTC (rev 12879)
</span><span class="lines">@@ -1747,15 +1747,6 @@
</span><span class="cx"> return $upload;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function wordpressmu_authenticate_siteadmin( $user, $password = '' ) {
- if ( is_super_admin( $user->user_login ) == false && ( $primary_blog = get_usermeta( $user->user_id, "primary_blog" ) ) ) {
- $details = get_blog_details( $primary_blog );
- if ( is_object( $details ) && $details->spam == 1 )
- return new WP_Error('blog_suspended', __('Blog Suspended.'));
- }
- return $user;
-}
-
</del><span class="cx"> function wordpressmu_wp_mail_from( $email ) {
</span><span class="cx"> if ( strpos( $email, 'wordpress@' ) !== false )
</span><span class="cx"> $email = get_option( 'admin_email' );
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (12878 => 12879)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-01-27 17:55:39 UTC (rev 12878)
+++ trunk/wp-includes/user.php 2010-01-27 18:11:17 UTC (rev 12879)
</span><span class="lines">@@ -88,9 +88,19 @@
</span><span class="cx"> if ( !$userdata )
</span><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><span class="cx">
</span><del>- if ( is_multisite() && (1 == $userdata->spam) )
- return new WP_Error('invalid_username', __('<strong>ERROR</strong>: Your account has been marked as a spammer.'));
</del><ins>+ if ( is_multisite() ) {
+ // Is user marked as spam?
+ if ( 1 == $userdata->spam)
+ return new WP_Error('invalid_username', __('<strong>ERROR</strong>: Your account has been marked as a spammer.'));
</ins><span class="cx">
</span><ins>+ // Is a user's blog marked as spam?
+ if ( !is_super_admin( $userdata->ID ) && isset($userdata->primary_blog) ) {
+ $details = get_blog_details( $userdata->primary_blog );
+ if ( is_object( $details ) && $details->spam == 1 )
+ return new WP_Error('blog_suspended', __('Blog Suspended.'));
+ }
+ }
+
</ins><span class="cx"> $userdata = apply_filters('wp_authenticate_user', $userdata, $password);
</span><span class="cx"> if ( is_wp_error($userdata) )
</span><span class="cx"> return $userdata;
</span></span></pre>
</div>
</div>
</body>
</html>