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

- some private message fixes

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@5139 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2005-05-01 13:15:49 +00:00
parent be3bdf61d7
commit 16e50db4ba
9 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/includes/ucp/ucp_pm.php
View File

@@ -132,9 +132,11 @@ class ucp_pm extends module
FROM ' . GROUPS_TABLE . '
WHERE group_id = ' . $user->data['group_id'];
$result = $db->sql_query($sql);
$user->data['group_message_limit'] = (int) $db->sql_fetchfield('group_message_limit', 0, $result);
$message_limit = (int) $db->sql_fetchfield('group_message_limit', 0, $result);
$db->sql_freeresult($result);
$user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit;
get_folder($user->data['user_id'], $folder);
include($phpbb_root_path . 'includes/ucp/ucp_pm_options.'.$phpEx);
@@ -156,9 +158,11 @@ class ucp_pm extends module
FROM ' . GROUPS_TABLE . '
WHERE group_id = ' . $user->data['group_id'];
$result = $db->sql_query($sql);
$user->data['group_message_limit'] = (int) $db->sql_fetchfield('group_message_limit', 0, $result);
$message_limit = (int) $db->sql_fetchfield('group_message_limit', 0, $result);
$db->sql_freeresult($result);
$user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit;
if ($folder_specified)
{
$folder_id = $folder_specified;
@@ -188,13 +192,11 @@ class ucp_pm extends module
// Move PM
if (isset($_REQUEST['move_pm']))
{
$message_limit = (!$user->data['group_message_limit']) ? $config['pm_max_msgs'] : $user->data['group_message_limit'];
$move_msg_ids = (isset($_POST['marked_msg_id'])) ? array_map('intval', $_POST['marked_msg_id']) : array();
$dest_folder = request_var('dest_folder', PRIVMSGS_NO_BOX);
$cur_folder_id = request_var('cur_folder_id', PRIVMSGS_NO_BOX);
if (move_pm($user->data['user_id'], $message_limit, $move_msg_ids, $dest_folder, $cur_folder_id))
if (move_pm($user->data['user_id'], $user->data['message_limit'], $move_msg_ids, $dest_folder, $cur_folder_id))
{
// Return to folder view if single message moved
if ($action == 'view_message')
@@ -219,7 +221,7 @@ class ucp_pm extends module
place_pm_into_folder($global_privmsgs_rules, request_var('release', 0));
$num_not_moved = $user->data['user_new_privmsg'];
}
if (!$msg_id && $folder_id == PRIVMSGS_NO_BOX && $mode != 'unread')
{
$folder_id = PRIVMSGS_INBOX;