X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FAllFriends.php;h=662dc17e4c24c047402f27b8773b9b7b879b80e2;hb=92692218255145124fb553d6b61d1d9fed27da19;hp=37710d4d9c6ebd7e4305a76f64ccdd49e2d9f734;hpb=c5e7abf9c552689812f1388ebba5e87fe245ad41;p=friendica.git

diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index 37710d4d9c..662dc17e4c 100644
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -5,17 +5,20 @@ namespace Friendica\Module;
 use Friendica\BaseModule;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Pager;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Model;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Proxy as ProxyUtils;
 
+/**
+ * This module shows all public friends of the selected contact
+ */
 class AllFriends extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
-		$app = self::getApp();
+		$app = DI::app();
 
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException();
@@ -29,7 +32,7 @@ class AllFriends extends BaseModule
 		}
 
 		if (!$cid) {
-			throw new HTTPException\BadRequestException(L10n::t('Invalid contact.'));
+			throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid contact.'));
 		}
 
 		$uid = $app->user['uid'];
@@ -37,19 +40,19 @@ class AllFriends extends BaseModule
 		$contact = Model\Contact::getContactForUser($cid, local_user(), ['name', 'url', 'photo', 'uid', 'id']);
 
 		if (empty($contact)) {
-			throw new HTTPException\BadRequestException(L10n::t('Invalid contact.'));
+			throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid contact.'));
 		}
 
-		$app->page['aside'] = "";
+		DI::page()['aside'] = "";
 		Model\Profile::load($app, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
 
 		$total = Model\GContact::countAllFriends(local_user(), $cid);
 
-		$pager = new Pager($app->query_string);
+		$pager = new Pager(DI::args()->getQueryString());
 
 		$friends = Model\GContact::allFriends(local_user(), $cid, $pager->getStart(), $pager->getItemsPerPage());
 		if (empty($friends)) {
-			return L10n::t('No friends to display.');
+			return DI::l10n()->t('No friends to display.');
 		}
 
 		$id = 0;
@@ -66,16 +69,16 @@ class AllFriends extends BaseModule
 				$friend['id'] = $friend['cid'];
 				$photoMenu = Model\Contact::photoMenu($friend);
 			} else {
-				$connlnk = $app->getBaseURL() . '/follow/?url=' . $friend['url'];
+				$connlnk = DI::baseUrl()->get() . '/follow/?url=' . $friend['url'];
 				$photoMenu = [
-					'profile' => [L10n::t("View Profile"), Model\Contact::magicLink($friend['url'])],
-					'follow'  => [L10n::t("Connect/Follow"), $connlnk]
+					'profile' => [DI::l10n()->t('View Profile'), Model\Contact::magicLinkbyId($friend['id'], $friend['url'])],
+					'follow'  => [DI::l10n()->t('Connect/Follow'), $connlnk]
 				];
 			}
 
 			$entry = [
-				'url'          => Model\Contact::magicLink($friend['url']),
-				'itemurl'      => defaults($contactDetails, 'addr', $friend['url']),
+				'url'          => Model\Contact::magicLinkbyId($friend['id'], $friend['url']),
+				'itemurl'      => ($contactDetails['addr'] ?? '') ?: $friend['url'],
 				'name'         => $contactDetails['name'],
 				'thumb'        => ProxyUtils::proxifyUrl($contactDetails['thumb'], false, ProxyUtils::SIZE_THUMB),
 				'img_hover'    => $contactDetails['name'],
@@ -85,7 +88,7 @@ class AllFriends extends BaseModule
 				'account_type' => Model\Contact::getAccountType($contactDetails),
 				'network'      => ContactSelector::networkToName($contactDetails['network'], $contactDetails['url']),
 				'photoMenu'    => $photoMenu,
-				'conntxt'      => L10n::t('Connect'),
+				'conntxt'      => DI::l10n()->t('Connect'),
 				'connlnk'      => $connlnk,
 				'id'           => ++$id,
 			];