9 files changed, 91 insertions, 196 deletions
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 .= ' | <a href="' . (($_SERVER['REQUEST_URI']) ? htmlspecialchars($_SERVER['REQUEST_URI']) : "index.$phpEx$SID") . ((strpos($_SERVER['REQUEST_URI'], '?') !== false) ? '&amp;' : '?') . 'explain=1">Explain</a>';
+			$explain_url = $phpbb_root_path . str_replace('&', '&amp;', $user->page['page']);
+			$explain_url = (strpos($explain_url, '?') !== false) ? str_replace('?', $SID . '&amp;', $explain_url) : $explain_url . '?' . str_replace('?', '', $SID);
+			$explain_url .= ((strpos($explain_url, '?') === false) ? '?' : '&amp;') . 'explain=1';
+
+			$debug_output .= ' | <a href="' . $explain_url . '">Explain</a>';
 		}
 	}
 
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 '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
-				echo '<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">';
-				echo '<head>';
-				echo '<meta http-equiv="content-type" content="text/html; charset=utf-8" />';
-				echo '<title>SQL Report</title>';
-				echo '<link href="' . $phpbb_root_path . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />';
-				echo '<link href="' . $phpbb_root_path . 'adm/style/sql_report.css" rel="stylesheet" type="text/css" media="screen" />';
-				echo '</head>';
-				echo '<body id="errorpage">';
-				echo '<div id="wrap">';
-				echo '	<div id="page-header">';
-				echo '		<a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '">Return to previous page</a>';
-				echo '	</div>';
-				echo '	<div id="page-body">';
-				echo '		<div class="panel">';
-				echo '			<span class="corners-top"><span></span></span>';
-				echo '			<div id="content">';
-				echo '				<h1>SQL Report</h1>';
-				echo '				<table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr>
-										<td height="40" align="center" valign="middle"><b>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' : '') . '</b></td>
-									</tr><tr>
-										<td align="center" nowrap="nowrap">Time spent on MySQL queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></td>
-									</tr></table>
-									<table width="95%" cellspacing="1" cellpadding="4" border="0" align="center"><tr>
-										<td>' . $this->sql_report . '</td>
-									</tr></table>';
-				echo '			</div>';
-				echo '			<span class="corners-bottom"><span></span></span>';
-				echo '		</div>';
-				echo '	</div>';
-				echo '	<div id="page-footer">';
-				echo '		Powered by phpBB &copy; ' . date('Y') . ' <a href="http://www.phpbb.com/">phpBB Group</a>';
-				echo '	</div>';
-				echo '</div>';
-				echo '</body>';
-				echo '</html>';
-
+				echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+					<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
+					<head>
+						<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+						<meta http-equiv="Content-Style-Type" content="text/css" />
+						<meta http-equiv="imagetoolbar" content="no" />
+						<title>SQL Report</title>
+						<link href="' . $phpbb_root_path . 'adm/style/admin.css" rel="stylesheet" type="text/css" media="screen" />
+					</head>
+					<body id="errorpage">
+					<div id="wrap">
+						<div id="page-header">
+							<a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '">Return to previous page</a>
+						</div>
+						<div id="page-body">
+							<div class="panel">
+								<span class="corners-top"><span></span></span>
+								<div id="content">
+									<h1>SQL Report</h1>
+									<br />
+									<p><b>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' : '') . '</b></p>
+
+									<p>Time spent on MySQL queries: <b>' . round($this->sql_time, 5) . 's</b> | Time spent on PHP: <b>' . round($totaltime - $this->sql_time, 5) . 's</b></p>
+
+									<br /><br />
+									' . $this->sql_report . '
+								</div>
+								<span class="corners-bottom"><span></span></span>
+							</div>
+						</div>
+						<div id="page-footer">
+							Powered by phpBB &copy; ' . date('Y') . ' <a href="http://www.phpbb.com/">phpBB Group</a>
+						</div>
+					</div>
+					</body>
+					</html>';
 				exit;
 				break;
 
@@ -322,17 +321,22 @@ class dbal
 				$endtime = $endtime[0] + $endtime[1];
 
 				$this->sql_report .= '
-					<hr width="100%"/><br />
 
-					<table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0">
+					<table cellspacing="1">
+					<thead>
 					<tr>
 						<th>Query #' . $this->num_queries . '</th>
 					</tr>
+					</thead>
+					<tbody>
 					<tr>
-						<td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td>
+						<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td>
 					</tr>
-					</table> ' . $this->html_hold . '
-					<p align="center">
+					</table>
+					
+					' . $this->html_hold . '
+
+					<p style="text-align: center;">
 				';
 
 				if ($this->query_result)
@@ -349,7 +353,7 @@ class dbal
 					$this->sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']);
 				}
 
-				$this->sql_report .= '</p>';
+				$this->sql_report .= '</p><br /><br />';
 
 				$this->sql_time += $endtime - $this->curtime;
 			break;
@@ -373,11 +377,11 @@ class dbal
 				if (!$html_table && sizeof($row))
 				{
 					$html_table = true;
-					$this->html_hold .= '<table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0" align="center"><tr>';
+					$this->html_hold .= '<table cellspacing="1"><tr>';
 								
 					foreach (array_keys($row) as $val)
 					{
-						$this->html_hold .= '<th nowrap="nowrap">' . (($val) ? ucwords(str_replace('_', ' ', $val)) : '&nbsp;') . '</th>';
+						$this->html_hold .= '<th>' . (($val) ? ucwords(str_replace('_', ' ', $val)) : '&nbsp;') . '</th>';
 					}
 					$this->html_hold .= '</tr>';
 				}
@@ -412,8 +416,10 @@ class dbal
 				$time_db = $splittime - $endtime;
 				$color = ($time_db > $time_cache) ? 'green' : 'red';
 
