phpBB

Code Changes

File: includes/ucp/ucp_pm.php

  Unmodified   Added   Modified   Removed
Line 209Line 209
					$submit_mark = false;
}


					$submit_mark = false;
}


				if (($move_pm || $submit_mark) && !check_form_key('ucp_pm_view'))




				// Move PM
if ($move_pm)
{
if (!check_form_key('ucp_pm_view'))

				{
trigger_error('FORM_INVALID');
}


				{
trigger_error('FORM_INVALID');
}


				// Move PM
if ($move_pm)
{

 
					$move_msg_ids	= (isset($_POST['marked_msg_id'])) ? $request->variable('marked_msg_id', array(0)) : array();
$cur_folder_id = $request->variable('cur_folder_id', PRIVMSGS_NO_BOX);


					$move_msg_ids	= (isset($_POST['marked_msg_id'])) ? $request->variable('marked_msg_id', array(0)) : array();
$cur_folder_id = $request->variable('cur_folder_id', PRIVMSGS_NO_BOX);


Line 361Line 361

$template->assign_vars(array(
'CUR_FOLDER_ID' => $folder_id,


$template->assign_vars(array(
'CUR_FOLDER_ID' => $folder_id,

					'CUR_FOLDER_NAME'		=> $folder_status['folder_name'],

					'CUR_FOLDER_NAME'		=> $folder_status ? $folder_status['folder_name'] : false,

					'NUM_NOT_MOVED'			=> $num_not_moved,
'NUM_REMOVED' => $num_removed,
'RELEASE_MESSAGE_INFO' => sprintf($user->lang['RELEASE_MESSAGES'], '<a href="' . $this->u_action . '&amp;folder=' . $folder_id . '&amp;release=1">', '</a>'),

					'NUM_NOT_MOVED'			=> $num_not_moved,
'NUM_REMOVED' => $num_removed,
'RELEASE_MESSAGE_INFO' => sprintf($user->lang['RELEASE_MESSAGES'], '<a href="' . $this->u_action . '&amp;folder=' . $folder_id . '&amp;release=1">', '</a>'),

Line 384Line 384
					'S_IN_OUTBOX'			=> ($folder_id == PRIVMSGS_OUTBOX) ? true : false,
'S_IN_SENTBOX' => ($folder_id == PRIVMSGS_SENTBOX) ? true : false,


					'S_IN_OUTBOX'			=> ($folder_id == PRIVMSGS_OUTBOX) ? true : false,
'S_IN_SENTBOX' => ($folder_id == PRIVMSGS_SENTBOX) ? true : false,


					'FOLDER_STATUS'				=> $folder_status['message'],
'FOLDER_MAX_MESSAGES' => $folder_status['max'],
'FOLDER_CUR_MESSAGES' => $folder_status['cur'],
'FOLDER_REMAINING_MESSAGES' => $folder_status['remaining'],
'FOLDER_PERCENT' => $folder_status['percent'])
);

					'FOLDER_STATUS'				=> $folder_status ? $folder_status['message'] : false,
'FOLDER_MAX_MESSAGES' => $folder_status ? $folder_status['max'] : false,
'FOLDER_CUR_MESSAGES' => $folder_status ? $folder_status['cur'] : false,
'FOLDER_REMAINING_MESSAGES' => $folder_status ? $folder_status['remaining'] : false,
'FOLDER_PERCENT' => $folder_status ? $folder_status['percent'] : false,
));


if ($action == 'view_folder')
{


if ($action == 'view_folder')
{

Line 405Line 405
				{
$template->assign_vars(array(
'S_VIEW_MESSAGE' => true,

				{
$template->assign_vars(array(
'S_VIEW_MESSAGE' => true,

						'L_RETURN_TO_FOLDER'	=> $user->lang('RETURN_TO', $folder_status['folder_name']),

						'L_RETURN_TO_FOLDER'	=> $user->lang('RETURN_TO', $folder_status ? $folder_status['folder_name'] : ''),

						'MSG_ID'				=> $msg_id,
));


						'MSG_ID'				=> $msg_id,
));