strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' of https://github.com/friendica/friendica into develop

Browse source
This commit is contained in:
Ralf Thees 2018-10-01 17:08:37 +02:00
commit 939466d5a7
3 changed files with 48 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/admin.php
View file

@ -909,6 +909,15 @@ function admin_page_summary(App $a)
$queues = ['label' => L10n::t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue]; $queues = ['label' => L10n::t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue];
$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'); $t = get_markup_template('admin/summary.tpl');
return replace_macros($t, [ return replace_macros($t, [
'$title' => L10n::t('Administration'), '$title' => L10n::t('Administration'),
@ -923,6 +932,7 @@ function admin_page_summary(App $a)
'$codename' => FRIENDICA_CODENAME, '$codename' => FRIENDICA_CODENAME,
'$build' => Config::get('system', 'build'), '$build' => Config::get('system', 'build'),
'$addons' => [L10n::t('Active addons'), $a->addons], '$addons' => [L10n::t('Active addons'), $a->addons],
'$serversettings' => $server_settings,
'$showwarning' => $showwarning, '$showwarning' => $showwarning,
'$warningtext' => $warningtext '$warningtext' => $warningtext
]); ]);

17
view/templates/admin/summary.tpl
View file

@ -44,5 +44,22 @@
<dd> {{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}</dt> <dd> {{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}</dt>
</dl> </dl>
<dl>
<dt>{{$serversettings.label}}</dt>
<dd>
<table>
<tbody>
<tr><td colspan="2"><b>PHP</b></td></tr>
{{foreach $serversettings.php as $k => $p}}
<tr><td>{{$k}}</td><td>{{$p}}</td></tr>
{{/foreach}}
<tr><td colspan="2"><b>MySQL / MariaDB</b></td></tr>
{{foreach $serversettings.mysql as $k => $p}}
<tr><td>{{$k}}</td><td>{{$p}}</td></tr>
{{/foreach}}
</tbody>
</table>
</dd>
</dl>
</div> </div>

21
view/theme/frio/templates/admin/summary.tpl
View file

@ -57,6 +57,27 @@
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$version.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$version.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry">{{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry">{{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}</div>
</div> </div>
{{* 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">{{$serversettings.label}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry">
<table class="table">
<tbody>
<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>
</table>
</div>
</div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>