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

Remove/Update references to include/html2*.php

Browse source
This commit is contained in:
Hypolite Petovan 2018-03-07 16:34:17 -05:00
parent 5e806ff598
commit 789561c7a2
18 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/Addons.md
View file

@ -372,7 +372,7 @@ include/cronhooks.php: Addon::callHooks('cron', $d);
include/security.php: Addon::callHooks('logged_in', $a->user); 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]); include/Contact.php: Addon::callHooks('remove_user',$r[0]);

2
doc/de/Addons.md
View file

@ -265,7 +265,7 @@ include/cronhooks.php: Addon::callHooks('cron', $d);
include/security.php: Addon::callHooks('logged_in', $a->user); 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]); include/Contact.php: Addon::callHooks('remove_user',$r[0]);

2
include/api.php
View file

@ -42,11 +42,9 @@ use Friendica\Util\Network;
use Friendica\Util\XML; use Friendica\Util\XML;
require_once 'include/conversation.php'; require_once 'include/conversation.php';
require_once 'include/html2plain.php';
require_once 'mod/share.php'; require_once 'mod/share.php';
require_once 'mod/item.php'; require_once 'mod/item.php';
require_once 'include/security.php'; require_once 'include/security.php';
require_once 'include/html2bbcode.php';
require_once 'mod/wall_upload.php'; require_once 'mod/wall_upload.php';
require_once 'mod/proxy.php'; require_once 'mod/proxy.php';

2
include/enotify.php
View file

@ -12,8 +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/html2bbcode.php';
/** /**
* @brief Creates a notification entry and possibly sends a mail * @brief Creates a notification entry and possibly sends a mail
* *

2
mod/display.php
View file

@ -368,8 +368,6 @@ 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/html2plain.php';
$description = trim(HTML::toPlaintext(BBCode::convert($s[0]["body"], false), 0, true)); $description = trim(HTML::toPlaintext(BBCode::convert($s[0]["body"], false), 0, true));
$title = trim(HTML::toPlaintext(BBCode::convert($s[0]["title"], false), 0, true)); $title = trim(HTML::toPlaintext(BBCode::convert($s[0]["title"], false), 0, true));
$author_name = $s[0]["author-name"]; $author_name = $s[0]["author-name"];

1
mod/item.php
View file

@ -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 />'; $link = '<a href="' . System::baseUrl() . '/profile/' . $a->user['nickname'] . '"><img src="' . $author['thumb'] . '" alt="' . $a->user['username'] . '" /></a><br /><br />';
$html = prepare_body($datarray); $html = prepare_body($datarray);
$message = '<html><body>' . $link . $html . $disclaimer . '</body></html>'; $message = '<html><body>' . $link . $html . $disclaimer . '</body></html>';
include_once 'include/html2plain.php';
$params = [ $params = [
'fromName' => $a->user['username'], 'fromName' => $a->user['username'],
'fromEmail' => $a->user['email'], 'fromEmail' => $a->user['email'],

2
mod/oexchange.php
View file

@ -46,8 +46,6 @@ function oexchange_content(App $a) {
return; return;
} }
require_once('include/html2bbcode.php');
$post = []; $post = [];
$post['profile_uid'] = local_user(); $post['profile_uid'] = local_user();

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

@ -28,7 +28,6 @@ use Friendica\Util\ParseUrl;
use League\HTMLToMarkdown\HtmlConverter; use League\HTMLToMarkdown\HtmlConverter;
require_once "include/event.php"; require_once "include/event.php";
require_once "include/html2plain.php";
require_once "mod/proxy.php"; require_once "mod/proxy.php";
class BBCode extends BaseObject class BBCode extends BaseObject

2
src/Content/Text/Markdown.php
View file

@ -10,8 +10,6 @@ use Friendica\BaseObject;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Michelf\MarkdownExtra; use Michelf\MarkdownExtra;
require_once 'include/html2bbcode.php';
/** /**
* Friendica-specific usage of Markdown * Friendica-specific usage of Markdown
* *

1
src/Core/NotificationsManager.php
View file

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

1
src/Model/GContact.php
View file

@ -20,7 +20,6 @@ use dba;
use Exception; use Exception;
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once 'include/html2bbcode.php';
/** /**
* @brief This class handles GlobalContact related functions * @brief This class handles GlobalContact related functions

1
src/Protocol/DFRN.php
View file

@ -42,7 +42,6 @@ require_once "include/enotify.php";
require_once "include/items.php"; 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";
/** /**
* @brief This class contain functions to create and send DFRN XML files * @brief This class contain functions to create and send DFRN XML files

2
src/Protocol/Email.php
View file

@ -6,8 +6,6 @@ namespace Friendica\Protocol;
use Friendica\Content\Text\HTML; use Friendica\Content\Text\HTML;
require_once 'include/html2plain.php';
/** /**
* @brief Email class * @brief Email class
*/ */

1
src/Protocol/Feed.php
View file

@ -15,7 +15,6 @@ use DOMDocument;
use DOMXPath; use DOMXPath;
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once 'include/html2bbcode.php';
require_once 'include/items.php'; require_once 'include/items.php';
/** /**

1
src/Protocol/OStatus.php
View file

@ -26,7 +26,6 @@ use DOMDocument;
use DOMXPath; use DOMXPath;
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once 'include/html2bbcode.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/Protocol/PortableContact.php
View file

@ -24,7 +24,6 @@ use DOMXPath;
use Exception; use Exception;
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once 'include/html2bbcode.php';
class PortableContact class PortableContact
{ {

1
src/Worker/Delivery.php
View file

@ -17,7 +17,6 @@ use Friendica\Protocol\Diaspora;
use Friendica\Protocol\Email; use Friendica\Protocol\Email;
use dba; use dba;
require_once 'include/html2plain.php';
require_once 'include/items.php'; require_once 'include/items.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

@ -18,7 +18,6 @@ use Friendica\Protocol\Salmon;
use dba; use dba;
require_once 'include/dba.php'; require_once 'include/dba.php';
require_once 'include/html2plain.php';
require_once 'include/items.php'; require_once 'include/items.php';
/* /*