diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-04 18:50:25 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-10-04 18:50:25 +0000 |
| commit | 760fe6bc66cc5571b220e3a80ddc027ad67b86f3 (patch) | |
| tree | 85cc3fdacda920243e9bfad58f9e44d4cd65841a /phpBB/install | |
| parent | c2085565789b4a5858ba9bb1189804b731cb2ab4 (diff) | |
| download | forums-760fe6bc66cc5571b220e3a80ddc027ad67b86f3.tar forums-760fe6bc66cc5571b220e3a80ddc027ad67b86f3.tar.gz forums-760fe6bc66cc5571b220e3a80ddc027ad67b86f3.tar.bz2 forums-760fe6bc66cc5571b220e3a80ddc027ad67b86f3.tar.xz forums-760fe6bc66cc5571b220e3a80ddc027ad67b86f3.zip | |
#i42
new password hashing mechanism for storing passwords
git-svn-id: file:///svn/phpbb/trunk@8139 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 7 | ||||
| -rwxr-xr-x | phpBB/install/index.php | 6 | ||||
| -rwxr-xr-x | phpBB/install/install_install.php | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 66a22213f9..cea393724f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -55,7 +55,14 @@ require($phpbb_root_path . 'includes/cache.' . $phpEx); require($phpbb_root_path . 'includes/template.' . $phpEx); require($phpbb_root_path . 'includes/session.' . $phpEx); require($phpbb_root_path . 'includes/auth.' . $phpEx); + require($phpbb_root_path . 'includes/functions.' . $phpEx); + +if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx)) +{ + require($phpbb_root_path . 'includes/functions_content.' . $phpEx); +} + require($phpbb_root_path . 'includes/functions_admin.' . $phpEx); require($phpbb_root_path . 'includes/constants.' . $phpEx); require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx); diff --git a/phpBB/install/index.php b/phpBB/install/index.php index d30a48be98..f3a833a872 100755 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -149,6 +149,12 @@ else // Include essential scripts require($phpbb_root_path . 'includes/functions.' . $phpEx); + +if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx)) +{ + require($phpbb_root_path . 'includes/functions_content.' . $phpEx); +} + include($phpbb_root_path . 'includes/auth.' . $phpEx); include($phpbb_root_path . 'includes/session.' . $phpEx); include($phpbb_root_path . 'includes/template.' . $phpEx); diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index ca86816e9c..7bc0f32be3 100755 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1309,7 +1309,7 @@ class install_install extends module WHERE config_name = 'avatar_salt'", 'UPDATE ' . $data['table_prefix'] . "users - SET username = '" . $db->sql_escape($data['admin_name']) . "', user_password='" . $db->sql_escape(md5($data['admin_pass1'])) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($data['default_lang']) . "', user_email='" . $db->sql_escape($data['board_email1']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . (crc32($data['board_email1']) . strlen($data['board_email1'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "' + SET username = '" . $db->sql_escape($data['admin_name']) . "', user_password='" . $db->sql_escape(phpbb_hash($data['admin_pass1'])) . "', user_ip = '" . $db->sql_escape($user_ip) . "', user_lang = '" . $db->sql_escape($data['default_lang']) . "', user_email='" . $db->sql_escape($data['board_email1']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . (crc32($data['board_email1']) . strlen($data['board_email1'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "' WHERE username = 'Admin'", 'UPDATE ' . $data['table_prefix'] . "moderator_cache |