Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #11791 by kps: trim passwords to avoid copy-paste mistakes.

4.7.x
Dries Buytaert 2005-05-21 11:57:59 +00:00
parent fafa11aff0
commit 2a744f8950
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/user.module
View File

@ -805,7 +805,7 @@ function user_login($edit = array(), $msg = '') {
else if ($edit['name'] && $edit['pass']) { else if ($edit['name'] && $edit['pass']) {
if (!$user->uid) { if (!$user->uid) {
$user = user_authenticate($edit['name'], $edit['pass']); $user = user_authenticate($edit['name'], trim($edit['pass']));
} }
if ($user->uid) { if ($user->uid) {
@ -1158,6 +1158,8 @@ function user_edit_validate($uid, &$edit) {
// If required, check that proposed passwords match. If so, add the new password to $edit. // If required, check that proposed passwords match. If so, add the new password to $edit.
if ($edit['pass1']) { if ($edit['pass1']) {
$edit['pass1'] = trim($edit['pass1']);
$edit['pass2'] = trim($edit['pass2']);
if ($edit['pass1'] == $edit['pass2']) { if ($edit['pass1'] == $edit['pass2']) {
$edit['pass'] = $edit['pass1']; $edit['pass'] = $edit['pass1'];
} }

4
modules/user/user.module
View File

@ -805,7 +805,7 @@ function user_login($edit = array(), $msg = '') {
else if ($edit['name'] && $edit['pass']) { else if ($edit['name'] && $edit['pass']) {
if (!$user->uid) { if (!$user->uid) {
$user = user_authenticate($edit['name'], $edit['pass']); $user = user_authenticate($edit['name'], trim($edit['pass']));
} }
if ($user->uid) { if ($user->uid) {
@ -1158,6 +1158,8 @@ function user_edit_validate($uid, &$edit) {
// If required, check that proposed passwords match. If so, add the new password to $edit. // If required, check that proposed passwords match. If so, add the new password to $edit.
if ($edit['pass1']) { if ($edit['pass1']) {
$edit['pass1'] = trim($edit['pass1']);
$edit['pass2'] = trim($edit['pass2']);
if ($edit['pass1'] == $edit['pass2']) { if ($edit['pass1'] == $edit['pass2']) {
$edit['pass'] = $edit['pass1']; $edit['pass'] = $edit['pass1'];
} }