aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-02-22 01:31:04 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-02-22 01:31:04 +0000
commit658df35cd4c176916e7cd0bd766bb8c8e0cc77d1 (patch)
tree26faf321e9540bafad1bfe4eebccc1a201971c88 /phpBB
parent3f3c0d56be1c41f0ec01b31662b2be64a999f188 (diff)
downloadforums-658df35cd4c176916e7cd0bd766bb8c8e0cc77d1.tar
forums-658df35cd4c176916e7cd0bd766bb8c8e0cc77d1.tar.gz
forums-658df35cd4c176916e7cd0bd766bb8c8e0cc77d1.tar.bz2
forums-658df35cd4c176916e7cd0bd766bb8c8e0cc77d1.tar.xz
forums-658df35cd4c176916e7cd0bd766bb8c8e0cc77d1.zip
Fixed small server error. Updated layout
git-svn-id: file:///svn/phpbb/trunk@12 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/db/mysql.php495
1 files changed, 296 insertions, 199 deletions
diff --git a/phpBB/db/mysql.php b/phpBB/db/mysql.php
index 3b592f048c..3a24572784 100644
--- a/phpBB/db/mysql.php
+++ b/phpBB/db/mysql.php
@@ -19,214 +19,311 @@
*
***************************************************************************/
-if(!defined("SQL_LAYER")){
+if(!defined("SQL_LAYER"))
+{
define("SQL_LAYER","mysql");
-class sql_db {
+class sql_db
+{
- var $db_connect_id;
- var $query_result;
- var $row;
+ var $db_connect_id;
+ var $query_result;
+ var $row;
- //
- // Constructor
- //
- function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency=true){
+ //
+ // Constructor
+ //
+ function sql_db($sqlserver, $sqluser, $sqlpassword, $database, $persistency = true)
+ {
- $this->persistency = $persistency;
- $this->user = $sqluser;
- $this->password = $sqlpassword;
- $this->host = $sqlserver;
+ $this->persistency = $persistency;
+ $this->user = $sqluser;
+ $this->password = $sqlpassword;
+ $this->server = $sqlserver;
+ $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;
- }
- //
- // Other base methods
- //
- function sql_setdb($database){
- if($database != ""){
- $this->dbname = $database;
- $dbselect = @mysql_select_db($this->dbname);
- if(!$dbselect){
- sql_close();
- $this->db_connect_id = $dbselect;
- }
- return $this->db_connect_id;
- } else {
- return false;
- }
- }
- function sql_close(){
- if($this->db_connect_id){
- if($this->query_result){
- @mysql_free_result($this->query_result);
- }
- $result = @mysql_close($this->db_connect_id);
- return $result;
- } else {
- return false;
- }
- }
+ 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;
+ }
- //
- // Base query method
- //
- function sql_query($query=""){
- // Remove any pre-existing queries
- unset($this->query_result);
- if($query != ""){
- $this->query_result = @mysql_query($query, $this->db_connect_id);
- }
- if($this->query_result){
- unset($this->row[$this->query_result]);
- unset($this->rowset[$this->query_result]);
- return $this->query_result;
- } else {
- return false;
- }
- }
- //
- // Other query methods
- //
- 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_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);
- return $this->row[$query_id];
- } else {
- return false;
- }
- }
- 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)){
- $result[] = $this->rowset[$query_id];
- }
- return $result;
- } else {
- return false;
- }
- }
- 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];
- } else {
- if($this->rowset[$query_id]){
- $result = $this->rowset[$query_id][$field];
- } else if($this->row[$query_id]){
- $result = $this->row[$query_id][$field];
- }
- }
- }
- return $result;
- } else {
- 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_connection_id){
- $result = @mysql_insert_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){
- if(!$query_id)
- $query_id = $this->query_result;
- $result[message] = @mysql_error($query_id);
- $result[code] = @mysql_errno($query_id);
+ //
+ // Other base methods
+ //
+ function sql_setdb($database)
+ {
+ if($database != "")
+ {
+ $this->dbname = $database;
+ $dbselect = @mysql_select_db($this->dbname);
+ if(!$dbselect)
+ {
+ sql_close();
+ $this->db_connect_id = $dbselect;
+ }
+ return $this->db_connect_id;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ function sql_close()
+ {
+ if($this->db_connect_id)
+ {
+ if($this->query_result)
+ {
+ @mysql_free_result($this->query_result);
+ }
+ $result = @mysql_close($this->db_connect_id);
+ return $result;
+ }
+ else
+ {
+ return false;
+ }
+ }
- return $result;
- }
+ //
+ // Base query method
+ //
+ function sql_query($query = "")
+ {
+ // Remove any pre-existing queries
+ unset($this->query_result);
+ if($query != "")
+ {
+ $this->query_result = @mysql_query($query, $this->db_connect_id);
+ }
+ if($this->query_result)
+ {
+ unset($this->row[$this->query_result]);
+ unset($this->rowset[$this->query_result]);
+ return $this->query_result;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ //
+ // Other query methods
+ //
+ 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_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);
+ return $this->row[$query_id];
+ }
+ else
+ {
+ return false;
+ }
+ }
+ 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))
+ {
+ $result[] = $this->rowset[$query_id];
+ }
+ return $result;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ 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];
+ }
+ }
+ else
+ {
+ if($this->rowset[$query_id])
+ {
+ $result = $this->rowset[$query_id][$field];
+ }
+ else if($this->row[$query_id])
+ {
+ $result = $this->row[$query_id][$field];
+ }
+ }
+ }
+ return $result;
+ }
+ else
+ {
+ 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_connection_id)
+ {
+ $result = @mysql_insert_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)
+ {
+ if(!$query_id)
+ {
+ $query_id = $this->query_result;
+ }
+ $result[message] = @mysql_error($query_id);
+ $result[code] = @mysql_errno($query_id);
+
+ return $result;
+ }
} // class sql_db