Remove references to include/bbcode.php

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index dd8864a631798302af0b04b02781f2f6e11f3ab3..e69ac36f683c20a329d6f8676053a9a06a8a1684 100644 (file)
--- 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 = '';

diff --git a/include/api.php b/include/api.php
index 013d47fe23bb3e6a3f2acf1cd1e32436c84b5bf5..f7c04aaf88f0e4e621178e69d53bbd2b04e5be32 100644 (file)
--- 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';

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 0a869ab383c5b05abc34f645475b83a5694148f2..bea15e3d4c20093128d1aa484841e865ed93d23b 100644 (file)
--- 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

diff --git a/include/conversation.php b/include/conversation.php
index 71770d31d692def5226e7b0ed072e6eb61330fee..1ff1dbf5f4cdb57ca29d1ee41d4f1ae93b3d68ab 100644 (file)
--- 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);

diff --git a/include/enotify.php b/include/enotify.php
index 2b6eec576c8b63b007c05442acb3a20e1a9f1b5d..c877540aba378d14100d0974b338d7154cf0e53d 100644 (file)
--- 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';
 
 /**

diff --git a/include/event.php b/include/event.php
index c86ba732b8ef80ed26b59f762610d6dc8896e666..1c34e03cc686e7f0e2e8e15d9a58adf57aa8413a 100644 (file)
--- 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();
 

diff --git a/include/items.php b/include/items.php
index 456853d80d516f614300830cc398bf9517a1ced5..31c8aaa799394dacdfaec90795523c63b325e989 100644 (file)
--- 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';

diff --git a/include/text.php b/include/text.php
index ee5d4763ef984fc2939bc5131567f0e2c1fb46e5..02f17fdb4b3bfb4f3b89983b36cee3c615af8a4b 100644 (file)
--- 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 {

diff --git a/mod/babel.php b/mod/babel.php
index 683bc5fed1cc7911adfd047d28921bfe4f20de29..43b5c4e8070949f1ed79166dd7eb1baaa6b58d8f 100644 (file)
--- 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;
 

diff --git a/mod/community.php b/mod/community.php
index 5536a4934cdf58dd03124cb717c7d8a8270f0360..88fc6168bbbe8041091e4a83878a53c9c54ab216 100644 (file)
--- 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';
 

diff --git a/mod/display.php b/mod/display.php
index 1e1515f10f24f4d06b0d30c5b27588e3c3038671..42aad736cc4e8503cd9fe94e9bb303af42c53352 100644 (file)
--- 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"];

diff --git a/mod/events.php b/mod/events.php
index 5f6fb2c68930676cda16b16012dd8f1e0b5450ad..695dbb290fa7cab17129f676d9133d391059427b 100644 (file)
--- 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';
 

diff --git a/mod/filer.php b/mod/filer.php
index 177b80acbe2835f14af0d85a4aa79c38da43fd0d..190b6f78acb13d2729b3c1162c0634d49b295687 100644 (file)
--- 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)

diff --git a/mod/like.php b/mod/like.php
index 9371c30743c45a94ba131fc463d3e3d70046f8ce..957fe5fc42ee107b9dafcb22c5c9b35a727567d6 100644 (file)
--- 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) {

diff --git a/mod/message.php b/mod/message.php
index d51fe0a779ab375eb1b8f0b9c0d2dcdde276bead..bb32b5a72d5231c026a2f99477fdae8aa573e246 100644 (file)
--- 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),

diff --git a/mod/notes.php b/mod/notes.php
index b607c084ed594e1a4e82e871976a2b01d858db41..3b46df07da000ba02c2b4c1c35d1547fcc8981c1 100644 (file)
--- 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';

diff --git a/mod/notify.php b/mod/notify.php
index a65e14debb8e6ce5dec7b8b3d032967e159aac2c..f22c1cf5b1d11342b5c92b861ed7714397e40186 100644 (file)
--- 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) {

diff --git a/mod/photos.php b/mod/photos.php
index 863a848d61f53917ed0a679ff4eaddb09ab31ffa..2b6998ae1dfb0aa992390162a8b0ce06d64e1bd0 100644 (file)
--- 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';
 

diff --git a/mod/ping.php b/mod/ping.php
index e24168aa978d5b653d26d7d8cafcd57e35ab9e7d..146411206f601370312353ed07436fbcee96b48e 100644 (file)
--- 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';
 

diff --git a/mod/poco.php b/mod/poco.php
index d212bb5f9cb0663db50b1d781f75a34ed285c15a..0728020eccab3292e6cc7428b616bc5b80bed149 100644 (file)
--- 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);
                                }

diff --git a/mod/poke.php b/mod/poke.php
index c1207917398b5b9037fa704e9739f84776c549b2..3148896bc27a8fa624bd4732bdfdf692d9b8f324 100644 (file)
--- 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) {

diff --git a/mod/profile.php b/mod/profile.php
index a7c39ab33f7ea88bc6200447d53b18dd84068d3f..74ca06aad9fb9e4e7b5155c73f2df8b830072c09 100644 (file)
--- 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';

diff --git a/mod/register.php b/mod/register.php
index 76c5073d59c3aed5c38da966493da661dc75faf7..51ed57a9c5c41832d63537537949af132b48e6ac 100644 (file)
--- 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)
 {

diff --git a/mod/search.php b/mod/search.php
index afe94121dbca37f28c39ab8c35d6500f6a5c8230..1f93934658f822b0ff31526cbcedb9c8a41df42f 100644 (file)
--- 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';

diff --git a/mod/subthread.php b/mod/subthread.php
index b4f2ca819cebeb459a4ebe59c8046d5ff3855794..c858f2d1fa3a3c847ea132b823605d33b31496ce 100644 (file)
--- 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) {

diff --git a/mod/tagger.php b/mod/tagger.php
index c602613f1fa008cf9b74173b142761b8d8c2a940..16195cc339d2f02f4c04eb719f7e7b04484e1e98 100644 (file)
--- 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) {

diff --git a/mod/tagrm.php b/mod/tagrm.php
index b7e72b4da8a833969ac3f1cfc332973ce3134a67..b9991d68da5b5ff0ea4c9a7a360dfe2fe1464ed8 100644 (file)
--- 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()) {

diff --git a/mod/videos.php b/mod/videos.php
index 65dda1b498da8ffaedee045a093dc5b3ba06d4fb..75a4d031f333441359f230ab62c8e8327dce3f43 100644 (file)
--- 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');
 

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 064d5030ee7ab42d019ed83daec21d723dcddf6e..9f250e9bfa3ee454fa01af18aeddcb6b624200c7 100644 (file)
--- 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";

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index 3d11789e93cad21f57e0a9487db7d5c7aea77a36..0e552d2e09620207632ffec2c58e7eb61badb4f5 100644 (file)
--- 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

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index d1a705fd7c1193aa86e2f14969f197aab0147716..81f99630994173c0a5867446d58f39ff56b05af8 100644 (file)
--- 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 = '';
 

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 00064b7e864db52ddcdda019aec789609b64c2be..6876d254185aefff9877de9fae3aa305e2b9d823 100644 (file)
--- 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

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index ed3c5c0a072cf1977f46616e9f405326e4463549..7b06a2d68b8141342527016b9a90df0c5f43d27d 100644 (file)
--- 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';

diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index dbc0bdb5d0da22a1f746622e7fb446eb6dfad19e..b8eceb05bc03666d87e8fd866903c87069bdc3ff 100644 (file)
--- 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
 

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index f22549c2b822fa13982250c9e2e4b1ac2691329a..b43639b8451d32b5d87ba178331dfae37b5b56ea 100644 (file)
--- 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

diff --git a/src/Worker/Queue.php b/src/Worker/Queue.php
index 29be22199f68c3aa21be55835dcd67cd52bd0501..3f4a764cee244f14f4aa927b7d4cd5cbfef68acf 100644 (file)
--- 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
 {