summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Cowie2016-07-20 08:35:28 (GMT)
committerSteve Cowie2016-07-20 08:35:28 (GMT)
commit25ff64afb26968ac9370e9298ab129ce4407db6d (patch)
treeda8792029dd341ce94bd19aac783b1eb3cc9e070
parent9602c189f59eaed34a7843f64e3ad45a5bd5492d (diff)
parentf64e4879b93256604ee6a1c009937e5a259eddcc (diff)
Merge branch '7.x-1.x' of git.drupal.org:project/logintoboggan into 7.x-1.xHEAD7.x-1.x
-rw-r--r--INSTALL.txt4
-rw-r--r--README.txt2
-rw-r--r--contrib/logintoboggan_rules/README.txt2
-rw-r--r--contrib/logintoboggan_rules/logintoboggan_rules.module7
-rw-r--r--contrib/logintoboggan_variable/logintoboggan_variable.module4
-rw-r--r--logintoboggan.admin.inc2
-rw-r--r--logintoboggan.install2
-rw-r--r--logintoboggan.module26
-rw-r--r--logintoboggan.unifiedlogin.js4
-rw-r--r--logintoboggan.validation.inc2
10 files changed, 23 insertions, 32 deletions
diff --git a/INSTALL.txt b/INSTALL.txt
index 38382e0..1927445 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -22,7 +22,7 @@ Configure each block at Administration » Structure » Blocks as follows...
1. Configure the 'User login' block for LoginToboggan functionality:
Change title if required; using <none> can make for a very neat login system,
-when combined with the javascript functionality: clicking upon "Login/register"
+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"
sends user to a login form, returning them to original page after successful
@@ -54,7 +54,7 @@ CAVEATS:
re-added to the Non-authenticated role after a user has been validated.
Note that these protections are only present in core's interface -- if
you have another module enabled which does any role manipulation
- (either via the user interface or programatically), you must find your
+ (either via the user interface or programmatically), you must find your
own way to ensure that it doesn't add any users back into the
Non-authenticated role.
diff --git a/README.txt b/README.txt
index d51be7f..7d79c21 100644
--- a/README.txt
+++ b/README.txt
@@ -29,7 +29,7 @@ module by offering the following features:
11. Optionally have unvalidated users purged from the system at a pre-defined
interval
(please read the CAVEATS section of INSTALL.txt for important information
- on configuringthis feature!).
+ on configuring this feature!).
Users who choose their own password can be automatically assigned to a selected
'non-authenticated' role. This role could have more permissions than anonymous
diff --git a/contrib/logintoboggan_rules/README.txt b/contrib/logintoboggan_rules/README.txt
index 5a3656d..369faaa 100644
--- a/contrib/logintoboggan_rules/README.txt
+++ b/contrib/logintoboggan_rules/README.txt
@@ -8,7 +8,7 @@ Installation
============
1. Enable the module in the module listing page.
2. In LoginToboggan settings check "Set password" option.
-3. Thats it!!
+3. That's it!!
For best results, you may want to uncheck the "Immediate login" option on
LoginToboggan settings. This is just for cosmetic reasons, as in most use
diff --git a/contrib/logintoboggan_rules/logintoboggan_rules.module b/contrib/logintoboggan_rules/logintoboggan_rules.module
index ad6b080..ea26abd 100644
--- a/contrib/logintoboggan_rules/logintoboggan_rules.module
+++ b/contrib/logintoboggan_rules/logintoboggan_rules.module
@@ -1,6 +1,5 @@
<?php
-
/**
* @file
* Logintoboggan Rules module
@@ -8,15 +7,11 @@
* This module provides integration of LoginToboggan module with Rules module
*/
-
-
/**
- * Implement hook_user()
- *
+ * Implements hook_user_update().
*/
function logintoboggan_rules_user_update(&$edit, $account) {
if (!empty($account->logintoboggan_email_validated)) {
rules_invoke_event('logintoboggan_validated', $account);
}
}
-
diff --git a/contrib/logintoboggan_variable/logintoboggan_variable.module b/contrib/logintoboggan_variable/logintoboggan_variable.module
index 11126b0..1f073ce 100644
--- a/contrib/logintoboggan_variable/logintoboggan_variable.module
+++ b/contrib/logintoboggan_variable/logintoboggan_variable.module
@@ -30,7 +30,7 @@ function logintoboggan_variable_variable_info($options) {
'localize' => FALSE,
),
'logintoboggan_login_with_email' => array(
- 'title' => t('Allow users to login using their e-mail address', array(), $options),
+ 'title' => t('Allow users to log in using their e-mail address', array(), $options),
'description' => t('Users will be able to enter EITHER their username OR their e-mail address to log in.', array(), $options),
'default' => 0,
'type' => 'boolean',
@@ -71,7 +71,7 @@ function logintoboggan_variable_variable_info($options) {
),
'logintoboggan_redirect_on_confirm' => array(
'title' => t('Redirect path on confirmation', array(), $options),
- 'description' => t('The path the user will be redirected to after confiming their account.', array(), $options),
+ 'description' => t('The path the user will be redirected to after confirming their account.', array(), $options),
'default' => '',
'type' => 'url',
'group' => 'user_settings',
diff --git a/logintoboggan.admin.inc b/logintoboggan.admin.inc
index 0674a4c..7447d1e 100644
--- a/logintoboggan.admin.inc
+++ b/logintoboggan.admin.inc
@@ -17,7 +17,7 @@ function logintoboggan_main_settings() {
$form['login']['logintoboggan_login_with_email'] = array(
'#type' => 'radios',
- '#title' => t('Allow users to login using their e-mail address'),
+ '#title' => t('Allow users to log in using their e-mail address'),
'#default_value' => variable_get('logintoboggan_login_with_email', 0),
'#options' => array($_disabled, $_enabled),
'#description' => t('Users will be able to enter EITHER their username OR their e-mail address to log in.'),
diff --git a/logintoboggan.install b/logintoboggan.install
index 88d3c3b..b42123f 100644
--- a/logintoboggan.install
+++ b/logintoboggan.install
@@ -24,7 +24,7 @@ function logintoboggan_disable() {
}
/**
- * Remove hardcoded numeric deltas from blocks.
+ * Remove hard-coded numeric deltas from blocks.
*/
function logintoboggan_update_7000(&$sandbox) {
// Get an array of the renamed block deltas, organized by module.
diff --git a/logintoboggan.module b/logintoboggan.module
index 219a1aa..446354b 100644
--- a/logintoboggan.module
+++ b/logintoboggan.module
@@ -65,8 +65,8 @@ function logintoboggan_help($path, $arg) {
case 'admin/help#logintoboggan':
$output = t("<p>The Login Toboggan module improves the Drupal login system by offering the following features:
<ol>
- <li>Allow users to login using either their username OR their e-mail address.</li>
- <li>Allow users to login immediately.</li>
+ <li>Allow users to log in using either their username OR their e-mail address.</li>
+ <li>Allow users to log in immediately.</li>
<li>Provide a login form on Access Denied pages for non-logged-in (anonymous) users.</li>
<li>The module provides two login block options: One uses JavaScript to display the form within the block immediately upon clicking 'log in'. The other brings the user to a separate page, but returns the user to their original page upon login.</li>
<li>Customize the registration form with two e-mail fields to ensure accuracy.</li>
@@ -139,7 +139,7 @@ function logintoboggan_form_block_admin_configure_alter(&$form, &$form_state) {
'#title' => t('Block type'),
'#default_value' => variable_get('logintoboggan_login_block_type', 0),
'#options' => array(t('Standard'), t('Link'), t('Collapsible form')),
- '#description' => t("'Standard' is a standard login block, 'Link' is a login link that returns the user to the original page after logging in, 'Collapsible form' is a javascript collaspible login form."),
+ '#description' => t("'Standard' is a standard login block, 'Link' is a login link that returns the user to the original page after logging in, 'Collapsible form' is a JavaScript collapsible login form."),
);
$form['settings']['logintoboggan_login_block_message'] = array(
@@ -202,7 +202,7 @@ function logintoboggan_form_user_profile_form_alter(&$form, &$form_state) {
'#value' => '1',
);
if (variable_get('user_register', USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL) == USER_REGISTER_VISITORS_ADMINISTRATIVE_APPROVAL) {
- $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']['status']['#description'] = t('If this user was created using the "Immediate Login" feature of LoginToboggan, and they are also awaiting administrator 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.");
}
@@ -390,7 +390,7 @@ function logintoboggan_form_alter(&$form, &$form_state, $form_id) {
// Disable the checkbox at the Account settings page which controls
// whether e-mail verification is required upon registration or not.
// The LoginToboggan module implements e-mail verification functionality
- // differently than core, and will control wether e-mail verification is
+ // differently than core, and will control whether e-mail verification is
// required or not.
$form['registration_cancellation']['user_email_verification']['#disabled'] = true;
$form['registration_cancellation']['user_email_verification']['#description'] = t('This setting has been locked by the LoginToboggan module. You can change this setting by modifying the <strong>Set password</strong> checkbox at <a href="!link">LoginToboggan settings page</a>.', array('!link' => url('admin/config/system/logintoboggan')));
@@ -749,7 +749,7 @@ function logintoboggan_revalidate_access($account) {
* Which form to display, should be 'login' or 'register'.
*/
function logintoboggan_unified_login_page($active_form = 'login') {
- // Sanitise the $active_form text as it comes direct from the url.
+ // Sanitize the $active_form text as it comes direct from the url.
// It should only ever be 'login' or 'register', so default to 'login'.
if ($active_form != 'login' && $active_form != 'register') {
$active_form = 'login';
@@ -767,7 +767,7 @@ function logintoboggan_unified_login_page($active_form = 'login') {
}
/**
- * Implemenation of hook_theme().
+ * Implementation of hook_theme().
*
* @ingroup logintoboggan_core
*/
@@ -1130,22 +1130,18 @@ function _logintoboggan_protocol() {
*/
function _logintoboggan_process_redirect($redirect, $account) {
$variables = array('%uid' => $account->uid);
- $redirect = parse_url(urldecode(strtr($redirect, $variables)));
+ $redirect = drupal_parse_url(urldecode(strtr($redirect, $variables)));
// If there's a path set, override the destination parameter if necessary.
if ($redirect['path'] && variable_get('logintoboggan_override_destination_parameter', 1)) {
unset($_GET['destination']);
}
- // Explicitly create query and fragment elements if not present already.
- $query = isset($redirect['query']) ? $redirect['query'] : array();
- $fragment = isset($redirect['fragment']) ? $redirect['fragment'] : '';
-
return array(
$redirect['path'],
array(
- 'query' => $query,
- 'fragment' => $fragment,
+ 'query' => $redirect['query'],
+ 'fragment' => $redirect['fragment'],
),
);
}
@@ -1222,7 +1218,7 @@ function theme_lt_username_description($variables) {
switch ($variables['form_id']) {
case 'user_login':
// The username field's description when shown on the /user/login page.
- return t('You may login with either your assigned username or your e-mail address.');
+ return t('You may log in with either your assigned username or your e-mail address.');
break;
case 'user_login_block':
return '';
diff --git a/logintoboggan.unifiedlogin.js b/logintoboggan.unifiedlogin.js
index d8980f9..774cdd3 100644
--- a/logintoboggan.unifiedlogin.js
+++ b/logintoboggan.unifiedlogin.js
@@ -16,7 +16,7 @@ Drupal.behaviors.unifiedLogin = {
var title = data.match("<title>(.*?)</title>")[1];
$('html head').find('title').text(title);
$('h1.title').text(title.substring(0,title.indexOf('|')));
- },
+ }
});
return false;
});
@@ -31,7 +31,7 @@ Drupal.behaviors.unifiedLogin = {
var title = data.match("<title>(.*?)</title>")[1];
$('html head').find('title').text(title);
$('h1.title').text(title.substring(0,title.indexOf('|')));
- },
+ }
});
return false;
});
diff --git a/logintoboggan.validation.inc b/logintoboggan.validation.inc
index 9d576ee..cccbc41 100644
--- a/logintoboggan.validation.inc
+++ b/logintoboggan.validation.inc
@@ -39,7 +39,7 @@ function logintoboggan_validate_email($account, $timestamp, $hashed_pass, $actio
drupal_set_message(t('You have successfully validated your e-mail address.'));
}
if (!$account->status) {
- drupal_set_message(t('Your account is currently blocked -- login cancelled.'), 'error');
+ drupal_set_message(t('Your account is currently blocked -- login canceled.'), 'error');
drupal_goto('');
}
else {