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

- finally removed sql_numrows

Browse source 
- sql_fetchfield now in dbal.php
- check query id correctly as well as other tiny fixes


git-svn-id: file:///svn/phpbb/trunk@6439 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-10-04 15:15:40 +00:00
parent f7f6e9bcde
commit 26aba1a1f1
12 changed files with 122 additions and 516 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -410,14 +410,6 @@ class acm
return false; return false;
} }
/**
* Fetch the number of rows from cache (database)
*/
function sql_numrows($query_id)
{
return sizeof($this->sql_rowset[$query_id]);
}
/** /**
* Fetch a field from the current row of a cached database result (database) * Fetch a field from the current row of a cached database result (database)
*/ */

36
phpBB/includes/db/dbal.php
View file

@ -110,12 +110,12 @@ class dbal
*/ */
function sql_fetchrowset($query_id = false) function sql_fetchrowset($query_id = false)
{ {
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
if ($query_id) if ($query_id !== false)
{ {
$result = array(); $result = array();
while ($row = $this->sql_fetchrow($query_id)) while ($row = $this->sql_fetchrow($query_id))
@ -129,6 +129,38 @@ class dbal
return false; return false;
} }
/**
* Fetch field
* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
*/
function sql_fetchfield($field, $rownum = false, $query_id = false)
{
global $cache;
if ($query_id === false)
{
$query_id = $this->query_result;
}
if ($query_id !== false)
{
if ($rownum !== false)
{
$this->sql_rowseek($rownum, $query_id);
}
if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_fetchfield($query_id, $field);
}
$row = $this->sql_fetchrow($query_id);
return (isset($row[$field])) ? $row[$field] : false;
}
return false;
}
/** /**
* SQL Transaction * SQL Transaction
* @access private * @access private

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

@ -165,39 +165,6 @@ class dbal_firebird extends dbal
} }
} }
/**
* Return number of rows
* Not used within core code
*/
function sql_numrows($query_id = false)//(&$query_id)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_numrows($query_id);
}
/*
$num_rows = 0;
while ($this->sql_fetchrow($query_id))
{
$num_rows++;
}
// leave the query_id alone, it never hurt anybody
$query_id = $this->sql_query($this->last_query_text);
return $num_rows;
*/
return false;
}
/** /**
* Return number of affected rows * Return number of affected rows
*/ */
@ -221,7 +188,7 @@ class dbal_firebird extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -231,6 +198,11 @@ class dbal_firebird extends dbal
return $cache->sql_fetchrow($query_id); return $cache->sql_fetchrow($query_id);
} }
if ($query_id === false)
{
return false;
}
$row = array(); $row = array();
$cur_row = @ibase_fetch_object($query_id, IBASE_TEXT); $cur_row = @ibase_fetch_object($query_id, IBASE_TEXT);
@ -247,38 +219,6 @@ class dbal_firebird extends dbal
return (sizeof($row)) ? $row : false; return (sizeof($row)) ? $row : false;
} }
/**
* Fetch field
* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
*/
function sql_fetchfield($field, $rownum = false, $query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if ($query_id)
{
if ($rownum !== false)
{
$this->sql_rowseek($rownum, $query_id);
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_fetchfield($query_id, $field);
}
$row = $this->sql_fetchrow($query_id);
return isset($row[$field]) ? $row[$field] : false;
}
return false;
}
/** /**
* Seek to given row number * Seek to given row number
* rownum is zero-based * rownum is zero-based
@ -287,7 +227,7 @@ class dbal_firebird extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -297,6 +237,19 @@ class dbal_firebird extends dbal
return $cache->sql_rowseek($rownum, $query_id); return $cache->sql_rowseek($rownum, $query_id);
} }
if ($query_id === false)
{
return;
}
$this->sql_freeresult($query_id);
$query_id = $this->sql_query($this->last_query_text);
if ($query_id === false)
{
return false;
}
// 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
for ($i = 0; $i < $rownum; $i++) for ($i = 0; $i < $rownum; $i++)
{ {
@ -316,7 +269,7 @@ class dbal_firebird extends dbal
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
if ($query_id && $this->last_query_text != '') if ($query_id !== false && $this->last_query_text != '')
{ {
if ($this->query_result && preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename)) if ($this->query_result && preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename))
{ {
@ -344,7 +297,7 @@ class dbal_firebird extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }

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

@ -202,27 +202,6 @@ class dbal_mssql extends dbal
} }
} }
/**
* Return number of rows
* Not used within core code
*/
function sql_numrows($query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_numrows($query_id);
}
return ($query_id) ? @mssql_num_rows($query_id) : false;
}
/** /**
* Return number of affected rows * Return number of affected rows
*/ */
@ -238,7 +217,7 @@ class dbal_mssql extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -248,6 +227,11 @@ class dbal_mssql extends dbal
return $cache->sql_fetchrow($query_id); return $cache->sql_fetchrow($query_id);
} }
if ($query_id === false)
{
return false;
}
$row = @mssql_fetch_assoc($query_id); $row = @mssql_fetch_assoc($query_id);
// I hope i am able to remove this later... hopefully only a PHP or MSSQL bug // I hope i am able to remove this later... hopefully only a PHP or MSSQL bug
@ -262,38 +246,6 @@ class dbal_mssql extends dbal
return $row; return $row;
} }
/**
* Fetch field
* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
*/
function sql_fetchfield($field, $rownum = false, $query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if ($query_id)
{
if ($rownum !== false)
{
$this->sql_rowseek($rownum, $query_id);
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_fetchfield($query_id, $field);
}
$row = $this->sql_fetchrow($query_id);
return isset($row[$field]) ? $row[$field] : false;
}
return false;
}
/** /**
* Seek to given row number * Seek to given row number
* rownum is zero-based * rownum is zero-based
@ -302,7 +254,7 @@ class dbal_mssql extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -312,7 +264,7 @@ class dbal_mssql extends dbal
return $cache->sql_rowseek($rownum, $query_id); return $cache->sql_rowseek($rownum, $query_id);
} }
return ($query_id) ? @mssql_data_seek($query_id, $rownum) : false; return ($query_id !== false) ? @mssql_data_seek($query_id, $rownum) : false;
} }
/** /**
@ -341,7 +293,7 @@ class dbal_mssql extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }

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

@ -201,27 +201,6 @@ class dbal_mssql_odbc extends dbal
} }
} }
/**
* Return number of rows
* Not used within core code
*/
function sql_numrows($query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_numrows($query_id);
}
return ($query_id) ? @odbc_num_rows($query_id) : false;
}
/** /**
* Return number of affected rows * Return number of affected rows
*/ */
@ -237,7 +216,7 @@ class dbal_mssql_odbc extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -247,39 +226,7 @@ class dbal_mssql_odbc extends dbal
return $cache->sql_fetchrow($query_id); return $cache->sql_fetchrow($query_id);
} }
return ($query_id) ? @odbc_fetch_array($query_id) : false; return ($query_id !== false) ? @odbc_fetch_array($query_id) : false;
}
/**
* Fetch field
* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
*/
function sql_fetchfield($field, $rownum = false, $query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if ($query_id)
{
if ($rownum !== false)
{
$this->sql_rowseek($rownum, $query_id);
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_fetchfield($query_id, $field);
}
$row = $this->sql_fetchrow($query_id);
return isset($row[$field]) ? $row[$field] : false;
}
return false;
} }
/** /**
@ -290,7 +237,7 @@ class dbal_mssql_odbc extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -300,10 +247,15 @@ class dbal_mssql_odbc extends dbal
return $cache->sql_rowseek($rownum, $query_id); return $cache->sql_rowseek($rownum, $query_id);
} }
if ($query_id === false)
{
return false;
}
$this->sql_freeresult($query_id); $this->sql_freeresult($query_id);
$query_id = $this->sql_query($this->last_query_text); $query_id = $this->sql_query($this->last_query_text);
if (!$query_id) if ($query_id === false)
{ {
return false; return false;
} }
@ -348,7 +300,7 @@ class dbal_mssql_odbc extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }

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

@ -193,27 +193,6 @@ class dbal_mysql extends dbal
} }
} }
/**
* Return number of rows
* Not used within core code
*/
function sql_numrows($query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_numrows($query_id);
}
return ($query_id) ? @mysql_num_rows($query_id) : false;
}
/** /**
* Return number of affected rows * Return number of affected rows
*/ */
@ -229,7 +208,7 @@ class dbal_mysql extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -239,47 +218,7 @@ class dbal_mysql extends dbal
return $cache->sql_fetchrow($query_id); return $cache->sql_fetchrow($query_id);
} }
return ($query_id) ? @mysql_fetch_assoc($query_id) : false; return ($query_id !== false) ? @mysql_fetch_assoc($query_id) : false;
}
/**
* Fetch field
* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
*/
function sql_fetchfield($field, $rownum = false, $query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if ($query_id)
{
if ($rownum === false)
{
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_fetchfield($query_id, $field);
}
$row = $this->sql_fetchrow($query_id);
return isset($row[$field]) ? $row[$field] : false;
}
else
{
if (isset($cache->sql_rowset[$query_id]))
{
$cache->sql_rowseek($rownum, $query_id);
return $cache->sql_fetchfield($query_id, $field);
}
return @mysql_result($query_id, $rownum, $field);
}
}
return false;
} }
/** /**
@ -290,7 +229,7 @@ class dbal_mysql extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -300,7 +239,7 @@ class dbal_mysql extends dbal
return $cache->sql_rowseek($rownum, $query_id); return $cache->sql_rowseek($rownum, $query_id);
} }
return ($query_id) ? @mysql_data_seek($query_id, $rownum) : false; return ($query_id !== false) ? @mysql_data_seek($query_id, $rownum) : false;
} }
/** /**
@ -318,7 +257,7 @@ class dbal_mysql extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }

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

@ -174,27 +174,6 @@ class dbal_mysqli extends dbal
} }
} }
/**
* Return number of rows
* Not used within core code
*/
function sql_numrows($query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_numrows($query_id);
}
return ($query_id) ? @mysqli_num_rows($query_id) : false;
}
/** /**
* Return number of affected rows * Return number of affected rows
*/ */
@ -210,7 +189,7 @@ class dbal_mysqli extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -220,39 +199,7 @@ class dbal_mysqli extends dbal
return $cache->sql_fetchrow($query_id); return $cache->sql_fetchrow($query_id);
} }
return ($query_id) ? @mysqli_fetch_assoc($query_id) : false; return ($query_id !== false) ? @mysqli_fetch_assoc($query_id) : false;
}
/**
* Fetch field
* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
*/
function sql_fetchfield($field, $rownum = false, $query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if ($query_id)
{
if ($rownum !== false)
{
$this->sql_rowseek($rownum, $query_id);
}
if (!is_object($query_id) && isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_fetchfield($query_id, $field);
}
$row = $this->sql_fetchrow($query_id);
return isset($row[$field]) ? $row[$field] : false;
}
return false;
} }
/** /**
@ -263,7 +210,7 @@ class dbal_mysqli extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -273,7 +220,7 @@ class dbal_mysqli extends dbal
return $cache->sql_rowseek($rownum, $query_id); return $cache->sql_rowseek($rownum, $query_id);
} }
return ($query_id) ? @mysqli_data_seek($query_id, $rownum) : false; return ($query_id !== false) ? @mysqli_data_seek($query_id, $rownum) : false;
} }
/** /**
@ -291,7 +238,7 @@ class dbal_mysqli extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }

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

@ -281,33 +281,6 @@ class dbal_oracle extends dbal
} }
} }
/**
* Return number of rows
* Not used within core code
*/
function sql_numrows($query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_numrows($query_id);
}
$result = @ocifetchstatement($query_id, $this->rowset);
// OCIFetchStatment kills our query result so we have to execute the statment again
// if we ever want to use the query_id again.
@ociexecute($query_id, OCI_DEFAULT);
return $result;
}
/** /**
* Return number of affected rows * Return number of affected rows
*/ */
@ -323,7 +296,7 @@ class dbal_oracle extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -333,56 +306,29 @@ class dbal_oracle extends dbal
return $cache->sql_fetchrow($query_id); return $cache->sql_fetchrow($query_id);
} }
$row = array(); if ($query_id !== false)
$result = @ocifetchinto($query_id, $row, OCI_ASSOC + OCI_RETURN_NULLS);
if (!$result || !$row)
{ {
return false; $row = array();
} $result = @ocifetchinto($query_id, $row, OCI_ASSOC + OCI_RETURN_NULLS);
$result_row = array(); if (!$result || !$row)
foreach ($row as $key => $value)
{
// OCI->CLOB?
if (is_object($value))
{ {
$value = $value->load(); return false;
} }
$result_row[strtolower($key)] = $value; $result_row = array();
} foreach ($row as $key => $value)
return ($query_id) ? $result_row : false;
}
/**
* Fetch field
* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
*/
function sql_fetchfield($field, $rownum = false, $query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if ($query_id)
{
if ($rownum !== false)
{ {
$this->sql_rowseek($rownum, $query_id); // OCI->CLOB?
if (is_object($value))
{
$value = $value->load();
}
$result_row[strtolower($key)] = $value;
} }
if (isset($cache->sql_rowset[$query_id])) return $result_row;
{
return $cache->sql_fetchfield($query_id, $field);
}
$row = $this->sql_fetchrow($query_id);
return isset($row[$field]) ? $row[$field] : false;
} }
return false; return false;
@ -396,7 +342,7 @@ class dbal_oracle extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -406,7 +352,7 @@ class dbal_oracle extends dbal
return $cache->sql_rowseek($rownum, $query_id); return $cache->sql_rowseek($rownum, $query_id);
} }
if (!$query_id) if ($query_id === false)
{ {
return false; return false;
} }
@ -433,7 +379,7 @@ class dbal_oracle extends dbal
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
if ($query_id && $this->last_query_text != '') if ($query_id !== false && $this->last_query_text != '')
{ {
if (preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename)) if (preg_match('#^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)#is', $this->last_query_text, $tablename))
{ {
@ -465,7 +411,7 @@ class dbal_oracle extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }

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

@ -98,6 +98,8 @@ class dbal_postgres extends dbal
{ {
$query_id = @pg_query($this->db_connect_id, 'select version()'); $query_id = @pg_query($this->db_connect_id, 'select version()');
$row = @pg_fetch_assoc($query_id, null); $row = @pg_fetch_assoc($query_id, null);
@pg_free_result($query_id);
$version = $row['version']; $version = $row['version'];
return ((!empty($version)) ? ' ' . $version : ''); return ((!empty($version)) ? ' ' . $version : '');
} }
@ -221,27 +223,6 @@ class dbal_postgres extends dbal
} }
} }
/**
* Return number of rows
* Not used within core code
*/
function sql_numrows($query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_numrows($query_id);
}
return ($query_id) ? @pg_num_rows($query_id) : false;
}
/** /**
* Return number of affected rows * Return number of affected rows
*/ */
@ -257,7 +238,7 @@ class dbal_postgres extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -267,41 +248,7 @@ class dbal_postgres extends dbal
return $cache->sql_fetchrow($query_id); return $cache->sql_fetchrow($query_id);
} }
$row = @pg_fetch_assoc($query_id, null); return ($query_id !== false) ? @pg_fetch_assoc($query_id, null) : false;
return ($query_id) ? $row : false;
}
/**
* Fetch field
* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
*/
function sql_fetchfield($field, $rownum = false, $query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if ($query_id)
{
if ($rownum !== false)
{
$this->sql_rowseek($rownum, $query_id);
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_fetchfield($query_id, $field);
}
$row = $this->sql_fetchrow($query_id);
return isset($row[$field]) ? $row[$field] : false;
}
return false;
} }
/** /**
@ -312,7 +259,7 @@ class dbal_postgres extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -322,7 +269,7 @@ class dbal_postgres extends dbal
return $cache->sql_rowseek($rownum, $query_id); return $cache->sql_rowseek($rownum, $query_id);
} }
return ($query_id) ? @pg_result_seek($query_id, $rownum) : false; return ($query_id !== false) ? @pg_result_seek($query_id, $rownum) : false;
} }
/** /**
@ -332,7 +279,7 @@ class dbal_postgres extends dbal
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
if ($query_id && $this->last_query_text != '') if ($query_id !== false && $this->last_query_text != '')
{ {
if (preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text, $tablename)) if (preg_match("/^INSERT[\t\n ]+INTO[\t\n ]+([a-z0-9\_\-]+)/is", $this->last_query_text, $tablename))
{ {
@ -361,7 +308,7 @@ class dbal_postgres extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }

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

@ -169,27 +169,6 @@ class dbal_sqlite extends dbal
} }
} }
/**
* Return number of rows
* Not used within core code
*/
function sql_numrows($query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_numrows($query_id);
}
return ($query_id) ? @sqlite_num_rows($query_id) : false;
}
/** /**
* Return number of affected rows * Return number of affected rows
*/ */
@ -205,7 +184,7 @@ class dbal_sqlite extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -215,40 +194,7 @@ class dbal_sqlite extends dbal
return $cache->sql_fetchrow($query_id); return $cache->sql_fetchrow($query_id);
} }
$row = @sqlite_fetch_array($query_id, SQLITE_ASSOC); return ($query_id !== false) ? @sqlite_fetch_array($query_id, SQLITE_ASSOC) : false;
return $row;
}
/**
* Fetch field
* if rownum is false, the current row is used, else it is pointing to the row (zero-based)
*/
function sql_fetchfield($field, $rownum = false, $query_id = false)
{
global $cache;
if (!$query_id)
{
$query_id = $this->query_result;
}
if ($query_id)
{
if ($rownum !== false)
{
$this->sql_rowseek($rownum, $query_id);
}
if (isset($cache->sql_rowset[$query_id]))
{
return $cache->sql_fetchfield($query_id, $field);
}
return @sqlite_column($query_id, $field);
}
return false;
} }
/** /**
@ -259,7 +205,7 @@ class dbal_sqlite extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }
@ -269,7 +215,7 @@ class dbal_sqlite extends dbal
return $cache->sql_rowseek($rownum, $query_id); return $cache->sql_rowseek($rownum, $query_id);
} }
return ($query_id) ? @sqlite_seek($query_id, $rownum) : false; return ($query_id !== false) ? @sqlite_seek($query_id, $rownum) : false;
} }
/** /**
@ -287,7 +233,7 @@ class dbal_sqlite extends dbal
{ {
global $cache; global $cache;
if (!$query_id) if ($query_id === false)
{ {
$query_id = $this->query_result; $query_id = $this->query_result;
} }

2
phpBB/includes/functions_display.php
View file

@ -339,7 +339,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'FORUM_ID' => $row['forum_id'], 'FORUM_ID' => $row['forum_id'],
'FORUM_NAME' => $row['forum_name'], 'FORUM_NAME' => $row['forum_name'],
'FORUM_DESC' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']), 'FORUM_DESC' => generate_text_for_display($row['forum_desc'], $row['forum_desc_uid'], $row['forum_desc_bitfield'], $row['forum_desc_options']),
'TOPICS' => ($auth->acl_get('m_approve', $forum_id)) ? $row['forum_topics_real'] : $row['forum_topics'], 'TOPICS' => $row['forum_topics'],
$l_post_click_count => $post_click_count, $l_post_click_count => $post_click_count,
'FORUM_FOLDER_IMG' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '" />' : $user->img($folder_image, $folder_alt), 'FORUM_FOLDER_IMG' => ($row['forum_image']) ? '<img src="' . $phpbb_root_path . $row['forum_image'] . '" alt="' . $user->lang[$folder_alt] . '" />' : $user->img($folder_image, $folder_alt),
'FORUM_FOLDER_IMG_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : $user->img($folder_image, $folder_alt, false, '', 'src'), 'FORUM_FOLDER_IMG_SRC' => ($row['forum_image']) ? $phpbb_root_path . $row['forum_image'] : $user->img($folder_image, $folder_alt, false, '', 'src'),

4
phpBB/includes/ucp/ucp_profile.php
View file

@ -122,7 +122,7 @@ class ucp_profile
if ($config['email_enable'] && $email != $user->data['user_email'] && $user->data['user_type'] != USER_FOUNDER && ($config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN)) if ($config['email_enable'] && $email != $user->data['user_email'] && $user->data['user_type'] != USER_FOUNDER && ($config['require_activation'] == USER_ACTIVATION_SELF || $config['require_activation'] == USER_ACTIVATION_ADMIN))
{ {
include_once($phpbb_root_path . 'includes/functions_messenger.'.$phpEx); include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx);
$server_url = generate_board_url(); $server_url = generate_board_url();
@ -185,7 +185,7 @@ class ucp_profile
$messenger->save_queue(); $messenger->save_queue();
user_active_flip('deactivate', $user_id, INACTIVE_PROFILE); user_active_flip('deactivate', $user->data['user_id'], INACTIVE_PROFILE);
$sql_ary += array( $sql_ary += array(
'user_actkey' => $user_actkey, 'user_actkey' => $user_actkey,