[Phpbb-checkins] CVS: phpBB2/db db2.php,1.1,1.2 msaccess.php,1.5,1.6 mssql-odbc.php,1.4,1.5 mssql.php,1.20,1.21 mysql.php,1.13,1.14 mysql4.php,1.1,1.2 oracle.php,1.17,1.18 postgres7.php,1.16,1.17

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/db
In directory usw-pr-cvs1:/tmp/cvs-serv6525/db

Modified Files:
	db2.php msaccess.php mssql-odbc.php mssql.php mysql.php 
	mysql4.php oracle.php postgres7.php 
Log Message:
Fix various var not set warnings ... many thanks go to The Horta for pointing out and offering fixes for many of these

Index: db2.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/db2.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** db2.php	2001/11/20 22:27:29	1.1
--- db2.php	2002/01/28 17:24:45	1.2
***************
*** 33,37 ****
  	var $query_numrows;
  	var $next_id;
! 	var $row;
  	var $row_index;
  	var $num_queries = 0;
--- 33,38 ----
  	var $query_numrows;
  	var $next_id;
! 	var $row = array();
! 	var $rowset = array();
  	var $row_index;
  	var $num_queries = 0;

Index: msaccess.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/msaccess.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** msaccess.php	2002/01/25 02:01:24	1.5
--- msaccess.php	2002/01/28 17:24:45	1.6
***************
*** 29,42 ****
  
  	var $db_connect_id;
! 	var $result_ids;
  	var $result;
  
  	var $next_id;
  
! 	var $num_rows;
! 	var $current_row;
! 	var $field_names;
! 	var $field_types;
! 	var $result_rowset;
  
  	var $num_queries = 0;
--- 29,42 ----
  
  	var $db_connect_id;
! 	var $result_ids = array();
  	var $result;
  
  	var $next_id;
  
! 	var $num_rows = array();
! 	var $current_row = array();
! 	var $field_names = array();
! 	var $field_types = array();
! 	var $result_rowset = array();
  
  	var $num_queries = 0;

Index: mssql-odbc.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mssql-odbc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** mssql-odbc.php	2001/12/24 14:45:47	1.4
--- mssql-odbc.php	2002/01/28 17:24:45	1.5
***************
*** 33,41 ****
  	var $next_id;
  
! 	var $num_rows;
! 	var $current_row;
! 	var $field_names;
! 	var $field_types;
! 	var $result_rowset;
  
  	var $num_queries = 0;
--- 33,41 ----
  	var $next_id;
  
! 	var $num_rows = array();
! 	var $current_row = array();
! 	var $field_names = array();
! 	var $field_types = array();
! 	var $result_rowset = array();
  
  	var $num_queries = 0;

Index: mssql.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mssql.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** mssql.php	2001/12/24 14:45:47	1.20
--- mssql.php	2002/01/28 17:24:45	1.21
***************
*** 34,38 ****
  	var $in_transaction = 0;
  
! 	var $row;
  	var $limit_offset;
  	var $query_limit_success;
--- 34,39 ----
  	var $in_transaction = 0;
  
! 	var $row = array();
! 	var $rowset = array();
  	var $limit_offset;
  	var $query_limit_success;

Index: mysql.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** mysql.php	2001/08/30 22:20:23	1.13
--- mysql.php	2002/01/28 17:24:45	1.14
***************
*** 30,34 ****
  	var $db_connect_id;
  	var $query_result;
! 	var $row;
  	var $num_queries = 0;
  
--- 30,35 ----
  	var $db_connect_id;
  	var $query_result;
! 	var $row = array();
! 	var $rowset = array();
  	var $num_queries = 0;
  

Index: mysql4.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/mysql4.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** mysql4.php	2001/11/04 15:26:33	1.1
--- mysql4.php	2002/01/28 17:24:45	1.2
***************
*** 5,9 ****
   *   begin                : Saturday, Feb 13, 2001
   *   copyright            : (C) 2001 The phpBB Group
!  *   email                : su...@ph...
   *
   *   $Id$
--- 5,9 ----
   *   begin                : Saturday, Feb 13, 2001
   *   copyright            : (C) 2001 The phpBB Group
!  *   email                : supportphpbb.com
   *
   *   $Id$
***************
*** 30,34 ****
  	var $db_connect_id;
  	var $query_result;
! 	var $row;
  	var $num_queries = 0;
  	var $in_transaction = 0;
--- 30,35 ----
  	var $db_connect_id;
  	var $query_result;
! 	var $row = array();
! 	var $rowset = array();
  	var $num_queries = 0;
  	var $in_transaction = 0;
