Changeset 485 for trunk/phpbms/include/db.php

Timestamp:

04/07/09 11:44:18 (3 years ago)

Author:

nate

Message:

• Merged Nathan branch back into trunk.

Files:

• trunk/phpbms/include/db.php (modified) (15 diffs)

trunk/phpbms/include/db.php

@@ -1 @@
-<?php 
+<?php
 /*
  $Rev: 249 $ | $LastChangedBy: brieb $
@@ -41 +41 @@
                 //we may want to do more than connect via mysql;
                 var $type="mysql";
-                                
+
                 // mysql vars;
                 var $db_link;
@@ -49 +49 @@
                 var $dbpass;
                 var $pconnect=true;
-                
+
                 var $showError=false;
                 var $logError=true;
                 var $stopOnError=true;
                 var $errorFormat="xhtml";
-                
+
                 var $error = NULL;
-                                
+
                 function db($connect = true, $hostname = NULL, $schema = NULL, $user = NULL, $pass = NULL, $pconnect = NULL, $type = "mysql"){
-                        
+
                         if($type!="mysql")
                         $this->type=$type;
@@ -69 +69 @@
                                         if($hostname!=NULL)
                                                 $this->hostname = $hostname;
-                                        
+
                                         if(defined("MYSQL_DATABASE"))
                                                 $this->schema = MYSQL_DATABASE;
                                         if($schema!=NULL)
                                                 $this->schema = $schema;
-                
+
                                         if(defined("MYSQL_USER"))
                                                 $this->dbuser = MYSQL_USER;
                                         if($schema!=NULL)
                                                 $this->dbuser = $user;
-                
+
                                         if(defined("MYSQL_USERPASS"))
                                                 $this->dbpass = MYSQL_USERPASS;
                                         if($schema!=NULL)
                                                 $this->dbpass = $pass;
-                
+
                                         if(defined("MYSQL_PCONNECT"))
                                                 $this->pconnect = MYSQL_PCONNECT;
                                         if($pconnect!=NULL)
                                                 $this->pconnect = $pconnect;
-                                break;                          
+                                break;
                         }
-                                                
+
                         if($connect){
                                 if($this->connect()){
@@ -97 +97 @@
                                                 return $this->db_link;
                                         else
-                                                return false;                           
+                                                return false;
                                 } else
                                         return false;
@@ -106 +106 @@
                 function connect(){
                         // This functions connects to the database.  It uses pconnect if the variable is set;
-                                                
+
                         if($this->pconnect)
                                 $this->db_link = @ mysql_pconnect($this->hostname,$this->dbuser,$this->dbpass);
                         else
                                 $this->db_link = @ mysql_connect($this->hostname,$this->dbuser,$this->dbpass);
+
                         if(!$this->db_link){
+
                                 $error = new appError(-400,"Could not connect to database server.\n\n".$this->getError(),"",$this->showError,$this->stopOnError,false,$this->errorFormat);
                                 return false;
-                        } else                  
+
+                        } else
                                 return $this->db_link;
-                }
-
-                
+
+                }//end function connect
+
+
                 function selectSchema($schema=NULL){
                         if($schema!=NULL)
                                 $this->schema=$schema;
-                                
+
                         if(! @ mysql_select_db($this->schema,$this->db_link)){
-                                $error = new appError(-410,"Could not open schema ".$this->schema,"",$this->showError,$this->stopOnError,false,$this->errorFormat);     
+                                $error = new appError(-410,"Could not open schema ".$this->schema,"",$this->showError,$this->stopOnError,false,$this->errorFormat);
                                 return false;
                         } else
-                                return true;                                                    
+                                return true;
                 }
 
@@ -134 +138 @@
                         switch($this->type){
                                 case "mysql":
-                                        if(!isset($this->db_link)) 
-                                                if(!$this->dataB()) die($this->error);
+                                        if(!isset($this->db_link))
+                                                if(!$this->db()) die($this->error);
                                         $queryresult = @ mysql_query($sqlstatement,$this->db_link);
                                         if(!$queryresult){
@@ -141 +145 @@
                                                 $error = new appError(-420,$this->getError($this->db_link)."\n\nStatement: ".$sqlstatement,"",$this->showError,$this->stopOnError,$this->logError,$this->errorFormat);
                                                 return false;
-                                        }                                       
-                                break;
-                        }//end case
-                        
+                                        }
+                                break;
+                        }//end case
+
                         $this->error=NULL;
                         return $queryresult;
@@ -153 +157 @@
 
                         switch($this->type){
-                                case "mysql":                   
+                                case "mysql":
                                         @ mysql_query("SET NAMES ".$encoding, $this->db_link);
                                         break;
-                                        
+
                         }//endswitch
 
@@ -163 +167 @@
 
                 function getError($link = NULL){
-                        
-                        switch($this->type){
-                                case "mysql":
-                                        $thereturn = mysql_error($link);
+
+                        switch($this->type){
+                                case "mysql":
+                                        if($link)
+                                                $thereturn = @ mysql_error($link);
+                                        else
+                                                $thereturn = @ mysql_error();
                                 break;
                         }//end switch --type--
-                        
-                        return $thereturn;
-                        
+
+                        return $thereturn;
+
                 }//end method --getError--
-                
+
 
                 function numRows($queryresult){
@@ -200 +207 @@
                 }//end function
 
-                
+
                 function startTransaction(){
-                        
-                        switch($this->type){
-                                
+
+                        switch($this->type){
+
                                 case "mysql":
                                         $this->query("START TRANSACTION;");
                                 break;
-                        
+
                         }//end switch
-                        
+
                 }//end method --startTransaction--
-                
-                
+
+
                 function commitTransaction(){
-                        
-                        switch($this->type){
-                                
+
+                        switch($this->type){
+
                                 case "mysql":
                                         $this->query("COMMIT;");
                                 break;
-                        
+
                         }//end switch
-                        
+
                 }//end method --startTransaction--
-                
-                
+
+
                 function rollbackTransaction(){
-                        
-                        switch($this->type){
-                                
+
+                        switch($this->type){
+
                                 case "mysql":
                                         $this->query("ROLLBACK;");
                                 break;
-                        
+
                         }//end switch
-                        
+
                 }//end method --startTransaction--
-                
+
 
                 function seek($queryresult,$rownum){
@@ -278 +285 @@
                         return $thereturn;
                 }//end function
-                
-                
+
+
                 function tableInfo($tablename){
                         //this function returns a multi-dimensional array describing the fields in a given table
@@ -291 +298 @@
                                                         $thereturn[$name]["type"] = @ mysql_field_type($queryresult,$offset);
                                                         $thereturn[$name]["length"] = mysql_field_len($queryresult,$offset);
-                                                        $thereturn[$name]["flags"] = mysql_field_flags($queryresult,$offset);                                                   
+                                                        $thereturn[$name]["flags"] = mysql_field_flags($queryresult,$offset);
                                                 }
                                         }
@@ -305 +312 @@
                                 case "mysql":
                                         $thereturn = @ mysql_insert_id($this->db_link);
-                                break;                  
+                                break;
                         }
-                        
+
                         return $thereturn;
                 }
-                
+
                 function affectedRows(){
                         $thereturn = false;
@@ -316 +323 @@
                                 case "mysql":
                                         $thereturn = @ mysql_affected_rows($this->db_link);
-                                break;                  
+                                break;
                         }
-                        
+
                         return $thereturn;
                 }
-                
+
 }//end db class
 ?>