X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fadmin.php;h=0cb30924a8eb96802c00340b44ce356c95cc47c2;hb=24117c24ce8717a4096a7da54f773a2fd793738b;hp=b2f84d07293249be52d48269d521690fc2f01ba8;hpb=e62c1c3f81495f149f5613dc2c31ca896239949e;p=friendica.git

diff --git a/mod/admin.php b/mod/admin.php
index b2f84d0729..0cb30924a8 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -24,6 +24,7 @@ use Friendica\Module\Tos;
 use Friendica\Util\Arrays;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
+use Friendica\Util\Network;
 
 require_once 'include/enotify.php';
 require_once 'include/text.php';
@@ -868,6 +869,14 @@ function admin_page_summary(App $a)
 		$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.ini.php, please copy config/local-sample.ini.php and move your config from <code>.htconfig.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->get_baseurl() . '/help/Config');
 	}
 
+	// Check server vitality
+	if (!admin_page_server_vital()) {
+		$showwarning = true;
+		$well_known = $a->get_baseurl() . '/.well-known/host-meta';
+		$warningtext[] = 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, $a->get_baseurl() . '/help/Install');
+	}
+
 	$r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`");
 	$accounts = [
 		[L10n::t('Normal Account'), 0],
@@ -899,6 +908,7 @@ function admin_page_summary(App $a)
 
 	$queues = ['label' => L10n::t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue];
 
+	$php_settings = [L10n::t('PHP Values'), ['upload_max_filesize' => ini_get('upload_max_filesize'), 'post_max_size' => ini_get('post_max_size'), 'memory_limit' => ini_get('memory_limit')]];
 
 	$t = get_markup_template('admin/summary.tpl');
 	return replace_macros($t, [
@@ -914,6 +924,7 @@ function admin_page_summary(App $a)
 		'$codename' => FRIENDICA_CODENAME,
 		'$build' => Config::get('system', 'build'),
 		'$addons' => [L10n::t('Active addons'), $a->addons],
+		'$php' => $php_settings,
 		'$showwarning' => $showwarning,
 		'$warningtext' => $warningtext
 	]);
@@ -1689,11 +1700,14 @@ function admin_page_users_post(App $a)
 		$body = sprintf($body, System::baseUrl(), $user['email'], $result['password'], Config::get('config', 'sitename'));
 
 		notification([
-			'type' => SYSTEM_EMAIL,
+			'type'     => SYSTEM_EMAIL,
+			'language' => $user['language'],
+			'to_name'  => $user['username'],
 			'to_email' => $user['email'],
-			'subject' => L10n::t('Registration details for %s', Config::get('config', 'sitename')),
+			'uid'      => $user['uid'],
+			'subject'  => L10n::t('Registration details for %s', Config::get('config', 'sitename')),
 			'preamble' => $preamble,
-			'body' => $body]);
+			'body'     => $body]);
 	}
 
 	if (x($_POST, 'page_users_block')) {
@@ -2541,3 +2555,10 @@ function admin_page_features(App $a)
 		return $o;
 	}
 }
+
+function admin_page_server_vital()
+{
+	// Fetch the host-meta to check if this really is a vital server
+	$serverret = Network::curl(System::baseUrl() . '/.well-known/host-meta');
+	return $serverret["success"];
+}