X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=wwwroot%2Finc%2Fdatabase.inc;h=80a03a93711275078acf726b4ec75ff55cbe5182;hb=HEAD;hp=e20b5fac2766133640550d4e8ebbf82baf0a92dd;hpb=a3be90c67dddac260c8267cf61ccd0a6b758cb35;p=mirrors%2FKyberia-bloodline.git

diff --git a/wwwroot/inc/database.inc b/wwwroot/inc/database.inc
index e20b5fa..80a03a9 100644
--- a/wwwroot/inc/database.inc
+++ b/wwwroot/inc/database.inc
@@ -1,138 +1,101 @@
 <?php
-require ("result.inc");
 
-class CLASS_DATABASE {
+require("result.inc");
 
-/*
-var $Database="";
-var $User="";
-var $Password="";
-var $Url="";
-*/
+function db_escape_string($str) {
+	global $db;
+	//This function should be used in whole project instead of *_escape_string() functions!	
+	//return mysql_escape_string($str); //XXX TODO $db->quote($str), mysql_real_escape_string() or pg_escape_string() should be used here!
+	return preg_replace('(^.|.$)', '', $db->quote($str)); //XXX HACK
+}
 
-var $Master = true;
-var $_linkId = false;
-var $_url = "";
-var $_user = "";
-var $_password = "";
-var $_database = "";
-var $_halt_on_error = true;
+class CLASS_DATABASE extends PDO {
+	//All functions in this class are deprecated!
+	//Please use only native PDO functions!
 
-/*
-function CLASS_DATABASE ($database=DB_DATABASE,$user=DB_USER,$password=DB_PASS,$url=DB_HOST) {
-	$this->Database=$database;
-	$this->Password=$password;
-	$this->User=$user;
-	$this->Url=$url;
-*/
+	var $Master = true;
+	var $_linkId = false;
+	var $_url = "";
+	var $_user = "";
+	var $_password = "";
+	var $_database = "";
+	var $_halt_on_error = true;
 
-function CLASS_DATABASE() {
-	$this->connect(DB_HOST,DB_USER,DB_PASS,DB_DATABASE);
-}
+	function __construct() {
+		$this->connect(DB_HOST, DB_USER, DB_PASS, DB_DATABASE);
+	}
 
-function connect($url,$user,$password,$database, $halt_on_error = true) {
+	protected function connect($host, $user, $password, $database, $halt_on_error = true) {
 		global $error;
-		$this->_halt_on_error = $halt_on_error;
-		if ($this->_linkId == false) {
-			$this->_linkId=mysql_connect($url, $user, $password);
-			if ($this->_linkId == false) {
-				$error='chcipla databaza';
-				$this->exception($error);
-				return false;
-				//die();
-			}// else {
-		 	 //	mysql_query('set character set utf8');
-			 //}
-			$this->_url=$url;
-			$this->_user=$user;
-			$this->_password=$password;
+		parent::__construct("mysql:host=$host;dbname=$database", $user,
+				    $password);
+		/*{
+		   $error='chcipla databaza';
+		   $this->exception($error); //deprecated
+		   }; */
+		$this->setAttribute(PDO::ATTR_STATEMENT_CLASS,
+				    array('result', array($this)));
 
-			if ($this->_linkId == false || mysql_select_db($database, $this->_linkId) == false) {
-				$this->exception("1Database failed.");
-				return false;
-				die();
-			}
-			$this->_database=$database;
-		}
+		$this->_halt_on_error = $halt_on_error;
+		$this->_url = $host;
+		$this->_user = $user;
+		$this->_password = $password;
+		/* if ($this->_linkId == false) {
+		   $this->_linkId=mysql_connect($host, $user, $password);
+		   if ($this->_linkId == false) {
+		   $error='chcipla databaza';
+		   $this->exception($error);
+		   return false;
+		   //die();
+		   }// else {
+		   //   mysql_query('set character set utf8');
+		   //}
+		   $this->_url=$host;
+		   $this->_user=$user;
+		   $this->_password=$password;
+
+		   if ($this->_linkId == false || mysql_select_db($database, $this->_linkId) == false) {
+		   $this->exception("1Database failed.");
+		   return false;
+		   die();
+		   }
+		   $this->_database=$database;
+		   }
+		 */
 		return true;
-}
-
-function closeMysql() {
-	mysql_close($this->_linkId);
-}
-
-function query($sql) {
-
-		$this->_linkId = false;
-		$this->connect(DB_HOST,DB_USER,DB_PASS,DB_DATABASE);
-		$this->Master = true;
-
-		$this->_queryId = mysql_query($sql,$this->_linkId);
-
-		if (isset($_SESSION['debugging'])) {
-			echo $sql;
-			global $timer_start;
-			echo "<BR>".SubStr((Time()+SubStr(MicroTime(),0,8)-$timer_start),0,7);
-		}
-
-		if ($this->_queryId == false) {
-	      		$this->exception("query failed ::$sql::");
-		}
-
-		return new result($this->_queryId, $sql);
 	}
 
-
-function executequery($sql) {
-	return($this->query($sql));
-}
-
-function executetransaction($queries) {
-	$this->executequery("set autocommit=0");
-	if (is_array($queries)) {
-		foreach ($queries as $query) {
-			$this->executequery($query);
+	function update($sql) {	//DEPRECATED!!! Use $db->query($sql)->rowCount(); instead!!!
+		if (!$this->Master) {
+			$this->_linkId = false;
+			$this->connect(DB_HOST, DB_USER, DB_PASS, DB_DATABASE);
+			$this->Master = true;
 		}
-	}
-	$this->executequery("commit");
-	$this->executequery("set autocommit=1");
-}
-
-function executeupdate($sql) {
-	return($this->update($sql));
-}
-
-function update($sql) {
-	if (!$this->Master) {
-		$this->_linkId = false;
-		$this->connect(DB_HOST,DB_USER,DB_PASS,DB_DATABASE);
-                $this->Master = true;
-	}
 
-	$this->_queryId = @mysql_db_query($this->_database,$sql,$this->_linkId);
+		$this->_queryId = $this->query($sql);
 		if ($this->_queryId == false) {
 			$this->exception("update failed.");
 		}
-		$rows=@mysql_affected_rows($this->_linkId);
-		return($rows);
-}
+		$rows = @$this->_queryId->rowCount();
+		return ($rows);
+	}
 
-function getLastInsertId() {
-		return(@mysql_insert_id($this->_linkId));
-}
+	function getLastInsertId() {	//DEPRECATED!!! Use $db->lastInsertId(); instead!!!
+		return (@$this->lastInsertId());
+	}
 
-function exception($errorMessage) {
+	protected function exception($errorMessage) {
 
-	echo "<!-- ";
-	echo @mysql_error($this->_linkId)," (",@mysql_errno($this->_linkId),")";
-	echo "-->";
+		echo "<!-- ";
+		//echo @mysql_error($this->_linkId)," (",@mysql_errno($this->_linkId),")";
+		echo "-->";
 
-	if ($this->_halt_on_error) {
-		die("<pre>".$errorMessage."</pre>");
+		if ($this->_halt_on_error) {
+			die("<pre>".$errorMessage."</pre>");
 		} else {
 			echo $errorMessage."<br>";
 			return false;
 		}
 	}
 }
-?>
+