diff options
| author | David Tobin <dtobin08@gmail.com> | 2012-07-05 02:47:49 +0100 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-02-04 23:10:10 -0600 |
| commit | 293b65e3efbf94f6521acebe1b9f3e7bbca20286 (patch) | |
| tree | 11fdc3c88318dbea7b8bb381be6395628b95cbc5 | |
| parent | 996f1abee3640848dbcb00062646b681fe5e58af (diff) | |
| download | forums-293b65e3efbf94f6521acebe1b9f3e7bbca20286.tar forums-293b65e3efbf94f6521acebe1b9f3e7bbca20286.tar.gz forums-293b65e3efbf94f6521acebe1b9f3e7bbca20286.tar.bz2 forums-293b65e3efbf94f6521acebe1b9f3e7bbca20286.tar.xz forums-293b65e3efbf94f6521acebe1b9f3e7bbca20286.zip | |
[ticket/10896] Adds email validation to email settings in ACP
Adds a new validation type to the ACP validate_config_vars function
and implements it on the board_contact and board_email settings.
PHPBB3-10896
| -rw-r--r-- | phpBB/adm/index.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 2e4089c02e..2da8a130cc 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -449,6 +449,13 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) } break; + case 'email': + if (!preg_match('/^' . get_preg_expression('email') . '$/i', $cfg_array[$config_name])) + { + $error[] = $user->lang['EMAIL_INVALID']; + } + break; + // Absolute path case 'script_path': if (!$cfg_array[$config_name]) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index f437dca8f9..ebbf66657e 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -408,8 +408,8 @@ class acp_board 'board_email_form' => array('lang' => 'BOARD_EMAIL_FORM', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true), 'email_function_name' => array('lang' => 'EMAIL_FUNCTION_NAME', 'validate' => 'string', 'type' => 'text:20:50', 'explain' => true), 'email_package_size' => array('lang' => 'EMAIL_PACKAGE_SIZE', 'validate' => 'int:0', 'type' => 'text:5:5', 'explain' => true), - 'board_contact' => array('lang' => 'CONTACT_EMAIL', 'validate' => 'string', 'type' => 'text:25:100', 'explain' => true), - 'board_email' => array('lang' => 'ADMIN_EMAIL', 'validate' => 'string', 'type' => 'text:25:100', 'explain' => true), + 'board_contact' => array('lang' => 'CONTACT_EMAIL', 'validate' => 'email', 'type' => 'text:25:100', 'explain' => true), + 'board_email' => array('lang' => 'ADMIN_EMAIL', 'validate' => 'email', 'type' => 'text:25:100', 'explain' => true), 'board_email_sig' => array('lang' => 'EMAIL_SIG', 'validate' => 'string', 'type' => 'textarea:5:30', 'explain' => true), 'board_hide_emails' => array('lang' => 'BOARD_HIDE_EMAILS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 844d5ef3ef..9f8799b6d6 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -160,6 +160,7 @@ $lang = array_merge($lang, array( 'EDIT_POST' => 'Edit post', 'EMAIL' => 'E-mail', // Short form for EMAIL_ADDRESS 'EMAIL_ADDRESS' => 'E-mail address', + 'EMAIL_INVALID' => 'The email address you entered is invalid.', 'EMAIL_SMTP_ERROR_RESPONSE' => 'Ran into problems sending e-mail at <strong>Line %1$s</strong>. Response: %2$s.', 'EMPTY_SUBJECT' => 'You must specify a subject when posting a new topic.', 'EMPTY_MESSAGE_SUBJECT' => 'You must specify a subject when composing a new message.', |