Menu
▾
▴
[Phpbb-checkins] CVS: phpBB2/includes/db dbal.php,NONE,1.1 firebird.php,1.16,1.17 mssql.php,1.6,1.7 mysql.php,1.29,1.30 mysql4.php,1.17,1.18 mysqli.php,1.1,1.2 oracle.php,1.4,1.5 postgres.php,1.8,1.9 sqlite.php,1.9,1.10
Update of /cvsroot/phpbb/phpBB2/includes/db In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17699/includes/db Modified Files: firebird.php mssql.php mysql.php mysql4.php mysqli.php oracle.php postgres.php sqlite.php Added Files: dbal.php Log Message: - changed dbal class layout --- NEW FILE --- <?php /** * * @package dbal * @version $Id: dbal.php,v 1.1 2005/08/17 15:57:50 acydburn Exp $ * @copyright (c) 2005 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ /** * @package dbal * Database Abstraction Layer */ class dbal { var $db_connect_id; var $query_result; var $return_on_error = false; var $transaction = false; var $sql_time = 0; var $num_queries = 0; var $open_queries = array(); function sql_return_on_error($fail = false) { $this->return_on_error = $fail; } function sql_num_queries() { return $this->num_queries; } // Idea for this from Ikonboard function sql_build_array($query, $assoc_ary = false) { if (!is_array($assoc_ary)) { return false; } $fields = array(); $values = array(); if ($query == 'INSERT') { foreach ($assoc_ary as $key => $var) { $fields[] = $key; if (is_null($var)) { $values[] = 'NULL'; } elseif (is_string($var)) { $values[] = "'" . $this->sql_escape($var) . "'"; } else { $values[] = (is_bool($var)) ? intval($var) : $var; } } $query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')'; } else if ($query == 'UPDATE' || $query == 'SELECT') { $values = array(); foreach ($assoc_ary as $key => $var) { if (is_null($var)) { $values[] = "$key = NULL"; } elseif (is_string($var)) { $values[] = "$key = '" . $this->sql_escape($var) . "'"; } else { $values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var"; } } $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values); } return $query; } function sql_error($sql = '') { $error = $this->db_sql_error(); if (!$this->return_on_error) { $this_page = (isset($_SERVER['PHP_SELF']) && !empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF']; $this_page .= '&' . ((isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : (isset($_ENV['QUERY_STRING']) ? $_ENV['QUERY_STRING'] : '')); $message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . $error['message'] . ' [' . $error['code'] . ']<br /><br /><u>CALLING PAGE</u><br /><br />' . htmlspecialchars($this_page) . (($sql != '') ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '') . '<br />'; if ($this->transaction) { $this->sql_transaction('rollback'); } trigger_error($message, E_USER_ERROR); } return $error; } function sql_report($mode, $query = '') { if (empty($_GET['explain'])) { return; } global $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; static $sql_report = ''; static $cache_num_queries = 0; if (!$query && !empty($query_hold)) { $query = $query_hold; } switch ($mode) { case 'display': if (!empty($cache)) { $cache->unload(); } $this->sql_close(); $mtime = explode(' ', microtime()); $totaltime = $mtime[0] + $mtime[1] - $starttime; echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n"; echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n"; echo 'td.cat { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n"; echo '</style><title>' . $msg_title . '</title></head><body>'; echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '"><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">SQL Report</span> </td></tr></table><br clear="all"/><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" . (($cache_num_queries) ? " + $cache_num_queries " . (($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>'; echo $sql_report; echo '</td></tr></table><br /></body></html>'; exit; break; case 'stop': $endtime = explode(' ', microtime()); $endtime = $endtime[0] + $endtime[1]; $sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query #' . $this->num_queries . '</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> ' . $html_hold . '<p align="center">'; if ($this->query_result) { if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query)) { $sql_report .= "Affected rows: <b>" . $this->sql_affectedrows($this->query_result) . '</b> | '; } $sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $curtime) . 's</b>'; } else { $error = $this->sql_error(); $sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); } $sql_report .= '</p>'; $this->sql_time += $endtime - $curtime; break; default: $this->_sql_report($mode, $query); break; } } } if (!defined('IN_PHPBB')) { exit; } /** * This variable holds the class name to use later */ $sql_db = 'dbal_' . $dbms; ?> Index: firebird.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/db/firebird.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** firebird.php 5 May 2005 17:00:45 -0000 1.16 --- firebird.php 17 Aug 2005 15:57:50 -0000 1.17 *************** *** 2,6 **** /** * ! * @package dbal_firebird * @version $Id$ * @copyright (c) 2005 phpBB Group --- 2,6 ---- /** * ! * @package dbal * @version $Id$ * @copyright (c) 2005 phpBB Group *************** *** 15,35 **** { ! define('SQL_LAYER', 'firebird'); /** ! * @package dbal_firebird * Firebird/Interbase Database Abstraction Layer * Minimum Requirement is Firebird 1.5+/Interbase 7.1+ */ ! class sql_db { - var $db_connect_id; - var $query_result; - var $return_on_error = false; - var $transaction = false; - var $sql_time = 0; - var $num_queries = 0; - var $open_queries = array(); - var $last_query_text = ''; --- 15,28 ---- { ! define('SQL_LAYER', 'firebird'); ! include($phpbb_root_path . 'includes/db/dbal.' . $phpEx); /** ! * @package dbal * Firebird/Interbase Database Abstraction Layer * Minimum Requirement is Firebird 1.5+/Interbase 7.1+ */ ! class dbal_firebird extends dbal { var $last_query_text = ''; *************** *** 72,85 **** } - function sql_return_on_error($fail = false) - { - $this->return_on_error = $fail; - } - - function sql_num_queries() - { - return $this->num_queries; - } - function sql_transaction($status = 'begin') { --- 65,68 ---- *************** *** 167,226 **** } - // Idea for this from Ikonboard - function sql_build_array($query, $assoc_ary = false) - { - if (!is_array($assoc_ary)) - { - return false; - } - - $fields = array(); - $values = array(); - if ($query == 'INSERT') - { - foreach ($assoc_ary as $key => $var) - { - $fields[] = $key; - - if (is_null($var)) - { - $values[] = 'NULL'; - } - elseif (is_string($var)) - { - $values[] = "'" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? intval($var) : $var; - } - } - - $query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')'; - } - else if ($query == 'UPDATE' || $query == 'SELECT') - { - $values = array(); - foreach ($assoc_ary as $key => $var) - { - if (is_null($var)) - { - $values[] = "$key = NULL"; - } - elseif (is_string($var)) - { - $values[] = "$key = '" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var"; - } - } - $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values); - } - - return $query; - } - // Other query methods // --- 150,153 ---- *************** *** 234,238 **** function sql_affectedrows() { ! // TODO: hmm, maybe doing something similar as in mssql-odbc.php? return ($this->query_result) ? true : false; } --- 161,165 ---- function sql_affectedrows() { ! // TODO: hmm, maybe doing something similar as in mssql_odbc.php? return ($this->query_result) ? true : false; } *************** *** 316,320 **** if (empty($this->row[$query_id]) && empty($this->rowset[$query_id])) { ! if ($this->sql_fetchrow($query_id)) { $result = $this->row[$query_id][$field]; --- 243,247 ---- if (empty($this->row[$query_id]) && empty($this->rowset[$query_id])) { ! if ($this->row[$query_id] = $this->sql_fetchrow($query_id)) { $result = $this->row[$query_id][$field]; *************** *** 398,431 **** } ! function sql_error($sql = '') { ! if (!$this->return_on_error) ! { ! $this_page =(!empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF']; ! $this_page .= '&' .((!empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : $_ENV['QUERY_STRING']); ! ! $message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . @ibase_errmsg() . '<br /><br /><u>CALLING PAGE</u><br /><br />' . $this_page .(($sql != '') ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '') . '<br />'; ! ! if ($this->transaction) ! { ! $this->sql_transaction('rollback'); ! } ! ! trigger_error($message, E_USER_ERROR); ! } ! ! $result['message'] = @ibase_errmsg(); ! $result['code'] = ''; ! ! return $result; } ! function sql_report($mode, $query = '') { - if (empty($_GET['explain'])) - { - return; - } - global $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; --- 325,338 ---- } ! function db_sql_error() { ! return array( ! 'message' => @ibase_errmsg(), ! 'code' => '' ! ); } ! function _sql_report($mode, $query = '') { global $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; *************** *** 433,463 **** static $cache_num_queries = 0; - if (!$query && !empty($query_hold)) - { - $query = $query_hold; - } - switch ($mode) { - case 'display': - if (!empty($cache)) - { - $cache->unload(); - } - $this->sql_close(); - - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - - echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n"; - echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n"; - echo 'td.cat { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n"; - echo '</style><title>' . $msg_title . '</title></head><body>'; - echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '"><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">SQL Report</span> </td></tr></table><br clear="all"/><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" . (($cache_num_queries) ? " + $cache_num_queries " . (($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>'; - echo $sql_report; - echo '</td></tr></table><br /></body></html>'; - exit; - break; - case 'start': $query_hold = $query; --- 340,345 ---- *************** *** 494,526 **** $cache_num_queries++; break; - - case 'stop': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query #' . $this->num_queries . '</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> ' . $html_hold . '<p align="center">'; - - if ($this->query_result) - { - if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query)) - { - $sql_report .= "Affected rows: <b>" . $this->sql_affectedrows($this->query_result) . '</b> | '; - } - $sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $curtime) . 's</b>'; - } - else - { - $error = $this->sql_error(); - $sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); - } - - $sql_report .= '</p>'; - - $this->sql_time += $endtime - $curtime; - break; } } ! } // class sql_db } // if ... define --- 376,383 ---- $cache_num_queries++; break; } } ! } } // if ... define Index: mssql.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/db/mssql.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** mssql.php 22 Apr 2005 17:44:31 -0000 1.6 --- mssql.php 17 Aug 2005 15:57:50 -0000 1.7 *************** *** 2,6 **** /** * ! * @package dbal_mssql * @version $Id$ * @copyright (c) 2005 phpBB Group --- 2,6 ---- /** * ! * @package dbal * @version $Id$ * @copyright (c) 2005 phpBB Group *************** *** 15,34 **** { ! define('SQL_LAYER', 'mssql'); /** ! * @package dbal_mssql * MSSQL Database Abstraction Layer * Minimum Requirement is MSSQL 2000+ */ ! class sql_db { - var $db_connect_id; - var $query_result; - var $return_on_error = false; - var $transaction = false; - var $sql_time = 0; - var $num_queries = 0; - var $open_queries = array(); function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false) --- 15,28 ---- { ! define('SQL_LAYER', 'mssql'); ! include($phpbb_root_path . 'includes/db/dbal.' . $phpEx); /** ! * @package dbal * MSSQL Database Abstraction Layer * Minimum Requirement is MSSQL 2000+ */ ! class dbal_mssql extends dbal { function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false) *************** *** 76,89 **** } - function sql_return_on_error($fail = false) - { - $this->return_on_error = $fail; - } - - function sql_num_queries() - { - return $this->num_queries; - } - function sql_transaction($status = 'begin') { --- 70,73 ---- *************** *** 195,254 **** } - // Idea for this from Ikonboard - function sql_build_array($query, $assoc_ary = false) - { - if (!is_array($assoc_ary)) - { - return false; - } - - $fields = array(); - $values = array(); - if ($query == 'INSERT') - { - foreach ($assoc_ary as $key => $var) - { - $fields[] = $key; - - if (is_null($var)) - { - $values[] = 'NULL'; - } - elseif (is_string($var)) - { - $values[] = "'" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? intval($var) : $var; - } - } - - $query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')'; - } - else if ($query == 'UPDATE' || $query == 'SELECT') - { - $values = array(); - foreach ($assoc_ary as $key => $var) - { - if (is_null($var)) - { - $values[] = "$key = NULL"; - } - elseif (is_string($var)) - { - $values[] = "$key = '" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var"; - } - } - $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values); - } - - return $query; - } - // Other query methods // --- 179,182 ---- *************** *** 341,345 **** if (empty($this->row[$query_id]) && empty($this->rowset[$query_id])) { ! if ($this->sql_fetchrow($query_id)) { $result = $this->row[$query_id][$field]; --- 269,273 ---- if (empty($this->row[$query_id]) && empty($this->rowset[$query_id])) { ! if ($this->row[$query_id] = $this->sql_fetchrow($query_id)) { $result = $this->row[$query_id][$field]; *************** *** 419,454 **** } ! function sql_error($sql = '') { ! if (!$this->return_on_error) ! { ! $this_page = (isset($_SERVER['PHP_SELF']) && !empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF']; ! $this_page .= '&' . ((isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : (isset($_ENV['QUERY_STRING']) ? $_ENV['QUERY_STRING'] : '')); ! ! $message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . @mssql_get_last_message() . '<br /><br /><u>CALLING PAGE</u><br /><br />' . htmlspecialchars($this_page) . (($sql != '') ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '') . '<br />'; ! ! if ($this->transaction) ! { ! $this->sql_transaction('rollback'); ! } ! ! trigger_error($message, E_USER_ERROR); ! } ! ! $result = array( 'message' => @mssql_get_last_message($this->db_connect_id), 'code' => '' ); - - return $result; } ! function sql_report($mode, $query = '') { - if (empty($_GET['explain'])) - { - return; - } - global $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; --- 347,360 ---- } ! function db_sql_error() { ! return array( 'message' => @mssql_get_last_message($this->db_connect_id), 'code' => '' ); } ! function _sql_report($mode, $query = '') { global $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; *************** *** 456,486 **** static $cache_num_queries = 0; - if (!$query && !empty($query_hold)) - { - $query = $query_hold; - } - switch ($mode) { - case 'display': - if (!empty($cache)) - { - $cache->unload(); - } - $this->sql_close(); - - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - - echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n"; - echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n"; - echo 'td.cat { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n"; - echo '</style><title>' . $msg_title . '</title></head><body>'; - echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '"><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">SQL Report</span> </td></tr></table><br clear="all"/><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" . (($cache_num_queries) ? " + $cache_num_queries " . (($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>'; - echo $sql_report; - echo '</td></tr></table><br /></body></html>'; - exit; - break; - case 'start': $query_hold = $query; --- 362,367 ---- *************** *** 517,549 **** $cache_num_queries++; break; - - case 'stop': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query #' . $this->num_queries . '</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> ' . $html_hold . '<p align="center">'; - - if ($this->query_result) - { - if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query)) - { - $sql_report .= "Affected rows: <b>" . $this->sql_affectedrows($this->query_result) . '</b> | '; - } - $sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $curtime) . 's</b>'; - } - else - { - $error = $this->sql_error(); - $sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); - } - - $sql_report .= '</p>'; - - $this->sql_time += $endtime - $curtime; - break; } } ! } // class sql_db } // if ... define --- 398,405 ---- $cache_num_queries++; break; } } ! } } // if ... define Index: mysql.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/db/mysql.php,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -r1.29 -r1.30 *** mysql.php 5 May 2005 17:00:46 -0000 1.29 --- mysql.php 17 Aug 2005 15:57:50 -0000 1.30 *************** *** 2,6 **** /** * ! * @package dbal_mysql * @version $Id$ * @copyright (c) 2005 phpBB Group --- 2,6 ---- /** * ! * @package dbal * @version $Id$ * @copyright (c) 2005 phpBB Group *************** *** 15,34 **** { ! define('SQL_LAYER', 'mysql'); /** ! * @package dbal_mysql * MySQL Database Abstraction Layer * Minimum Requirement is 3.23+/4.0+/4.1+ */ ! class sql_db { - var $db_connect_id; - var $query_result; - var $return_on_error = false; - var $transaction = false; - var $sql_time = 0; - var $num_queries = 0; - var $open_queries = array(); function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false) --- 15,28 ---- { ! define('SQL_LAYER', 'mysql'); ! include($phpbb_root_path . 'includes/db/dbal.' . $phpEx); /** ! * @package dbal * MySQL Database Abstraction Layer * Minimum Requirement is 3.23+/4.0+/4.1+ */ ! class dbal_mysql extends dbal { function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false) *************** *** 73,86 **** } - function sql_return_on_error($fail = false) - { - $this->return_on_error = $fail; - } - - function sql_num_queries() - { - return $this->num_queries; - } - function sql_transaction($status = 'begin') { --- 67,70 ---- *************** *** 189,248 **** } - // Idea for this from Ikonboard - function sql_build_array($query, $assoc_ary = false) - { - if (!is_array($assoc_ary)) - { - return false; - } - - $fields = array(); - $values = array(); - if ($query == 'INSERT') - { - foreach ($assoc_ary as $key => $var) - { - $fields[] = $key; - - if (is_null($var)) - { - $values[] = 'NULL'; - } - elseif (is_string($var)) - { - $values[] = "'" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? intval($var) : $var; - } - } - - $query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')'; - } - else if ($query == 'UPDATE' || $query == 'SELECT') - { - $values = array(); - foreach ($assoc_ary as $key => $var) - { - if (is_null($var)) - { - $values[] = "$key = NULL"; - } - elseif (is_string($var)) - { - $values[] = "$key = '" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var"; - } - } - $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values); - } - - return $query; - } - // Other query methods // --- 173,176 ---- *************** *** 321,325 **** if (empty($this->row[$query_id]) && empty($this->rowset[$query_id])) { ! if ($this->sql_fetchrow($query_id)) { $result = $this->row[$query_id][$field]; --- 249,253 ---- if (empty($this->row[$query_id]) && empty($this->rowset[$query_id])) { ! if ($this->row[$query_id] = $this->sql_fetchrow($query_id)) { $result = $this->row[$query_id][$field]; *************** *** 381,448 **** } ! function sql_error($sql = '') { ! if (!$this->return_on_error) ! { ! $this_page = (isset($_SERVER['PHP_SELF']) && !empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF']; ! $this_page .= '&' . ((isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : (isset($_ENV['QUERY_STRING']) ? $_ENV['QUERY_STRING'] : '')); ! ! $message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . @mysql_error() . '<br /><br /><u>CALLING PAGE</u><br /><br />' . htmlspecialchars($this_page) . (($sql != '') ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '') . '<br />'; ! ! if ($this->transaction) ! { ! $this->sql_transaction('rollback'); ! } ! ! trigger_error($message, E_USER_ERROR); ! } ! ! $result = array( 'message' => @mysql_error(), 'code' => @mysql_errno() ); - - return $result; } ! function sql_report($mode, $query = '') { ! if (empty($_GET['explain'])) ! { ! return; ! } ! ! global $db, $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; static $sql_report = ''; static $cache_num_queries = 0; - if (!$query && !empty($query_hold)) - { - $query = $query_hold; - } - switch ($mode) { - case 'display': - if (!empty($cache)) - { - $cache->unload(); - } - $db->sql_close(); - - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - - echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n"; - echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n"; - echo 'td.cat { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n"; - echo '</style><title>' . $msg_title . '</title></head><body>'; - echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '"><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">SQL Report</span> </td></tr></table><br clear="all"/><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" . (($cache_num_queries) ? " + $cache_num_queries " . (($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>'; - echo $sql_report; - echo '</td></tr></table><br /></body></html>'; - exit; - break; - case 'start': $query_hold = $query; --- 309,329 ---- } ! function db_sql_error() { ! return array( 'message' => @mysql_error(), 'code' => @mysql_errno() ); } ! function _sql_report($mode, $query = '') { ! global $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; static $sql_report = ''; static $cache_num_queries = 0; switch ($mode) { case 'start': $query_hold = $query; *************** *** 526,557 **** $cache_num_queries++; break; - - case 'stop': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query #' . $this->num_queries . '</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> ' . $html_hold . '<p align="center">'; - - if ($this->query_result) - { - if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query)) - { - $sql_report .= "Affected rows: <b>" . $this->sql_affectedrows($this->query_result) . '</b> | '; - } - $sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $curtime) . 's</b>'; - } - else - { - $error = $this->sql_error(); - $sql_report .= '<b style="color: red">FAILED</b> - MySQL Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); - } - - $sql_report .= '</p>'; - - $this->sql_time += $endtime - $curtime; - break; } } ! } // class sql_db } // if ... define --- 407,413 ---- $cache_num_queries++; break; } } ! } } // if ... define Index: mysql4.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/db/mysql4.php,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -r1.17 -r1.18 *** mysql4.php 5 May 2005 17:00:47 -0000 1.17 --- mysql4.php 17 Aug 2005 15:57:50 -0000 1.18 *************** *** 2,6 **** /** * ! * @package dbal_mysql4 * @version $Id$ * @copyright (c) 2005 phpBB Group --- 2,6 ---- /** * ! * @package dbal * @version $Id$ * @copyright (c) 2005 phpBB Group *************** *** 15,34 **** { ! define('SQL_LAYER', 'mysql4'); /** ! * @package dbal_mysql4 * MySQL4 Database Abstraction Layer * Minimum Requirement is 4.0+/4.1+ */ ! class sql_db { - var $db_connect_id; - var $query_result; - var $return_on_error = false; - var $transaction = false; - var $sql_time = 0; - var $num_queries = 0; - var $open_queries = array(); function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false) --- 15,28 ---- { ! define('SQL_LAYER', 'mysql4'); ! include($phpbb_root_path . 'includes/db/dbal.' . $phpEx); /** ! * @package dbal * MySQL4 Database Abstraction Layer * Minimum Requirement is 4.0+/4.1+ */ ! class dbal_mysql4 extends dbal { function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false) *************** *** 73,86 **** } - function sql_return_on_error($fail = false) - { - $this->return_on_error = $fail; - } - - function sql_num_queries() - { - return $this->num_queries; - } - function sql_transaction($status = 'begin') { --- 67,70 ---- *************** *** 189,248 **** } - // Idea for this from Ikonboard - function sql_build_array($query, $assoc_ary = false) - { - if (!is_array($assoc_ary)) - { - return false; - } - - $fields = array(); - $values = array(); - if ($query == 'INSERT') - { - foreach ($assoc_ary as $key => $var) - { - $fields[] = $key; - - if (is_null($var)) - { - $values[] = 'NULL'; - } - elseif (is_string($var)) - { - $values[] = "'" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? intval($var) : $var; - } - } - - $query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')'; - } - else if ($query == 'UPDATE' || $query == 'SELECT') - { - $values = array(); - foreach ($assoc_ary as $key => $var) - { - if (is_null($var)) - { - $values[] = "$key = NULL"; - } - elseif (is_string($var)) - { - $values[] = "$key = '" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var"; - } - } - $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values); - } - - return $query; - } - // Other query methods // --- 173,176 ---- *************** *** 321,325 **** if (empty($this->row[$query_id]) && empty($this->rowset[$query_id])) { ! if ($this->sql_fetchrow($query_id)) { $result = $this->row[$query_id][$field]; --- 249,253 ---- if (empty($this->row[$query_id]) && empty($this->rowset[$query_id])) { ! if ($this->row[$query_id] = $this->sql_fetchrow($query_id)) { $result = $this->row[$query_id][$field]; *************** *** 381,448 **** } ! function sql_error($sql = '') { ! if (!$this->return_on_error) ! { ! $this_page = (isset($_SERVER['PHP_SELF']) && !empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF']; ! $this_page .= '&' . ((isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : (isset($_ENV['QUERY_STRING']) ? $_ENV['QUERY_STRING'] : '')); ! ! $message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . @mysql_error() . '<br /><br /><u>CALLING PAGE</u><br /><br />' . htmlspecialchars($this_page) . (($sql != '') ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '') . '<br />'; ! ! if ($this->transaction) ! { ! $this->sql_transaction('rollback'); ! } ! ! trigger_error($message, E_USER_ERROR); ! } ! ! $result = array( 'message' => @mysql_error(), 'code' => @mysql_errno() ); - - return $result; } ! function sql_report($mode, $query = '') { ! if (empty($_GET['explain'])) ! { ! return; ! } ! ! global $db, $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; static $sql_report = ''; static $cache_num_queries = 0; - if (!$query && !empty($query_hold)) - { - $query = $query_hold; - } - switch ($mode) { - case 'display': - if (!empty($cache)) - { - $cache->unload(); - } - $db->sql_close(); - - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - - echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n"; - echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n"; - echo 'td.cat { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n"; - echo '</style><title>' . $msg_title . '</title></head><body>'; - echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '"><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">SQL Report</span> </td></tr></table><br clear="all"/><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" . (($cache_num_queries) ? " + $cache_num_queries " . (($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>'; - echo $sql_report; - echo '</td></tr></table><br /></body></html>'; - exit; - break; - case 'start': $query_hold = $query; --- 309,329 ---- } ! function db_sql_error() { ! return array( 'message' => @mysql_error(), 'code' => @mysql_errno() ); } ! function _sql_report($mode, $query = '') { ! global $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; static $sql_report = ''; static $cache_num_queries = 0; switch ($mode) { case 'start': $query_hold = $query; *************** *** 526,557 **** $cache_num_queries++; break; - - case 'stop': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query #' . $this->num_queries . '</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> ' . $html_hold . '<p align="center">'; - - if ($this->query_result) - { - if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query)) - { - $sql_report .= "Affected rows: <b>" . $this->sql_affectedrows($this->query_result) . '</b> | '; - } - $sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $curtime) . 's</b>'; - } - else - { - $error = $this->sql_error(); - $sql_report .= '<b style="color: red">FAILED</b> - MySQL Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); - } - - $sql_report .= '</p>'; - - $this->sql_time += $endtime - $curtime; - break; } } ! } // class sql_db } // if ... define --- 407,413 ---- $cache_num_queries++; break; } } ! } } // if ... define Index: mysqli.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/db/mysqli.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** mysqli.php 22 Apr 2005 17:44:32 -0000 1.1 --- mysqli.php 17 Aug 2005 15:57:50 -0000 1.2 *************** *** 2,6 **** /** * ! * @package dbal_mysqli * @version $Id$ * @copyright (c) 2005 phpBB Group --- 2,6 ---- /** * ! * @package dbal * @version $Id$ * @copyright (c) 2005 phpBB Group *************** *** 15,35 **** { ! define('SQL_LAYER', 'mysqli'); /** ! * @package dbal_mysqli * MySQLi Database Abstraction Layer * Minimum Requirement is MySQL 4.1+ and the mysqli-extension */ ! class sql_db { - var $db_connect_id; - var $query_result; - var $return_on_error = false; - var $transaction = false; - var $sql_time = 0; - var $num_queries = 0; - var $open_queries = array(); - var $indexed = 0; --- 15,28 ---- { ! define('SQL_LAYER', 'mysqli'); ! include($phpbb_root_path . 'includes/db/dbal.' . $phpEx); /** ! * @package dbal * MySQLi Database Abstraction Layer * Minimum Requirement is MySQL 4.1+ and the mysqli-extension */ ! class dbal_mysqli extends dbal { var $indexed = 0; *************** *** 72,85 **** } - function sql_return_on_error($fail = false) - { - $this->return_on_error = $fail; - } - - function sql_num_queries() - { - return $this->num_queries; - } - function sql_transaction($status = 'begin') { --- 65,68 ---- *************** *** 190,249 **** } - // Idea for this from Ikonboard - function sql_build_array($query, $assoc_ary = false) - { - if (!is_array($assoc_ary)) - { - return false; - } - - $fields = array(); - $values = array(); - if ($query == 'INSERT') - { - foreach ($assoc_ary as $key => $var) - { - $fields[] = $key; - - if (is_null($var)) - { - $values[] = 'NULL'; - } - elseif (is_string($var)) - { - $values[] = "'" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? intval($var) : $var; - } - } - - $query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')'; - } - else if ($query == 'UPDATE' || $query == 'SELECT') - { - $values = array(); - foreach ($assoc_ary as $key => $var) - { - if (is_null($var)) - { - $values[] = "$key = NULL"; - } - elseif (is_string($var)) - { - $values[] = "$key = '" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var"; - } - } - $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values); - } - - return $query; - } - // Other query methods // --- 173,176 ---- *************** *** 393,460 **** } ! function sql_error($sql = '') { ! if (!$this->return_on_error) ! { ! $this_page = (isset($_SERVER['PHP_SELF']) && !empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF']; ! $this_page .= '&' . ((isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : (isset($_ENV['QUERY_STRING']) ? $_ENV['QUERY_STRING'] : '')); ! ! $message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . @mysqli_error($this->db_connect_id) . '<br /><br /><u>CALLING PAGE</u><br /><br />' . htmlspecialchars($this_page) . (($sql != '') ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '') . '<br />'; ! ! if ($this->transaction) ! { ! $this->sql_transaction('rollback'); ! } ! ! trigger_error($message, E_USER_ERROR); ! } ! ! $result = array( 'message' => @mysqli_error($this->db_connect_id), 'code' => @mysqli_errno($this->db_connect_id) ); - - return $result; } ! function sql_report($mode, $query = '') { ! if (empty($_GET['explain'])) ! { ! return; ! } ! ! global $db, $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; static $sql_report = ''; static $cache_num_queries = 0; - if (!$query && !empty($query_hold)) - { - $query = $query_hold; - } - switch ($mode) { - case 'display': - if (!empty($cache)) - { - $cache->unload(); - } - $db->sql_close(); - - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - - echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n"; - echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n"; - echo 'td.cat { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n"; - echo '</style><title>' . $msg_title . '</title></head><body>'; - echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '"><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">SQL Report</span> </td></tr></table><br clear="all"/><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" . (($cache_num_queries) ? " + $cache_num_queries " . (($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>'; - echo $sql_report; - echo '</td></tr></table><br /></body></html>'; - exit; - break; - case 'start': $query_hold = $query; --- 320,340 ---- } ! function db_sql_error() { ! return array( 'message' => @mysqli_error($this->db_connect_id), 'code' => @mysqli_errno($this->db_connect_id) ); } ! function _sql_report($mode, $query = '') { ! global $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; static $sql_report = ''; static $cache_num_queries = 0; switch ($mode) { case 'start': $query_hold = $query; *************** *** 538,569 **** $cache_num_queries++; break; - - case 'stop': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query #' . $this->num_queries . '</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> ' . $html_hold . '<p align="center">'; - - if ($this->query_result) - { - if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query)) - { - $sql_report .= "Affected rows: <b>" . $this->sql_affectedrows($this->query_result) . '</b> | '; - } - $sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $curtime) . 's</b>'; - } - else - { - $error = $this->sql_error(); - $sql_report .= '<b style="color: red">FAILED</b> - MySQL Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); - } - - $sql_report .= '</p>'; - - $this->sql_time += $endtime - $curtime; - break; } } ! } // class sql_db } // if ... define --- 418,424 ---- $cache_num_queries++; break; } } ! } } // if ... define Index: oracle.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/db/oracle.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** oracle.php 5 May 2005 17:00:47 -0000 1.4 --- oracle.php 17 Aug 2005 15:57:50 -0000 1.5 *************** *** 2,6 **** /** * ! * @package dbal_oracle * @version $Id$ * @copyright (c) 2005 phpBB Group --- 2,6 ---- /** * ! * @package dbal * @version $Id$ * @copyright (c) 2005 phpBB Group *************** *** 15,34 **** { ! define('SQL_LAYER', 'oracle'); /** ! * @package dbal_oracle * Oracle Database Abstraction Layer */ ! class sql_db { - var $db_connect_id; - var $query_result; - var $return_on_error = false; - var $transaction = false; - var $sql_time = 0; - var $num_queries = 0; - var $open_queries = array(); - var $last_query_text = ''; --- 15,27 ---- { ! define('SQL_LAYER', 'oracle'); ! include($phpbb_root_path . 'includes/db/dbal.' . $phpEx); /** ! * @package dbal * Oracle Database Abstraction Layer */ ! class dbal_oracle extends dbal { var $last_query_text = ''; *************** *** 71,84 **** } - function sql_return_on_error($fail = false) - { - $this->return_on_error = $fail; - } - - function sql_num_queries() - { - return $this->num_queries; - } - function sql_transaction($status = 'begin') { --- 64,67 ---- *************** *** 202,261 **** } - // Idea for this from Ikonboard - function sql_build_array($query, $assoc_ary = false) - { - if (!is_array($assoc_ary)) - { - return false; - } - - $fields = array(); - $values = array(); - if ($query == 'INSERT') - { - foreach ($assoc_ary as $key => $var) - { - $fields[] = $key; - - if (is_null($var)) - { - $values[] = 'NULL'; - } - elseif (is_string($var)) - { - $values[] = "'" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? intval($var) : $var; - } - } - - $query = ' (' . implode(', ', $fields) . ') VALUES (' . implode(', ', $values) . ')'; - } - else if ($query == 'UPDATE' || $query == 'SELECT') - { - $values = array(); - foreach ($assoc_ary as $key => $var) - { - if (is_null($var)) - { - $values[] = "$key = NULL"; - } - elseif (is_string($var)) - { - $values[] = "$key = '" . $this->sql_escape($var) . "'"; - } - else - { - $values[] = (is_bool($var)) ? "$key = " . intval($var) : "$key = $var"; - } - } - $query = implode(($query == 'UPDATE') ? ', ' : ' AND ', $values); - } - - return $query; - } - // Other query methods // --- 185,188 ---- *************** *** 452,456 **** } ! function sql_error($sql = '') { $error = @ocierror(); --- 379,383 ---- } ! function db_sql_error() { $error = @ocierror(); *************** *** 467,495 **** } - if (!$this->return_on_error) - { - $this_page = (isset($_SERVER['PHP_SELF']) && !empty($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : $_ENV['PHP_SELF']; - $this_page .= '&' . ((isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : (isset($_ENV['QUERY_STRING']) ? $_ENV['QUERY_STRING'] : '')); - - $message = '<u>SQL ERROR</u> [ ' . SQL_LAYER . ' ]<br /><br />' . $error['message'] . ' [' . $error['code'] . ']<br /><br /><u>CALLING PAGE</u><br /><br />' . htmlspecialchars($this_page) . (($sql != '') ? '<br /><br /><u>SQL</u><br /><br />' . $sql : '') . '<br />'; - - if ($this->transaction) - { - $this->sql_transaction('rollback'); - } - - trigger_error($message, E_USER_ERROR); - } - return $error; } ! function sql_report($mode, $query = '') { - if (empty($_GET['explain'])) - { - return; - } - global $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; --- 394,402 ---- } return $error; } ! function _sql_report($mode, $query = '') { global $cache, $starttime, $phpbb_root_path; static $curtime, $query_hold, $html_hold; *************** *** 497,527 **** static $cache_num_queries = 0; - if (!$query && !empty($query_hold)) - { - $query = $query_hold; - } - switch ($mode) { - case 'display': - if (!empty($cache)) - { - $cache->unload(); - } - $this->sql_close(); - - $mtime = explode(' ', microtime()); - $totaltime = $mtime[0] + $mtime[1] - $starttime; - - echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head><meta http-equiv="Content-Type" content="text/html; charset=iso-8869-1"><meta http-equiv="Content-Style-Type" content="text/css"><link rel="stylesheet" href="' . $phpbb_root_path . 'adm/subSilver.css" type="text/css"><style type="text/css">' . "\n"; - echo 'th { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic3.gif\') }' . "\n"; - echo 'td.cat { background-image: url(\'' . $phpbb_root_path . 'adm/images/cellpic1.gif\') }' . "\n"; - echo '</style><title>' . $msg_title . '</title></head><body>'; - echo '<table width="100%" cellspacing="0" cellpadding="0" border="0"><tr><td><a href="' . htmlspecialchars(preg_replace('/&explain=([^&]*)/', '', $_SERVER['REQUEST_URI'])) . '"><img src="' . $phpbb_root_path . 'adm/images/header_left.jpg" width="200" height="60" alt="phpBB Logo" title="phpBB Logo" border="0"/></a></td><td width="100%" background="' . $phpbb_root_path . 'adm/images/header_bg.jpg" height="60" align="right" nowrap="nowrap"><span class="maintitle">SQL Report</span> </td></tr></table><br clear="all"/><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" . (($cache_num_queries) ? " + $cache_num_queries " . (($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>'; - echo $sql_report; - echo '</td></tr></table><br /></body></html>'; - exit; - break; - case 'start': $query_hold = $query; --- 404,409 ---- *************** *** 561,594 **** $cache_num_queries++; break; - - case 'stop': - $endtime = explode(' ', microtime()); - $endtime = $endtime[0] + $endtime[1]; - - $sql_report .= '<hr width="100%"/><br /><table class="bg" width="100%" cellspacing="1" cellpadding="4" border="0"><tr><th>Query #' . $this->num_queries . '</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> ' . $html_hold . '<p align="center">'; - - if ($this->query_result) - { - if (preg_match('/^(UPDATE|DELETE|REPLACE)/', $query)) - { - $sql_report .= "Affected rows: <b>" . $this->sql_affectedrows($this->query_result) . '</b> | '; - } - $sql_report .= 'Before: ' . sprintf('%.5f', $curtime - $starttime) . 's | After: ' . sprintf('%.5f', $endtime - $starttime) . 's | Elapsed: <b>' . sprintf('%.5f', $endtime - $curtime) . 's</b>'; - } - else - { - $error = $this->sql_error(); - $sql_report .= '<b style="color: red">FAILED</b> - ' . SQL_LAYER . ' Error ' . $error['code'] . ': ' . htmlspecialchars($error['message']); - } - - $sql_report .= '</p>'; - - $this->sql_time += $endtime - $curtime; - break; } } ! } // class sql_db } // if ... define --- 443,451 ---- $cache_num_queries++; break; } } ! } } // if ... define Index: postgres.php =================================================================== RCS file: /cvsroot/phpbb/phpBB2/includes/db/postgres.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** postgres.php 20 Apr 2005 20:47:03 -0000 1.8 --- postgres.php 17 Aug 2005 15:57:50 -0000 1.9 *************** *** 2,6 **** /** * ! * @package dbal_postgres * @version $Id$ * @copyright (c) 2005 phpBB Group --- 2,6 ---- /** * ! * @package dbal * @version $Id$ * @copyright (c) 2005 phpBB Group *************** *** 15,34 **** { ! define('SQL_LAYER', 'postgresql'); /** ! * @package dbal_postgres * PostgreSQL Database Abstraction Layer * Minimum Requirement is Version 7.3+ */ ! class sql_db { - var $db_connect_id; - var $query_result; - var $return_on_error = false; - var $transaction = false; - var $sql_time = 0; - var $num_queries = 0; - var $open_queries = array(); function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false) --- 15,28 ---- { ! define('SQL_LAYER', 'postgresql'); ! include($phpbb_root_path . 'includes/db/dbal.' . $phpEx); /** ! * @package dbal * PostgreSQL Database Abstraction Layer * Minimum Requirement is Version 7.3+ */ ! class dbal_postgres extends dbal { function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = false, $persistency = false) *************** *** 98,111 **** } - function sql_return_on_error($fail = false) - { - $this->return_on_error = $fail; - } - - function sql_num_queries() - { - return $this->num_queries; - } - function sql_transaction($status = 'begin') { --- ... [truncated message content] |
