X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fupdate_gcontact.php;h=883a22989508eb4080c114f09472e030065adee0;hb=f1c53530a13ca73281f5dc1dd51ac1319f138e81;hp=6aa8bcac29858e58127169e22f22388af50b2eb5;hpb=f852f7aac0b44f243d3cd812aa92122f7b38067b;p=friendica.git

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 6aa8bcac29..883a229895 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -2,53 +2,32 @@
 
 use \Friendica\Core\Config;
 
-require_once("boot.php");
+function update_gcontact_run(&$argv, &$argc) {
+	global $a;
 
-function update_gcontact_run(&$argv, &$argc){
-	global $a, $db;
-
-	if(is_null($a)) {
-		$a = new App;
-	}
-
-	if(is_null($db)) {
-		@include(".htconfig.php");
-		require_once("include/dba.php");
-		$db = new dba($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-	};
-
-	require_once('include/Scrape.php');
-	require_once("include/socgraph.php");
-
-	Config::load();
-
-	$a->set_baseurl(get_config('system','url'));
-
-	load_hooks();
+	require_once 'include/Scrape.php';
+	require_once 'include/socgraph.php';
 
 	logger('update_gcontact: start');
 
-	if(($argc > 1) && (intval($argv[1])))
+	if (($argc > 1) && (intval($argv[1]))) {
 		$contact_id = intval($argv[1]);
+	}
 
-	if(!$contact_id) {
+	if (!$contact_id) {
 		logger('update_gcontact: no contact');
 		return;
 	}
 
-	// Don't check this stuff if the function is called by the poller
-	if (App::callstack() != "poller_run")
-		if (App::is_already_running('update_gcontact'.$contact_id, '', 540))
-			return;
-
 	$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"]);
 
@@ -98,8 +77,3 @@ function update_gcontact_run(&$argv, &$argc){
 				dbesc(normalise_link($data["url"]))
 			);
 }
-
-if (array_search(__file__,get_included_files())===0){
-	update_gcontact_run($_SERVER["argv"],$_SERVER["argc"]);
-	killme();
-}