X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fupdate_gcontact.php;h=97c825352eb26919930ea92c99727077875389d9;hb=0cd9db9cb7f4c96f597e37590a536eaae123238d;hp=08d4149a716343e6f0ef137cc8cde5b0e0d2476f;hpb=4ebebe96fee1ea3dda219fa7049e6d14a142aa19;p=friendica.git

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 08d4149a71..97c825352e 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -1,12 +1,12 @@
 <?php
 
-use \Friendica\Core\Config;
+use Friendica\Core\Config;
 
-function update_gcontact_run(&$argv, &$argc){
+function update_gcontact_run(&$argv, &$argc) {
 	global $a;
 
-	require_once('include/Scrape.php');
-	require_once('include/socgraph.php');
+	require_once 'include/probe.php';
+	require_once 'include/socgraph.php';
 
 	logger('update_gcontact: start');
 
@@ -21,11 +21,13 @@ function update_gcontact_run(&$argv, &$argc){
 
 	$r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
 
-	if (!$r)
+	if (!dbm::is_result($r)) {
 		return;
+	}
 
-	if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
+	if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
 		return;
+	}
 
 	$data = probe_url($r[0]["url"]);
 
@@ -38,16 +40,16 @@ function update_gcontact_run(&$argv, &$argc){
 		return;
 	}
 
-	if (($data["name"] == "") AND ($r[0]['name'] != ""))
+	if (($data["name"] == "") && ($r[0]['name'] != ""))
 		$data["name"] = $r[0]['name'];
 
-	if (($data["nick"] == "") AND ($r[0]['nick'] != ""))
+	if (($data["nick"] == "") && ($r[0]['nick'] != ""))
 		$data["nick"] = $r[0]['nick'];
 
-	if (($data["addr"] == "") AND ($r[0]['addr'] != ""))
+	if (($data["addr"] == "") && ($r[0]['addr'] != ""))
 		$data["addr"] = $r[0]['addr'];
 
-	if (($data["photo"] == "") AND ($r[0]['photo'] != ""))
+	if (($data["photo"] == "") && ($r[0]['photo'] != ""))
 		$data["photo"] = $r[0]['photo'];