-				$this->sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query results obtained from the cache</th></tr><tr><td class="row1"><textarea style="font-family:\'Courier New\',monospace;width:100%" rows="5">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></table><p align="center">';
-				$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p>';
+				$this->sql_report .= '<table cellspacing="1"><thead><tr><th>Query results obtained from the cache</th></tr></thead><tbody><tr>';
+				$this->sql_report .= '<td class="row3"><textarea style="font-family:\'Courier New\',monospace;width:99%" rows="5" cols="10">' . preg_replace('/\t(AND|OR)(\W)/', "\$1\$2", htmlspecialchars(preg_replace('/[\s]*[\n\r\t]+[\n\r\s\t]*/', "\n", $query))) . '</textarea></td></tr></tbody></table>';
+				$this->sql_report .= '<p style="text-align: center;">';
+				$this->sql_report .= 'Before: ' . sprintf('%.5f', $this->curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed [cache]: <b style="color: ' . $color . '">' . sprintf('%.5f', ($time_cache)) . 's</b> | Elapsed [db]: <b>' . sprintf('%.5f', $time_db) . 's</b></p><br /><br />';
 
 				// 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 .= ' | <a href="' . (($_SERVER['REQUEST_URI']) ? htmlspecialchars($_SERVER['REQUEST_URI']) : "index.$phpEx$SID") . ((strpos($_SERVER['REQUEST_URI'], '?') !== false) ? '&amp;' : '?') . 'explain=1">Explain</a>';
+			$explain_url = $phpbb_root_path . str_replace('&', '&amp;', $user->page['page']);
+			$explain_url = (strpos($explain_url, '?') !== false) ? str_replace('?', $SID . '&amp;', $explain_url) : $explain_url . '?' . str_replace('?', '', $SID);
+			$explain_url .= ((strpos($explain_url, '?') === false) ? '?' : '&amp;') . 'explain=1';
+
+			$debug_output .= ' | <a href="' . $explain_url . '>Explain</a>';
 		}
 	}
 
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 8841083d37..d81e659dc0 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -244,7 +244,7 @@ $lang = array_merge($lang, array(
 	'IMG_BTN_EMAIL'			=> 'Send email',
 	'IMG_BTN_SEARCH'		=> 'Search posts',
 	'IMG_BTN_WWW'			=> 'Website',
-	'IMG_BTN_IP'			=> 'Show IP',
+	'IMG_BTN_INFO'			=> 'Show post details',
 	'IMG_BTN_EDIT'			=> 'Edit post',
 	'IMG_BTN_AIM'			=> 'AIM',
 	'IMG_BTN_ICQ'			=> 'ICQ',
diff --git a/phpBB/styles/subSilver/imageset/imageset.cfg b/phpBB/styles/subSilver/imageset/imageset.cfg
index 4e881fd88c..cd32a4ccc8 100644
--- a/phpBB/styles/subSilver/imageset/imageset.cfg
+++ b/phpBB/styles/subSilver/imageset/imageset.cfg
@@ -31,7 +31,7 @@ img_btn_locked = {LANG}/btn_locked.gif*27*97
 img_btn_profile = {LANG}/btn_profile.gif*20*72
 img_btn_pm = {LANG}/btn_pm.gif*20*72
 img_btn_delete = {LANG}/btn_delete.gif*20*20
-img_btn_ip = {LANG}/btn_ip.gif*20*20
+img_btn_info = {LANG}/btn_ip.gif*20*20
 img_btn_quote = {LANG}/btn_quote.gif*20*90
 img_btn_search = {LANG}/btn_search.gif*20*72
 img_btn_edit = {LANG}/btn_edit.gif*20*90
diff --git a/phpBB/styles/subSilver/theme/stylesheet.css b/phpBB/styles/subSilver/theme/stylesheet.css
index 21b6946909..1654b32de5 100644
--- a/phpBB/styles/subSilver/theme/stylesheet.css
+++ b/phpBB/styles/subSilver/theme/stylesheet.css
@@ -20,10 +20,12 @@
 	/* Reset browsers default margin, padding and font sizes */
 	margin: 0;
 	padding: 0;
-	}
+}
+
 html {
 	font-size: 100%;
-	}
+}
+
 body {
 	/* Text-Sizing with ems: http://www.clagnut.com/blog/348/ */
 	font-family: Verdana, Helvetica, Arial, sans-serif;
@@ -31,20 +33,24 @@ body {
 	background-color: #FFFFFF;
 	font-size: 62.5%; /* This sets the default font size to be equivalent to 10px */
 	margin: 0;
-	}
+}
 
 #wrapheader {
 	height: 120px;
 	background-image: url('./images/background.gif');
 	background-repeat: repeat-x;
 	padding: 0 25px 15px 25px;
-	}
+}
+
 #wrapcentre {
 	margin: 25px;
-	}
+}
+
 #wrapfooter {
 	text-align: center;
-	}
+	clear: both;
+}
+
 #wrapnav {
 	width: 100%;
 	margin: 0px;
@@ -52,22 +58,26 @@ body {
 	border-width: 1px;
 	border-style: solid;
 	border-color: #A9B8C2;
-	}
+}
+
 #logodesc {
 	
-	}
+}
+
 #menubar {
 	
-	}
+}
+
 #datebar {
 	margin-top: 10px;
-	}
+}
+
 #findbar {
 	width: 100%;
 	margin: 0px;
 	padding: 0px;
 	border: 0px;
-	}
+}
 
 .forumrules {
 	background-color: #F9CC79;
@@ -78,7 +88,7 @@ body {
 	font-weight: normal;
 	font-size: 1.1em;
 	font-family: Verdana, Arial, Helvetica, sans-serif;
-	}
+}
 
 #pageheader { }
 #pagecontent { }