X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FStatistics.php;h=514f10bb73d768d836fb576d06d29a5c6863b2d0;hb=f8018f8dfe0183ce7c8f7e8460e0d9fbd5b9395b;hp=f4a1334d2ec2edde2ee035c9245da4058304dde2;hpb=0b6e0566d75e145afb92dca61325fd423ed6f2eb;p=friendica.git

diff --git a/src/Module/Statistics.php b/src/Module/Statistics.php
index f4a1334d2e..514f10bb73 100644
--- a/src/Module/Statistics.php
+++ b/src/Module/Statistics.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,33 +21,36 @@
 
 namespace Friendica\Module;
 
+use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\Addon;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\KeyValueStorage\Capabilities\IManageKeyValuePairs;
 use Friendica\Core\L10n;
+use Friendica\Core\System;
 use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Util\Profiler;
 use Psr\Log\LoggerInterface;
 
 class Statistics extends BaseModule
 {
 	/** @var IManageConfigValues */
 	protected $config;
-	/** @var LoggerInterface */
-	protected $logger;
-
-	public function __construct(IManageConfigValues $config, LoggerInterface $logger, L10n $l10n, array $parameters = [])
+	/** @var IManageKeyValuePairs */
+	protected $keyValue;
+	
+	public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, IManageConfigValues $config, IManageKeyValuePairs $keyValue, Response $response, array $server, array $parameters = [])
 	{
-		parent::__construct($l10n, $parameters);
-
-		$this->logger = $logger;
-		$this->config = $config;
+		parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
+		$this->config   = $config;
+		$this->keyValue = $keyValue;
 		if (!$this->config->get("system", "nodeinfo")) {
 			throw new NotFoundException();
 		}
 	}
 
-	public function rawContent()
+	protected function rawContent(array $request = [])
 	{
 		$registration_open =
 			intval($this->config->get('config', 'register_policy')) !== Register::CLOSED
@@ -69,19 +72,17 @@ class Statistics extends BaseModule
 
 		$statistics = array_merge([
 			'name'                  => $this->config->get('config', 'sitename'),
-			'network'               => FRIENDICA_PLATFORM,
-			'version'               => FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
+			'network'               => App::PLATFORM,
+			'version'               => App::VERSION . '-' . DB_UPDATE_VERSION,
 			'registrations_open'    => $registration_open,
-			'total_users'           => $this->config->get('nodeinfo', 'total_users'),
-			'active_users_halfyear' => $this->config->get('nodeinfo', 'active_users_halfyear'),
-			'active_users_monthly'  => $this->config->get('nodeinfo', 'active_users_monthly'),
-			'local_posts'           => $this->config->get('nodeinfo', 'local_posts'),
+			'total_users'           => $this->keyValue->get('nodeinfo_total_users'),
+			'active_users_halfyear' => $this->keyValue->get('nodeinfo_active_users_halfyear'),
+			'active_users_monthly'  => $this->keyValue->get('nodeinfo_active_users_monthly'),
+			'local_posts'           => $this->keyValue->get('nodeinfo_local_posts'),
 			'services'              => $services,
 		], $services);
 
-		header("Content-Type: application/json");
-		echo json_encode($statistics, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
 		$this->logger->debug("statistics.", ['statistics' => $statistics]);
-		exit();
+		System::jsonExit($statistics);
 	}
 }