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

made sql_rowseek consistent with the dbal methods as well as fixing sql_query_limit for mssql, especially if sql_query_limit($sql, 0, 0) is given...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6389 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-09-23 11:10:37 +00:00
parent 7542fabaa7
commit 6d08ef7b3a
13 changed files with 42 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/acp_bots.html
View file

@ -89,7 +89,7 @@
<input class="button2" name="add" type="submit" value="{L_BOT_ADD}" /> <input class="button2" name="add" type="submit" value="{L_BOT_ADD}" />
</fieldset> </fieldset>
<fieldset class="quick"> <fieldset class="quick" style="float: right;">
<select name="action">{S_BOT_OPTIONS}</select> <select name="action">{S_BOT_OPTIONS}</select>
<input class="button2" name="submit" type="submit" value="{L_SUBMIT}" /> <input class="button2" name="submit" type="submit" value="{L_SUBMIT}" />
</fieldset> </fieldset>

2
phpBB/includes/acm/acm_file.php
View file

@ -424,7 +424,7 @@ class acm
/** /**
* Seek a specific row in an a cached database result (database) * Seek a specific row in an a cached database result (database)
*/ */
function sql_rowseek($query_id, $rownum) function sql_rowseek($rownum, $query_id)
{ {
if ($rownum >= sizeof($this->sql_rowset[$query_id])) if ($rownum >= sizeof($this->sql_rowset[$query_id]))
{ {

2
phpBB/includes/db/firebird.php
View file

@ -281,7 +281,7 @@ class dbal_firebird extends dbal
if (isset($cache->sql_rowset[$query_id])) if (isset($cache->sql_rowset[$query_id]))
{ {
return $cache->sql_rowseek($query_id, $rownum); return $cache->sql_rowseek($rownum, $query_id);
} }
// We do not fetch the row for rownum == 0 because then the next resultset would be the second row // We do not fetch the row for rownum == 0 because then the next resultset would be the second row

34
phpBB/includes/db/mssql.php
View file

@ -172,30 +172,26 @@ class dbal_mssql extends dbal
{ {
$this->query_result = false; $this->query_result = false;
// if $total is set to 0 we do not want to limit the number of rows // Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows)
if ($total == 0) if ($total)
{ {
$total = -1; // We need to grab the total number of rows + the offset number of rows to get the correct result
} if (strpos($query, 'SELECT DISTINCT') === 0)
{
$row_offset = ($total) ? $offset : ''; $query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15);
$num_rows = ($total) ? $total : $offset; }
else
if (strpos($query, 'SELECT DISTINCT') === 0) {
{ $query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6);
$query = 'SELECT DISTINCT TOP ' . ($row_offset + $num_rows) . ' ' . substr($query, 15); }
}
else
{
$query = 'SELECT TOP ' . ($row_offset + $num_rows) . ' ' . substr($query, 6);
} }
$result = $this->sql_query($query, $cache_ttl); $result = $this->sql_query($query, $cache_ttl);
// Seek by $row_offset rows // Seek by $offset rows
if ($row_offset) if ($offset)
{ {
$this->sql_rowseek($result, $row_offset); $this->sql_rowseek($offset, $result);
} }
return $result; return $result;
@ -313,7 +309,7 @@ class dbal_mssql extends dbal
if (isset($cache->sql_rowset[$query_id])) if (isset($cache->sql_rowset[$query_id]))
{ {
return $cache->sql_rowseek($query_id, $rownum); return $cache->sql_rowseek($rownum, $query_id);
} }
return ($query_id) ? @mssql_data_seek($query_id, $rownum) : false; return ($query_id) ? @mssql_data_seek($query_id, $rownum) : false;

37
phpBB/includes/db/mssql_odbc.php
View file

@ -168,33 +168,26 @@ class dbal_mssql_odbc extends dbal
{ {
$this->query_result = false; $this->query_result = false;
// if $total is set to 0 we do not want to limit the number of rows // Since TOP is only returning a set number of rows we won't need it if total is set to 0 (return all rows)
if ($total == 0) if ($total)
{ {
$total = -1; // We need to grab the total number of rows + the offset number of rows to get the correct result
} if (strpos($query, 'SELECT DISTINCT') === 0)
{
$row_offset = ($total) ? $offset : 0; $query = 'SELECT DISTINCT TOP ' . ($total + $offset) . ' ' . substr($query, 15);
$num_rows = ($total) ? $total : $offset; }
else
if (strpos($query, 'SELECT DISTINCT') === 0) {
{ $query = 'SELECT TOP ' . ($total + $offset) . ' ' . substr($query, 6);
$query = 'SELECT DISTINCT TOP ' . ($row_offset + $num_rows) . ' ' . substr($query, 15); }
}
else
{
$query = 'SELECT TOP ' . ($row_offset + $num_rows) . ' ' . substr($query, 6);
} }
$result = $this->sql_query($query, $cache_ttl); $result = $this->sql_query($query, $cache_ttl);
// Seek by $row_offset rows // Seek by $offset rows
if ($row_offset) if ($offset)
{ {
for ($i = 0; $i < $row_offset; $i++) $this->sql_rowseek($offset, $result);
{
$this->sql_fetchrow($result);
}
} }
return $result; return $result;
@ -301,7 +294,7 @@ class dbal_mssql_odbc extends dbal
if (isset($cache->sql_rowset[$query_id])) if (isset($cache->sql_rowset[$query_id]))
{ {
return $cache->sql_rowseek($query_id, $rownum); return $cache->sql_rowseek($rownum, $query_id);
} }
$this->sql_freeresult($query_id); $this->sql_freeresult($query_id);

4
phpBB/includes/db/mysql.php
View file

@ -249,7 +249,7 @@ class dbal_mysql extends dbal
{ {
if (isset($cache->sql_rowset[$query_id])) if (isset($cache->sql_rowset[$query_id]))
{ {
$cache->sql_rowseek($query_id, $rownum); $cache->sql_rowseek($rownum, $query_id);
return $cache->sql_fetchfield($query_id, $field); return $cache->sql_fetchfield($query_id, $field);
} }
@ -275,7 +275,7 @@ class dbal_mysql extends dbal
if (isset($cache->sql_rowset[$query_id])) if (isset($cache->sql_rowset[$query_id]))
{ {
return $cache->sql_rowseek($query_id, $rownum); return $cache->sql_rowseek($rownum, $query_id);
} }
return ($query_id) ? @mysql_data_seek($query_id, $rownum) : false; return ($query_id) ? @mysql_data_seek($query_id, $rownum) : false;

4
phpBB/includes/db/mysql4.php
View file

@ -252,7 +252,7 @@ class dbal_mysql4 extends dbal
{ {
if (isset($cache->sql_rowset[$query_id])) if (isset($cache->sql_rowset[$query_id]))
{ {
$cache->sql_rowseek($query_id, $rownum); $cache->sql_rowseek($rownum, $query_id);
return $cache->sql_fetchfield($query_id, $field); return $cache->sql_fetchfield($query_id, $field);
} }
@ -278,7 +278,7 @@ class dbal_mysql4 extends dbal
if (isset($cache->sql_rowset[$query_id])) if (isset($cache->sql_rowset[$query_id]))
{ {
return $cache->sql_rowseek($query_id, $rownum); return $cache->sql_rowseek($rownum, $query_id);
} }
return ($query_id) ? @mysql_data_seek($query_id, $rownum) : false; return ($query_id) ? @mysql_data_seek($query_id, $rownum) : false;

2
phpBB/includes/db/mysqli.php
View file

@ -270,7 +270,7 @@ class dbal_mysqli extends dbal
if (!is_object($query_id) && isset($cache->sql_rowset[$query_id])) if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
{ {
return $cache->sql_rowseek($query_id, $rownum); return $cache->sql_rowseek($rownum, $query_id);
} }
return ($query_id) ? @mysqli_data_seek($query_id, $rownum) : false; return ($query_id) ? @mysqli_data_seek($query_id, $rownum) : false;

2
phpBB/includes/db/oracle.php
View file

@ -403,7 +403,7 @@ class dbal_oracle extends dbal
if (isset($cache->sql_rowset[$query_id])) if (isset($cache->sql_rowset[$query_id]))
{ {
return $cache->sql_rowseek($query_id, $rownum); return $cache->sql_rowseek($rownum, $query_id);
} }
if (!$query_id) if (!$query_id)

2
phpBB/includes/db/postgres.php
View file

@ -319,7 +319,7 @@ class dbal_postgres extends dbal
if (isset($cache->sql_rowset[$query_id])) if (isset($cache->sql_rowset[$query_id]))
{ {
return $cache->sql_rowseek($query_id, $rownum); return $cache->sql_rowseek($rownum, $query_id);
} }
return ($query_id) ? @pg_result_seek($query_id, $rownum) : false; return ($query_id) ? @pg_result_seek($query_id, $rownum) : false;

2
phpBB/includes/db/sqlite.php
View file

@ -266,7 +266,7 @@ class dbal_sqlite extends dbal
if (isset($cache->sql_rowset[$query_id])) if (isset($cache->sql_rowset[$query_id]))
{ {
return $cache->sql_rowseek($query_id, $rownum); return $cache->sql_rowseek($rownum, $query_id);
} }
return ($query_id) ? @sqlite_seek($query_id, $rownum) : false; return ($query_id) ? @sqlite_seek($query_id, $rownum) : false;

5
phpBB/includes/functions_messenger.php
View file

@ -1358,11 +1358,6 @@ class smtp_class
*/ */
function mail_encode($str) function mail_encode($str)
{ {
if ($encoding == '')
{
return $str;
}
// define start delimimter, end delimiter and spacer // define start delimimter, end delimiter and spacer
$end = "?="; $end = "?=";
$start = "=?UTF-8?B?"; $start = "=?UTF-8?B?";

2
phpBB/includes/mcp/mcp_reports.php
View file

@ -364,7 +364,7 @@ function close_report($post_id_list, $mode, $action)
trigger_error('NOT_AUTHORIZED'); trigger_error('NOT_AUTHORIZED');
} }
if (($action == 'delete') && (strpos($user->data['session_page'], 'mode=report_details') !== false)) if ($action == 'delete' && strpos($user->data['session_page'], 'mode=report_details') !== false)
{ {
$redirect = request_var('redirect', build_url(array('mode')) . '&amp;mode=reports'); $redirect = request_var('redirect', build_url(array('mode')) . '&amp;mode=reports');
} }