- Automatically add users/groups to the PM recipient list, if entered or selected.

- Reply to PM now includes all previous recipients and not only the original sender. - 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. - 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/trunk@8914 89ea8834-ac86-4346-8a33-228a782c2dd0
2025-07-31 14:00:31 +02:00 · 2008-09-23 13:11:34 +00:00
parent b486710ea1
commit ce6b87ccec
16 changed files with 166 additions and 54 deletions
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -126,6 +126,7 @@ class acp_board
 						'pm_max_msgs'			=> array('lang' => 'BOXES_LIMIT',			'validate' => 'int:0',	'type' => 'text:4:4', 'explain' => true),
 						'full_folder_action'	=> array('lang' => 'FULL_FOLDER_ACTION',	'validate' => 'int',	'type' => 'select', 'method' => 'full_folder_select', 'explain' => true),
 						'pm_edit_time'			=> array('lang' => 'PM_EDIT_TIME',			'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
+						'pm_max_recipients'		=> array('lang' => 'PM_MAX_RECIPIENTS',		'validate' => 'int:0',	'type' => 'text:5:5', 'explain' => true),

 						'legend2'				=> 'GENERAL_OPTIONS',
 						'allow_mass_pm'			=> array('lang' => 'ALLOW_MASS_PM',			'validate' => 'bool',	'type' => 'radio:yes_no', 'explain' => false),
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -302,6 +302,7 @@ class acp_groups
 						'receive_pm'		=> isset($_REQUEST['group_receive_pm']) ? 1 : 0,
 						'legend'			=> isset($_REQUEST['group_legend']) ? 1 : 0,
 						'message_limit'		=> request_var('group_message_limit', 0),
+						'max_recipients'	=> request_var('group_max_recipients', 0),
 						'founder_manage'	=> 0,
 					);

@@ -394,7 +395,7 @@ class acp_groups
 						// were made.

 						$group_attributes = array();
-						$test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'legend', 'message_limit', 'founder_manage');
+						$test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'legend', 'message_limit', 'max_recipients', 'founder_manage');
 						foreach ($test_variables as $test)
 						{
 							if (isset($submit_ary[$test]) && ($action == 'add' || $group_row['group_' . $test] != $submit_ary[$test]))
@@ -554,6 +555,7 @@ class acp_groups
 					'GROUP_FOUNDER_MANAGE'	=> (isset($group_row['group_founder_manage']) && $group_row['group_founder_manage']) ? ' checked="checked"' : '',
 					'GROUP_LEGEND'			=> (isset($group_row['group_legend']) && $group_row['group_legend']) ? ' checked="checked"' : '',
 					'GROUP_MESSAGE_LIMIT'	=> (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0,
+					'GROUP_MAX_RECIPIENTS'	=> (isset($group_row['group_max_recipients'])) ? $group_row['group_max_recipients'] : 0,
 					'GROUP_COLOUR'			=> (isset($group_row['group_colour'])) ? $group_row['group_colour'] : '',


--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -183,17 +183,40 @@ class acp_main
 							trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
 						}

-						$sql = 'SELECT COUNT(p.post_id) AS num_posts, u.user_id
-							FROM ' . USERS_TABLE . ' u
-							LEFT JOIN  ' . POSTS_TABLE . ' p ON (u.user_id = p.poster_id AND p.post_postcount = 1 AND p.post_approved = 1)
-							GROUP BY u.user_id';
-						$result = $db->sql_query($sql);
+						// Resync post counts
+						$start = 0;

-						while ($row = $db->sql_fetchrow($result))
+						do
 						{
-							$db->sql_query('UPDATE ' . USERS_TABLE . " SET user_posts = {$row['num_posts']} WHERE user_id = {$row['user_id']}");
+							$sql = 'SELECT COUNT(p.post_id) AS num_posts, u.user_id
+								FROM ' . USERS_TABLE . ' u
+								LEFT JOIN  ' . POSTS_TABLE . ' p ON (u.user_id = p.poster_id AND p.post_postcount = 1 AND p.post_approved = 1)
+								GROUP BY u.user_id
+								ORDER BY u.user_id ASC';
+							$result = $db->sql_query_limit($sql, 200, $start);
+
+							if ($row = $db->sql_fetchrow($result))
+							{
+								$i = 0;
+
+								do
+								{
+									$sql = 'UPDATE ' . USERS_TABLE . " SET user_posts = {$row['num_posts']} WHERE user_id = {$row['user_id']}";
+									_sql($sql, $errored, $error_ary);
+
+									$i++;
+								}
+								while ($row = $db->sql_fetchrow($result));
+
+								$start = ($i < 200) ? 0 : $start + 200;
+							}
+							else
+							{
+								$start = 0;
+							}
+							$db->sql_freeresult($result);
 						}
-						$db->sql_freeresult($result);
+						while ($start);

 						add_log('admin', 'LOG_RESYNC_POSTCOUNTS');

--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -314,8 +314,6 @@ function user_delete($mode, $user_id, $post_username = false)
 		return false;
 	}

