keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4462 from MrPetovan/task/3878-move-include-bbcode-to-src

Browse source 
Move include/bbcode to src/ part 2: bbcode()
This commit is contained in:
Michael Vogel 2018-02-15 21:35:27 +01:00 committed by GitHub
commit 753f92c234
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 95 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/acl_selectors.php
View file

@ -186,9 +186,6 @@ function contact_selector($selname, $selclass, $options, $preselected = false)
function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false, $tabindex = null) {
require_once "include/bbcode.php";
$a = get_app();
$o = '';

40
include/api.php
View file

@ -40,7 +40,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network;
use Friendica\Util\XML;
require_once 'include/bbcode.php';
require_once 'include/conversation.php';
require_once 'include/html2plain.php';
require_once 'mod/share.php';
@ -2604,13 +2603,12 @@ function api_format_messages($item, $recipient, $sender)
if (x($_GET, 'getText')) {
$ret['title'] = $item['title'];
if ($_GET['getText'] == 'html') {
$ret['text'] = bbcode($item['body'], false, false);
$ret['text'] = BBCode::convert($item['body'], false);
} elseif ($_GET['getText'] == 'plain') {
//$ret['text'] = html2plain(bbcode($item['body'], false, false, true), 0);
$ret['text'] = trim(html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 2, true), 0));
$ret['text'] = trim(html2plain(BBCode::convert(api_clean_plain_items($item['body']), false, 2, true), 0));
}
} else {
$ret['text'] = $item['title'] . "\n" . html2plain(bbcode(api_clean_plain_items($item['body']), false, false, 2, true), 0);
$ret['text'] = $item['title'] . "\n" . html2plain(BBCode::convert(api_clean_plain_items($item['body']), false, 2, true), 0);
}
if (x($_GET, 'getUserObjects') && $_GET['getUserObjects'] == 'false') {
unset($ret['sender']);
@ -2632,7 +2630,7 @@ function api_convert_item($item)
$attachments = api_get_attachments($body);
// Workaround for ostatus messages where the title is identically to the body
$html = bbcode(api_clean_plain_items($body), false, false, 2, true);
$html = BBCode::convert(api_clean_plain_items($body), false, 2, true);
$statusbody = trim(html2plain($html, 0));
// handle data: images
@ -2650,7 +2648,7 @@ function api_convert_item($item)
$statustext = substr($statustext, 0, 1000)."... \n".$item["plink"];
}
$statushtml = bbcode(api_clean_attachments($body), false, false);
$statushtml = BBCode::convert(api_clean_attachments($body), false);
// Workaround for clients with limited HTML parser functionality
$search = ["<br>", "<blockquote>", "</blockquote>",
@ -2664,7 +2662,7 @@ function api_convert_item($item)
$statushtml = str_replace($search, $replace, $statushtml);
if ($item['title'] != "") {
$statushtml = "<br><h4>" . bbcode($item['title']) . "</h4><br>" . $statushtml;
$statushtml = "<br><h4>" . BBCode::convert($item['title']) . "</h4><br>" . $statushtml;
}
do {
@ -2682,7 +2680,7 @@ function api_convert_item($item)
// feeds without body should contain the link
if (($item['network'] == NETWORK_FEED) && (strlen($item['body']) == 0)) {
$statushtml .= bbcode($item['plink']);
$statushtml .= BBCode::convert($item['plink']);
}
$entities = api_get_entitities($statustext, $body);
@ -3053,18 +3051,18 @@ function api_format_items_profiles($profile_row)
'religion' => $profile_row['religion'],
'public_keywords' => $profile_row['pub_keywords'],
'private_keywords' => $profile_row['prv_keywords'],
'likes' => bbcode(api_clean_plain_items($profile_row['likes']) , false, false, 2, false),
'dislikes' => bbcode(api_clean_plain_items($profile_row['dislikes']) , false, false, 2, false),
'about' => bbcode(api_clean_plain_items($profile_row['about']) , false, false, 2, false),
'music' => bbcode(api_clean_plain_items($profile_row['music']) , false, false, 2, false),
'book' => bbcode(api_clean_plain_items($profile_row['book']) , false, false, 2, false),
'tv' => bbcode(api_clean_plain_items($profile_row['tv']) , false, false, 2, false),
'film' => bbcode(api_clean_plain_items($profile_row['film']) , false, false, 2, false),
'interest' => bbcode(api_clean_plain_items($profile_row['interest']) , false, false, 2, false),
'romance' => bbcode(api_clean_plain_items($profile_row['romance']) , false, false, 2, false),
'work' => bbcode(api_clean_plain_items($profile_row['work']) , false, false, 2, false),
'education' => bbcode(api_clean_plain_items($profile_row['education']), false, false, 2, false),
'social_networks' => bbcode(api_clean_plain_items($profile_row['contact']) , false, false, 2, false),
'likes' => BBCode::convert(api_clean_plain_items($profile_row['likes']) , false, 2),
'dislikes' => BBCode::convert(api_clean_plain_items($profile_row['dislikes']) , false, 2),
'about' => BBCode::convert(api_clean_plain_items($profile_row['about']) , false, 2),
'music' => BBCode::convert(api_clean_plain_items($profile_row['music']) , false, 2),
'book' => BBCode::convert(api_clean_plain_items($profile_row['book']) , false, 2),
'tv' => BBCode::convert(api_clean_plain_items($profile_row['tv']) , false, 2),
'film' => BBCode::convert(api_clean_plain_items($profile_row['film']) , false, 2),
'interest' => BBCode::convert(api_clean_plain_items($profile_row['interest']) , false, 2),
'romance' => BBCode::convert(api_clean_plain_items($profile_row['romance']) , false, 2),
'work' => BBCode::convert(api_clean_plain_items($profile_row['work']) , false, 2),
'education' => BBCode::convert(api_clean_plain_items($profile_row['education']), false, 2),
'social_networks' => BBCode::convert(api_clean_plain_items($profile_row['contact']) , false, 2),
'homepage' => $profile_row['homepage'],
'users' => null
];

10
include/bb2diaspora.php
View file

@ -12,7 +12,6 @@ use League\HTMLToMarkdown\HtmlConverter;
require_once 'include/event.php';
require_once 'include/html2bbcode.php';
require_once 'include/bbcode.php';
/**
* @brief Callback function to replace a Diaspora style mention in a mention for Friendica
@ -119,11 +118,10 @@ function diaspora_mentions($match) {
* systems like Diaspora and Libertree
*
* @param string $Text
* @param bool $preserve_nl Effects unclear, unused in Friendica
* @param bool $fordiaspora Diaspora requires more changes than Libertree
* @return string
*/
function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
function bb2diaspora($Text, $fordiaspora = true) {
$a = get_app();
$OriginalText = $Text;
@ -146,7 +144,7 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
// Converting images with size parameters to simple images. Markdown doesn't know it.
$Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $Text);
// Extracting multi-line code blocks before the whitespace processing/code highlighter in bbcode()
// Extracting multi-line code blocks before the whitespace processing/code highlighter in BBCode::convert()
$codeblocks = [];
$Text = preg_replace_callback("#\[code(?:=([^\]]*))?\](.*?)\[\/code\]#is",
@ -164,7 +162,7 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
// Convert it to HTML - don't try oembed
if ($fordiaspora) {
$Text = bbcode($Text, $preserve_nl, false, 3);
$Text = BBCode::convert($Text, false, 3);
// Add all tags that maybe were removed
if (preg_match_all("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $OriginalText, $tags)) {
@ -178,7 +176,7 @@ function bb2diaspora($Text, $preserve_nl = false, $fordiaspora = true) {
$Text = $Text." ".$tagline;
}
} else {
$Text = bbcode($Text, $preserve_nl, false, 4);
$Text = BBCode::convert($Text, false, 4);
}
// mask some special HTML chars from conversation to markdown

11
include/bbcode.php
View file

@ -1,11 +0,0 @@
<?php
/**
* @file include/bbcode.php
*/
use Friendica\Content\Text\BBCode;
function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = false, $forplaintext = false)
{
return BBCode::convert($Text, $preserve_nl, $tryoembed, $simplehtml, $forplaintext);
}

2
include/conversation.php
View file

@ -21,7 +21,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
use Friendica\Util\XML;
require_once "include/bbcode.php";
require_once "include/acl_selectors.php";
function item_extract_images($body) {
@ -499,7 +498,6 @@ function item_condition() {
*
*/
function conversation(App $a, $items, $mode, $update, $preview = false) {
require_once 'include/bbcode.php';
require_once 'mod/proxy.php';
$ssl_state = ((local_user()) ? true : false);

10
include/enotify.php
View file

@ -3,6 +3,7 @@
* @file include/enotify.php
*/
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
@ -11,7 +12,6 @@ use Friendica\Database\DBM;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Emailer;
require_once 'include/bbcode.php';
require_once 'include/html2bbcode.php';
/**
@ -448,7 +448,7 @@ function notification($params)
$datarray = [];
$datarray['hash'] = $hash;
$datarray['name'] = $params['source_name'];
$datarray['name_cache'] = strip_tags(bbcode($params['source_name']));
$datarray['name_cache'] = strip_tags(BBCode::convert($params['source_name']));
$datarray['url'] = $params['source_link'];
$datarray['photo'] = $params['source_photo'];
$datarray['date'] = DateTimeFormat::utcNow();
@ -519,7 +519,7 @@ function notification($params)
$itemlink = System::baseUrl().'/notify/view/'.$notify_id;
$msg = replace_macros($epreamble, ['$itemlink' => $itemlink]);
$msg_cache = format_notification_message($datarray['name_cache'], strip_tags(bbcode($msg)));
$msg_cache = format_notification_message($datarray['name_cache'], strip_tags(BBCode::convert($msg)));
q("UPDATE `notify` SET `msg` = '%s', `msg_cache` = '%s' WHERE `id` = %d AND `uid` = %d",
dbesc($msg),
dbesc($msg_cache),
@ -567,9 +567,9 @@ function notification($params)
}
// textversion keeps linebreaks
$textversion = strip_tags(str_replace("<br>", "\n", html_entity_decode(bbcode(stripslashes(str_replace(["\\r\\n", "\\r", "\\n"], "\n",
$textversion = strip_tags(str_replace("<br>", "\n", html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r\\n", "\\r", "\\n"], "\n",
$body))),ENT_QUOTES, 'UTF-8')));
$htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(["\\r\\n", "\\r", "\\n\\n", "\\n"],
$htmlversion = html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r\\n", "\\r", "\\n\\n", "\\n"],
"<br />\n", $body))), ENT_QUOTES, 'UTF-8');
$datarray = [];

21
include/event.php
View file

@ -5,6 +5,7 @@
*/
use Friendica\Content\Feature;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
@ -15,7 +16,6 @@ use Friendica\Model\Profile;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map;
require_once 'include/bbcode.php';
require_once 'include/conversation.php';
function format_event_html($ev, $simple = false) {
@ -38,9 +38,9 @@ function format_event_html($ev, $simple = false) {
);
if ($simple) {
$o = "<h3>" . bbcode($ev['summary']) . "</h3>";
$o = "<h3>" . BBCode::convert($ev['summary']) . "</h3>";
$o .= "<div>" . bbcode($ev['desc']) . "</div>";
$o .= "<div>" . BBCode::convert($ev['desc']) . "</div>";
$o .= "<h4>" . L10n::t('Starts:') . "</h4><p>" . $event_start . "</p>";
@ -57,7 +57,7 @@ function format_event_html($ev, $simple = false) {
$o = '<div class="vevent">' . "\r\n";
$o .= '<div class="summary event-summary">' . bbcode($ev['summary']) . '</div>' . "\r\n";
$o .= '<div class="summary event-summary">' . BBCode::convert($ev['summary']) . '</div>' . "\r\n";
$o .= '<div class="event-start"><span class="event-label">' . L10n::t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
. DateTimeFormat::utc($ev['start'], (($ev['adjust']) ? DateTimeFormat::ATOM : 'Y-m-d\TH:i:s' ))
@ -71,11 +71,11 @@ function format_event_html($ev, $simple = false) {
. '</span></div>' . "\r\n";
}
$o .= '<div class="description event-description">' . bbcode($ev['desc']) . '</div>' . "\r\n";
$o .= '<div class="description event-description">' . BBCode::convert($ev['desc']) . '</div>' . "\r\n";
if (strlen($ev['location'])) {
$o .= '<div class="event-location"><span class="event-label">' . L10n::t('Location:') . '</span>&nbsp;<span class="location">'
. bbcode($ev['location'])
. BBCode::convert($ev['location'])
. '</span></div>' . "\r\n";
// Include a map of the location if the [map] BBCode is used.
@ -238,7 +238,6 @@ function event_delete($event_id) {
function event_store($arr) {
require_once 'include/items.php';
require_once 'include/bbcode.php';
$a = get_app();
@ -610,15 +609,15 @@ function process_events($arr) {
$drop = [System::baseUrl() . '/events/drop/' . $rr['id'], L10n::t('Delete event'), '', ''];
}
$title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
$title = strip_tags(html_entity_decode(BBCode::convert($rr['summary']), ENT_QUOTES, 'UTF-8'));
if (! $title) {
list($title, $_trash) = explode("<br", bbcode($rr['desc']), 2);
list($title, $_trash) = explode("<br", BBCode::convert($rr['desc']), 2);
$title = strip_tags(html_entity_decode($title, ENT_QUOTES, 'UTF-8'));
}
$html = format_event_html($rr);
$rr['desc'] = bbcode($rr['desc']);
$rr['location'] = bbcode($rr['location']);
$rr['desc'] = BBCode::convert($rr['desc']);
$rr['location'] = BBCode::convert($rr['location']);
$events[] = [
'id' => $rr['id'],
'start' => $start,

1
include/items.php
View file

@ -19,7 +19,6 @@ use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
use Friendica\Util\Temporal;
require_once 'include/bbcode.php';
require_once 'include/text.php';
require_once 'mod/share.php';
require_once 'include/enotify.php';

10
include/text.php
View file

@ -7,6 +7,7 @@ use Friendica\App;
use Friendica\Content\ContactSelector;
use Friendica\Content\Feature;
use Friendica\Content\Smilies;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
@ -15,7 +16,7 @@ use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Model\Term;
use Friendica\Render\FriendicaSmarty;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map;
@ -1423,13 +1424,10 @@ function prepare_body(&$item, $attach = false, $preview = false) {
* @return string Formattet HTML.
*/
function prepare_text($text) {
require_once 'include/bbcode.php';
if (stristr($text, '[nosmile]')) {
$s = bbcode($text);
$s = BBCode::convert($text);
} else {
$s = Smilies::replace(bbcode($text));
$s = Smilies::replace(BBCode::convert($text));
}
return trim($s);

6
mod/babel.php
View file

@ -2,10 +2,11 @@
/**
* @file mod/babel.php
*/
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown;
use Friendica\Core\L10n;
require_once 'include/bbcode.php';
require_once 'include/bb2diaspora.php';
require_once 'include/html2bbcode.php';
@ -37,11 +38,10 @@ function babel_content()
$o .= '<h2>' . L10n::t('Source input: ') . '</h2>' . EOL . EOL;
$o .= visible_lf($text) . EOL . EOL;
$html = bbcode($text);
$html = BBCode::convert($text);
$o .= '<h2>' . L10n::t("bbcode \x28raw HTML\x28: ") . '</h2>' . EOL . EOL;
$o .= htmlspecialchars($html) . EOL . EOL;
//$html = bbcode($text);
$o .= '<h2>' . L10n::t('bbcode: ') . '</h2>' . EOL . EOL;
$o .= $html . EOL . EOL;

1
mod/community.php
View file

@ -63,7 +63,6 @@ function community_content(App $a, $update = 0)
}
}
require_once 'include/bbcode.php';
require_once 'include/security.php';
require_once 'include/conversation.php';

7
mod/contacts.php
View file

@ -6,6 +6,7 @@
use Friendica\App;
use Friendica\Content\ContactSelector;
use Friendica\Content\Nav;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Widget;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
@ -646,11 +647,11 @@ function contacts_content(App $a)
'$profileurllabel' => L10n::t('Profile URL'),
'$profileurl' => $contact['url'],
'$account_type' => Contact::getAccountType($contact),
'$location' => bbcode($contact["location"]),
'$location' => BBCode::convert($contact["location"]),
'$location_label' => L10n::t("Location:"),
'$xmpp' => bbcode($contact["xmpp"]),
'$xmpp' => BBCode::convert($contact["xmpp"]),
'$xmpp_label' => L10n::t("XMPP:"),
'$about' => bbcode($contact["about"], false, false),
'$about' => BBCode::convert($contact["about"], false),
'$about_label' => L10n::t("About:"),
'$keywords' => $contact["keywords"],
'$keywords_label' => L10n::t("Tags:"),

7
mod/display.php
View file

@ -4,6 +4,7 @@
*/
use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Protocol;
@ -366,10 +367,10 @@ function display_content(App $a, $update = false, $update_uid = 0) {
$o .= conversation($a, $items, 'display', $update_uid);
// Preparing the meta header
require_once 'include/bbcode.php';
require_once 'include/html2plain.php';
$description = trim(html2plain(bbcode($s[0]["body"], false, false), 0, true));
$title = trim(html2plain(bbcode($s[0]["title"], false, false), 0, true));
$description = trim(html2plain(BBCode::convert($s[0]["body"], false), 0, true));
$title = trim(html2plain(BBCode::convert($s[0]["title"], false), 0, true));
$author_name = $s[0]["author-name"];
$image = $a->remove_baseurl($s[0]["author-thumb"]);

1
mod/events.php
View file

@ -15,7 +15,6 @@ use Friendica\Model\Profile;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
require_once 'include/bbcode.php';
require_once 'include/event.php';
require_once 'include/items.php';

1
mod/filer.php
View file

@ -7,7 +7,6 @@ use Friendica\Core\L10n;
use Friendica\Core\PConfig;
require_once 'include/security.php';
require_once 'include/bbcode.php';
require_once 'include/items.php';
function filer_content(App $a)

4
mod/follow.php
View file

@ -164,9 +164,9 @@ function follow_content(App $a) {
'$url_label' => L10n::t("Profile URL"),
'$myaddr' => $myaddr,
'$request' => $request,
/*'$location' => bbcode($r[0]["location"]),
/*'$location' => Friendica\Content\Text\BBCode::::convert($r[0]["location"]),
'$location_label' => L10n::t("Location:"),
'$about' => bbcode($r[0]["about"], false, false),
'$about' => Friendica\Content\Text\BBCode::::convert($r[0]["about"], false, false),
'$about_label' => L10n::t("About:"), */
'$keywords' => $r[0]["keywords"],
'$keywords_label' => L10n::t("Tags:")

1
mod/like.php
View file

@ -5,7 +5,6 @@ use Friendica\Core\System;
use Friendica\Model\Item;
require_once 'include/security.php';
require_once 'include/bbcode.php';
require_once 'include/items.php';
function like_content(App $a) {

5
mod/message.php
View file

@ -6,6 +6,7 @@
use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Content\Smilies;
use Friendica\Content\Text\BBCode;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Database\DBM;
@ -335,8 +336,6 @@ function message_content(App $a)
intval(local_user())
);
require_once("include/bbcode.php");
$tpl = get_markup_template('msg-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, [
'$baseurl' => System::baseUrl(true),
@ -376,7 +375,7 @@ function message_content(App $a)
$from_name_e = $message['from-name'];
$subject_e = $message['title'];
$body_e = Smilies::replace(bbcode($message['body']));
$body_e = Smilies::replace(BBCode::convert($message['body']));
$to_name_e = $message['name'];
$contact = Contact::getDetailsByURL($message['from-url']);

1
mod/notes.php
View file

@ -31,7 +31,6 @@ function notes_content(App $a, $update = false)
return;
}
require_once 'include/bbcode.php';
require_once 'include/security.php';
require_once 'include/conversation.php';
require_once 'include/acl_selectors.php';

4
mod/notify.php
View file

@ -4,6 +4,7 @@
*/
use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\L10n;
use Friendica\Core\NotificationsManager;
use Friendica\Core\System;
@ -61,7 +62,6 @@ function notify_content(App $a)
$notif_tpl = get_markup_template('notifications.tpl');
$not_tpl = get_markup_template('notify.tpl');
require_once('include/bbcode.php');
$r = $nm->getAll(['seen'=>0]);
if (DBM::is_result($r) > 0) {
@ -69,7 +69,7 @@ function notify_content(App $a)
$notif_content .= replace_macros($not_tpl, [
'$item_link' => System::baseUrl(true).'/notify/view/'. $it['id'],
'$item_image' => $it['photo'],
'$item_text' => strip_tags(bbcode($it['msg'])),
'$item_text' => strip_tags(BBCode::convert($it['msg'])),
'$item_when' => Temporal::getRelativeDate($it['date'])
]);
}

8
mod/photos.php
View file

@ -6,6 +6,7 @@
use Friendica\App;
use Friendica\Content\Feature;
use Friendica\Content\Nav;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
@ -17,7 +18,6 @@ use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Photo;
use Friendica\Model\Profile;
use Friendica\Model\Term;
use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Protocol\DFRN;
@ -27,7 +27,6 @@ use Friendica\Util\Temporal;
require_once 'include/items.php';
require_once 'include/acl_selectors.php';
require_once 'include/bbcode.php';
require_once 'include/security.php';
function photos_init(App $a) {
@ -934,7 +933,6 @@ function photos_content(App $a)
return;
}
require_once 'include/bbcode.php';
require_once 'include/security.php';
require_once 'include/conversation.php';
@ -1411,7 +1409,7 @@ function photos_content(App $a)
if (strlen($tag_str)) {
$tag_str .= ', ';
}
$tag_str .= bbcode($t);
$tag_str .= BBCode::convert($t);
}
$tags = [L10n::t('Tags: '), $tag_str];
if ($cmd === 'edit') {
@ -1574,7 +1572,7 @@ function photos_content(App $a)
$name_e = $profile_name;
$title_e = $item['title'];
$body_e = bbcode($item['body']);
$body_e = BBCode::convert($item['body']);
$comments .= replace_macros($template,[
'$id' => $item['item_id'],

6
mod/ping.php
View file

@ -6,6 +6,7 @@
use Friendica\App;
use Friendica\Content\Feature;
use Friendica\Content\ForumManager;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Cache;
use Friendica\Core\L10n;
@ -18,7 +19,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal;
use Friendica\Util\XML;
require_once 'include/bbcode.php';
require_once 'mod/proxy.php';
require_once 'include/enotify.php';
@ -481,8 +481,8 @@ function ping_get_notifications($uid)
$notification["name"] = $notification["name_cache"];
$notification["message"] = $notification["msg_cache"];
} else {
$notification["name"] = strip_tags(bbcode($notification["name"]));
$notification["message"] = format_notification_message($notification["name"], strip_tags(bbcode($notification["msg"])));
$notification["name"] = strip_tags(BBCode::convert($notification["name"]));
$notification["message"] = format_notification_message($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
q(
"UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",

4
mod/poco.php
View file

@ -5,6 +5,7 @@
use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\System;
@ -245,8 +246,7 @@ function poco_init(App $a) {
}
$about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']);
if (is_null($about)) {
require_once 'include/bbcode.php';
$about = bbcode($contact['about'], false, false);
$about = BBCode::convert($contact['about'], false);
Cache::set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);
}

1
mod/poke.php
View file

@ -22,7 +22,6 @@ use Friendica\Database\DBM;
use Friendica\Model\Item;
require_once 'include/security.php';
require_once 'include/bbcode.php';
require_once 'include/items.php';
function poke_init(App $a) {

1
mod/profile.php
View file

@ -116,7 +116,6 @@ function profile_content(App $a, $update = 0)
return Login::form();
}
require_once 'include/bbcode.php';
require_once 'include/security.php';
require_once 'include/conversation.php';
require_once 'include/acl_selectors.php';

4
mod/register.php
View file

@ -4,6 +4,7 @@
*/
use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
@ -14,7 +15,6 @@ use Friendica\Model\User;
use Friendica\Util\DateTimeFormat;
require_once 'include/enotify.php';
require_once 'include/bbcode.php';
function register_post(App $a)
{
@ -262,7 +262,7 @@ function register_content(App $a)
'$invite_id' => $invite_id,
'$realpeople' => $realpeople,
'$regtitle' => L10n::t('Registration'),
'$registertext' => x($a->config, 'register_text') ? bbcode($a->config['register_text']) : "",
'$registertext' => x($a->config, 'register_text') ? BBCode::convert($a->config['register_text']) : "",
'$fillwith' => $fillwith,
'$fillext' => $fillext,
'$oidlabel' => $oidlabel,

1
mod/search.php
View file

@ -11,7 +11,6 @@ use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Database\DBM;
require_once "include/bbcode.php";
require_once 'include/security.php';
require_once 'include/conversation.php';
require_once 'mod/dirfind.php';

1
mod/subthread.php
View file

@ -10,7 +10,6 @@ use Friendica\Database\DBM;
use Friendica\Model\Item;
require_once 'include/security.php';
require_once 'include/bbcode.php';
require_once 'include/items.php';
function subthread_content(App $a) {

1
mod/tagger.php
View file

@ -11,7 +11,6 @@ use Friendica\Database\DBM;
use Friendica\Model\Item;
require_once 'include/security.php';
require_once 'include/bbcode.php';
require_once 'include/items.php';
function tagger_content(App $a) {

6
mod/tagrm.php
View file

@ -2,14 +2,14 @@
/**
* @file mod/tagrm.php
*/
use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\L10n;
use Friendica\Core\System;
use Friendica\Database\DBM;
use Friendica\Model\Item;
require_once 'include/bbcode.php';
function tagrm_post(App $a) {
if (!local_user()) {
@ -91,7 +91,7 @@ function tagrm_content(App $a) {
$o .= '<ul>';
foreach ($arr as $x) {
$o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x) . '" >' . bbcode($x) . '</input></li>';
$o .= '<li><input type="checkbox" name="tag" value="' . bin2hex($x) . '" >' . BBCode::convert($x) . '</input></li>';
}
$o .= '</ul>';

3
mod/videos.php
View file

@ -20,7 +20,6 @@ use Friendica\Util\DateTimeFormat;
require_once 'include/items.php';
require_once 'include/acl_selectors.php';
require_once 'include/bbcode.php';
require_once 'include/security.php';
function videos_init(App $a) {
@ -202,8 +201,6 @@ function videos_content(App $a) {
return;
}
require_once('include/bbcode.php');
require_once('include/security.php');
require_once('include/conversation.php');

16
src/Content/Text/BBCode.php
View file

@ -23,7 +23,6 @@ use Friendica\Util\Map;
use Friendica\Util\Network;
use Friendica\Util\ParseUrl;
require_once "include/bbcode.php";
require_once "include/event.php";
require_once "include/html2plain.php";
require_once "mod/proxy.php";
@ -174,7 +173,7 @@ class BBCode
}
if ($title != "") {
$title = bbcode(html_entity_decode($title, ENT_QUOTES, 'UTF-8'), false, false, true);
$title = BBCode::convert(html_entity_decode($title, ENT_QUOTES, 'UTF-8'), false, true);
$title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
$title = str_replace(["[", "]"], ["&#91;", "&#93;"], $title);
$data["title"] = $title;
@ -409,7 +408,7 @@ class BBCode
}
}
$html = bbcode($post["text"].$post["after"], false, false, $htmlmode);
$html = BBCode::convert($post["text"].$post["after"], false, $htmlmode);
$msg = html2plain($html, 0, true);
$msg = trim(html_entity_decode($msg, ENT_QUOTES, 'UTF-8'));
@ -706,7 +705,7 @@ class BBCode
}
if ($data["description"] != "" && $data["description"] != $data["title"]) {
$return .= sprintf('<blockquote>%s</blockquote>', trim(bbcode($data["description"])));
$return .= sprintf('<blockquote>%s</blockquote>', trim(BBCode::convert($data["description"])));
}
if ($data["type"] == "link") {
@ -1135,7 +1134,7 @@ class BBCode
break;
case 4:
$headline .= '<br /><b>' . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
$headline = '<br /><b>' . html_entity_decode("&#x2672; ", ENT_QUOTES, 'UTF-8');
$headline .= L10n::t('<a href="%1$s" target="_blank">%2$s</a> %3$s', $link, $userid, $posted);
$headline .= ":</b><br />";
@ -1342,13 +1341,12 @@ class BBCode
* - 8: Used for WP backlink text setting
*
* @param string $text
* @param bool $preserve_nl
* @param bool $try_oembed
* @param int $simple_html
* @param bool $for_plaintext
* @return string
*/
public static function convert($text, $preserve_nl = false, $try_oembed = true, $simple_html = false, $for_plaintext = false)
public static function convert($text, $try_oembed = true, $simple_html = false, $for_plaintext = false)
{
$a = get_app();
@ -1473,10 +1471,6 @@ class BBCode
$text = str_replace(["\r","\n"], ['<br />', '<br />'], $text);
if ($preserve_nl) {
$text = str_replace(["\n", "\r"], ['', ''], $text);
}
// Remove all hashtag addresses
if ((!$try_oembed || $simple_html) && !in_array($simple_html, [3, 7])) {
$text = preg_replace("/([#@!])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $text);

10
src/Core/NotificationsManager.php
View file

@ -7,6 +7,7 @@
namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Content\Text\BBCode;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Core\System;
@ -19,7 +20,6 @@ use Friendica\Util\XML;
require_once 'include/dba.php';
require_once 'include/html2plain.php';
require_once 'include/bbcode.php';
/**
* @brief Methods for read and write notifications from/to database
@ -46,7 +46,7 @@ class NotificationsManager extends BaseObject
$local_time = DateTimeFormat::local($n['date']);
$n['timestamp'] = strtotime($local_time);
$n['date_rel'] = Temporal::getRelativeDate($n['date']);
$n['msg_html'] = bbcode($n['msg'], false, false, false, false);
$n['msg_html'] = BBCode::convert($n['msg'], false);
$n['msg_plain'] = explode("\n", trim(html2plain($n['msg_html'], 0)))[0];
$rets[] = $n;
@ -243,7 +243,7 @@ class NotificationsManager extends BaseObject
$default_item_link = System::baseUrl(true) . '/notify/view/' . $it['id'];
$default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
$default_item_url = $it['url'];
$default_item_text = strip_tags(bbcode($it['msg']));
$default_item_text = strip_tags(BBCode::convert($it['msg']));
$default_item_when = DateTimeFormat::local($it['date'], 'r');
$default_item_ago = Temporal::getRelativeDate($it['date']);
break;
@ -843,8 +843,8 @@ class NotificationsManager extends BaseObject
'contact_id' => $it['contact-id'],
'photo' => ((x($it, 'photo')) ? proxy_url($it['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
'name' => $it['name'],
'location' => bbcode($it['glocation'], false, false),
'about' => bbcode($it['gabout'], false, false),
'location' => BBCode::convert($it['glocation'], false),
'about' => BBCode::convert($it['gabout'], false),
'keywords' => $it['gkeywords'],
'gender' => $it['ggender'],
'hidden' => $it['hidden'] == 1,

14
src/Model/Profile.php
View file

@ -7,6 +7,7 @@ namespace Friendica\Model;
use Friendica\App;
use Friendica\Content\Feature;
use Friendica\Content\ForumManager;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Cache;
use Friendica\Core\Config;
@ -23,7 +24,6 @@ use Friendica\Util\Temporal;
use dba;
require_once 'include/dba.php';
require_once 'include/bbcode.php';
require_once 'mod/proxy.php';
class Profile
@ -487,13 +487,13 @@ class Profile
}
if (isset($p['about'])) {
$p['about'] = bbcode($p['about']);
$p['about'] = BBCode::convert($p['about']);
}
if (isset($p['address'])) {
$p['address'] = bbcode($p['address']);
$p['address'] = BBCode::convert($p['address']);
} else {
$p['address'] = bbcode($p['location']);
$p['address'] = BBCode::convert($p['location']);
}
if (isset($p['photo'])) {
@ -624,8 +624,6 @@ class Profile
public static function getEvents()
{
require_once 'include/bbcode.php';
$a = get_app();
$o = '';
@ -667,13 +665,13 @@ class Profile
$istoday = true;
}
$title = strip_tags(html_entity_decode(bbcode($rr['summary']), ENT_QUOTES, 'UTF-8'));
$title = strip_tags(html_entity_decode(BBCode::convert($rr['summary']), ENT_QUOTES, 'UTF-8'));
if (strlen($title) > 35) {
$title = substr($title, 0, 32) . '... ';
}
$description = substr(strip_tags(bbcode($rr['desc'])), 0, 32) . '... ';
$description = substr(strip_tags(BBCode::convert($rr['desc'])), 0, 32) . '... ';
if (!$description) {
$description = L10n::t('[No description]');
}

5
src/Protocol/DFRN.php
View file

@ -43,7 +43,6 @@ require_once "include/items.php";
require_once "include/event.php";
require_once "include/text.php";
require_once "include/html2bbcode.php";
require_once "include/bbcode.php";
/**
* @brief This class contain functions to create and send DFRN XML files
@ -832,7 +831,7 @@ class DFRN
}
}
if ($r->content) {
XML::addElement($doc, $entry, "content", bbcode($r->content), ["type" => "html"]);
XML::addElement($doc, $entry, "content", BBCode::convert($r->content), ["type" => "html"]);
}
return $entry;
@ -938,7 +937,7 @@ class DFRN
$htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
}
$htmlbody = bbcode($htmlbody, false, false, 7);
$htmlbody = BBCode::convert($htmlbody, false, 7);
}
$author = self::addEntryAuthor($doc, "author", $item["author-link"], $item);

3
src/Protocol/Diaspora.php
View file

@ -9,6 +9,7 @@
*/
namespace Friendica\Protocol;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\L10n;
@ -4197,7 +4198,7 @@ class Diaspora
}
$about = $profile['about'];
$about = strip_tags(bbcode($about));
$about = strip_tags(BBCode::convert($about));
$location = Profile::formatLocation($profile);
$tags = '';

7
src/Protocol/OStatus.php
View file

@ -26,7 +26,6 @@ use DOMXPath;
require_once 'include/dba.php';
require_once 'include/html2bbcode.php';
require_once 'include/bbcode.php';
require_once 'include/items.php';
require_once 'mod/share.php';
require_once 'include/enotify.php';
@ -1373,7 +1372,7 @@ class OStatus
XML::addElement($doc, $author, "uri", $owner["url"]);
XML::addElement($doc, $author, "name", $owner["nick"]);
XML::addElement($doc, $author, "email", $owner["addr"]);
XML::addElement($doc, $author, "summary", bbcode($owner["about"], false, false, 7));
XML::addElement($doc, $author, "summary", BBCode::convert($owner["about"], false, 7));
$attributes = ["rel" => "alternate", "type" => "text/html", "href" => $owner["url"]];
XML::addElement($doc, $author, "link", "", $attributes);
@ -1398,7 +1397,7 @@ class OStatus
XML::addElement($doc, $author, "poco:preferredUsername", $owner["nick"]);
XML::addElement($doc, $author, "poco:displayName", $owner["name"]);
XML::addElement($doc, $author, "poco:note", bbcode($owner["about"], false, false, 7));
XML::addElement($doc, $author, "poco:note", BBCode::convert($owner["about"], false, 7));
if (trim($owner["location"]) != "") {
$element = $doc->createElement("poco:address");
@ -1879,7 +1878,7 @@ class OStatus
$body = "[b]".$item['title']."[/b]\n\n".$body;
}
$body = bbcode($body, false, false, 7);
$body = BBCode::convert($body, false, 7);
XML::addElement($doc, $entry, "content", $body, ["type" => "html"]);

1
src/Worker/Delivery.php
View file

@ -19,7 +19,6 @@ use dba;
require_once 'include/html2plain.php';
require_once 'include/items.php';
require_once 'include/bbcode.php';
/// @todo This is some ugly code that needs to be split into several methods

1
src/Worker/Notifier.php
View file

@ -20,7 +20,6 @@ use dba;
require_once 'include/dba.php';
require_once 'include/html2plain.php';
require_once 'include/items.php';
require_once 'include/bbcode.php';
/*
* This file was at one time responsible for doing all deliveries, but this caused

1
src/Worker/Queue.php
View file

@ -18,7 +18,6 @@ use dba;
require_once 'include/dba.php';
require_once 'include/items.php';
require_once 'include/bbcode.php';
class Queue
{