]> git.mxchange.org Git - friendica.git/commitdiff
projects / friendica.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e806ff)
Remove/Update references to include/html2*.php
authorHypolite Petovan <mrpetovan@gmail.com>
Wed, 7 Mar 2018 21:34:17 +0000 (16:34 -0500)
committerHypolite Petovan <mrpetovan@gmail.com>
Wed, 7 Mar 2018 21:34:17 +0000 (16:34 -0500)
18 files changed:
doc/Addons.md patch | blob | history
doc/de/Addons.md patch | blob | history
include/api.php patch | blob | history
include/enotify.php patch | blob | history
mod/display.php patch | blob | history
mod/item.php patch | blob | history
mod/oexchange.php patch | blob | history
src/Content/Text/BBCode.php patch | blob | history
src/Content/Text/Markdown.php patch | blob | history
src/Core/NotificationsManager.php patch | blob | history
src/Model/GContact.php patch | blob | history
src/Protocol/DFRN.php patch | blob | history
src/Protocol/Email.php patch | blob | history
src/Protocol/Feed.php patch | blob | history
src/Protocol/OStatus.php patch | blob | history
src/Protocol/PortableContact.php patch | blob | history
src/Worker/Delivery.php patch | blob | history
src/Worker/Notifier.php patch | blob | history

diff --git a/doc/Addons.md b/doc/Addons.md
index dadf76abd7dc677ea05566c8f641214b0745991f..de0d9e4963a85a84ce8b495bf95e85f17bbf3e31 100644 (file)
--- a/doc/Addons.md
+++ b/doc/Addons.md
@@ -372,7 +372,7 @@ include/cronhooks.php:      Addon::callHooks('cron', $d);
 
 include/security.php:          Addon::callHooks('logged_in', $a->user);
 
-include/html2bbcode.php:       Addon::callHooks('html2bbcode', $text);
+src/Content/Text/HTML.php:     Addon::callHooks('html2bbcode', $text);
 
 include/Contact.php:   Addon::callHooks('remove_user',$r[0]);
 
diff --git a/doc/de/Addons.md b/doc/de/Addons.md
index f4c14bc61356c63a51099f11ebf691785b345b57..5bbfde279437388ae2cbd08d42f871598ce15b64 100644 (file)
--- a/doc/de/Addons.md
+++ b/doc/de/Addons.md
@@ -265,7 +265,7 @@ include/cronhooks.php:              Addon::callHooks('cron', $d);
 
 include/security.php:          Addon::callHooks('logged_in', $a->user);
 
-include/html2bbcode.php:       Addon::callHooks('html2bbcode', $text);
+src/Content/Text/HTML.php:     Addon::callHooks('html2bbcode', $text);
 
 include/Contact.php:           Addon::callHooks('remove_user',$r[0]);
 
diff --git a/include/api.php b/include/api.php
index 2645d06f657b4fff8a77ede31012b91ca90cbc16..eec713c5374744ae0b6ae8d8bc66f51221fcc09b 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -42,11 +42,9 @@ use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 require_once 'include/conversation.php';
-require_once 'include/html2plain.php';
 require_once 'mod/share.php';
 require_once 'mod/item.php';
 require_once 'include/security.php';
-require_once 'include/html2bbcode.php';
 require_once 'mod/wall_upload.php';
 require_once 'mod/proxy.php';
 
diff --git a/include/enotify.php b/include/enotify.php
index c877540aba378d14100d0974b338d7154cf0e53d..1e2008392d3438494ee0c20d1850f116ef8dd7b9 100644 (file)
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -12,8 +12,6 @@ use Friendica\Database\DBM;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Emailer;
 
