| Line 92 | Line 92 |
|---|
{
if ($user->data['user_new_privmsg'])
{
|
{
if ($user->data['user_new_privmsg'])
{
|
$l_new_message = ($user->data['user_new_privmsg'] == 1 ) ? $user->lang['YOU_NEW_PM'] : $user->lang['YOU_NEW_PMS'];
| $l_new_message = ($user->data['user_new_privmsg'] == 1) ? $user->lang['YOU_NEW_PM'] : $user->lang['YOU_NEW_PMS'];
|
}
else
{
| }
else
{
|
| Line 115 | Line 115 |
|---|
case 'compose':
$action = request_var('action', 'post');
|
case 'compose':
$action = request_var('action', 'post');
|
get_folder($user->data['user_id']);
| $user_folders = get_folder($user->data['user_id']);
|
if (!$auth->acl_get('u_sendpm'))
{
|
if (!$auth->acl_get('u_sendpm'))
{
|
trigger_error('NO_AUTH_SEND_MESSAGE');
| // trigger_error('NO_AUTH_SEND_MESSAGE');
$template->assign_vars(array(
'S_NO_AUTH_SEND_MESSAGE' => true,
'S_COMPOSE_PM_VIEW' => true,
));
$tpl_file = 'ucp_pm_viewfolder';
break;
|
}
include($phpbb_root_path . 'includes/ucp/ucp_pm_compose.' . $phpEx);
|
}
include($phpbb_root_path . 'includes/ucp/ucp_pm_compose.' . $phpEx);
|
compose_pm($id, $mode, $action);
| compose_pm($id, $mode, $action, $user_folders);
|
$tpl_file = 'posting_body';
break;
case 'options':
|
$tpl_file = 'posting_body';
break;
case 'options':
|
$sql = 'SELECT group_message_limit
FROM ' . GROUPS_TABLE . '
WHERE group_id = ' . $user->data['group_id'];
$result = $db->sql_query($sql, 3600);
$message_limit = (int) $db->sql_fetchfield('group_message_limit');
$db->sql_freeresult($result);
$user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit;
| set_user_message_limit();
|
get_folder($user->data['user_id']);
include($phpbb_root_path . 'includes/ucp/ucp_pm_options.' . $phpEx);
| get_folder($user->data['user_id']);
include($phpbb_root_path . 'includes/ucp/ucp_pm_options.' . $phpEx);
|
| Line 168 | Line 167 |
|---|
case 'view':
|
case 'view':
|
$sql = 'SELECT group_message_limit
FROM ' . GROUPS_TABLE . '
WHERE group_id = ' . $user->data['group_id'];
$result = $db->sql_query($sql, 3600);
$message_limit = (int) $db->sql_fetchfield('group_message_limit');
$db->sql_freeresult($result);
$user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit;
| set_user_message_limit();
|
if ($folder_specified)
{
|
if ($folder_specified)
{
|
| Line 251 | Line 243 |
|---|
$num_not_moved = $num_removed = 0;
$release = request_var('release', 0);
|
$num_not_moved = $num_removed = 0;
$release = request_var('release', 0);
|
if ($user->data['user_new_privmsg'] && $action == 'view_folder')
| if ($user->data['user_new_privmsg'] && ($action == 'view_folder' || $action == 'view_message'))
|
{
$return = place_pm_into_folder($global_privmsgs_rules, $release);
$num_not_moved = $return['not_moved'];
| {
$return = place_pm_into_folder($global_privmsgs_rules, $release);
$num_not_moved = $return['not_moved'];
|
