]> git.mxchange.org Git - friendica.git/blobdiff - include/group.php
Merge pull request #2112 from rabuzarus/2811_group_side
[friendica.git] / include / group.php
index 82cdc554f0de3be3578e8c615d608b7b044304d9..862d06818dd0957bb8a7428f3a7c7b996b953e89 100644 (file)
@@ -8,17 +8,17 @@ function group_add($uid,$name) {
                $r = group_byname($uid,$name); // check for dups
                if($r !== false) {
 
-                       // This could be a problem. 
+                       // 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. 
+                       // 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",
+                               $r = q("UPDATE `group` SET `deleted` = 0 WHERE `uid` = %d AND `name` = '%s'",
                                        intval($uid),
                                        dbesc($name)
                                );
@@ -32,7 +32,7 @@ function group_add($uid,$name) {
                        dbesc($name)
                );
                $ret = $r;
-       }       
+       }
        return $ret;
 }
 
@@ -40,7 +40,7 @@ function group_add($uid,$name) {
 function group_rmv($uid,$name) {
        $ret = false;
        if(x($uid) && x($name)) {
-               $r = q("SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
+               $r = q("SELECT id FROM `group` WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
                        intval($uid),
                        dbesc($name)
                );
@@ -49,6 +49,37 @@ function group_rmv($uid,$name) {
                if(! $group_id)
                        return false;
 
+               // remove group from default posting lists
+               $r = q("SELECT def_gid, allow_gid, deny_gid FROM user WHERE uid = %d LIMIT 1",
+                      intval($uid)
+               );
+               if($r) {
+                       $user_info = $r[0];
+                       $change = false;
+
+                       if($user_info['def_gid'] == $group_id) {
+                               $user_info['def_gid'] = 0;
+                               $change = true;
+                       }
+                       if(strpos($user_info['allow_gid'], '<' . $group_id . '>') !== false) {
+                               $user_info['allow_gid'] = str_replace('<' . $group_id . '>', '', $user_info['allow_gid']);
+                               $change = true;
+                       }
+                       if(strpos($user_info['deny_gid'], '<' . $group_id . '>') !== false) {
+                               $user_info['deny_gid'] = str_replace('<' . $group_id . '>', '', $user_info['deny_gid']);
+                               $change = true;
+                       }
+
+                       if($change) {
+                               q("UPDATE user SET def_gid = %d, allow_gid = '%s', deny_gid = '%s' WHERE uid = %d",
+                                 intval($user_info['def_gid']),
+                                 dbesc($user_info['allow_gid']),
+                                 dbesc($user_info['deny_gid']),
+                                 intval($uid)
+                               );
+                       }
+               }
+
                // remove all members
                $r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d ",
                        intval($uid),
@@ -56,7 +87,7 @@ function group_rmv($uid,$name) {
                );
 
                // remove group
-               $r = q("UPDATE `group` SET `deleted` = 1 WHERE `uid` = %d AND `name` = '%s' LIMIT 1",
+               $r = q("UPDATE `group` SET `deleted` = 1 WHERE `uid` = %d AND `name` = '%s'",
                        intval($uid),
                        dbesc($name)
                );
@@ -86,29 +117,30 @@ function group_rmv_member($uid,$name,$member) {
                return false;
        if(! ( $uid && $gid && $member))
                return false;
-       $r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d LIMIT 1 ",
+       $r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d",
                intval($uid),
                intval($gid),
                intval($member)
        );
        return $r;
-       
+
 
 }
 
 
-function group_add_member($uid,$name,$member) {
-       $gid = group_byname($uid,$name);
+function group_add_member($uid,$name,$member,$gid = 0) {
+       if(! $gid)
+               $gid = group_byname($uid,$name);
        if((! $gid) || (! $uid) || (! $member))
                return false;
 
-       $r = q("SELECT * FROM `group_member` WHERE `uid` = %d AND `id` = %d AND `contact-id` = %d LIMIT 1",     
+       $r = q("SELECT * FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d LIMIT 1",
                intval($uid),
                intval($gid),
                intval($member)
        );
        if(count($r))
-               return true;    // You might question this, but 
+               return true;    // You might question this, but
                                // we indicate success because the group member was in fact created
                                // -- It was just created at another time
        if(! count($r))
@@ -124,9 +156,11 @@ function group_add_member($uid,$name,$member) {
 function group_get_members($gid) {
        $ret = array();
        if(intval($gid)) {
-               $r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member` 
-                       LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 
-                       WHERE `gid` = %d AND `group_member`.`uid` = %d ORDER BY `contact`.`name` ASC ",
+               $r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member`
+                       INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
+                       WHERE `gid` = %d AND `group_member`.`uid` = %d AND
+                               NOT `contact`.`self` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+                               ORDER BY `contact`.`name` ASC ",
                        intval($gid),
                        intval(local_user())
                );
@@ -139,14 +173,14 @@ function group_get_members($gid) {
 function group_public_members($gid) {
        $ret = 0;
        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 
+               $r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member`
+                       INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
+                       WHERE `gid` = %d AND `group_member`.`uid` = %d
                        AND  `contact`.`network` = '%s' AND `contact`.`notify` != '' ",
                        intval($gid),
                        intval(local_user()),
                        dbesc(NETWORK_OSTATUS)
-               );              
+               );
                if(count($r))
                        $ret = count($r);
        }
@@ -154,8 +188,45 @@ function group_public_members($gid) {
 }
 
 
+function mini_group_select($uid,$gid = 0) {
+
+       $grps = array();
+       $o = '';
+
+       $r = q("SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d ORDER BY `name` ASC",
+               intval($uid)
+       );
+       $grps[] = array('name' => '', 'id' => '0', 'selected' => '');
+       if(count($r)) {
+               foreach($r as $rr) {
+                       $grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : ''));
+               }
+
+       }
+       logger('groups: ' . print_r($grps,true));
+
+       $o = replace_macros(get_markup_template('group_selection.tpl'), array(
+               '$label' => t('Default privacy group for new contacts'),
+               '$groups' => $grps
+       ));
+       return $o;
+}
+
 
-function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) {
+/**
+ * @brief Create group sidebar widget
+ * 
+ * @param string $every
+ * @param string $each
+ * @param string $editmode
+ *     'standard' => include link 'Edit groups'
+ *     'extended' => include link 'Create new group'
+ *     'full' => include link 'Create new group' and provide for each group a link to edit this group
+ * @param int $group_id
+ * @param int $cid
+ * @return string
+ */
+function group_side($every="contacts",$each="group",$editmode = "standard", $group_id = 0, $cid = 0) {
 
        $o = '';
 
@@ -179,13 +250,13 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
        $member_of = array();
        if($cid) {
                $member_of = groups_containing(local_user(),$cid);
-       } 
+       }
 
        if(count($r)) {
                foreach($r as $rr) {
                        $selected = (($group_id == $rr['id']) ? ' group-selected' : '');
                        
-                       if ($edit) {
+                       if ($editmode == "full") {
                                $groupedit = array(
                                        'href' => "group/".$rr['id'],
                                        'title' => t('edit'),
@@ -205,21 +276,28 @@ function group_side($every="contacts",$each="group",$edit = false, $group_id = 0
                        );
                }
        }
-       
-       
+
+
        $tpl = get_markup_template("group_side.tpl");
        $o = replace_macros($tpl, array(
-               '$title'                => t('Groups'),
+               '$title'        => t('Groups'),
+               'newgroup'      => (($editmode == "extended") || ($editmode == "full") ? 1 : ''),
+               '$editgroupstext' => t('Edit groups'),
+               'grouppage'     => "group/",
+               '$edittext'     => t('Edit group'),
                '$createtext'   => t('Create a new group'),
-               '$groups'               => $groups,
-               '$add'                  => t('add'),
+               '$creategroup'  => t('Group Name: '),
+               '$form_security_token' => get_form_security_token("group_edit"),
+               '$ungrouped'    => (($every === 'contacts') ? t('Contacts not in any group') : ''),
+               '$groups'       => $groups,
+               '$add'          => t('add'),
        ));
-               
-       
+
+
        return $o;
 }
 
-function expand_groups($a) {
+function expand_groups($a,$check_dead = false) {
        if(! (is_array($a) && count($a)))
                return array();
        $groups = implode(',', $a);
@@ -229,13 +307,17 @@ function expand_groups($a) {
        if(count($r))
                foreach($r as $rr)
                        $ret[] = $rr['contact-id'];
+       if($check_dead) {
+               require_once('include/acl_selectors.php');
+               $ret = prune_deadguys($ret);
+       }
        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 ",
+       $r = q("SELECT `group`.`name`, `group`.`id` FROM `group` INNER 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)
        );