keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Start a gcontact probing for new gcontacts

Browse source
This commit is contained in:
Michael Vogel 2016-04-20 21:47:57 +02:00 committed by Roland Haeder
parent 7931555b64
commit ede888dd4c
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
2 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/socgraph.php
View file

@ -1448,8 +1448,15 @@ function get_gcontact_id($contact) {
$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2", $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
dbesc(normalise_link($contact["url"]))); dbesc(normalise_link($contact["url"])));
if ($r) if ($r) {
$gcontact_id = $r[0]["id"]; $gcontact_id = $r[0]["id"];
// Complete newly added contacts from "probable" accounts
if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_FEED))) {
logger("Probing ".$contact["url"], LOGGER_DEBUG);
proc_run('php', 'include/gprobe.php', bin2hex($contact["url"]));
}
}
} }
if ((count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != "")) if ((count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != ""))

12
index.php
View file

@ -117,9 +117,15 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
} }
if((x($_GET,'zrl')) && (!$install && !$maintenance)) { if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
$_SESSION['my_url'] = $_GET['zrl']; // Only continue when the given profile link seems valid
$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string); // Valid profile links contain a path and no query parameters
zrl_init($a); if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") AND
(parse_url($_GET['zrl'], PHP_URL_PATH) != "")) {
$_SESSION['my_url'] = $_GET['zrl'];
$a->query_string = preg_replace('/[\?&]zrl=(.*?)([\?&]|$)/is','',$a->query_string);
zrl_init($a);
} else
logger("Invalid ZRL parameter ".$_GET['zrl'], LOGGER_DEBUG);
} }
/** /**