Merge pull request #7255 from annando/issue-7223

[friendica.git] / src / Worker / UpdateGContact.php

diff --git a/src/Worker/UpdateGContact.php b/src/Worker/UpdateGContact.php
index 7298cf37077016d18ada58ca59ff0a7456470a90..b927e61bbd2718c1d251e8dce9dff5734783bf22 100644 (file)
--- a/src/Worker/UpdateGContact.php
+++ b/src/Worker/UpdateGContact.php
@@ -6,19 +6,22 @@
 
 namespace Friendica\Worker;
 
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Network\Probe;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
 
 class UpdateGContact
 {
        public static function execute($contact_id)
        {
-               logger('update_gcontact: start');
+               Logger::log('update_gcontact: start');
 
                if (empty($contact_id)) {
-                       logger('update_gcontact: no contact');
+                       Logger::log('update_gcontact: no contact');
                        return;
                }
 
@@ -28,19 +31,19 @@ class UpdateGContact
                        return;
                }
 
-               if (!in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+               if (!in_array($r[0]["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
                        return;
                }
 
                $data = Probe::uri($r[0]["url"]);
 
-               if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+               if (!in_array($data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
                        if ($r[0]["server_url"] != "") {
                                PortableContact::checkServer($r[0]["server_url"], $r[0]["network"]);
                        }
 
                        q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `id` = %d",
-                               dbesc(DateTimeFormat::utcNow()), intval($contact_id));
+                               DBA::escape(DateTimeFormat::utcNow()), intval($contact_id));
                        return;
                }
 
@@ -63,26 +66,26 @@ class UpdateGContact
 
                q("UPDATE `gcontact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
                                        WHERE `id` = %d",
-                                       dbesc($data["name"]),
-                                       dbesc($data["nick"]),
-                                       dbesc($data["addr"]),
-                                       dbesc($data["photo"]),
+                                       DBA::escape($data["name"]),
+                                       DBA::escape($data["nick"]),
+                                       DBA::escape($data["addr"]),
+                                       DBA::escape($data["photo"]),
                        intval($contact_id)
                );
 
                q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s'
                                        WHERE `uid` = 0 AND `addr` = '' AND `nurl` = '%s'",
-                                       dbesc($data["name"]),
-                                       dbesc($data["nick"]),
-                                       dbesc($data["addr"]),
-                                       dbesc($data["photo"]),
-                                       dbesc(normalise_link($data["url"]))
+                                       DBA::escape($data["name"]),
+                                       DBA::escape($data["nick"]),
+                                       DBA::escape($data["addr"]),
+                                       DBA::escape($data["photo"]),
+                                       DBA::escape(Strings::normaliseLink($data["url"]))
                );
 
                q("UPDATE `contact` SET `addr` = '%s'
                                        WHERE `uid` != 0 AND `addr` = '' AND `nurl` = '%s'",
-                                       dbesc($data["addr"]),
-                                       dbesc(normalise_link($data["url"]))
+                                       DBA::escape($data["addr"]),
+                                       DBA::escape(Strings::normaliseLink($data["url"]))
                );
        }
 }