Updated to the latest s9e\TextFormatter

composer.json

@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "Embed third-party content in your phpBB forum",
 	"homepage": "https://github.com/s9e/phpbb-ext-mediaembed/",
-	"version": "20150813",
+	"version": "20150930",
 	"keywords": ["phpbb","embed","forum","media"],
 	"license": "MIT",
 	"require": {

parsing.php

@@ -285,7 +285,7 @@ protected function finalizeOutput()
 		$this->outputText($this->textLen, 0, \true);
 		do
 		{
-			$this->output = \preg_replace('(<(?!/)[^>]+></[\\w:]+>)', '', $this->output, -1, $cnt);
+			$this->output = \preg_replace('(<([^ />]+)></\\1>)', '', $this->output, -1, $cnt);
 		}
 		while ($cnt > 0);
 		if (\strpos($this->output, '</i><i>') !== \false)
@@ -1554,45 +1554,9 @@ public function parse($text, array $matches)
 	public static function filterTag(Tag $tag, TagStack $tagStack, array $sites)
 	{
 		if ($tag->hasAttribute('media'))
-		{
-			$tagName = $tag->getAttribute('media');
-			if (!$tag->hasAttribute('id')
-			 && $tag->hasAttribute('url')
-			 && \strpos($tag->getAttribute('url'), '://') === \false)
-				$tag->setAttribute('id', $tag->getAttribute('url'));
-		}
+			self::addTagFromMediaId($tag, $tagStack, $sites);
 		elseif ($tag->hasAttribute('url'))
-		{
-			$p = \parse_url($tag->getAttribute('url'));
-			if (isset($p['scheme']) && isset($sites[$p['scheme'] . ':']))
-				$tagName = $sites[$p['scheme'] . ':'];
-			elseif (isset($p['host']))
-			{
-				$host = $p['host'];
-				do
-				{
-					if (isset($sites[$host]))
-					{
-						$tagName = $sites[$host];
-						break;
-					}
-					$pos = \strpos($host, '.');
-					if ($pos === \false)
-						break;
-					$host = \substr($host, 1 + $pos);
-				}
-				while ($host > '');
-			}
-		}
-		if (isset($tagName))
-		{
-			$endTag = $tag->getEndTag() ?: $tag;
-			$lpos = $tag->getPos();
-			$rpos = $endTag->getPos() + $endTag->getLen();
-			$newTag = $tagStack->addSelfClosingTag(\strtoupper($tagName), $lpos, $rpos - $lpos);
-			$newTag->setAttributes($tag->getAttributes());
-			$newTag->setSortPriority($tag->getSortPriority());
-		}
+			self::addTagFromMediaUrl($tag, $tagStack, $sites);
 		return \false;
 	}
 	public static function hasNonDefaultAttribute(Tag $tag)
@@ -1613,6 +1577,47 @@ public static function scrape(Tag $tag, array $scrapeConfig, $cacheDir = \null)
 			self::scrapeEntry($url, $tag, $scrape, $cacheDir);
 		return \true;
 	}
+	protected static function addSiteTag(Tag $tag, TagStack $tagStack, $siteId)
+	{
+		$endTag = $tag->getEndTag() ?: $tag;
+		$lpos = $tag->getPos();
+		$rpos = $endTag->getPos() + $endTag->getLen();
+		$newTag = $tagStack->addSelfClosingTag(\strtoupper($siteId), $lpos, $rpos - $lpos);
+		$newTag->setAttributes($tag->getAttributes());
+		$newTag->setSortPriority($tag->getSortPriority());
+	}
+	protected static function addTagFromMediaId(Tag $tag, TagStack $tagStack, array $sites)
+	{
+		if (!$tag->hasAttribute('id') && $tag->hasAttribute('url') && \strpos($tag->getAttribute('url'), '://') === \false)
+			$tag->setAttribute('id', $tag->getAttribute('url'));
+		$siteId = \strtolower($tag->getAttribute('media'));
+		if (\in_array($siteId, $sites, \true))
+			self::addSiteTag($tag, $tagStack, $siteId);
+	}
+	protected static function addTagFromMediaUrl(Tag $tag, TagStack $tagStack, array $sites)
+	{
+		$p = \parse_url($tag->getAttribute('url'));
+		if (isset($p['scheme']) && isset($sites[$p['scheme'] . ':']))
+			$siteId = $sites[$p['scheme'] . ':'];
+		elseif (isset($p['host']))
+			$siteId = self::findSiteIdByHost($p['host'], $sites);
+		if (!empty($siteId))
+			self::addSiteTag($tag, $tagStack, $siteId);
+	}
+	protected static function findSiteIdByHost($host, array $sites)
+	{
+		do
+		{
+			if (isset($sites[$host]))
+				return $sites[$host];
+			$pos = \strpos($host, '.');
+			if ($pos === \false)
+				break;
+			$host = \substr($host, 1 + $pos);
+		}
+		while ($host > '');
+		return \false;
+	}
 	protected static function replaceTokens($url, array $vars)
 	{
 		return \preg_replace_callback(

versions.json

@@ -1 +1 @@
-{"stable":{"20150813":{"current":"20150813","announcement":"https:\/\/www.phpbb.com\/community\/viewtopic.php?f=456&t=2272431","download":"https:\/\/github.com\/s9e\/phpbb-ext-mediaembed\/releases\/download\/20150813\/s9e-mediaembed-20150813.zip","eol":null,"security":false}}}
+{"stable":{"20150930":{"current":"20150930","announcement":"https:\/\/www.phpbb.com\/community\/viewtopic.php?f=456&t=2272431","download":"https:\/\/github.com\/s9e\/phpbb-ext-mediaembed\/releases\/download\/20150930\/s9e-mediaembed-20150930.zip","eol":null,"security":false}}}