diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-10-17 15:42:11 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-10-17 15:42:11 +0200 |
| commit | f049fcd6046bbbeea035b02a78638bbacee7dce1 (patch) | |
| tree | c50af620b416fb6c307d54228ec4fd21e05ada5d | |
| parent | 01df1d3301ab533e92e374594d8cb35692def491 (diff) | |
| download | forums-f049fcd6046bbbeea035b02a78638bbacee7dce1.tar forums-f049fcd6046bbbeea035b02a78638bbacee7dce1.tar.gz forums-f049fcd6046bbbeea035b02a78638bbacee7dce1.tar.bz2 forums-f049fcd6046bbbeea035b02a78638bbacee7dce1.tar.xz forums-f049fcd6046bbbeea035b02a78638bbacee7dce1.zip | |
[ticket/11863] Display warning to user because of activation method
PHPBB3-11863
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 10 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index dd6c731abb..63e2647f02 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -615,7 +615,15 @@ class acp_board { add_log('admin', 'LOG_CONFIG_' . strtoupper($mode)); - trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($this->u_action)); + $message = $user->lang('CONFIG_UPDATED'); + $message_type = E_USER_NOTICE; + if (!$config['email_enable'] && in_array($mode, array('email', 'registration')) && + in_array($config['require_activation'], array(USER_ACTIVATION_SELF, USER_ACTIVATION_ADMIN))) + { + $message .= '<br /><br />' . $user->lang('ACC_ACTIVATION_WARNING'); + $message_type = E_USER_WARNING; + } + trigger_error($message . adm_back_link($this->u_action), $message_type); } $this->tpl_name = 'acp_board'; diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index a2bfb43be7..8d6c1c141d 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -222,6 +222,7 @@ $lang = array_merge($lang, array( 'ACC_ACTIVATION' => 'Account activation', 'ACC_ACTIVATION_EXPLAIN' => 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations. <em>“Board-wide email” must be enabled in order to use user or admin activation.</em>', + 'ACC_ACTIVATION_WARNING' => 'Please note that the currently selected activation method requires emails to be enabled, otherwise registration will be disabled. We recommend to either select a different activation method or reenable emails.', 'NEW_MEMBER_POST_LIMIT' => 'New member post limit', 'NEW_MEMBER_POST_LIMIT_EXPLAIN' => 'New members are within the <em>Newly Registered Users</em> group until they reach this number of posts. You can use this group to keep them from using the PM system or to review their posts. <strong>A value of 0 disables this feature.</strong>', 'NEW_MEMBER_GROUP_DEFAULT' => 'Set Newly Registered Users group to default', |