-	$db->sql_transaction('begin');
-
 	// Before we begin, we will remove the reports the user issued.
 	$sql = 'SELECT r.post_id, p.topic_id
 		FROM ' . REPORTS_TABLE . ' r, ' . POSTS_TABLE . ' p
@@ -384,6 +382,8 @@ function user_delete($mode, $user_id, $post_username = false)
 	{
 		case 'retain':

+			$db->sql_transaction('begin');
+
 			if ($post_username === false)
 			{
 				$post_username = $user->lang['GUEST'];
@@ -431,6 +431,9 @@ function user_delete($mode, $user_id, $post_username = false)
 					$db->sql_query($sql);
 				}
 			}
+
+			$db->sql_transaction('commit');
+
 		break;

 		case 'remove':
@@ -484,6 +487,8 @@ function user_delete($mode, $user_id, $post_username = false)
 		break;
 	}

+	$db->sql_transaction('begin');
+
 	$table_ary = array(USERS_TABLE, USER_GROUP_TABLE, TOPICS_WATCH_TABLE, FORUMS_WATCH_TABLE, ACL_USERS_TABLE, TOPICS_TRACK_TABLE, TOPICS_POSTED_TABLE, FORUMS_TRACK_TABLE, PROFILE_FIELDS_DATA_TABLE, MODERATOR_CACHE_TABLE, DRAFTS_TABLE, BOOKMARKS_TABLE);

 	foreach ($table_ary as $table)
@@ -552,6 +557,8 @@ function user_delete($mode, $user_id, $post_username = false)
 		$db->sql_query($sql);
 	}

+	$db->sql_transaction('commit');
+
 	// Reset newest user info if appropriate
 	if ($config['newest_user_id'] == $user_id)
 	{
@@ -564,8 +571,6 @@ function user_delete($mode, $user_id, $post_username = false)
 		set_config('num_users', $config['num_users'] - 1, true);
 	}

-	$db->sql_transaction('commit');
-
 	return false;
 }

@@ -2274,12 +2279,13 @@ function group_create(&$group_id, $type, $name, $desc, $group_attributes, $allow
 		'group_receive_pm'		=> 'int',
 		'group_legend'			=> 'int',
 		'group_message_limit'	=> 'int',
+		'group_max_recipients'	=> 'int',

 		'group_founder_manage'	=> 'int',
 	);

 	// Those are group-only attributes
-	$group_only_ary = array('group_receive_pm', 'group_legend', 'group_message_limit', 'group_founder_manage');
+	$group_only_ary = array('group_receive_pm', 'group_legend', 'group_message_limit', 'group_max_recipients', 'group_founder_manage');

 	// Check data. Limit group name length.
 	if (!utf8_strlen($name) || utf8_strlen($name) > 60)
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -958,11 +958,11 @@ function disapprove_post($post_id_list, $id, $mode)
 						$lang_reasons[$post_data['user_lang']] = $user->lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang];

 						// Only load up the language pack if the language is different to the current one
