mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/13990] Reparse markup inside of forum rules/description

Browse Source 
PHPBB3-13990
This commit is contained in:
JoshyPHP
2015-07-06 19:17:40 +02:00
parent f81a2bc7c5
commit a44711e574
11 changed files with 160 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/text_reparser/plugins/fixtures/forums.xml
View File

@@ -5,87 +5,109 @@
<column>forum_parents</column>
<column>forum_desc</column>
<column>forum_desc_uid</column>
<column>forum_desc_options</column>
<column>forum_rules</column>
<column>forum_rules_uid</column>
<column>forum_rules_options</column>
<row>
<value>1</value>
<value></value>
<value>This row should be [b]ignored[/b]</value>
<value>abcd1234</value>
<value>0</value>
<value>This row should be [b]ignored[/b]</value>
<value>abcd1234</value>
<value>0</value>
</row>
<row>
<value>2</value>
<value></value>
<value>[b]Not bold[/b] :) http://example.org</value>
<value>abcd1234</value>
<value>0</value>
<value>[b]Not bold[/b] :) http://example.org</value>
<value>abcd1234</value>
<value>0</value>
</row>
<row>
<value>3</value>
<value></value>
<value>[b:abcd1234]Bold[/b:abcd1234] :) http://example.org</value>
<value>abcd1234</value>
<value>1</value>
<value>[b:abcd1234]Bold[/b:abcd1234] :) http://example.org</value>
<value>abcd1234</value>
<value>1</value>
</row>
<row>
<value>4</value>
<value></value>
<value><![CDATA[[b]Not bold[/b] <!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) --> http://example.org]]></value>
<value>abcd1234</value>
<value>2</value>
<value><![CDATA[[b]Not bold[/b] <!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) --> http://example.org]]></value>
<value>abcd1234</value>
<value>2</value>
</row>
<row>
<value>5</value>
<value></value>
<value><![CDATA[[b]Not bold[/b] :) <!-- m --><a class="postlink" href="http://example.org">http://example.org</a><!-- m -->]]></value>
<value>abcd1234</value>
<value>4</value>
<value><![CDATA[[b]Not bold[/b] :) <!-- m --><a class="postlink" href="http://example.org">http://example.org</a><!-- m -->]]></value>
<value>abcd1234</value>
<value>4</value>
</row>
<row>
<value>6</value>
<value></value>
<value><![CDATA[[flash=123,345:abcd1234]http&#58;//example&#46;org/flash&#46;swf[/flash:abcd1234]]]></value>
<value>abcd1234</value>
<value>1</value>
<value><![CDATA[[flash=123,345:abcd1234]http&#58;//example&#46;org/flash&#46;swf[/flash:abcd1234]]]></value>
<value>abcd1234</value>
<value>1</value>
</row>
<row>
<value>7</value>
<value></value>
<value><![CDATA[[flash=123,345]http://example.org/flash.swf[/flash]]]></value>
<value>abcd1234</value>
<value>0</value>
<value><![CDATA[[flash=123,345]http://example.org/flash.swf[/flash]]]></value>
<value>abcd1234</value>
<value>0</value>
</row>
<row>
<value>8</value>
<value></value>
<value><![CDATA[[img:abcd1234]http&#58;//example&#46;org/img&#46;png[/img:abcd1234]]]></value>
<value>abcd1234</value>
<value>1</value>
<value><![CDATA[[img:abcd1234]http&#58;//example&#46;org/img&#46;png[/img:abcd1234]]]></value>
<value>abcd1234</value>
<value>1</value>
</row>
<row>
<value>9</value>
<value></value>
<value><![CDATA[[img]http://example.org/img.png[/img]]]></value>
<value>abcd1234</value>
<value>0</value>
<value><![CDATA[[img]http://example.org/img.png[/img]]]></value>
<value>abcd1234</value>
<value>0</value>
</row>
<row>
<value>1000</value>
<value></value>
<value>This row should be [b]ignored[/b]</value>
<value>abcd1234</value>
<value>0</value>
<value>This row should be [b]ignored[/b]</value>
<value>abcd1234</value>
<value>0</value>
</row>
</table>
</dataset>

8
tests/text_reparser/plugins/fixtures/groups.xml
View File

@@ -38,25 +38,25 @@
<row>
<value>6</value>
<value><![CDATA[[flash=123,345:abcd1234]http&#58;//example&#46;org/flash&#46;swf[/flash:abcd1234]]]></value>
<value>7</value>
<value>1</value>
<value>abcd1234</value>
</row>
<row>
<value>7</value>
<value><![CDATA[[flash=123,345]http://example.org/flash.swf[/flash]]]></value>
<value>7</value>
<value>1</value>
<value>abcd1234</value>
</row>
<row>
<value>8</value>
<value><![CDATA[[img:abcd1234]http&#58;//example&#46;org/img&#46;png[/img:abcd1234]]]></value>
<value>7</value>
<value>1</value>
<value>abcd1234</value>
</row>
<row>
<value>9</value>
<value><![CDATA[[img]http://example.org/img.png[/img]]]></value>
<value>7</value>
<value>1</value>
<value>abcd1234</value>
</row>
<row>

60
tests/text_reparser/plugins/fixtures/poll_options.xml
View File

@@ -29,6 +29,21 @@
<value>2</value>
<value><![CDATA[<!-- m --><a class="postlink" href="http://example.org">http://example.org</a><!-- m -->]]></value>
</row>
<row>
<value>1</value>
<value>11</value>
<value>[b:abcd1234]Bold[/b:abcd1234] :) http://example.org</value>
</row>
<row>
<value>1</value>
<value>12</value>
<value><![CDATA[[b]Not bold[/b] <!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) --> http://example.org]]></value>
</row>
<row>
<value>1</value>
<value>13</value>
<value><![CDATA[[b]Not bold[/b] :) <!-- m --><a class="postlink" href="http://example.org">http://example.org</a><!-- m -->]]></value>
</row>
<row>
<value>1</value>
<value>123</value>
@@ -42,9 +57,39 @@
</table>
<table name="phpbb_posts">
<column>post_id</column>
<column>enable_bbcode</column>
<column>enable_smilies</column>
<column>enable_magic_url</column>
<column>post_text</column>
<column>bbcode_uid</column>
<row>
<value>1</value>
<value>1</value>
<value>1</value>
<value>1</value>
<value></value>
<value>abcd1234</value>
</row>
<row>
<value>11</value>
<value>1</value>
<value>0</value>
<value>0</value>
<value></value>
<value>abcd1234</value>
</row>
<row>
<value>12</value>
<value>0</value>
<value>1</value>
<value>0</value>
<value></value>
<value>abcd1234</value>
</row>
<row>
<value>13</value>
<value>0</value>
<value>0</value>
<value>1</value>
<value></value>
<value>abcd1234</value>
@@ -64,6 +109,21 @@
<value>1</value>
<value>This row should be [b]ignored[/b]</value>
</row>
<row>
<value>11</value>
<value>11</value>
<value>BBCode</value>
</row>
<row>
<value>12</value>
<value>12</value>
<value>Smilies</value>
</row>
<row>
<value>13</value>
<value>13</value>
<value>Magic URLs</value>
</row>
<row>
<value>123</value>
<value>1</value>

40
tests/text_reparser/plugins/fixtures/polls.xml
View File

@@ -2,9 +2,39 @@
<dataset>
<table name="phpbb_posts">
<column>post_id</column>
<column>enable_bbcode</column>
<column>enable_smilies</column>
<column>enable_magic_url</column>
<column>post_text</column>
<column>bbcode_uid</column>
<row>
<value>1</value>
<value>0</value>
<value>0</value>
<value>0</value>
<value></value>
<value>abcd1234</value>
</row>
<row>
<value>2</value>
<value>1</value>
<value>0</value>
<value>0</value>
<value></value>
<value>abcd1234</value>
</row>
<row>
<value>3</value>
<value>0</value>
<value>1</value>
<value>0</value>
<value></value>
<value>abcd1234</value>
</row>
<row>
<value>4</value>
<value>0</value>
<value>0</value>
<value>1</value>
<value></value>
<value>abcd1234</value>
@@ -26,22 +56,22 @@
</row>
<row>
<value>3</value>
<value>1</value>
<value>2</value>
<value>[b:abcd1234]Bold[/b:abcd1234] :) http://example.org</value>
</row>
<row>
<value>4</value>
<value>1</value>
<value>3</value>
<value><![CDATA[[b]Not bold[/b] <!-- s:) --><img src="{SMILIES_PATH}/icon_e_smile.gif" alt=":)" title="Smile" /><!-- s:) --> http://example.org]]></value>
</row>
<row>
<value>5</value>
<value>1</value>
<value>4</value>
<value><![CDATA[[b]Not bold[/b] :) <!-- m --><a class="postlink" href="http://example.org">http://example.org</a><!-- m -->]]></value>
</row>
<row>
<value>6</value>
<value>1</value>
<value>2</value>
<value><![CDATA[[flash=123,345:abcd1234]http&#58;//example&#46;org/flash&#46;swf[/flash:abcd1234]]]></value>
</row>
<row>
@@ -51,7 +81,7 @@
</row>
<row>
<value>8</value>
<value>1</value>
<value>2</value>
<value><![CDATA[[img:abcd1234]http&#58;//example&#46;org/img&#46;png[/img:abcd1234]]]></value>
</row>
<row>

17
tests/text_reparser/plugins/poll_option_test.php
View File

@@ -49,7 +49,7 @@ class phpbb_textreparser_poll_option_test extends phpbb_database_test_case
public function testReparse()
{
$reparser = $this->get_reparser();
$reparser->reparse_range(2, 3);
$reparser->reparse_range(2, 13);
$sql = 'SELECT topic_id, poll_option_id, poll_option_text
FROM ' . POLL_OPTIONS_TABLE . '
@@ -84,6 +84,21 @@ class phpbb_textreparser_poll_option_test extends phpbb_database_test_case
'poll_option_id' => 3,
'poll_option_text' => '<r><URL url="http://example.org">http://example.org</URL></r>',
),
array(
'topic_id' => 11,
'poll_option_id' => 1,
'poll_option_text' => '<r><B><s>[b]</s>Bold<e>[/b]</e></B> :) http://example.org</r>',
),
array(
'topic_id' => 12,
'poll_option_id' => 1,
'poll_option_text' => '<r>[b]Not bold[/b] <E>:)</E> http://example.org</r>',
),
array(
'topic_id' => 13,
'poll_option_id' => 1,
'poll_option_text' => '<r>[b]Not bold[/b] :) <URL url="http://example.org">http://example.org</URL></r>',
),
array(
'topic_id' => 123,
'poll_option_id' => 1,