mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

Merge r10497 and r10499 into 3.0.7 - #57755

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10502 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2010-02-18 01:40:51 +00:00
parent b68d23347a
commit dccd529498
4 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View File

@ -158,6 +158,7 @@
<li>[Fix] Fix problems with firebird by no longer using 'count' as a column alias. (Bug #57455)</li>
<li>[Fix] Small language correction for the FAQ page. (Bug #57825)</li>
<li>[Fix] Restrict search for language/../iso.txt to folders. (Bug #57795)</li>
<li>[Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)</li>
<li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li>
<li>[Change] Log activation through inactive users ACP. (Bug #30145)</li>
<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>

4
phpBB/includes/functions.php
View File

@ -556,11 +556,11 @@ function _hash_crypt_private($password, $setting, &$itoa64)
*
* @param string $email Email address
*
* @return string Big Integer
* @return string Unsigned Big Integer
*/
function phpbb_email_hash($email)
{
return crc32(strtolower($email)) . strlen($email);
return sprintf('%u', crc32(strtolower($email))) . strlen($email);
}
/**

4
phpBB/includes/functions_convert.php
View File

@ -205,10 +205,12 @@ function get_group_id($group_name)
/**
* Generate the email hash stored in the users table
*
* Note: Deprecated, calls should directly go to phpbb_email_hash()
*/
function gen_email_hash($email)
{
return (crc32(strtolower($email)) . strlen($email));
return phpbb_email_hash($email);
}
/**

35
phpBB/install/database_update.php
View File

@ -906,6 +906,9 @@ function database_update_info()
),
),
),
// No changes from 3.0.7-RC1 to 3.0.7
'3.0.7-RC1' => array(),
);
}
@ -1597,6 +1600,38 @@ function change_database_data(&$no_updates, $version)
$no_updates = false;
break;
// No changes from 3.0.7-RC1 to 3.0.7
case '3.0.7-RC1':
$sql = 'SELECT user_id, user_email, user_email_hash
FROM ' . USERS_TABLE . '
WHERE user_type <> ' . USER_IGNORE . "
AND user_email <> ''";
$result = $db->sql_query($sql);
$i = 0;
while ($row = $db->sql_fetchrow($result))
{
$user_email_hash = phpbb_email_hash($row['user_email']);
if ($user_email_hash != $row['user_email_hash'])
{
$sql_ary = array(
'user_email_hash' => $user_email_hash,
);
$sql = 'UPDATE ' . USERS_TABLE . '
SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE user_id = ' . (int) $row['user_id'];
__sql($sql, $errored, $error_ary, ($i % 100 == 0));
++$i;
}
}
$db->sql_freeresult($result);
break;
}
}