mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-15 21:44:56 +01:00
Code Issues Releases Wiki Activity

- fix severe bug with email hash calculation

Browse Source 
- 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:
Meik Sievertsen 2007-01-24 17:19:35 +00:00
parent 5f0b61065f
commit 01b491e8f5
5 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/acp/acp_users.php
View File

@ -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);

6
phpBB/includes/functions_convert.php
View File

@ -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);
}
}

4
phpBB/includes/functions_user.php
View File

@ -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);

18
phpBB/install/database_update.php
View File

@ -627,6 +627,24 @@ if (version_compare($current_version, '3.0.b4', '<='))
WHERE module_class = 'acp' AND module_mode = 'version_check' AND module_auth = 'acl_a_'";
_sql($sql, $errored, $error_ary);
// Because the email hash could have been calculated wrongly, we will update it for every user.
// Since this is not used in a live environment there are not much... not used in a live environment, yes!
$sql = 'SELECT user_id, user_email
FROM ' . USERS_TABLE;
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
if ($row['user_email'])
{
$sql = 'UPDATE ' . USERS_TABLE . '
SET user_email_hash = ' . (crc32($row['user_email']) . strlen($row['user_email'])) . '
WHERE user_id = ' . $row['user_id'];
_sql($sql, $errored, $error_ary);
}
}
$db->sql_freeresult($result);
$no_updates = false;
}

2
phpBB/install/install_install.php
View File

@ -1277,7 +1277,7 @@ class install_install extends module
WHERE config_name = 'newest_username'",
'UPDATE ' . $table_prefix . "users
SET username = '" . $db->sql_escape($admin_name) . "', user_password='" . $db->sql_escape(md5($admin_pass1)) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($default_lang) . "', user_email='" . $db->sql_escape($board_email1) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . (int) (crc32(strtolower($board_email1)) . strlen($board_email1)) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($admin_name)) . "'
SET username = '" . $db->sql_escape($admin_name) . "', user_password='" . $db->sql_escape(md5($admin_pass1)) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($default_lang) . "', user_email='" . $db->sql_escape($board_email1) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . (crc32($board_email1) . strlen($board_email1)) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($admin_name)) . "'
WHERE username = 'Admin'",
'UPDATE ' . $table_prefix . "moderator_cache