don't make -desc so obnoxious looking

[friendica.git] / include / group.php

diff --git a/include/group.php b/include/group.php
index 5001cf53ecbb916fcc2a14dc16831a61eeb2ac31..edb547de6d8f00ea31561efebf63c7a3b84dbf4c 100644 (file)
--- a/include/group.php
+++ b/include/group.php
@@ -6,8 +6,26 @@ function group_add($uid,$name) {
        $ret = false;
        if(x($uid) && x($name)) {
                $r = group_byname($uid,$name); // check for dups
-               if($r !== false) 
+               if($r !== false) {
+
+                       // This could be a problem. 
+                       // Let's assume we've just created a group which we once deleted
+                       // all the old members are gone, but the group remains so we don't break any security
+                       // access lists. What we're doing here is reviving the dead group, but old content which
+                       // was restricted to this group may now be seen by the new group members. 
+
+                       $z = q("SELECT * FROM `group` WHERE `id` = %d LIMIT 1",
+                               intval($r)
+                       );
+                       if(count($z) && $z[0]['deleted']) {
+                               $r = q("UPDATE `group` SET `deleted` = 0 WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
+                                       intval($uid),
+                                       dbesc($name)
+                               );
+                               notice( t('A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name.') . EOL); 
+                       }
                        return true;
+               }
                $r = q("INSERT INTO `group` ( `uid`, `name` )
                        VALUES( %d, '%s' ) ",
                        intval($uid),
@@ -91,7 +109,7 @@ function group_add_member($uid,$name,$member) {
        );
        if(count($r))
                return true;    // You might question this, but 
-                               // we indicate success because the group was in fact created
+                               // we indicate success because the group member was in fact created
                                // -- It was just created at another time
        if(! count($r))
                $r = q("INSERT INTO `group_member` (`uid`, `gid`, `contact-id`)
@@ -123,9 +141,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' AND `contact`.`notify` != '' ",
                        intval($gid),
-                       intval(local_user())
+                       intval(local_user()),
+                       dbesc(NETWORK_OSTATUS)
                );              
                if(count($r))
                        $ret = count($r);
@@ -135,40 +155,69 @@ function group_public_members($gid) {
 
 
 
-function group_side($every="contacts",$each="group") {
+function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) {
 
        $o = '';
 
        if(! local_user())
                return '';
 
-       $createtext = t('Create a new group');
-       $linktext= t('Everybody');
-
-$o .= <<< EOT
-
-<div id="group-sidebar">
-<h3>Groups</h3>
-
-<div id="sidebar-new-group">
-<a href="group/new">$createtext</a>
-</div>
+       $groups = array();
+       
+       $groups[] = array(
+               'text'  => t('Everybody'),
+               'id' => 0,
+               'selected' => (($group_id == 0) ? 'group-selected' : ''),
+               'href'  => $every,
+       );
 
-<div id="sidebar-group-list">
-       <ul id="sidebar-group-ul">
-       <li class="sidebar-group-li" ><a href="$every" >$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'])
        );
+       $member_of = array();
+       if($cid) {
+               $member_of = groups_containing(local_user(),$cid);
+       } 
+
        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']) ? ' group-selected' : '');
+                       
+                       if ($edit) {
+                               $groupedit = array(
+                                       'href' => "group/".$rr['id'],
+                                       'title' => t('edit'),
+                               );
+                       } else {
+                               $groupedit = null;
+                       }
+                       
+                       $groups[] = array(
+                               'id'            => $rr['id'],
+                               'cid'           => $cid,
+                               'text'          => $rr['name'],
+                               'selected'      => $selected,
+                               'href'          => $each."/".$rr['id'],
+                               'edit'          => $groupedit,
+                               'ismember'      => in_array($rr['id'],$member_of),
+                       );
+               }
        }
-       $o .= " </ul>\r\n       </div>\r\n</div>";      
-
+       
+       
+       $tpl = get_markup_template("group_side.tpl");
+       $o = replace_macros($tpl, array(
+               '$title'                => t('Groups'),
+               '$edittext'     => t('Edit group'),
+               '$createtext'   => t('Create a new group'),
+               '$ungrouped'    => (($every === 'contacts') ? t('Contacts not in any group') : ''),
+               '$groups'               => $groups,
+               '$add'                  => t('add'),
+       ));
+               
+       
        return $o;
 }
 
@@ -184,3 +233,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;
+}