mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 16:35:35 +02:00
Code Issues Releases Wiki Activity

- Remove the BBCode UIDs from the output

Browse Source 
- Faster generation of CAPTCHA images


git-svn-id: file:///svn/phpbb/trunk@5575 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M
2006-02-22 22:17:36 +00:00
parent 6b13f94be9
commit ac011448ab
2 changed files with 98 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
phpBB/includes/ucp/ucp_confirm.php
View File

@ -191,9 +191,23 @@ class ucp_confirm
else
{
// The total length of this image, uncompressed, is just a calculation of pixels
$len = $temp_len = ($width + 1) * $height;
$len = ($width + 1) * $height;
// Adler-32 hash generation
// Note: The hash is _backwards_ so we must reverse it
if (@extension_loaded('hash'))
{
$adler_hash = hash('adler32', $raw_image, true);
}
else if (@extension_loaded('mhash'))
{
$adler_hash = mhash(MHASH_ADLER32, $raw_image);
}
else
{
// Optimized Adler-32 loop ported from the GNU Classpath project
$temp_len = $len;
$s1 = 1;
$s2 = 0;
$i = 0;
@ -217,10 +231,11 @@ class ucp_confirm
$s2 %= 65521;
}
$adler = ($s2 << 16) | $s1;
$adler_hash = pack('C4', $adler & 255, ($adler >> 8) & 255, ($adler >> 16) & 255, ($adler >> 24) & 255);
}
// This is the same thing as gzcompress($raw_image, 0)
$raw_image = pack('C7', 0x78, 0x01, 0x01, $len, ($len >> 8) & 255, ~$len & 255, ~($len >> 8)) . $raw_image;
$raw_image .= pack('C4', ($adler >> 24) & 255, ($adler >> 16) & 255, ($adler >> 8) & 255, $adler & 255);
// This is the same thing as gzcompress($raw_image, 0) but does not need zlib
$raw_image = pack('C7', 0x78, 0x01, 0x01, $len, ($len >> 8) & 255, ~$len & 255, ~($len >> 8)) . $raw_image . strrev($adler_hash);
// The Zlib header + Adler hash make us add on 11
$len += 11;

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

@ -17,6 +17,10 @@ function view_folder($id, $mode, $folder_id, $folder, $type)
global $user, $template, $auth, $db, $cache;
global $phpbb_root_path, $config, $phpEx, $SID;
$submit_export = (isset($_POST['submit_export'])) ? true : false;
if (!$submit_export)
{
$user->add_lang('viewforum');
// Grab icons
@ -61,6 +65,7 @@ function view_folder($id, $mode, $folder_id, $folder, $type)
'S_UNREAD' => ($type == 'unread'),
'S_MARK_OPTIONS'=> $s_mark_options)
);
}
$folder_info = get_pm_from($folder_id, $folder, $user->data['user_id'], "{$phpbb_root_path}ucp.$phpEx$SID", $type);
@ -123,11 +128,15 @@ function view_folder($id, $mode, $folder_id, $folder, $type)
$data = array();
$export_type = request_var('export_option', '');
$enclosure = request_var('enclosure', '');
$delimiter = request_var('delimiter', '');
foreach ($folder_info['pm_list'] as $message_id)
{
$row = &$folder_info['rowset'][$message_id];
if (isset($_REQUEST['submit_export']))
if ($submit_export && ($export_type !== 'CSV' || ($delimiter !== '' && $enclosure !== '')))
{
$sql = 'SELECT p.message_text
FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u
@ -140,9 +149,11 @@ function view_folder($id, $mode, $folder_id, $folder, $type)
$message_row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$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']);
$message = preg_replace('#\[(\/?[a-z\*\+\-]+(?:=.*?)?)(?:\:?[0-9a-z]{5,})\]#', '[\1]', $message_row['message_text']);
$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);
}
else
else if (!$submit_export || $export_type !== 'CSV')
{
$folder_img = ($row['unread']) ? 'folder_new' : 'folder';
$folder_alt = ($row['unread']) ? 'NEW_MESSAGES' : 'NO_NEW_MESSAGES';
@ -199,27 +210,22 @@ function view_folder($id, $mode, $folder_id, $folder, $type)
);
}
$type = request_var('export_option', '');
$enclosure = request_var('enclosure', '');
$delimiter = request_var('delimiter', '');
$submit_export = (isset($_POST['submit_export'])) ? true : false;
// Ask the user what he wants
if ($submit_export)
{
if ($delimiter === '' && $type == 'CSV')
if ($export_type == 'CSV' && ($delimiter === '' || $enclosure === ''))
{
$template->assign_var('PROMPT', true);
}
else
{
switch ($type)
switch ($export_type)
{
case 'CSV':
case 'CSV_EXCEL':
$mimetype = 'text/csv';
$filetype = 'csv';
if ($type == 'CSV_EXCEL')
if ($export_type == 'CSV_EXCEL')
{
$enclosure = '"';
$delimiter = ',';