some minor work on contact edit page

[friendica.git] / include / group.php

diff --git a/include/group.php b/include/group.php
index 065c2241febec2bb286f5ba2086ad1c57a60049f..f21ce42e09f95ff89c223a0007dbf43a10852cc3 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -123,9 +123,11 @@ 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` = '%s' OR `contact`.`notify` = '' )",
                        intval($gid),
-                       intval(local_user())
+                       intval(local_user()),
+                       dbesc(NETWORK_OSTATUS)
                );              
                if(count($r))
                        $ret = count($r);
@@ -135,7 +137,7 @@ function group_public_members($gid) {
 
 
 
-function group_side($every="contacts",$each="group",$edit = false) {
+function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) {
 
        $o = '';
 
@@ -144,30 +146,46 @@ function group_side($every="contacts",$each="group",$edit = false) {
 
        $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($cid) {
+               $member_of = groups_containing(local_user(),$cid);
+       } 
+
        if(count($r)) {
-               foreach($r as $rr)
-                       $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";
+               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> " : "") 
+                       . (($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";
+               }
        }
-       $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;
 }
@@ -184,3 +202,30 @@ function expand_groups($a) {
                        $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;
+
+}
+
+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