// Added informations to AdminInformation tab (memory limit and max execution time)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16826 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger committed 2012-08-13 15:19:37 +00:00
1 parent 10296817c9
commit 7bed77fec3
2 files changed
+13 -7

No files matched your search

@@ -77,23 +77,24 @@
<br /> <br />
<fieldset> <fieldset>
<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Information about your configuration'}</legend> <legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Information about your configuration'}</legend>
<h3>{l s='Server information'}</h3> <h3>{l s='Server information'}</h3>
<p>
<b>{l s='Prestashop version'}:</b> {$version.ps|escape:'htmlall':'UTF-8'}
</p>
{if count($uname)} {if count($uname)}
<p> <p>
<b>{l s='Server information'}:</b> {$uname|escape:'htmlall':'UTF-8'} <b>{l s='Server information'}:</b> {$uname|escape:'htmlall':'UTF-8'}
</p> </p>
{/if} {/if}
<p> <p>
<b>{l s='Server software version'}:</b> {$version.server|escape:'htmlall':'UTF-8'} <b>{l s='Server software version'}:</b> {$version.server|escape:'htmlall':'UTF-8'}
</p> </p>
<p> <p>
<b>{l s='PHP version'}:</b> {$version.php|escape:'htmlall':'UTF-8'} <b>{l s='PHP version'}:</b> {$version.php|escape:'htmlall':'UTF-8'}
</p> </p>
<p>
<b>{l s='Memory limit'}:</b> {$version.memory_limit|escape:'htmlall':'UTF-8'}
</p>
<p>
<b>{l s='Max execution time'}:</b> {$version.max_execution_time|escape:'htmlall':'UTF-8'}
</p>
{if $apache_instaweb} {if $apache_instaweb}
<p style="color:red;font-weight:700">{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p> <p style="color:red;font-weight:700">{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
{/if} {/if}
@@ -112,6 +113,9 @@
<hr /> <hr />
<h3>{l s='Store information'}</h3> <h3>{l s='Store information'}</h3>
<p>
<b>{l s='Prestashop version'}:</b> {$shop.ps|escape:'htmlall':'UTF-8'}
</p>
<p> <p>
<b>{l s='Shop URL'}:</b> {$shop.url|escape:'htmlall':'UTF-8'} <b>{l s='Shop URL'}:</b> {$shop.url|escape:'htmlall':'UTF-8'}
</p> </p>
@@ -38,8 +38,9 @@ class AdminInformationControllerCore extends AdminController
$this->tpl_view_vars = array( $this->tpl_view_vars = array(
'version' => array( 'version' => array(
'php' => phpversion(), 'php' => phpversion(),
'ps' => _PS_VERSION_,
'server' => $_SERVER['SERVER_SOFTWARE'], 'server' => $_SERVER['SERVER_SOFTWARE'],
'memory_limit' => ini_get('memory_limit'),
'max_execution_time' => ini_get('max_execution_time')
), ),
'database' => array( 'database' => array(
'version' => Db::getInstance()->getVersion(), 'version' => Db::getInstance()->getVersion(),
@@ -49,6 +50,7 @@ class AdminInformationControllerCore extends AdminController
'uname' => function_exists('php_uname') ? php_uname('s').' '.php_uname('v').' '.php_uname('m') : '', 'uname' => function_exists('php_uname') ? php_uname('s').' '.php_uname('v').' '.php_uname('m') : '',
'apache_instaweb' => Tools::apacheModExists('mod_instaweb'), 'apache_instaweb' => Tools::apacheModExists('mod_instaweb'),
'shop' => array( 'shop' => array(
'ps' => _PS_VERSION_,
'url' => Tools::getHttpHost(true).__PS_BASE_URI__, 'url' => Tools::getHttpHost(true).__PS_BASE_URI__,
'theme' => _THEME_NAME_, 'theme' => _THEME_NAME_,
), ),