bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Improve mod/babel

Browse source 
- Handle multiple line endings
- Conserve HTML special chars in input box on submit
- Add new result panel with HTML::toMarkdown result
This commit is contained in:
Hypolite Petovan 2018-09-17 23:18:34 -04:00
parent 382a7f5acd
commit d6985baaed
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/babel.php
View file

@ -10,7 +10,7 @@ function visible_whitespace($s)
{ {
$s = str_replace(' ', ' ', $s); $s = str_replace(' ', ' ', $s);
return str_replace("\n", '<br />', $s); return str_replace(["\r\n", "\n", "\r"], '<br />', $s);
} }
function babel_content() function babel_content()
@ -114,6 +114,12 @@ function babel_content()
'content' => visible_whitespace($bbcode) 'content' => visible_whitespace($bbcode)
]; ];
$markdown = Text\HTML::toMarkdown($html);
$results[] = [
'title' => L10n::t('HTML::toMarkdown'),
'content' => visible_whitespace($markdown)
];
$text = Text\HTML::toPlaintext($html); $text = Text\HTML::toPlaintext($html);
$results[] = [ $results[] = [
'title' => L10n::t('HTML::toPlaintext'), 'title' => L10n::t('HTML::toPlaintext'),
@ -124,7 +130,7 @@ function babel_content()
$tpl = get_markup_template('babel.tpl'); $tpl = get_markup_template('babel.tpl');
$o = replace_macros($tpl, [ $o = replace_macros($tpl, [
'$text' => ['text', L10n::t('Source text'), defaults($_REQUEST, 'text', ''), ''], '$text' => ['text', L10n::t('Source text'), htmlentities(defaults($_REQUEST, 'text', '')), ''],
'$type_bbcode' => ['type', L10n::t('BBCode'), 'bbcode', '', defaults($_REQUEST, 'type', 'bbcode') == 'bbcode'], '$type_bbcode' => ['type', L10n::t('BBCode'), 'bbcode', '', defaults($_REQUEST, 'type', 'bbcode') == 'bbcode'],
'$type_markdown' => ['type', L10n::t('Markdown'), 'markdown', '', defaults($_REQUEST, 'type', 'bbcode') == 'markdown'], '$type_markdown' => ['type', L10n::t('Markdown'), 'markdown', '', defaults($_REQUEST, 'type', 'bbcode') == 'markdown'],
'$type_html' => ['type', L10n::t('HTML'), 'html', '', defaults($_REQUEST, 'type', 'bbcode') == 'html'], '$type_html' => ['type', L10n::t('HTML'), 'html', '', defaults($_REQUEST, 'type', 'bbcode') == 'html'],