***************
*** 39,43 ****
  	function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
  	{
- 
  		$this->persistency = $persistency;
  		$this->user = $sqluser;
--- 40,43 ----
***************
*** 46,69 ****
  		$this->dbname = $database;
  
! 		if($this->persistency)
! 		{
! 			$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 != "")
  			{
  				$this->dbname = $database;
! 				$dbselect = @mysql_select_db($this->dbname);
! 				if(!$dbselect)
  				{
! 					@mysql_close($this->db_connect_id);
  					$this->db_connect_id = $dbselect;
  				}
  			}
  			return $this->db_connect_id;
  		}
--- 46,65 ----
  		$this->dbname = $database;
  
! 		$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 )
  		{
! 			if( $database != "" )
  			{
  				$this->dbname = $database;
! 				$dbselect = mysql_select_db($this->dbname);
! 
! 				if( !$dbselect )
  				{
! 					mysql_close($this->db_connect_id);
  					$this->db_connect_id = $dbselect;
  				}
  			}
+ 
  			return $this->db_connect_id;
  		}
***************
*** 79,83 ****
  	function sql_close()
  	{
! 		if($this->db_connect_id)
  		{
  			//
--- 75,79 ----
  	function sql_close()
  	{
! 		if( $this->db_connect_id )
  		{
  			//
***************
*** 86,93 ****
  			if( $this->in_transaction )
  			{
! 				@mysql_query("COMMIT", $this->db_connect_id);
  			}
! 			$result = @mysql_close($this->db_connect_id);
! 			return $result;
  		}
  		else
--- 82,89 ----
  			if( $this->in_transaction )
  			{
! 				mysql_query("COMMIT", $this->db_connect_id);
  			}
! 
! 			return mysql_close($this->db_connect_id);
  		}
  		else
***************
*** 109,116 ****
  		if( $query != "" )
  		{
! //			$this->num_queries++;
  			if( $transaction == BEGIN_TRANSACTION )
  			{
! 				$result = @mysql_query("BEGIN", $this->db_connect_id);
  				if(!$result)
  				{
--- 105,112 ----
  		if( $query != "" )
  		{
! 			$this->num_queries++;
  			if( $transaction == BEGIN_TRANSACTION )
  			{
! 				$result = mysql_query("BEGIN", $this->db_connect_id);
  				if(!$result)
  				{
***************
*** 120,124 ****
  			}
  
! 			$this->query_result = @mysql_query($query, $this->db_connect_id);
  		}
  
--- 116,120 ----
  			}
  
! 			$this->query_result = mysql_query($query, $this->db_connect_id);
  		}
  
***************
*** 130,134 ****
  			if( $transaction == END_TRANSACTION )
  			{
! 				$result = @mysql_query("COMMIT", $this->db_connect_id);
  			}
  			
--- 126,130 ----
  			if( $transaction == END_TRANSACTION )
  			{
! 				$result = mysql_query("COMMIT", $this->db_connect_id);
  			}
  			
***************
*** 137,143 ****
  		else
  		{
! 			if($this->in_transaction)
  			{
! 				@mysql_query("ROLLBACK", $this->db_connect_id);
  				$this->in_transaction = FALSE;
  			}
--- 133,139 ----
  		else
  		{
! 			if( $this->in_transaction )
  			{
! 				mysql_query("ROLLBACK", $this->db_connect_id);
  				$this->in_transaction = FALSE;
  			}
***************
*** 151,237 ****
  	function sql_numrows($query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
  		}
! 		if($query_id)
! 		{
! 			$result = @mysql_num_rows($query_id);
! 			return $result;
! 		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_affectedrows()
  	{
! 		if($this->db_connect_id)
! 		{
! 			$result = @mysql_affected_rows($this->db_connect_id);
! 			return $result;
! 		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_numfields($query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
- 		}
- 		if($query_id)
- 		{
- 			$result = @mysql_num_fields($query_id);
- 			return $result;
- 		}
- 		else
- 		{
- 			return false;
  		}
  	}
  	function sql_fieldname($offset, $query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
- 		}
- 		if($query_id)
- 		{
- 			$result = @mysql_field_name($query_id, $offset);
- 			return $result;
  		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_fieldtype($offset, $query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
  		}
! 		if($query_id)
! 		{
! 			$result = @mysql_field_type($query_id, $offset);
! 			return $result;
! 		}
! 		else
! 		{
! 			return false;
! 		}
  	}
  	function sql_fetchrow($query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
  		}
! 		if($query_id)
  		{
! 			$this->row[$query_id] = @mysql_fetch_array($query_id, MYSQL_ASSOC);
  			return $this->row[$query_id];
  		}
--- 147,203 ----
  	function sql_numrows($query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		return ( $query_id ) ? mysql_num_rows($query_id) : false;
  	}
+ 
  	function sql_affectedrows()
  	{
! 		return ( $this->db_connect_id ) ? mysql_affected_rows($this->db_connect_id) : false;
  	}
+ 
  	function sql_numfields($query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
+ 
+ 		return ( $query_id ) ? mysql_num_fields($query_id) : false;
  	}
+ 
  	function sql_fieldname($offset, $query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		return ( $query_id ) ? mysql_field_name($query_id, $offset) : false;
  	}
+ 
  	function sql_fieldtype($offset, $query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		return ( $query_id ) ? mysql_field_type($query_id, $offset) : false;
  	}
+ 
  	function sql_fetchrow($query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		if( $query_id )
  		{
! 			$this->row[$query_id] = mysql_fetch_array($query_id, MYSQL_ASSOC);
  			return $this->row[$query_id];
  		}
***************
*** 241,258 ****
  		}
  	}
  	function sql_fetchrowset($query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
  		}
! 		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))
  			{
  				$result[] = $this->rowset[$query_id];
  			}
  			return $result;
  		}
--- 207,228 ----
  		}
  	}
+ 
  	function sql_fetchrowset($query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		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))
  			{
  				$result[] = $this->rowset[$query_id];
  			}
+ 
  			return $result;
  		}
