mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

- Added 'max_recipients' setting for private messages. This setting allows admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting.

Browse Source 
- Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8911 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2008-09-23 13:03:33 +00:00
parent 38afbf6759
commit 4a3db854b7
21 changed files with 138 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpBB/language/en/acp/board.php
View File

@@ -113,6 +113,7 @@ $lang = array_merge($lang, array(
'ALLOW_FORWARD_PM' => 'Allow forwarding of private messages',
'ALLOW_IMG_PM' => 'Allow use of <code>[IMG]</code> BBCode tag',
'ALLOW_MASS_PM' => 'Allow sending of private messages to multiple users and groups',
'ALLOW_MASS_PM_EXPLAIN' => 'Sending to groups can be adjusted per group within the group settings page.',
'ALLOW_PRINT_PM' => 'Allow print view in private messaging',
'ALLOW_QUOTE_PM' => 'Allow quotes in private messages',
'ALLOW_SIG_PM' => 'Allow signature in private messages',
@@ -127,6 +128,8 @@ $lang = array_merge($lang, array(
'HOLD_NEW_MESSAGES' => 'Hold new messages',
'PM_EDIT_TIME' => 'Limit editing time',
'PM_EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a private message not already delivered. Setting the value to 0 disables this behaviour.',
'PM_MAX_RECIPIENTS' => 'Maximum number of allowed recipients',
'PM_MAX_RECIPIENTS_EXPLAIN' => 'The maximum number of allowed recipients in a private message. If 0 is entered, an unlimited number is allowed. This setting can be adjusted for every group within the group settings page.',
));
// Post Settings

2
phpBB/language/en/acp/groups.php
View File

@@ -86,6 +86,8 @@ $lang = array_merge($lang, array(
'GROUP_NAME_TAKEN' => 'The group name you entered is already in use, please select an alternative.',
'GROUP_OPEN' => 'Open',
'GROUP_PENDING' => 'Pending members',
'GROUP_MAX_RECIPIENTS' => 'Maximum number of allowed recipients per private message',
'GROUP_MAX_RECIPIENTS_EXPLAIN' => 'The maximum number of allowed recipients in a private message. If 0 is entered, the board-wide setting is used.',
'GROUP_PROMOTE' => 'Promote to group leader',
'GROUP_RANK' => 'Group rank',
'GROUP_RECEIVE_PM' => 'Group able to receive private messages',

3
phpBB/language/en/acp/permissions_phpbb.php
View File

@@ -111,7 +111,8 @@ $lang = array_merge($lang, array(
'acl_u_sig' => array('lang' => 'Can use signature', 'cat' => 'post'),
'acl_u_sendpm' => array('lang' => 'Can send private messages', 'cat' => 'pm'),
'acl_u_masspm' => array('lang' => 'Can send pm to multiple users and groups', 'cat' => 'pm'),
'acl_u_masspm' => array('lang' => 'Can send messages to multiple users', 'cat' => 'pm'),
'acl_u_masspm_group'=> array('lang' => 'Can send messages to groups', 'cat' => 'pm'),
'acl_u_readpm' => array('lang' => 'Can read private messages', 'cat' => 'pm'),
'acl_u_pm_edit' => array('lang' => 'Can edit own private messages', 'cat' => 'pm'),
'acl_u_pm_delete' => array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'),

2
phpBB/language/en/ucp.php
View File

@@ -391,7 +391,7 @@ $lang = array_merge($lang, array(
'TIMEZONE' => 'Timezone',
'TO' => 'To',
'TOO_MANY_RECIPIENTS' => 'Too many recipients.',
'TOO_MANY_RECIPIENTS' => 'You tried to send a private message to too many recipients.',
'TOO_MANY_REGISTERS' => 'You have exceeded the maximum number of registration attempts for this session. Please try again later.',
'UCP' => 'User Control Panel',