dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// change page time load calculation

Browse Source
This commit is contained in:
tDidierjean
2012-04-11 11:53:44 +00:00
parent 462385884d
commit 465313a5cd
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/index.php
+3 -1
View File
@@ -25,7 +25,9 @@
* International Registered Trademark & Property of PrestaShop SA * International Registered Trademark & Property of PrestaShop SA
*/ */
$timer_start = microtime(true);
define('_PS_ADMIN_DIR_', getcwd()); define('_PS_ADMIN_DIR_', getcwd());
require(dirname(__FILE__).'/../config/config.inc.php'); require(dirname(__FILE__).'/../config/config.inc.php');
require(dirname(__FILE__).'/functions.php'); require(dirname(__FILE__).'/functions.php');
@@ -38,4 +40,4 @@ if (!isset($_REQUEST['controller']) && isset($_REQUEST['tab']))
$_REQUEST['controller'] = strtolower($_REQUEST['tab']); $_REQUEST['controller'] = strtolower($_REQUEST['tab']);
// Prepare and trigger admin dispatcher // Prepare and trigger admin dispatcher
Dispatcher::getInstance()->dispatch(); Dispatcher::getInstance()->dispatch();
admin-dev/themes/default/template/footer.tpl
+1 -1
View File
@@ -31,7 +31,7 @@
<div id="footer"> <div id="footer">
<div class="footerLeft"> <div class="footerLeft">
<a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a><br /> <a href="http://www.prestashop.com/" target="_blank">PrestaShop&trade; {$ps_version}</a><br />
<span>{l s='Load time: '}{$end_time}s</span> <span>{l s='Load time: '}{number_format(microtime(true) - $timer_start, 3, '.', '')}s</span>
</div> </div>
<div class="footerRight"> <div class="footerRight">
{if $iso_is_fr} {if $iso_is_fr}
classes/controller/AdminController.php
+5 -5
View File
@@ -249,6 +249,8 @@ class AdminControllerCore extends Controller
public function __construct() public function __construct()
{ {
global $timer_start;
$this->timer_start = $timer_start;
// Has to be remove for the next Prestashop version // Has to be remove for the next Prestashop version
global $token; global $token;
@@ -289,6 +291,7 @@ class AdminControllerCore extends Controller
28 => $this->l('Zone assigned to the selection successfully'), 28 => $this->l('Zone assigned to the selection successfully'),
29 => $this->l('Upgrade successful') 29 => $this->l('Upgrade successful')
); );
if (!$this->identifier) $this->identifier = 'id_'.$this->table; if (!$this->identifier) $this->identifier = 'id_'.$this->table;
if (!$this->_defaultOrderBy) $this->_defaultOrderBy = $this->identifier; if (!$this->_defaultOrderBy) $this->_defaultOrderBy = $this->identifier;
$this->tabAccess = Profile::getProfileAccess($this->context->employee->id_profile, $this->id); $this->tabAccess = Profile::getProfileAccess($this->context->employee->id_profile, $this->id);
@@ -411,8 +414,7 @@ class AdminControllerCore extends Controller
if ($field = $this->filterToField($key, $filter)) if ($field = $this->filterToField($key, $filter))
{ {
$type = (array_key_exists('filter_type', $field) ? $field['filter_type'] : (array_key_exists('type', $field) ? $field['type'] : false)); $type = (array_key_exists('filter_type', $field) ? $field['filter_type'] : (array_key_exists('type', $field) ? $field['type'] : false)); if (($type == 'date' || $type == 'datetime') && is_string($value))
if (($type == 'date' || $type == 'datetime') && is_string($value))
$value = unserialize($value); $value = unserialize($value);
$key = isset($tmp_tab[1]) ? $tmp_tab[0].'.`'.$tmp_tab[1].'`' : '`'.$tmp_tab[0].'`'; $key = isset($tmp_tab[1]) ? $tmp_tab[0].'.`'.$tmp_tab[1].'`' : '`'.$tmp_tab[0].'`';
@@ -1369,7 +1371,7 @@ class AdminControllerCore extends Controller
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'ps_version' => _PS_VERSION_, 'ps_version' => _PS_VERSION_,
'end_time' => number_format(microtime(true) - $this->timerStart, 3, '.', ''), 'timer_start' => $this->timer_start,
'iso_is_fr' => strtoupper($this->context->language->iso_code) == 'FR', 'iso_is_fr' => strtoupper($this->context->language->iso_code) == 'FR',
)); ));
} }
@@ -1588,8 +1590,6 @@ class AdminControllerCore extends Controller
$protocol_content = (isset($useSSL) && $useSSL && Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://'; $protocol_content = (isset($useSSL) && $useSSL && Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://';
$this->context->link = new Link($protocol_link, $protocol_content); $this->context->link = new Link($protocol_link, $protocol_content);
$this->timerStart = microtime(true);
if (isset($_GET['logout'])) if (isset($_GET['logout']))
$this->context->employee->logout(); $this->context->employee->logout();