Browse Source

Only show supported networks in sidebar and contact list

tags/3.4.3
Michael Vogel 4 years ago
parent
commit
8b23e77171
3 changed files with 46 additions and 5 deletions
  1. +3
    -0
      include/acl_selectors.php
  2. +40
    -3
      include/contact_widgets.php
  3. +3
    -2
      mod/contacts.php

+ 3
- 0
include/acl_selectors.php View File

@@ -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

+ 40
- 3
include/contact_widgets.php View File

@@ -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())
);


+ 3
- 2
mod/contacts.php View File

@@ -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'])

Loading…
Cancel
Save