Merge pull request #4192 from zeroadam/Follow-#3878

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

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 1b846b31716c04600e3576557205febb4a4b2184..830f80e921e209730e93cbf4bd9c19fedb906989 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -17,6 +17,7 @@ use dba;
 use Exception;
 
 require_once 'include/datetime.php';
+require_once 'include/dba.php';
 require_once 'include/network.php';
 require_once 'include/html2bbcode.php';
 
@@ -326,8 +327,8 @@ class GContact
        }
 
        /**
-        * @param object  $uid     user
-        * @param object  $cid     cid
+        * @param integer $uid     user
+        * @param integer $cid     cid
         * @param integer $start   optional, default 0
         * @param integer $limit   optional, default 9999
         * @param boolean $shuffle optional, default false
@@ -364,8 +365,8 @@ class GContact
        }
 
        /**
-        * @param object  $uid     user
-        * @param object  $zcid    zcid
+        * @param integer $uid     user
+        * @param integer $zcid    zcid
         * @param integer $start   optional, default 0
         * @param integer $limit   optional, default 9999
         * @param boolean $shuffle optional, default false
@@ -396,8 +397,8 @@ class GContact
        }
 
        /**
-        * @param object $uid user
-        * @param object $cid cid
+        * @param integer $uid user
+        * @param integer $cid cid
         * @return integer
         */
        public static function countAllFriends($uid, $cid)
@@ -419,11 +420,11 @@ class GContact
        }
 
        /**
-        * @param object  $uid   user
-        * @param object  $cid   cid
+        * @param integer $uid   user
+        * @param integer $cid   cid
         * @param integer $start optional, default 0
         * @param integer $limit optional, default 80
-        * @return object
+        * @return array
         */
        public static function allFriends($uid, $cid, $start = 0, $limit = 80)
        {
@@ -635,7 +636,7 @@ class GContact
        /**
         * @brief Replace alternate OStatus user format with the primary one
         *
-        * @param arr $contact contact array (called by reference)
+        * @param array $contact contact array (called by reference)
         * @return void
         */
        public static function fixAlternateContactAddress(&$contact)
@@ -655,7 +656,7 @@ class GContact
        /**
         * @brief Fetch the gcontact id, add an entry if not existed
         *
-        * @param arr $contact contact array
+        * @param array $contact contact array
         *
         * @return bool|int Returns false if not found, integer if contact was found
         */
@@ -746,7 +747,7 @@ class GContact
        /**
         * @brief Updates the gcontact table from a given array
         *
-        * @param arr $contact contact array
+        * @param array $contact contact array
         *
         * @return bool|int Returns false if not found, integer if contact was found
         */
@@ -907,7 +908,7 @@ class GContact
        /**
         * @brief Updates the gcontact entry from probe
         *
-        * @param str $url profile link
+        * @param string $url profile link
         * @return void
         */
        public static function updateFromProbe($url)
@@ -973,7 +974,7 @@ class GContact
         *
         * If the "Statistics" plugin is enabled (See http://gstools.org/ for details) we query user data with this.
         *
-        * @param str $server Server address
+        * @param string $server Server address
         * @return void
         */
        public static function fetchGsUsers($server)