some minor work on contact edit page

[friendica.git] / include / group.php

diff --git a/include/group.php b/include/group.php
index 8ee7face6d9a132dfee7e6a6373fe309fc5650ba..f21ce42e09f95ff89c223a0007dbf43a10852cc3 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -124,9 +124,10 @@ function group_public_members($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' AND `contact`.`network` != 'mail' AND `contact`.`network` != 'face' ",
+                       AND ( `contact`.`network` = '%s' OR `contact`.`notify` = '' )",
                        intval($gid),
-                       intval(local_user())
+                       intval(local_user()),
+                       dbesc(NETWORK_OSTATUS)
                );              
                if(count($r))
                        $ret = count($r);
@@ -170,7 +171,7 @@ EOT;
                        $o .= ' <li class="sidebar-group-li">' 
                        . (($edit) ? "<a href=\"group/{$rr['id']}\" title=\"" . t('Edit') 
                                . "\" ><img src=\"images/spencil.gif\" alt=\"" . t('Edit') . "\"></a> " : "") 
-                       . (($cid) ? '<input type="checkbox" onclick="contactgroupChangeMember(' . $rr['id'] . ',' . $cid . ');return true;" '
+                       . (($cid) ? '<input type="checkbox" class="' . (($selected) ? 'ticked' : 'unticked') . '" onclick="contactgroupChangeMember(' . $rr['id'] . ',' . $cid . ');return true;" '
                                . ((in_array($rr['id'],$member_of)) ? ' checked="checked" ' : '') . '/>' : '')
                        . "<a href=\"$each/{$rr['id']}\" $selected >{$rr['name']}</a></li>\r\n";
                }