X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_widgets.php;h=810671a91cceee3e4ce78a646b56b7ef443a79d3;hb=37fccee503341ce1363e57cc81d465ef224e702d;hp=1aaef115c91d672bb2b226f77fd104055848434a;hpb=8bd6e1aef9bcace19e4517b4f53c976d4c0a2760;p=friendica.git

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 1aaef115c9..810671a91c 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -1,11 +1,12 @@
 <?php
 
-function follow_widget() {
+function follow_widget($value = "") {
 
 	return replace_macros(get_markup_template('follow.tpl'),array(
 		'$connect' => t('Add New Contact'),
 		'$desc' => t('Enter address or web location'),
 		'$hint' => t('Example: bob@example.com, http://example.com/barbara'),
+		'$value' => $value,
 		'$follow' => t('Connect')
 	));
 
@@ -47,8 +48,10 @@ function networks_widget($baseurl,$selected = '') {
 	if(! local_user())
 		return '';
 
-	
-	$r = q("select distinct(network) from contact where uid = %d and self = 0",
+	if(! feature_enabled(local_user(),'networks'))
+		return '';
+
+	$r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `self` = 0 ORDER BY `network`",
 		intval(local_user())
 	);
 
@@ -80,6 +83,9 @@ function fileas_widget($baseurl,$selected = '') {
 	if(! local_user())
 		return '';
 
+	if(! feature_enabled(local_user(),'filing'))
+		return '';
+
 	$saved = get_pconfig(local_user(),'system','filetags');
 	if(! strlen($saved))
 		return;
@@ -106,8 +112,12 @@ function fileas_widget($baseurl,$selected = '') {
 }
 
 function categories_widget($baseurl,$selected = '') {
+
 	$a = get_app();
 
+	if(! feature_enabled($a->profile['profile_uid'],'categories'))
+		return '';
+
 	$saved = get_pconfig($a->profile['profile_uid'],'system','filetags');
 	if(! strlen($saved))
 		return;
@@ -142,15 +152,30 @@ function common_friends_visitor_widget($profile_uid) {
 
 	$cid = $zcid = 0;
 
-	if(can_write_wall($a,$profile_uid))
-		$cid = local_user();
-	else {
+	if(is_array($_SESSION['remote'])) {
+		foreach($_SESSION['remote'] as $visitor) {
+			if($visitor['uid'] == $profile_uid) {
+				$cid = $visitor['cid'];
+				break;
+			}
+		}
+	}
+
+	if(! $cid) {
 		if(get_my_url()) {
-			$r = q("select id from gcontact where nurl = '%s' limit 1",
-				dbesc(normalise_link(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(count($r))
-				$zcid = $r[0]['id'];
+				$cid = $r[0]['id'];
+			else {
+				$r = q("select id from gcontact where nurl = '%s' limit 1",
+					dbesc(normalise_link(get_my_url()))
+				);
+				if(count($r))
+					$zcid = $r[0]['id'];
+			}
 		}
 	}
 
@@ -159,16 +184,26 @@ function common_friends_visitor_widget($profile_uid) {
 
 	require_once('include/socgraph.php');
 
-
-	$t = count_common_friends_remote($profile_uid,$cid,$zcid);
+	if($cid)
+		$t = count_common_friends($profile_uid,$cid);
+	else
+		$t = count_common_friends_zcid($profile_uid,$zcid);
 	if(! $t)
 		return;
 
-	$r = common_friends_remote($profile_uid,$cid,$zcid);
+	if($cid)
+		$r = common_friends($profile_uid,$cid,0,5,true);
+	else
+		$r = common_friends_zcid($profile_uid,$zcid,0,5,true);
 
 	return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
-		'$desc' =>  sprintf( tt("%d friend in common", "%d friends in common", $t), $t),
-		'$items = $r
+		'$desc' =>  sprintf( tt("%d contact in common", "%d contacts in common", $t), $t),
+		'$base' => $a->get_baseurl(),
+		'$uid' => $profile_uid,
+		'$cid' => (($cid) ? $cid : '0'),
+		'$linkmore' => (($t > 5) ? 'true' : ''),
+		'$more' => t('show more'),
+		'$items' => $r
 	)); 
 
-};
\ No newline at end of file
+};