X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fallfriends.php;h=32cd23ec6bf0d1469f2dbb43467111a61b2490ea;hb=5c254ee401ed5cc77d11648d1e2c6e9223188e99;hp=0d8be35cd36414574db2bc8cd2c4e7a07939ee78;hpb=39ff6e9ce9251fe69b56ba05ea7bdc1896f34de2;p=friendica.git

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 0d8be35cd3..32cd23ec6b 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -2,14 +2,16 @@
 /**
  * @file mod/allfriends.php
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
+use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
-use dba;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/dba.php';
 require_once 'mod/contacts.php';
@@ -18,7 +20,7 @@ function allfriends_content(App $a)
 {
 	$o = '';
 	if (!local_user()) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -33,9 +35,9 @@ function allfriends_content(App $a)
 
 	$uid = $a->user['uid'];
 
-	$contact = dba::selectFirst('contact', ['name', 'url', 'photo'], ['id' => $cid, 'uid' => local_user()]);
+	$contact = DBA::selectFirst('contact', ['name', 'url', 'photo'], ['id' => $cid, 'uid' => local_user()]);
 
-	if (!DBM::is_result($contact)) {
+	if (!DBA::isResult($contact)) {
 		return;
 	}
 
@@ -47,8 +49,8 @@ function allfriends_content(App $a)
 	$a->set_pager_total($total);
 
 	$r = GContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
-	if (!DBM::is_result($r)) {
-		$o .= t('No friends to display.');
+	if (!DBA::isResult($r)) {
+		$o .= L10n::t('No friends to display.');
 		return $o;
 	}
 
@@ -70,8 +72,8 @@ function allfriends_content(App $a)
 		} else {
 			$connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
 			$photo_menu = [
-				'profile' => [t("View Profile"), Profile::zrl($rr['url'])],
-				'follow' => [t("Connect/Follow"), $connlnk]
+				'profile' => [L10n::t("View Profile"), Contact::magicLink($rr['url'])],
+				'follow' => [L10n::t("Connect/Follow"), $connlnk]
 			];
 		}
 
@@ -79,7 +81,7 @@ function allfriends_content(App $a)
 			'url'          => $rr['url'],
 			'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
 			'name'         => htmlentities($contact_details['name']),
-			'thumb'        => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+			'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
 			'img_hover'    => htmlentities($contact_details['name']),
 			'details'      => $contact_details['location'],
 			'tags'         => $contact_details['keywords'],
@@ -87,7 +89,7 @@ function allfriends_content(App $a)
 			'account_type' => Contact::getAccountType($contact_details),
 			'network'      => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
 			'photo_menu'   => $photo_menu,
-			'conntxt'      => t('Connect'),
+			'conntxt'      => L10n::t('Connect'),
 			'connlnk'      => $connlnk,
 			'id'           => ++$id,
 		];
@@ -99,7 +101,7 @@ function allfriends_content(App $a)
 	$tpl = get_markup_template('viewcontact_template.tpl');
 
 	$o .= replace_macros($tpl, [
-		//'$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
+		//'$title' => L10n::t('Friends of %s', htmlentities($c[0]['name'])),
 		'$tab_str' => $tab_str,
 		'$contacts' => $entries,
 		'$paginate' => paginate($a),