diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-03 18:35:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-03 18:35:59 +0000 |
| commit | 5284f321789b5d0456b48a529ed59a99956020e8 (patch) | |
| tree | ec6af414977763a8a2a9b570c4e071597239409e /phpBB/language | |
| parent | d7f87be493589daf3d0996eb83f489c62d4380a7 (diff) | |
| download | forums-5284f321789b5d0456b48a529ed59a99956020e8.tar forums-5284f321789b5d0456b48a529ed59a99956020e8.tar.gz forums-5284f321789b5d0456b48a529ed59a99956020e8.tar.bz2 forums-5284f321789b5d0456b48a529ed59a99956020e8.tar.xz forums-5284f321789b5d0456b48a529ed59a99956020e8.zip | |
- extend config checking to include check for writeable path
- removed not utilized user_allow_email column from schema
- removed inactive groups (they had no use at all, since inactive users are not able to login)
The only benefit those brought are distinguish users - but this is no longer needed too due to the inactive code present. This also allows us to retain group memberships as well as default settings for users being set inactive due to profile changes.
- rewrote user_active_flip to support multiple users and a mode, as well as coping with the aforementioned changes
- implemented updated jabber class to support SRV server records and for better jabberd2 support.
- jabber errors now logged to the error log with a full transaction
- fixed user_delete calls to include usernames where possible and also update last post information correctly
- implemented additioal checks to user management to cope with common mistakes
- On installation, guess the required mysql schema as best as possible. Users now only need to decide if they want to use the mysqli extension or not (mysqli selected by default) and no longer need to know their mysql version.
- founders do not need to re-activate their account on profile changes
- remove older session if re-authentication was successful (re-authentication always assigns a new session id)
- set the cookie directly instead of using php's function
- added inactive_remind to see which users got deactivated because of reminders (or re-activation) sent out
hopefully not introduced too many bugs - those testing with CVS releases, please concentrate on user registration, activation, profile changes (email/password)...
git-svn-id: file:///svn/phpbb/trunk@6436 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/common.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/users.php | 5 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 | ||||
| -rwxr-xr-x | phpBB/language/en/install.php | 7 |
4 files changed, 11 insertions, 7 deletions
diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 925878ba61..55edf78a56 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -204,8 +204,9 @@ $lang = array_merge($lang, array( 'DEACTIVATE' => 'Deactivate', 'DIMENSIONS' => 'Dimensions', - 'DIRECTORY_DOES_NOT_EXIST' => 'The entered directory "%s" does not exist.', + 'DIRECTORY_DOES_NOT_EXIST' => 'The entered path "%s" does not exist.', 'DIRECTORY_NOT_DIR' => 'The entered path "%s" is not a directory.', + 'DIRECTORY_NOT_WRITEABLE' => 'The entered path "%s" is not writeable.', 'DISABLE' => 'Disable', 'DOWNLOAD' => 'Download', 'DOWNLOAD_AS' => 'Download as', @@ -341,6 +342,7 @@ $lang = array_merge($lang, array( 'INACTIVE_REASON_MANUAL' => 'Account deactivated by administrator', 'INACTIVE_REASON_PROFILE' => 'Profile details changed', 'INACTIVE_REASON_REGISTER' => 'Newly registered account', + 'INACTIVE_REASON_REMIND' => 'Forced user account reactivation', 'INACTIVE_REASON_UNKNOWN' => 'Unknown', 'INACTIVE_USERS' => 'Inactive Users', 'INACTIVE_USERS_EXPLAIN' => 'This is a list of users who have registered but whos accounts are inactive. You can activate, delete or remind (by sending an email) these users if you wish.', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 6f2595682c..9745aa853a 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -36,8 +36,13 @@ $lang = array_merge($lang, array( 'BAN_SUCCESSFUL' => 'Ban entered successfully.', + 'CANNOT_BAN_FOUNDER' => 'You are not allowed to ban founder accounts.', 'CANNOT_BAN_YOURSELF' => 'You are not allowed to ban yourself.', + 'CANNOT_DEACTIVATE_BOT' => 'You are not allowed to deactivate bot accounts. Please deactivate the bot instead.', + 'CANNOT_DEACTIVATE_FOUNDER' => 'You are not allowed to deactivate founder accounts.', 'CANNOT_DEACTIVATE_YOURSELF' => 'You are not allowed to deactivate your own account.', + 'CANNOT_FORCE_REACT_BOT' => 'You are not allowed to force reactivation on bot accounts. Please deactivate the bot instead.', + 'CANNOT_FORCE_REACT_FOUNDER' => 'You are not allowed to force reactivation on founder accounts.', 'CANNOT_FORCE_REACT_YOURSELF' => 'You are not allowed to force reactivation of your own account.', 'CANNOT_REMOVE_ANONYMOUS' => 'You are not able to remove the guest user account.', 'CANNOT_REMOVE_YOURSELF' => 'You are not allowed to remove your own user account.', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index c10b9219e9..05ae2133ef 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -214,8 +214,6 @@ $lang = array_merge($lang, array( 'G_ADMINISTRATORS' => 'Administrators', 'G_BOTS' => 'Bots', 'G_GUESTS' => 'Guests', - 'G_INACTIVE' => 'Unapproved Users', - 'G_INACTIVE_COPPA' => 'Unapproved COPPA Users', 'G_REGISTERED' => 'Registered Users', 'G_REGISTERED_COPPA' => 'Registered COPPA Users', 'G_GLOBAL_MODERATORS' => 'Global Moderators', diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 0933f95aa6..dcb96a1c7c 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -92,15 +92,14 @@ $lang = array_merge($lang, array( 'DEV_NO_TEST_FILE' => 'No value has been specified for the test_file variable in the convertor. If you are a user of this convertor, you should not be seeing this error, please report this message to the convertor author. If you are a convertor author, you must specify the name of a file which exists in the source forum to allow the path to it to be verified.', 'DIRECTORIES_AND_FILES' => 'Directory and file setup', 'DISABLE_KEYS' => 'Disabling keys', - 'DLL_FIREBIRD' => 'Firebird 1.5+', + 'DLL_FIREBIRD' => 'Firebird', 'DLL_FTP' => 'Remote FTP support [ Installation ]', 'DLL_GD' => 'GD graphics support [ Visual Confirmation ]', 'DLL_MBSTRING' => 'Multi-byte character support', 'DLL_MSSQL' => 'MSSQL Server 2000+', 'DLL_MSSQL_ODBC' => 'MSSQL Server 2000+ via ODBC', - 'DLL_MYSQL' => 'MySQL 3.23.x/4.x', - 'DLL_MYSQL4' => 'MySQL 4.x/5.x', - 'DLL_MYSQLI' => 'MySQL 4.1.x/5.x with MySQLi Extension', + 'DLL_MYSQL' => 'MySQL', + 'DLL_MYSQLI' => 'MySQL with MySQLi Extension', 'DLL_ORACLE' => 'Oracle', 'DLL_POSTGRES' => 'PostgreSQL 7.x/8.x', 'DLL_SQLITE' => 'SQLite', |