friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Update the contact table as well.

This commit is contained in:
Michael Vogel 2015-11-06 01:19:37 +01:00
parent 0f41f35041
commit f42a3c9bc6
2 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/onepoll.php
View File

@ -18,10 +18,10 @@ function onepoll_run(&$argv, &$argc){
} }
if(is_null($db)) { if(is_null($db)) {
@include(".htconfig.php"); @include(".htconfig.php");
require_once("include/dba.php"); require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data); $db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($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){ if (array_search(__file__,get_included_files())===0){
onepoll_run($_SERVER["argv"],$_SERVER["argc"]); onepoll_run($_SERVER["argv"],$_SERVER["argc"]);
killme(); killme();
} }

39
include/update_gcontact.php
View File

@ -10,22 +10,14 @@ function update_gcontact_run(&$argv, &$argc){
} }
if(is_null($db)) { if(is_null($db)) {
@include(".htconfig.php"); @include(".htconfig.php");
require_once("include/dba.php"); require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data); $db = new dba($db_host, $db_user, $db_pass, $db_data);
unset($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/pidfile.php');
require_once('include/queue_fn.php'); require_once('include/Scrape.php');
load_config('config'); load_config('config');
load_config('system'); load_config('system');
@ -36,18 +28,9 @@ function update_gcontact_run(&$argv, &$argc){
logger('update_gcontact: start'); logger('update_gcontact: start');
$manual_id = 0;
$generation = 0;
$hub_update = false;
$force = false;
$restart = false;
if(($argc > 1) && (intval($argv[1]))) if(($argc > 1) && (intval($argv[1])))
$contact_id = intval($argv[1]); $contact_id = intval($argv[1]);
if(($argc > 2) && ($argv[2] == "force"))
$force = true;
if(!$contact_id) { if(!$contact_id) {
logger('update_gcontact: no contact'); logger('update_gcontact: no contact');
return; return;
@ -99,16 +82,22 @@ function update_gcontact_run(&$argv, &$argc){
); );
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `photo` = '%s' 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["name"]),
dbesc($data["nick"]), dbesc($data["nick"]),
dbesc($data["addr"]), dbesc($data["addr"]),
dbesc($data["photo"]), dbesc($data["photo"]),
dbesc(normalise_link($data["url"])) 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){ if (array_search(__file__,get_included_files())===0){
update_gcontact_run($_SERVER["argv"],$_SERVER["argc"]); update_gcontact_run($_SERVER["argv"],$_SERVER["argc"]);
killme(); killme();
} }