makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2020-08-23 16:47:13 +02:00
commit d095a8537d
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
9 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/styles/prosilver/template/bbcode.html
View file

@ -77,6 +77,19 @@
<!-- BEGIN url --><a href="{URL}" class="postlink">{DESCRIPTION}</a><!-- END url --> <!-- BEGIN url --><a href="{URL}" class="postlink">{DESCRIPTION}</a><!-- END url -->
<!-- BEGIN email --><a href="mailto:{EMAIL}">{DESCRIPTION}</a><!-- END email --> <!-- BEGIN email -->
<a>
<xsl:attribute name="href">
<xsl:text>mailto:</xsl:text>
<xsl:value-of select="@email"/>
<xsl:if test="@subject or @body">
<xsl:text>?</xsl:text>
<xsl:if test="@subject">subject=<xsl:value-of select="@subject"/></xsl:if>
<xsl:if test="@body"><xsl:if test="@subject">&amp;</xsl:if>body=<xsl:value-of select="@body"/></xsl:if>
</xsl:if>
</xsl:attribute>
<xsl:apply-templates/>
</a>
<!-- END email -->
<!-- BEGIN flash --><object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}"><param name="movie" value="{URL}" /><param name="play" value="false" /><param name="loop" value="false" /><param name="quality" value="high" /><param name="allowScriptAccess" value="never" /><param name="allowNetworking" value="internal" /><embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="false" loop="false" quality="high" allowscriptaccess="never" allownetworking="internal"></embed></object><!-- END flash --> <!-- BEGIN flash --><object classid="clsid:D27CDB6E-AE6D-11CF-96B8-444553540000" codebase="http://active.macromedia.com/flash2/cabs/swflash.cab#version=5,0,0,0" width="{WIDTH}" height="{HEIGHT}"><param name="movie" value="{URL}" /><param name="play" value="false" /><param name="loop" value="false" /><param name="quality" value="high" /><param name="allowScriptAccess" value="never" /><param name="allowNetworking" value="internal" /><embed src="{URL}" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash" width="{WIDTH}" height="{HEIGHT}" play="false" loop="false" quality="high" allowscriptaccess="never" allownetworking="internal"></embed></object><!-- END flash -->

2
tests/test_framework/phpbb_test_case_helpers.php
View file

@ -402,7 +402,7 @@ class phpbb_test_case_helpers
$tables['phpbb_styles'][] = array( $tables['phpbb_styles'][] = array(
'style_id' => 1, 'style_id' => 1,
'style_path' => 'prosilver', 'style_path' => 'prosilver',
'bbcode_bitfield' => 'kNg=' 'bbcode_bitfield' => '//g='
); );
} }

14
tests/text_formatter/s9e/default_formatting_test.php
View file

