X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=markdown%2Fmarkdown.php;h=283d8ee20754f6954b758a310130bf672e20b299;hb=886c56e4b7a96c7d88c58d1bec1da36abc987b89;hp=f02bc2a017f208b878e08bd72be7b8ae1c7def76;hpb=f2fc22227a0dfae8f5c85f24f1c5bfa6e5c4c245;p=friendica-addons.git

diff --git a/markdown/markdown.php b/markdown/markdown.php
index f02bc2a0..283d8ee2 100644
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -17,7 +17,7 @@ function markdown_install() {
 	Hook::register('addon_settings_post',   __FILE__, 'markdown_addon_settings_post');
 }
 
-function markdown_addon_settings(App $a, &$s)
+function markdown_addon_settings(App $a, array &$data)
 {
 	if (!local_user()) {
 		return;
@@ -25,12 +25,16 @@ function markdown_addon_settings(App $a, &$s)
 
 	$enabled = intval(DI::pConfig()->get(local_user(), 'markdown', 'enabled'));
 
-	$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/');
-	$s .= Renderer::replaceMacros($t, [
-		'$title'   => DI::l10n()->t('Markdown'),
-		'$enabled' => ['enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, self created items will additionally be parsed via Markdown.')],
-		'$submit'  => DI::l10n()->t('Save Settings'),
+	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/');
+	$html = Renderer::replaceMacros($t, [
+		'$enabled' => ['enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, adds Markdown support to the Compose Post form.')],
 	]);
+
+	$data = [
+		'addon' => 'markdown',
+		'title' => DI::l10n()->t('Markdown Settings'),
+		'html'  => $html,
+	];
 }
 
 function markdown_addon_settings_post(App $a, &$b)
@@ -47,26 +51,22 @@ function markdown_post_local_start(App $a, &$request) {
 		return;
 	}
 
-	// Elements that shouldn't be parsed
-	$elements = ['code', 'noparse', 'nobb', 'pre', 'share', 'url', 'img', 'bookmark',
-		'audio', 'video', 'youtube', 'vimeo', 'attachment', 'iframe', 'map', 'mail'];
-	foreach ($elements as $element) {
-		$request['body'] = preg_replace_callback("/\[" . $element . "(.*?)\](.*?)\[\/" . $element . "\]/ism",
-			function ($match) use ($element) {
-				return '[' . $element . '-b64' . base64_encode($match[1]) . ']' . base64_encode($match[2]) . '[/b64-' . $element . ']';
-			},
-			$request['body']
-		);
-	}
-
-	$request['body'] = Markdown::toBBCode($request['body']);
+	// Escape elements that shouldn't be parsed
+	$request['body'] = \Friendica\Content\Text\BBCode::performWithEscapedTags(
+		$request['body'],
+		['code', 'noparse', 'nobb', 'pre', 'share', 'url', 'img', 'bookmark',
+			'audio', 'video', 'youtube', 'vimeo', 'attachment', 'iframe', 'map', 'mail'],
+		function ($body) {
+			// Escape mentions which username can contain Markdown-like characters
+			// See https://github.com/friendica/friendica/issues/9486
+			return \Friendica\Util\Strings::performWithEscapedBlocks($body, '/[@!][^@\s]+@[^\s]+\w/', function ($text) {
+				// Markdown accepts literal HTML but we do not in post body, so we need to escape left chevrons
+				// (right chevrons are used for quoting in Markdown)
+				// See https://github.com/friendica/friendica/issues/10634
+				$text = strtr($text, ['<' => '&lt;']);
 
-	foreach (array_reverse($elements) as $element) {
-		$request['body'] = preg_replace_callback("/\[" . $element . "-b64(.*?)\](.*?)\[\/b64-" . $element . "\]/ism",
-			function ($match) use ($element) {
-				return '[' . $element . base64_decode($match[1]) . ']' . base64_decode($match[2]) . '[/' . $element . ']';
-			},
-			$request['body']
-		);
-	}
+				return Markdown::toBBCode($text);
+			});
+		}
+	);
 }