bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Remove function prepare_text and use BBCode::convert() instead

Browse source
This commit is contained in:
Philipp Holzer 2019-10-23 00:58:13 +02:00
parent 2c31916757
commit 9e94e8b48c
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
4 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/text.php
View file

@ -17,19 +17,6 @@ function activity_match($haystack,$needle) {
return (($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle, NAMESPACE_ACTIVITY_SCHEMA))); return (($haystack === $needle) || ((basename($needle) === $haystack) && strstr($needle, NAMESPACE_ACTIVITY_SCHEMA)));
} }
/**
* @brief Given a text string, convert from bbcode to html and add smilie icons.
*
* @param string $text String with bbcode.
* @return string Formatted HTML
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function prepare_text($text)
{
$s = BBCode::convert($text);
return trim($s);
}
/** /**
* return array with details for categories and folders for an item * return array with details for categories and folders for an item
* *

6
src/Model/Event.php
View file

@ -911,7 +911,7 @@ class Event extends BaseObject
$tpl = Renderer::getMarkupTemplate('event_stream_item.tpl'); $tpl = Renderer::getMarkupTemplate('event_stream_item.tpl');
$return = Renderer::replaceMacros($tpl, [ $return = Renderer::replaceMacros($tpl, [
'$id' => $item['event-id'], '$id' => $item['event-id'],
'$title' => prepare_text($item['event-summary']), '$title' => BBCode::convert($item['event-summary']),
'$dtstart_label' => L10n::t('Starts:'), '$dtstart_label' => L10n::t('Starts:'),
'$dtstart_title' => $dtstart_title, '$dtstart_title' => $dtstart_title,
'$dtstart_dt' => $dtstart_dt, '$dtstart_dt' => $dtstart_dt,
@ -929,7 +929,7 @@ class Event extends BaseObject
'$author_name' => $item['author-name'], '$author_name' => $item['author-name'],
'$author_link' => $profile_link, '$author_link' => $profile_link,
'$author_avatar' => $item['author-avatar'], '$author_avatar' => $item['author-avatar'],
'$description' => prepare_text($item['event-desc']), '$description' => BBCode::convert($item['event-desc']),
'$location_label' => L10n::t('Location:'), '$location_label' => L10n::t('Location:'),
'$show_map_label' => L10n::t('Show map'), '$show_map_label' => L10n::t('Show map'),
'$hide_map_label' => L10n::t('Hide map'), '$hide_map_label' => L10n::t('Hide map'),
@ -979,7 +979,7 @@ class Event extends BaseObject
} }
} }
$location['name'] = prepare_text($location['name']); $location['name'] = BBCode::convert($location['name']);
// Construct the map HTML. // Construct the map HTML.
if (isset($location['address'])) { if (isset($location['address'])) {

2
src/Model/Item.php
View file

@ -3348,7 +3348,7 @@ class Item extends BaseObject
) { ) {
self::addRedirLinkToImageLinks($item); self::addRedirLinkToImageLinks($item);
$item["rendered-html"] = prepare_text($item["body"]); $item["rendered-html"] = BBCode::convert($item["body"]);
$item["rendered-hash"] = hash("md5", $item["body"]); $item["rendered-hash"] = hash("md5", $item["body"]);
$hook_data = ['item' => $item, 'rendered-html' => $item['rendered-html'], 'rendered-hash' => $item['rendered-hash']]; $hook_data = ['item' => $item, 'rendered-html' => $item['rendered-html'], 'rendered-hash' => $item['rendered-hash']];

24
src/Model/Profile.php
View file

@ -823,51 +823,51 @@ class Profile
$profile['religion'] = [L10n::t('Religion:'), $a->profile['religion']]; $profile['religion'] = [L10n::t('Religion:'), $a->profile['religion']];
} }
if ($txt = prepare_text($a->profile['about'])) { if ($txt = BBCode::convert($a->profile['about'])) {
$profile['about'] = [L10n::t('About:'), $txt]; $profile['about'] = [L10n::t('About:'), $txt];
} }
if ($txt = prepare_text($a->profile['interest'])) { if ($txt = BBCode::convert($a->profile['interest'])) {
$profile['interest'] = [L10n::t('Hobbies/Interests:'), $txt]; $profile['interest'] = [L10n::t('Hobbies/Interests:'), $txt];
} }
if ($txt = prepare_text($a->profile['likes'])) { if ($txt = BBCode::convert($a->profile['likes'])) {
$profile['likes'] = [L10n::t('Likes:'), $txt]; $profile['likes'] = [L10n::t('Likes:'), $txt];
} }
if ($txt = prepare_text($a->profile['dislikes'])) { if ($txt = BBCode::convert($a->profile['dislikes'])) {
$profile['dislikes'] = [L10n::t('Dislikes:'), $txt]; $profile['dislikes'] = [L10n::t('Dislikes:'), $txt];
} }
if ($txt = prepare_text($a->profile['contact'])) { if ($txt = BBCode::convert($a->profile['contact'])) {
$profile['contact'] = [L10n::t('Contact information and Social Networks:'), $txt]; $profile['contact'] = [L10n::t('Contact information and Social Networks:'), $txt];
} }
if ($txt = prepare_text($a->profile['music'])) { if ($txt = BBCode::convert($a->profile['music'])) {
$profile['music'] = [L10n::t('Musical interests:'), $txt]; $profile['music'] = [L10n::t('Musical interests:'), $txt];
} }
if ($txt = prepare_text($a->profile['book'])) { if ($txt = BBCode::convert($a->profile['book'])) {
$profile['book'] = [L10n::t('Books, literature:'), $txt]; $profile['book'] = [L10n::t('Books, literature:'), $txt];
} }
if ($txt = prepare_text($a->profile['tv'])) { if ($txt = BBCode::convert($a->profile['tv'])) {
$profile['tv'] = [L10n::t('Television:'), $txt]; $profile['tv'] = [L10n::t('Television:'), $txt];
} }
if ($txt = prepare_text($a->profile['film'])) { if ($txt = BBCode::convert($a->profile['film'])) {
$profile['film'] = [L10n::t('Film/dance/culture/entertainment:'), $txt]; $profile['film'] = [L10n::t('Film/dance/culture/entertainment:'), $txt];
} }
if ($txt = prepare_text($a->profile['romance'])) { if ($txt = BBCode::convert($a->profile['romance'])) {
$profile['romance'] = [L10n::t('Love/Romance:'), $txt]; $profile['romance'] = [L10n::t('Love/Romance:'), $txt];
} }
if ($txt = prepare_text($a->profile['work'])) { if ($txt = BBCode::convert($a->profile['work'])) {
$profile['work'] = [L10n::t('Work/employment:'), $txt]; $profile['work'] = [L10n::t('Work/employment:'), $txt];
} }
if ($txt = prepare_text($a->profile['education'])) { if ($txt = BBCode::convert($a->profile['education'])) {
$profile['education'] = [L10n::t('School/education:'), $txt]; $profile['education'] = [L10n::t('School/education:'), $txt];
} }