Merge pull request #4171 from MrPetovan/task/fix-scrutinizer-issues

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

diff --git a/src/Model/Group.php b/src/Model/Group.php
index 542827151039e72bcf31a982c4083b52a8534259..db9ec331e46f34bede096b71443e5fc0a69f6836 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';
 
 /**
@@ -57,15 +58,12 @@ class Group extends BaseObject
        /**
         * @brief Get a list of group ids a contact belongs to
         *
-        * @todo Get rid of $uid, the contact id already bears the information
-        *
-        * @param int $uid
         * @param int $cid
         * @return array
         */
-       private static function getByContactIdForUserId($uid, $cid)
+       public static function getIdsByContactId($cid)
        {
-               $condition = ['uid' => $uid, 'contact-id' => $cid];
+               $condition = ['contact-id' => $cid];
                $stmt = dba::select('group_member', ['gid'], $condition);
 
                $return = [];
@@ -101,7 +99,6 @@ class Group extends BaseObject
                                FROM `group`
                                WHERE `group`.`uid` = ?;",
                        local_user(),
-                       local_user(),
                        local_user()
                );
 
@@ -134,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) {
@@ -142,8 +139,13 @@ class Group extends BaseObject
                        return false;
                }
 
+               $group = dba::select('group', ['uid'], ['gid' => $gid], ['limit' => 1]);
+               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::select('user', ['def_gid', 'allow_gid', 'deny_gid'], ['uid' => $group['uid']], ['limit' => 1]);
                if (DBM::is_result($user)) {
                        $change = false;
 
@@ -161,7 +163,7 @@ class Group extends BaseObject
                        }
 
                        if ($change) {
-                               dba::update('user', $user, ['uid' => $uid]);
+                               dba::update('user', $user, ['uid' => $group['uid']]);
                        }
                }
 
@@ -179,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;
@@ -369,7 +371,7 @@ class Group extends BaseObject
 
                $member_of = array();
                if ($cid) {
-                       $member_of = self::getByContactIdForUserId(local_user(), $cid);
+                       $member_of = self::getIdsByContactId($cid);
                }
 
                while ($group = dba::fetch($stmt)) {