Improved information in the system tab on the admin panel index

Closes #2793

diff --git a/wcfsetup/install/files/acp/templates/index.tpl b/wcfsetup/install/files/acp/templates/index.tpl
index dbdf4da9a9ff881fe5efcfe1939f5c5b5a3bd471..4b034133aab09fc35e020c2d9c1c208531e96c00 100644 (file)
--- a/wcfsetup/install/files/acp/templates/index.tpl
+++ b/wcfsetup/install/files/acp/templates/index.tpl
@@ -79,6 +79,10 @@
                <section class="section">
                        <h2 class="sectionTitle">{lang}wcf.acp.index.system.software{/lang}</h2>
                        
+                       <dl>
+                               <dt>{lang}wcf.acp.index.system.software.version{/lang}</dt>
+                               <dd>{@WCF_VERSION}</dd>
+                       </dl>
                        <dl>
                                <dt>{lang}wcf.acp.index.system.software.apiVersion{/lang}</dt>
                                <dd>{@WSC_API_VERSION}</dd>
@@ -91,6 +95,11 @@
                        {/if}
                        
                        {event name='softwareFields'}
+                       
+                       <dl>
+                               <dt>{lang}wcf.acp.index.system.software.databaseNumber{/lang}</dt>
+                               <dd>{@WCF_N}</dd>
+                       </dl>
                </section>
                
                <section class="section">
@@ -107,7 +116,25 @@
                        </dl>
                        
                        <dl>
-                               <dt>{lang}wcf.acp.index.system.php{/lang}</dt>
+                               <dt>{lang}wcf.acp.index.system.mySQLVersion{/lang}</dt>
+                               <dd>{$server[mySQLVersion]}</dd>
+                       </dl>
+                       
+                       {if $server[load]}
+                               <dl>
+                                       <dt>{lang}wcf.acp.index.system.load{/lang}</dt>
+                                       <dd>{$server[load]}</dd>
+                               </dl>
+                       {/if}
+                       
+                       {event name='serverFields'}
+               </section>
+               
+               <section class="section">
+                       <h2 class="sectionTitle">{lang}wcf.acp.index.system.php{/lang}</h2>
+                       
+                       <dl>
+                               <dt>{lang}wcf.acp.index.system.php.version{/lang}</dt>
                                <dd>
                                        {if $__wcf->session->getPermission('admin.configuration.package.canInstallPackage') && $__wcf->session->getPermission('admin.configuration.package.canUpdatePackage')}
                                                <a href="{link controller='PHPInfo'}{/link}">{PHP_VERSION}</a>
@@ -118,18 +145,27 @@
                        </dl>
                        
                        <dl>
-                               <dt>{lang}wcf.acp.index.system.mySQLVersion{/lang}</dt>
-                               <dd>{$server[mySQLVersion]}</dd>
+                               <dt>memory_limit</dt>
+                               <dd>
+                                       {$server[memoryLimit]}
+                               </dd>
                        </dl>
                        
-                       {if $server[load]}
-                               <dl>
-                                       <dt>{lang}wcf.acp.index.system.load{/lang}</dt>
-                                       <dd>{$server[load]}</dd>
-                               </dl>
-                       {/if}
+                       <dl>
+                               <dt>post_max_size</dt>
+                               <dd>
+                                       {$server[postMaxSize]}
+                               </dd>
+                       </dl>
                        
