From f536990fba898ec0302b31e32512dc6471ab9e1b Mon Sep 17 00:00:00 2001
From: dMetzger <damien.metzger@prestashop.com>
Date: Mon, 13 Aug 2012 15:19:37 +0000
Subject: [PATCH] // Added informations to AdminInformation tab (memory limit
 and max execution time)

---
 .../information/helpers/view/view.tpl            | 16 ++++++++++------
 controllers/admin/AdminInformationController.php |  4 +++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
index 9f2a3ca69..933c0de35 100644
--- a/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/information/helpers/view/view.tpl
@@ -77,23 +77,24 @@
 	<br />
 	<fieldset>
 		<legend><img src="../img/t/AdminInformation.gif" alt="" /> {l s='Information about your configuration'}</legend>
-		<h3>{l s='Server information'}</h3>
-		<p>
-			<b>{l s='Prestashop version'}:</b> {$version.ps|escape:'htmlall':'UTF-8'}
-		</p>
-	
+		<h3>{l s='Server information'}</h3>	
 		{if count($uname)}
 		<p>
 			<b>{l s='Server information'}:</b> {$uname|escape:'htmlall':'UTF-8'}
 		</p>
 		{/if}
-	
 		<p>
 			<b>{l s='Server software version'}:</b> {$version.server|escape:'htmlall':'UTF-8'}
 		</p>
 		<p>
 			<b>{l s='PHP version'}:</b> {$version.php|escape:'htmlall':'UTF-8'}
 		</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}
 		<p style="color:red;font-weight:700">{l s='PageSpeed module for Apache installed (mod_instaweb)'}</p>
 		{/if}
@@ -112,6 +113,9 @@
 	
 		<hr />
 		<h3>{l s='Store information'}</h3>
+		<p>
+			<b>{l s='Prestashop version'}:</b> {$shop.ps|escape:'htmlall':'UTF-8'}
+		</p>
 		<p>
 			<b>{l s='Shop URL'}:</b> {$shop.url|escape:'htmlall':'UTF-8'}
 		</p>
diff --git a/controllers/admin/AdminInformationController.php b/controllers/admin/AdminInformationController.php
index 4b5524c11..097fcb62e 100644
--- a/controllers/admin/AdminInformationController.php
+++ b/controllers/admin/AdminInformationController.php
@@ -38,8 +38,9 @@ class AdminInformationControllerCore extends AdminController
 		$this->tpl_view_vars = array(
 			'version' => array(
 				'php' => phpversion(),
-				'ps' => _PS_VERSION_,
 				'server' => $_SERVER['SERVER_SOFTWARE'],
+				'memory_limit' => ini_get('memory_limit'),
+				'max_execution_time' => ini_get('max_execution_time')
 			),
 			'database' => array(
 				'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') : '',
 			'apache_instaweb' => Tools::apacheModExists('mod_instaweb'),
 			'shop' => array(
+				'ps' => _PS_VERSION_,
 				'url' => Tools::getHttpHost(true).__PS_BASE_URI__,
 				'theme' => _THEME_NAME_,
 			),