Merge pull request #4243 from MrPetovan/task/switch-to-array-new-style

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

diff --git a/src/Model/Group.php b/src/Model/Group.php
index 26bab7f45bca4b5828e5a5f3d4936c4658fbb0cb..a5cd57d47d6c9c0b8d09b7238f13556d9427de98 100644 (file)
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -11,6 +11,7 @@ use Friendica\Database\DBM;
 use dba;
 
 require_once 'boot.php';
+require_once 'include/dba.php';
 require_once 'include/text.php';
 
 /**
@@ -38,7 +39,7 @@ class Group extends BaseObject
                                // 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.
-                               $group = dba::select('group', ['deleted'], ['id' => $gid], ['limit' => 1]);
+                               $group = dba::selectFirst('group', ['deleted'], ['id' => $gid]);
                                if (DBM::is_result($group) && $group['deleted']) {
                                        dba::update('group', ['deleted' => 0], ['gid' => $gid]);
                                        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);
@@ -60,7 +61,7 @@ class Group extends BaseObject
         * @param int $cid
         * @return array
         */
-       private static function getIdsByContactId($cid)
+       public static function getIdsByContactId($cid)
        {
                $condition = ['contact-id' => $cid];
                $stmt = dba::select('group_member', ['gid'], $condition);
@@ -98,7 +99,6 @@ class Group extends BaseObject
                                FROM `group`
                                WHERE `group`.`uid` = ?;",
                        local_user(),
-                       local_user(),
                        local_user()
                );
 
@@ -120,7 +120,7 @@ class Group extends BaseObject
                        return false;
                }
 
-               $group = dba::select('group', ['id'], ['uid' => $uid, 'name' => $name], ['limit' => 1]);
+               $group = dba::selectFirst('group', ['id'], ['uid' => $uid, 'name' => $name]);
                if (DBM::is_result($group)) {
                        return $group['id'];
                }
@@ -131,7 +131,7 @@ class Group extends BaseObject
        /**
         * @brief Mark a group as deleted
         *
-        * @param type $gid
+        * @param int $gid
         * @return boolean
         */
        public static function remove($gid) {
@@ -139,8 +139,13 @@ class Group extends BaseObject
                        return false;
                }
 
+               $group = dba::selectFirst('group', ['uid'], ['gid' => $gid]);
+               if (!DBM::is_result($group)) {
+                       return false;
+               }
+
                // remove group from default posting lists
-               $user = dba::select('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $uid], ['limit' => 1]);
+               $user = dba::selectFirst('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $group['uid']]);
                if (DBM::is_result($user)) {
                        $change = false;
 
@@ -158,7 +163,7 @@ class Group extends BaseObject
                        }
 
                        if ($change) {
-                               dba::update('user', $user, ['uid' => $uid]);
+                               dba::update('user', $user, ['uid' => $group['uid']]);
                        }
                }
 
@@ -176,9 +181,9 @@ class Group extends BaseObject
         *
         * @deprecated Use Group::remove instead
         *
-        * @param type $uid
-        * @param type $name
-        * @return type
+        * @param int $uid
+        * @param string $name
+        * @return bool
         */
        public static function removeByName($uid, $name) {
                $return = false;
@@ -325,10 +330,10 @@ class Group extends BaseObject
                        $label = t('Default privacy group for new contacts');
                }
 
-               $o = replace_macros(get_markup_template('group_selection.tpl'), array(
+               $o = replace_macros(get_markup_template('group_selection.tpl'), [
                        '$label' => $label,
                        '$groups' => $display_groups
-               ));
+               ]);
                return $o;
        }
 
@@ -364,7 +369,7 @@ class Group extends BaseObject
 
                $stmt = dba::select('group', [], ['deleted' => 0, 'uid' => local_user()], ['order' => ['name']]);
 
-               $member_of = array();
+               $member_of = [];
                if ($cid) {
                        $member_of = self::getIdsByContactId($cid);
                }