X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FContent%2FText%2FMarkdown.php;h=0687b5377b0e82bf408251bcecdc7562d2deb652;hb=58c6ef2bc0fdf7ca7210e98fd21a1b08c08ed409;hp=1d2f68bc7c4ef2bbc0c930c4c15acdaa01bdcd0d;hpb=29f7ebe307c22b275466390937b82ccb3820fb1c;p=friendica.git
diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index 1d2f68bc7c..0687b5377b 100644
--- a/src/Content/Text/Markdown.php
+++ b/src/Content/Text/Markdown.php
@@ -7,12 +7,14 @@
namespace Friendica\Content\Text;
use Friendica\BaseObject;
+use Friendica\Model\Contact;
use Michelf\MarkdownExtra;
+use Friendica\Content\Text\HTML;
/**
* Friendica-specific usage of Markdown
*
- * @author Hypolite Petovan
+ * @author Hypolite Petovan
*/
class Markdown extends BaseObject
{
@@ -30,10 +32,92 @@ class Markdown extends BaseObject
$MarkdownParser = new MarkdownExtra();
$MarkdownParser->hard_wrap = $hardwrap;
+ $MarkdownParser->code_class_prefix = 'language-';
$html = $MarkdownParser->transform($text);
self::getApp()->save_timestamp($stamp1, "parser");
return $html;
}
+
+ /**
+ * @brief Callback function to replace a Diaspora style mention in a mention for Friendica
+ *
+ * @param array $match Matching values for the callback
+ * @return string Replaced mention
+ */
+ private static function diasporaMention2BBCodeCallback($match)
+ {
+ if ($match[2] == '') {
+ return;
+ }
+
+ $data = Contact::getDetailsByAddr($match[2]);
+
+ if (empty($data)) {
+ return;
+ }
+
+ $name = $match[1];
+
+ if ($name == '') {
+ $name = $data['name'];
+ }
+
+ return '@[url=' . $data['url'] . ']' . $name . '[/url]';
+ }
+
+ /*
+ * we don't want to support a bbcode specific markdown interpreter
+ * and the markdown library we have is pretty good, but provides HTML output.
+ * So we'll use that to convert to HTML, then convert the HTML back to bbcode,
+ * and then clean up a few Diaspora specific constructs.
+ */
+ public static function toBBCode($s)
+ {
+ $s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
+
+ // Handles single newlines
+ $s = str_replace("\r\n", "\n", $s);
+ $s = str_replace("\n", " \n", $s);
+ $s = str_replace("\r", " \n", $s);
+
+ // Replace lonely stars in lines not starting with it with literal stars
+ $s = preg_replace('/^([^\*]+)\*([^\*]*)$/im', '$1\*$2', $s);
+
+ // The parser cannot handle paragraphs correctly
+ $s = str_replace(['
', '', '
'], ['
', '
', '
'], $s);
+
+ // Escaping the hash tags
+ $s = preg_replace('/\#([^\s\#])/', '#$1', $s);
+
+ $s = self::convert($s);
+
+ $regexp = "/@\{(?:([^\}]+?); )?([^\} ]+)\}/";
+ $s = preg_replace_callback($regexp, ['self', 'diasporaMention2BBCodeCallback'], $s);
+
+ $s = str_replace('#', '#', $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:\/\-?&;.=_~#%$!+,@]+(?