-						if ($post_data['user_lang'] != $user->lang_name && file_exists($phpbb_root_path . '/language/' . $post_data['user_lang'] . '/mcp.' . $phpEx))
+						if ($post_data['user_lang'] != $user->lang_name && file_exists(PHPBB_ROOT_PATH . '/language/' . $post_data['user_lang'] . '/mcp.' . PHP_EXT))
 						{
 							// Load up the language pack
 							$lang = array();
-							@include($phpbb_root_path . '/language/' . $post_data['user_lang'] . '/mcp.' . $phpEx);
+							@include(PHPBB_ROOT_PATH . '/language/' . $post_data['user_lang'] . '/mcp.' . PHP_EXT);

 							// If we find the reason in this language pack use it
 							if (isset($lang['report_reasons']['DESCRIPTION'][$disapprove_reason_lang]))
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -504,7 +504,8 @@ class ucp_groups
 								'colour'		=> request_var('group_colour', ''),
 								'rank'			=> request_var('group_rank', 0),
 								'receive_pm'	=> isset($_REQUEST['group_receive_pm']) ? 1 : 0,
-								'message_limit'	=> request_var('group_message_limit', 0)
+								'message_limit'	=> request_var('group_message_limit', 0),
+								'max_recipients'=> request_var('group_max_recipients', 0),
 							);

 							$data['uploadurl']	= request_var('uploadurl', '');
@@ -602,7 +603,7 @@ class ucp_groups
 								// were made.
 						
 								$group_attributes = array();
-								$test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height');
+								$test_variables = array('rank', 'colour', 'avatar', 'avatar_type', 'avatar_width', 'avatar_height', 'receive_pm', 'legend', 'message_limit', 'max_recipients');
 								foreach ($test_variables as $test)
 								{
 									if ($action == 'add' || (isset($submit_ary[$test]) && $group_row['group_' . $test] != $submit_ary[$test]))
@@ -692,6 +693,7 @@ class ucp_groups
 							'ERROR_MSG'				=> (sizeof($error)) ? implode('<br />', $error) : '',
 							'GROUP_RECEIVE_PM'		=> (isset($group_row['group_receive_pm']) && $group_row['group_receive_pm']) ? ' checked="checked"' : '',
 							'GROUP_MESSAGE_LIMIT'	=> (isset($group_row['group_message_limit'])) ? $group_row['group_message_limit'] : 0,
+							'GROUP_MAX_RECIPIENTS'	=> (isset($group_row['group_max_recipients'])) ? $group_row['group_max_recipients'] : 0,
 							
 							'GROUP_DESC'			=> $group_desc_data['text'],
 							'S_DESC_BBCODE_CHECKED'	=> $group_desc_data['allow_bbcode'],
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -44,6 +44,11 @@ function compose_pm($id, $mode, $action)
 	// Do NOT use request_var or specialchars here
 	$address_list	= isset($_REQUEST['address_list']) ? $_REQUEST['address_list'] : array();

+	if (!is_array($address_list))
+	{
+		$address_list = array();
+	}
+
 	$submit		= (isset($_POST['post'])) ? true : false;
 	$preview	= (isset($_POST['preview'])) ? true : false;
 	$save		= (isset($_POST['save'])) ? true : false;
@@ -78,7 +83,8 @@ function compose_pm($id, $mode, $action)
 	// Output PM_TO box if message composing
 	if ($action != 'edit')
 	{
-		if ($config['allow_mass_pm'] && $auth->acl_get('u_masspm'))
+		// Add groups to PM box
+		if ($config['allow_mass_pm'] && $auth->acl_get('u_masspm_group'))
 		{
 			$sql = 'SELECT g.group_id, g.group_name, g.group_type
 				FROM ' . GROUPS_TABLE . ' g';
@@ -111,7 +117,7 @@ function compose_pm($id, $mode, $action)
 		$template->assign_vars(array(
 			'S_SHOW_PM_BOX'		=> true,
 			'S_ALLOW_MASS_PM'	=> ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? true : false,
-			'S_GROUP_OPTIONS'	=> ($config['allow_mass_pm'] && $auth->acl_get('u_masspm')) ? $group_options : '',
+			'S_GROUP_OPTIONS'	=> ($config['allow_mass_pm'] && $auth->acl_get('u_masspm_group')) ? $group_options : '',
 			'U_FIND_USERNAME'	=> append_sid('memberlist', "mode=searchuser&amp;form=postform&amp;field=username_list&amp;select_single=$select_single"),
 		));
 	}
@@ -280,7 +286,24 @@ function compose_pm($id, $mode, $action)

 			if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !sizeof($address_list) && !$refresh && !$submit && !$preview)
 			{
-				$address_list = array('u' => array($post['author_id'] => 'to'));
+				if ($action == 'quotepost')
+				{
+					$address_list = array('u' => array($post['author_id'] => 'to'));
+				}
+				else
+				{
+					// We try to include every previously listed member from the TO Header
+					$address_list = rebuild_header(array('to' => $post['to_address']));
+
+					// Add the author (if he is already listed then this is no shame (it will be overwritten))
+					$address_list['u'][$post['author_id']] = 'to';
+
+					// Now, make sure the user itself is not listed. ;)
+					if (isset($address_list['u'][$user->data['user_id']]))
+					{
+						unset($address_list['u'][$user->data['user_id']]);
+					}
+				}
 			}
 			else if ($action == 'edit' && !sizeof($address_list) && !$refresh && !$submit && !$preview)
 			{
@@ -314,7 +337,7 @@ function compose_pm($id, $mode, $action)
 		$check_value = 0;
 	}

-	if (($to_group_id || isset($address_list['g'])) && (!$config['allow_mass_pm'] || !$auth->acl_get('u_masspm')))
+	if (($to_group_id || isset($address_list['g'])) && (!$config['allow_mass_pm'] || !$auth->acl_get('u_masspm_group')))
 	{
 		trigger_error('NO_AUTH_GROUP_MESSAGE');
 	}
@@ -379,14 +402,43 @@ function compose_pm($id, $mode, $action)
 		redirect(append_sid('ucp', 'i=pm&amp;mode=view&amp;action=view_message&amp;p=' . $msg_id));
 	}

