diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-24 17:19:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-24 17:19:35 +0000 |
| commit | 01b491e8f5930adca696a09d13501ad6236aadb6 (patch) | |
| tree | 18d1294a528b2ca227a766ae456457c3d747d151 /phpBB/install | |
| parent | 5f0b61065fdd107d32fa1f2c0b80981a239218a7 (diff) | |
| download | forums-01b491e8f5930adca696a09d13501ad6236aadb6.tar forums-01b491e8f5930adca696a09d13501ad6236aadb6.tar.gz forums-01b491e8f5930adca696a09d13501ad6236aadb6.tar.bz2 forums-01b491e8f5930adca696a09d13501ad6236aadb6.tar.xz forums-01b491e8f5930adca696a09d13501ad6236aadb6.zip | |
- 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
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 18 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 8fd30020a1..4d8fc449a0 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -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; } diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 7bfecd1685..b6bf1dd03d 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -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 |