*/
use Friendica\App;
use Friendica\Core\Hook;
-use Friendica\Core\Logger;
use Friendica\Content\Text\Markdown;
use Friendica\Core\Renderer;
-use Friendica\Core\PConfig;
-use Friendica\Core\L10n;
+use Friendica\DI;
function markdown_install() {
Hook::register('post_local_start', __FILE__, 'markdown_post_local_start');
Hook::register('addon_settings_post', __FILE__, 'markdown_addon_settings_post');
}
-function markdown_addon_settings(App $a, &$s)
+function markdown_addon_settings(array &$data)
{
- if (!local_user()) {
+ if (!DI::userSession()->getLocalUserId()) {
return;
}
- $enabled = intval(PConfig::get(local_user(), 'markdown', 'enabled'));
+ $enabled = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'markdown', 'enabled'));
- $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/');
- $s .= Renderer::replaceMacros($t, [
- '$title' => L10n::t('Markdown'),
- '$enabled' => ['enabled', L10n::t('Enable Markdown parsing'), $enabled, L10n::t('If enabled, self created items will additionally be parsed via Markdown.')],
- '$submit' => 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)
+function markdown_addon_settings_post(array &$b)
{
- if (!local_user() || empty($_POST['markdown-submit'])) {
+ if (!DI::userSession()->getLocalUserId() || empty($_POST['markdown-submit'])) {
return;
}
- PConfig::set(local_user(), 'markdown', 'enabled', intval($_POST['enabled']));
+ DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'markdown', 'enabled', intval($_POST['enabled']));
}
-function markdown_post_local_start(App $a, &$request) {
- if (empty($request['body']) || !PConfig::get(local_user(), 'markdown', 'enabled')) {
+function markdown_post_local_start(&$request) {
+ if (empty($request['body']) || !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'markdown', 'enabled')) {
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, ['<' => '<']);
- 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);
+ });
+ }
+ );
}