Merge pull request #8149 from annando/fix-warning

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

diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index 6dac33bfb14e4a5656ebda787ddbb91f1c66a3ab..f669138d76b0e591537e809aaad9b4d20d28512b 100644 (file)
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -1,14 +1,13 @@
 <?php
 /**
  * @file src/Model/GlobalContact.php
- * @brief This file includes the GlobalContact class with directory related functions
+ * This file includes the GlobalContact class with directory related functions
  */
 namespace Friendica\Model;
 
 use DOMDocument;
 use DOMXPath;
 use Exception;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -23,12 +22,12 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 /**
- * @brief This class handles GlobalContact related functions
+ * This class handles GlobalContact related functions
  */
 class GContact
 {
        /**
-        * @brief Search global contact table by nick or name
+        * Search global contact table by nick or name
         *
         * @param string $search Name or nick
         * @param string $mode   Search mode (e.g. "community")
@@ -43,13 +42,13 @@ class GContact
                }
 
                // check supported networks
-               if (Config::get('system', 'diaspora_enabled')) {
+               if (DI::config()->get('system', 'diaspora_enabled')) {
                        $diaspora = Protocol::DIASPORA;
                } else {
                        $diaspora = Protocol::DFRN;
                }
 
-               if (!Config::get('system', 'ostatus_disabled')) {
+               if (!DI::config()->get('system', 'ostatus_disabled')) {
                        $ostatus = Protocol::OSTATUS;
                } else {
                        $ostatus = Protocol::DFRN;
@@ -88,7 +87,7 @@ class GContact
        }
 
        /**
-        * @brief Link the gcontact entry with user, contact and global contact
+        * Link the gcontact entry with user, contact and global contact
         *
         * @param integer $gcid Global contact ID
         * @param integer $uid  User ID
@@ -108,7 +107,7 @@ class GContact
        }
 
        /**
-        * @brief Sanitize the given gcontact data
+        * Sanitize the given gcontact data
         *
         * Generation:
         *  0: No definition
@@ -424,11 +423,11 @@ class GContact
 
                $network = [Protocol::DFRN, Protocol::ACTIVITYPUB];
 
-               if (Config::get('system', 'diaspora_enabled')) {
+               if (DI::config()->get('system', 'diaspora_enabled')) {
                        $network[] = Protocol::DIASPORA;
                }
 
-               if (!Config::get('system', 'ostatus_disabled')) {
+               if (!DI::config()->get('system', 'ostatus_disabled')) {
                        $network[] = Protocol::OSTATUS;
                }
 
@@ -508,7 +507,7 @@ class GContact
 
                $done[] = DI::baseUrl() . '/poco';
 
-               if (strlen(Config::get('system', 'directory'))) {
+               if (strlen(DI::config()->get('system', 'directory'))) {
                        $x = Network::fetchUrl(Search::getGlobalDirectory() . '/pubsites');
                        if (!empty($x)) {
                                $j = json_decode($x);
@@ -537,7 +536,7 @@ class GContact
        }
 
        /**
-        * @brief Removes unwanted parts from a contact url
+        * Removes unwanted parts from a contact url
         *
         * @param string $url Contact url
         *
@@ -570,7 +569,7 @@ class GContact
        }
 
        /**
-        * @brief Fetch the gcontact id, add an entry if not existed
+        * Fetch the gcontact id, add an entry if not existed
         *
         * @param array $contact contact array
         *
@@ -635,7 +634,7 @@ class GContact
        }
 
        /**
-        * @brief Updates the gcontact table from a given array
+        * Updates the gcontact table from a given array
         *
         * @param array $contact contact array
         *
@@ -903,7 +902,7 @@ class GContact
                $curlResult = Network::curl($data['poll']);
                if (!$curlResult->isSuccess()) {
                        $fields = ['last_failure' => DateTimeFormat::utcNow()];
-                       DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($profile)]);
+                       DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
 
                        Logger::info("Profile wasn't reachable (no feed)", ['url' => $data['url']]);
                        return;
@@ -947,7 +946,7 @@ class GContact
                DBA::update('gcontact', $fields, ['nurl' => Strings::normaliseLink($data['url'])]);
        }
        /**
-        * @brief Updates the gcontact entry from a given public contact id
+        * Updates the gcontact entry from a given public contact id
         *
         * @param integer $cid contact id
         * @return void
@@ -960,7 +959,7 @@ class GContact
        }
 
        /**
-        * @brief Updates the gcontact entry from a given public contact url
+        * Updates the gcontact entry from a given public contact url
         *
         * @param string $url contact url
         * @return integer gcontact id
@@ -973,7 +972,7 @@ class GContact
        }
 
        /**
-        * @brief Helper function for updateFromPublicContactID and updateFromPublicContactURL
+        * Helper function for updateFromPublicContactID and updateFromPublicContactURL
         *
         * @param array $condition contact condition
         * @return integer gcontact id
@@ -1058,7 +1057,7 @@ class GContact
        }
 
        /**
-        * @brief Updates the gcontact entry from probe
+        * Updates the gcontact entry from probe
         *
         * @param string  $url   profile link
         * @param boolean $force Optional forcing of network probing (otherwise we use the cached data)
@@ -1090,7 +1089,7 @@ class GContact
        }
 
        /**
-        * @brief Update the gcontact entry for a given user id
+        * Update the gcontact entry for a given user id
         *
         * @param int $uid User ID
         * @return bool
@@ -1130,7 +1129,7 @@ class GContact
        }
 
        /**
-        * @brief Get the basepath for a given contact link
+        * Get the basepath for a given contact link
         *
         * @param string $url The gcontact link
         * @param boolean $dont_update Don't update the contact
@@ -1162,7 +1161,7 @@ class GContact
        }
 
        /**
-        * @brief Fetches users of given GNU Social server
+        * Fetches users of given GNU Social server
         *
         * If the "Statistics" addon is enabled (See http://gstools.org/ for details) we query user data with this.
         *
@@ -1227,14 +1226,15 @@ class GContact
        }
 
        /**
-        * @brief Asking GNU Social server on a regular base for their user data
+        * Asking GNU Social server on a regular base for their user data
+        *
         * @return void
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
        public static function discoverGsUsers()
        {
-               $requery_days = intval(Config::get('system', 'poco_requery_days'));
+               $requery_days = intval(DI::config()->get('system', 'poco_requery_days'));
 
                $last_update = date("c", time() - (60 * 60 * 24 * $requery_days));