Merge pull request #1033 from annando/master

[friendica.git] / include / contact_widgets.php

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index ce1cdbad55e003b647a0ca75c83e2b8e11a337ef..6d9b097d693e81e7656dcdd90369d7d84fadf6c1 100644 (file)
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -47,8 +47,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 +82,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 +111,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 +151,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())),
@@ -189,4 +205,4 @@ function common_friends_visitor_widget($profile_uid) {
                '$items' => $r
        )); 
 
-};
\ No newline at end of file
+};