***************
*** 262,282 ****
  		}
  	}
  	function sql_fetchfield($field, $rownum = -1, $query_id = 0)
  	{
! 		if(!$query_id)
  		{
  			$query_id = $this->query_result;
  		}
! 		if($query_id)
  		{
! 			if($rownum > -1)
  			{
! 				$result = @mysql_result($query_id, $rownum, $field);
  			}
  			else
  			{
! 				if(empty($this->row[$query_id]) && empty($this->rowset[$query_id]))
  				{
! 					if($this->sql_fetchrow())
  					{
  						$result = $this->row[$query_id][$field];
--- 232,254 ----
  		}
  	}
+ 
  	function sql_fetchfield($field, $rownum = -1, $query_id = 0)
  	{
! 		if( !$query_id )
  		{
  			$query_id = $this->query_result;
  		}
! 
! 		if( $query_id )
  		{
! 			if( $rownum > -1 )
  			{
! 				$result = mysql_result($query_id, $rownum, $field);
  			}
  			else
  			{
! 				if( empty($this->row[$query_id]) && empty($this->rowset[$query_id]) )
  				{
! 					if( $this->sql_fetchrow() )
  					{
  						$result = $this->row[$query_id][$field];
***************
*** 285,293 ****
  				else
  				{
! 					if($this->rowset[$query_id])
  					{
  						$result = $this->rowset[$query_id][$field];
  					}
! 					else if($this->row[$query_id])
  					{
  						$result = $this->row[$query_id][$field];
--- 257,265 ----
  				else
  				{
! 					if( $this->rowset[$query_id] )
  					{
  						$result = $this->rowset[$query_id][$field];
  					}
! 					else if( $this->row[$query_id] )
  					{
  						$result = $this->row[$query_id][$field];
***************
*** 295,298 ****
--- 267,271 ----
  				}
  			}
+ 
  			return $result;
  		}
***************
*** 302,350 ****
  		}
  	}
! 	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)
  	{
! 		$result["message"] = @mysql_error($this->db_connect_id);
! 		$result["code"] = @mysql_errno($this->db_connect_id);
  
  		return $result;
--- 275,308 ----
  		}
  	}
! 
! 	function sql_rowseek($rownum, $query_id = 0)
! 	{
! 		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;

Index: oracle.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/oracle.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** oracle.php	2001/09/13 23:19:53	1.17
--- oracle.php	2002/01/28 17:24:45	1.18
***************
*** 31,35 ****
  	var $query_result;
  	var $in_transaction = 0;
! 	var $row;
  	var $num_queries = 0;
  	var $last_query_text = "";
--- 31,36 ----
  	var $query_result;
  	var $in_transaction = 0;
! 	var $row = array();
! 	var $rowset = array();
  	var $num_queries = 0;
  	var $last_query_text = "";

Index: postgres7.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/db/postgres7.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** postgres7.php	2002/01/01 14:35:33	1.16
--- postgres7.php	2002/01/28 17:24:45	1.17
***************
*** 31,35 ****
  	var $query_result;
  	var $in_transaction = 0;
! 	var $row;
  	var $rownum = array();
  	var $num_queries = 0;
--- 31,36 ----
  	var $query_result;
  	var $in_transaction = 0;
! 	var $row = array();
! 	var $rowset = array();
  	var $rownum = array();
  	var $num_queries = 0;