diff options
Diffstat (limited to 'modules/user/user.module')
| -rw-r--r-- | modules/user/user.module | 133 |
1 files changed, 68 insertions, 65 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 3c90fbb87..ba935046c 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -2236,7 +2236,7 @@ function user_mail($key, &$message, $params) { * * Used by user_mail() and the settings forms to retrieve strings. */ -function _user_mail_text($key, $language = NULL, $variables = array()) { +function _user_mail_text($key, $language = NULL, $variables = array(), $replace = TRUE) { $langcode = isset($language) ? $language->language : NULL; if ($admin_setting = variable_get('user_mail_' . $key, FALSE)) { @@ -2247,143 +2247,150 @@ function _user_mail_text($key, $language = NULL, $variables = array()) { // No override, return default string. switch ($key) { case 'register_no_approval_required_subject': - $text = t('Account details for [user:name] at [site:name]', array(), array('langcode' => $langcode)); + $text = t('Account details for !user-name-token at !site-name-token', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); break; case 'register_no_approval_required_body': - $text = t("[user:name], + $text = t("!user-name-token, -Thank you for registering at [site:name]. You may now log in to [site:login-url] using the following username and password: +Thank you for registering at !site-name-token. You may now log in by clicking this link or copying and pasting it to your browser: -username: [user:name] -password: [user:password] +!one-time-login-token -You may also log in by clicking on this link or copying and pasting it in your browser: +This link can only be used once to log in and will lead you to a page where you can set your password. -[user:one-time-login-url] +After setting your password, you will be able to log in at !site-login-url-token in the future using: -This is a one-time login, so it can be used only once. +username: !user-name-token +password: Your password -After logging in, you will be redirected to [user:edit-url] so you can change your password. - - --- [site:name] team", array(), array('langcode' => $langcode)); +-- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]', '!one-time-login-token' => '[user:one-time-login-url]', '!site-login-url-token' => '[site:login-url]'), array('langcode' => $langcode)); break; case 'register_admin_created_subject': - $text = t('An administrator created an account for you at [site:name]', array(), array('langcode' => $langcode)); + $text = t('An administrator created an account for you at !site-name-token', array('!site-name-token' => '[site:name]'), array('langcode' => $langcode)); break; case 'register_admin_created_body': - $text = t("[user:name], - -A site administrator at [site:name] has created an account for you. You may now log in to [site:login-url] using the following username and password: + $text = t("!user-name-token, -username: [user:name] -password: [user:password] +A site administrator at !site-name-token has created an account for you. You may now log in by clicking this link or copying and pasting it to your browser: -You may also log in by clicking on this link or copying and pasting it in your browser: +!one-time-login-token -[user:one-time-login-url] +This link can only be used once to log in and will lead you to a page where you can set your password. -This is a one-time login, so it can be used only once. +After setting your password, you will be able to log in at !site-login-url-token in the future using: -After logging in, you will be redirected to [user:edit-url] so you can change your password. +username: !user-name-token +password: Your password - --- [site:name] team", array(), array('langcode' => $langcode)); +-- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]', '!one-time-login-token' => '[user:one-time-login-url]', '!site-login-url-token' => '[site:login-url]'), array('langcode' => $langcode)); break; case 'register_pending_approval_subject': case 'register_pending_approval_admin_subject': - $text = t('Account details for [user:name] at [site:name] (pending admin approval)', array(), array('langcode' => $langcode)); + $text = t('Account details for !user-name-token at !site-name-token (pending admin approval)', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); break; case 'register_pending_approval_body': - $text = t("[user:name], + $text = t("!user-name-token, -Thank you for registering at [site:name]. Your application for an account is currently pending approval. Once it has been approved, you will receive another e-mail containing information about how to log in, set your password, and other details. +Thank you for registering at !site-name-token. Your application for an account is currently pending approval. Once it has been approved, you will receive another e-mail containing information about how to log in, set your password, and other details. --- [site:name] team", array(), array('langcode' => $langcode)); +-- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); break; case 'register_pending_approval_admin_body': - $text = t("[user:name] has applied for an account. + $text = t("!user-name-token has applied for an account. -[user:edit-url]", array(), array('langcode' => $langcode)); +!user-edit-url-token", array('!user-name-token' => '[user:name]', '!user-edit-url-token' => '[user:edit-url]'), array('langcode' => $langcode)); break; case 'password_reset_subject': - $text = t('Replacement login information for [user:name] at [site:name]', array(), array('langcode' => $langcode)); + $text = t('Replacement login information for !user-name-token at !site-name-token', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); break; case 'password_reset_body': - $text = t("[user:name], + $text = t("!user-name-token, -A request to reset the password for your account has been made at [site:name]. +A request to reset the password for your account has been made at !site-name-token. -You may now log in to [site:uri-brief] by clicking on this link or copying and pasting it in your browser: +You may now log in by clicking this link or copying and pasting it to your browser: -[user:one-time-login-url] +!one-time-login-token -This is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it's not used. +This link can only be used once to log in and will lead you to a page where you can set your password. It expires after one day and nothing will happen if it's not used. -After logging in, you will be redirected to [user:edit-url] so you can change your password.", array(), array('langcode' => $langcode)); +-- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]', '!one-time-login-token' => '[user:one-time-login-url]'), array('langcode' => $langcode)); break; case 'status_activated_subject': - $text = t('Account details for [user:name] at [site:name] (approved)', array(), array('langcode' => $langcode)); + $text = t('Account details for !user-name-token at !site-name-token (approved)', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); break; case 'status_activated_body': - $text = t("[user:name], + $text = t("!user-name-token, -Your account at [site:name] has been activated. +Your account at !site-name-token has been activated. -You may now log in by clicking on this link or copying and pasting it in your browser: +You may now log in by clicking this link or copying and pasting it into your browser: -[site:login-url] +!site-login-url-token -This is a one-time login, so it can be used only once. +This link can only be used once to log in and will lead you to a page where you can set your password. -After logging in, you will be redirected to [user:edit-url] so you can change your password. +After setting your password, you will be able to log in at !site-login-url-token in the future using: -Once you have set your own password, you will be able to log in to [site:login-url] in the future using: +username: !user-name-token +password: Your password -username: [user:name]", array(), array('langcode' => $langcode)); +-- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]', '!site-login-url-token' => '[site:login-url]'), array('langcode' => $langcode)); break; case 'status_blocked_subject': - $text = t('Account details for [user:name] at [site:name] (blocked)', array(), array('langcode' => $langcode)); + $text = t('Account details for !user-name-token at !site-name-token (blocked)', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); break; case 'status_blocked_body': - $text = t("[user:name],\n\nYour account on [site:name] has been blocked.", array(), array('langcode' => $langcode)); + $text = t("!user-name-token, + +Your account on !site-name-token has been blocked. + +-- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); break; case 'cancel_confirm_subject': - $text = t('Account cancellation request for [user:name] at [site:name]', array(), array('langcode' => $langcode)); + $text = t('Account cancellation request for !user-name-token at !site-name-token', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); break; case 'cancel_confirm_body': - $text = t("[user:name], + $text = t("!user-name-token, -A request to cancel your account has been made at [site:name]. +A request to cancel your account has been made at !site-name-token. -You may now cancel your account on [site:url-brief] by clicking this link or copying and pasting it into your browser: +You may now cancel your account on !site-url-brief-token by clicking this link or copying and pasting it into your browser: -[user:cancel-url] +!user-cancel-url-token NOTE: The cancellation of your account is not reversible. -This link expires in one day and nothing will happen if it is not used.", array(), array('langcode' => $langcode)); +This link expires in one day and nothing will happen if it is not used. + +-- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]', '!site-url-brief-token' => '[site:url-brief]', '!user-cancel-url-token' => '[user:cancel-url]'), array('langcode' => $langcode)); break; case 'status_canceled_subject': - $text = t('Account details for [user:name] at [site:name] (canceled)', array(), array('langcode' => $langcode)); + $text = t('Account details for !user-name-token at !site-name-token (canceled)', array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); break; case 'status_canceled_body': - $text = t("[user:name], + $text = t("!user-name-token, -Your account on [site:name] has been canceled.", array(), array('langcode' => $langcode)); +Your account on !site-name-token has been canceled. + +-- !site-name-token team", array('!user-name-token' => '[user:name]', '!site-name-token' => '[site:name]'), array('langcode' => $langcode)); break; } } - return token_replace($text, $variables, array('language' => $language, 'callback' => 'user_mail_tokens')); + if ($replace) { + return token_replace($text, $variables, array('language' => $language, 'callback' => 'user_mail_tokens')); + } + + return $text; } /** @@ -2395,10 +2402,6 @@ function user_mail_tokens(&$replacements, $data, $options) { if (isset($data['user'])) { $replacements['[user:one-time-login-url]'] = user_pass_reset_url($data['user']); $replacements['[user:cancel-url]'] = user_cancel_url($data['user']); - - if (isset($data['user']->password) && !empty($data['user']->password)) { - $replacements['[user:password]'] = $data['user']->password; - } } } @@ -3289,10 +3292,10 @@ function user_register_submit($form, &$form_state) { $op = $notify ? 'register_admin_created' : 'register_no_approval_required'; _user_mail_notify($op, $account); if ($notify) { - drupal_set_message(t('Password and further instructions have been e-mailed to the new user <a href="@url">%name</a>.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); + drupal_set_message(t('A welcome message with further instructions has been e-mailed to the new user <a href="@url">%name</a>.', array('@url' => url("user/$account->uid"), '%name' => $account->name))); } else { - drupal_set_message(t('Your password and further instructions have been sent to your e-mail address.')); + drupal_set_message(t('A welcome message with further instructions has been sent to your e-mail address.')); $form_state['redirect'] = ''; } } |