merged 2 if() into one as requested by CR

[friendica.git] / include / contact_widgets.php

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index f66d23c518e5b16125d91c7d3381f92b17404ea2..d077a065e16590def2a304749bcc57f5fd6a50ba 100644 (file)
--- 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 "";
 
@@ -80,24 +83,28 @@ 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 '';
+       }
 
        $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' : '' ));
+                       }
                }
        }
 
@@ -116,21 +123,23 @@ function networks_widget($baseurl,$selected = '') {
 }
 
 function fileas_widget($baseurl,$selected = '') {
-       $a = get_app();
-       if(! local_user())
+       if (! local_user()) {
                return '';
+       }
 
-       if(! feature_enabled(local_user(),'filing'))
+       if (! feature_enabled(local_user(),'filing')) {
                return '';
+       }
 
        $saved = get_pconfig(local_user(),'system','filetags');
-       if(! strlen($saved))
+       if (! strlen($saved)) {
                return;
+       }
 
        $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' : ''));
@@ -152,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();
@@ -235,7 +246,7 @@ function common_friends_visitor_widget($profile_uid) {
 
        return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
                '$desc' =>  sprintf( tt("%d contact in common", "%d contacts in common", $t), $t),
-               '$base' => $a->get_baseurl(),
+               '$base' => App::get_baseurl(),
                '$uid' => $profile_uid,
                '$cid' => (($cid) ? $cid : '0'),
                '$linkmore' => (($t > 5) ? 'true' : ''),