mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 00:37:42 +02:00
- fix severe bug with email hash calculation
- fix bug in convertor not correctly converting config values git-svn-id: file:///svn/phpbb/trunk@6927 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -733,7 +733,7 @@ class acp_users
|
||||
{
|
||||
$sql_ary += array(
|
||||
'user_email' => $update_email,
|
||||
'user_email_hash' => crc32(strtolower($update_email)) . strlen($update_email)
|
||||
'user_email_hash' => crc32($update_email) . strlen($update_email)
|
||||
);
|
||||
|
||||
add_log('user', $user_id, 'LOG_USER_UPDATE_EMAIL', $user_row['username'], $user_row['user_email'], $update_email);
|
||||
|
@@ -1181,6 +1181,12 @@ function restore_config($schema)
|
||||
|
||||
if ($config_value !== '')
|
||||
{
|
||||
// Most are...
|
||||
if (is_string($config_value))
|
||||
{
|
||||
$config_value = utf8_htmlspecialchars($config_value);
|
||||
}
|
||||
|
||||
set_config($config_name, $config_value);
|
||||
}
|
||||
}
|
||||
|
@@ -145,7 +145,7 @@ function user_add($user_row, $cp_data = false)
|
||||
'user_password' => (isset($user_row['user_password'])) ? $user_row['user_password'] : '',
|
||||
'user_pass_convert' => 0,
|
||||
'user_email' => strtolower($user_row['user_email']),
|
||||
'user_email_hash' => (int) crc32(strtolower($user_row['user_email'])) . strlen($user_row['user_email']),
|
||||
'user_email_hash' => crc32(strtolower($user_row['user_email'])) . strlen($user_row['user_email']),
|
||||
'group_id' => $user_row['group_id'],
|
||||
'user_type' => $user_row['user_type'],
|
||||
);
|
||||
@@ -1332,7 +1332,7 @@ function validate_email($email)
|
||||
{
|
||||
$sql = 'SELECT user_email_hash
|
||||
FROM ' . USERS_TABLE . "
|
||||
WHERE user_email_hash = " . crc32($email) . strlen($email);
|
||||
WHERE user_email_hash = " . (crc32($email) . strlen($email));
|
||||
$result = $db->sql_query($sql);
|
||||
$row = $db->sql_fetchrow($result);
|
||||
$db->sql_freeresult($result);
|
||||
|
Reference in New Issue
Block a user