Markdown: refurbished link parsing

- Added parsing of plain links in Markdown
- Linking with []() syntax should no longer produce relative links
This commit is contained in:
Marcin Kurczewski 2013-10-26 12:08:42 +02:00
parent cf749aa5fd
commit 35146e9587

View file

@ -7,20 +7,37 @@ class CustomMarkdown extends \Michelf\Markdown
$this->span_gamut += ['doSpoilers' => 71];
$this->span_gamut += ['doPosts' => 8];
$this->span_gamut += ['doTags' => 9];
$this->span_gamut += ['doAutoLinks2' => 29];
parent::__construct();
}
protected function doAutoLinks2($text)
{
$text = preg_replace_callback('{(?<!<)((https?|ftp):[^\'"><\s]+)}i', [&$this, '_doAutoLinks_url_callback'], $text);
$text = preg_replace_callback('{(?<!\w)(www\.[^\'"><\s]+)}i', [&$this, '_doAutoLinks_url_callback'], $text);
return $text;
}
protected function _doAnchors_inline_callback($matches)
{
if ($matches[3] == '')
$url = &$matches[4];
else
$url = &$matches[3];
if (!preg_match('/^((https?|ftp):|)\/\//', $url))
$url = 'http://' . $url;
return parent::_doAnchors_inline_callback($matches);
}
protected function doHardBreaks($text)
{
return preg_replace_callback('/\n/', array(&$this, '_doHardBreaks_callback'), $text);
return preg_replace_callback('/\n/', [&$this, '_doHardBreaks_callback'], $text);
}
protected function doSpoilers($text)
{
if (is_array($text))
{
$text = $this->hashPart('<span class="spoiler">') . $text[1] . $this->hashPart('</span>');
}
return preg_replace_callback('{\[spoiler\]((?:[^\[]|\[(?!\/?spoiler\])|(?R))+)\[\/spoiler\]}is', [__CLASS__, 'doSpoilers'], $text);
}