X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcontact_widgets.php;h=d077a065e16590def2a304749bcc57f5fd6a50ba;hb=3e51ebd4995ee85220132ce1019fd1f712901679;hp=71a75d431eaa3efba3769be507356ee41184f37f;hpb=b9e4b9f2747deb5cdd7d7f68e200496e0c3162aa;p=friendica.git

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 71a75d431e..d077a065e1 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -66,6 +66,9 @@ function unavailable_networks() {
 	if (!get_config("system","diaspora_enabled"))
 		$networks[] = NETWORK_DIASPORA;
 
+	if (!plugin_enabled("pnut"))
+		$networks[] = NETWORK_PNUT;
+
 	if (!sizeof($networks))
 		return "";
 
@@ -90,16 +93,18 @@ function networks_widget($baseurl,$selected = '') {
 
 	$extra_sql = unavailable_networks();
 
-	$r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND NOT `self` $extra_sql ORDER BY `network`",
+	$r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `network` != '' $extra_sql ORDER BY `network`",
 		intval(local_user())
 	);
 
 	$nets = array();
 	if (dbm::is_result($r)) {
 		require_once('include/contact_selectors.php');
-		foreach($r as $rr) {
-				if($rr['network'])
-					$nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
+		foreach ($r as $rr) {
+			/// @TODO If 'network' is not there, this triggers an E_NOTICE
+			if ($rr['network']) {
+				$nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
+			}
 		}
 	}
 
@@ -133,8 +138,8 @@ function fileas_widget($baseurl,$selected = '') {
 
 	$matches = false;
 	$terms = array();
-    $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER);
-    if($cnt) {
+	$cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER);
+	if ($cnt) {
 		foreach($matches as $mtch) {
 			$unescaped = xmlify(file_tag_decode($mtch[1]));
 			$terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
@@ -156,12 +161,14 @@ function categories_widget($baseurl,$selected = '') {
 
 	$a = get_app();
 
-	if(! feature_enabled($a->profile['profile_uid'],'categories'))
+	if (! feature_enabled($a->profile['profile_uid'],'categories')) {
 		return '';
+	}
 
 	$saved = get_pconfig($a->profile['profile_uid'],'system','filetags');
-	if(! strlen($saved))
+	if (! strlen($saved)) {
 		return;
+	}
 
 	$matches = false;
 	$terms = array();