makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIME

Browse source 
PHPBB3-12687
This commit is contained in:
Tristan Darricau 2014-06-10 18:24:58 +02:00
parent 1e769ba87f
commit 06e6c91513
2 changed files with 59 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
phpBB/includes/functions.php
View file

@ -5029,6 +5029,63 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
return; return;
} }
/**
* Set the DEBUG_OUTPUT template var
*/
function display_debug_output()
{
global $starttime, $template, $db, $config, $auth, $user, $request;
if ($request->variable('explain', false) && $auth->acl_get('a_') && defined('DEBUG') && method_exists($db, 'sql_report'))
{
$db->sql_report('display');
}
$debug_info = array();
// Output page creation time
if (defined('PHPBB_DISPLAY_LOAD_TIME'))
{
$mtime = explode(' ', microtime());
$totaltime = $mtime[0] + $mtime[1] - $starttime;
$debug_info[] = sprintf('Time : %.3fs', $totaltime);
$debug_info[] = $db->sql_num_queries() . ' Queries';
if ($auth->acl_get('a_'))
{
if (function_exists('memory_get_peak_usage'))
{
if ($memory_usage = memory_get_peak_usage())
{
$memory_usage = get_formatted_filesize($memory_usage);
$debug_info[] = 'Peak Memory Usage: ' . $memory_usage;
}
}
}
}
if (defined('DEBUG'))
{
$debug_info[] = 'GZIP : ' . (($config['gzip_compress'] && @extension_loaded('zlib')) ? 'On' : 'Off');
if ($user->load)
{
$debug_info[] = 'Load : ' . $user->load;
}
if ($auth->acl_get('a_'))
{
$debug_info[] = '<a href="' . build_url() . '&amp;explain=1">Explain</a>';
}
}
$template->assign_vars(array(
'DEBUG_OUTPUT' => implode(' | ', $debug_info),
));
}
/** /**
* Generate page footer * Generate page footer
* *
@ -5061,43 +5118,9 @@ function page_footer($run_cron = true, $display_template = true, $exit_handler =
return; return;
} }
// Output page creation time display_debug_output();
if (defined('DISPLAY_LOAD_TIME'))
{
$mtime = explode(' ', microtime());
$totaltime = $mtime[0] + $mtime[1] - $starttime;
if ($request->variable('explain', false) && $auth->acl_get('a_') && defined('DEBUG') && method_exists($db, 'sql_report'))
{
$db->sql_report('display');
}
$debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress'] && @extension_loaded('zlib')) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime);
if ($auth->acl_get('a_'))
{
if (defined('DISPLAY_LOAD_TIME'))
{
if (function_exists('memory_get_peak_usage'))
{
if ($memory_usage = memory_get_peak_usage())
{
$memory_usage = get_formatted_filesize($memory_usage);
$debug_output .= ' | Peak Memory Usage: ' . $memory_usage;
}
}
}
if (defined('DEBUG'))
{
$debug_output .= ' | <a href="' . build_url() . '&amp;explain=1">Explain</a>';
}
}
}
$template->assign_vars(array( $template->assign_vars(array(
'DEBUG_OUTPUT' => (defined('DISPLAY_LOAD_TIME')) ? $debug_output : '',
'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited'), 'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited'),

36
phpBB/includes/functions_acp.php
View file

@ -146,43 +146,9 @@ function adm_page_footer($copyright_html = true)
return; return;
} }
// Output page creation time display_debug_output();
if (defined('DISPLAY_LOAD_TIME'))
{
$mtime = explode(' ', microtime());
$totaltime = $mtime[0] + $mtime[1] - $starttime;
if ($request->variable('explain', false) && $auth->acl_get('a_') && defined('DEBUG') && method_exists($db, 'sql_report'))
{
$db->sql_report('display');
}
$debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime);
if ($auth->acl_get('a_'))
{
if (defined('DISPLAY_LOAD_TIME'))
{
if (function_exists('memory_get_peak_usage'))
{
if ($memory_usage = memory_get_peak_usage())
{
$memory_usage = get_formatted_filesize($memory_usage);
$debug_output .= ' | Peak Memory Usage: ' . $memory_usage;
}
}
}
if (defined('DEBUG'))
{
$debug_output .= ' | <a href="' . build_url() . '&amp;explain=1">Explain</a>';
}
}
}
$template->assign_vars(array( $template->assign_vars(array(
'DEBUG_OUTPUT' => (defined('DISPLAY_LOAD_TIME')) ? $debug_output : '',
'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '',
'S_COPYRIGHT_HTML' => $copyright_html, 'S_COPYRIGHT_HTML' => $copyright_html,
'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited'), 'CREDIT_LINE' => $user->lang('POWERED_BY', '<a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited'),