From 428c6b9d425e2ca9eba0fe71a9431fbb939d8d25 Mon Sep 17 00:00:00 2001 From: Steve Cowie Date: Fri, 28 Dec 2012 11:32:15 +0000 Subject: [PATCH 1/2] alter password length handling to be more compatible with core --- logintoboggan.admin.inc | 4 ++-- logintoboggan.module | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/logintoboggan.admin.inc b/logintoboggan.admin.inc index 0674a4c..9d6dafd 100644 --- a/logintoboggan.admin.inc +++ b/logintoboggan.admin.inc @@ -158,14 +158,14 @@ function logintoboggan_main_settings() { '#description' => t('If enabled, users will receive a \'Log in successful\' message upon login.') ); $min_pass_options = array(t('None')); - for ($i = 2; $i < 30; $i++) { + for ($i = 6; $i < 30; $i++) { $min_pass_options[$i] = $i; } $form['other']['logintoboggan_minimum_password_length'] = array( '#type' => 'select', '#title' => t('Minimum password length'), '#options' => $min_pass_options, - '#default_value' => variable_get('logintoboggan_minimum_password_length', 0), + '#default_value' => variable_get('logintoboggan_minimum_password_length', 6), '#description' => t('LoginToboggan automatically performs basic password validation for illegal characters. If you would additionally like to have a minimum password length requirement, select the length here, or set to \'None\' for no password length validation.') ); diff --git a/logintoboggan.module b/logintoboggan.module index f9441fa..cd2df21 100755 --- a/logintoboggan.module +++ b/logintoboggan.module @@ -260,10 +260,10 @@ function logintoboggan_form_user_register_form_alter(&$form, &$form_state) { $form['account']['name']['#weight'] = -30; $form['account']['mail']['#weight'] = -29; } - $min_pass = variable_get('logintoboggan_minimum_password_length', 0); + $min_pass = variable_get('logintoboggan_minimum_password_length', 6); if ($pass && $min_pass > 0) { $form['account']['pass']['#description'] = isset($form['account']['pass']['#description']) ? $form['account']['pass']['#description'] . " " : ""; - $form['account']['pass']['#description'] .= t('Password must be at least %length characters.', array('%length' => $min_pass)); + $form['account']['pass']['#description'] .= t('Extra security hardening means password must be at least %length characters.', array('%length' => $min_pass)); } } } @@ -966,7 +966,7 @@ function logintoboggan_validate_pass($pass) { $pass)) { return t('The password contains an illegal character.'); } - $min_pass_length = variable_get('logintoboggan_minimum_password_length', 0); + $min_pass_length = variable_get('logintoboggan_minimum_password_length', 6); if ($min_pass_length && strlen($pass) < $min_pass_length) return t("The password is too short: it must be at least %min_length characters.", array('%min_length' => $min_pass_length)); } -- 1.7.9.5 From bb2d85d0711369864b8f788fba2742bb0b0060d7 Mon Sep 17 00:00:00 2001 From: Steve Cowie Date: Fri, 28 Dec 2012 12:36:35 +0000 Subject: [PATCH 2/2] Add an update hook function to increase minimum password length variable to 6 --- logintoboggan.install | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/logintoboggan.install b/logintoboggan.install index 88d3c3b..2032924 100644 --- a/logintoboggan.install +++ b/logintoboggan.install @@ -38,6 +38,15 @@ function logintoboggan_update_7000(&$sandbox) { } /** + * Increase the minimum password length to 6. + */ + function logintoboggan_update_7001() { + $pass_length = variable_get('logintoboggan_minimum_password_length', '6'); + $pass_length = $pass_length < 6 ? '6': $pass_length; + variable_set('logintoboggan_minimum_password_length', $pass_length); + } + +/** * Implement hook_uninstall(). */ function logintoboggan_uninstall() { -- 1.7.9.5