friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Remove references to include/bbcode.php

This commit is contained in:
Hypolite Petovan 2018-02-14 22:01:14 -05:00
parent 05a2ea4220
commit 9e3bae5caa
36 changed files with 1 additions and 50 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) { 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(); $a = get_app();
$o = ''; $o = '';

1
include/api.php
View File

@ -40,7 +40,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/bbcode.php';
require_once 'include/conversation.php'; require_once 'include/conversation.php';
require_once 'include/html2plain.php'; require_once 'include/html2plain.php';
require_once 'mod/share.php'; require_once 'mod/share.php';

1
include/bb2diaspora.php
View File

@ -12,7 +12,6 @@ use League\HTMLToMarkdown\HtmlConverter;
require_once 'include/event.php'; require_once 'include/event.php';
require_once 'include/html2bbcode.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 * @brief Callback function to replace a Diaspora style mention in a mention for Friendica

2
include/conversation.php
View File

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

1
include/enotify.php
View File

@ -12,7 +12,6 @@ use Friendica\Database\DBM;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Emailer; use Friendica\Util\Emailer;
require_once 'include/bbcode.php';
require_once 'include/html2bbcode.php'; require_once 'include/html2bbcode.php';
/** /**

2
include/event.php
View File

@ -16,7 +16,6 @@ use Friendica\Model\Profile;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Map; use Friendica\Util\Map;
require_once 'include/bbcode.php';
require_once 'include/conversation.php'; require_once 'include/conversation.php';
function format_event_html($ev, $simple = false) { function format_event_html($ev, $simple = false) {
@ -239,7 +238,6 @@ function event_delete($event_id) {
function event_store($arr) { function event_store($arr) {
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/bbcode.php';
$a = get_app(); $a = get_app();

1
include/items.php
View File

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

3
include/text.php
View File

@ -1424,9 +1424,6 @@ function prepare_body(&$item, $attach = false, $preview = false) {
* @return string Formattet HTML. * @return string Formattet HTML.
*/ */
function prepare_text($text) { function prepare_text($text) {
require_once 'include/bbcode.php';
if (stristr($text, '[nosmile]')) { if (stristr($text, '[nosmile]')) {
$s = BBCode::convert($text); $s = BBCode::convert($text);
} else { } else {

2
mod/babel.php
View File

@ -7,7 +7,6 @@ use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown; use Friendica\Content\Text\Markdown;
use Friendica\Core\L10n; use Friendica\Core\L10n;
require_once 'include/bbcode.php';
require_once 'include/bb2diaspora.php'; require_once 'include/bb2diaspora.php';
require_once 'include/html2bbcode.php'; require_once 'include/html2bbcode.php';
@ -43,7 +42,6 @@ function babel_content()
$o .= '<h2>' . L10n::t("bbcode \x28raw HTML\x28: ") . '</h2>' . EOL . EOL; $o .= '<h2>' . L10n::t("bbcode \x28raw HTML\x28: ") . '</h2>' . EOL . EOL;
$o .= htmlspecialchars($html) . EOL . EOL; $o .= htmlspecialchars($html) . EOL . EOL;
//$html = bbcode($text);
$o .= '<h2>' . L10n::t('bbcode: ') . '</h2>' . EOL . EOL; $o .= '<h2>' . L10n::t('bbcode: ') . '</h2>' . EOL . EOL;
$o .= $html . 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/security.php';
require_once 'include/conversation.php'; require_once 'include/conversation.php';

2
mod/display.php
View File

@ -367,8 +367,8 @@ function display_content(App $a, $update = false, $update_uid = 0) {
$o .= conversation($a, $items, 'display', $update_uid); $o .= conversation($a, $items, 'display', $update_uid);
// Preparing the meta header // Preparing the meta header
require_once 'include/bbcode.php';
require_once 'include/html2plain.php'; require_once 'include/html2plain.php';
$description = trim(html2plain(BBCode::convert($s[0]["body"], 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)); $title = trim(html2plain(BBCode::convert($s[0]["title"], false), 0, true));
$author_name = $s[0]["author-name"]; $author_name = $s[0]["author-name"];

1
mod/events.php
View File

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

1
mod/filer.php
View File

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

1
mod/like.php
View File

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

2
mod/message.php
View File

@ -336,8 +336,6 @@ function message_content(App $a)
intval(local_user()) intval(local_user())
); );
require_once("include/bbcode.php");
$tpl = get_markup_template('msg-header.tpl'); $tpl = get_markup_template('msg-header.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, [ $a->page['htmlhead'] .= replace_macros($tpl, [
'$baseurl' => System::baseUrl(true), '$baseurl' => System::baseUrl(true),

1
mod/notes.php
View File

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

1
mod/notify.php
View File

@ -62,7 +62,6 @@ function notify_content(App $a)
$notif_tpl = get_markup_template('notifications.tpl'); $notif_tpl = get_markup_template('notifications.tpl');
$not_tpl = get_markup_template('notify.tpl'); $not_tpl = get_markup_template('notify.tpl');
require_once('include/bbcode.php');
$r = $nm->getAll(['seen'=>0]); $r = $nm->getAll(['seen'=>0]);
if (DBM::is_result($r) > 0) { if (DBM::is_result($r) > 0) {

2
mod/photos.php
View File

@ -27,7 +27,6 @@ use Friendica\Util\Temporal;
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/acl_selectors.php'; require_once 'include/acl_selectors.php';
require_once 'include/bbcode.php';
require_once 'include/security.php'; require_once 'include/security.php';
function photos_init(App $a) { function photos_init(App $a) {
@ -934,7 +933,6 @@ function photos_content(App $a)
return; return;
} }
require_once 'include/bbcode.php';
require_once 'include/security.php'; require_once 'include/security.php';
require_once 'include/conversation.php'; require_once 'include/conversation.php';

1
mod/ping.php
View File

@ -19,7 +19,6 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/bbcode.php';
require_once 'mod/proxy.php'; require_once 'mod/proxy.php';
require_once 'include/enotify.php'; require_once 'include/enotify.php';

1
mod/poco.php
View File

@ -246,7 +246,6 @@ function poco_init(App $a) {
} }
$about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']); $about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']);
if (is_null($about)) { if (is_null($about)) {
require_once 'include/bbcode.php';
$about = BBCode::convert($contact['about'], false); $about = BBCode::convert($contact['about'], false);
Cache::set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about); 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; use Friendica\Model\Item;
require_once 'include/security.php'; require_once 'include/security.php';
require_once 'include/bbcode.php';
require_once 'include/items.php'; require_once 'include/items.php';
function poke_init(App $a) { 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(); return Login::form();
} }
require_once 'include/bbcode.php';
require_once 'include/security.php'; require_once 'include/security.php';
require_once 'include/conversation.php'; require_once 'include/conversation.php';
require_once 'include/acl_selectors.php'; require_once 'include/acl_selectors.php';

1
mod/register.php
View File

@ -15,7 +15,6 @@ use Friendica\Model\User;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
require_once 'include/enotify.php'; require_once 'include/enotify.php';
require_once 'include/bbcode.php';
function register_post(App $a) function register_post(App $a)
{ {

1
mod/search.php
View File

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

1
mod/subthread.php
View File

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

1
mod/tagger.php
View File

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

2
mod/tagrm.php
View File

@ -10,8 +10,6 @@ use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Item; use Friendica\Model\Item;
require_once 'include/bbcode.php';
function tagrm_post(App $a) { function tagrm_post(App $a) {
if (!local_user()) { if (!local_user()) {

3
mod/videos.php
View File

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

1
src/Content/Text/BBCode.php
View File

@ -23,7 +23,6 @@ use Friendica\Util\Map;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\ParseUrl; use Friendica\Util\ParseUrl;
require_once "include/bbcode.php";
require_once "include/event.php"; require_once "include/event.php";
require_once "include/html2plain.php"; require_once "include/html2plain.php";
require_once "mod/proxy.php"; require_once "mod/proxy.php";

1
src/Core/NotificationsManager.php
View File

@ -20,7 +20,6 @@ use Friendica\Util\XML;
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once 'include/html2plain.php'; require_once 'include/html2plain.php';
require_once 'include/bbcode.php';
/** /**
* @brief Methods for read and write notifications from/to database * @brief Methods for read and write notifications from/to database

3
src/Model/Profile.php
View File

@ -24,7 +24,6 @@ use Friendica\Util\Temporal;
use dba; use dba;
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once 'include/bbcode.php';
require_once 'mod/proxy.php'; require_once 'mod/proxy.php';
class Profile class Profile
@ -625,8 +624,6 @@ class Profile
public static function getEvents() public static function getEvents()
{ {
require_once 'include/bbcode.php';
$a = get_app(); $a = get_app();
$o = ''; $o = '';

1
src/Protocol/DFRN.php
View File

@ -43,7 +43,6 @@ require_once "include/items.php";
require_once "include/event.php"; require_once "include/event.php";
require_once "include/text.php"; require_once "include/text.php";
require_once "include/html2bbcode.php"; require_once "include/html2bbcode.php";
require_once "include/bbcode.php";
/** /**
* @brief This class contain functions to create and send DFRN XML files * @brief This class contain functions to create and send DFRN XML files

1
src/Protocol/OStatus.php
View File

@ -26,7 +26,6 @@ use DOMXPath;
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once 'include/html2bbcode.php'; require_once 'include/html2bbcode.php';
require_once 'include/bbcode.php';
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'mod/share.php'; require_once 'mod/share.php';
require_once 'include/enotify.php'; require_once 'include/enotify.php';

1
src/Worker/Delivery.php
View File

@ -19,7 +19,6 @@ use dba;
require_once 'include/html2plain.php'; require_once 'include/html2plain.php';
require_once 'include/items.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 /// @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/dba.php';
require_once 'include/html2plain.php'; require_once 'include/html2plain.php';
require_once 'include/items.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 * 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/dba.php';
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/bbcode.php';
class Queue class Queue
{ {