From d473e260bd5df34033673c631c50956980440cea Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Sun, 6 Jan 2019 16:27:30 +0100 Subject: [PATCH] Improved information in the system tab on the admin panel index Closes #2793 --- .../install/files/acp/templates/index.tpl | 56 +++++++++++++++---- .../files/lib/acp/page/IndexPage.class.php | 6 +- wcfsetup/install/lang/de.xml | 8 ++- wcfsetup/install/lang/en.xml | 8 ++- 4 files changed, 65 insertions(+), 13 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl index dbdf4da9a9..4b034133aa 100644 --- a/wcfsetup/install/files/acp/templates/index.tpl +++ b/wcfsetup/install/files/acp/templates/index.tpl @@ -79,6 +79,10 @@

{lang}wcf.acp.index.system.software{/lang}

+
+
{lang}wcf.acp.index.system.software.version{/lang}
+
{@WCF_VERSION}
+
{lang}wcf.acp.index.system.software.apiVersion{/lang}
{@WSC_API_VERSION}
@@ -91,6 +95,11 @@ {/if} {event name='softwareFields'} + +
+
{lang}wcf.acp.index.system.software.databaseNumber{/lang}
+
{@WCF_N}
+
@@ -107,7 +116,25 @@
-
{lang}wcf.acp.index.system.php{/lang}
+
{lang}wcf.acp.index.system.mySQLVersion{/lang}
+
{$server[mySQLVersion]}
+
+ + {if $server[load]} +
+
{lang}wcf.acp.index.system.load{/lang}
+
{$server[load]}
+
+ {/if} + + {event name='serverFields'} +
+ +
+

{lang}wcf.acp.index.system.php{/lang}

+ +
+
{lang}wcf.acp.index.system.php.version{/lang}
{if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage') && $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage')} {PHP_VERSION} @@ -118,18 +145,27 @@
-
{lang}wcf.acp.index.system.mySQLVersion{/lang}
-
{$server[mySQLVersion]}
+
memory_limit
+
+ {$server[memoryLimit]} +
- {if $server[load]} -
-
{lang}wcf.acp.index.system.load{/lang}
-
{$server[load]}
-
- {/if} +
+
post_max_size
+
+ {$server[postMaxSize]} +
+
- {event name='serverFields'} +
+
{lang}wcf.acp.index.system.php.sslSupport{/lang}
+
+ {if $server[sslSupport]}{lang}wcf.acp.index.system.php.sslSupport.available{/lang}{else}{lang}wcf.acp.index.system.php.sslSupport.notAvailable{/lang}{/if} +
+
+ + {event name='phpFields'}
{event name='systemFieldsets'} diff --git a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php index 8019c84bcf..b5cdbc77f6 100755 --- a/wcfsetup/install/files/lib/acp/page/IndexPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/IndexPage.class.php @@ -3,6 +3,7 @@ namespace wcf\acp\page; use wcf\page\AbstractPage; use wcf\system\application\ApplicationHandler; use wcf\system\cache\builder\OptionCacheBuilder; +use wcf\system\io\RemoteFile; use wcf\system\package\PackageInstallationDispatcher; use wcf\system\request\LinkHandler; use wcf\system\WCF; @@ -32,7 +33,10 @@ class IndexPage extends AbstractPage { 'os' => PHP_OS, 'webserver' => isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : '', 'mySQLVersion' => WCF::getDB()->getVersion(), - 'load' => '' + 'load' => '', + 'memoryLimit' => @ini_get('memory_limit'), + 'postMaxSize' => @ini_get('post_max_size'), + 'sslSupport' => RemoteFile::supportsSSL() ]; // get load diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 8961bfdb4a..dcb300669b 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -861,12 +861,18 @@ + + - + + + + + diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 12383d5f53..941dc0a4e0 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -838,12 +838,18 @@ + + - + + + + + -- 2.20.1