if(intval($gid)) {
$r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member`
LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
- WHERE `gid` = %d AND `group_member`.`uid` = %d",
+ WHERE `gid` = %d AND `group_member`.`uid` = %d ORDER BY `contact`.`name` ASC ",
intval($gid),
intval(local_user())
);
if(intval($gid)) {
$r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member`
LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
- WHERE `gid` = %d AND `group_member`.`uid` = %d AND `contact`.`network` != 'dfrn' ",
+ WHERE `gid` = %d AND `group_member`.`uid` = %d
+ AND `contact`.`network` != 'dfrn' AND `contact`.`network` != 'mail' AND `contact`.`network` != 'face' ",
intval($gid),
intval(local_user())
);
-function group_side($every="contacts",$each="group") {
+function group_side($every="contacts",$each="group",$edit = false, $group_id = 0) {
$o = '';
$createtext = t('Create a new group');
$linktext= t('Everybody');
-
+ $selected = (($group_id == 0) ? ' class="group-selected" ' : '');
$o .= <<< EOT
<div id="group-sidebar">
<h3>Groups</h3>
-<div id="sidebar-new-group">
-<a href="group/new">$createtext</a>
-</div>
-
<div id="sidebar-group-list">
<ul id="sidebar-group-ul">
- <li class="sidebar-group-li" ><a href="$every" >$linktext</a></li>
+ <li class="sidebar-group-li" ><a href="$every" $selected >$linktext</a></li>
EOT;
- $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d",
+ $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
intval($_SESSION['uid'])
);
if(count($r)) {
- foreach($r as $rr)
- $o .= " <li class=\"sidebar-group-li\"><a href=\"$each/{$rr['id']}\">{$rr['name']}</a></li>\r\n";
+ foreach($r as $rr) {
+ $selected = (($group_id == $rr['id']) ? ' class="group-selected" ' : '');
+ $o .= ' <li class="sidebar-group-li">' . (($edit) ? "<a href=\"group/{$rr['id']}\" title=\"" . t('Edit') . "\" ><img src=\"images/spencil.gif\" alt=\"" . t('Edit') . "\"></a> " : "") . "<a href=\"$each/{$rr['id']}\" $selected >{$rr['name']}</a></li>\r\n";
+ }
}
- $o .= " </ul>\r\n </div>\r\n</div>";
+ $o .= " </ul>\r\n </div>";
+
+ $o .= <<< EOT
+
+ <div id="sidebar-new-group">
+ <a href="group/new">$createtext</a>
+ </div>
+</div>
+
+EOT;
return $o;
}
$ret[] = $rr['contact-id'];
return $ret;
}
+
+
+function member_of($c) {
+
+ $r = q("SELECT `group`.`name`, `group`.`id` FROM `group` LEFT JOIN `group_member` ON `group_member`.`gid` = `group`.`id` WHERE `group_member`.`contact-id` = %d AND `group`.`deleted` = 0 ORDER BY `group`.`name` ASC ",
+ intval($c)
+ );
+
+ return $r;
+
+}
+