aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMáté Bartus <CHItA@users.noreply.github.com>2017-09-07 15:08:12 +0200
committerGitHub <noreply@github.com>2017-09-07 15:08:12 +0200
commitda357f80f859844bcf0323201045ca082b9d68e7 (patch)
treeac124713422f2b58b29d07ffd603840c5da0fc1b
parent9af394eff3d3f571e8c8d82c4b2c10bc3de4accd (diff)
parente67d2ae3b9d71bfd9aa82ec250c13d1186b1e280 (diff)
downloadforums-da357f80f859844bcf0323201045ca082b9d68e7.tar
forums-da357f80f859844bcf0323201045ca082b9d68e7.tar.gz
forums-da357f80f859844bcf0323201045ca082b9d68e7.tar.bz2
forums-da357f80f859844bcf0323201045ca082b9d68e7.tar.xz
forums-da357f80f859844bcf0323201045ca082b9d68e7.zip
Merge pull request #4903 from rxu/ticket/15323
[ticket/15323] Allow Twig syntax in bbcode.html
-rw-r--r--phpBB/includes/bbcode.php5
-rw-r--r--phpBB/phpbb/textformatter/s9e/factory.php4
-rw-r--r--tests/text_formatter/s9e/factory_test.php25
-rw-r--r--tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html75
4 files changed, 102 insertions, 7 deletions
diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php
index e8492a82a3..6572c0ad2c 100644
--- a/phpBB/includes/bbcode.php
+++ b/phpBB/includes/bbcode.php
@@ -501,7 +501,10 @@ class bbcode
// Turn template blocks into PHP assignment statements for the values of $bbcode_tpl..
$this->bbcode_template = array();
- $matches = preg_match_all('#<!-- BEGIN (.*?) -->(.*?)<!-- END (?:.*?) -->#', $tpl, $match);
+ // Capture the BBCode template matches
+ // Allow phpBB template or the Twig syntax
+ $matches = (preg_match_all('#<!-- BEGIN (.*?) -->(.*?)<!-- END (?:.*?) -->#', $tpl, $match)) ?:
+ preg_match_all('#{% for (.*?) in .*? %}(.*?){% endfor %}#s', $tpl, $match);
for ($i = 0; $i < $matches; $i++)
{
diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php
index 3f2e0ab8cb..b3616a3063 100644
--- a/phpBB/phpbb/textformatter/s9e/factory.php
+++ b/phpBB/phpbb/textformatter/s9e/factory.php
@@ -521,7 +521,9 @@ class factory implements \phpbb\textformatter\cache_interface
protected function extract_templates($template)
{
// Capture the template fragments
- preg_match_all('#<!-- BEGIN (.*?) -->(.*?)<!-- END .*? -->#s', $template, $matches, PREG_SET_ORDER);
+ // Allow either phpBB template or the Twig syntax
+ preg_match_all('#<!-- BEGIN (.*?) -->(.*?)<!-- END .*? -->#s', $template, $matches, PREG_SET_ORDER) ?:
+ preg_match_all('#{% for (.*?) in .*? %}(.*?){% endfor %}#s', $template, $matches, PREG_SET_ORDER);
$fragments = array();
foreach ($matches as $match)
diff --git a/tests/text_formatter/s9e/factory_test.php b/tests/text_formatter/s9e/factory_test.php
index 3d3ea8b794..82b1b0043b 100644
--- a/tests/text_formatter/s9e/factory_test.php
+++ b/tests/text_formatter/s9e/factory_test.php
@@ -32,9 +32,15 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
return __DIR__ . '/../../tmp/';
}
- public function get_factory()
+ public function get_factory($styles_path = null)
{
global $config, $phpbb_root_path, $request, $user;
+
+ if (!isset($styles_path))
+ {
+ $styles_path = $phpbb_root_path . 'styles/';
+ }
+
$this->cache = new phpbb_mock_cache;
$dal = new \phpbb\textformatter\data_access(
$this->new_dbal(),
@@ -42,7 +48,7 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
'phpbb_smilies',
'phpbb_styles',
'phpbb_words',
- $phpbb_root_path . 'styles/'
+ $styles_path
);
$factory = new \phpbb\textformatter\s9e\factory(
$dal,
@@ -68,10 +74,8 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
return $factory;
}
- public function test_get_configurator()
+ public function run_configurator_assertions($configurator)
{
- $configurator = $this->get_factory()->get_configurator();
-
$this->assertInstanceOf('s9e\\TextFormatter\\Configurator', $configurator);
$this->assertTrue(isset($configurator->plugins['Autoemail']));
@@ -97,6 +101,17 @@ class phpbb_textformatter_s9e_factory_test extends phpbb_database_test_case
$this->assertTrue(isset($configurator->Emoticons[':D']));
}
+ public function test_get_configurator()
+ {
+ $configurator = $this->get_factory()->get_configurator();
+ $this->run_configurator_assertions($configurator);
+
+ // Test with twigified bbcode.html
+ $configurator = $this->get_factory(__DIR__ . '/fixtures/styles/')->get_configurator();
+ $this->run_configurator_assertions($configurator);
+
+ }
+
public function test_regenerate()
{
extract($this->get_factory()->regenerate());
diff --git a/tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html b/tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html
new file mode 100644
index 0000000000..22be395499
--- /dev/null
+++ b/tests/text_formatter/s9e/fixtures/styles/prosilver/template/bbcode.html
@@ -0,0 +1,75 @@
+{% for ulist_open in loops.ulist_open %}<ul style="list-style-type: {{ LIST_TYPE }}">{% endfor %}
+{% for ulist_open_default in loops.ulist_open_default %}<ul>{% endfor %}
+{% for ulist_close in loops.ulist_close %}</ul>{% endfor %}
+
+{% for olist_open in loops.olist_open %}<ol style="list-style-type: {{ LIST_TYPE }}">{% endfor %}
+{% for olist_close in loops.olist_close %}</ol>{% endfor %}
+
+{% for listitem in loops.listitem %}<li>{% endfor %}
+{% for listitem_close in loops.listitem_close %}</li>{% endfor %}
+
+{% for quote_username_open in loops.quote_username_open %}<blockquote><div><cite>{{ USERNAME }} {{ lang('WROTE') }}{{ lang('COLON') }}</cite>{% endfor %}
+{% for quote_open in loops.quote_open %}<blockquote class="uncited"><div>{% endfor %}
+{% for quote_close in loops.quote_close %}</div></blockquote>{% endfor %}
+{% for quote_extended in loops.quote_extended %}
+<blockquote>
+ <xsl:if test="not(@author)">
+ <xsl:attribute name="class">uncited</xsl:attribute>
+ </xsl:if>
+ <div>
+ <xsl:if test="@author">
+ <cite>
+ <xsl:choose>
+ <xsl:when test="@url">
+ <a href="{@url}" class="postlink"><xsl:value-of select="@author"/></a>
+ </xsl:when>
+ <xsl:when test="@profile_url">
+ <a href="{@profile_url}"><xsl:value-of select="@author"/></a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="@author"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text> </xsl:text>
+ <xsl:value-of select="$L_WROTE"/>
+ <xsl:value-of select="$L_COLON"/>
+ <xsl:if test="@post_url">
+ <xsl:text> </xsl:text>
+ <a href="{@post_url}" data-post-id="{@post_id}" onclick="if(document.getElementById(hash.substr(1)))href=hash">&#8593;</a>
+ </xsl:if>
+ <xsl:if test="@date">
+ <div class="responsive-hide"><xsl:value-of select="@date"/></div>
+ </xsl:if>
+ </cite>
+ </xsl:if>
+ <xsl:apply-templates/>
+ </div>
+</blockquote>
+{% endfor %}
+
+{% for code_open in loops.code_open %}<div class="codebox"><p>{{ lang('CODE') }}{{ lang('COLON') }} <a href="#" onclick="selectCode(this); return false;">{{ lang('SELECT_ALL_CODE') }}</a></p><pre><code>{% endfor %}
+{% for code_close in loops.code_close %}</code></pre></div>{% endfor %}
+
+{% for inline_attachment_open in loops.inline_attachment_open %}<div class="inline-attachment">{% endfor %}
+{% for inline_attachment_close in loops.inline_attachment_close %}</div>{% endfor %}
+
+{% for b_open in loops.b_open %}<strong class="text-strong">{% endfor %}
+{% for b_close in loops.b_close %}</strong>{% endfor %}
+
+{% for u_open in loops.u_open %}<span style="text-decoration: underline">{% endfor %}
+{% for u_close in loops.u_close %}</span>{% endfor %}
+
+{% for i_open in loops.i_open %}<em class="text-italics">{% endfor %}
+{% for i_close in loops.i_close %}</em>{% endfor %}
+
+{% for color in loops.color %}<span style="color: {{ COLOR }}">{{ TEXT }}</span>{% endfor %}
+
+{% for size in loops.size %}<span style="font-size: {{ SIZE }}%; line-height: 116%;">{{ TEXT }}</span>{% endfor %}
+
+{% for img in loops.img %}<img src="{{ URL }}" class="postimage" alt="{{ lang('IMAGE') }}" />{% endfor %}
+
+{% for url in loops.url %}<a href="{{ URL }}" class="postlink">{{ DESCRIPTION }}</a>{% endfor %}
+
+{% for email in loops.email %}<a href="mailto:{{ EMAIL }}">{{ DESCRIPTION }}</a>{% endfor %}
+
+{% for flash in loops.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>{% endfor %}