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

[ticket/13803] Added tests, fixed param order in generate_text_for_storage()

Browse Source 
PHPBB3-13803
This commit is contained in:
JoshyPHP
2015-05-01 19:21:01 +02:00
parent 986af43f37
commit b5911281ae
5 changed files with 135 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/textreparser/base.php
View File

@@ -63,8 +63,8 @@ abstract class base implements reparser_interface
$bitfield,
$flags,
$unparsed['enable_bbcode'],
$unparsed['enable_smilies'],
$unparsed['enable_magic_url']
$unparsed['enable_magic_url'],
$unparsed['enable_smilies']
);
// Save the new text if it has changed

39
phpBB/phpbb/textreparser/plugins/user_signature.php
View File

@@ -15,15 +15,48 @@ namespace phpbb\textreparser\plugins;
class user_signature extends \phpbb\textreparser\row_based_plugin
{
/**
* @var array Bit numbers used for user options
* @see \phpbb\user
*/
protected $keyoptions;
/**
* Constructor
*
* Retrieves and saves the bit numbers used for user options
*/
public function __construct()
{
$class_vars = get_class_vars('phpbb\\user');
$this->keyoptions = $class_vars['keyoptions'];
}
/**
* {@inheritdoc}
*/
protected function add_missing_fields(array $row)
{
$options = $row['user_options'];
$row += array(
'enable_bbcode' => phpbb_optionget($this->keyoptions['sig_bbcode'], $options),
'enable_smilies' => phpbb_optionget($this->keyoptions['sig_smilies'], $options),
'enable_magic_url' => phpbb_optionget($this->keyoptions['sig_links'], $options),
);
return $row;
}
/**
* {@inheritdoc}
*/
protected function get_columns()
{
return array(
'id' => 'user_id',
'text' => 'user_sig',
'bbcode_uid' => 'user_sig_bbcode_uid',
'id' => 'user_id',
'text' => 'user_sig',
'bbcode_uid' => 'user_sig_bbcode_uid',
'user_options' => 'user_options',
);
}

34
phpBB/phpbb/textreparser/row_based_plugin.php
View File

@@ -44,6 +44,29 @@ abstract class row_based_plugin extends base
*/
abstract protected function get_table_name();
/**
* Add fields to given row, if applicable
*
* The enable_* fields are not always saved to the database. Sometimes we need to guess their
* original value based on the text content or possibly other fields
*
* @param array $row Original row
* @return array Complete row
*/
protected function add_missing_fields(array $row)
{
if (!isset($row['enable_bbcode'], $row['enable_smilies'], $row['enable_magic_url']))
{
$row += array(
'enable_bbcode' => !empty($row['bbcode_uid']),
'enable_smilies' => (strpos($row['text'], '<!-- s') !== false),
'enable_magic_url' => (strpos($row['text'], '<!-- m -->') !== false),
);
}
return $row;
}
/**
* {@inheritdoc}
*/
@@ -67,16 +90,7 @@ abstract class row_based_plugin extends base
$result = $this->db->sql_query($this->get_records_query($min_id, $max_id));
while ($row = $this->db->sql_fetchrow($result))
{
if (!isset($row['enable_bbcode'], $row['enable_smilies'], $row['enable_magic_url']))
{
// Those fields are not saved to the database, we need to guess their original value
$row += array(
'enable_bbcode' => !empty($row['bbcode_uid']),
'enable_smilies' => (strpos($row['text'], '<!-- s') !== false),
'enable_magic_url' => (strpos($row['text'], '<!-- m -->') !== false)
);
}
$records[] = $row;
$records[] = $this->add_missing_fields($row);
}
$this->db->sql_freeresult($result);