Completely removed argc/argv

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

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 89051f27dc8608595fd0890d386cb377d67c2007..1ca681a1eb1b86fbcda1a93ed6eb20307577b211 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -106,13 +106,13 @@ class Contact extends BaseModule
                }
 
                // @TODO: Replace with parameter from router
-               if ($a->argv[1] === 'batch') {
+               if (DI::args()->getArgv()[1] === 'batch') {
                        self::batchActions();
                        return;
                }
 
                // @TODO: Replace with parameter from router
-               $contact_id = intval($a->argv[1]);
+               $contact_id = intval(DI::args()->getArgv()[1]);
                if (!$contact_id) {
                        return;
                }
@@ -156,12 +156,6 @@ class Contact extends BaseModule
                if (!DBA::isResult($r)) {
                        notice(DI::l10n()->t('Failed to update contact record.'));
                }
-
-               $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
-               if (DBA::isResult($contact)) {
-                       $a->data['contact'] = $contact;
-               }
-
                return;
        }
 
@@ -277,10 +271,10 @@ class Contact extends BaseModule
 
                $contact = null;
                // @TODO: Replace with parameter from router
-               if ($a->argc == 2 && intval($a->argv[1])
-                       || $a->argc == 3 && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])
+               if (DI::args()->getArgc() == 2 && intval(DI::args()->getArgv()[1])
+                       || DI::args()->getArgc() == 3 && intval(DI::args()->getArgv()[1]) && in_array(DI::args()->getArgv()[2], ['posts', 'conversations'])
                ) {
-                       $contact_id = intval($a->argv[1]);
+                       $contact_id = intval(DI::args()->getArgv()[1]);
 
                        // Ensure to use the user contact when the public contact was provided
                        $data = Model\Contact::getPublicAndUserContactID($contact_id, local_user());
@@ -299,15 +293,13 @@ class Contact extends BaseModule
                if (DBA::isResult($contact)) {
                        if ($contact['self']) {
                                // @TODO: Replace with parameter from router
-                               if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
+                               if ((DI::args()->getArgc() == 3) && intval(DI::args()->getArgv()[1]) && in_array(DI::args()->getArgv()[2], ['posts', 'conversations'])) {
                                        DI::baseUrl()->redirect('profile/' . $contact['nick']);
                                } else {
                                        DI::baseUrl()->redirect('profile/' . $contact['nick'] . '/profile');
                                }
                        }
 
-                       $a->data['contact'] = $contact;
-
                        $vcard_widget = Widget\VCard::getHTML($contact);
 
                        $findpeople_widget = '';
@@ -351,14 +343,14 @@ class Contact extends BaseModule
                        return Login::form();
                }
 
-               if ($a->argc == 3) {
-                       $contact_id = intval($a->argv[1]);
+               if (DI::args()->getArgc() == 3) {
+                       $contact_id = intval(DI::args()->getArgv()[1]);
                        if (!$contact_id) {
                                throw new BadRequestException();
                        }
 
                        // @TODO: Replace with parameter from router
-                       $cmd = $a->argv[2];
+                       $cmd = DI::args()->getArgv()[2];
 
                        $orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false, 'deleted' => false]);
                        if (!DBA::isResult($orig_record)) {
@@ -453,9 +445,7 @@ class Contact extends BaseModule
 
                $_SESSION['return_path'] = DI::args()->getQueryString();
 
-               if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
-                       $contact = $a->data['contact'];
-
+               if (!empty($contact)) {
                        DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
                                '$baseurl' => DI::baseUrl()->get(true),
                        ]);
@@ -647,7 +637,7 @@ class Contact extends BaseModule
                $sql_values = [local_user()];
 
                // @TODO: Replace with parameter from router
-               $type = $a->argv[1] ?? '';
+               $type = DI::args()->getArgv()[1] ?? '';
 
                switch ($type) {
                        case 'blocked':