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

[ticket/10922] Added support for body and subject in email BBCode

Browse source 
PHPBB3-10922
This commit is contained in:
JoshyPHP 2015-04-28 02:40:33 +02:00
parent 6870293a9e
commit 102b6c2df3
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/phpbb/textformatter/s9e/factory.php
View file

@ -68,7 +68,7 @@ class factory implements \phpbb\textformatter\cache_interface
'b' => '[B]{TEXT}[/B]',
'code' => '[CODE]{TEXT}[/CODE]',
'color' => '[COLOR={COLOR}]{TEXT}[/COLOR]',
'email' => '[EMAIL={EMAIL;useContent}]{TEXT}[/EMAIL]',
'email' => '[EMAIL={EMAIL;useContent} subject={TEXT;optional;postFilter=urlencode} body={TEXT;optional;postFilter=urlencode}]{TEXT}[/EMAIL]',
'flash' => '[FLASH={NUMBER1},{NUMBER2} width={NUMBER1;postFilter=#flashwidth} height={NUMBER2;postFilter=#flashheight} url={URL;useContent} /]',
'i' => '[I]{TEXT}[/I]',
'img' => '[IMG src={IMAGEURL;useContent}]',
@ -97,7 +97,18 @@ class factory implements \phpbb\textformatter\cache_interface
'img' => '<img src="{IMAGEURL}" alt="{L_IMAGE}"/>',
'size' => '<span style="font-size: {FONTSIZE}%; line-height: normal"><xsl:apply-templates/></span>',
'color' => '<span style="color: {COLOR}"><xsl:apply-templates/></span>',
'email' => '<a href="mailto:{EMAIL}"><xsl:apply-templates/></a>',
'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>',
);
/**

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

@ -1 +1,3 @@
<a href="mailto:user@example.org">user@example.org</a><a href="mailto:user@example.org">...</a>
<a href="mailto:user@example.org">user@example.org</a><br>
<a href="mailto:user@example.org">...</a><br>
<a href="mailto:user@example.org?subject=Hello&amp;body=Sent+from+phpBB">user@example.org</a><br>

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

@ -1 +1,3 @@
[email]user@example.org[/email][email=user@example.org]...[/email]
[email]user@example.org[/email]
[email=user@example.org]...[/email]
[email subject="Hello" body="Sent from phpBB"]user@example.org[/email]