<!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>[12722] trunk/wp-admin: merge wp-admin user, plugins, themes, upgrade ,
See #11644</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12722">12722</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-01-14 02:02:19 +0000 (Thu, 14 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>merge wp-admin user, plugins, themes, upgrade , See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminupgradephp">trunk/wp-admin/upgrade.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkwpadmin">trunk/wp-admin/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmin"></a>
<div class="propset"><h4>Property changes: trunk/wp-admin</h4>
<pre class="diff"><span>
<span class="cx">Name: svn:ignore
</span><span class="cx"> + .themes.php.swp
</span><span class="cx">.user-edit.php.swp
</span><span class="cx">.user-new.php.swp
</span><span class="cx">.users.php.swp
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (12721 => 12722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-01-13 19:06:47 UTC (rev 12721)
+++ trunk/wp-admin/plugins.php 2010-01-14 02:02:19 UTC (rev 12722)
</span><span class="lines">@@ -231,8 +231,10 @@
</span><span class="cx"> add_thickbox();
</span><span class="cx">
</span><span class="cx"> $help = '<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>';
</span><ins>+if ( !is_multisite() || is_super_admin() ) {
</ins><span class="cx"> $help .= '<p>' . sprintf(__('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '</p>';
</span><span class="cx"> $help .= '<p>' . sprintf(__('You can find additional plugins for your site by using the new <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> directly and installing manually. To <em>manually</em> install a plugin you generally just need to upload the plugin file into your <code>%2$s</code> directory. Once a plugin has been installed, you may activate it here.'), 'plugin-install.php', WP_PLUGIN_DIR) . '</p>';
</span><ins>+}
</ins><span class="cx">
</span><span class="cx"> add_contextual_help('plugins', $help);
</span><span class="cx">
</span><span class="lines">@@ -282,11 +284,11 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>-<h2><?php echo esc_html( $title ); ?> <a href="plugin-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a></h2>
</del><ins>+<h2><?php echo esc_html( $title ); if ( !is_multisite() || is_super_admin() ) { ?> <a href="plugin-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a><?php } ?></h2>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-$all_plugins = get_plugins();
</del><ins>+$all_plugins = apply_filters( 'all_plugins', get_plugins() );
</ins><span class="cx"> $search_plugins = array();
</span><span class="cx"> $active_plugins = array();
</span><span class="cx"> $inactive_plugins = array();
</span><span class="lines">@@ -323,6 +325,10 @@
</span><span class="cx"> $upgrade_plugins[ $plugin_file ] = $plugin_data;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+if ( is_multisite() && !is_super_admin() ) {
+ $upgrade_plugins = false;
+}
+
</ins><span class="cx"> $total_all_plugins = count($all_plugins);
</span><span class="cx"> $total_inactive_plugins = count($inactive_plugins);
</span><span class="cx"> $total_active_plugins = count($active_plugins);
</span><span class="lines">@@ -515,6 +521,8 @@
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span><ins>+<?php do_action( 'pre_current_active_plugins', $all_plugins ) ?>
+
</ins><span class="cx"> <form method="post" action="<?php echo admin_url('plugins.php') ?>">
</span><span class="cx"> <?php wp_nonce_field('bulk-manage-plugins') ?>
</span><span class="cx"> <input type="hidden" name="plugin_status" value="<?php echo esc_attr($status) ?>" />
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (12721 => 12722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-01-13 19:06:47 UTC (rev 12721)
+++ trunk/wp-admin/themes.php 2010-01-14 02:02:19 UTC (rev 12722)
</span><span class="lines">@@ -12,6 +12,30 @@
</span><span class="cx"> if ( !current_user_can('switch_themes') )
</span><span class="cx"> wp_die( __( 'Cheatin&#8217; uh?' ) );
</span><span class="cx">
</span><ins>+if ( is_multisite() ) {
+ $themes = get_themes();
+ $ct = current_theme_info();
+ $allowed_themes = apply_filters("allowed_themes", get_site_allowed_themes() );
+ if( $allowed_themes == false )
+ $allowed_themes = array();
+
+ $blog_allowed_themes = wpmu_get_blog_allowedthemes();
+ if( is_array( $blog_allowed_themes ) )
+ $allowed_themes = array_merge( $allowed_themes, $blog_allowed_themes );
+ if( $blog_id != 1 )
+ unset( $allowed_themes[ "h3" ] );
+
+ if( isset( $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] ) == false )
+ $allowed_themes[ wp_specialchars( $ct->stylesheet ) ] = true;
+
+ reset( $themes );
+ foreach( $themes as $key => $theme ) {
+ if( isset( $allowed_themes[ wp_specialchars( $theme[ 'Stylesheet' ] ) ] ) == false ) {
+ unset( $themes[ $key ] );
+ }
+ }
+ reset( $themes );
+}
</ins><span class="cx"> if ( isset($_GET['action']) ) {
</span><span class="cx"> if ( 'activate' == $_GET['action'] ) {
</span><span class="cx"> check_admin_referer('switch-theme_' . $_GET['template']);
</span><span class="lines">@@ -32,7 +56,7 @@
</span><span class="cx"> $parent_file = 'themes.php';
</span><span class="cx">
</span><span class="cx"> $help = '<p>' . __('Themes give your WordPress style. Once a theme is installed, you may preview it, activate it or deactivate it here.') . '</p>';
</span><del>-if ( current_user_can('install_themes') ) {
</del><ins>+if ( ( !is_multisite() && current_user_can('install_themes') ) || is_super_admin() ) {
</ins><span class="cx"> $help .= '<p>' . sprintf(__('You can find additional themes for your site by using the new <a href="%1$s">Theme Browser/Installer</a> functionality or by browsing the <a href="http://wordpress.org/extend/themes/">WordPress Theme Directory</a> directly and installing manually. To install a theme <em>manually</em>, <a href="%2$s">upload its ZIP archive with the new uploader</a> or copy its folder via FTP into your <code>wp-content/themes</code> directory.'), 'theme-install.php', 'theme-install.php?tab=upload' ) . '</p>';
</span><span class="cx"> $help .= '<p>' . __('Once a theme is uploaded, you should see it on this page.') . '</p>' ;
</span><span class="cx"> }
</span><span class="lines">@@ -43,6 +67,9 @@
</span><span class="cx"> wp_enqueue_script( 'theme-preview' );
</span><span class="cx">
</span><span class="cx"> require_once('admin-header.php');
</span><ins>+if( is_multisite() && is_super_admin() ) {
+ ?><div id="message0" class="updated fade"><p><?php _e('Administrator: new themes must be activated in the <a href="wpmu-themes.php">Themes Admin</a> page before they appear here.'); ?></p></div><?php
+}
</ins><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( ! validate_current_theme() ) : ?>
</span><span class="lines">@@ -58,7 +85,8 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>-$themes = get_themes();
</del><ins>+if ( !is_multisite() )
+ $themes = get_themes();
</ins><span class="cx"> $ct = current_theme_info();
</span><span class="cx"> unset($themes[$ct->name]);
</span><span class="cx">
</span><span class="lines">@@ -97,6 +125,10 @@
</span><span class="cx"> */
</span><span class="cx"> function theme_update_available( $theme ) {
</span><span class="cx"> static $themes_update;
</span><ins>+
+ if ( is_multisite() && !is_super_admin() )
+ return;
+
</ins><span class="cx"> if ( !isset($themes_update) )
</span><span class="cx"> $themes_update = get_site_transient('update_themes');
</span><span class="cx">
</span><span class="lines">@@ -127,7 +159,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>-<h2><?php echo esc_html( $title ); ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a></h2>
</del><ins>+<h2><?php echo esc_html( $title ); if ( !is_multisite() || is_super_admin() ) { ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php } ?></h2>
</ins><span class="cx">
</span><span class="cx"> <h3><?php _e('Current Theme'); ?></h3>
</span><span class="cx"> <div id="current-theme">
</span><span class="lines">@@ -138,7 +170,7 @@
</span><span class="cx"> /* translators: 1: theme title, 2: theme version, 3: theme author */
</span><span class="cx"> printf(__('%1$s %2$s by %3$s'), $ct->title, $ct->version, $ct->author) ; ?></h4>
</span><span class="cx"> <p class="theme-description"><?php echo $ct->description; ?></p>
</span><del>-<?php if ($ct->parent_theme) { ?>
</del><ins>+<?php if ( ( !is_multisite() || is_super_admin() ) && $ct->parent_theme ) { ?>
</ins><span class="cx"> <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $ct->title, str_replace( WP_CONTENT_DIR, '', $ct->template_dir ), str_replace( WP_CONTENT_DIR, '', $ct->stylesheet_dir ), $ct->title, $ct->parent_theme); ?></p>
</span><span class="cx"> <?php } else { ?>
</span><span class="cx"> <p><?php printf(__('All of this theme&#8217;s files are located in <code>%2$s</code>.'), $ct->title, str_replace( WP_CONTENT_DIR, '', $ct->template_dir ), str_replace( WP_CONTENT_DIR, '', $ct->stylesheet_dir ) ); ?></p>
</span><span class="lines">@@ -217,7 +249,7 @@
</span><span class="cx"> $actions = array();
</span><span class="cx"> $actions[] = '<a href="' . $activate_link . '" class="activatelink" title="' . $activate_text . '">' . __('Activate') . '</a>';
</span><span class="cx"> $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $theme_name)) . '">' . __('Preview') . '</a>';
</span><del>- if ( current_user_can('update_themes') )
</del><ins>+ if ( ( !is_multisite() && current_user_can('update_themes') ) || is_super_admin() )
</ins><span class="cx"> $actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url("themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet) . '" onclick="' . "if ( confirm('" . esc_js(sprintf( __("You are about to delete this theme '%s'\n 'Cancel' to stop, 'OK' to delete."), $theme_name )) . "') ) {return true;}return false;" . '">' . __('Delete') . '</a>';
</span><span class="cx"> $actions = apply_filters('theme_action_links', $actions, $themes[$theme_name]);
</span><span class="cx">
</span><span class="lines">@@ -233,7 +265,7 @@
</span><span class="cx"> printf(__('%1$s %2$s by %3$s'), $title, $version, $author) ; ?></h3>
</span><span class="cx"> <p class="description"><?php echo $description; ?></p>
</span><span class="cx"> <span class='action-links'><?php echo $actions ?></span>
</span><del>- <?php if ($parent_theme) {
</del><ins>+ <?php if ( ( !is_multisite() || is_super_admin() ) && $parent_theme ) {
</ins><span class="cx"> /* translators: 1: theme title, 2: template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?>
</span><span class="cx"> <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ), $title, $parent_theme); ?></p>
</span><span class="cx"> <?php } else { ?>
</span><span class="lines">@@ -266,10 +298,10 @@
</span><span class="cx"> <?php
</span><span class="cx"> // List broken themes, if any.
</span><span class="cx"> $broken_themes = get_broken_themes();
</span><del>-if ( count($broken_themes) ) {
</del><ins>+if ( ( !is_multisite() || is_super_admin() ) && count( $broken_themes ) ) {
</ins><span class="cx"> ?>
</span><span class="cx">
</span><del>-<h2><?php _e('Broken Themes'); ?></h2>
</del><ins>+<h2><?php _e('Broken Themes'); ?> <?php if ( is_multisite() ) _e( '(Site admin only)' ); ?></h2>
</ins><span class="cx"> <p><?php _e('The following themes are installed but incomplete. Themes must have a stylesheet and a template.'); ?></p>
</span><span class="cx">
</span><span class="cx"> <table id="broken-themes">
</span></span></pre></div>
<a id="trunkwpadminupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upgrade.php (12721 => 12722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upgrade.php 2010-01-13 19:06:47 UTC (rev 12721)
+++ trunk/wp-admin/upgrade.php 2010-01-14 02:02:19 UTC (rev 12722)
</span><span class="lines">@@ -86,6 +86,11 @@
</span><span class="cx"> $backto = stripslashes( urldecode( $backto ) );
</span><span class="cx"> $backto = esc_url_raw( $backto );
</span><span class="cx"> $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/');
</span><ins>+ if( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) {
+ $wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );
+ } else {
+ $wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );
+ }
</ins><span class="cx"> ?>
</span><span class="cx"> <h2><?php _e( 'Upgrade Complete' ); ?></h2>
</span><span class="cx"> <p><?php _e( 'Your WordPress database has been successfully upgraded!' ); ?></p>
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (12721 => 12722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-01-13 19:06:47 UTC (rev 12721)
+++ trunk/wp-admin/user-edit.php 2010-01-14 02:02:19 UTC (rev 12722)
</span><span class="lines">@@ -60,6 +60,11 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
+// Only allow site admins to edit every user.
+if ( is_multisite() && !defined( "EDIT_ANY_USER" ) && !is_super_admin() && $user_id != $current_user->ID )
+ wp_die( __( 'You do not have permission to edit this user.' ) );
+
</ins><span class="cx"> switch ($action) {
</span><span class="cx"> case 'switchposts':
</span><span class="cx">
</span><span class="lines">@@ -81,7 +86,24 @@
</span><span class="cx"> else
</span><span class="cx"> do_action('edit_user_profile_update', $user_id);
</span><span class="cx">
</span><del>-$errors = edit_user($user_id);
</del><ins>+if ( !is_multisite() ) {
+ $errors = edit_user($user_id);
+} else {
+ // WPMU must delete the user from the current blog if WP added him after editing.
+ $delete_role = false;
+ $blog_prefix = $wpdb->get_blog_prefix();
+ if( $user_id != $current_user->ID ) {
+ $cap = $wpdb->get_var( "SELECT meta_value FROM {$wpdb->usermeta} WHERE user_id = '{$user_id}' AND meta_key = '{$blog_prefix}capabilities' AND meta_value = 'a:0:{}'" );
+ if( null == $cap && $_POST[ 'role' ] == '' ) {
+ $_POST[ 'role' ] = 'contributor';
+ $delete_role = true;
+ }
+ }
+ if ( !isset( $errors ) || ( isset( $errors ) && is_object( $errors ) && false == $errors->get_error_codes() ) )
+ $errors = edit_user($user_id);
+ if( $delete_role ) // stops users being added to current blog when they are edited
+ update_usermeta( $user_id, $blog_prefix . 'capabilities' , '' );
+}
</ins><span class="cx">
</span><span class="cx"> if ( !is_wp_error( $errors ) ) {
</span><span class="cx"> $redirect = (IS_PROFILE_PAGE ? "profile.php?" : "user-edit.php?user_id=$user_id&"). "updated=true";
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (12721 => 12722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-01-13 19:06:47 UTC (rev 12721)
+++ trunk/wp-admin/user-new.php 2010-01-14 02:02:19 UTC (rev 12722)
</span><span class="lines">@@ -15,21 +15,89 @@
</span><span class="cx"> /** WordPress Registration API */
</span><span class="cx"> require_once( ABSPATH . WPINC . '/registration.php');
</span><span class="cx">
</span><ins>+if ( is_multisite() ) {
+ function admin_created_user_email( $text ) {
+ return sprintf( __( "Hi,
+You've been invited to join '%s' at
+%s as a %s.
+If you do not want to join this blog please ignore
+this email. This invitation will expire in a few days.
+
+Please click the following link to activate your user account:
+%%s" ), get_bloginfo('name'), site_url(), wp_specialchars( $_REQUEST[ 'role' ] ) );
+ }
+ add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
+
+ function admin_created_user_subject( $text ) {
+ return "[" . get_bloginfo('name') . "] Your blog invite";
+ }
+}
+
</ins><span class="cx"> if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
</span><span class="cx"> check_admin_referer('add-user');
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('create_users') )
</span><span class="cx"> wp_die(__('You can&#8217;t create users.'));
</span><span class="cx">
</span><del>- $user_id = add_user();
</del><ins>+ if ( !is_multisite() ) {
+ $user_id = add_user();
</ins><span class="cx">
</span><del>- if ( is_wp_error( $user_id ) ) {
- $add_user_errors = $user_id;
</del><ins>+ if ( is_wp_error( $user_id ) ) {
+ $add_user_errors = $user_id;
+ } else {
+ $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
+ $redirect = 'users.php?usersearch='. urlencode($new_user_login) . '&update=add';
+ wp_redirect( $redirect . '#user-' . $user_id );
+ die();
+ }
</ins><span class="cx"> } else {
</span><del>- $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
- $redirect = 'users.php?usersearch='. urlencode($new_user_login) . '&update=add';
- wp_redirect( $redirect . '#user-' . $user_id );
- die();
</del><ins>+ $user_login = preg_replace( "/\s+/", '', sanitize_user( $_REQUEST[ 'user_login' ], true ) );
+ $user_details = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->users} WHERE user_login = %s AND user_email = %s", $user_login, $_REQUEST[ 'email' ] ) );
+ if( $user_details ) {
+ // Adding an existing user to this blog
+ $new_user_email = wp_specialchars(trim($_REQUEST['email']));
+ $redirect = 'user-new.php';
+ $username = $user_details->user_login;
+ $user_id = $user_details->ID;
+ if( ($username != null && is_site_admin( $username ) == false ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) {
+ $redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' );
+ } else {
+ if ( isset( $_POST[ 'noconfirmation' ] ) && is_site_admin() ) {
+ add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
+ $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
+ } else {
+ $newuser_key = substr( md5( $user_id ), 0, 5 );
+ add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
+ $message = __("Hi,\n\nYou have been invited to join '%s' at\n%s as a %s.\nPlease click the following link to confirm the invite:\n%s\n");
+ wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname' ) ), sprintf($message, get_option('blogname'), site_url(), $_REQUEST[ 'role' ], site_url("/newbloguser/$newuser_key/")));
+ $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
+ }
+ }
+ wp_redirect( $redirect );
+ die();
+ } else {
+ // Adding a new user to this blog
+ $user_details = wpmu_validate_user_signup( $_REQUEST[ 'user_login' ], $_REQUEST[ 'email' ] );
+ unset( $user_details[ 'errors' ]->errors[ 'user_email_used' ] );
+ if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
+ $add_user_errors = $user_details[ 'errors' ];
+ } else {
+ $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
+ if ( isset( $_POST[ 'noconfirmation' ] ) && is_site_admin() ) {
+ add_filter( 'wpmu_signup_user_notification', create_function('', '{return false;}') ); // Disable confirmation email
+ }
+ wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
+ if ( isset( $_POST[ 'noconfirmation' ] ) && is_site_admin() ) {
+ $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) );
+ wpmu_activate_signup( $key );
+ $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
+ } else {
+ $redirect = add_query_arg( array('update' => 'newuserconfimation'), 'user-new.php' );
+ }
+ wp_redirect( $redirect );
+ die();
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -42,6 +110,22 @@
</span><span class="cx">
</span><span class="cx"> require_once ('admin-header.php');
</span><span class="cx">
</span><ins>+if ( is_multisite() ) {
+ switch( $_GET[ 'update' ] ) {
+ case "newuserconfimation":
+ $messages[] = '<div id="message" class="updated fade"><p>' . __('Invitation email sent to new user. A confirmation link must be clicked before their account is created.') . '</p></div>';
+ break;
+ case "add":
+ $messages[] = '<div id="message" class="updated fade"><p>' . __('Invitation email sent to user. A confirmation link must be clicked for them to be added to your blog.') . '</p></div>';
+ break;
+ case "addnoconfirmation":
+ $messages[] = '<div id="message" class="updated fade"><p>' . __('User has been added to your blog.') . '</p></div>';
+ break;
+ case "addexisting":
+ $messages[] = '<div id="message" class="updated fade"><p>' . __('That user is already a member of this blog.') . '</p></div>';
+ break;
+ }
+}
</ins><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="lines">@@ -74,10 +158,15 @@
</span><span class="cx"> <div id="ajax-response"></div>
</span><span class="cx">
</span><span class="cx"> <?php
</span><ins>+if ( !is_multisite() ) {
</ins><span class="cx"> if ( get_option('users_can_register') )
</span><span class="cx"> echo '<p>' . sprintf(__('Users can <a href="%1$s">register themselves</a> or you can manually create users here.'), site_url('wp-register.php')) . '</p>';
</span><span class="cx"> else
</span><span class="cx"> echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), admin_url('options-general.php#users_can_register')) . '</p>';
</span><ins>+} else {
+ echo '<p>' . __( 'You can add new users to your blog in two ways:' ) . '<ol><li> ' . __( 'Enter the username and email address of an existing user on this site.' ) . '</li><li> ' . __( 'Enter the username and the email address of a person who is not already a member of this site. Choose the username carefully, it cannot be changed.' ) . '</li></ol></p>';
+ echo '<p>' . __( 'That person will be sent an email asking them to click a link confirming the invite. New users will then be sent an email with a randomly generated password and a login link.' ) . '</p>';
+}
</ins><span class="cx"> ?>
</span><span class="cx"> <form action="#add-new-user" method="post" name="adduser" id="adduser" class="add:users: validate">
</span><span class="cx"> <?php wp_nonce_field('add-user') ?>
</span><span class="lines">@@ -92,6 +181,7 @@
</span><span class="cx"> $new_user_send_password = !$_POST || isset($_POST['send_password']);
</span><span class="cx"> ?>
</span><span class="cx"> <table class="form-table">
</span><ins>+<?php if ( !is_multisite() ) { ?>
</ins><span class="cx"> <tr class="form-field form-required">
</span><span class="cx"> <th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label>
</span><span class="cx"> <input name="action" type="hidden" id="action" value="adduser" /></th>
</span><span class="lines">@@ -130,7 +220,16 @@
</span><span class="cx"> <td><label for="send_password"><input type="checkbox" name="send_password" id="send_password" <?php checked($new_user_send_password, true); ?> /> <?php _e('Send this password to the new user by email.'); ?></label></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span><del>-
</del><ins>+<?php } else { // multisite ?>
+ <tr class="form-field form-required">
+ <th scope="row"><label for="user_login"><?php _e('Username (required)') ?></label><input name="action" type="hidden" id="action" value="adduser" /></th>
+ <td ><input name="user_login" type="text" id="user_login" value="<?php echo $new_user_login; ?>" aria-required="true" /></td>
+ </tr>
+ <tr class="form-field form-required">
+ <th scope="row"><label for="email"><?php _e('E-mail (required)') ?></label></th>
+ <td><input name="email" type="text" id="email" value="<?php echo $new_user_email; ?>" /></td>
+ </tr>
+<?php } ?>
</ins><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row"><label for="role"><?php _e('Role'); ?></label></th>
</span><span class="cx"> <td><select name="role" id="role">
</span><span class="lines">@@ -142,6 +241,13 @@
</span><span class="cx"> </select>
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><ins>+
+ <?php if ( is_multisite() && is_super_admin() ) { ?>
+ <tr class="form-field">
+ <th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
+ <td><input name="noconfirmation" type="checkbox" id="noconfirmation" value="1" /> <label for="noconfirmation"><?php _e( 'Site administrators can add a user without sending the confirmation email.' ); ?></label></td>
+ </tr>
+ <?php } ?>
</ins><span class="cx"> </table>
</span><span class="cx"> <p class="submit">
</span><span class="cx"> <input name="adduser" type="submit" id="addusersub" class="button-primary" value="<?php esc_attr_e('Add User') ?>" />
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (12721 => 12722)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-01-13 19:06:47 UTC (rev 12721)
+++ trunk/wp-admin/users.php 2010-01-14 02:02:19 UTC (rev 12722)
</span><span class="lines">@@ -98,10 +98,18 @@
</span><span class="cx"> }
</span><span class="cx"> switch($_REQUEST['delete_option']) {
</span><span class="cx"> case 'delete':
</span><del>- wp_delete_user($id);
</del><ins>+ if ( !is_multisite() ) {
+ wp_delete_user($id);
+ } else {
+ remove_user_from_blog($id, $blog_id); // WPMU only remove user from blog
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case 'reassign':
</span><del>- wp_delete_user($id, $_REQUEST['reassign_user']);
</del><ins>+ if ( !is_multisite() ) {
+ wp_delete_user($id, $_REQUEST['reassign_user']);
+ } else {
+ remove_user_from_blog($id, $blog_id, $_REQUEST['reassign_user']);
+ }
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> ++$delete_count;
</span><span class="lines">@@ -153,7 +161,12 @@
</span><span class="cx"> $go_delete = true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
</del><ins>+ if ( !is_multisite() ) {
+ $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users ORDER BY user_login");
+ } else {
+ // WPMU only searches users of current blog
+ $all_logins = $wpdb->get_results("SELECT ID, user_login FROM $wpdb->users, $wpdb->usermeta WHERE $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '".$wpdb->prefix."capabilities' ORDER BY user_login");
+ }
</ins><span class="cx"> $user_dropdown = '<select name="reassign_user">';
</span><span class="cx"> foreach ( (array) $all_logins as $login )
</span><span class="cx"> if ( $login->ID == $current_user->ID || !in_array($login->ID, $userids) )
</span><span class="lines">@@ -239,7 +252,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>-<h2><?php echo esc_html( $title ); ?> <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'user'); ?></a> <?php
</del><ins>+<h2><?php echo esc_html( $title ); if ( !is_multisite() || get_site_option( 'add_new_users' ) ) { ?> <a href="user-new.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'user'); ?></a><?php }
</ins><span class="cx"> if ( isset($_GET['usersearch']) && $_GET['usersearch'] )
</span><span class="cx"> printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $_GET['usersearch'] ) ); ?>
</span><span class="cx"> </h2>
</span><span class="lines">@@ -385,6 +398,16 @@
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+<?php
+if ( is_multisite() ) {
+ foreach ( array('user_login' => 'user_login', 'first_name' => 'user_firstname', 'last_name' => 'user_lastname', 'email' => 'user_email', 'url' => 'user_uri', 'role' => 'user_role') as $formpost => $var ) {
+ $var = 'new_' . $var;
+ $$var = isset($_REQUEST[$formpost]) ? esc_attr(stripslashes($_REQUEST[$formpost])) : '';
+ }
+ unset($name);
+}
+?>
+
</ins><span class="cx"> <br class="clear" />
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>