aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/board.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2006-07-07 12:36:44 +0000
committerNils Adermann <naderman@naderman.de>2006-07-07 12:36:44 +0000
commita5c23243c7a0a86ccd749b7733b11d30a6c349e1 (patch)
treef7cd509c0db4efb62f212e483ba5a83bff0d457d /phpBB/language/en/acp/board.php
parent8c128de642207142bf599fcf9d78c2b0e705e351 (diff)
downloadforums-a5c23243c7a0a86ccd749b7733b11d30a6c349e1.tar
forums-a5c23243c7a0a86ccd749b7733b11d30a6c349e1.tar.gz
forums-a5c23243c7a0a86ccd749b7733b11d30a6c349e1.tar.bz2
forums-a5c23243c7a0a86ccd749b7733b11d30a6c349e1.tar.xz
forums-a5c23243c7a0a86ccd749b7733b11d30a6c349e1.zip
- display age in user profile and make it available on viewtopic
- various tiny bugfixes including [Bug #2351] [Bug #2549] [Bug #2681] [Bug #3015] - strip first, then change newlines [Bug #2403] - added support for creating user profiles to the login function (makes use of user_add), triggered by LOGIN_SUCCESS_CREATE_PROFILE constant - moved newest user updating from ucp_register to user_add function - renamed the admin_ auth module function to acp_ - added initialisation code to auth_apache which checks whether it will work - added user_add support to both auth_ldap and auth_apache - some auth_ldap tweaks, should work with users deeper in the organisation structure too now - adjusted global topics in mcp_report to work like mcp_queue git-svn-id: file:///svn/phpbb/trunk@6151 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/board.php')
-rw-r--r--phpBB/language/en/acp/board.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 68bde04177..f7f23b2ec5 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -287,11 +287,15 @@ $lang = array_merge($lang, array(
'ACP_AUTH_SETTINGS_EXPLAIN' => 'phpBB2 supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.',
'AUTH_METHOD' => 'Select an authentication method',
+
+ 'APACHE_SETUP_BEFORE_USE' => 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username.',
+
'LDAP_DN' => 'LDAP base dn',
'LDAP_DN_EXPLAIN' => 'This is the Distinguished Name, locating the user information, e.g. o=My Company,c=US',
+ 'LDAP_EMAIL' => 'LDAP email attribute',
+ 'LDAP_EMAIL_EXPLAIN' => 'Set this to the name of your user entry email attribute (if one exists) in order to automatically set the email address for new users. Leaving this empty results in empty email address for users who log in for the first time.',
+ 'LDAP_NO_EMAIL' => 'The specified email attribute does not exist.',
'LDAP_NO_IDENTITY' => 'Could not find a login identity for %s',
- 'LDAP_NO_LDAP_EXTENSION' => 'LDAP extension not availible',
- 'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server',
'LDAP_SERVER' => 'LDAP server name',
'LDAP_SERVER_EXPLAIN' => 'If using LDAP this is the name or IP address of the server.',
'LDAP_UID' => 'LDAP uid',