mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Fix various var not set warnings ... many thanks go to The Horta for pointing out and offering fixes for many of these

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@1997 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen
2002-01-28 17:25:58 +00:00
parent 4c87b7480e
commit e46d624c6b
13 changed files with 162 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

224
phpBB/db/mysql4.php
View File

@@ -4,7 +4,7 @@
* -------------------
* begin : Saturday, Feb 13, 2001
* copyright : (C) 2001 The phpBB Group
* email : support@phpbb.com
* email : supportphpbb.com
*
* $Id$
*
@@ -29,7 +29,8 @@ class sql_db
var $db_connect_id;
var $query_result;
var $row;
var $row = array();
var $rowset = array();
var $num_queries = 0;
var $in_transaction = 0;
@@ -38,33 +39,28 @@ class sql_db
//
function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
{
$this->persistency = $persistency;
$this->user = $sqluser;
$this->password = $sqlpassword;
$this->server = $sqlserver;
$this->dbname = $database;
if($this->persistency)
$this->db_connect_id = ($this->persistency) ? mysql_pconnect($this->server, $this->user, $this->password) : mysql_connect($this->server, $this->user, $this->password);
if( $this->db_connect_id )
{
$this->db_connect_id = @mysql_pconnect($this->server, $this->user, $this->password);
}
else
{
$this->db_connect_id = @mysql_connect($this->server, $this->user, $this->password);
}
if($this->db_connect_id)
{
if($database != "")
if( $database != "" )
{
$this->dbname = $database;
$dbselect = @mysql_select_db($this->dbname);
if(!$dbselect)
$dbselect = mysql_select_db($this->dbname);
if( !$dbselect )
{
@mysql_close($this->db_connect_id);
mysql_close($this->db_connect_id);
$this->db_connect_id = $dbselect;
}
}
return $this->db_connect_id;
}
else
@@ -78,17 +74,17 @@ class sql_db
//
function sql_close()
{
if($this->db_connect_id)
if( $this->db_connect_id )
{
//
// Commit any remaining transactions
//
if( $this->in_transaction )
{
@mysql_query("COMMIT", $this->db_connect_id);
mysql_query("COMMIT", $this->db_connect_id);
}
$result = @mysql_close($this->db_connect_id);
return $result;
return mysql_close($this->db_connect_id);
}
else
{
@@ -108,10 +104,10 @@ class sql_db
if( $query != "" )
{
// $this->num_queries++;
$this->num_queries++;
if( $transaction == BEGIN_TRANSACTION )
{
$result = @mysql_query("BEGIN", $this->db_connect_id);
$result = mysql_query("BEGIN", $this->db_connect_id);
if(!$result)
{
return false;
@@ -119,7 +115,7 @@ class sql_db
$this->in_transaction = TRUE;
}
$this->query_result = @mysql_query($query, $this->db_connect_id);
$this->query_result = mysql_query($query, $this->db_connect_id);
}
if( $this->query_result )
@@ -129,16 +125,16 @@ class sql_db
if( $transaction == END_TRANSACTION )
{
$result = @mysql_query("COMMIT", $this->db_connect_id);
$result = mysql_query("COMMIT", $this->db_connect_id);
}
return $this->query_result;
}
else
{
if($this->in_transaction)
if( $this->in_transaction )
{
@mysql_query("ROLLBACK", $this->db_connect_id);
mysql_query("ROLLBACK", $this->db_connect_id);
$this->in_transaction = FALSE;
}
return false;
@@ -150,89 +146,59 @@ class sql_db
//
function sql_numrows($query_id = 0)
{
if(!$query_id)
if( !$query_id )
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_num_rows($query_id);
return $result;
}
else
{
return false;
}
return ( $query_id ) ? mysql_num_rows($query_id) : false;
}
function sql_affectedrows()
{
if($this->db_connect_id)
{
$result = @mysql_affected_rows($this->db_connect_id);
return $result;
}
else
{
return false;
}
return ( $this->db_connect_id ) ? mysql_affected_rows($this->db_connect_id) : false;
}
function sql_numfields($query_id = 0)
{
if(!$query_id)
if( !$query_id )
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_num_fields($query_id);
return $result;
}
else
{
return false;
}
return ( $query_id ) ? mysql_num_fields($query_id) : false;
}
function sql_fieldname($offset, $query_id = 0)
{
if(!$query_id)
if( !$query_id )
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_field_name($query_id, $offset);
return $result;
}
else
{
return false;
}
return ( $query_id ) ? mysql_field_name($query_id, $offset) : false;
}
function sql_fieldtype($offset, $query_id = 0)
{
if(!$query_id)
if( !$query_id )
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_field_type($query_id, $offset);
return $result;
}
else
{
return false;
}
return ( $query_id ) ? mysql_field_type($query_id, $offset) : false;
}
function sql_fetchrow($query_id = 0)
{
if(!$query_id)
if( !$query_id )
{
$query_id = $this->query_result;
}
if($query_id)
if( $query_id )
{
$this->row[$query_id] = @mysql_fetch_array($query_id, MYSQL_ASSOC);
$this->row[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC);
return $this->row[$query_id];
}
else
@@ -240,20 +206,24 @@ class sql_db
return false;
}
}
function sql_fetchrowset($query_id = 0)
{
if(!$query_id)
if( !$query_id )
{
$query_id = $this->query_result;
}
if($query_id)
if( $query_id )
{
unset($this->rowset[$query_id]);
unset($this->row[$query_id]);
while($this->rowset[$query_id] = @mysql_fetch_array($query_id, MYSQL_ASSOC))
while($this->rowset[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC))
{
$result[] = $this->rowset[$query_id];
}
return $result;
}
else
@@ -261,39 +231,42 @@ class sql_db
return false;
}
}
function sql_fetchfield($field, $rownum = -1, $query_id = 0)
{
if(!$query_id)
if( !$query_id )
{
$query_id = $this->query_result;
}
if($query_id)
if( $query_id )
{
if($rownum > -1)
if( $rownum > -1 )
{
$result = @mysql_result($query_id, $rownum, $field);
$result = mysql_result($query_id, $rownum, $field);
}
else
{
if(empty($this->row[$query_id]) && empty($this->rowset[$query_id]))
if( empty($this->row[$query_id]) && empty($this->rowset[$query_id]) )
{
if($this->sql_fetchrow())
if( $this->sql_fetchrow() )
{
$result = $this->row[$query_id][$field];
}
}
else
{
if($this->rowset[$query_id])
if( $this->rowset[$query_id] )
{
$result = $this->rowset[$query_id][$field];
}
else if($this->row[$query_id])
else if( $this->row[$query_id] )
{
$result = $this->row[$query_id][$field];
}
}
}
return $result;
}
else
@@ -301,51 +274,36 @@ class sql_db
return false;
}
}
function sql_rowseek($rownum, $query_id = 0){
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_data_seek($query_id, $rownum);
return $result;
}
else
{
return false;
}
}
function sql_nextid(){
if($this->db_connect_id)
{
$result = @mysql_insert_id($this->db_connect_id);
return $result;
}
else
{
return false;
}
}
function sql_freeresult($query_id = 0){
if(!$query_id)
{
$query_id = $this->query_result;
}
if($query_id)
{
$result = @mysql_free_result($query_id);
return $result;
}
else
{
return false;
}
}
function sql_error($query_id = 0)
function sql_rowseek($rownum, $query_id = 0)
{
$result["message"] = @mysql_error($this->db_connect_id);
$result["code"] = @mysql_errno($this->db_connect_id);
if( !$query_id )
{
$query_id = $this->query_result;
}
return ( $query_id ) ? mysql_data_seek($query_id, $rownum) : false;
}
function sql_nextid()
{
return ( $this->db_connect_id ) ? mysql_insert_id($this->db_connect_id) : false;
}
function sql_freeresult($query_id = 0)
{
if( !$query_id )
{
$query_id = $this->query_result;
}
return ( $query_id ) ? mysql_free_result($query_id) : false;
}
function sql_error()
{
$result['message'] = mysql_error($this->db_connect_id);
$result['code'] = mysql_errno($this->db_connect_id);
return $result;
}