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

[ticket/9109] Properly document and calculate the group settings with value 0

Browse Source 
PHPBB3-9109
This commit is contained in:
Joas Schilling
2015-01-25 00:33:26 +01:00
parent b0c910e49c
commit 291143fe6a
5 changed files with 170 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
phpBB/includes/functions_privmsgs.php
View File

@@ -2139,17 +2139,56 @@ function set_user_message_limit()
{
global $user, $db, $config;
// Get maximum about from user memberships - if it is 0, there is no limit set and we use the maximum value within the config.
$sql = 'SELECT MAX(g.group_message_limit) as max_message_limit
// Get maximum about from user memberships
$message_limit = phpbb_get_max_setting_from_group($db, $user->data['user_id'], 'message_limit');
// If it is 0, there is no limit set and we use the maximum value within the config.
$user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit;
}
/**
* Get the maximum PM setting for the groups of the user
*
* @param \phpbb\db\driver\driver_interface $db
* @param int $user_id
* @param string $setting Only 'max_recipients' and 'message_limit' are supported
* @return int The maximum setting for all groups of the user, unless one group has '0'
*/
function phpbb_get_max_setting_from_group(\phpbb\db\driver\driver_interface $db, $user_id, $setting)
{
if ($setting !== 'max_recipients' && $setting !== 'message_limit')
{
throw new InvalidArgumentException('Setting "' . $setting . '" is not supported');
}
// Get maximum number of allowed recipients
$sql = 'SELECT MAX(g.group_' . $setting . ') as max_setting
FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
WHERE ug.user_id = ' . $user->data['user_id'] . '
WHERE ug.user_id = ' . (int) $user_id . '
AND ug.user_pending = 0
AND ug.group_id = g.group_id';
$result = $db->sql_query($sql);
$message_limit = (int) $db->sql_fetchfield('max_message_limit');
$max_setting = (int) $db->sql_fetchfield('max_setting');
$db->sql_freeresult($result);
$user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit;
if ($max_setting)
{
// If the user is limited by a group, check whether he is also set to
// unlimited in another group (value 0)
$sql = 'SELECT g.group_' . $setting . ' as max_setting
FROM ' . GROUPS_TABLE . ' g, ' . USER_GROUP_TABLE . ' ug
WHERE ug.user_id = ' . (int) $user_id . '
AND ug.user_pending = 0
AND ug.group_id = g.group_id
AND g.group_max_recipients = 0';
$result = $db->sql_query($sql);
$is_unlimited = $db->sql_fetchfield('max_setting');
$db->sql_freeresult($result);
$max_setting = ($is_unlimited === false) ? $max_setting : 0;
}
return $max_setting;
}
/**

10
phpBB/includes/ucp/ucp_pm_compose.php
View File

@@ -504,15 +504,9 @@ function compose_pm($id, $mode, $action, $user_folders = array())
}
// 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 = phpbb_get_max_setting_from_group($db, $user->data['user_id'], 'max_recipients');
// If it is 0, there is no limit set and we use the maximum value within the config.
$max_recipients = (!$max_recipients) ? $config['pm_max_recipients'] : $max_recipients;
// If this is a quote/reply "to all"... we may increase the max_recpients to the number of original recipients