X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_widgets.php;h=bbbd941b5609df3ae7321bc708599e17c6de4ccc;hb=0adff6f6b893bd7562547bb00021f358383f51ba;hp=4dab6a53e81623de4cedb6c850683322718b69f1;hpb=a9f825ec3fc8b44115b1fae3b1aeb2c07f23e3de;p=friendica.git

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 4dab6a53e8..bbbd941b56 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')
 	));
 
@@ -19,12 +20,12 @@ function findpeople_widget() {
 	if(get_config('system','invitation_only')) {
 		$x = get_pconfig(local_user(),'system','invites_remaining');
 		if($x || is_site_admin()) {
-			$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">' 
-			. sprintf( tt('%d invitation available','%d invitations available',$x), $x) 
+			$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">'
+			. sprintf( tt('%d invitation available','%d invitations available',$x), $x)
 			. '</div>' . $inv;
 		}
 	}
- 
+
 	return replace_macros(get_markup_template('peoplefind.tpl'),array(
 		'$findpeople' => t('Find People'),
 		'$desc' => t('Enter name or interest'),
@@ -39,16 +40,55 @@ function findpeople_widget() {
 
 }
 
+function unavailable_networks() {
+	$network_filter = "";
+
+	$networks = array();
+
+	if (!plugin_enabled("appnet"))
+		$networks[] = NETWORK_APPNET;
+
+	if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook"))
+		$networks[] = NETWORK_FACEBOOK;
+
+	if (!plugin_enabled("statusnet"))
+		$networks[] = NETWORK_STATUSNET;
+
+	if (!plugin_enabled("pumpio"))
+		$networks[] = NETWORK_PUMPIO;
+
+	if (!plugin_enabled("twitter"))
+		$networks[] = NETWORK_TWITTER;
+
+	if (get_config("system","ostatus_disabled"))
+		$networks[] = NETWORK_OSTATUS;
+
+	if (!get_config("system","diaspora_enabled"))
+		$networks[] = NETWORK_DIASPORA;
+
+	if (!sizeof($networks))
+		return "";
+
+	$network_filter = implode("','", $networks);
+
+	$network_filter = "AND `network` NOT IN ('$network_filter')";
+
+	return $network_filter;
+}
 
 function networks_widget($baseurl,$selected = '') {
 
 	$a = get_app();
 
-	if(! local_user())
+	if(!local_user())
 		return '';
 
-	
-	$r = q("select distinct(network) from contact where uid = %d and self = 0",
+	if(!feature_enabled(local_user(),'networks'))
+		return '';
+
+	$extra_sql = unavailable_networks();
+
+	$r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND NOT `self` $extra_sql ORDER BY `network`",
 		intval(local_user())
 	);
 
@@ -80,6 +120,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 +149,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,9 +189,16 @@ function common_friends_visitor_widget($profile_uid) {
 
 	$cid = $zcid = 0;
 
-	if(can_write_wall($a,$profile_uid))
-		$cid = remote_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 contact where nurl = '%s' and uid = %d limit 1",
 				dbesc(normalise_link(get_my_url())),
@@ -163,7 +217,7 @@ function common_friends_visitor_widget($profile_uid) {
 	}
 
 	if($cid == 0 && $zcid == 0)
-		return; 
+		return;
 
 	require_once('include/socgraph.php');
 
@@ -175,13 +229,18 @@ function common_friends_visitor_widget($profile_uid) {
 		return;
 
 	if($cid)
-		$r = common_friends($profile_uid,$cid,5,true);
+		$r = common_friends($profile_uid,$cid,0,5,true);
 	else
-		$r = common_friends_zcid($profile_uid,$zcid,5,true);
+		$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),
+		'$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
+};