From 39b76a628b0c485b2ec96bbd2ea1bfea91ca4da3 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 10 Jun 2014 16:13:09 +0200 Subject: [ticket/12687] Add a constant to display the load time without DEBUG PHPBB3-12687 --- phpBB/includes/functions_acp.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'phpBB/includes/functions_acp.php') diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 373eb57934..4d0a20ce1f 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -147,7 +147,7 @@ function adm_page_footer($copyright_html = true) } // Output page creation time - if (defined('DEBUG')) + if (defined('DISPLAY_LOAD_TIME')) { $mtime = explode(' ', microtime()); $totaltime = $mtime[0] + $mtime[1] - $starttime; @@ -159,7 +159,7 @@ function adm_page_footer($copyright_html = true) $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_') && defined('DEBUG')) + if ($auth->acl_get('a_') && defined('DISPLAY_LOAD_TIME')) { if (function_exists('memory_get_peak_usage')) { @@ -176,7 +176,7 @@ function adm_page_footer($copyright_html = true) } $template->assign_vars(array( - 'DEBUG_OUTPUT' => (defined('DEBUG')) ? $debug_output : '', + 'DEBUG_OUTPUT' => (defined('DISPLAY_LOAD_TIME')) ? $debug_output : '', 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'S_COPYRIGHT_HTML' => $copyright_html, 'CREDIT_LINE' => $user->lang('POWERED_BY', 'phpBB® Forum Software © phpBB Limited'), -- cgit v1.2.1 From 1e769ba87f3b2d510ad82e11e971fc2abcf8a8d0 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 10 Jun 2014 17:52:41 +0200 Subject: [ticket/12687] Display the explain link only when DEBUG is set PHPBB3-12687 --- phpBB/includes/functions_acp.php | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'phpBB/includes/functions_acp.php') diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 4d0a20ce1f..357832794d 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -159,19 +159,25 @@ function adm_page_footer($copyright_html = true) $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_') && defined('DISPLAY_LOAD_TIME')) + if ($auth->acl_get('a_')) { - if (function_exists('memory_get_peak_usage')) + if (defined('DISPLAY_LOAD_TIME')) { - if ($memory_usage = memory_get_peak_usage()) + if (function_exists('memory_get_peak_usage')) { - $memory_usage = get_formatted_filesize($memory_usage); + if ($memory_usage = memory_get_peak_usage()) + { + $memory_usage = get_formatted_filesize($memory_usage); - $debug_output .= ' | Peak Memory Usage: ' . $memory_usage; + $debug_output .= ' | Peak Memory Usage: ' . $memory_usage; + } } } - $debug_output .= ' | Explain'; + if (defined('DEBUG')) + { + $debug_output .= ' | Explain'; + } } } -- cgit v1.2.1 From 06e6c915134d11db906d0275c2a75a6280a07ab6 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Tue, 10 Jun 2014 18:24:58 +0200 Subject: [ticket/12687] Rename DISPLAY_LOAD_TIME to PHPBB_DISPLAY_LOAD_TIME PHPBB3-12687 --- phpBB/includes/functions_acp.php | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) (limited to 'phpBB/includes/functions_acp.php') diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 357832794d..86eaf856de 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -146,43 +146,9 @@ function adm_page_footer($copyright_html = true) return; } - // Output page creation time - 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 .= ' | Explain'; - } - } - } + display_debug_output(); $template->assign_vars(array( - 'DEBUG_OUTPUT' => (defined('DISPLAY_LOAD_TIME')) ? $debug_output : '', 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'S_COPYRIGHT_HTML' => $copyright_html, 'CREDIT_LINE' => $user->lang('POWERED_BY', 'phpBB® Forum Software © phpBB Limited'), -- cgit v1.2.1 From ceef85ee0e4e425b5f1a79a378506752d46cef02 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Thu, 12 Jun 2014 14:33:00 +0200 Subject: [ticket/12687] Return a string and move the displaying of the sql report PHPBB3-12687 --- phpBB/includes/functions_acp.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'phpBB/includes/functions_acp.php') diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 86eaf856de..037749f7e9 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -146,9 +146,10 @@ function adm_page_footer($copyright_html = true) return; } - display_debug_output(); + phpbb_check_and_display_sql_report(); $template->assign_vars(array( + 'DEBUG_OUTPUT' => phpbb_generate_debug_output(), 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'S_COPYRIGHT_HTML' => $copyright_html, 'CREDIT_LINE' => $user->lang('POWERED_BY', 'phpBB® Forum Software © phpBB Limited'), -- cgit v1.2.1 From 6c0fd61b1df5e3c1245aa4a8d3c7e991de7a2dbf Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Thu, 12 Jun 2014 23:27:19 +0200 Subject: [ticket/12687] Remove globals PHPBB3-12687 --- phpBB/includes/functions_acp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/includes/functions_acp.php') diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 037749f7e9..8453da6e6e 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -146,10 +146,10 @@ function adm_page_footer($copyright_html = true) return; } - phpbb_check_and_display_sql_report(); + phpbb_check_and_display_sql_report($request, $auth, $db); $template->assign_vars(array( - 'DEBUG_OUTPUT' => phpbb_generate_debug_output(), + 'DEBUG_OUTPUT' => phpbb_generate_debug_output($db, $config, $auth, $user), 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'S_COPYRIGHT_HTML' => $copyright_html, 'CREDIT_LINE' => $user->lang('POWERED_BY', 'phpBB® Forum Software © phpBB Limited'), -- cgit v1.2.1