1
0
Fork 0

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
commit a71eb1d127
8 changed files with 19 additions and 14 deletions

View file

@ -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));
}

View file

@ -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);
}
}
}

View file

@ -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) {