-require_once 'include/html2bbcode.php';
-
 /**
  * @brief Creates a notification entry and possibly sends a mail
  *
diff --git a/mod/display.php b/mod/display.php
index 7c74a93ca0ffad6eb07b23776b1b2a76436b5557..dfa8640309dfcb8b84706cc18d758ba89839c3ed 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -368,8 +368,6 @@ function display_content(App $a, $update = false, $update_uid = 0) {
        $o .= conversation($a, $items, 'display', $update_uid);
 
        // Preparing the meta header
-       require_once 'include/html2plain.php';
-
        $description = trim(HTML::toPlaintext(BBCode::convert($s[0]["body"], false), 0, true));
        $title = trim(HTML::toPlaintext(BBCode::convert($s[0]["title"], false), 0, true));
        $author_name = $s[0]["author-name"];
diff --git a/mod/item.php b/mod/item.php
index c05650cfafcc4ddcd8baa1e9e968034976005665..1bbc08527953cc76cad4b2f680670ddb14317fc8 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -808,7 +808,6 @@ function item_post(App $a) {
                                $link = '<a href="' . System::baseUrl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
                                $html    = prepare_body($datarray);
                                $message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
-                               include_once 'include/html2plain.php';
                                $params =  [
                                        'fromName' => $a->user['username'],
                                        'fromEmail' => $a->user['email'],
diff --git a/mod/oexchange.php b/mod/oexchange.php
index 2e1d7a2dbc9f15b4e0e25a054f0843102123fec3..9f844e1db3770f7e4cd5243773e12c4d641750df 100644 (file)
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -46,8 +46,6 @@ function oexchange_content(App $a) {
                return;
        }
 
-       require_once('include/html2bbcode.php');
-
        $post = [];
 
        $post['profile_uid'] = local_user();
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index c59d2433042a1d5780011a642205936f5ce349d3..1148103054c2e37e3613581e08b29af922cd729c 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -28,7 +28,6 @@ use Friendica\Util\ParseUrl;
 use League\HTMLToMarkdown\HtmlConverter;
 
 require_once "include/event.php";
-require_once "include/html2plain.php";
 require_once "mod/proxy.php";
 
 class BBCode extends BaseObject
diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index 6e982c7f04709c96bf0cb711256ba47cd5d7acdc..ff6f890bb53361bcf1b9ab762c9344143a43f4bf 100644 (file)
--- a/src/Content/Text/Markdown.php
+++ b/src/Content/Text/Markdown.php
@@ -10,8 +10,6 @@ use Friendica\BaseObject;
 use Friendica\Model\Contact;
 use Michelf\MarkdownExtra;
 
-require_once  'include/html2bbcode.php';
-
 /**
  * Friendica-specific usage of Markdown
  *
diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index aaf6933f0299759b934448a632df3afba363fa29..95be5cdede0579db74a941fd7932444b9cb62093 100644 (file)
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -19,7 +19,6 @@ use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
 require_once 'include/dba.php';
-require_once 'include/html2plain.php';
 
 /**
  * @brief Methods for read and write notifications from/to database
diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 7b14b2cdc4d19e42ce4cab9298f6a153aaa92343..7a64751d64c5470bb86e89f89a65ebb267bb71f8 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -20,7 +20,6 @@ use dba;
 use Exception;
 
 require_once 'include/dba.php';
-require_once 'include/html2bbcode.php';
 
 /**
  * @brief This class handles GlobalContact related functions
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index a82ae3d255f4adf5f02f9a78060899b66dded215..3def7d3a8c94735b5f3af3e1fc56d6bb1eebcf90 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -42,7 +42,6 @@ require_once "include/enotify.php";
 require_once "include/items.php";
 require_once "include/event.php";
 require_once "include/text.php";
-require_once "include/html2bbcode.php";
 
 /**
  * @brief This class contain functions to create and send DFRN XML files
diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index 671e6a3edddee861d1b28621aea01f04b3960a6c..054a1f4ff769ac55e7b6d833075398c4c651de2e 100644 (file)
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -6,8 +6,6 @@ namespace Friendica\Protocol;
 
 use Friendica\Content\Text\HTML;
 
-require_once 'include/html2plain.php';
-
 /**
  * @brief Email class
  */
diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index d54846fc3475740bdd95b728a2c8b07bd8adc9fd..c67df646b4dd0cfafc2c0a203009d754e953785f 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -15,7 +15,6 @@ use DOMDocument;
 use DOMXPath;
 
 require_once 'include/dba.php';
-require_once 'include/html2bbcode.php';
 require_once 'include/items.php';
 
 /**
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 9eebc7f2e48970694acc2e87e50cbed954fec98f..fd53772fd742f45167ebabb841290f42d5d7ec07 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -26,7 +26,6 @@ use DOMDocument;
 use DOMXPath;
 
 require_once 'include/dba.php';
-require_once 'include/html2bbcode.php';
 require_once 'include/items.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index f5513bddd61d472583f68939737272c75454fcc5..46862b4065e4a8ca0230f9ea3d5d0bd64a8f2a88 100644 (file)
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -24,7 +24,6 @@ use DOMXPath;
 use Exception;
 
 require_once 'include/dba.php';
-require_once 'include/html2bbcode.php';
 
 class PortableContact
 {
diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index fe6fad66b024bb199305849e7f37171db51b20d4..dc6caab3db9c95fe0cdece3100077ed633c7ac4c 100644 (file)
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -17,7 +17,6 @@ use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
 use dba;
 
-require_once 'include/html2plain.php';
 require_once 'include/items.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 b43639b8451d32b5d87ba178331dfae37b5b56ea..edb0df33adbbcf0d63968dcb6b5ae1cfc055f61d 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -18,7 +18,6 @@ use Friendica\Protocol\Salmon;
 use dba;
 
 require_once 'include/dba.php';
-require_once 'include/html2plain.php';
 require_once 'include/items.php';
 
 /*
Unnamed repository; edit this file 'description' to name the repository.