diff --git a/INSTALL.txt b/INSTALL.txt index e6bcb56..38382e0 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -24,7 +24,7 @@ Configure each block at Administration » Structure » Blocks as follows... Change title if required; using can make for a very neat login system, when combined with the javascript functionality: clicking upon "Login/register" reveals the login form in sliding fashion. To select this functionality, select -'Collapsible form' under "Block type". Selecting 'Link' under "Block type" +'Collapsible form' under "Block type". Selecting 'Link' under "Block type" sends user to a login form, returning them to original page after successful login. @@ -46,7 +46,7 @@ CAVEATS: a. Be very careful when editing the 'Non-authenticated role' setting. If you set it to anything other than the 'authenticated user' role, LoginToboggan will happily start deleting any users you have in that - role that were created prior to the purge interval. If you want to + role that were created prior to the purge interval. If you want to avoid problems, it's best to never change that setting after you've initially set it up. diff --git a/README.txt b/README.txt index 31e5906..d51be7f 100755 --- a/README.txt +++ b/README.txt @@ -33,7 +33,7 @@ module by offering the following features: Users who choose their own password can be automatically assigned to a selected 'non-authenticated' role. This role could have more permissions than anonymous -but less than authenticated - thus preventing spoof accounts and spammers. The +but less than authenticated - thus preventing spoof accounts and spammers. The user will only be removed from the non-authenticated role and granted authenticated permissions when they verify their account via a special email link, or when an administrator removes them from the non-authenticated role. diff --git a/UPGRADING.txt b/UPGRADING.txt index 362c596..435ce7e 100644 --- a/UPGRADING.txt +++ b/UPGRADING.txt @@ -5,9 +5,9 @@ 6.x to 7.x: -1. Core changed the way it identifies blocks internally. The update functions +1. Core changed the way it identifies blocks internally. The update functions should handle the transition. -2. A new option for a unified login/register page has been added. See the +2. A new option for a unified login/register page has been added. See the 'Present a unified login/registration page' setting in the 'Log in' section of LoginToboggan settings. diff --git a/logintoboggan.admin.inc b/logintoboggan.admin.inc index 87b9e5a..695bb0c 100644 --- a/logintoboggan.admin.inc +++ b/logintoboggan.admin.inc @@ -53,10 +53,10 @@ function logintoboggan_main_settings() { '#type' => 'checkbox', '#title' => t('Set password'), '#default_value' => !variable_get('user_email_verification', TRUE) ? 1 : 0, - '#description' => t("This will allow users to choose their initial password when registering (note that this setting is a mirror of the Require e-mail verification when a visitor creates an account setting, and is merely here for convenience). If selected, users will be assigned to the role below. They will not be assigned to the 'authenticated user' role until they confirm their e-mail address by following the link in their registration e-mail. It is HIGHLY recommended that you set up a 'pre-authorized' role with limited permissions for this purpose.
NOTE: If you enable this feature, you should edit the Welcome (no approval required) text.", array('!settings' => url('admin/config/people/accounts'))) . $help_text, + '#description' => t("This will allow users to choose their initial password when registering (note that this setting is a mirror of the Require e-mail verification when a visitor creates an account setting, and is merely here for convenience). If selected, users will be assigned to the role below. They will not be assigned to the 'authenticated user' role until they confirm their e-mail address by following the link in their registration e-mail. It is HIGHLY recommended that you set up a 'pre-authorized' role with limited permissions for this purpose.
NOTE: If you enable this feature, you should edit the Welcome (no approval required) text.", array('!settings' => url('admin/config/people/accounts'))) . $help_text, ); - // Grab the roles that can be used for pre-auth. Remove the anon role, as it's not a valid choice. + // Grab the roles that can be used for pre-auth. Remove the anon role, as it's not a valid choice. $roles = user_roles(TRUE); $form ['registration']['logintoboggan_pre_auth_role'] = array( diff --git a/logintoboggan.module b/logintoboggan.module index 6ccb24f..7ec765f 100755 --- a/logintoboggan.module +++ b/logintoboggan.module @@ -195,7 +195,7 @@ function logintoboggan_form_user_profile_form_alter(&$form, &$form_state) { unset($form['account']['roles'][DRUPAL_AUTHENTICATED_RID]); // This form element is necessary as a placeholder for the user's - // pre-auth setting on form load. It's used to compare against the + // pre-auth setting on form load. It's used to compare against the // submitted form values to see if the pre-auth role has been unchecked. $form['logintoboggan_pre_auth_check'] = array( '#type' => 'hidden', @@ -291,7 +291,7 @@ function logintoboggan_form_user_admin_account_alter(&$form, &$form_state) { */ function logintoboggan_form_user_pass_reset_alter(&$form, &$form_state) { // Password resets count as validating an email address, so remove the user - // from the pre-auth role if they are still in it. We only want to run this + // from the pre-auth role if they are still in it. We only want to run this // code when the user first hits the reset login form. if (arg(5) != 'login' && ($uid = (int) arg(2))) { if ($account = user_load($uid)) { @@ -360,7 +360,7 @@ function logintoboggan_form_alter(&$form, &$form_state, $form_id) { // What would really be nice here is to start with a clean form, but // we can't really do that, because drupal_prepare_form() has already // been run, and we can't run it again in the _alter() hook, or we'll - // get into and endless loop. Since we don't know exactly what's in + // get into and endless loop. Since we don't know exactly what's in // the form, strip out all regular form elements and the handlers. foreach (element_children($form) as $element) { unset($form[$element]); @@ -406,7 +406,7 @@ function logintoboggan_js_alter(&$javascript) { if (isset($javascript['modules/user/user.permissions.js'])) { $id = logintoboggan_validating_id(); // If the pre-auth user isn't the auth user, then swap out core's user - // permissions js with LT's custom implementation. This is necessary to + // permissions js with LT's custom implementation. This is necessary to // prevent the pre-auth role's checkboxes from being automatically disabled // when the auth user's checkboxes are checked. if ($id != DRUPAL_AUTHENTICATED_RID) { @@ -421,7 +421,7 @@ function logintoboggan_js_alter(&$javascript) { function logintoboggan_page_alter(&$page) { // Remove blocks on access denied pages. if (isset($page['#logintoboggan_denied'])) { - drupal_set_message(t('Access denied. You may need to login below or register to access this page.'), 'error'); + drupal_set_message(t('Access denied. You may need to login below or register to access this page.'), 'error'); unset($page['sidebar_first'], $page['sidebar_second']); } } @@ -495,7 +495,7 @@ function logintoboggan_user_register_submit($form, &$form_state) { // Add plain text password into user account to generate mail tokens. $account->password = $pass; - // Compose the appropriate user message. Validation emails are only sent if: + // Compose the appropriate user message. Validation emails are only sent if: // 1. Users can set their own password. // 2. The pre-auth role isn't the auth user. // 3. Visitors can create their own accounts. @@ -1048,7 +1048,7 @@ function logintoboggan_user_update(&$edit, $account, $category) { $pre_auth = !variable_get('user_email_verification', TRUE) && $validating_id != DRUPAL_AUTHENTICATED_RID; if ($pre_auth) { // Check to see if an admin has manually removed the pre-auth role from - // the user. If so, send the account activation email. + // the user. If so, send the account activation email. if (!isset($edit['roles'][$validating_id]) || !$edit['roles'][$validating_id]) { // Mail the user, letting them know their account now has auth user perms. _user_mail_notify('status_activated', $account); @@ -1103,7 +1103,7 @@ function logintoboggan_mail_alter(&$message) { $url_options = array('absolute' => TRUE); $language = $message['language']; $langcode = isset($language) ? $language->language : NULL; - $message['body'][] = t("\n\nThe user has automatically received the permissions of the LoginToboggan validating role. To give the user full site permissions, click the link below:\n\n!validation_url/admin\n\nAlternatively, you may visit their user account listed above and remove them from the validating role.", array('!validation_url' => logintoboggan_eml_validate_url($account, $url_options)), array('langcode' => $langcode)); + $message['body'][] = t("\n\nThe user has automatically received the permissions of the LoginToboggan validating role. To give the user full site permissions, click the link below:\n\n!validation_url/admin\n\nAlternatively, you may visit their user account listed above and remove them from the validating role.", array('!validation_url' => logintoboggan_eml_validate_url($account, $url_options)), array('langcode' => $langcode)); } } } diff --git a/logintoboggan.permissions.js b/logintoboggan.permissions.js index 1dd97f7..88b8a60 100644 --- a/logintoboggan.permissions.js +++ b/logintoboggan.permissions.js @@ -2,7 +2,7 @@ /** * This is a custom implementation of user.permissions.js, which is necessary * because LoginToboggan needs its pre-auth role to not be explicitly tied to - * the auth role. The change is minor -- simply exclude the pre-auth role from + * the auth role. The change is minor -- simply exclude the pre-auth role from * all the auto-checking as the anon and auth user roles are. */