Merge branch 'develop' of https://github.com/friendica/friendica into develop

[friendica.git] / src / Model / Group.php

diff --git a/src/Model/Group.php b/src/Model/Group.php
index 32ef7593d5bac8a72247d7f59be97ea740198809..e313842e4143677afceb1f143dddb18eff3a0c31 100644 (file)
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -38,7 +38,7 @@ class Group extends BaseObject
                                // 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.
                                $group = DBA::selectFirst('group', ['deleted'], ['id' => $gid]);
-                               if (DBA::is_result($group) && $group['deleted']) {
+                               if (DBA::isResult($group) && $group['deleted']) {
                                        DBA::update('group', ['deleted' => 0], ['id' => $gid]);
                                        notice(L10n::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);
                                }
@@ -132,7 +132,7 @@ class Group extends BaseObject
                }
 
                $group = DBA::selectFirst('group', ['id'], ['uid' => $uid, 'name' => $name]);
-               if (DBA::is_result($group)) {
+               if (DBA::isResult($group)) {
                        return $group['id'];
                }
 
@@ -151,13 +151,13 @@ class Group extends BaseObject
                }
 
                $group = DBA::selectFirst('group', ['uid'], ['id' => $gid]);
-               if (!DBA::is_result($group)) {
+               if (!DBA::isResult($group)) {
                        return false;
                }
 
                // remove group from default posting lists
                $user = DBA::selectFirst('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $group['uid']]);
-               if (DBA::is_result($user)) {
+               if (DBA::isResult($user)) {
                        $change = false;
 
                        if ($user['def_gid'] == $gid) {
@@ -273,36 +273,25 @@ class Group extends BaseObject
         *
         * @param array $group_ids
         * @param boolean $check_dead
-        * @param boolean $use_gcontact
         * @return array
         */
-       public static function expand($group_ids, $check_dead = false, $use_gcontact = false)
+       public static function expand($group_ids, $check_dead = false)
        {
                if (!is_array($group_ids) || !count($group_ids)) {
                        return [];
                }
 
-               $condition = '`gid` IN (' . substr(str_repeat("?, ", count($group_ids)), 0, -2) . ')';
-               if ($use_gcontact) {
-                       $sql = 'SELECT `gcontact`.`id` AS `contact-id` FROM `group_member`
-                                       INNER JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
-                                       INNER JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
-                               WHERE ' . $condition;
-                       $param_arr = array_merge([$sql], $group_ids);
-                       $stmt = call_user_func_array('dba::p', $param_arr);
-               } else {
-                       $condition_array = array_merge([$condition], $group_ids);
-                       $stmt = DBA::select('group_member', ['contact-id'], $condition_array);
-               }
+               $stmt = DBA::select('group_member', ['contact-id'], ['gid' => $group_ids]);
 
                $return = [];
                while($group_member = DBA::fetch($stmt)) {
                        $return[] = $group_member['contact-id'];
                }
 
-               if ($check_dead && !$use_gcontact) {
+               if ($check_dead) {
                        Contact::pruneUnavailable($return);
                }
+
                return $return;
        }
 
@@ -360,7 +349,7 @@ class Group extends BaseObject
         * @param int $cid
         * @return string
         */
-       public static function sidebarWidget($every = 'contacts', $each = 'group', $editmode = 'standard', $group_id = '', $cid = 0)
+       public static function sidebarWidget($every = 'contact', $each = 'group', $editmode = 'standard', $group_id = '', $cid = 0)
        {
                $o = '';
 
@@ -415,7 +404,7 @@ class Group extends BaseObject
                        'newgroup' => $editmode == 'extended' || $editmode == 'full' ? 1 : '',
                        'grouppage' => 'group/',
                        '$edittext' => L10n::t('Edit group'),
-                       '$ungrouped' => $every === 'contacts' ? L10n::t('Contacts not in any group') : '',
+                       '$ungrouped' => $every === 'contact' ? L10n::t('Contacts not in any group') : '',
                        '$ungrouped_selected' => (($group_id === 'none') ? 'group-selected' : ''),
                        '$createtext' => L10n::t('Create a new group'),
                        '$creategroup' => L10n::t('Group Name: '),