+	// Get maximum number of allowed recipients
+	$sql = 'SELECT MAX(g.group_max_recipients) as max_recipients
+		FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
+		WHERE ug.user_id = ' . $user->data['user_id'] . '
+			AND ug.user_pending = 0
+			AND ug.group_id = g.group_id';
+	$result = $db->sql_query($sql);
+	$max_recipients = (int) $db->sql_fetchfield('max_recipients');
+	$db->sql_freeresult($result);
+
+	$max_recipients = (!$max_recipients) ? $config['pm_max_recipients'] : $max_recipients;
+
+	// Damn php and globals - i know, this is horrible
+	global $refresh, $submit, $preview;
+
 	// Handle User/Group adding/removing
 	handle_message_list_actions($address_list, $error, $remove_u, $remove_g, $add_to, $add_bcc);

-	// Check for too many recipients
+	// Check mass pm to group permission
+	if ((!$config['allow_mass_pm'] || !$auth->acl_get('u_masspm_group')) && !empty($address_list['g']))
+	{
+		$address_list = array();
+		$error[] = $user->lang['NO_AUTH_GROUP_MESSAGE'];
+	}
+
+	// Check mass pm to users permission
 	if ((!$config['allow_mass_pm'] || !$auth->acl_get('u_masspm')) && num_recipients($address_list) > 1)
 	{
-		$address_list = get_recipient_pos($address_list, 1);
-		$error[] = $user->lang['TOO_MANY_RECIPIENTS'];
+		$address_list = get_recipients($address_list, 1);
+		$error[] = $user->lang('TOO_MANY_RECIPIENTS', 1);
+	}
+
+	// Check for too many recipients
+	if (!empty($address_list['u']) && $max_recipients && sizeof($address_list['u']) > $max_recipients)
+	{
+		$address_list = get_recipients($address_list, $max_recipients);
+		$error[] = $user->lang('TOO_MANY_RECIPIENTS', $max_recipients);
 	}

 	// Always check if the submitted attachment data is valid and belongs to the user.
