Merge pull request #8033 from annando/contact-logging

[friendica.git] / src / Module / Contact.php

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 45e4900ac2ee8227f549edd8bdca8d76def3199f..d307652b63681ff5fc9aa4619ad6d533d4c3ce1d 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -351,7 +351,7 @@ class Contact extends BaseModule
 
                $tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
                $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
-                       '$baseurl' => $a->getBaseURL(true),
+                       '$baseurl' => DI::baseUrl()->get(true),
                ]);
 
                $sort_type = 0;
@@ -425,7 +425,7 @@ class Contact extends BaseModule
                                if (!empty($_REQUEST['confirm'])) {
                                        // <form> can't take arguments in its 'action' parameter
                                        // so add any arguments as hidden inputs
-                                       $query = explode_querystring($a->query_string);
+                                       $query = explode_querystring(DI::args()->getQueryString());
                                        $inputs = [];
                                        foreach ($query['args'] as $arg) {
                                                if (strpos($arg, 'confirm=') === false) {
@@ -467,13 +467,13 @@ class Contact extends BaseModule
                        }
                }
 
-               $_SESSION['return_path'] = $a->query_string;
+               $_SESSION['return_path'] = DI::args()->getQueryString();
 
                if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
                        $contact = $a->data['contact'];
 
                        $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
-                               '$baseurl' => $a->getBaseURL(true),
+                               '$baseurl' => DI::baseUrl()->get(true),
                        ]);
 
                        $contact['blocked']  = Model\Contact::isBlockedByUser($contact['id'], local_user());
@@ -776,7 +776,7 @@ class Contact extends BaseModule
                if (DBA::isResult($r)) {
                        $total = $r[0]['total'];
                }
-               $pager = new Pager($a->query_string);
+               $pager = new Pager(DI::args()->getQueryString());
 
                $contacts = [];
 
@@ -819,7 +819,7 @@ class Contact extends BaseModule
                        '$desc'       => L10n::t('Search your contacts'),
                        '$finding'    => $searching ? L10n::t('Results for: %s', $search) : '',
                        '$submit'     => L10n::t('Find'),
-                       '$cmd'        => $a->cmd,
+                       '$cmd'        => DI::args()->getCommand(),
                        '$contacts'   => $contacts,
                        '$contact_drop_confirm' => L10n::t('Do you really want to delete this contact?'),
                        'multiselect' => 1,