Fixed small server error. Updated layout

git-svn-id: file:///svn/phpbb/trunk@12 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-02-22 01:31:04 +00:00
parent 3f3c0d56be
commit 658df35cd4

View file

@ -19,11 +19,13 @@
* *
***************************************************************************/ ***************************************************************************/
if(!defined("SQL_LAYER")){ if(!defined("SQL_LAYER"))
{
define("SQL_LAYER","mysql"); define("SQL_LAYER","mysql");
class sql_db { class sql_db
{
var $db_connect_id; var $db_connect_id;
var $query_result; var $query_result;
@ -32,23 +34,31 @@ class sql_db {
// //
// Constructor // Constructor
// //
function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency=true){ function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
{
$this->persistency = $persistency; $this->persistency = $persistency;
$this->user = $sqluser; $this->user = $sqluser;
$this->password = $sqlpassword; $this->password = $sqlpassword;
$this->host = $sqlserver; $this->server = $sqlserver;
$this->dbname = $database;
if($this->persistency){ if($this->persistency)
{
$this->db_connect_id = @mysql_pconnect($this->server, $this->user, $this->password); $this->db_connect_id = @mysql_pconnect($this->server, $this->user, $this->password);
} else { }
else
{
$this->db_connect_id = @mysql_connect($this->server, $this->user, $this->password); $this->db_connect_id = @mysql_connect($this->server, $this->user, $this->password);
} }
if($this->db_connect_id){ if($this->db_connect_id)
if($database != ""){ {
if($database != "")
{
$this->dbname = $database; $this->dbname = $database;
$dbselect = @mysql_select_db($this->dbname); $dbselect = @mysql_select_db($this->dbname);
if(!$dbselect){ if(!$dbselect)
{
mysql_close($this->db_connect_id); mysql_close($this->db_connect_id);
$this->db_connect_id = $dbselect; $this->db_connect_id = $dbselect;
} }
@ -56,30 +66,41 @@ class sql_db {
} }
return $this->db_connect_id; return $this->db_connect_id;
} }
// //
// Other base methods // Other base methods
// //
function sql_setdb($database){ function sql_setdb($database)
if($database != ""){ {
if($database != "")
{
$this->dbname = $database; $this->dbname = $database;
$dbselect = @mysql_select_db($this->dbname); $dbselect = @mysql_select_db($this->dbname);
if(!$dbselect){ if(!$dbselect)
{
sql_close(); sql_close();
$this->db_connect_id = $dbselect; $this->db_connect_id = $dbselect;
} }
return $this->db_connect_id; return $this->db_connect_id;
} else { }
else
{
return false; return false;
} }
} }
function sql_close(){ function sql_close()
if($this->db_connect_id){ {
if($this->query_result){ if($this->db_connect_id)
{
if($this->query_result)
{
@mysql_free_result($this->query_result); @mysql_free_result($this->query_result);
} }
$result = @mysql_close($this->db_connect_id); $result = @mysql_close($this->db_connect_id);
return $result; return $result;
} else { }
else
{
return false; return false;
} }
} }
@ -87,141 +108,217 @@ class sql_db {
// //
// Base query method // Base query method
// //
function sql_query($query=""){ function sql_query($query = "")
{
// Remove any pre-existing queries // Remove any pre-existing queries
unset($this->query_result); unset($this->query_result);
if($query != ""){ if($query != "")
{
$this->query_result = @mysql_query($query, $this->db_connect_id); $this->query_result = @mysql_query($query, $this->db_connect_id);
} }
if($this->query_result){ if($this->query_result)
{
unset($this->row[$this->query_result]); unset($this->row[$this->query_result]);
unset($this->rowset[$this->query_result]); unset($this->rowset[$this->query_result]);
return $this->query_result; return $this->query_result;
} else { }
else
{
return false; return false;
} }
} }
// //
// Other query methods // Other query methods
// //
function sql_numrows($query_id = 0){ function sql_numrows($query_id = 0)
{
if(!$query_id) if(!$query_id)
{
$query_id = $this->query_result; $query_id = $this->query_result;
if($query_id){ }
if($query_id)
{
$result = @mysql_num_rows($query_id); $result = @mysql_num_rows($query_id);
return $result; return $result;
} else { }
else
{
return false; return false;
} }
} }
function sql_numfields($query_id = 0){ function sql_numfields($query_id = 0)
{
if(!$query_id) if(!$query_id)
{
$query_id = $this->query_result; $query_id = $this->query_result;
if($query_id){ }
if($query_id)
{
$result = @mysql_num_fields($query_id); $result = @mysql_num_fields($query_id);
return $result; return $result;
} else { }
else
{
return false; return false;
} }
} }
function sql_fieldname($offset, $query_id = 0){ function sql_fieldname($offset, $query_id = 0)
{
if(!$query_id) if(!$query_id)
{
$query_id = $this->query_result; $query_id = $this->query_result;
if($query_id){ }
if($query_id)
{
$result = @mysql_field_name($query_id, $offset); $result = @mysql_field_name($query_id, $offset);
return $result; return $result;
} else { }
else
{
return false; return false;
} }
} }
function sql_fieldtype($offset, $query_id = 0){ function sql_fieldtype($offset, $query_id = 0)
{
if(!$query_id) if(!$query_id)
{
$query_id = $this->query_result; $query_id = $this->query_result;
if($query_id){ }
if($query_id)
{
$result = @mysql_field_type($query_id, $offset); $result = @mysql_field_type($query_id, $offset);
return $result; return $result;
} else { }
else
{
return false; return false;
} }
} }
function sql_fetchrow($query_id = 0){ function sql_fetchrow($query_id = 0)
{
if(!$query_id) if(!$query_id)
{
$query_id = $this->query_result; $query_id = $this->query_result;
if($query_id){ }
if($query_id)
{
$this->row[$query_id] = @mysql_fetch_array($query_id); $this->row[$query_id] = @mysql_fetch_array($query_id);
return $this->row[$query_id]; return $this->row[$query_id];
} else { }
else
{
return false; return false;
} }
} }
function sql_fetchrowset($query_id = 0){ function sql_fetchrowset($query_id = 0)
{
if(!$query_id) if(!$query_id)
{
$query_id = $this->query_result; $query_id = $this->query_result;
if($query_id){ }
if($query_id)
{
unset($this->rowset[$query_id]); unset($this->rowset[$query_id]);
unset($this->row[$query_id]); unset($this->row[$query_id]);
while($this->rowset[$query_id] = @mysql_fetch_array($query_id)){ while($this->rowset[$query_id] = @mysql_fetch_array($query_id))
{
$result[] = $this->rowset[$query_id]; $result[] = $this->rowset[$query_id];
} }
return $result; return $result;
} else { }
else
{
return false; return false;
} }
} }
function sql_fetchfield($field, $rownum=-1, $query_id = 0) { function sql_fetchfield($field, $rownum = -1, $query_id = 0)
{
if(!$query_id) if(!$query_id)
{
$query_id = $this->query_result; $query_id = $this->query_result;
if($query_id){ }
if($rownum > -1){ if($query_id)
{
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])){ else
{
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]; $result = $this->row[$query_id][$field];
} else { }
if($this->rowset[$query_id]){ }
else
{
if($this->rowset[$query_id])
{
$result = $this->rowset[$query_id][$field]; $result = $this->rowset[$query_id][$field];
} else if($this->row[$query_id]){ }
else if($this->row[$query_id])
{
$result = $this->row[$query_id][$field]; $result = $this->row[$query_id][$field];
} }
} }
} }
return $result; return $result;
} else { }
else
{
return false; return false;
} }
} }
function sql_rowseek($rownum, $query_id = 0){ function sql_rowseek($rownum, $query_id = 0){
if(!$query_id) if(!$query_id)
{
$query_id = $this->query_result; $query_id = $this->query_result;
if($query_id){ }
if($query_id)
{
$result = @mysql_data_seek($query_id, $rownum); $result = @mysql_data_seek($query_id, $rownum);
return $result; return $result;
} else { }
else
{
return false; return false;
} }
} }
function sql_nextid(){ function sql_nextid(){
if($this->db_connection_id){ if($this->db_connection_id)
{
$result = @mysql_insert_id(); $result = @mysql_insert_id();
return $result; return $result;
} else { }
else
{
return false; return false;
} }
} }
function sql_freeresult($query_id = 0){ function sql_freeresult($query_id = 0){
if(!$query_id) if(!$query_id)
{
$query_id = $this->query_result; $query_id = $this->query_result;
if($query_id){ }
if($query_id)
{
$result = @mysql_free_result($query_id); $result = @mysql_free_result($query_id);
return $result; return $result;
} else { }
else
{
return false; return false;
} }
} }
function sql_error($query_id = 0){ function sql_error($query_id = 0)
{
if(!$query_id) if(!$query_id)
{
$query_id = $this->query_result; $query_id = $this->query_result;
}
$result[message] = @mysql_error($query_id); $result[message] = @mysql_error($query_id);
$result[code] = @mysql_errno($query_id); $result[code] = @mysql_errno($query_id);