diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-04-28 00:46:31 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-04-28 00:46:31 +0000 |
| commit | 7fcfd0c17d0f53ce4f196c881f9ace9d184d7777 (patch) | |
| tree | dd6abaae5eb51cf32580bbfeb0b1561b1abb8ae8 /phpBB | |
| parent | f5e0f060cd50cf3099d6e5cc12d8b390ed3b57ce (diff) | |
| download | forums-7fcfd0c17d0f53ce4f196c881f9ace9d184d7777.tar forums-7fcfd0c17d0f53ce4f196c881f9ace9d184d7777.tar.gz forums-7fcfd0c17d0f53ce4f196c881f9ace9d184d7777.tar.bz2 forums-7fcfd0c17d0f53ce4f196c881f9ace9d184d7777.tar.xz forums-7fcfd0c17d0f53ce4f196c881f9ace9d184d7777.zip | |
#10185
git-svn-id: file:///svn/phpbb/trunk@7413 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_users_overview.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 8 |
3 files changed, 11 insertions, 9 deletions
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index 5a51e3fc51..0bcd3d329e 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -49,7 +49,7 @@ <dd><input class="medium" type="text" id="email_confirm" name="email_confirm" value="" /></dd> </dl> <dl> - <dt><label for="user_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt> + <dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt> <dd><input type="password" id="user_password" name="user_password" value="" /></dd> </dl> <dl> diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index f7603f637e..fd76f0ee35 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -585,13 +585,13 @@ class acp_users 'user_founder' => request_var('user_founder', ($user_row['user_type'] == USER_FOUNDER) ? 1 : 0), 'email' => strtolower(request_var('user_email', $user_row['user_email'])), 'email_confirm' => strtolower(request_var('email_confirm', '')), - 'user_password' => request_var('user_password', '', true), + 'new_password' => request_var('user_password', '', true), 'password_confirm' => request_var('password_confirm', '', true), ); // Validation data - we do not check the password complexity setting here $check_ary = array( - 'user_password' => array( + 'new_password' => array( array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), array('password')), 'password_confirm' => array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), @@ -622,7 +622,7 @@ class acp_users $error = validate_data($data, $check_ary); - if ($data['user_password'] && $data['password_confirm'] != $data['user_password']) + if ($data['new_password'] && $data['password_confirm'] != $data['new_password']) { $error[] = 'NEW_PASSWORD_ERROR'; } @@ -634,7 +634,7 @@ class acp_users // Which updates do we need to do? $update_username = ($user_row['username'] != $data['username']) ? $data['username'] : false; - $update_password = ($data['user_password'] && $user_row['user_password'] != md5($data['user_password'])) ? true : false; + $update_password = ($data['new_password'] && $user_row['user_password'] != md5($data['new_password'])) ? true : false; $update_email = ($data['email'] != $user_row['user_email']) ? $data['email'] : false; if (!sizeof($error)) @@ -706,7 +706,7 @@ class acp_users if ($update_password) { $sql_ary += array( - 'user_password' => md5($data['user_password']), + 'user_password' => md5($data['new_password']), 'user_passchg' => time(), ); diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index bbd2d070cb..81f0433f1a 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1348,6 +1348,7 @@ function validate_password($password) { $upp = '\p{Lu}'; $low = '\p{Ll}'; + $let = '\p{L}'; $num = '\p{N}'; $sym = '[^\p{Lu}\p{Ll}\p{N}]'; $pcre = true; @@ -1357,6 +1358,7 @@ function validate_password($password) mb_regex_encoding('UTF-8'); $upp = '[[:upper:]]'; $low = '[[:lower:]]'; + $let = '[[:lower:][:upper:]]'; $num = '[[:digit:]]'; $sym = '[^[:upper:][:lower:][:digit:]]'; $mbstring = true; @@ -1365,6 +1367,7 @@ function validate_password($password) { $upp = '[A-Z]'; $low = '[a-z]'; + $let = '[a-zA-Z]'; $num = '[0-9]'; $sym = '[^A-Za-z0-9]'; $pcre = true; @@ -1380,8 +1383,7 @@ function validate_password($password) break; case 'PASS_TYPE_ALPHA': - $chars[] = $low; - $chars[] = $upp; + $chars[] = $let; $chars[] = $num; break; @@ -1398,7 +1400,7 @@ function validate_password($password) foreach ($chars as $char) { if (!preg_match('#' . $char . '#u', $password)) - { + {var_dump($char, $password); return 'INVALID_CHARS'; } } |