functions moved to HTML class

update function calls to moved class.
This commit is contained in:
Adam Magness 2018-11-05 21:06:26 -05:00
parent e31dde6084
commit a71eb1d127
8 changed files with 19 additions and 14 deletions

View File

@ -1046,7 +1046,7 @@ function api_statuses_mediap($type)
//$txt = urldecode(requestdata('status')); //$txt = urldecode(requestdata('status'));
if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) { if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) {
$txt = html2bb_video($txt); $txt = HTML::htmlToBBVideo($txt);
$config = HTMLPurifier_Config::createDefault(); $config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null); $config->set('Cache.DefinitionImpl', null);
$purifier = new HTMLPurifier($config); $purifier = new HTMLPurifier($config);
@ -1092,7 +1092,7 @@ function api_statuses_update($type)
if (requestdata('htmlstatus')) { if (requestdata('htmlstatus')) {
$txt = requestdata('htmlstatus'); $txt = requestdata('htmlstatus');
if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) { if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) {
$txt = html2bb_video($txt); $txt = HTML::htmlToBBVideo($txt);
$config = HTMLPurifier_Config::createDefault(); $config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null); $config->set('Cache.DefinitionImpl', null);

View File

@ -10,6 +10,7 @@ use Friendica\Content\ForumManager;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Content\Pager; use Friendica\Content\Pager;
use Friendica\Content\Widget; use Friendica\Content\Widget;
use Friendica\Content\Text\HTML;
use Friendica\Core\ACL; use Friendica\Core\ACL;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Config; use Friendica\Core\Config;
@ -205,7 +206,7 @@ function saved_searches($search)
$o = Renderer::replaceMacros($tpl, [ $o = Renderer::replaceMacros($tpl, [
'$title' => L10n::t('Saved Searches'), '$title' => L10n::t('Saved Searches'),
'$add' => L10n::t('add'), '$add' => L10n::t('add'),
'$searchbox' => search($search, 'netsearch-box', $srchurl, true), '$searchbox' => HTML::search($search, 'netsearch-box', $srchurl, true),
'$saved' => $saved, '$saved' => $saved,
]); ]);
@ -348,7 +349,7 @@ function networkConversation(App $a, $items, Pager $pager, $mode, $update, $orde
if (!$update) { if (!$update) {
if (PConfig::get(local_user(), 'system', 'infinite_scroll')) { if (PConfig::get(local_user(), 'system', 'infinite_scroll')) {
$o .= scroll_loader(); $o .= HTML::scrollLoader();
} else { } else {
$o .= $pager->renderMinimal(count($items)); $o .= $pager->renderMinimal(count($items));
} }

View File

@ -7,6 +7,7 @@ use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Content\Text\HTML;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Profile; use Friendica\Model\Profile;
@ -133,7 +134,7 @@ function profperm_content(App $a) {
foreach($members as $member) { foreach($members as $member) {
if ($member['url']) { if ($member['url']) {
$member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;'; $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
$o .= micropro($member,true,'mpprof', $textmode); $o .= HTML::micropro($member,true,'mpprof', $textmode);
} }
} }
$o .= '</div><div id="prof-members-end"></div>'; $o .= '</div><div id="prof-members-end"></div>';
@ -155,7 +156,7 @@ function profperm_content(App $a) {
foreach($r as $member) { foreach($r as $member) {
if (!in_array($member['id'],$ingroup)) { if (!in_array($member['id'],$ingroup)) {
$member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;'; $member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
$o .= micropro($member,true,'mpprof',$textmode); $o .= HTML::micropro($member,true,'mpprof',$textmode);
} }
} }
} }

View File

@ -7,6 +7,7 @@ use Friendica\App;
use Friendica\Content\Feature; use Friendica\Content\Feature;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Content\Pager; use Friendica\Content\Pager;
use Friendica\Content\Text\HTML;
use Friendica\Core\Cache; use Friendica\Core\Cache;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
@ -163,7 +164,7 @@ function search_content(App $a) {
'name' => "search-header", 'name' => "search-header",
'$title' => L10n::t("Search"), '$title' => L10n::t("Search"),
'$title_size' => 3, '$title_size' => 3,
'$content' => search($search,'search-box','search',((local_user()) ? true : false), false) '$content' => HTML::search($search,'search-box','search',((local_user()) ? true : false), false)
]); ]);
if (strpos($search,'#') === 0) { if (strpos($search,'#') === 0) {

View File

@ -7,6 +7,7 @@ namespace Friendica\Content;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Content\Feature; use Friendica\Content\Feature;
use Friendica\Content\Text\HTML;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\System; use Friendica\Core\System;
@ -169,7 +170,7 @@ class ForumManager
$total_shown = 0; $total_shown = 0;
$forumlist = ''; $forumlist = '';
foreach ($contacts as $contact) { foreach ($contacts as $contact) {
$forumlist .= micropro($contact, false, 'forumlist-profile-advanced'); $forumlist .= HTML::micropro($contact, false, 'forumlist-profile-advanced');
$total_shown ++; $total_shown ++;
if ($total_shown == $show_total) { if ($total_shown == $show_total) {
break; break;

View File

@ -862,7 +862,7 @@ class HTML
$contacts = L10n::tt('%d Contact', '%d Contacts', $total); $contacts = L10n::tt('%d Contact', '%d Contacts', $total);
$micropro = []; $micropro = [];
foreach ($r as $rr) { foreach ($r as $rr) {
$micropro[] = micropro($rr, true, 'mpfriend'); $micropro[] = self::micropro($rr, true, 'mpfriend');
} }
} }
} }

View File

@ -8,6 +8,7 @@ use Friendica\App;
use Friendica\Content\Feature; use Friendica\Content\Feature;
use Friendica\Content\ForumManager; use Friendica\Content\ForumManager;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\Core\Cache; use Friendica\Core\Cache;
use Friendica\Core\Config; use Friendica\Core\Config;
@ -467,7 +468,7 @@ class Profile
$updated = ''; $updated = '';
$contacts = 0; $contacts = 0;
if (!$block) { if (!$block) {
$contact_block = contact_block(); $contact_block = HTML::contactBlock();
if (is_array($a->profile) && !$a->profile['hide-friends']) { if (is_array($a->profile) && !$a->profile['hide-friends']) {
$r = q( $r = q(
@ -785,11 +786,11 @@ class Profile
} }
if ($a->profile['homepage']) { if ($a->profile['homepage']) {
$profile['homepage'] = [L10n::t('Homepage:'), linkify($a->profile['homepage'])]; $profile['homepage'] = [L10n::t('Homepage:'), HTML::toLink($a->profile['homepage'])];
} }
if ($a->profile['hometown']) { if ($a->profile['hometown']) {
$profile['hometown'] = [L10n::t('Hometown:'), linkify($a->profile['hometown'])]; $profile['hometown'] = [L10n::t('Hometown:'), HTML::toLink($a->profile['hometown'])];
} }
if ($a->profile['pub_keywords']) { if ($a->profile['pub_keywords']) {

View File

@ -2500,9 +2500,9 @@ class DFRN
/// @todo Do we really need this check for HTML elements? (It was copied from the old function) /// @todo Do we really need this check for HTML elements? (It was copied from the old function)
if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) { if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) {
$base_url = get_app()->getBaseURL(); $base_url = get_app()->getBaseURL();
$item['body'] = reltoabs($item['body'], $base_url); $item['body'] = HTML::relToAbs($item['body'], $base_url);
$item['body'] = html2bb_video($item['body']); $item['body'] = HTML::htmlToBBVideo($item['body']);
$item['body'] = OEmbed::HTML2BBCode($item['body']); $item['body'] = OEmbed::HTML2BBCode($item['body']);