Fix formatting in Probe::uri
This commit is contained in:
Hypolite Petovan
parent
7242b706f0
commit
1892462920
|
|
@ -318,10 +318,10 @@ class Probe
|
||||||
*
|
*
|
||||||
* @return array uri data
|
* @return array uri data
|
||||||
*/
|
*/
|
||||||
public static function uri($uri, $network = "", $uid = -1, $cache = true)
|
public static function uri($uri, $network = '', $uid = -1, $cache = true)
|
||||||
{
|
{
|
||||||
if ($cache) {
|
if ($cache) {
|
||||||
$result = Cache::get("Probe::uri:".$network.":".$uri);
|
$result = Cache::get('Probe::uri:' . $network . ':' . $uri);
|
||||||
if (!is_null($result)) {
|
if (!is_null($result)) {
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
@ -343,28 +343,28 @@ class Probe
|
||||||
$data = $ap_profile;
|
$data = $ap_profile;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isset($data["url"])) {
|
if (!isset($data['url'])) {
|
||||||
$data["url"] = $uri;
|
$data['url'] = $uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (x($data, "photo")) {
|
if (x($data, 'photo')) {
|
||||||
$data["baseurl"] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, "baseurl", "")), Strings::normaliseLink($data["photo"]));
|
$data['baseurl'] = Network::getUrlMatch(Strings::normaliseLink(defaults($data, 'baseurl', '')), Strings::normaliseLink($data['photo']));
|
||||||
} else {
|
} else {
|
||||||
$data["photo"] = System::baseUrl().'/images/person-300.jpg';
|
$data['photo'] = System::baseUrl() . '/images/person-300.jpg';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($data["name"])) {
|
if (empty($data['name'])) {
|
||||||
if (!empty($data["nick"])) {
|
if (!empty($data['nick'])) {
|
||||||
$data["name"] = $data["nick"];
|
$data['name'] = $data['nick'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!x($data, "name")) {
|
if (!x($data, 'name')) {
|
||||||
$data["name"] = $data["url"];
|
$data['name'] = $data['url'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($data["nick"])) {
|
if (empty($data['nick'])) {
|
||||||
$data["nick"] = strtolower($data["name"]);
|
$data['nick'] = strtolower($data['name']);
|
||||||
|
|
||||||
if (strpos($data['nick'], ' ')) {
|
if (strpos($data['nick'], ' ')) {
|
||||||
$data['nick'] = trim(substr($data['nick'], 0, strpos($data['nick'], ' ')));
|
$data['nick'] = trim(substr($data['nick'], 0, strpos($data['nick'], ' ')));
|
||||||
|
|
@ -372,42 +372,44 @@ class Probe
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!empty(self::$baseurl)) {
|
if (!empty(self::$baseurl)) {
|
||||||
$data["baseurl"] = self::$baseurl;
|
$data['baseurl'] = self::$baseurl;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($data["network"])) {
|
if (empty($data['network'])) {
|
||||||
$data["network"] = Protocol::PHANTOM;
|
$data['network'] = Protocol::PHANTOM;
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = self::rearrangeData($data);
|
$data = self::rearrangeData($data);
|
||||||
|
|
||||||
// Only store into the cache if the value seems to be valid
|
// Only store into the cache if the value seems to be valid
|
||||||
if (!in_array($data['network'], [Protocol::PHANTOM, Protocol::MAIL])) {
|
if (!in_array($data['network'], [Protocol::PHANTOM, Protocol::MAIL])) {
|
||||||
Cache::set("Probe::uri:".$network.":".$uri, $data, Cache::DAY);
|
Cache::set('Probe::uri:' . $network . ':' . $uri, $data, Cache::DAY);
|
||||||
|
|
||||||
/// @todo temporary fix - we need a real contact update function that updates only changing fields
|
/// @todo temporary fix - we need a real contact update function that updates only changing fields
|
||||||
/// The biggest problem is the avatar picture that could have a reduced image size.
|
/// The biggest problem is the avatar picture that could have a reduced image size.
|
||||||
/// It should only be updated if the existing picture isn't existing anymore.
|
/// It should only be updated if the existing picture isn't existing anymore.
|
||||||
/// We only update the contact when it is no probing for a specific network.
|
/// We only update the contact when it is no probing for a specific network.
|
||||||
if (($data['network'] != Protocol::FEED)
|
if (($data['network'] != Protocol::FEED)
|
||||||
&& ($network == "")
|
&& ($network == '')
|
||||||
&& $data["name"]
|
&& $data['name']
|
||||||
&& $data["nick"]
|
&& $data['nick']
|
||||||
&& $data["url"]
|
&& $data['url']
|
||||||
&& $data["addr"]
|
&& $data['addr']
|
||||||
&& $data["poll"]
|
&& $data['poll']
|
||||||
) {
|
) {
|
||||||
$fields = ['name' => $data['name'],
|
$fields = [
|
||||||
'nick' => $data['nick'],
|
'name' => $data['name'],
|
||||||
'url' => $data['url'],
|
'nick' => $data['nick'],
|
||||||
'addr' => $data['addr'],
|
'url' => $data['url'],
|
||||||
'photo' => $data['photo'],
|
'addr' => $data['addr'],
|
||||||
'keywords' => $data['keywords'],
|
'photo' => $data['photo'],
|
||||||
'location' => $data['location'],
|
'keywords' => $data['keywords'],
|
||||||
'about' => $data['about'],
|
'location' => $data['location'],
|
||||||
'notify' => $data['notify'],
|
'about' => $data['about'],
|
||||||
'network' => $data['network'],
|
'notify' => $data['notify'],
|
||||||
'server_url' => $data['baseurl']];
|
'network' => $data['network'],
|
||||||
|
'server_url' => $data['baseurl']
|
||||||
|
];
|
||||||
|
|
||||||
// This doesn't cover the case when a community isn't a community anymore
|
// This doesn't cover the case when a community isn't a community anymore
|
||||||
if (!empty($data['community']) && $data['community']) {
|
if (!empty($data['community']) && $data['community']) {
|
||||||
|
|
@ -427,7 +429,7 @@ class Probe
|
||||||
|
|
||||||
$fields['updated'] = DateTimeFormat::utcNow();
|
$fields['updated'] = DateTimeFormat::utcNow();
|
||||||
|
|
||||||
$condition = ['nurl' => Strings::normaliseLink($data["url"])];
|
$condition = ['nurl' => Strings::normaliseLink($data['url'])];
|
||||||
|
|
||||||
$old_fields = DBA::selectFirst('gcontact', $fieldnames, $condition);
|
$old_fields = DBA::selectFirst('gcontact', $fieldnames, $condition);
|
||||||
|
|
||||||
|
|
@ -444,25 +446,27 @@ class Probe
|
||||||
|
|
||||||
DBA::update('gcontact', $fields, $condition, $old_fields);
|
DBA::update('gcontact', $fields, $condition, $old_fields);
|
||||||
|
|
||||||
$fields = ['name' => $data['name'],
|
$fields = [
|
||||||
'nick' => $data['nick'],
|
'name' => $data['name'],
|
||||||
'url' => $data['url'],
|
'nick' => $data['nick'],
|
||||||
'addr' => $data['addr'],
|
'url' => $data['url'],
|
||||||
'alias' => $data['alias'],
|
'addr' => $data['addr'],
|
||||||
'keywords' => $data['keywords'],
|
'alias' => $data['alias'],
|
||||||
'location' => $data['location'],
|
'keywords' => $data['keywords'],
|
||||||
'about' => $data['about'],
|
'location' => $data['location'],
|
||||||
'batch' => $data['batch'],
|
'about' => $data['about'],
|
||||||
'notify' => $data['notify'],
|
'batch' => $data['batch'],
|
||||||
'poll' => $data['poll'],
|
'notify' => $data['notify'],
|
||||||
'request' => $data['request'],
|
'poll' => $data['poll'],
|
||||||
'confirm' => $data['confirm'],
|
'request' => $data['request'],
|
||||||
'poco' => $data['poco'],
|
'confirm' => $data['confirm'],
|
||||||
'network' => $data['network'],
|
'poco' => $data['poco'],
|
||||||
'pubkey' => $data['pubkey'],
|
'network' => $data['network'],
|
||||||
'priority' => $data['priority'],
|
'pubkey' => $data['pubkey'],
|
||||||
'writable' => true,
|
'priority' => $data['priority'],
|
||||||
'rel' => Contact::SHARING];
|
'writable' => true,
|
||||||
|
'rel' => Contact::SHARING
|
||||||
|
];
|
||||||
|
|
||||||
$fieldnames = [];
|
$fieldnames = [];
|
||||||
|
|
||||||
|
|
@ -474,7 +478,7 @@ class Probe
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$condition = ['nurl' => Strings::normaliseLink($data["url"]), 'self' => false, 'uid' => 0];
|
$condition = ['nurl' => Strings::normaliseLink($data['url']), 'self' => false, 'uid' => 0];
|
||||||
|
|
||||||
// "$old_fields" will return a "false" when the contact doesn't exist.
|
// "$old_fields" will return a "false" when the contact doesn't exist.
|
||||||
// This won't trigger an insert. This is intended, since we only need
|
// This won't trigger an insert. This is intended, since we only need
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue