mirror of
https://github.com/friendica/friendica
synced 2025-01-18 15:04:27 +00:00
replace method with anonymous function
This commit is contained in:
parent
3e523ddd09
commit
ee2cdc7763
2 changed files with 41 additions and 42 deletions
|
@ -25,6 +25,10 @@ class ActivityPubConversion extends BaseModule
|
||||||
{
|
{
|
||||||
$results = [];
|
$results = [];
|
||||||
|
|
||||||
|
$visible_whitespace = function (string $s): string {
|
||||||
|
return '<pre>' . htmlspecialchars($s) . '</pre>';
|
||||||
|
};
|
||||||
|
|
||||||
if (!empty($_REQUEST['source'])) {
|
if (!empty($_REQUEST['source'])) {
|
||||||
try {
|
try {
|
||||||
$source = json_decode($_REQUEST['source'], true);
|
$source = json_decode($_REQUEST['source'], true);
|
||||||
|
@ -39,11 +43,11 @@ class ActivityPubConversion extends BaseModule
|
||||||
$formatted = json_encode($source, JSON_PRETTY_PRINT);
|
$formatted = json_encode($source, JSON_PRETTY_PRINT);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Formatted'),
|
'title' => DI::l10n()->t('Formatted'),
|
||||||
'content' => $this->visible_whitespace(trim(var_export($formatted, true), "'")),
|
'content' => $visible_whitespace(trim(var_export($formatted, true), "'")),
|
||||||
];
|
];
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Source'),
|
'title' => DI::l10n()->t('Source'),
|
||||||
'content' => $this->visible_whitespace(var_export($source, true))
|
'content' => $visible_whitespace(var_export($source, true))
|
||||||
];
|
];
|
||||||
$activity = JsonLD::compact($source);
|
$activity = JsonLD::compact($source);
|
||||||
if (!$activity) {
|
if (!$activity) {
|
||||||
|
@ -51,7 +55,7 @@ class ActivityPubConversion extends BaseModule
|
||||||
}
|
}
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Activity'),
|
'title' => DI::l10n()->t('Activity'),
|
||||||
'content' => $this->visible_whitespace(var_export($activity, true))
|
'content' => $visible_whitespace(var_export($activity, true))
|
||||||
];
|
];
|
||||||
|
|
||||||
$type = JsonLD::fetchElement($activity, '@type');
|
$type = JsonLD::fetchElement($activity, '@type');
|
||||||
|
@ -99,14 +103,14 @@ class ActivityPubConversion extends BaseModule
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Object data'),
|
'title' => DI::l10n()->t('Object data'),
|
||||||
'content' => $this->visible_whitespace(var_export($object_data, true))
|
'content' => $visible_whitespace(var_export($object_data, true))
|
||||||
];
|
];
|
||||||
|
|
||||||
$item = ActivityPub\Processor::createItem($object_data, true);
|
$item = ActivityPub\Processor::createItem($object_data, true);
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Result Item'),
|
'title' => DI::l10n()->t('Result Item'),
|
||||||
'content' => $this->visible_whitespace(var_export($item, true))
|
'content' => $visible_whitespace(var_export($item, true))
|
||||||
];
|
];
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
$results[] = [
|
$results[] = [
|
||||||
|
@ -126,9 +130,4 @@ class ActivityPubConversion extends BaseModule
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function visible_whitespace(string $s): string
|
|
||||||
{
|
|
||||||
return '<pre>' . htmlspecialchars($s) . '</pre>';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,6 +30,11 @@ class Babel extends BaseModule
|
||||||
protected function content(array $request = []): string
|
protected function content(array $request = []): string
|
||||||
{
|
{
|
||||||
$results = [];
|
$results = [];
|
||||||
|
|
||||||
|
$visible_whitespace = function (string $s): string {
|
||||||
|
return '<pre>' . htmlspecialchars($s) . '</pre>';
|
||||||
|
};
|
||||||
|
|
||||||
if (!empty($request['text'])) {
|
if (!empty($request['text'])) {
|
||||||
self::checkFormSecurityTokenForbiddenOnError('babel');
|
self::checkFormSecurityTokenForbiddenOnError('babel');
|
||||||
switch (($request['type'] ?? '') ?: 'bbcode') {
|
switch (($request['type'] ?? '') ?: 'bbcode') {
|
||||||
|
@ -37,24 +42,24 @@ class Babel extends BaseModule
|
||||||
$bbcode = $request['text'];
|
$bbcode = $request['text'];
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Source input'),
|
'title' => DI::l10n()->t('Source input'),
|
||||||
'content' => $this->visible_whitespace($bbcode)
|
'content' => $visible_whitespace($bbcode)
|
||||||
];
|
];
|
||||||
|
|
||||||
$plain = Text\BBCode::toPlaintext($bbcode, false);
|
$plain = Text\BBCode::toPlaintext($bbcode, false);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('BBCode::toPlaintext'),
|
'title' => DI::l10n()->t('BBCode::toPlaintext'),
|
||||||
'content' => $this->visible_whitespace($plain)
|
'content' => $visible_whitespace($plain)
|
||||||
];
|
];
|
||||||
|
|
||||||
$html = Text\BBCode::convertForUriId(0, $bbcode);
|
$html = Text\BBCode::convertForUriId(0, $bbcode);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('BBCode::convert (raw HTML)'),
|
'title' => DI::l10n()->t('BBCode::convert (raw HTML)'),
|
||||||
'content' => $this->visible_whitespace($html)
|
'content' => $visible_whitespace($html)
|
||||||
];
|
];
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('BBCode::convert (hex)'),
|
'title' => DI::l10n()->t('BBCode::convert (hex)'),
|
||||||
'content' => $this->visible_whitespace(bin2hex($html)),
|
'content' => $visible_whitespace(bin2hex($html)),
|
||||||
];
|
];
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
|
@ -65,19 +70,19 @@ class Babel extends BaseModule
|
||||||
$bbcode2 = Text\HTML::toBBCode($html);
|
$bbcode2 = Text\HTML::toBBCode($html);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('BBCode::convert => HTML::toBBCode'),
|
'title' => DI::l10n()->t('BBCode::convert => HTML::toBBCode'),
|
||||||
'content' => $this->visible_whitespace($bbcode2)
|
'content' => $visible_whitespace($bbcode2)
|
||||||
];
|
];
|
||||||
|
|
||||||
$markdown = Text\BBCode::toMarkdown($bbcode);
|
$markdown = Text\BBCode::toMarkdown($bbcode);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('BBCode::toMarkdown'),
|
'title' => DI::l10n()->t('BBCode::toMarkdown'),
|
||||||
'content' => $this->visible_whitespace($markdown)
|
'content' => $visible_whitespace($markdown)
|
||||||
];
|
];
|
||||||
|
|
||||||
$html2 = Text\Markdown::convert($markdown);
|
$html2 = Text\Markdown::convert($markdown);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert (raw HTML)'),
|
'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert (raw HTML)'),
|
||||||
'content' => $this->visible_whitespace($html2)
|
'content' => $visible_whitespace($html2)
|
||||||
];
|
];
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert'),
|
'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert'),
|
||||||
|
@ -87,13 +92,13 @@ class Babel extends BaseModule
|
||||||
$bbcode3 = Text\Markdown::toBBCode($markdown);
|
$bbcode3 = Text\Markdown::toBBCode($markdown);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::toBBCode'),
|
'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::toBBCode'),
|
||||||
'content' => $this->visible_whitespace($bbcode3)
|
'content' => $visible_whitespace($bbcode3)
|
||||||
];
|
];
|
||||||
|
|
||||||
$bbcode4 = Text\HTML::toBBCode($html2);
|
$bbcode4 = Text\HTML::toBBCode($html2);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert => HTML::toBBCode'),
|
'title' => DI::l10n()->t('BBCode::toMarkdown => Markdown::convert => HTML::toBBCode'),
|
||||||
'content' => $this->visible_whitespace($bbcode4)
|
'content' => $visible_whitespace($bbcode4)
|
||||||
];
|
];
|
||||||
|
|
||||||
$tags = Text\BBCode::getTags($bbcode);
|
$tags = Text\BBCode::getTags($bbcode);
|
||||||
|
@ -101,22 +106,22 @@ class Babel extends BaseModule
|
||||||
$body = Item::setHashtags($bbcode);
|
$body = Item::setHashtags($bbcode);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Item Body'),
|
'title' => DI::l10n()->t('Item Body'),
|
||||||
'content' => $this->visible_whitespace($body)
|
'content' => $visible_whitespace($body)
|
||||||
];
|
];
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Item Tags'),
|
'title' => DI::l10n()->t('Item Tags'),
|
||||||
'content' => $this->visible_whitespace(var_export($tags, true)),
|
'content' => $visible_whitespace(var_export($tags, true)),
|
||||||
];
|
];
|
||||||
|
|
||||||
$body2 = PageInfo::searchAndAppendToBody($bbcode, true);
|
$body2 = PageInfo::searchAndAppendToBody($bbcode, true);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('PageInfo::appendToBody'),
|
'title' => DI::l10n()->t('PageInfo::appendToBody'),
|
||||||
'content' => $this->visible_whitespace($body2)
|
'content' => $visible_whitespace($body2)
|
||||||
];
|
];
|
||||||
$html3 = Text\BBCode::convertForUriId(0, $body2);
|
$html3 = Text\BBCode::convertForUriId(0, $body2);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('PageInfo::appendToBody => BBCode::convert (raw HTML)'),
|
'title' => DI::l10n()->t('PageInfo::appendToBody => BBCode::convert (raw HTML)'),
|
||||||
'content' => $this->visible_whitespace($html3)
|
'content' => $visible_whitespace($html3)
|
||||||
];
|
];
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('PageInfo::appendToBody => BBCode::convert'),
|
'title' => DI::l10n()->t('PageInfo::appendToBody => BBCode::convert'),
|
||||||
|
@ -127,7 +132,7 @@ class Babel extends BaseModule
|
||||||
$diaspora = trim($request['text']);
|
$diaspora = trim($request['text']);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Source input (Diaspora format)'),
|
'title' => DI::l10n()->t('Source input (Diaspora format)'),
|
||||||
'content' => $this->visible_whitespace($diaspora),
|
'content' => $visible_whitespace($diaspora),
|
||||||
];
|
];
|
||||||
|
|
||||||
$markdown = XML::unescape($diaspora);
|
$markdown = XML::unescape($diaspora);
|
||||||
|
@ -136,13 +141,13 @@ class Babel extends BaseModule
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Source input (Markdown)'),
|
'title' => DI::l10n()->t('Source input (Markdown)'),
|
||||||
'content' => $this->visible_whitespace($markdown),
|
'content' => $visible_whitespace($markdown),
|
||||||
];
|
];
|
||||||
|
|
||||||
$html = Text\Markdown::convert($markdown);
|
$html = Text\Markdown::convert($markdown);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Markdown::convert (raw HTML)'),
|
'title' => DI::l10n()->t('Markdown::convert (raw HTML)'),
|
||||||
'content' => $this->visible_whitespace($html),
|
'content' => $visible_whitespace($html),
|
||||||
];
|
];
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
|
@ -153,14 +158,14 @@ class Babel extends BaseModule
|
||||||
$bbcode = Text\Markdown::toBBCode($markdown);
|
$bbcode = Text\Markdown::toBBCode($markdown);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Markdown::toBBCode'),
|
'title' => DI::l10n()->t('Markdown::toBBCode'),
|
||||||
'content' => $this->visible_whitespace($bbcode),
|
'content' => $visible_whitespace($bbcode),
|
||||||
];
|
];
|
||||||
break;
|
break;
|
||||||
case 'html' :
|
case 'html' :
|
||||||
$html = trim($request['text']);
|
$html = trim($request['text']);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Raw HTML input'),
|
'title' => DI::l10n()->t('Raw HTML input'),
|
||||||
'content' => $this->visible_whitespace($html),
|
'content' => $visible_whitespace($html),
|
||||||
];
|
];
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
|
@ -172,12 +177,12 @@ class Babel extends BaseModule
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('HTML Purified (raw)'),
|
'title' => DI::l10n()->t('HTML Purified (raw)'),
|
||||||
'content' => $this->visible_whitespace($purified),
|
'content' => $visible_whitespace($purified),
|
||||||
];
|
];
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('HTML Purified (hex)'),
|
'title' => DI::l10n()->t('HTML Purified (hex)'),
|
||||||
'content' => $this->visible_whitespace(bin2hex($purified)),
|
'content' => $visible_whitespace(bin2hex($purified)),
|
||||||
];
|
];
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
|
@ -188,7 +193,7 @@ class Babel extends BaseModule
|
||||||
$bbcode = Text\HTML::toBBCode($html);
|
$bbcode = Text\HTML::toBBCode($html);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('HTML::toBBCode'),
|
'title' => DI::l10n()->t('HTML::toBBCode'),
|
||||||
'content' => $this->visible_whitespace($bbcode)
|
'content' => $visible_whitespace($bbcode)
|
||||||
];
|
];
|
||||||
|
|
||||||
$html2 = Text\BBCode::convertForUriId(0, $bbcode);
|
$html2 = Text\BBCode::convertForUriId(0, $bbcode);
|
||||||
|
@ -205,25 +210,25 @@ class Babel extends BaseModule
|
||||||
$bbcode2plain = Text\BBCode::toPlaintext($bbcode);
|
$bbcode2plain = Text\BBCode::toPlaintext($bbcode);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('HTML::toBBCode => BBCode::toPlaintext'),
|
'title' => DI::l10n()->t('HTML::toBBCode => BBCode::toPlaintext'),
|
||||||
'content' => $this->visible_whitespace($bbcode2plain),
|
'content' => $visible_whitespace($bbcode2plain),
|
||||||
];
|
];
|
||||||
|
|
||||||
$markdown = Text\HTML::toMarkdown($html);
|
$markdown = Text\HTML::toMarkdown($html);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('HTML::toMarkdown'),
|
'title' => DI::l10n()->t('HTML::toMarkdown'),
|
||||||
'content' => $this->visible_whitespace($markdown)
|
'content' => $visible_whitespace($markdown)
|
||||||
];
|
];
|
||||||
|
|
||||||
$text = Text\HTML::toPlaintext($html, 0);
|
$text = Text\HTML::toPlaintext($html, 0);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('HTML::toPlaintext'),
|
'title' => DI::l10n()->t('HTML::toPlaintext'),
|
||||||
'content' => $this->visible_whitespace($text),
|
'content' => $visible_whitespace($text),
|
||||||
];
|
];
|
||||||
|
|
||||||
$text = Text\HTML::toPlaintext($html, 0, true);
|
$text = Text\HTML::toPlaintext($html, 0, true);
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('HTML::toPlaintext (compact)'),
|
'title' => DI::l10n()->t('HTML::toPlaintext (compact)'),
|
||||||
'content' => $this->visible_whitespace($text),
|
'content' => $visible_whitespace($text),
|
||||||
];
|
];
|
||||||
break;
|
break;
|
||||||
case 'twitter':
|
case 'twitter':
|
||||||
|
@ -236,7 +241,7 @@ class Babel extends BaseModule
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Decoded post'),
|
'title' => DI::l10n()->t('Decoded post'),
|
||||||
'content' => $this->visible_whitespace(var_export($status, true)),
|
'content' => $visible_whitespace(var_export($status, true)),
|
||||||
];
|
];
|
||||||
|
|
||||||
$postarray = [];
|
$postarray = [];
|
||||||
|
@ -255,7 +260,7 @@ class Babel extends BaseModule
|
||||||
|
|
||||||
$results[] = [
|
$results[] = [
|
||||||
'title' => DI::l10n()->t('Post array before expand entities'),
|
'title' => DI::l10n()->t('Post array before expand entities'),
|
||||||
'content' => $this->visible_whitespace(var_export($postarray, true)),
|
'content' => $visible_whitespace(var_export($postarray, true)),
|
||||||
];
|
];
|
||||||
} else {
|
} else {
|
||||||
$results[] = [
|
$results[] = [
|
||||||
|
@ -285,9 +290,4 @@ class Babel extends BaseModule
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
}
|
}
|
||||||
|
|
||||||
private function visible_whitespace($s): string
|
|
||||||
{
|
|
||||||
return '<pre>' . htmlspecialchars($s) . '</pre>';
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue