Because this module completely reorients the Drupal login process you will probably want to edit the welcome e-mail on the user settings page. For instance if you have enabled the 'Set password' option, you probably should not send the user's password out in the welcome e-mail (also note when the 'Set password' option is enabled, the !login_url becomes a verification url that the user MUST visit in order to enable authenticated status). The following is an example welcome e-mail:
@@ -149,12 +150,21 @@ function logintoboggan_form_alter(&$form $account = user_load(array('uid' => arg(1))); $id = logintoboggan_validating_id(); $in_pre_auth_role = in_array($id, array_keys($account->roles)); - // Messages aren't necessary if pre-auth role is authenticated user. - if ($in_pre_auth_role && user_access('administer users') && $id != DRUPAL_AUTHENTICATED_RID) { - if ((variable_get('user_register', 1) == 2)) { - $form['account']['status']['#description'] = t('If this user was created using the "Immediate Login" feature of LoginToboggan, and they are also awaiting adminstrator approval on their account, you must remove them from the site\'s pre-authorized role in the "Roles" section below, or they will not receive authenticated user permissions!'); + // Messages are only necessary for user admins, and aren't necessary if + // pre-auth role is authenticated user. + if (user_access('administer users') && isset($form['account']['roles']) && $id != DRUPAL_AUTHENTICATED_RID) { + // User is still in the pre-auth role, so let the admin know. + if ($in_pre_auth_role) { + if ((variable_get('user_register', 1) == 2)) { + $form['account']['status']['#description'] = t('If this user was created using the "Immediate Login" feature of LoginToboggan, and they are also awaiting adminstrator approval on their account, you must remove them from the site\'s pre-authorized role in the "Roles" section below, or they will not receive authenticated user permissions!'); + } + $form['account']['roles']['#description'] = t("The user is assigned LoginToboggan's pre-authorized role, and is not currently receiving authenticated user permissions."); + } + // User is no longer in the pre-auth role, so remove the option to add + // them back. + else { + unset($form['account']['roles']['#options'][$id]); } - $form['account']['roles']['#description'] = t("The user is assigned LoginToboggan's pre-authorized role, and is not currently receiving authenticated user permissions."); } break; @@ -250,6 +260,15 @@ function logintoboggan_form_alter(&$form } } break; + + // Unset the ability to add the pre-auth role in the user admin interface. + case 'user_admin_account': + $id = logintoboggan_validating_id(); + $add = t('Add a role to the selected users'); + if ($id != DRUPAL_AUTHENTICATED_RID && isset($form['options']['operation']['#options'][$add]["add_role-$id"])) { + unset($form['options']['operation']['#options'][$add]["add_role-$id"]); + } + break; } } @@ -649,7 +668,7 @@ function logintoboggan_main_settings(&$f '#title' => t('Non-authenticated role'), '#options' => $roles, '#default_value' => variable_get('logintoboggan_pre_auth_role', DRUPAL_AUTHENTICATED_RID), - '#description' => t('If "Set password" is selected, users will be able to login before their e-mail address has been authenticated. Therefore, you must choose a role for new non-authenticated users. Users will be removed from this role and assigned to the "authenticated user" role once they follow the link in their welcome e-mail. Add new roles.', array('!url' => url('admin/user/roles'))), + '#description' => t('If "Set password" is selected, users will be able to login before their e-mail address has been authenticated. Therefore, you must choose a role for new non-authenticated users. Users will be removed from this role and assigned to the "authenticated user" role once they follow the link in their welcome e-mail. Add new roles. WARNING: changing this setting after initial site setup can cause undesirable results, including unintended deletion of users -- change with extreme caution!', array('!url' => url('admin/user/roles'))), ); $purge_options = array( @@ -673,7 +692,7 @@ function logintoboggan_main_settings(&$f '#title' => t('Delete unvalidated users after'), '#options' => $purge_options, '#default_value' => variable_get('logintoboggan_purge_unvalidated_user_interval', 0), - '#description' => t("If enabled, users that are still in the 'Non-authenticated role' set above will be deleted automatically from the system, if the set time interval since their last login has passed. This can be used to automatically purge spambot registrations. Note: this requires cron, and also requires that the 'Set password' option above is enabled.") + '#description' => t("If enabled, users that are still in the 'Non-authenticated role' set above will be deleted automatically from the system, if the set time interval since their initial account creation has passed. This can be used to automatically purge spambot registrations. Note: this requires cron, and also requires that the 'Set password' option above is enabled. WARNING: changing this setting after initial site setup can cause undesirable results, including unintended deletion of users -- change with extreme caution! (please read the CAVEATS section of INSTALL.txt for important information on configuring this feature)") ); $form['registration']['logintoboggan_immediate_login_on_register'] = array(