functions moved to HTML class

update function calls to moved class.

include/api.php

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

mod/network.php

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

mod/profperm.php

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

mod/search.php

@@ -7,6 +7,7 @@ use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
+use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
@@ -163,7 +164,7 @@ function search_content(App $a) {
 		'name' => "search-header",
 		'$title' => L10n::t("Search"),
 		'$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) {

src/Content/ForumManager.php

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

src/Content/Text/HTML.php

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

src/Model/Profile.php

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

src/Protocol/DFRN.php

@@ -2500,9 +2500,9 @@ class DFRN
 		/// @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)) {
 			$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']);