makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10535] Delete email confirm from installer

Browse source 
PHPBB3-10535
This commit is contained in:
p 2011-12-23 22:10:34 +00:00 • committed by David King
parent 4baa2bb52c
commit fc297a710e
3 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
phpBB/install/install_install.php
View file

@ -690,7 +690,7 @@ class install_install extends module
$error = array(); $error = array();
// Check the entered email address and password // Check the entered email address and password
if ($data['admin_name'] == '' || $data['admin_pass1'] == '' || $data['admin_pass2'] == '' || $data['board_email1'] == '' || $data['board_email2'] == '') if ($data['admin_name'] == '' || $data['admin_pass1'] == '' || $data['admin_pass2'] == '' || $data['board_email'] == '')
{ {
$error[] = $lang['INST_ERR_MISSING_DATA']; $error[] = $lang['INST_ERR_MISSING_DATA'];
} }
@ -722,12 +722,7 @@ class install_install extends module
$error[] = $lang['INST_ERR_PASSWORD_TOO_LONG']; $error[] = $lang['INST_ERR_PASSWORD_TOO_LONG'];
} }
if ($data['board_email1'] != $data['board_email2'] && $data['board_email1'] != '') if ($data['board_email'] != '' && !preg_match('/^' . get_preg_expression('email') . '$/i', $data['board_email']))
{
$error[] = $lang['INST_ERR_EMAIL_MISMATCH'];
}
if ($data['board_email1'] != '' && !preg_match('/^' . get_preg_expression('email') . '$/i', $data['board_email1']))
{ {
$error[] = $lang['INST_ERR_EMAIL_INVALID']; $error[] = $lang['INST_ERR_EMAIL_INVALID'];
} }
@ -1251,11 +1246,11 @@ class install_install extends module
WHERE config_name = 'server_port'", WHERE config_name = 'server_port'",
'UPDATE ' . $data['table_prefix'] . "config 'UPDATE ' . $data['table_prefix'] . "config
SET config_value = '" . $db->sql_escape($data['board_email1']) . "' SET config_value = '" . $db->sql_escape($data['board_email']) . "'
WHERE config_name = 'board_email'", WHERE config_name = 'board_email'",
'UPDATE ' . $data['table_prefix'] . "config 'UPDATE ' . $data['table_prefix'] . "config
SET config_value = '" . $db->sql_escape($data['board_email1']) . "' SET config_value = '" . $db->sql_escape($data['board_email']) . "'
WHERE config_name = 'board_contact'", WHERE config_name = 'board_contact'",
'UPDATE ' . $data['table_prefix'] . "config 'UPDATE ' . $data['table_prefix'] . "config
@ -1315,7 +1310,7 @@ class install_install extends module
WHERE config_name = 'avatar_salt'", WHERE config_name = 'avatar_salt'",
'UPDATE ' . $data['table_prefix'] . "users '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 = " . $db->sql_escape(phpbb_email_hash($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(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_email']) . "', user_dateformat='" . $db->sql_escape($lang['default_dateformat']) . "', user_email_hash = " . $db->sql_escape(phpbb_email_hash($data['board_email'])) . ", username_clean = '" . $db->sql_escape(utf8_clean_string($data['admin_name'])) . "'
WHERE username = 'Admin'", WHERE username = 'Admin'",
'UPDATE ' . $data['table_prefix'] . "moderator_cache 'UPDATE ' . $data['table_prefix'] . "moderator_cache
@ -1831,7 +1826,7 @@ class install_install extends module
$messenger->template('installed', $data['language']); $messenger->template('installed', $data['language']);
$messenger->to($data['board_email1'], $data['admin_name']); $messenger->to($data['board_email'], $data['admin_name']);
$messenger->anti_abuse_headers($config, $user); $messenger->anti_abuse_headers($config, $user);
@ -1890,8 +1885,7 @@ class install_install extends module
'admin_name' => utf8_normalize_nfc(request_var('admin_name', '', true)), 'admin_name' => utf8_normalize_nfc(request_var('admin_name', '', true)),
'admin_pass1' => request_var('admin_pass1', '', true), 'admin_pass1' => request_var('admin_pass1', '', true),
'admin_pass2' => request_var('admin_pass2', '', true), 'admin_pass2' => request_var('admin_pass2', '', true),
'board_email1' => strtolower(request_var('board_email1', '')), 'board_email' => strtolower(request_var('board_email', '')),
'board_email2' => strtolower(request_var('board_email2', '')),
'img_imagick' => request_var('img_imagick', ''), 'img_imagick' => request_var('img_imagick', ''),
'ftp_path' => request_var('ftp_path', ''), 'ftp_path' => request_var('ftp_path', ''),
'ftp_user' => request_var('ftp_user', ''), 'ftp_user' => request_var('ftp_user', ''),
@ -1930,8 +1924,7 @@ class install_install extends module
'admin_name' => array('lang' => 'ADMIN_USERNAME', 'type' => 'text:25:100', 'explain' => true), 'admin_name' => array('lang' => 'ADMIN_USERNAME', 'type' => 'text:25:100', 'explain' => true),
'admin_pass1' => array('lang' => 'ADMIN_PASSWORD', 'type' => 'password:25:100', 'explain' => true), 'admin_pass1' => array('lang' => 'ADMIN_PASSWORD', 'type' => 'password:25:100', 'explain' => true),
'admin_pass2' => array('lang' => 'ADMIN_PASSWORD_CONFIRM', 'type' => 'password:25:100', 'explain' => false), 'admin_pass2' => array('lang' => 'ADMIN_PASSWORD_CONFIRM', 'type' => 'password:25:100', 'explain' => false),
'board_email1' => array('lang' => 'CONTACT_EMAIL', 'type' => 'text:25:100', 'explain' => false), 'board_email' => array('lang' => 'CONTACT_EMAIL', 'type' => 'text:25:100', 'explain' => false),
'board_email2' => array('lang' => 'CONTACT_EMAIL_CONFIRM', 'type' => 'text:25:100', 'explain' => false),
); );
var $advanced_config_options = array( var $advanced_config_options = array(
'legend1' => 'ACP_EMAIL_SETTINGS', 'legend1' => 'ACP_EMAIL_SETTINGS',

1
phpBB/language/en/install.php
View file

@ -72,7 +72,6 @@ $lang = array_merge($lang, array(
'CONFIG_FILE_WRITTEN' => 'The configuration file has been written. You may now proceed to the next step of the installation.', 'CONFIG_FILE_WRITTEN' => 'The configuration file has been written. You may now proceed to the next step of the installation.',
'CONFIG_PHPBB_EMPTY' => 'The phpBB3 config variable for “%s” is empty.', 'CONFIG_PHPBB_EMPTY' => 'The phpBB3 config variable for “%s” is empty.',
'CONFIG_RETRY' => 'Retry', 'CONFIG_RETRY' => 'Retry',
'CONTACT_EMAIL_CONFIRM' => 'Confirm contact e-mail',
'CONTINUE_CONVERT' => 'Continue conversion', 'CONTINUE_CONVERT' => 'Continue conversion',
'CONTINUE_CONVERT_BODY' => 'A previous conversion attempt has been determined. You are now able to choose between starting a new conversion or continuing the conversion.', 'CONTINUE_CONVERT_BODY' => 'A previous conversion attempt has been determined. You are now able to choose between starting a new conversion or continuing the conversion.',
'CONTINUE_LAST' => 'Continue last statements', 'CONTINUE_LAST' => 'Continue last statements',

3
tests/test_framework/phpbb_functional_test_case.php
View file

@ -102,8 +102,7 @@ class phpbb_functional_test_case extends phpbb_test_case
'admin_name' => 'admin', 'admin_name' => 'admin',
'admin_pass1' => 'admin', 'admin_pass1' => 'admin',
'admin_pass2' => 'admin', 'admin_pass2' => 'admin',
'board_email1' => 'nobody@example.com', 'board_email' => 'nobody@example.com',
'board_email2' => 'nobody@example.com',
)); ));
$parseURL = parse_url(self::$config['phpbb_functional_url']); $parseURL = parse_url(self::$config['phpbb_functional_url']);