X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FWorker%2FUpdateGContact.php;h=1057d0a27037142cadbb59b553897eb5eb6ebc59;hb=48baa0be4b662b7c3d2afebad3b78324677fec14;hp=395e415bf7409a6fe0be01d830740cbb5767769e;hpb=28315ee9ddfc7a36cb966fb02e4977bf6b7e3568;p=friendica.git

diff --git a/src/Worker/UpdateGContact.php b/src/Worker/UpdateGContact.php
index 395e415bf7..1057d0a270 100644
--- a/src/Worker/UpdateGContact.php
+++ b/src/Worker/UpdateGContact.php
@@ -1,81 +1,28 @@
 <?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"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
-			return;
-		}
-
-		$data = Probe::uri($r[0]["url"]);
-
-		if (!in_array($data["network"], array(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
+{
+	/**
+	 * Update global contact via probe
+	 * @param string $url     Global contact url
+	 * @param string $command
+	 */
+	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]);
 	}
 }