X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fdba.php;h=86a3762b44f041945891eca407e5e31269fd7b77;hb=5efab810f5ac961995940e8ca4051123334111c2;hp=b89f28c599bd7d90b411d292c0b34e00dce20a0a;hpb=29092ace4428aeb796b31856aafa14cef1632bac;p=friendica.git

diff --git a/include/dba.php b/include/dba.php
index b89f28c599..86a3762b44 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,19 +1,30 @@
 <?php
+require_once("dbm.php");
+
+# if PDO is avaible for mysql, use the new database abstraction
+# TODO: PDO is disabled for release 3.3. We need to investigate why
+# the update from 3.2 fails with pdo
+/*
+if(class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
+  require_once("library/dddbl2/dddbl.php");
+  require_once("include/dba_pdo.php");
+}
+*/
+
 
 require_once('include/datetime.php');
 
 /**
- *
- * MySQL database class
+ * @class MySQL database class
  *
  * For debugging, insert 'dbg(1);' anywhere in the program flow.
  * dbg(0); will turn it off. Logging is performed at LOGGER_DATA level.
- * When logging, all binary info is converted to text and html entities are escaped so that 
+ * When logging, all binary info is converted to text and html entities are escaped so that
  * the debugging stream is safe to view within both terminals and web pages.
  *
  */
- 
-if(! class_exists('dba')) { 
+
+if(! class_exists('dba')) {
 class dba {
 
 	private $debug = 0;
@@ -55,6 +66,8 @@ class dba {
 			if(! mysqli_connect_errno()) {
 				$this->connected = true;
 			}
+			if (isset($a->config["system"]["db_charset"]))
+				$this->db->set_charset($a->config["system"]["db_charset"]);
 		}
 		else {
 			$this->mysqli = false;
@@ -62,6 +75,8 @@ class dba {
 			if($this->db && mysql_select_db($db,$this->db)) {
 				$this->connected = true;
 			}
+			if (isset($a->config["system"]["db_charset"]))
+				mysql_set_charset($a->config["system"]["db_charset"], $this->db);
 		}
 		if(! $this->connected) {
 			$this->db = null;
@@ -76,6 +91,23 @@ class dba {
 		return $this->db;
 	}
 
+	/**
+	 * @brief Returns the MySQL server version string
+	 * 
+	 * This function discriminate between the deprecated mysql API and the current
+	 * object-oriented mysqli API. Example of returned string: 5.5.46-0+deb8u1
+	 *
+	 * @return string
+	 */
+	public function server_info() {
+		if ($this->mysqli) {
+			$return = $this->db->server_info;
+		} else {
+			$return = mysql_get_server_info($this->db);
+		}
+		return $return;
+	}
+
 	public function q($sql, $onlyquery = false) {
 		global $a;
 
@@ -84,6 +116,14 @@ class dba {
 
 		$this->error = '';
 
+		// Check the connection (This can reconnect the connection - if configured)
+		if ($this->mysqli)
+			$connected = $this->db->ping();
+		else
+			$connected = mysql_ping($this->db);
+
+		$connstr = ($connected ? "Connected": "Disonnected");
+
 		$stamp1 = microtime(true);
 
 		if($this->mysqli)
@@ -96,6 +136,9 @@ class dba {
 
 		$a->save_timestamp($stamp1, "database");
 
+		if (strtolower(substr($sql, 0, 6)) != "select")
+			$a->save_timestamp($stamp1, "database_write");
+
 		if(x($a->config,'system') && x($a->config['system'],'db_log')) {
 			if (($duration > $a->config["system"]["db_loglimit"])) {
 				$duration = round($duration, 3);
@@ -108,14 +151,17 @@ class dba {
 		}
 
 		if($this->mysqli) {
-			if($this->db->errno)
+			if($this->db->errno) {
 				$this->error = $this->db->error;
+				$this->errorno = $this->db->errno;
+			}
+		} elseif(mysql_errno($this->db)) {
+			$this->error = mysql_error($this->db);
+			$this->errorno = mysql_errno($this->db);
 		}
-		elseif(mysql_errno($this->db))
-				$this->error = mysql_error($this->db);
 
 		if(strlen($this->error)) {
-			logger('dba: ' . $this->error);
+			logger('DB Error ('.$connstr.') '.$this->errorno.': '.$this->error);
 		}
 
 		if($this->debug) {
@@ -220,8 +266,17 @@ class dba {
 		}
 	}
 
+	function connected() {
+		if ($this->mysqli)
+			$connected = $this->db->ping();
+		else
+			$connected = mysql_ping($this->db);
+
+		return $connected;
+	}
+
 	function __destruct() {
-		if ($this->db) 
+		if ($this->db)
 			if($this->mysqli)
 				$this->db->close();
 			else
@@ -239,14 +294,14 @@ function printable($s) {
 }}
 
 // Procedural functions
-if(! function_exists('dbg')) { 
+if(! function_exists('dbg')) {
 function dbg($state) {
 	global $db;
 	if($db)
 	$db->dbg($state);
 }}
 
-if(! function_exists('dbesc')) { 
+if(! function_exists('dbesc')) {
 function dbesc($str) {
 	global $db;
 	if($db && $db->connected)
@@ -262,7 +317,7 @@ function dbesc($str) {
 // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
 //                   'user', 1);
 
-if(! function_exists('q')) { 
+if(! function_exists('q')) {
 function q($sql) {
 
 	global $db;
@@ -279,12 +334,12 @@ function q($sql) {
 
 	/**
 	 *
-	 * This will happen occasionally trying to store the 
-	 * session data after abnormal program termination 
+	 * This will happen occasionally trying to store the
+	 * session data after abnormal program termination
 	 *
 	 */
 	logger('dba: no database: ' . print_r($args,true));
-	return false; 
+	return false;
 
 }}
 
@@ -294,7 +349,7 @@ function q($sql) {
  *
  */
 
-if(! function_exists('dbq')) { 
+if(! function_exists('dbq')) {
 function dbq($sql) {
 
 	global $db;
@@ -306,10 +361,10 @@ function dbq($sql) {
 }}
 
 
-// Caller is responsible for ensuring that any integer arguments to 
+// Caller is responsible for ensuring that any integer arguments to
 // dbesc_array are actually integers and not malformed strings containing
-// SQL injection vectors. All integer array elements should be specifically 
-// cast to int to avoid trouble. 
+// SQL injection vectors. All integer array elements should be specifically
+// cast to int to avoid trouble.
 
 
 if(! function_exists('dbesc_array_cb')) {
@@ -330,4 +385,3 @@ function dbesc_array(&$arr) {
 function dba_timer() {
 	return microtime(true);
 }
-