X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcommon.php;h=1f1e8c33770f6b99bcbd46af57f803aaa59fccee;hb=05674206ba9a7c70c5e298e3925d95428abff78e;hp=26ef7e48b782af922433c3eb4f1a8fb4515649f2;hpb=9ca789b9529dceedc35f637804179e1034b3f1d9;p=friendica.git

diff --git a/mod/common.php b/mod/common.php
index 26ef7e48b7..1f1e8c3377 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -1,12 +1,18 @@
 <?php
 
-require_once('include/socgraph.php');
-require_once('include/Contact.php');
-require_once('include/contact_selectors.php');
-require_once('mod/contacts.php');
-
-function common_content(App &$a) {
-
+/**
+ * @file include/common.php
+ */
+use Friendica\App;
+use Friendica\Content\ContactSelector;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
+
+require_once 'mod/contacts.php';
+
+function common_content(App $a)
+{
 	$o = '';
 
 	$cmd = $a->argv[1];
@@ -14,8 +20,8 @@ function common_content(App &$a) {
 	$cid = intval($a->argv[3]);
 	$zcid = 0;
 
-	if (! local_user()) {
-		notice( t('Permission denied.') . EOL);
+	if (!local_user()) {
+		notice(t('Permission denied.') . EOL);
 		return;
 	}
 
@@ -23,7 +29,7 @@ function common_content(App &$a) {
 		return;
 	}
 
-	if (! $uid) {
+	if (!$uid) {
 		return;
 	}
 
@@ -32,45 +38,44 @@ function common_content(App &$a) {
 			intval($cid),
 			intval($uid)
 		);
-		/// @TODO Handle $c with dbm::is_result()
+		/// @TODO Handle $c with DBM::is_result()
 		$a->page['aside'] = "";
-		profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
+		profile_load($a, "", 0, Contact::getDetailsByURL($c[0]["url"]));
 	} else {
 		$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 			intval($uid)
 		);
-		/// @TODO Handle $c with dbm::is_result()
-
-		$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
+		/// @TODO Handle $c with DBM::is_result()
+		$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), array(
 			'$name' => htmlentities($c[0]['name']),
 			'$photo' => $c[0]['photo'],
 			'url' => 'contacts/' . $cid
 		));
 
-		if (! x($a->page,'aside')) {
+		if (!x($a->page, 'aside')) {
 			$a->page['aside'] = '';
 		}
 		$a->page['aside'] .= $vcard_widget;
 	}
 
-	if (! dbm::is_result($c)) {
+	if (!DBM::is_result($c)) {
 		return;
 	}
 
-	if(! $cid) {
-		if(get_my_url()) {
-			$r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
-				dbesc(normalise_link(get_my_url())),
-				intval($profile_uid)
+	if (!$cid && get_my_url()) {
+		/// @todo : Initialize $profile_uid
+		$r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+			dbesc(normalise_link(get_my_url())),
+			intval($profile_uid)
+		);
+		if (DBM::is_result($r)) {
+			$cid = $r[0]['id'];
+		} else {
+			$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
+				dbesc(normalise_link(get_my_url()))
 			);
-			if (dbm::is_result($r))
-				$cid = $r[0]['id'];
-			else {
-				$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-					dbesc(normalise_link(get_my_url()))
-				);
-				if (dbm::is_result($r))
-					$zcid = $r[0]['id'];
+			if (DBM::is_result($r)) {
+				$zcid = $r[0]['id'];
 			}
 		}
 	}
@@ -80,62 +85,61 @@ function common_content(App &$a) {
 	}
 
 	if ($cid) {
-		$t = count_common_friends($uid, $cid);
+		$t = GContact::countCommonFriends($uid, $cid);
 	} else {
-		$t = count_common_friends_zcid($uid, $zcid);
+		$t = GContact::countCommonFriendsZcid($uid, $zcid);
 	}
 
-	if (count($t)) {
+	if ($t > 0) {
 		$a->set_pager_total($t);
 	} else {
-		notice( t('No contacts in common.') . EOL);
+		notice(t('No contacts in common.') . EOL);
 		return $o;
 	}
 
-
 	if ($cid) {
-		$r = common_friends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
+		$r = GContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
 	} else {
-		$r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
+		$r = GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
 	}
 
-
-	if (! dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return $o;
 	}
 
 	$id = 0;
 
+	$entries = [];
 	foreach ($r as $rr) {
-
 		//get further details of the contact
-		$contact_details = get_contact_details_by_url($rr['url'], $uid);
+		$contact_details = Contact::getDetailsByURL($rr['url'], $uid);
 
 		// $rr['id'] is needed to use contact_photo_menu()
 		/// @TODO Adding '/" here avoids E_NOTICE on missing constants
 		$rr['id'] = $rr['cid'];
 
-		$photo_menu = '';
-		$photo_menu = contact_photo_menu($rr);
+		$photo_menu = Contact::photoMenu($rr);
 
 		$entry = array(
 			'url'          => $rr['url'],
-			'itemurl'      => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+			'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
 			'name'         => $contact_details['name'],
 			'thumb'        => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
 			'img_hover'    => htmlentities($contact_details['name']),
 			'details'      => $contact_details['location'],
 			'tags'         => $contact_details['keywords'],
 			'about'        => $contact_details['about'],
-			'account_type' => account_type($contact_details),
-			'network'      => network_to_name($contact_details['network'], $contact_details['url']),
+			'account_type' => Contact::getAccountType($contact_details),
+			'network'      => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
 			'photo_menu'   => $photo_menu,
 			'id'           => ++$id,
 		);
 		$entries[] = $entry;
 	}
 
-	if ($cmd === 'loc' && $cid && $uid == local_user()) {
+	$title = '';
+	$tab_str = '';
+	if ($cmd === 'loc' && $cid && local_user() == $uid) {
 		$tab_str = contacts_tab($a, $cid, 4);
 	} else {
 		$title = t('Common Friends');
@@ -143,7 +147,7 @@ function common_content(App &$a) {
 
 	$tpl = get_markup_template('viewcontact_template.tpl');
 
-	$o .= replace_macros($tpl,array(
+	$o .= replace_macros($tpl, array(
 		'$title'    => $title,
 		'$tab_str'  => $tab_str,
 		'$contacts' => $entries,