phpBB

Code Changes

File: includes/functions_content.php

  Unmodified   Added   Modified   Removed
Line 460Line 460
/**
* Decode text whereby text is coming from the db and expected to be pre-parsed content
* We are placing this outside of the message parser because we are often in need of it...

/**
* Decode text whereby text is coming from the db and expected to be pre-parsed content
* We are placing this outside of the message parser because we are often in need of it...

 
*
* NOTE: special chars are kept encoded
*
* @param string &$message Original message, passed by reference
* @param string $bbcode_uid BBCode UID
* @return null

*/
function decode_message(&$message, $bbcode_uid = '')
{

*/
function decode_message(&$message, $bbcode_uid = '')
{

	global $config, $phpbb_dispatcher;

if ($bbcode_uid)
{
$match = array('<br />', "[/*:m:$bbcode_uid]", ":u:$bbcode_uid", ":o:$bbcode_uid", ":$bbcode_uid");
$replace = array("\n", '', '', '', '');
}
else
{
$match = array('<br />');
$replace = array("\n");
}

	global $phpbb_container, $phpbb_dispatcher;













/**
* Use this event to modify the message before it is decoded


/**
* Use this event to modify the message before it is decoded

Line 488Line 483
	$vars = array('message_text', 'bbcode_uid');
extract($phpbb_dispatcher->trigger_event('core.decode_message_before', compact($vars)));
$message = $message_text;

	$vars = array('message_text', 'bbcode_uid');
extract($phpbb_dispatcher->trigger_event('core.decode_message_before', compact($vars)));
$message = $message_text;

 

if (preg_match('#^<[rt][ >]#', $message))
{
$message = htmlspecialchars($phpbb_container->get('text_formatter.utils')->unparse($message), ENT_COMPAT);
}
else
{
if ($bbcode_uid)
{
$match = array('<br />', "[/*:m:$bbcode_uid]", ":u:$bbcode_uid", ":o:$bbcode_uid", ":$bbcode_uid");
$replace = array("\n", '', '', '', '');
}
else
{
$match = array('<br />');
$replace = array("\n");
}


$message = str_replace($match, $replace, $message);

$match = get_preg_expression('bbcode_htm');


$message = str_replace($match, $replace, $message);

$match = get_preg_expression('bbcode_htm');

	$replace = array('\1', '\1', '\2', '\1', '', '');

		$replace = array('\1', '\1', '\2', '\2', '\1', '', '');


$message = preg_replace($match, $replace, $message);


$message = preg_replace($match, $replace, $message);

 
	}


/**
* Use this event to modify the message after it is decoded


/**
* Use this event to modify the message after it is decoded

Line 511Line 524
}

/**

}

/**

* Strips all bbcode from a text and returns the plain content

* Strips all bbcode from a text in place

*/
function strip_bbcode(&$text, $uid = '')

*/
function strip_bbcode(&$text, $uid = '')

 
{
global $phpbb_container;

if (preg_match('#^<[rt][ >]#', $text))
{
$text = $phpbb_container->get('text_formatter.utils')->clean_formatting($text);
}
else

{
if (!$uid)
{

{
if (!$uid)
{

Line 526Line 547
	$replace = array('\1', '\1', '\2', '\1', '', '');

$text = preg_replace($match, $replace, $text);

	$replace = array('\1', '\1', '\2', '\1', '', '');

$text = preg_replace($match, $replace, $text);

 
	}

}

/**

}

/**

Line 535Line 557
function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text = true)
{
static $bbcode;

function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text = true)
{
static $bbcode;

	global $phpbb_dispatcher;

	global $phpbb_dispatcher, $phpbb_container;


if ($text === '')
{


if ($text === '')
{

Line 556Line 578
	$vars = array('text', 'uid', 'bitfield', 'flags', 'censor_text');
extract($phpbb_dispatcher->trigger_event('core.modify_text_for_display_before', compact($vars)));


	$vars = array('text', 'uid', 'bitfield', 'flags', 'censor_text');
extract($phpbb_dispatcher->trigger_event('core.modify_text_for_display_before', compact($vars)));


 
	if (preg_match('#^<[rt][ >]#', $text))
{
$renderer = $phpbb_container->get('text_formatter.renderer');

// Temporarily switch off viewcensors if applicable
$old_censor = $renderer->get_viewcensors();
if ($old_censor !== $censor_text)
{
$renderer->set_viewcensors($censor_text);
}

$text = $renderer->render($text);

// Restore the previous value
if ($old_censor !== $censor_text)
{
$renderer->set_viewcensors($old_censor);
}
}
else
{

	if ($censor_text)
{
$text = censor_text($text);

	if ($censor_text)
{
$text = censor_text($text);

Line 584Line 627

$text = bbcode_nl2br($text);
$text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES));


$text = bbcode_nl2br($text);
$text = smiley_text($text, !($flags & OPTION_FLAG_SMILIES));

 
	}


/**
* Use this event to modify the text after it is parsed


/**
* Use this event to modify the text after it is parsed

Line 604Line 648
/**
* For parsing custom parsed text to be stored within the database.
* This function additionally returns the uid and bitfield that needs to be stored.

/**
* For parsing custom parsed text to be stored within the database.
* This function additionally returns the uid and bitfield that needs to be stored.

* Expects $text to be the value directly from request_var() and in it's non-parsed form

* Expects $text to be the value directly from $request->variable() and in it's non-parsed form

*
* @param string $text The text to be replaced with the parsed one
* @param string $uid The BBCode uid for this parse

*
* @param string $text The text to be replaced with the parsed one
* @param string $uid The BBCode uid for this parse

Line 613Line 657
* @param bool $allow_bbcode If BBCode is allowed (i.e. if BBCode is parsed)
* @param bool $allow_urls If urls is allowed
* @param bool $allow_smilies If smilies are allowed

* @param bool $allow_bbcode If BBCode is allowed (i.e. if BBCode is parsed)
* @param bool $allow_urls If urls is allowed
* @param bool $allow_smilies If smilies are allowed

 
* @param bool $allow_img_bbcode
* @param bool $allow_flash_bbcode
* @param bool $allow_quote_bbcode
* @param bool $allow_url_bbcode
* @param string $mode Mode to parse text as, e.g. post or sig

*
* @return array An array of string with the errors that occurred while parsing
*/

*
* @return array An array of string with the errors that occurred while parsing
*/

function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false)

function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bbcode = false, $allow_urls = false, $allow_smilies = false, $allow_img_bbcode = true, $allow_flash_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $mode = 'post')

{
global $phpbb_root_path, $phpEx, $phpbb_dispatcher;


{
global $phpbb_root_path, $phpEx, $phpbb_dispatcher;


Line 631Line 680
	* @var bool		allow_bbcode	Whether or not to parse BBCode
* @var bool allow_urls Whether or not to parse URLs
* @var bool allow_smilies Whether or not to parse Smilies

	* @var bool		allow_bbcode	Whether or not to parse BBCode
* @var bool allow_urls Whether or not to parse URLs
* @var bool allow_smilies Whether or not to parse Smilies

 
	* @var bool		allow_img_bbcode	Whether or not to parse the [img] BBCode
* @var bool allow_flash_bbcode Whether or not to parse the [flash] BBCode
* @var bool allow_quote_bbcode Whether or not to parse the [quote] BBCode
* @var bool allow_url_bbcode Whether or not to parse the [url] BBCode
* @var string mode Mode to parse text as, e.g. post or sig

	* @since 3.1.0-a1

	* @since 3.1.0-a1

 
	* @changed 3.2.0-a1

	*/
$vars = array(
'text',

	*/
$vars = array(
'text',

Line 641Line 696
		'allow_bbcode',
'allow_urls',
'allow_smilies',

		'allow_bbcode',
'allow_urls',
'allow_smilies',

 
		'allow_img_bbcode',
'allow_flash_bbcode',
'allow_quote_bbcode',
'allow_url_bbcode',
'mode',

	);
extract($phpbb_dispatcher->trigger_event('core.modify_text_for_storage_before', compact($vars)));

$uid = $bitfield = '';
$flags = (($allow_bbcode) ? OPTION_FLAG_BBCODE : 0) + (($allow_smilies) ? OPTION_FLAG_SMILIES : 0) + (($allow_urls) ? OPTION_FLAG_LINKS : 0);

	);
extract($phpbb_dispatcher->trigger_event('core.modify_text_for_storage_before', compact($vars)));

$uid = $bitfield = '';
$flags = (($allow_bbcode) ? OPTION_FLAG_BBCODE : 0) + (($allow_smilies) ? OPTION_FLAG_SMILIES : 0) + (($allow_urls) ? OPTION_FLAG_LINKS : 0);


if ($text === '')
{
return;
}

 

if (!class_exists('parse_message'))
{


if (!class_exists('parse_message'))
{

Line 658Line 713
	}

$message_parser = new parse_message($text);

	}

$message_parser = new parse_message($text);

	$message_parser->parse($allow_bbcode, $allow_urls, $allow_smilies);

	$message_parser->parse($allow_bbcode, $allow_urls, $allow_smilies, $allow_img_bbcode, $allow_flash_bbcode, $allow_quote_bbcode, $allow_url_bbcode, true, $mode);


$text = $message_parser->message;
$uid = $message_parser->bbcode_uid;


$text = $message_parser->message;
$uid = $message_parser->bbcode_uid;

Line 693Line 748
*/
function generate_text_for_edit($text, $uid, $flags)
{

*/
function generate_text_for_edit($text, $uid, $flags)
{

	global $phpbb_root_path, $phpEx, $phpbb_dispatcher;

	global $phpbb_dispatcher;


/**
* Use this event to modify the text before it is decoded for editing


/**
* Use this event to modify the text before it is decoded for editing

Line 980Line 1035
*/
function smiley_text($text, $force_option = false)
{

*/
function smiley_text($text, $force_option = false)
{

	global $config, $user, $phpbb_path_helper;

	global $config, $user, $phpbb_path_helper, $phpbb_dispatcher;


if ($force_option || !$config['allow_smilies'] || !$user->optionget('viewsmilies'))
{


if ($force_option || !$config['allow_smilies'] || !$user->optionget('viewsmilies'))
{

Line 989Line 1044
	else
{
$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_path_helper->get_web_root_path();

	else
{
$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_path_helper->get_web_root_path();

 

/**
* Event to override the root_path for smilies
*
* @event core.smiley_text_root_path
* @var string root_path root_path for smilies
* @since 3.1.11-RC1
*/
$vars = array('root_path');
extract($phpbb_dispatcher->trigger_event('core.smiley_text_root_path', compact($vars)));

		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img class="smilies" src="' . $root_path . $config['smilies_path'] . '/\2 />', $text);
}
}

		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img class="smilies" src="' . $root_path . $config['smilies_path'] . '/\2 />', $text);
}
}

Line 999Line 1064
* @param mixed $forum_id The forum id the attachments are displayed in (false if in private message)
* @param string &$message The post/private message
* @param array &$attachments The attachments to parse for (inline) display. The attachments array will hold templated data after parsing.

* @param mixed $forum_id The forum id the attachments are displayed in (false if in private message)
* @param string &$message The post/private message
* @param array &$attachments The attachments to parse for (inline) display. The attachments array will hold templated data after parsing.

* @param array &$update_count The attachment counts to be updated - will be filled

* @param array &$update_count_ary The attachment counts to be updated - will be filled

* @param bool $preview If set to true the attachments are parsed for preview. Within preview mode the comments are fetched from the given $attachments array and not fetched from the database.
*/

* @param bool $preview If set to true the attachments are parsed for preview. Within preview mode the comments are fetched from the given $attachments array and not fetched from the database.
*/

function parse_attachments($forum_id, &$message, &$attachments, &$update_count, $preview = false)

function parse_attachments($forum_id, &$message, &$attachments, &$update_count_ary, $preview = false)

{
if (!sizeof($attachments))
{

{
if (!sizeof($attachments))
{

Line 1089Line 1154
		// Some basics...
$attachment['extension'] = strtolower(trim($attachment['extension']));
$filename = $phpbb_root_path . $config['upload_path'] . '/' . utf8_basename($attachment['physical_filename']);

		// Some basics...
$attachment['extension'] = strtolower(trim($attachment['extension']));
$filename = $phpbb_root_path . $config['upload_path'] . '/' . utf8_basename($attachment['physical_filename']);

		$thumbnail_filename = $phpbb_root_path . $config['upload_path'] . '/thumb_' . utf8_basename($attachment['physical_filename']);

 

$upload_icon = '';



$upload_icon = '';


Line 1131Line 1195

if (!$denied)
{


if (!$denied)
{

			$l_downloaded_viewed = $download_link = '';

 
			$display_cat = $extensions[$attachment['extension']]['display_cat'];

if ($display_cat == ATTACHMENT_CATEGORY_IMAGE)

			$display_cat = $extensions[$attachment['extension']]['display_cat'];

if ($display_cat == ATTACHMENT_CATEGORY_IMAGE)

Line 1192Line 1255
						'U_INLINE_LINK'		=> $inline_link,
);


						'U_INLINE_LINK'		=> $inline_link,
);


					$update_count[] = $attachment['attach_id'];

					$update_count_ary[] = $attachment['attach_id'];

				break;

// Images, but display Thumbnail

				break;

// Images, but display Thumbnail

Line 1205Line 1268
						'THUMB_IMAGE'		=> $thumbnail_link,
);


						'THUMB_IMAGE'		=> $thumbnail_link,
);


					$update_count[] = $attachment['attach_id'];
break;

// Windows Media Streams
case ATTACHMENT_CATEGORY_WM:

// Giving the filename directly because within the wm object all variables are in local context making it impossible
// to validate against a valid session (all params can differ)
// $download_link = $filename;

$block_array += array(
'U_FORUM' => generate_board_url(),
'ATTACH_ID' => $attachment['attach_id'],
'S_WM_FILE' => true,
);

// Viewed/Heared File ... update the download count
$update_count[] = $attachment['attach_id'];
break;

// Real Media Streams
case ATTACHMENT_CATEGORY_RM:
case ATTACHMENT_CATEGORY_QUICKTIME:

$block_array += array(
'S_RM_FILE' => ($display_cat == ATTACHMENT_CATEGORY_RM) ? true : false,
'S_QUICKTIME_FILE' => ($display_cat == ATTACHMENT_CATEGORY_QUICKTIME) ? true : false,
'U_FORUM' => generate_board_url(),
'ATTACH_ID' => $attachment['attach_id'],
);

// Viewed/Heared File ... update the download count
$update_count[] = $attachment['attach_id'];

					$update_count_ary[] = $attachment['attach_id'];

































				break;

// Macromedia Flash Files

				break;

// Macromedia Flash Files

Line 1252Line 1283
					);

// Viewed/Heared File ... update the download count

					);

// Viewed/Heared File ... update the download count

					$update_count[] = $attachment['attach_id'];

					$update_count_ary[] = $attachment['attach_id'];

				break;

default:

				break;

default:

Line 1275Line 1306
			);
}


			);
}


 
		$update_count = $update_count_ary;

		/**
* Use this event to modify the attachment template data.
*

		/**
* Use this event to modify the attachment template data.
*

Line 1302Line 1334
			'update_count',
);
extract($phpbb_dispatcher->trigger_event('core.parse_attachments_modify_template_data', compact($vars)));

			'update_count',
);
extract($phpbb_dispatcher->trigger_event('core.parse_attachments_modify_template_data', compact($vars)));

 
		$update_count_ary = $update_count;
unset($update_count);


$template->assign_block_vars('_file', $block_array);



$template->assign_block_vars('_file', $block_array);


Line 1387Line 1421
*/
function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = false, $append = '')
{

*/
function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = false, $append = '')
{

	$chars = array();


 
	$strip_reply = false;
$stripped = false;
if ($allow_reply && strpos($string, 'Re: ') === 0)

	$strip_reply = false;
$stripped = false;
if ($allow_reply && strpos($string, 'Re: ') === 0)