Fix docblocks types

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

diff --git a/src/Model/Group.php b/src/Model/Group.php
index 857b972d62b4c81c4f1d02ff64e54b689f0355a8..410f78b1564216ffb2dbd1ecd599ffccb3970492 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';
 
 /**
@@ -47,6 +48,9 @@ class Group extends BaseObject
                        }
 
                        $return = dba::insert('group', ['uid' => $uid, 'name' => $name]);
+                       if ($return) {
+                               $return = dba::lastInsertId();
+                       }
                }
                return $return;
        }
@@ -54,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)
+       private static function getIdsByContactId($cid)
        {
-               $condition = ['uid' => $uid, 'contact-id' => $cid];
+               $condition = ['contact-id' => $cid];
                $stmt = dba::select('group_member', ['gid'], $condition);
 
                $return = [];
@@ -93,13 +94,11 @@ class Group extends BaseObject
                                        AND `contact-id` IN
                                                (SELECT `contact-id`
                                                FROM `group_member`
-                                               WHERE `group_member`.`gid` = `group`.`id`
-                                               AND `group_member`.`uid` = ?)
+                                               WHERE `group_member`.`gid` = `group`.`id`)
                                        ) AS `count`
                                FROM `group`
                                WHERE `group`.`uid` = ?;",
                        local_user(),
-                       local_user(),
                        local_user()
                );
 
@@ -132,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) {
@@ -177,9 +176,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;
@@ -367,7 +366,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)) {