X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fallfriends.php;h=bf852419d21f5cf27cb7dbcada9129ebad56853f;hb=5ebe10d7fc808dc2ed3502b532e6db020928aa1c;hp=1456661253ff25bfb44f2e94e45fb2f0474a618a;hpb=bc58e8d3be1fe238d110d269afc312908f572343;p=friendica.git

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 1456661253..bf852419d2 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -3,82 +3,81 @@
  * @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) {
-
+function allfriends_content(App $a)
+{
 	$o = '';
-	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
+	if (!local_user()) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
+	$cid = 0;
 	if ($a->argc > 1) {
 		$cid = intval($a->argv[1]);
 	}
 
-	if (! $cid) {
+	if (!$cid) {
 		return;
 	}
 
 	$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);
 
-	if(count($total))
-		$a->set_pager_total($total);
+	$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 (!DBM::is_result($r)) {
+		$o .= L10n::t('No friends to display.');
 		return $o;
 	}
 
 	$id = 0;
 
+	$entries = [];
 	foreach ($r as $rr) {
-
 		//get further details of the contact
 		$contact_details = Contact::getDetailsByURL($rr['url'], $uid, $rr);
 
 		$photo_menu = '';
 
+		$connlnk = '';
 		// $rr[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photo_menu
 		// If the contact is not common to the user, Connect/Follow' will be added to the photo menu
-		if ($rr[cid]) {
-			$rr[id] = $rr[cid];
-			$photo_menu = Contact::photoMenu ($rr);
-		}
-		else {
+		if ($rr['cid']) {
+			$rr['id'] = $rr['cid'];
+			$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"), Profile::zrl($rr['url'])],
+				'follow' => [L10n::t("Connect/Follow"), $connlnk]
+			];
 		}
 
-		$entry = array(
+		$entry = [
 			'url'          => $rr['url'],
-			'itemurl'      => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+			'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
 			'name'         => htmlentities($contact_details['name']),
 			'thumb'        => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
 			'img_hover'    => 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;
 }