From 02f96595b71f74dc5fb123c981aa59af2d65bfa3 Mon Sep 17 00:00:00 2001
From: Alex Warhawk <ax.warhawk@gmail.com>
Date: Tue, 14 Jun 2011 15:22:25 +0200
Subject: [PATCH 1/2] changed the for loop to a while loopt (refering last
 commit)

---
 class.MySQL.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/class.MySQL.php b/class.MySQL.php
index 7b6d973..8a78b9f 100644
--- a/class.MySQL.php
+++ b/class.MySQL.php
@@ -251,7 +251,7 @@ function ArrayResult(){
 	// 'Arrays' multiple result
 	function ArrayResults(){
 		$this->aArrayedResults = array();
-		for ($i = 0; $aData = mysql_fetch_assoc($this->aResult); $i++){
+		while ($aData = mysql_fetch_assoc($this->aResult){
 			$this->aArrayedResults[] = $aData;
 		}
 		return $this->aArrayedResults;

From e1b219e392ba58e6d276a1793f29662b76820c87 Mon Sep 17 00:00:00 2001
From: Alex Warhawk <ax.warhawk@gmail.com>
Date: Thu, 1 Sep 2011 09:42:56 +0200
Subject: [PATCH 2/2] added possibility to create more than one instances, the
 mysql function calls now use the sDBLink handle also corrected a syntax error

---
 class.MySQL.php | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/class.MySQL.php b/class.MySQL.php
index 8a78b9f..6a01129 100644
--- a/class.MySQL.php
+++ b/class.MySQL.php
@@ -20,14 +20,14 @@
 // MySQL Class
 class MySQL {
 	// Base variables
-	var $sLastError;		// Holds the last error
-	var $sLastQuery;		// Holds the last query
-	var $aResult;			// Holds the MySQL query result
-	var $iRecords;			// Holds the total number of records returned
-	var $iAffected;			// Holds the total number of records affected
-	var $aRawResults;		// Holds raw 'arrayed' results
-	var $aArrayedResult;	// Holds a single 'arrayed' result
-	var $aArrayedResults;	// Holds multiple 'arrayed' results (usually with a set key)
+	var $sLastError;				// Holds the last error
+	var $sLastQuery;				// Holds the last query
+	var $aResult;					// Holds the MySQL query result
+	var $iRecords;					// Holds the total number of records returned
+	var $iAffected;					// Holds the total number of records affected
+	var $aRawResults;				// Holds raw 'arrayed' results
+	var $aArrayedResult;			// Holds a single 'arrayed' result
+	var $aArrayedResults;			// Holds multiple 'arrayed' results (usually with a set key)
 	
 	var $sHostname = MYSQL_HOST;	// MySQL Hostname
 	var $sUsername = MYSQL_USER;	// MySQL Username
@@ -56,12 +56,12 @@ function Connect($bPersistant = false){
 		}
 		
 		if (!$this->sDBLink){
-   			$this->sLastError = 'Could not connect to server: ' . mysql_error();
+   			$this->sLastError = 'Could not connect to server: ' . mysql_error($this->sDBLink);
 			return false;
 		}
 		
 		if(!$this->UseDB()){
-			$this->sLastError = 'Could not connect to database: ' . mysql_error();
+			$this->sLastError = 'Could not connect to database: ' . mysql_error($this->sDBLink);
 			return false;
 		}
 		return true;
@@ -69,8 +69,8 @@ function Connect($bPersistant = false){
 	
 	// Select database to use
 	function UseDB(){
-		if (!mysql_select_db($this->sDatabase)) {
-			$this->sLastError ='Cannot select database: ' . mysql_error();
+		if (!mysql_select_db($this->sDatabase, $this->sDBLink)) {
+			$this->sLastError ='Cannot select database: ' . mysql_error($this->sDBLink);
 			return false;
 		}else{
 			return true;
@@ -80,12 +80,12 @@ function UseDB(){
 	// Executes MySQL query
 	function ExecuteSQL($sSQLQuery){
 		$this->sLastQuery 	= $sSQLQuery;
-		if($this->aResult 		= mysql_query($sSQLQuery)){
+		if($this->aResult 		= mysql_query($sSQLQuery, $this->sDBLink)){
 			$this->iRecords 	= @mysql_num_rows($this->aResult);
-			$this->iAffected	= @mysql_affected_rows();
+			$this->iAffected	= @mysql_affected_rows($this->sDBLink);
 			return true;
 		}else{
-			$this->sLastError = mysql_error();
+			$this->sLastError = mysql_error($this->sDBLink);
 			return false;
 		}
 	}
@@ -244,14 +244,14 @@ function Update($sTable, $aSet, $aWhere, $aExclude = ''){
 	
 	// 'Arrays' a single result
 	function ArrayResult(){
-		$this->aArrayedResult = mysql_fetch_assoc($this->aResult) or die (mysql_error());
+		$this->aArrayedResult = mysql_fetch_assoc($this->aResult) or die (mysql_error($this->sDBLink));
 		return $this->aArrayedResult;
 	}
 
 	// 'Arrays' multiple result
 	function ArrayResults(){
 		$this->aArrayedResults = array();
-		while ($aData = mysql_fetch_assoc($this->aResult){
+		while ($aData = mysql_fetch_assoc($this->aResult)){
 			$this->aArrayedResults[] = $aData;
 		}
 		return $this->aArrayedResults;
@@ -276,14 +276,14 @@ function SecureData($aData){
 		if(is_array($aData)){
 			foreach($aData as $iKey=>$sVal){
 				if(!is_array($aData[$iKey])){
-					$aData[$iKey] = mysql_real_escape_string($aData[$iKey]);
+					$aData[$iKey] = mysql_real_escape_string($aData[$iKey], $this->sDBLink);
 				}
 			}
 		}else{
-			$aData = mysql_real_escape_string($aData);
+			$aData = mysql_real_escape_string($aData, $this->sDBLink);
 		}
 		return $aData;
 	}
 }
-?>
 
+?>