Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / include / group.php

diff --git a/include/group.php b/include/group.php
index e16c900d90cc27257c67acf22b1b85bc52bb619b..8ee7face6d9a132dfee7e6a6373fe309fc5650ba 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -136,7 +136,7 @@ function group_public_members($gid) {
 
 
 
-function group_side($every="contacts",$each="group",$edit = false, $group_id = 0) {
+function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) {
 
        $o = '';
 
@@ -160,10 +160,19 @@ EOT;
        $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
                intval($_SESSION['uid'])
        );
+       if($cid) {
+               $member_of = groups_containing(local_user(),$cid);
+       } 
+
        if(count($r)) {
                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 .= ' <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;" '
+                               . ((in_array($rr['id'],$member_of)) ? ' checked="checked" ' : '') . '/>' : '')
+                       . "<a href=\"$each/{$rr['id']}\" $selected >{$rr['name']}</a></li>\r\n";
                }
        }
        $o .= " </ul>\r\n       </div>";
@@ -204,3 +213,18 @@ function member_of($c) {
 
 }
 
+function groups_containing($uid,$c) {
+
+       $r = q("SELECT `gid` FROM `group_member` WHERE `uid` = %d AND `group_member`.`contact-id` = %d ",
+               intval($uid),
+               intval($c)
+       );
+
+       $ret = array();
+       if(count($r)) {
+               foreach($r as $rr)
+                       $ret[] = $rr['gid'];
+       }
+
+       return $ret;
+}
\ No newline at end of file