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

Merge pull request #8108 from annando/server-detection

Browse source 
Improved server platform detection
This commit is contained in:
Tobias Diekershoff 2020-01-13 08:00:01 +01:00 committed by GitHub
commit c84a8ebe78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Model/GServer.php
View file

@ -931,6 +931,11 @@ class GServer
$serverdata['site_name'] = $data['title']; $serverdata['site_name'] = $data['title'];
} }
if (!empty($data['title']) && empty($serverdata['platform']) && empty($serverdata['network'])) {
$serverdata['platform'] = 'mastodon';
$serverdata['network'] = Protocol::ACTIVITYPUB;
}
if (!empty($data['description'])) { if (!empty($data['description'])) {
$serverdata['info'] = trim($data['description']); $serverdata['info'] = trim($data['description']);
} }
@ -944,9 +949,14 @@ class GServer
$serverdata['version'] = $matches[2]; $serverdata['version'] = $matches[2];
} }
if (!empty($serverdata['version']) && strstr($serverdata['version'], 'Pleroma')) { if (!empty($serverdata['version']) && strstr(strtolower($serverdata['version']), 'pleroma')) {
$serverdata['platform'] = 'pleroma';
$serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['version']));
}
if (!empty($serverdata['platform']) && strstr($serverdata['platform'], 'pleroma')) {
$serverdata['version'] = trim(str_ireplace('pleroma', '', $serverdata['platform']));
$serverdata['platform'] = 'pleroma'; $serverdata['platform'] = 'pleroma';
$serverdata['version'] = trim(str_replace('Pleroma', '', $serverdata['version']));
} }
return $serverdata; return $serverdata;
@ -1203,10 +1213,8 @@ class GServer
$serverdata['network'] = Protocol::ACTIVITYPUB; $serverdata['network'] = Protocol::ACTIVITYPUB;
} }
} }
if (($attr['name'] == 'generator') && (empty($serverdata['platform']) || (substr(strtolower($attr['content']), 0, 9) == 'wordpress'))) {
if ($attr['name'] == 'generator') {
$serverdata['platform'] = strtolower($attr['content']); $serverdata['platform'] = strtolower($attr['content']);
$version_part = explode(' ', $attr['content']); $version_part = explode(' ', $attr['content']);
if (count($version_part) == 2) { if (count($version_part) == 2) {