From 21f4ec101ab2e898324ad1f080e14f4a1fcc84cc Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Feb 2009 06:33:29 -0500
Subject: [PATCH] Added a uninstall script for fedora.

---
 server/lib/classes/db_mysql.inc.php |   53 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/server/lib/classes/db_mysql.inc.php b/server/lib/classes/db_mysql.inc.php
index 0270821..828bb43 100644
--- a/server/lib/classes/db_mysql.inc.php
+++ b/server/lib/classes/db_mysql.inc.php
@@ -29,19 +29,18 @@
 
 	class db
 	{
-		var $dbHost = "";		  // hostname of the MySQL server
-		var $dbName = "";		  // logical database name on that server
-		var $dbUser = "";		  // database authorized user
-		var $dbPass = "";		  // user's password
-		var $dbCharset = "";      // what charset comes and goes to mysql: utf8 / latin1
-		var $linkId = 0;		  // last result of mysql_connect()
-		var $queryId = 0;		  // last result of mysql_query()
-		var $record	= array();	  // last record fetched
-        var $autoCommit = 1;      // Autocommit Transactions
-		var $currentRow;		  // current row number
-		var $errorNumber = 0;	  // last error number
-		var $errorMessage = "";	  // last error message
-		var $errorLocation = "";  // last error location
+		var $dbHost = "";		// hostname of the MySQL server
+		var $dbName = "";		// logical database name on that server
+		var $dbUser = "";		// database authorized user
+		var $dbPass = "";		// user's password
+		var $linkId = 0;		// last result of mysql_connect()
+		var $queryId = 0;		// last result of mysql_query()
+		var $record	= array();	// last record fetched
+        var $autoCommit = 1;    // Autocommit Transactions
+		var $currentRow;		// current row number
+		var $errorNumber = 0;	// last error number
+		var $errorMessage = "";	// last error message
+		var $errorLocation = "";// last error location
 		var $show_error_messages = false;
 
 		// constructor
@@ -53,7 +52,6 @@
 			$this->dbName = $conf["db_database"];
 			$this->dbUser = $conf["db_user"];
 			$this->dbPass = $conf["db_password"];
-			$this->dbCharset = $conf["db_charset"];
 			//$this->connect();
 		}
 
@@ -80,7 +78,6 @@
 					$this->updateError('DB::connect()<br />mysql_connect');
 					return false;
 				}
-    			$this->queryId = @mysql_query('SET NAMES '.$this->dbCharset, $this->linkId);
 			}
 			return true;
 		}
@@ -171,7 +168,7 @@
 				return addslashes($formfield);
 			}
 			
-			return mysql_real_escape_string($formfield);
+			return mysql_real_escape_string($formfield, $this->linkId);
         }
 		
 		// Check der variablen
@@ -226,14 +223,24 @@
            }
        }
        
-       function closeConn() {
+       public function closeConn()
+    	{
+    		if($this->linkId)
+    		{
+    			mysql_close($this->linkId);
+    			return true;
+    		} else { return false; }
+    	}
        
-       }
-       
-       function freeResult() {
-       
-       
-       }
+    	public function freeResult($query) 
+    	{
+    		if(mysql_free_result($query))
+    		{
+    			return true;
+    		} else {
+    			return false;
+    		}
+    	}
        
        function delete() {
        

--
Gitblit v1.9.1