Bug adding users in multisite

[jane]

In 3.0 multisite (site in question is wordcamp.org), am having trouble adding new users to an individual site. When you click Add new User, you get:

You can add new users to your site in two ways:

1. Enter the username and email address of an existing user on this site.

2. 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.

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.

A) We should update that text to say network instead of site.

B) When I entered someone's username and email who was already in the network user system, instead of adding them to site, I get two error messages:
Sorry, that username already exists''

Sorry, that email address is already used''

Catch-22.

The network/site confusion was fixed in [15310].

Also, part B) works for me. Is it a specific user name/email combo or are all failing?

(Maybe the check in user-new.php lines 58/59 should use username_exists and email_exists like wpmu_validate_user_signup instead of the direct query)

Part B also works for me, although I recommend we call the second button "Create User" for clarity. Attaching a minor patch create user.diff to do this.

Suggestion One: I wonder if the current screen couldn't be refactored though. Why do we need two areas? The more fields the more of a headache we're potentially causing users... could we have just one form and intelligently work out if we need to add or create and add the user.

Suggestion Two: If we want to keep the two form structure, then when someone mistakenly enters values in the "Create" section rather than the "Add" section should we (a) guess they want to add a user and just do it (assuming we have a user who matches both username and email), or should we add an error message with a button explaining that we think they meant to add a user, not create one, with these details and offering an "Add this user" button?

Amend one button's text from "Add User" to "Create User"

jane, any problems here still?

s/Creationism/Evolution/

s/Creationism/Evolution/

(In [16930]) s/Creationism/Evolution/ in site-users. See #14756

We should use get_blog_option not raw SQL here in both cases.

Can probably move the setting of $default_role up to the top with $editblog_roles

(In [16935]) Use get_blog_option() isntead of raw SQL in site-users. See #14756

Leaving this open if someone wants to tweak the forms... See ​http://make.wordpress.org/ui/2010/12/14/203/.

In the bug scrub, we discussed changing just the button text for 3.1 and pushing the more thorough rework to 3.2.

(In [17049]) Clarify button text. fixes #14756

Modest string changes for 3.1. Further UI revamp pushed to 3.2. Accounting for being able to create and/or add users and the single site and multisite variations make this too big for 3.1.

Should we not do this text clarification on the wp-admin/users.php page too as that always says Add New which is confusing when a user can only Add Existing.

That's really trivial. "Add Existing" without "User" would look odd there I think. When they go to the page, it is clear that they're adding existing vs new. Close and revisit in 3.2?

Better Button Titles

Take 2, with proper user of context and consistency

That re-uses the strings in both places and makes the it clearer for users who can only promote that they are not entering some secret place they shouldn't go.

Seems I misinterpreted nacins feedback and got my consistency all wrong :-(

Third time lucky?

(In [17069]) Improve the button and header test to give a clearer picture between Adding New Users and Adding Exiting Users to a site. Fixes #14756