diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 2120232759..5a36a9e03e 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -140,7 +140,8 @@ function adm_page_header($page_title) function adm_page_footer($copyright_html = true) { - global $db, $config, $template, $SID, $user, $auth, $starttime, $phpbb_root_path, $phpEx, $cache; + global $db, $config, $template, $user, $auth, $cache; + global $SID, $starttime, $phpbb_root_path, $phpbb_admin_path, $phpEx; // Output page creation time if (defined('DEBUG')) @@ -169,7 +170,11 @@ function adm_page_footer($copyright_html = true) } } - $debug_output .= ' | Explain'; + $explain_url = $phpbb_root_path . str_replace('&', '&', $user->page['page']); + $explain_url = (strpos($explain_url, '?') !== false) ? str_replace('?', $SID . '&', $explain_url) : $explain_url . '?' . str_replace('?', '', $SID); + $explain_url .= ((strpos($explain_url, '?') === false) ? '?' : '&') . 'explain=1'; + + $debug_output .= ' | Explain'; } } diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 1b6e284a30..e4018250a8 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -871,6 +871,7 @@ table.pmask td.name { color: #333333; } +/* Tooltip for permission roles */ .tooltip { width: 200px; color: #000; diff --git a/phpBB/adm/style/sql_report.css b/phpBB/adm/style/sql_report.css deleted file mode 100644 index 64d19b80c6..0000000000 --- a/phpBB/adm/style/sql_report.css +++ /dev/null @@ -1,131 +0,0 @@ -/* - $Id$ - - The original "subSilver" theme for phpBB2 - Created by subBlue design :: http://www.subBlue.com - Updated for phpBB 2.2 by psoTFX :: phpBB Group - Copyright (c) 2002 phpBB Group -*/ - -body { - background-color: white; - font-family: Verdana, Arial, Helvetica, sans-serif; - margin: 0; - border: 0; - padding: 0; -} - -p { - font-size: 8pt; -} - -.maintitle, h1 { - font: bold 18pt 'Trebuchet MS', Verdana, sans-serif; - text-decoration:none; - line-height: 120%; -} - -h2 { - font: bold 12pt Arial, Helvetica, sans-serif; - text-decoration:none; - line-height: 120%; -} - -.maintitle { - color: #12749B -} - -/* - Anchors -*/ -a:link, a:active, a:visited { color: #006699; text-decoration: none; } -a:hover { color: #DD6900; text-decoration: underline; } - -a.nav { color: #006699; text-decoration: none; } -a.nav:hover { text-decoration: underline; } - -a.th:link { color: #FFA34F; text-decoration: none; } -a.th:active { color: #FFA34F; text-decoration: none; } -a.th:visited { color: #FFA34F; text-decoration: none; } -a.th:hover { color: #FFA34F; text-decoration: underline; } - -/* - Non-tag specific -*/ -.gen, .gensmall { - color: black; -} -.gen { - font-size: 8pt; -} -.gensmall { - font-size: 7pt; -} -.nav { - color: black; - font-size: 7pt; - font-weight: bold; -} - -.error { color: #FF0000 } - -/* - Tables -*/ -table.bg { - background-color: #ACBBC6 -} - -th, td { - font: normal 8pt Verdana, Arial, Helvetica, sans-serif; -} - -th { - height: 25px; - background-color: #006699; - color: #FFA34F; - font-weight: bold; - font-size: 11px; -} - -td.cat { - height: 28px; - background-color: #D1D7DC; -} - -.row1 { - background-color: #EFEFEF; -} -.row2 { - background-color: #DEE3E7; -} -.row3 { - background-color: #D1D7DC; -} - -/* - Misc -*/ -hr { - height: 0px; - border: solid #D1D7DC 0px; - border-top-width: 1px; -} - -/* - Forms -*/ -input { - text-indent: 2px; -} - -textarea, select { - border: 1px solid; -} - -input, textarea, select { - color: black; - font: normal 8pt Verdana, Arial, Helvetica, sans-serif; - border-color: black; -} - diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/includes/acp/acp_styles.php index 5b2a8fdfc9..036df4d8b7 100644 --- a/phpBB/includes/acp/acp_styles.php +++ b/phpBB/includes/acp/acp_styles.php @@ -454,7 +454,7 @@ pagination_sep = \'{PAGINATION_SEP}\' 'site_logo', ), 'buttons' => array( - 'btn_post', 'btn_reply', 'btn_locked', 'btn_quote', 'btn_edit', 'btn_delete', 'btn_report', 'btn_post_pm', 'btn_reply_pm', 'btn_profile', 'btn_pm', 'btn_ip', 'btn_search', 'btn_email', 'btn_www', 'btn_icq', 'btn_aim', 'btn_yim', 'btn_msnm', 'btn_jabber', 'btn_online', 'btn_offline', + 'btn_post', 'btn_reply', 'btn_locked', 'btn_quote', 'btn_edit', 'btn_delete', 'btn_report', 'btn_post_pm', 'btn_reply_pm', 'btn_profile', 'btn_pm', 'btn_info', 'btn_search', 'btn_email', 'btn_www', 'btn_icq', 'btn_aim', 'btn_yim', 'btn_msnm', 'btn_jabber', 'btn_online', 'btn_offline', ), 'icons' => array( 'icon_unapproved', 'icon_reported', 'icon_attach', 'icon_post', 'icon_post_new', 'icon_post_latest', 'icon_post_newest',), diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index 1a6b6f25a4..acc64da799 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -277,43 +277,42 @@ class dbal $mtime = explode(' ', microtime()); $totaltime = $mtime[0] + $mtime[1] - $starttime; - echo ''; - echo ''; - echo ''; - echo ''; - echo 'SQL Report'; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
'; - echo '
'; - echo ' Return to previous page'; - echo '
'; - echo '
'; - echo '
'; - echo ' '; - echo '
'; - echo '

SQL Report

'; - echo ' - - - -
Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries} queries" . (($this->cache_num_queries) ? " + {$this->cache_num_queries} " . (($this->cache_num_queries == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '
Time spent on MySQL queries: ' . round($this->sql_time, 5) . 's | Time spent on PHP: ' . round($totaltime - $this->sql_time, 5) . 's
- - -
' . $this->sql_report . '
'; - echo '
'; - echo ' '; - echo '
'; - echo '
'; - echo '
'; - echo ' Powered by phpBB © ' . date('Y') . ' phpBB Group'; - echo '
'; - echo '
'; - echo ''; - echo ''; + echo ' + + + + + + SQL Report + + + +
+
+ Return to previous page +
+
+
+ +
+

