X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommon.php;h=afe78ce460270fdd06a44bf2b02543883ac87042;hb=c4da138eee992d0380b8b1791e641116d86c3f8b;hp=cfeb531f761017616c0dfe00e777b1c5925cd78f;hpb=224cfb274694a063ef205e7a0331f435cc0999c0;p=friendica.git

diff --git a/mod/common.php b/mod/common.php
index cfeb531f76..afe78ce460 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -2,13 +2,15 @@
 /**
  * @file include/common.php
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
-use Friendica\Database\DBM;
+use Friendica\Core\L10n;
+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';
@@ -23,7 +25,7 @@ function common_content(App $a)
 	$zcid = 0;
 
 	if (!local_user()) {
-		notice(t('Permission denied.') . EOL);
+		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -36,22 +38,22 @@ function common_content(App $a)
 	}
 
 	if ($cmd === 'loc' && $cid) {
-		$contact = dba::selectFirst('contact', ['name', 'url', 'photo'], ['id' => $cid, 'uid' => $uid]);
+		$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['id' => $cid, 'uid' => $uid]);
 
-		if (DBM::is_result($contact)) {
+		if (DBA::isResult($contact)) {
 			$a->page['aside'] = "";
 			Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
 		}
 	} else {
-		$contact = dba::selectFirst('contact', ['name', 'url', 'photo'], ['self' => true, 'uid' => $uid]);
+		$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
 
-		if (DBM::is_result($contact)) {
-			$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), array(
+		if (DBA::isResult($contact)) {
+			$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
 				'$name' => htmlentities($contact['name']),
 				'$photo' => $contact['photo'],
 				'url' => 'contacts/' . $cid
-			));
-	
+			]);
+
 			if (!x($a->page, 'aside')) {
 				$a->page['aside'] = '';
 			}
@@ -59,17 +61,17 @@ function common_content(App $a)
 		}
 	}
 
-	if (!DBM::is_result($contact)) {
+	if (!DBA::isResult($contact)) {
 		return;
 	}
 
 	if (!$cid && Profile::getMyURL()) {
-		$contact = dba::selectFirst('contact', ['id'], ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $uid]);
-		if (DBM::is_result($contact)) {
+		$contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $uid]);
+		if (DBA::isResult($contact)) {
 			$cid = $contact['id'];
 		} else {
-			$gcontact = dba::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
-			if (DBM::is_result($gcontact)) {
+			$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
+			if (DBA::isResult($gcontact)) {
 				$zcid = $gcontact['id'];
 			}
 		}
@@ -88,7 +90,7 @@ function common_content(App $a)
 	if ($t > 0) {
 		$a->set_pager_total($t);
 	} else {
-		notice(t('No contacts in common.') . EOL);
+		notice(L10n::t('No contacts in common.') . EOL);
 		return $o;
 	}
 
@@ -98,7 +100,7 @@ function common_content(App $a)
 		$r = GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
 	}
 
-	if (!DBM::is_result($r)) {
+	if (!DBA::isResult($r)) {
 		return $o;
 	}
 
@@ -115,11 +117,11 @@ function common_content(App $a)
 
 		$photo_menu = Contact::photoMenu($rr);
 
-		$entry = array(
+		$entry = [
 			'url'          => $rr['url'],
 			'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
 			'name'         => $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'],
@@ -128,26 +130,26 @@ function common_content(App $a)
 			'network'      => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
 			'photo_menu'   => $photo_menu,
 			'id'           => ++$id,
-		);
+		];
 		$entries[] = $entry;
 	}
 
 	$title = '';
 	$tab_str = '';
 	if ($cmd === 'loc' && $cid && local_user() == $uid) {
-		$tab_str = contacts_tab($a, $cid, 4);
+		$tab_str = contacts_tab($a, $contact, 4);
 	} else {
-		$title = t('Common Friends');
+		$title = L10n::t('Common Friends');
 	}
 
 	$tpl = get_markup_template('viewcontact_template.tpl');
 
-	$o .= replace_macros($tpl, array(
+	$o .= replace_macros($tpl, [
 		'$title'    => $title,
 		'$tab_str'  => $tab_str,
 		'$contacts' => $entries,
 		'$paginate' => paginate($a),
-	));
+	]);
 
 	return $o;
 }