From 1cd06df5fa4e620efee726ab83c02861752a14b7 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 29 Nov 2015 12:02:14 +0100
Subject: [PATCH 1/3] Bugfix: Only show the feed link for local profiles

---
 include/identity.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index 0282b2d9a5..48fd5056dc 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -218,15 +218,15 @@ if(! function_exists('profile_sidebar')) {
 		if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
 			$connect = false;
 
-		if ($connect)
+		if (isset($profile['remoteconnect']))
+			$remoteconnect = $profile['remoteconnect'];
+
+		if ($connect AND ($profile['network'] == NETWORK_DFRN) AND !isset($remoteconnect))
 			$subscribe_feed = t("Atom feed");
 		else
 			$subscribe_feed = false;
 
-		if (isset($profile['remoteconnect']))
-			$remoteconnect = $profile['remoteconnect'];
-
-		if( get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()) )
+		if(get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()))
 			$wallmessage = t('Message');
 		else
 			$wallmessage = false;

From 8b23e771714c1a2687460120bf6006430458c1f8 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 29 Nov 2015 13:37:24 +0100
Subject: [PATCH 2/3] Only show supported networks in sidebar and contact list

---
 include/acl_selectors.php   |  3 +++
 include/contact_widgets.php | 43 ++++++++++++++++++++++++++++++++++---
 mod/contacts.php            |  5 +++--
 3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index a1154399a7..4ef3d05ea3 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once("include/contact_selectors.php");
+require_once("include/contact_widgets.php");
 require_once("include/features.php");
 require_once("mod/proxy.php");
 
@@ -425,6 +426,8 @@ function acl_lookup(&$a, $out_type = 'json') {
 		$group_count = 0;
 	}
 
+	$sql_extra2 .= " ".unavailable_networks();
+
 	if ($type=='' || $type=='c'){
 		$r = q("SELECT COUNT(*) AS c FROM `contact`
 				WHERE `uid` = %d AND `self` = 0
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 810671a91c..a7c82c33cf 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -40,18 +40,55 @@ function findpeople_widget() {
 
 }
 
+function unavailable_networks() {
+	$network_filter = "";
+
+	$networks = array();
+
+	if (!plugin_enabled("appnet"))
+		$networks[] = NETWORK_APPNET;
+
+	if (!plugin_enabled("fbpost"))
+		$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 '';
 
-	if(! feature_enabled(local_user(),'networks'))
+	if(!feature_enabled(local_user(),'networks'))
 		return '';
 
-	$r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `self` = 0 ORDER BY `network`",
+	$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())
 	);
 
diff --git a/mod/contacts.php b/mod/contacts.php
index 1dc886363a..9fdcf277b8 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -56,7 +56,7 @@ function contacts_init(&$a) {
 	}
 
 	$groups_widget .= group_side('contacts','group','full',0,$contact_id);
-	
+
 	$a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array(
 		'$vcard_widget' => $vcard_widget,
 		'$findpeople_widget' => $findpeople_widget,
@@ -786,8 +786,9 @@ function contacts_content(&$a) {
 		$total = $r[0]['total'];
 	}
 
+	$sql_extra3 = unavailable_networks();
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ",
 		intval($_SESSION['uid']),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])

From 2fabde5d2d06f2e9a8e6c3a84b3e3fdd19fdda6a Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Sun, 29 Nov 2015 13:42:31 +0100
Subject: [PATCH 3/3] Added the old Facebook addon for addon check

---
 include/contact_widgets.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index a7c82c33cf..bbbd941b56 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -20,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'),
@@ -48,7 +48,7 @@ function unavailable_networks() {
 	if (!plugin_enabled("appnet"))
 		$networks[] = NETWORK_APPNET;
 
-	if (!plugin_enabled("fbpost"))
+	if (!plugin_enabled("fbpost") AND !plugin_enabled("facebook"))
 		$networks[] = NETWORK_FACEBOOK;
 
 	if (!plugin_enabled("statusnet"))
@@ -217,7 +217,7 @@ function common_friends_visitor_widget($profile_uid) {
 	}
 
 	if($cid == 0 && $zcid == 0)
-		return; 
+		return;
 
 	require_once('include/socgraph.php');
 
@@ -241,6 +241,6 @@ function common_friends_visitor_widget($profile_uid) {
 		'$linkmore' => (($t > 5) ? 'true' : ''),
 		'$more' => t('show more'),
 		'$items' => $r
-	)); 
+	));
 
 };