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

One error, one documentation, one brace

Browse source
This commit is contained in:
Michael 2017-03-13 06:32:33 +00:00
parent 97d3176754
commit 44888590e5
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/discover_poco.php
View file

@ -29,6 +29,14 @@ function discover_poco_run(&$argv, &$argc){
if ($a->maxload_reached())
return;
/*
This function can be called in these ways:
- dirsearch <search pattern>: Searches for "search pattern" in the directory. "search pattern" is url encoded.
- checkcontact: Updates gcontact entries
- suggestions: Discover other servers for their contacts.
- server <poco url>: Searches for the poco server list. "poco url" is base64 encoded.
*/
if(($argc > 2) && ($argv[1] == "dirsearch")) {
$search = urldecode($argv[2]);
$mode = 1;

6
include/socgraph.php
View file

@ -431,7 +431,7 @@ function poco_detect_server($profile) {
// Wild guess
if ($server_url == "") {
$base = preg_replace("=(https?://)(.*?)/(.*)=ism", "$1$2", $profile);
if (base != $profile) {
if ($base != $profile) {
$server_url = $base;
$network = NETWORK_PHANTOM;
}
@ -1303,7 +1303,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
dbesc($last_failure),
dbesc(normalise_link($server_url))
);
} elseif (!$failure)
} elseif (!$failure) {
q("INSERT INTO `gserver` (`url`, `nurl`, `version`, `site_name`, `info`, `register_policy`, `poco`, `noscrape`, `network`, `platform`, `created`, `last_contact`, `last_failure`)
VALUES ('%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
dbesc($server_url),
@ -1321,7 +1321,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
dbesc($last_failure),
dbesc(datetime_convert())
);
}
logger("End discovery for server ".$server_url, LOGGER_DEBUG);
return !$failure;