@ -50,7 +50,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
return array( return array(
array( array(
'[b]bold[/b]', '[b]bold[/b]',
'<span style="font-weight:bold">bold</span>' '<strong class="text-strong">bold</strong>'
), ),
array( array(
'[u]underlined[/u]', '[u]underlined[/u]',
@ -58,7 +58,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
), ),
array( array(
'[i]italic[/i]', '[i]italic[/i]',
'<span style="font-style:italic">italic</span>' '<em class="text-italics">italic</em>'
), ),
array( array(
'[color=#FF0000]colored[/color]', '[color=#FF0000]colored[/color]',
@ -70,7 +70,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
), ),
array( array(
'[size=75]smaller[/size]', '[size=75]smaller[/size]',
'<span style="font-size: 75%; line-height: normal">smaller</span>' '<span style="font-size:75%;line-height:116%">smaller</span>'
), ),
array( array(
'[quote]quoted[/quote]', '[quote]quoted[/quote]',
@ -184,17 +184,17 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
array( array(
// Allow textual bbcodes in textual bbcodes // Allow textual bbcodes in textual bbcodes
'[b]bold [i]bold + italic[/i][/b]', '[b]bold [i]bold + italic[/i][/b]',
'<span style="font-weight:bold">bold <span style="font-style:italic">bold + italic</span></span>' '<strong class="text-strong">bold <em class="text-italics">bold + italic</em></strong>'
), ),
array( array(
// Allow textual bbcodes in url with description // Allow textual bbcodes in url with description
'[url=https://area51.phpbb.com/]Area51 [i]italic[/i][/url]', '[url=https://area51.phpbb.com/]Area51 [i]italic[/i][/url]',
'<a href="https://area51.phpbb.com/" class="postlink">Area51 <span style="font-style:italic">italic</span></a>' '<a href="https://area51.phpbb.com/" class="postlink">Area51 <em class="text-italics">italic</em></a>'
), ),
array( array(
// Allow url with description in textual bbcodes // Allow url with description in textual bbcodes
'[i]italic [url=https://area51.phpbb.com/]Area51[/url][/i]', '[i]italic [url=https://area51.phpbb.com/]Area51[/url][/i]',
'<span style="font-style:italic">italic <a href="https://area51.phpbb.com/" class="postlink">Area51</a></span>' '<em class="text-italics">italic <a href="https://area51.phpbb.com/" class="postlink">Area51</a></em>'
), ),
array( array(
// Do not parse textual bbcodes in code // Do not parse textual bbcodes in code
@ -209,7 +209,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
array( array(
// Textual bbcode nesting into textual bbcode // Textual bbcode nesting into textual bbcode
'[b]bold [i]bold + italic[/b] italic[/i]', '[b]bold [i]bold + italic[/b] italic[/i]',
'<span style="font-weight:bold">bold <span style="font-style:italic">bold + italic</span></span><span style="font-style:italic"> italic</span>' '<strong class="text-strong">bold <em class="text-italics">bold + italic</em></strong><em class="text-italics"> italic</em>'
), ),
array( array(
"[code]\tline1\n line2[/code]", "[code]\tline1\n line2[/code]",

2
tests/text_formatter/s9e/fixtures/default_formatting.xml
View file

@ -446,7 +446,7 @@
<value>&amp;copy; phpBB Group</value> <value>&amp;copy; phpBB Group</value>
<value>1</value> <value>1</value>
<value>prosilver</value> <value>prosilver</value>
<value>kNg=</value> <value>//g=</value>
<value>0</value> <value>0</value>
<value></value> <value></value>
</row> </row>

2
tests/text_formatter/s9e/fixtures/factory.xml
View file

@ -95,7 +95,7 @@
<value>&amp;copy; phpBB Group</value> <value>&amp;copy; phpBB Group</value>
<value>1</value> <value>1</value>
<value>prosilver</value> <value>prosilver</value>
<value>kNg=</value> <value>//g=</value>
<value>0</value> <value>0</value>
<value></value> <value></value>
</row> </row>

4
tests/text_processing/tickets_data/PHPBB3-10268.html
View file

@ -1,4 +1,4 @@
<blockquote><div><cite><a href="http://phpbb.com" class="postlink">http://phpbb.com</a> wrote:</cite>...</div></blockquote> <blockquote><div><cite><a href="http://phpbb.com" class="postlink">http://phpbb.com</a> wrote:</cite>...</div></blockquote>
<blockquote><div><cite><a href="http://phpbb.com" class="postlink"> http://phpbb.com</a> wrote:</cite>...</div></blockquote> <blockquote><div><cite><a href="http://phpbb.com" class="postlink"> http://phpbb.com</a> wrote:</cite>...</div></blockquote>
<span style="font-weight:bold"><a href="http://phpbb.com" class="postlink">http://phpbb.com</a></span><br> <strong class="text-strong"><a href="http://phpbb.com" class="postlink">http://phpbb.com</a></strong><br>
<span style="font-weight:bold"> <a href="http://phpbb.com" class="postlink">http://phpbb.com</a></span><br> <strong class="text-strong"> <a href="http://phpbb.com" class="postlink">http://phpbb.com</a></strong><br>

1
tests/text_processing/tickets_data/PHPBB3-10922.html
View file

@ -7,3 +7,4 @@
<a href="mailto:user@example.org?subject=Hello&amp;body=Sent%20from%20phpBB">user@example.org</a><br> <a href="mailto:user@example.org?subject=Hello&amp;body=Sent%20from%20phpBB">user@example.org</a><br>
<a href="mailto:user@example.org?subject=Hello&amp;body=Sent%20from%20phpBB">user@example.org</a><br> <a href="mailto:user@example.org?subject=Hello&amp;body=Sent%20from%20phpBB">user@example.org</a><br>
<a href="mailto:user@example.org?subject=Hello&amp;body=Sent%20from%20phpBB">...</a><br> <a href="mailto:user@example.org?subject=Hello&amp;body=Sent%20from%20phpBB">...</a><br>
<a href="mailto:user@example.org?subject=hi%26attach%3Dfoo">user@example.org</a><br>

1
tests/text_processing/tickets_data/PHPBB3-10922.txt
View file

@ -7,3 +7,4 @@
[email subject="Hello" body="Sent from phpBB"]user@example.org[/email] [email subject="Hello" body="Sent from phpBB"]user@example.org[/email]
[email body="Sent from phpBB" subject="Hello"]user@example.org[/email] [email body="Sent from phpBB" subject="Hello"]user@example.org[/email]
[email body="Sent from phpBB" subject="Hello" email="user@example.org"]...[/email] [email body="Sent from phpBB" subject="Hello" email="user@example.org"]...[/email]
[email subject="hi&attach=foo"]user@example.org[/email]

2
tests/text_processing/tickets_data/PHPBB3-13921.html
View file

@ -1 +1 @@
<span style="font-size: 200%; line-height: normal"></span><div style="text-align:center"><span style="font-size: 200%; line-height: normal">xxx</span></div> <span style="font-size:200%;line-height:116%"></span><div style="text-align:center"><span style="font-size:200%;line-height:116%">xxx</span></div>