X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FAdmin%2FSummary.php;h=46d1ee9ad1a3f5387a7d85d6fe8a1ba35c941a64;hb=18f54f4425cd849c857ffd3ec00e08cf31f4adec;hp=4c94b6e26ac11beb11e99e75b9275b9996675b28;hpb=b9873a88a5bb19f2d493739a072c6ac3f745e76e;p=friendica.git

diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index 4c94b6e26a..46d1ee9ad1 100644
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -21,28 +21,28 @@
 
 namespace Friendica\Module\Admin;
 
+use Friendica\App;
 use Friendica\Core\Addon;
-use Friendica\Core\Config\Cache;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Update;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
+use Friendica\Core\Config\Factory\Config;
 use Friendica\Model\Register;
 use Friendica\Module\BaseAdmin;
-use Friendica\Module\Update\Profile;
-use Friendica\Network\HTTPException\InternalServerErrorException;
-use Friendica\Render\FriendicaSmarty;
-use Friendica\Util\ConfigFileLoader;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
+use Friendica\Network\HTTPException\ServiceUnavailableException;
+use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
 
 class Summary extends BaseAdmin
 {
-	public static function content(array $parameters = [])
+	protected function content(array $request = []): string
 	{
-		parent::content($parameters);
+		parent::content();
 
 		$a = DI::app();
 
@@ -56,36 +56,38 @@ class Summary extends BaseAdmin
 			$warningtext[] = DI::l10n()->t('Template engine (%s) error: %s', $templateEngine::$name, $error);
 		}
 
-		if (DBA::count(['information_schema' => 'tables'], ['engine' => 'myisam', 'table_schema' => DBA::databaseName()])) {
+		if (DBA::count('information_schema.tables', ['engine' => 'myisam', 'table_schema' => DBA::databaseName()])) {
 			$warningtext[] = DI::l10n()->t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
 		}
 
 		// are there InnoDB tables in Antelope in the DB? If so, trigger a warning message
-		if (DBA::count(['information_schema' => 'tables'], ['ENGINE' => 'InnoDB', 'ROW_FORMAT' => ['COMPACT', 'REDUNDANT'], 'table_schema' => DBA::databaseName()])) {
+		if (DBA::count('information_schema.tables', ['ENGINE' => 'InnoDB', 'ROW_FORMAT' => ['COMPACT', 'REDUNDANT'], 'table_schema' => DBA::databaseName()])) {
 			$warningtext[] = DI::l10n()->t('Your DB still runs with InnoDB tables in the Antelope file format. You should change the file format to Barracuda. Friendica is using features that are not provided by the Antelope format. See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php bin/console.php dbstructure toinnodb</tt> of your Friendica installation for an automatic conversion.<br />', 'https://dev.mysql.com/doc/refman/5.7/en/innodb-file-format.html');
 		}
 
 		// Avoid the database error 1615 "Prepared statement needs to be re-prepared", see https://github.com/friendica/friendica/issues/8550
-		$table_definition_cache = DBA::getVariable('table_definition_cache');
-		$table_open_cache = DBA::getVariable('table_open_cache');
-		if (!empty($table_definition_cache) && !empty($table_open_cache)) {
-			$suggested_definition_cache = min(400 + round($table_open_cache / 2, 1), 2000);
-			if ($suggested_definition_cache > $table_definition_cache) {
-				$warningtext[] = DI::l10n()->t('Your table_definition_cache is too low (%d). This can lead to the database error "Prepared statement needs to be re-prepared". Please set it at least to %d (or -1 for autosizing). See <a href="%s">here</a> for more information.<br />', $table_definition_cache, $suggested_definition_cache, 'https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_table_definition_cache');
+		if (!DI::config()->get('database', 'pdo_emulate_prepares')) {
+			$table_definition_cache = DBA::getVariable('table_definition_cache');
+			$table_open_cache = DBA::getVariable('table_open_cache');
+			if (!empty($table_definition_cache) && !empty($table_open_cache)) {
+				$suggested_definition_cache = min(400 + round($table_open_cache / 2, 1), 2000);
+				if ($suggested_definition_cache > $table_definition_cache) {
+					$warningtext[] = DI::l10n()->t('Your table_definition_cache is too low (%d). This can lead to the database error "Prepared statement needs to be re-prepared". Please set it at least to %d. See <a href="%s">here</a> for more information.<br />', $table_definition_cache, $suggested_definition_cache, 'https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_table_definition_cache');
+				}
 			}
 		}
 
-		// Check if github.com/friendica/master/VERSION is higher then
-		// the local version of Friendica. Check is opt-in, source may be master or devel branch
+		// Check if github.com/friendica/stable/VERSION is higher then
+		// the local version of Friendica. Check is opt-in, source may be stable or develop branch
 		if (DI::config()->get('system', 'check_new_version_url', 'none') != 'none') {
 			$gitversion = DI::config()->get('system', 'git_friendica_version');
-			if (version_compare(FRIENDICA_VERSION, $gitversion) < 0) {
-				$warningtext[] = DI::l10n()->t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s', FRIENDICA_VERSION, $gitversion);
+			if (version_compare(App::VERSION, $gitversion) < 0) {
+				$warningtext[] = DI::l10n()->t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s', App::VERSION, $gitversion);
 			}
 		}
 
 		if (DI::config()->get('system', 'dbupdate', DBStructure::UPDATE_NOT_CHECKED) == DBStructure::UPDATE_NOT_CHECKED) {
-			DBStructure::update($a->getBasePath(), false, true);
+			DBStructure::performUpdate();
 		}
 
 		if (DI::config()->get('system', 'dbupdate') == DBStructure::UPDATE_FAILED) {
@@ -114,7 +116,7 @@ class Summary extends BaseAdmin
 
 		// Check server vitality
 		if (!self::checkSelfHostMeta()) {
-			$well_known = DI::baseUrl()->get() . '/.well-known/host-meta';
+			$well_known = DI::baseUrl()->get() . Probe::HOST_META;
 			$warningtext[] = DI::l10n()->t('<a href="%s">%s</a> is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See <a href="%s">the installation page</a> for help.',
 				$well_known, $well_known, DI::baseUrl()->get() . '/help/Install');
 		}
@@ -129,7 +131,7 @@ class Summary extends BaseAdmin
 				$stream = $fileSystem->createStream($file);
 
 				if (!isset($stream)) {
-					throw new InternalServerErrorException('Stream is null.');
+					throw new ServiceUnavailableException('Stream is null.');
 				}
 
 			} catch (\Throwable $exception) {
@@ -143,7 +145,7 @@ class Summary extends BaseAdmin
 					$stream = $fileSystem->createStream($file);
 
 					if (!isset($stream)) {
-						throw new InternalServerErrorException('Stream is null.');
+						throw new ServiceUnavailableException('Stream is null.');
 					}
 				}
 			} catch (\Throwable $exception) {
@@ -152,7 +154,7 @@ class Summary extends BaseAdmin
 		}
 
 		// check legacy basepath settings
-		$configLoader = new ConfigFileLoader($a->getBasePath());
+		$configLoader = (new Config())->createConfigFileLoader($a->getBasePath(), $_SERVER);
 		$configCache = new Cache();
 		$configLoader->setupCache($configCache);
 		$confBasepath = $configCache->get('system', 'basepath');
@@ -185,27 +187,6 @@ class Summary extends BaseAdmin
 			}
 		}
 
-		$accounts = [
-			[DI::l10n()->t('Normal Account'), 0],
-			[DI::l10n()->t('Automatic Follower Account'), 0],
-			[DI::l10n()->t('Public Forum Account'), 0],
-			[DI::l10n()->t('Automatic Friend Account'), 0],
-			[DI::l10n()->t('Blog Account'), 0],
-			[DI::l10n()->t('Private Forum Account'), 0]
-		];
-
-		$users = 0;
-		$pageFlagsCountStmt = DBA::p('SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`');
-		while ($pageFlagsCount = DBA::fetch($pageFlagsCountStmt)) {
-			$accounts[$pageFlagsCount['page-flags']][1] = $pageFlagsCount['count'];
-			$users += $pageFlagsCount['count'];
-		}
-		DBA::close($pageFlagsCountStmt);
-
-		Logger::debug('accounts', ['accounts' => $accounts]);
-
-		$pending = Register::getPendingCount();
-
 		$deferred = DBA::count('workerqueue', ['NOT `done` AND `retrial` > ?', 0]);
 
 		$workerqueue = DBA::count('workerqueue', ['NOT `done` AND `retrial` = ?', 0]);
@@ -218,10 +199,10 @@ class Summary extends BaseAdmin
 
 		$server_settings = [
 			'label' => DI::l10n()->t('Server Settings'),
-			'php' => [
+			'php'   => [
 				'upload_max_filesize' => ini_get('upload_max_filesize'),
-				'post_max_size' => ini_get('post_max_size'),
-				'memory_limit' => ini_get('memory_limit')
+				'post_max_size'       => ini_get('post_max_size'),
+				'memory_limit'        => ini_get('memory_limit')
 			],
 			'mysql' => [
 				'max_allowed_packet' => $max_allowed_packet
@@ -230,26 +211,23 @@ class Summary extends BaseAdmin
 
 		$t = Renderer::getMarkupTemplate('admin/summary.tpl');
 		return Renderer::replaceMacros($t, [
-			'$title' => DI::l10n()->t('Administration'),
-			'$page' => DI::l10n()->t('Summary'),
-			'$queues' => $queues,
-			'$users' => [DI::l10n()->t('Registered users'), $users],
-			'$accounts' => $accounts,
-			'$pending' => [DI::l10n()->t('Pending registrations'), $pending],
-			'$version' => [DI::l10n()->t('Version'), FRIENDICA_VERSION],
-			'$platform' => FRIENDICA_PLATFORM,
-			'$codename' => FRIENDICA_CODENAME,
-			'$build' => DI::config()->get('system', 'build'),
-			'$addons' => [DI::l10n()->t('Active addons'), Addon::getEnabledList()],
+			'$title'          => DI::l10n()->t('Administration'),
+			'$page'           => DI::l10n()->t('Summary'),
+			'$queues'         => $queues,
+			'$version'        => [DI::l10n()->t('Version'), App::VERSION],
+			'$platform'       => App::PLATFORM,
+			'$codename'       => App::CODENAME,
+			'$build'          => DI::config()->get('system', 'build'),
+			'$addons'         => [DI::l10n()->t('Active addons'), Addon::getEnabledList()],
 			'$serversettings' => $server_settings,
-			'$warningtext' => $warningtext
+			'$warningtext'    => $warningtext,
 		]);
 	}
 
 	private static function checkSelfHostMeta()
 	{
 		// Fetch the host-meta to check if this really is a vital server
-		return Network::curl(DI::baseUrl()->get() . '/.well-known/host-meta')->isSuccess();
+		return DI::httpClient()->get(DI::baseUrl()->get() . Probe::HOST_META, HttpClientAccept::XRD_XML)->isSuccess();
 	}
 
 }