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

Another one bites the dust :D

Browse Source 
- Nicer way of cleaning junk in PM export
- Added various signature and posting controls :P


git-svn-id: file:///svn/phpbb/trunk@5583 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M
2006-02-25 05:46:52 +00:00
parent 73a2c56104
commit f95e730adf
6 changed files with 81 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/ucp/ucp_pm_viewfolder.php
View File

@@ -138,7 +138,8 @@ function view_folder($id, $mode, $folder_id, $folder, $type)
if ($submit_export && ($export_type !== 'CSV' || ($delimiter !== '' && $enclosure !== '')))
{
$sql = 'SELECT p.message_text
include_once($phpbb_root_path . 'includes/functions_posting.'.$phpEx);
$sql = 'SELECT p.message_text, p.bbcode_uid
FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u
WHERE t.user_id = ' . $user->data['user_id'] . "
AND p.author_id = u.user_id
@@ -149,9 +150,9 @@ function view_folder($id, $mode, $folder_id, $folder, $type)
$message_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$message = preg_replace('#\[(\/?[a-z\*\+\-]+(?:=.*?)?)(?:\:?[0-9a-z]{5,})\]#', '[\1]', $message_row['message_text']);
decode_message($message_row['message_text'], $message_row['bbcode_uid']);
$data[] = array('subject' => censor_text($row['message_subject']), 'from' => $row['username'], 'date' => $user->format_date($row['message_time']), 'to' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode(', ', $address_list[$message_id]) : '', 'message' => $message);
$data[] = array('subject' => censor_text($row['message_subject']), 'from' => $row['username'], 'date' => $user->format_date($row['message_time']), 'to' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode(', ', $address_list[$message_id]) : '', 'message' => $message_row['message_text']);
}
else if (!$submit_export || $export_type !== 'CSV')
{