X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FText%2FMarkdown.php;h=8173a62af770dd487d8a3d80d4bbe9fec7d6f8be;hb=55369613d46eda72d5e120d5cf66703867eb03e3;hp=8d363675fc47ef9ae54bcaf254a5d86777c6a8f3;hpb=3c76826793feeb933dab7a07dab7cc7eb2efc451;p=friendica.git
diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index 8d363675fc..8173a62af7 100644
--- a/src/Content/Text/Markdown.php
+++ b/src/Content/Text/Markdown.php
@@ -1,19 +1,31 @@
.
+ *
*/
namespace Friendica\Content\Text;
-use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Contact;
/**
* Friendica-specific usage of Markdown
- *
- * @author Hypolite Petovan
*/
class Markdown
{
@@ -21,63 +33,71 @@ class Markdown
* Converts a Markdown string into HTML. The hardwrap parameter maximizes
* compatibility with Diaspora in spite of the Markdown standard.
*
- * @brief Converts a Markdown string into HTML
* @param string $text
- * @param bool $hardwrap
+ * @param bool $hardwrap Enables line breaks on \n without two trailing spaces
+ * @param string $baseuri Optional. Prepend anchor links with this URL
* @return string
- * @throws \Exception
*/
- public static function convert($text, $hardwrap = true) {
- $stamp1 = microtime(true);
+ public static function convert($text, $hardwrap = true, $baseuri = null) {
+ DI::profiler()->startRecording('rendering');
$MarkdownParser = new MarkdownParser();
$MarkdownParser->code_class_prefix = 'language-';
$MarkdownParser->hard_wrap = $hardwrap;
$MarkdownParser->hashtag_protection = true;
- $MarkdownParser->url_filter_func = function ($url) {
- if (strpos($url, '#') === 0) {
- $url = ltrim($_SERVER['REQUEST_URI'], '/') . $url;
+ $MarkdownParser->url_filter_func = function ($url) use ($baseuri) {
+ if (!empty($baseuri) && strpos($url, '#') === 0) {
+ $url = ltrim($baseuri, '/') . $url;
}
return $url;
};
+ $text = self::convertDiasporaMentionsToHtml($text);
+
$html = $MarkdownParser->transform($text);
- DI::profiler()->saveTimestamp($stamp1, "parser", System::callstack());
+ DI::profiler()->stopRecording();
return $html;
}
/**
- * @brief Callback function to replace a Diaspora style mention in a mention for Friendica
+ * Replace Diaspora-style mentions in a text since they trip the Markdown parser autolinker.
*
- * @param array $match Matching values for the callback
- * [1] = mention type (@ or !)
- * [2] = name (optional)
- * [3] = address
- * @return string Replaced mention
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @throws \ImagickException
+ * @param string $text
+ * @return string
*/
- private static function diasporaMention2BBCodeCallback($match)
+ private static function convertDiasporaMentionsToHtml(string $text)
{
- if ($match[3] == '') {
- return;
- }
-
- $data = Contact::getDetailsByAddr($match[3]);
-
- if (empty($data)) {
- return;
- }
-
- $name = $match[2];
-
- if ($name == '') {
- $name = $data['name'];
- }
-
- return $match[1] . '[url=' . $data['url'] . ']' . $name . '[/url]';
+ return preg_replace_callback(
+ '/([@!]){(?:([^}]+?); ?)?([^} ]+)}/',
+ /*
+ * Matching values for the callback
+ * [1] = mention type (@ or !)
+ * [2] = name (optional)
+ * [3] = profile URL
+ */
+ function ($matches) {
+ if ($matches[3] == '') {
+ return '';
+ }
+
+ $data = Contact::getByURL($matches[3]);
+
+ if (empty($data)) {
+ return '';
+ }
+
+ $name = $matches[2];
+
+ if ($name == '') {
+ $name = $data['name'];
+ }
+
+ return $matches[1] . '' . $name . '';
+ },
+ $text
+ );
}
/*
@@ -88,7 +108,7 @@ class Markdown
*/
public static function toBBCode($s)
{
- $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
+ DI::profiler()->startRecording('rendering');
// The parser cannot handle paragraphs correctly
$s = str_replace(['
', '', '
'], ['
', '
', '
'], $s);
@@ -98,17 +118,11 @@ class Markdown
$s = self::convert($s);
- $regexp = "/([@!])\{(?:([^\}]+?); ?)?([^\} ]+)\}/";
- $s = preg_replace_callback($regexp, ['self', 'diasporaMention2BBCodeCallback'], $s);
-
$s = HTML::toBBCode($s);
// protect the recycle symbol from turning into a tag, but without unescaping angles and naked ampersands
$s = str_replace('♲', html_entity_decode('♲', ENT_QUOTES, 'UTF-8'), $s);
- // Convert everything that looks like a link to a link
- $s = preg_replace('/([^\]=]|^)(https?\:\/\/)([a-zA-Z0-9:\/\-?&;.=_~#%$!+,@]+(?stopRecording();
return $s;
}
}