Merge pull request #8142 from nupplaphil/task/di_config

[friendica.git] / src / Module / Admin / Federation.php

diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php
index cc0067808fb22758c303dbe27d591c6c1c1d5c8d..0d83cc41a1e2507337158a4dbd2b9b333feae2a3 100644 (file)
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@ -2,10 +2,9 @@
 
 namespace Friendica\Module\Admin;
 
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Module\BaseAdminModule;
 
 class Federation extends BaseAdminModule
@@ -17,7 +16,7 @@ class Federation extends BaseAdminModule
                // get counts on active federation systems this node is knowing
                // We list the more common systems by name. The rest is counted as "other"
                $systems = [
-                       'Friendica'   => ['name' => 'Friendica', 'color' => '#ffc018'], // orange from the logo
+                       'friendica'   => ['name' => 'Friendica', 'color' => '#ffc018'], // orange from the logo
                        'diaspora'    => ['name' => 'Diaspora', 'color' => '#a1a1a1'], // logo is black and white, makes a gray
                        'funkwhale'   => ['name' => 'Funkwhale', 'color' => '#4082B4'], // From the homepage
                        'gnusocial'   => ['name' => 'GNU Social/Statusnet', 'color' => '#a22430'], // dark red from the logo
@@ -31,7 +30,7 @@ class Federation extends BaseAdminModule
                        'socialhome'  => ['name' => 'SocialHome', 'color' => '#52056b'], // lilac from the Django Image used at the Socialhome homepage
                        'wordpress'   => ['name' => 'WordPress', 'color' => '#016087'], // Background color of the homepage
                        'writefreely' => ['name' => 'WriteFreely', 'color' => '#292929'], // Font color of the homepage
-                       'other'       => ['name' => L10n::t('Other'), 'color' => '#F1007E'], // ActivityPub main color
+                       'other'       => ['name' => DI::l10n()->t('Other'), 'color' => '#F1007E'], // ActivityPub main color
                ];
 
                $platforms = array_keys($systems);
@@ -66,11 +65,11 @@ class Federation extends BaseAdminModule
                        }
                        DBA::close($versions);
 
-                       $platform = $gserver['platform'];
+                       $platform = $gserver['platform'] = strtolower($gserver['platform']);
 
-                       if ($platform == 'Friendika') {
-                               $platform = 'Friendica';
-                       } elseif (in_array($platform, ['Red Matrix', 'redmatrix', 'red'])) {
+                       if ($platform == 'friendika') {
+                               $platform = 'friendica';
+                       } elseif (in_array($platform, ['red matrix', 'redmatrix', 'red'])) {
                                $platform = 'hubzilla';
                        } elseif(stristr($platform, 'pleroma')) {
                                $platform = 'pleroma';
@@ -85,7 +84,7 @@ class Federation extends BaseAdminModule
                        if ($platform != $gserver['platform']) {
                                if ($platform == 'other') {
                                        $versionCounts = $counts[$platform][1] ?? [];
-                                       $versionCounts[] = ['version' => $gserver['platform'] ?: L10n::t('unknown'), 'total' => $gserver['total']];
+                                       $versionCounts[] = ['version' => $gserver['platform'] ?: DI::l10n()->t('unknown'), 'total' => $gserver['total']];
                                        $gserver['version'] = '';
                                } else {
                                        $versionCounts = array_merge($versionCounts, $counts[$platform][1] ?? []);
@@ -96,7 +95,7 @@ class Federation extends BaseAdminModule
                                $gserver['users'] += $counts[$platform][0]['users'] ?? 0;
                        }
 
-                       if ($platform == 'Friendica') {
+                       if ($platform == 'friendica') {
                                $versionCounts = self::reformaFriendicaVersions($versionCounts);
                        } elseif ($platform == 'pleroma') {
                                $versionCounts = self::reformaPleromaVersions($versionCounts);
@@ -113,20 +112,20 @@ class Federation extends BaseAdminModule
                DBA::close($gserver);
 
                // some helpful text
-               $intro = L10n::t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.');
-               $hint = L10n::t('The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here.');
+               $intro = DI::l10n()->t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.');
+               $hint = DI::l10n()->t('The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here.');
 
                // load the template, replace the macros and return the page content
                $t = Renderer::getMarkupTemplate('admin/federation.tpl');
                return Renderer::replaceMacros($t, [
-                       '$title' => L10n::t('Administration'),
-                       '$page' => L10n::t('Federation Statistics'),
+                       '$title' => DI::l10n()->t('Administration'),
+                       '$page' => DI::l10n()->t('Federation Statistics'),
                        '$intro' => $intro,
                        '$hint' => $hint,
-                       '$autoactive' => Config::get('system', 'poco_completion'),
+                       '$autoactive' => DI::config()->get('system', 'poco_completion'),
                        '$counts' => $counts,
                        '$version' => FRIENDICA_VERSION,
-                       '$legendtext' => L10n::t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users),
+                       '$legendtext' => DI::l10n()->t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users),
                ]);
        }
 
@@ -247,7 +246,7 @@ class Federation extends BaseAdminModule
                // to the version string for the displayed list.
                foreach ($versionCounts as $key => $value) {
                        if ($versionCounts[$key]['version'] == '') {
-                               $versionCounts[$key] = ['total' => $versionCounts[$key]['total'], 'version' => L10n::t('unknown')];
+                               $versionCounts[$key] = ['total' => $versionCounts[$key]['total'], 'version' => DI::l10n()->t('unknown')];
                        }
                }