Merge https://github.com/friendika/friendika into pull

[friendica.git] / include / group.php

diff --git a/include/group.php b/include/group.php
index 5001cf53ecbb916fcc2a14dc16831a61eeb2ac31..8866104fca54a58ad49bfded919bb220e6633158 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -123,7 +123,8 @@ function group_public_members($gid) {
        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())
                );              
@@ -135,7 +136,7 @@ function group_public_members($gid) {
 
 
 
-function group_side($every="contacts",$each="group") {
+function group_side($every="contacts",$each="group",$edit = false) {
 
        $o = '';
 
@@ -165,7 +166,7 @@ EOT;
        );
        if(count($r)) {
                foreach($r as $rr)
-                       $o .= " <li class=\"sidebar-group-li\"><a href=\"$each/{$rr['id']}\">{$rr['name']}</a></li>\r\n";
+                       $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']}\">{$rr['name']}</a></li>\r\n";
        }
        $o .= " </ul>\r\n       </div>\r\n</div>";