bug #369 - show contacts who are not in any groups
This commit is contained in:
parent
af68d033e3
commit
3c4e6d3461
|
@ -176,12 +176,26 @@ function random_profile() {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function contacts_not_grouped($uid) {
|
function contacts_not_grouped($uid,$start = 0,$count = 0) {
|
||||||
$r = q("select * from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) ",
|
dbg(1);
|
||||||
|
if(! $count) {
|
||||||
|
$r = q("select count(*) as total from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) ",
|
||||||
intval($uid),
|
intval($uid),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
dbg(0);
|
||||||
|
return $r;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
dbg(1);
|
||||||
|
$r = q("select * from contact where uid = %d and self = 0 and id not in (select distinct(`contact-id`) from group_member where uid = %d) limit %d, %d",
|
||||||
|
intval($uid),
|
||||||
|
intval($uid),
|
||||||
|
intval($start),
|
||||||
|
intval($count)
|
||||||
|
);
|
||||||
|
dbg(0);
|
||||||
return $r;
|
return $r;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -212,6 +212,7 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
|
||||||
'$title' => t('Groups'),
|
'$title' => t('Groups'),
|
||||||
'$edittext' => t('Edit group'),
|
'$edittext' => t('Edit group'),
|
||||||
'$createtext' => t('Create a new group'),
|
'$createtext' => t('Create a new group'),
|
||||||
|
'$ungrouped' => (($every === 'contacts') ? t('Contacts not in any group') : ''),
|
||||||
'$groups' => $groups,
|
'$groups' => $groups,
|
||||||
'$add' => t('add'),
|
'$add' => t('add'),
|
||||||
));
|
));
|
||||||
|
|
65
mod/nogroup.php
Normal file
65
mod/nogroup.php
Normal file
|
@ -0,0 +1,65 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
require_once('include/Contact.php');
|
||||||
|
require_once('include/socgraph.php');
|
||||||
|
require_once('include/contact_selectors.php');
|
||||||
|
|
||||||
|
function nogroup_init(&$a) {
|
||||||
|
|
||||||
|
if(! local_user())
|
||||||
|
return;
|
||||||
|
|
||||||
|
require_once('include/group.php');
|
||||||
|
require_once('include/contact_widgets.php');
|
||||||
|
|
||||||
|
if(! x($a->page,'aside'))
|
||||||
|
$a->page['aside'] = '';
|
||||||
|
|
||||||
|
$a->page['aside'] .= group_side('contacts','group',false,0,$contact_id);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function nogroup_content(&$a) {
|
||||||
|
|
||||||
|
if(! local_user()) {
|
||||||
|
notice( t('Permission denied.') . EOL);
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
require_once('include/Contact.php');
|
||||||
|
$r = contacts_not_grouped(local_user());
|
||||||
|
if(count($r)) {
|
||||||
|
$a->set_pager_total($r[0]['total']);
|
||||||
|
}
|
||||||
|
$r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']);
|
||||||
|
if(count($r)) {
|
||||||
|
foreach($r as $rr) {
|
||||||
|
|
||||||
|
|
||||||
|
$contacts[] = array(
|
||||||
|
'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
|
||||||
|
'edit_hover' => t('Edit contact'),
|
||||||
|
'photo_menu' => contact_photo_menu($rr),
|
||||||
|
'id' => $rr['id'],
|
||||||
|
'alt_text' => $alt_text,
|
||||||
|
'dir_icon' => $dir_icon,
|
||||||
|
'thumb' => $rr['thumb'],
|
||||||
|
'name' => $rr['name'],
|
||||||
|
'username' => $rr['name'],
|
||||||
|
'sparkle' => $sparkle,
|
||||||
|
'itemurl' => $rr['url'],
|
||||||
|
'url' => $url,
|
||||||
|
'network' => network_to_name($rr['network']),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$tpl = get_markup_template("nogroup-template.tpl");
|
||||||
|
$o .= replace_macros($tpl,array(
|
||||||
|
'$header' => t('Contacts who are not members of a group'),
|
||||||
|
'$contacts' => $contacts,
|
||||||
|
'$paginate' => paginate($a),
|
||||||
|
));
|
||||||
|
|
||||||
|
return $o;
|
||||||
|
|
||||||
|
}
|
|
@ -23,6 +23,11 @@
|
||||||
<div id="sidebar-new-group">
|
<div id="sidebar-new-group">
|
||||||
<a href="group/new">$createtext</a>
|
<a href="group/new">$createtext</a>
|
||||||
</div>
|
</div>
|
||||||
|
{{ if $ungrouped }}
|
||||||
|
<div id="sidebar-ungrouped">
|
||||||
|
<a href="nogroup">$ungrouped</a>
|
||||||
|
</div>
|
||||||
|
{{ endif }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
12
view/nogroup-template.tpl
Normal file
12
view/nogroup-template.tpl
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
<h1>$header</h1>
|
||||||
|
|
||||||
|
{{ for $contacts as $contact }}
|
||||||
|
{{ inc contact_template.tpl }}{{ endinc }}
|
||||||
|
{{ endfor }}
|
||||||
|
<div id="contact-edit-end"></div>
|
||||||
|
|
||||||
|
$paginate
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue