clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

"addr" and "server_url" are now generated directly in "update_gcontact" if not given.

Browse Source
This commit is contained in:
Michael Vogel
2016-02-14 11:56:23 +01:00
parent b9e1792076
commit 5d35974c19
3 changed files with 75 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/socgraph.php
View File

@@ -1433,6 +1433,28 @@ function update_gcontact($contact) {
if (!isset($contact["updated"]))
$contact["updated"] = datetime_convert();
if ($contact["server_url"] == "") {
$server_url = $contact["url"];
$server_url = matching_url($server_url, $contact["alias"]);
if ($server_url != "")
$contact["server_url"] = $server_url;
$server_url = matching_url($server_url, $contact["photo"]);
if ($server_url != "")
$contact["server_url"] = $server_url;
$server_url = matching_url($server_url, $contact["notify"]);
if ($server_url != "")
$contact["server_url"] = $server_url;
} else
$contact["server_url"] = normalise_link($contact["server_url"]);
if (($contact["addr"] == "") AND ($contact["server_url"] != "") AND ($contact["nick"] != "")) {
$hostname = str_replace("http://", "", $contact["server_url"]);
$contact["addr"] = $contact["nick"]."@".$hostname;
}
// Check if any field changed
$update = false;
unset($fields["generation"]);