One-time login link error message is incorrect and misleading

Looks good, I expect it will take some time before this gets a second review - with code freeze and all

Refactored a bit, fixed some coding convention and added some little documentation, the functionality is the same. Even though the use case is a bit strange, I think its need is valid.

Another thing we could do is use:

  if ($user->uid) {
    $message = $user->uid == $uid ? "You are logged in as %user. <a href='!link'>Change your password.</a>" : "Someone else is already logged into the site on this computer. Please <a href='!link'>logout</a> and try using the link again.";
    drupal_set_message($message, array('%user' => $user->name, '!link' => url("user/{$user->uid}/edit"))); 
    drupal_goto();
  }

...But that doesn't really look pretty.

big improvement. i think thats pretty (informative).

+++ modules/user/user.pages.inc	17 Aug 2009 22:47:05 -0000
@@ -78,9 +78,17 @@
+      drupal_set_message(t("You are logged in as %user. <a href='!link'>Change your password.</a>", array('%user' => $user->name, '!link' => url("user/{$user->uid}/edit"))));
...
+      drupal_set_message(t("Someone else is already logged into the site on this computer. Please <a href='!link'>logout</a> and try using the link again.", array('!link' => url('logout'))));

These t() strings are a bit inconsistent with others in core:

a) We should switch the quotes so that the string is encased in single quotes and the link href in double quotes.

b) Elsewhere, url() strings are passed in with descriptive @ placeholders that describe where they're going to go, rather than ! placeholders called a generic "link". For example, @block-admin, @cron, etc.

c) The braces in user/{$user->uid}/edit is rather ugly. Does it work without? If not, let's use concatenation here instead as it helps with the readability.

Finally, that second string doesn't quite feel right. I like that it's plain-English, but it doesn't actually tell me enough to figure out what's going on. Does my browser have an active session as another user? Or is my cookie invalid? Or..?

Maybe something instead like "You are currently logged in as $this_user->name but have used a password reset link for $other_user->name. Please log out and try again."

I'm on crack. Are you, too?

The patch is working great. I mark this RTBC looking at the previous feedbacks and because I tested this extensively.

On a side note, and out of the scope of this patch, I've discovered another bug that we should investiagte, when you try to reach a reset link that does not exist and you are not logged in, you get an access denied page (which is good) but it's repeated two times (this must be related to the way drupal_access_denied() is used). This will surely be reported in another issue but I need to further test it (with other call to drupal_access_denied()).

Committed to HEAD. Thanks!

D6 backport.