From f42a3c9bc60c403fa361df9dcd772be956c16ce4 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 6 Nov 2015 01:19:37 +0100 Subject: [PATCH] Update the contact table as well. --- include/onepoll.php | 12 ++++++------ include/update_gcontact.php | 39 +++++++++++++------------------------ 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/include/onepoll.php b/include/onepoll.php index 0e58a776c..6ff7eae42 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -18,10 +18,10 @@ function onepoll_run(&$argv, &$argc){ } 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); + @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); }; @@ -679,6 +679,6 @@ function onepoll_run(&$argv, &$argc){ } if (array_search(__file__,get_included_files())===0){ - onepoll_run($_SERVER["argv"],$_SERVER["argc"]); - killme(); + onepoll_run($_SERVER["argv"],$_SERVER["argc"]); + killme(); } diff --git a/include/update_gcontact.php b/include/update_gcontact.php index 05cfba96c..ce2323f18 100644 --- a/include/update_gcontact.php +++ b/include/update_gcontact.php @@ -10,22 +10,14 @@ function update_gcontact_run(&$argv, &$argc){ } 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); + @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/session.php'); - require_once('include/datetime.php'); - require_once('library/simplepie/simplepie.inc'); - require_once('include/items.php'); - require_once('include/Contact.php'); - require_once('include/email.php'); - require_once('include/socgraph.php'); require_once('include/pidfile.php'); - require_once('include/queue_fn.php'); + require_once('include/Scrape.php'); load_config('config'); load_config('system'); @@ -36,18 +28,9 @@ function update_gcontact_run(&$argv, &$argc){ logger('update_gcontact: start'); - $manual_id = 0; - $generation = 0; - $hub_update = false; - $force = false; - $restart = false; - if(($argc > 1) && (intval($argv[1]))) $contact_id = intval($argv[1]); - if(($argc > 2) && ($argv[2] == "force")) - $force = true; - if(!$contact_id) { logger('update_gcontact: no contact'); return; @@ -99,16 +82,22 @@ function update_gcontact_run(&$argv, &$argc){ ); q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s' - WHERE `uid` = 0 AND `nurl` = '%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"])) ); + + q("UPDATE `contact` SET `addr` = '%s' + WHERE `uid` != 0 AND `addr` = '' AND `nurl` = '%s'", + dbesc($data["addr"]), + dbesc(normalise_link($data["url"])) + ); } if (array_search(__file__,get_included_files())===0){ - update_gcontact_run($_SERVER["argv"],$_SERVER["argc"]); - killme(); + update_gcontact_run($_SERVER["argv"],$_SERVER["argc"]); + killme(); }