-                       {event name='serverFields'}
+                       <dl>
+                               <dt>{lang}wcf.acp.index.system.php.sslSupport{/lang}</dt>
+                               <dd>
+                                       {if $server[sslSupport]}{lang}wcf.acp.index.system.php.sslSupport.available{/lang}{else}{lang}wcf.acp.index.system.php.sslSupport.notAvailable{/lang}{/if}
+                               </dd>
+                       </dl>
+                       
+                       {event name='phpFields'}
                </section>
                
                {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 8019c84bcf2bb0be3fa4e49d9e53dfdf08104d10..b5cdbc77f69bcfa7b8c0882a5f20c315e8d7324b 100755 (executable)
--- 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 8961bfdb4aef8e75a291c7430a2e8c985eb11658..dcb300669b64e7ed42f6097b387944c3047f3026 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -861,12 +861,18 @@
                <item name="wcf.acp.index.setup.title"><![CDATA[Bitte warten]]></item>
                <item name="wcf.acp.index.system"><![CDATA[System]]></item>
                <item name="wcf.acp.index.system.software"><![CDATA[Software]]></item>
+               <item name="wcf.acp.index.system.software.version"><![CDATA[WoltLab Suite&trade; Version]]></item>
                <item name="wcf.acp.index.system.software.apiVersion"><![CDATA[WoltLab Suite&trade; API-Version]]></item>
                <item name="wcf.acp.index.system.software.legacyApiVersions"><![CDATA[Ältere, noch unterstützte API-Versionen]]></item>
+               <item name="wcf.acp.index.system.software.databaseNumber"><![CDATA[Datenbank-Installationsnummer]]></item>
                <item name="wcf.acp.index.system.server"><![CDATA[Server]]></item>
                <item name="wcf.acp.index.system.os"><![CDATA[Betriebssystem]]></item>
                <item name="wcf.acp.index.system.webserver"><![CDATA[Webserver]]></item>
-               <item name="wcf.acp.index.system.php"><![CDATA[PHP-Version]]></item>
+               <item name="wcf.acp.index.system.php"><![CDATA[PHP]]></item>
+               <item name="wcf.acp.index.system.php.version"><![CDATA[PHP-Version]]></item>
+               <item name="wcf.acp.index.system.php.sslSupport"><![CDATA[Unterstützung von SSL-Verbindungen]]></item>
+               <item name="wcf.acp.index.system.php.sslSupport.available"><![CDATA[vorhanden]]></item>
+               <item name="wcf.acp.index.system.php.sslSupport.notAvailable"><![CDATA[nicht vorhanden]]></item>
                <item name="wcf.acp.index.system.mySQLVersion"><![CDATA[MySQL-Version]]></item>
                <item name="wcf.acp.index.system.load"><![CDATA[Aktueller UNIX Load]]></item>
                <item name="wcf.acp.index.woltlab.website"><![CDATA[Website]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 12383d5f5338922e5e971f0e3fc52d2f3d196d7a..941dc0a4e007c8d308763b6709917448002b3b6b 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -838,12 +838,18 @@
                <item name="wcf.acp.index.setup.title"><![CDATA[Please Wait]]></item>
                <item name="wcf.acp.index.system"><![CDATA[System]]></item>
                <item name="wcf.acp.index.system.software"><![CDATA[Software]]></item>
+               <item name="wcf.acp.index.system.software.version"><![CDATA[WoltLab Suite&trade; Version]]></item>
                <item name="wcf.acp.index.system.software.apiVersion"><![CDATA[WoltLab Suite&trade; API-version]]></item>
                <item name="wcf.acp.index.system.software.legacyApiVersions"><![CDATA[Older, still supported, API-versions]]></item>
+               <item name="wcf.acp.index.system.software.databaseNumber"><![CDATA[Database Installation Number]]></item>
                <item name="wcf.acp.index.system.server"><![CDATA[Server]]></item>
                <item name="wcf.acp.index.system.os"><![CDATA[Operating System]]></item>
                <item name="wcf.acp.index.system.webserver"><![CDATA[Web Server]]></item>
-               <item name="wcf.acp.index.system.php"><![CDATA[PHP Version]]></item>
+               <item name="wcf.acp.index.system.php"><![CDATA[PHP]]></item>
+               <item name="wcf.acp.index.system.php.version"><![CDATA[PHP Version]]></item>
+               <item name="wcf.acp.index.system.php.sslSupport"><![CDATA[SSL Support]]></item>
+               <item name="wcf.acp.index.system.php.sslSupport.available"><![CDATA[available]]></item>
+               <item name="wcf.acp.index.system.php.sslSupport.notAvailable"><![CDATA[not available]]></item>
                <item name="wcf.acp.index.system.mySQLVersion"><![CDATA[MySQL Version]]></item>
                <item name="wcf.acp.index.system.load"><![CDATA[Current UNIX Load]]></item>
                <item name="wcf.acp.index.woltlab.website"><![CDATA[Website]]></item>