X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact.php;h=d307652b63681ff5fc9aa4619ad6d533d4c3ce1d;hb=3c76826793feeb933dab7a07dab7cc7eb2efc451;hp=01af275864480e3f1e708d69b246d8571e6accd6;hpb=d3a4558e808a138988545291a8ac7bd35db3e939;p=friendica.git

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 01af275864..d307652b63 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -17,10 +17,11 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model;
+use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\NotFoundException;
-use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
@@ -32,7 +33,7 @@ use Friendica\Util\Strings;
  */
 class Contact extends BaseModule
 {
-	private static function batchActions(App $a)
+	private static function batchActions()
 	{
 		if (empty($_POST['contact_batch']) || !is_array($_POST['contact_batch'])) {
 			return;
@@ -72,12 +73,12 @@ class Contact extends BaseModule
 			info(L10n::tt('%d contact edited.', '%d contacts edited.', $count_actions));
 		}
 
-		$a->internalRedirect('contact');
+		DI::baseUrl()->redirect('contact');
 	}
 
 	public static function post(array $parameters = [])
 	{
-		$a = self::getApp();
+		$a = DI::app();
 
 		if (!local_user()) {
 			return;
@@ -85,7 +86,7 @@ class Contact extends BaseModule
 
 		// @TODO: Replace with parameter from router
 		if ($a->argv[1] === 'batch') {
-			self::batchActions($a);
+			self::batchActions();
 			return;
 		}
 
@@ -97,7 +98,7 @@ class Contact extends BaseModule
 
 		if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false])) {
 			notice(L10n::t('Could not access contact record.') . EOL);
-			$a->internalRedirect('contact');
+			DI::baseUrl()->redirect('contact');
 			return; // NOTREACHED
 		}
 
@@ -246,7 +247,7 @@ class Contact extends BaseModule
 			return Login::form($_SERVER['REQUEST_URI']);
 		}
 
-		$a = self::getApp();
+		$a = DI::app();
 
 		$nets = $_GET['nets'] ?? '';
 		$rel  = $_GET['rel']  ?? '';
@@ -278,9 +279,9 @@ class Contact extends BaseModule
 			if ($contact['self']) {
 				// @TODO: Replace with parameter from router
 				if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
-					$a->internalRedirect('profile/' . $contact['nick']);
+					DI::baseUrl()->redirect('profile/' . $contact['nick']);
 				} else {
-					$a->internalRedirect('profile/' . $contact['nick'] . '?tab=profile');
+					DI::baseUrl()->redirect('profile/' . $contact['nick'] . '?tab=profile');
 				}
 			}
 
@@ -350,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;
@@ -378,13 +379,13 @@ class Contact extends BaseModule
 
 			if ($cmd === 'update' && ($orig_record['uid'] != 0)) {
 				self::updateContactFromPoll($contact_id);
-				$a->internalRedirect('contact/' . $contact_id);
+				DI::baseUrl()->redirect('contact/' . $contact_id);
 				// NOTREACHED
 			}
 
 			if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
 				self::updateContactFromProbe($contact_id);
-				$a->internalRedirect('crepair/' . $contact_id);
+				DI::baseUrl()->redirect('crepair/' . $contact_id);
 				// NOTREACHED
 			}
 
@@ -394,7 +395,7 @@ class Contact extends BaseModule
 				$blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
 				info(($blocked ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL);
 
-				$a->internalRedirect('contact/' . $contact_id);
+				DI::baseUrl()->redirect('contact/' . $contact_id);
 				// NOTREACHED
 			}
 
@@ -404,7 +405,7 @@ class Contact extends BaseModule
 				$ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
 				info(($ignored ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL);
 
-				$a->internalRedirect('contact/' . $contact_id);
+				DI::baseUrl()->redirect('contact/' . $contact_id);
 				// NOTREACHED
 			}
 
@@ -415,7 +416,7 @@ class Contact extends BaseModule
 					info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL);
 				}
 
-				$a->internalRedirect('contact/' . $contact_id);
+				DI::baseUrl()->redirect('contact/' . $contact_id);
 				// NOTREACHED
 			}
 
@@ -424,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) {
@@ -449,13 +450,13 @@ class Contact extends BaseModule
 				}
 				// Now check how the user responded to the confirmation query
 				if (!empty($_REQUEST['canceled'])) {
-					$a->internalRedirect('contact');
+					DI::baseUrl()->redirect('contact');
 				}
 
 				self::dropContact($orig_record);
 				info(L10n::t('Contact has been removed.') . EOL);
 
-				$a->internalRedirect('contact');
+				DI::baseUrl()->redirect('contact');
 				// NOTREACHED
 			}
 			if ($cmd === 'posts') {
@@ -466,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());
@@ -528,7 +529,7 @@ class Contact extends BaseModule
 
 			$poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
 
-			$nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url']));
+			$nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']));
 
 			// tabs
 			$tab_str = self::getTabsHTML($a, $contact, 3);
@@ -775,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 = [];
 
@@ -818,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,
@@ -1043,7 +1044,7 @@ class Contact extends BaseModule
 			'sparkle'   => $sparkle,
 			'itemurl'   => ($rr['addr'] ?? '') ?: $rr['url'],
 			'url'       => $url,
-			'network'   => ContactSelector::networkToName($rr['network'], $rr['url']),
+			'network'   => ContactSelector::networkToName($rr['network'], $rr['url'], $rr['protocol']),
 			'nick'      => $rr['nick'],
 		];
 	}