X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact.php;h=769bb82b3160f071bba899514e142c9217c39ec3;hb=6cbfa5b862ce7a241fd4339129749f87dc19760c;hp=d307652b63681ff5fc9aa4619ad6d533d4c3ce1d;hpb=3c76826793feeb933dab7a07dab7cc7eb2efc451;p=friendica.git diff --git a/src/Module/Contact.php b/src/Module/Contact.php index d307652b63..769bb82b31 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -14,7 +14,6 @@ use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Protocol; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; @@ -252,8 +251,8 @@ class Contact extends BaseModule $nets = $_GET['nets'] ?? ''; $rel = $_GET['rel'] ?? ''; - if (empty($a->page['aside'])) { - $a->page['aside'] = ''; + if (empty(DI::page()['aside'])) { + DI::page()['aside'] = ''; } $contact_id = null; @@ -347,10 +346,10 @@ class Contact extends BaseModule $groups_widget = null; } - $a->page['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget . $rel_widget; + DI::page()['aside'] .= $vcard_widget . $findpeople_widget . $follow_widget . $groups_widget . $networks_widget . $rel_widget; $tpl = Renderer::getMarkupTemplate('contacts-head.tpl'); - $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [ + DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl, [ '$baseurl' => DI::baseUrl()->get(true), ]); @@ -434,7 +433,7 @@ class Contact extends BaseModule } } - $a->page['aside'] = ''; + DI::page()['aside'] = ''; return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [ '$header' => L10n::t('Drop contact'), @@ -472,7 +471,7 @@ class Contact extends BaseModule if (!empty($a->data['contact']) && is_array($a->data['contact'])) { $contact = $a->data['contact']; - $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [ + DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [ '$baseurl' => DI::baseUrl()->get(true), ]); @@ -931,7 +930,7 @@ class Contact extends BaseModule 'default_location' => $a->user['default-location'], 'nickname' => $a->user['nickname'], 'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'), - 'acl' => ACL::getFullSelectorHTML($a->page, $a->user, true), + 'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true), 'bang' => '', 'visitor' => 'block', 'profile_uid' => local_user(), @@ -947,7 +946,7 @@ class Contact extends BaseModule } if (DBA::isResult($contact)) { - $a->page['aside'] = ''; + DI::page()['aside'] = ''; $profiledata = Model\Contact::getDetailsByURL($contact['url']); @@ -965,12 +964,12 @@ class Contact extends BaseModule $o = self::getTabsHTML($a, $contact, 2); if (DBA::isResult($contact)) { - $a->page['aside'] = ''; + DI::page()['aside'] = ''; $profiledata = Model\Contact::getDetailsByURL($contact['url']); if (local_user() && in_array($profiledata['network'], Protocol::FEDERATED)) { - $profiledata['remoteconnect'] = System::baseUrl() . '/follow?url=' . urlencode($profiledata['url']); + $profiledata['remoteconnect'] = DI::baseUrl() . '/follow?url=' . urlencode($profiledata['url']); } Model\Profile::load($a, '', 0, $profiledata, true);