NL translation update THX Walis

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

diff --git a/src/Worker/UpdateGContact.php b/src/Worker/UpdateGContact.php
index a506f0e087f55be156b583ae33bbbb9ec2cf062a..aacebcb80ae93d7482994261f06d8cd9e565ad67 100644 (file)
--- a/src/Worker/UpdateGContact.php
+++ b/src/Worker/UpdateGContact.php
@@ -1,81 +1,23 @@
 <?php
+
 /**
  * @file src/Worker/UpdateGcontact.php
  */
-namespace Friendica\Worker;
-
-use Friendica\Core\Config;
-use Friendica\Database\DBM;
-use Friendica\Network\Probe;
-use Friendica\Protocol\PortableContact;
-
-class UpdateGContact {
-       public static function execute($contact_id) {
-               global $a;
-
-               logger('update_gcontact: start');
-
-               if (empty($contact_id)) {
-                       logger('update_gcontact: no contact');
-                       return;
-               }
-
-               $r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
-
-               if (!DBM::is_result($r)) {
-                       return;
-               }
 
-               if (!in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
-                       return;
-               }
-
-               $data = Probe::uri($r[0]["url"]);
-
-               if (!in_array($data["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_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(datetime_convert()), intval($contact_id));
-                       return;
-               }
-
-               if (($data["name"] == "") && ($r[0]['name'] != ""))
-                       $data["name"] = $r[0]['name'];
-
-               if (($data["nick"] == "") && ($r[0]['nick'] != ""))
-                       $data["nick"] = $r[0]['nick'];
-
-               if (($data["addr"] == "") && ($r[0]['addr'] != ""))
-                       $data["addr"] = $r[0]['addr'];
-
-               if (($data["photo"] == "") && ($r[0]['photo'] != ""))
-                       $data["photo"] = $r[0]['photo'];
+namespace Friendica\Worker;
 
+use Friendica\Core\Logger;
+use Friendica\Model\GContact;
+use Friendica\Database\DBA;
 
-               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"]),
-                                       intval($contact_id)
-                               );
+class UpdateGContact
+{
+       public static function execute($url, $command = '')
+       {
+               $force = ($command == "force");
 
-               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"]))
-                               );
+               $success = GContact::updateFromProbe($url, $force);
 
-               q("UPDATE `contact` SET `addr` = '%s'
-                                       WHERE `uid` != 0 AND `addr` = '' AND `nurl` = '%s'",
-                                       dbesc($data["addr"]),
-                                       dbesc(normalise_link($data["url"]))
-                               );
+               Logger::info('Updated from probe', ['url' => $url, 'force' => $force, 'success' => $success]);
        }
 }