Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #6114 from annando/server-discovery

Browse source 
Fix wrong server detecting / improved Pleroma version numbers
This commit is contained in:
Hypolite Petovan 2018-11-12 00:12:13 -05:00 committed by GitHub
commit 6e39b93eb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
mod/admin.php
View file

@ -651,6 +651,29 @@ function admin_page_federation(App $a)
$v[$key] = ['total' => $v[$key]['total'], 'version' => L10n::t('unknown')]; $v[$key] = ['total' => $v[$key]['total'], 'version' => L10n::t('unknown')];
} }
} }
// Reformat and compact version numbers
if ($p == 'Pleroma') {
$compacted = [];
foreach ($v as $key => $value) {
$version = $v[$key]['version'];
$parts = explode(' ', trim($version));
do {
$part = array_pop($parts);
} while (!empty($parts) && ((strlen($part) >= 40) || (strlen($part) <= 3)));
if (!empty($part)) {
$compacted[$part] += $v[$key]['total'];
}
}
$v = [];
foreach ($compacted as $version => $total) {
$v[] = ['version' => $version, 'total' => $total];
}
}
// in the DB the Diaspora versions have the format x.x.x.x-xx the last // in the DB the Diaspora versions have the format x.x.x.x-xx the last
// part (-xx) should be removed to clean up the versions from the "head // part (-xx) should be removed to clean up the versions from the "head
// commit" information and combined into a single entry for x.x.x.x // commit" information and combined into a single entry for x.x.x.x

5
src/Network/CurlResult.php
View file

@ -133,6 +133,11 @@ class CurlResult
{ {
$this->isSuccess = ($this->returnCode >= 200 && $this->returnCode <= 299) || $this->errorNumber == 0; $this->isSuccess = ($this->returnCode >= 200 && $this->returnCode <= 299) || $this->errorNumber == 0;
// Everything higher or equal 400 is not a success
if ($this->returnCode >= 400) {
$this->isSuccess = false;
}
if (!$this->isSuccess) { if (!$this->isSuccess) {
Logger::log('error: ' . $this->url . ': ' . $this->returnCode . ' - ' . $this->error, Logger::INFO); Logger::log('error: ' . $this->url . ': ' . $this->returnCode . ' - ' . $this->error, Logger::INFO);
Logger::log('debug: ' . print_r($this->info, true), Logger::DATA); Logger::log('debug: ' . print_r($this->info, true), Logger::DATA);