SQL Report

+
+

Page generated in ' . round($totaltime, 4) . " seconds with {$this->num_queries} queries" . (($this->cache_num_queries) ? " + {$this->cache_num_queries} " . (($this->cache_num_queries == 1) ? 'query' : 'queries') . ' returning data from cache' : '') . '

+

Time spent on MySQL queries: ' . round($this->sql_time, 5) . 's | Time spent on PHP: ' . round($totaltime - $this->sql_time, 5) . 's

+ +

+ ' . $this->sql_report . ' +
+ +
+
+
+ Powered by phpBB © ' . date('Y') . ' phpBB Group +
+
+ + '; exit; break; @@ -322,17 +321,22 @@ class dbal $endtime = $endtime[0] + $endtime[1]; $this->sql_report .= ' -

- +
+ + + - + -
Query #' . $this->num_queries . '
' . $this->html_hold . ' -

+ + + ' . $this->html_hold . ' + +

'; if ($this->query_result) @@ -349,7 +353,7 @@ class dbal $this->sql_report .= 'FAILED - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); } - $this->sql_report .= '

'; + $this->sql_report .= '



'; $this->sql_time += $endtime - $this->curtime; break; @@ -373,11 +377,11 @@ class dbal if (!$html_table && sizeof($row)) { $html_table = true; - $this->html_hold .= ''; + $this->html_hold .= '
'; foreach (array_keys($row) as $val) { - $this->html_hold .= ''; + $this->html_hold .= ''; } $this->html_hold .= ''; } @@ -412,8 +416,10 @@ class dbal $time_db = $splittime - $endtime; $color = ($time_db > $time_cache) ? 'green' : 'red'; - $this->sql_report .= '

' . (($val) ? ucwords(str_replace('_', ' ', $val)) : ' ') . '' . (($val) ? ucwords(str_replace('_', ' ', $val)) : ' ') . '
Query results obtained from the cache

'; - $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: ' . sprintf('%.5f', ($time_cache)) . 's | Elapsed [db]: ' . sprintf('%.5f', $time_db) . 's

'; + $this->sql_report .= ''; + $this->sql_report .= '
Query results obtained from the cache
'; + $this->sql_report .= '

'; + $this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: ' . sprintf('%.5f', ($time_cache)) . 's | Elapsed [db]: ' . sprintf('%.5f', $time_db) . 's



'; // Pad the start time to not interfere with page timing $starttime += $time_db; diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 1fe1082ea5..699dd4c9f5 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2612,7 +2612,11 @@ function page_footer() } } - $debug_output .= ' | Explain'; + $explain_url = $phpbb_root_path . str_replace('&', '&', $user->page['page']); + $explain_url = (strpos($explain_url, '?') !== false) ? str_replace('?', $SID . '&', $explain_url) : $explain_url . '?' . str_replace('?', '', $SID); + $explain_url .= ((strpos($explain_url, '?') === false) ? '?' : '&') . 'explain=1'; + + $debug_output .= ' |