X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fallfriends.php;h=d85d3ec9b36938f015e3f197c154ed086d98c6f7;hb=3e797547a37f8c8f22e88965b4a4d278bcc192e0;hp=9d6a6b0c7bda9345be974c35ba2f3ece97806718;hpb=045a0b2a007d869fc141f3f4a7a1761589565fdf;p=friendica.git

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 9d6a6b0c7b..d85d3ec9b3 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -1,22 +1,24 @@
 <?php
-
 /**
  * @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\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Model\Profile;
 
-require_once 'include/contact_selectors.php';
+require_once 'include/dba.php';
 require_once 'mod/contacts.php';
 
 function allfriends_content(App $a)
 {
 	$o = '';
 	if (!local_user()) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -31,17 +33,14 @@ function allfriends_content(App $a)
 
 	$uid = $a->user['uid'];
 
-	$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-		intval($cid),
-		intval(local_user())
-	);
+	$contact = dba::selectFirst('contact', ['name', 'url', 'photo'], ['id' => $cid, 'uid' => local_user()]);
 
-	if (!DBM::is_result($c)) {
+	if (!DBM::is_result($contact)) {
 		return;
 	}
 
 	$a->page['aside'] = "";
-	profile_load($a, "", 0, Contact::getDetailsByURL($c[0]["url"]));
+	Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
 
 	$total = GContact::countAllFriends(local_user(), $cid);
 
@@ -49,7 +48,7 @@ function allfriends_content(App $a)
 
 	$r = GContact::allFriends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
 	if (!DBM::is_result($r)) {
-		$o .= t('No friends to display.');
+		$o .= L10n::t('No friends to display.');
 		return $o;
 	}
 
@@ -70,13 +69,13 @@ function allfriends_content(App $a)
 			$photo_menu = Contact::photoMenu($rr);
 		} else {
 			$connlnk = System::baseUrl() . '/follow/?url=' . $rr['url'];
-			$photo_menu = array(
-				'profile' => array(t("View Profile"), zrl($rr['url'])),
-				'follow' => array(t("Connect/Follow"), $connlnk)
-			);
+			$photo_menu = [
+				'profile' => [L10n::t("View Profile"), Contact::magicLink($rr['url'])],
+				'follow' => [L10n::t("Connect/Follow"), $connlnk]
+			];
 		}
 
-		$entry = array(
+		$entry = [
 			'url'          => $rr['url'],
 			'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
 			'name'         => htmlentities($contact_details['name']),
@@ -86,12 +85,12 @@ function allfriends_content(App $a)
 			'tags'         => $contact_details['keywords'],
 			'about'        => $contact_details['about'],
 			'account_type' => Contact::getAccountType($contact_details),
-			'network'      => network_to_name($contact_details['network'], $contact_details['url']),
+			'network'      => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
 			'photo_menu'   => $photo_menu,
-			'conntxt'      => t('Connect'),
+			'conntxt'      => L10n::t('Connect'),
 			'connlnk'      => $connlnk,
 			'id'           => ++$id,
-		);
+		];
 		$entries[] = $entry;
 	}
 
@@ -99,12 +98,12 @@ function allfriends_content(App $a)
 
 	$tpl = get_markup_template('viewcontact_template.tpl');
 
-	$o .= replace_macros($tpl, array(
-		//'$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
+	$o .= replace_macros($tpl, [
+		//'$title' => L10n::t('Friends of %s', htmlentities($c[0]['name'])),
 		'$tab_str' => $tab_str,
 		'$contacts' => $entries,
 		'$paginate' => paginate($a),
-	));
+	]);
 
 	return $o;
 }