aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorDavid Tobin <dtobin08@gmail.com>2012-07-05 02:47:49 +0100
committerNathan Guse <nathaniel.guse@gmail.com>2013-02-04 23:10:10 -0600
commit293b65e3efbf94f6521acebe1b9f3e7bbca20286 (patch)
tree11fdc3c88318dbea7b8bb381be6395628b95cbc5 /phpBB/includes/acp
parent996f1abee3640848dbcb00062646b681fe5e58af (diff)
downloadforums-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
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_board.php4
1 files changed, 2 insertions, 2 deletions
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),