Adding $fields

diff --git a/src/Model/Contact/Relation.php b/src/Model/Contact/Relation.php
index 9740c3b24ac1f8d4ff1062e579298c8ac77ea94b..b6e612c7d8bd9f779610cbc3366b434c2b3bcd3e 100644 (file)
--- a/src/Model/Contact/Relation.php
+++ b/src/Model/Contact/Relation.php
@@ -231,6 +231,7 @@ class Relation
         * Returns a paginated list of contacts that are followed the provided public contact.
         *
         * @param int   $cid       Public contact id
+        * @param array $field     Field list
         * @param array $condition Additional condition on the contact table
         * @param int   $count
         * @param int   $offset
@@ -238,14 +239,14 @@ class Relation
         * @return array
         * @throws Exception
         */
-       public static function listFollows(int $cid, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
+       public static function listFollows(int $cid, array $fields = [], array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
        {
                $condition = DBA::mergeConditions($condition,
                        ['`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`)', 
                        $cid]
                );
 
-               return DI::dba()->selectToArray('contact', [], $condition,
+               return DI::dba()->selectToArray('contact', $fields, $condition,
                        ['limit' => [$offset, $count], 'order' => [$shuffle ? 'RAND()' : 'name']]
                );
        }
@@ -272,6 +273,7 @@ class Relation
         * Returns a paginated list of contacts that follow the provided public contact.
         *
         * @param int   $cid       Public contact id
+        * @param array $field     Field list
         * @param array $condition Additional condition on the contact table
         * @param int   $count
         * @param int   $offset
@@ -279,17 +281,15 @@ class Relation
         * @return array
         * @throws Exception
         */
-       public static function listFollowers(int $cid, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
+       public static function listFollowers(int $cid, array $fields = [], array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
        {
                $condition = DBA::mergeConditions($condition,
                        ['`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`)', $cid]
                );
 
-               $followers = DI::dba()->selectToArray('contact', [], $condition,
+               return DI::dba()->selectToArray('contact', $fields, $condition,
                        ['limit' => [$offset, $count], 'order' => [$shuffle ? 'RAND()' : 'name']]
                );
-
-               return $followers;
        }
 
        /**
@@ -310,9 +310,7 @@ class Relation
                        $sourceId, $targetId]
                );
 
-               $total = DI::dba()->count('contact', $condition);
-
-               return $total;
+               return DI::dba()->count('contact', $condition);
        }
 
        /**
@@ -321,6 +319,7 @@ class Relation
         *
         * @param int   $sourceId  Public contact id
         * @param int   $targetId  Public contact id
+        * @param array $field     Field list
         * @param array $condition Additional condition on the contact table
         * @param int   $count
         * @param int   $offset
@@ -328,7 +327,7 @@ class Relation
         * @return array
         * @throws Exception
         */
-       public static function listCommon(int $sourceId, int $targetId, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
+       public static function listCommon(int $sourceId, int $targetId, array $fields = [], array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
        {
                $condition = DBA::mergeConditions($condition,
                        ["`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`) 
@@ -336,11 +335,9 @@ class Relation
                        $sourceId, $targetId]
                );
 
-               $contacts = DI::dba()->selectToArray('contact', [], $condition,
+               return DI::dba()->selectToArray('contact', $fields, $condition,
                        ['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']]
                );
-
-               return $contacts;
        }
 
 
@@ -361,9 +358,7 @@ class Relation
                        $sourceId, $targetId]
                );
 
-               $total = DI::dba()->count('contact', $condition);
-
-               return $total;
+               return DI::dba()->count('contact', $condition);
        }
 
        /**
@@ -371,6 +366,7 @@ class Relation
         *
         * @param int   $sourceId  Public contact id
         * @param int   $targetId  Public contact id
+        * @param array $field     Field list
         * @param array $condition Additional condition array on the contact table
         * @param int   $count
         * @param int   $offset
@@ -378,7 +374,7 @@ class Relation
         * @return array
         * @throws Exception
         */
-       public static function listCommonFollows(int $sourceId, int $targetId, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
+       public static function listCommonFollows(int $sourceId, int $targetId, array $fields = [], array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
        {
                $condition = DBA::mergeConditions($condition,
                        ["`id` IN (SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ? AND `follows`) 
@@ -386,11 +382,9 @@ class Relation
                        $sourceId, $targetId]
                );
 
-               $contacts = DI::dba()->selectToArray('contact', [], $condition,
+               return DI::dba()->selectToArray('contact', $fields, $condition,
                        ['limit' => [$offset, $count], 'order' => [$shuffle ? 'name' : 'RAND()']]
                );
-
-               return $contacts;
        }
 
        /**
@@ -418,6 +412,7 @@ class Relation
         *
         * @param int   $sourceId  Public contact id
         * @param int   $targetId  Public contact id
+        * @param array $field     Field list
         * @param array $condition Additional condition on the contact table
         * @param int   $count
         * @param int   $offset
@@ -425,7 +420,7 @@ class Relation
         * @return array
         * @throws Exception
         */
-       public static function listCommonFollowers(int $sourceId, int $targetId, array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
+       public static function listCommonFollowers(int $sourceId, int $targetId, array $fields = [], array $condition = [], int $count = 30, int $offset = 0, bool $shuffle = false)
        {
                $condition = DBA::mergeConditions($condition,
                        ["`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ? AND `follows`) 
@@ -433,7 +428,7 @@ class Relation
                        $sourceId, $targetId]
                );
 
-               return DI::dba()->selectToArray('contact', [], $condition,
+               return DI::dba()->selectToArray('contact', $fields, $condition,
                        ['limit' => [$offset, $count],  'order' => [$shuffle ? 'name' : 'RAND()']]
                );
        }

diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index 9867ef5e9c988c7bc714fcc96889e31d8f8efdc9..f41b8b0d71a9a7db0bfdddfc390b4b2733e2c7a8 100644 (file)
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -67,7 +67,7 @@ class AllFriends extends BaseModule
 
                $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
-               $friends = Model\Contact\Relation::listFollows($cid, [], $pager->getItemsPerPage(), $pager->getStart());
+               $friends = Model\Contact\Relation::listFollows($cid, [], [], $pager->getItemsPerPage(), $pager->getStart());
                if (empty($friends)) {
                        return DI::l10n()->t('No friends to display.');
                }