Remove references to include/bbcode.php

2018-02-14 22:01:14 -05:00 · 2018-02-14 22:01:14 -05:00 · 9e3bae5caa
commit 9e3bae5caa
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@ -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 = '';
--- a/include/api.php
+++ b/include/api.php
@ -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';
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@ -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
--- a/include/conversation.php
+++ b/include/conversation.php
@ -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);
--- a/include/enotify.php
+++ b/include/enotify.php
@ -12,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';

 /**
--- a/include/event.php
+++ b/include/event.php
@ -16,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) {
@ -239,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();

--- a/include/items.php
+++ b/include/items.php
@ -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';
--- a/include/text.php
+++ b/include/text.php
@ -1424,9 +1424,6 @@ 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::convert($text);
 	} else {
--- a/mod/babel.php
+++ b/mod/babel.php
@ -7,7 +7,6 @@ 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';

@ -43,7 +42,6 @@ function babel_content()
 		$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;

--- a/mod/community.php
+++ b/mod/community.php
@ -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';

--- a/mod/display.php
+++ b/mod/display.php
@ -367,8 +367,8 @@ 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::convert($s[0]["body"], false), 0, true));
 	$title = trim(html2plain(BBCode::convert($s[0]["title"], false), 0, true));
 	$author_name = $s[0]["author-name"];
--- a/mod/events.php
+++ b/mod/events.php
@ -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';

--- a/mod/filer.php
+++ b/mod/filer.php
@ -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)
--- a/mod/like.php
+++ b/mod/like.php
@ -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) {
--- a/mod/message.php
+++ b/mod/message.php
@ -336,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),
--- a/mod/notes.php
+++ b/mod/notes.php
@ -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';
--- a/mod/notify.php
+++ b/mod/notify.php
@ -62,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) {
--- a/mod/photos.php
+++ b/mod/photos.php
@ -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';

--- a/mod/ping.php
+++ b/mod/ping.php
@ -19,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';

--- a/mod/poco.php
+++ b/mod/poco.php
@ -246,7 +246,6 @@ function poco_init(App $a) {
 				}
 				$about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']);
 				if (is_null($about)) {
-					require_once 'include/bbcode.php';
 					$about = BBCode::convert($contact['about'], false);
 					Cache::set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);
 				}
--- a/mod/poke.php
+++ b/mod/poke.php
@ -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) {
--- a/mod/profile.php
+++ b/mod/profile.php
@ -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';
--- a/mod/register.php
+++ b/mod/register.php
@ -15,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)
 {
--- a/mod/search.php
+++ b/mod/search.php
@ -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';
--- a/mod/subthread.php
+++ b/mod/subthread.php
@ -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) {
--- a/mod/tagger.php
+++ b/mod/tagger.php
@ -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) {
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@ -10,8 +10,6 @@ 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()) {
--- a/mod/videos.php
+++ b/mod/videos.php
@ -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');

--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@ -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";
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@ -20,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
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@ -24,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
@ -625,8 +624,6 @@ class Profile

 	public static function getEvents()
 	{
-		require_once 'include/bbcode.php';
-
 		$a = get_app();
 		$o = '';

--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@ -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
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@ -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';
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@ -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

--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@ -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
--- a/src/Worker/Queue.php
+++ b/src/Worker/Queue.php
@ -18,7 +18,6 @@ use dba;

 require_once 'include/dba.php';
 require_once 'include/items.php';
-require_once 'include/bbcode.php';

 class Queue
 {