@@ -948,6 +1000,7 @@ function compose_pm($id, $mode, $action)
 		'URL_STATUS'			=> ($url_status) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'],
 		'MINI_POST_IMG'			=> $user->img('icon_post_target', $user->lang['PM']),
 		'ERROR'					=> (sizeof($error)) ? implode('<br />', $error) : '',
+		'MAX_RECIPIENTS'		=> ($config['allow_mass_pm'] && ($auth->acl_get('u_masspm') || $auth->acl_get('u_masspm_group'))) ? $max_recipients : 0,

 		'S_COMPOSE_PM'			=> true,
 		'S_EDIT_POST'			=> ($action == 'edit'),
@@ -1026,14 +1079,33 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
 		}
 	}

+	// Add Selected Groups
+	$group_list = request_var('group_list', array(0));
+
+	// Build usernames to add
+	$usernames = (isset($_REQUEST['username'])) ? array(request_var('username', '', true)) : array();
+	$username_list = request_var('username_list', '', true);
+	if ($username_list)
+	{
+		$usernames = array_merge($usernames, explode("\n", $username_list));
+	}
+
+	// If add to or add bcc not pressed, users could still have usernames listed they want to add...
+	if (!$add_to && !$add_bcc && (sizeof($group_list) || sizeof($usernames)))
+	{
+		$add_to = true;
+
+		global $refresh, $submit, $preview;
+
+		$refresh = $preview = true;
+		$submit = false;
+	}
+
 	// Add User/Group [TO]
 	if ($add_to || $add_bcc)
 	{
 		$type = ($add_to) ? 'to' : 'bcc';

-		// Add Selected Groups
-		$group_list = request_var('group_list', array(0));
-
 		if (sizeof($group_list))
 		{
 			foreach ($group_list as $group_id)
@@ -1045,14 +1117,6 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
 		// User ID's to add...
 		$user_id_ary = array();

-		// Build usernames to add
-		$usernames = (isset($_REQUEST['username'])) ? array(request_var('username', '', true)) : array();
-		$username_list = request_var('username_list', '', true);
-		if ($username_list)
-		{
-			$usernames = array_merge($usernames, explode("\n", $username_list));
-		}
-
 		// Reveal the correct user_ids
 		if (sizeof($usernames))
 		{
@@ -1067,7 +1131,7 @@ function handle_message_list_actions(&$address_list, &$error, $remove_u, $remove
 		}

 		// Add Friends if specified
-		$friend_list = (is_array($_REQUEST['add_' . $type])) ? array_map('intval', array_keys($_REQUEST['add_' . $type])) : array();
+		$friend_list = (isset($_REQUEST['add_' . $type]) && is_array($_REQUEST['add_' . $type])) ? array_map('intval', array_keys($_REQUEST['add_' . $type])) : array();
 		$user_id_ary = array_merge($user_id_ary, $friend_list);

 		foreach ($user_id_ary as $user_id)
@@ -1143,22 +1207,22 @@ function num_recipients($address_list)
 }

 /**
-* Get recipient at position 'pos'
+* Get number of 'num_recipients' recipients from first position
 */
-function get_recipient_pos($address_list, $position = 1)
+function get_recipients($address_list, $num_recipients = 1)
 {
 	$recipient = array();

-	$count = 1;
+	$count = 0;
 	foreach ($address_list as $field => $adr_ary)
 	{
 		foreach ($adr_ary as $id => $type)
 		{
-			if ($count == $position)
+			if ($count >= $num_recipients)
 			{
-				$recipient[$field][$id] = $type;
 				break 2;
 			}
+			$recipient[$field][$id] = $type;
 			$count++;
 		}
 	}