From 1803862fc54e2968af275841c1e48a66dd0d4aa9 Mon Sep 17 00:00:00 2001
From: Jonny Tischbein <jonny_tischbein@systemli.org>
Date: Thu, 27 Sep 2018 19:46:28 +0200
Subject: [PATCH] associative array + adding mysql value + removing table
 header

---
 mod/admin.php                               | 12 ++++++++++--
 view/theme/frio/templates/admin/summary.tpl | 12 ++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/mod/admin.php b/mod/admin.php
index 0cb30924a8..562845ecc8 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -908,7 +908,15 @@ 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')]];
+
+	$r = q("SHOW variables LIKE 'max_allowed_packet'");
+	$max_allowed_packet = (($r) ? $r[0]['Value'] : 0);
+
+	$server_settings = ['label' => L10n::t('Server Settings'), 
+				'php' => ['upload_max_filesize' => ini_get('upload_max_filesize'), 
+						  'post_max_size' => ini_get('post_max_size'), 
+						  'memory_limit' => ini_get('memory_limit')], 
+				'mysql' => ['max_allowed_packet' => $max_allowed_packet]];
 
 	$t = get_markup_template('admin/summary.tpl');
 	return replace_macros($t, [
@@ -924,7 +932,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,
+		'$serversettings' => $server_settings,
 		'$showwarning' => $showwarning,
 		'$warningtext' => $warningtext
 	]);
diff --git a/view/theme/frio/templates/admin/summary.tpl b/view/theme/frio/templates/admin/summary.tpl
index ff70a0c7cb..3c33f92fdb 100644
--- a/view/theme/frio/templates/admin/summary.tpl
+++ b/view/theme/frio/templates/admin/summary.tpl
@@ -58,15 +58,19 @@
 			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry">{{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}</div>
 		</div>
 
-		{{* PHP Values. *}}
+		{{* Server Settings. *}}
 		<div id="admin-summary-php" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 admin-summary">
 			<hr class="admin-summary-separator">
-			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$php.0}}</div>
+			<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$serversettings.label}}</div>
 			<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry">
 				<table class="table">
-				<thead><tr><td>Configuration</td><td>Value</td></tr></thead>
 				<tbody>
-					{{foreach $php.1 as $k => $p}}
+					<tr class="info"><td colspan="2">PHP</td></tr>
+					{{foreach $serversettings.php as $k => $p}}
+						<tr><td>{{$k}}</td><td>{{$p}}</td></tr>
+					{{/foreach}}
+					<tr class="info"><td colspan="2">MySQL / MariaDB</td></tr>
+					{{foreach $serversettings.mysql as $k => $p}}
 						<tr><td>{{$k}}</td><td>{{$p}}</td></tr>
 					{{/foreach}}
 				</tbody>
-- 
2.39.5