From 07516c318c07c06acf51ed0c0795c08dfc2cbebd Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 5 Mar 2017 21:56:50 +0000
Subject: [PATCH 1/8] We now support PDO for database connections as well

---
 include/dba.php     | 321 ++++++++++++++++++++++++++++----------------
 include/uimport.php |   9 +-
 2 files changed, 205 insertions(+), 125 deletions(-)

diff --git a/include/dba.php b/include/dba.php
index 8e2d18db6..09d705cbd 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,17 +1,5 @@
 <?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');
 
 /**
@@ -24,13 +12,12 @@ require_once('include/datetime.php');
  *
  */
 
-if (! class_exists('dba')) {
 class dba {
 
 	private $debug = 0;
 	private $db;
 	private $result;
-	public  $mysqli = true;
+	private $driver;
 	public  $connected = false;
 	public  $error = false;
 
@@ -53,7 +40,7 @@ class dba {
 		if ($install) {
 			if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
 				if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
-					$this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
+					$this->error = sprintf(t('Cannot locate DNS info for database server \'%s\''), $server);
 					$this->connected = false;
 					$this->db = null;
 					return;
@@ -61,37 +48,49 @@ class dba {
 			}
 		}
 
-		if (class_exists('mysqli')) {
+		if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
+			$this->driver = 'pdo';
+			$connect = "mysql:host=".$server.";dbname=".$db;
+			if (isset($a->config["system"]["db_charset"])) {
+				$connect .= ";charset=".$a->config["system"]["db_charset"];
+			}
+			$this->db = @new PDO($connect, $user, $pass);
+			if (!$this->db->errorCode()) {
+				$this->connected = true;
+			}
+		} elseif (class_exists('mysqli')) {
+			$this->driver = 'mysqli';
 			$this->db = @new mysqli($server,$user,$pass,$db);
-			if (! mysqli_connect_errno()) {
+			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;
+		} elseif (function_exists('mysql_connect')) {
+			$this->driver = 'mysql';
 			$this->db = mysql_connect($server,$user,$pass);
 			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);
+		} else {
+			// No suitable SQL driver was found.
+			if (!$install) {
+				system_unavailable();
+			}
 		}
+
 		if (!$this->connected) {
 			$this->db = null;
 			if (!$install) {
 				system_unavailable();
 			}
 		}
-
 		$a->save_timestamp($stamp1, "network");
 	}
 
-	public function getdb() {
-		return $this->db;
-	}
-
 	/**
 	 * @brief Returns the MySQL server version string
 	 * 
@@ -101,12 +100,18 @@ class dba {
 	 * @return string
 	 */
 	public function server_info() {
-		if ($this->mysqli) {
-			$return = $this->db->server_info;
-		} else {
-			$return = mysql_get_server_info($this->db);
+		switch ($this->driver) {
+			case 'pdo':
+				$version = $this->db->getAttribute(PDO::ATTR_SERVER_VERSION);
+				break;
+			case 'mysqli':
+				$version = $this->db->server_info;
+				break;
+			case 'mysql':
+				$version = mysql_get_server_info($this->db);
+				break;
 		}
-		return $return;
+		return $version;
 	}
 
 	/**
@@ -130,12 +135,18 @@ class dba {
 			return 0;
 		}
 
-		if ($this->mysqli) {
-			$return = $this->result->num_rows;
-		} else {
-			$return = mysql_num_rows($this->result);
+		switch ($this->driver) {
+			case 'pdo':
+				$rows = $this->result->rowCount();
+				break;
+			case 'mysqli':
+				$rows = $this->result->num_rows;
+				break;
+			case 'mysql':
+				$rows = mysql_num_rows($this->result);
+				break;
 		}
-		return $return;
+		return $rows;
 	}
 
 	/**
@@ -172,8 +183,9 @@ class dba {
 			if ((intval($a->config["system"]["db_loglimit_index"]) > 0)) {
 				$log = (in_array($row['key'], $watchlist) AND
 					($row['rows'] >= intval($a->config["system"]["db_loglimit_index"])));
-			} else
+			} else {
 				$log = false;
+			}
 
 			if ((intval($a->config["system"]["db_loglimit_index_high"]) > 0) AND ($row['rows'] >= intval($a->config["system"]["db_loglimit_index_high"]))) {
 				$log = true;
@@ -204,11 +216,19 @@ 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);
+		switch ($this->driver) {
+			case 'pdo':
+				// Not sure if this really is working like expected
+				$connected = ($this->db->getAttribute(PDO::ATTR_CONNECTION_STATUS) != "");
+				break;
+			case 'mysqli':
+				$connected = $this->db->ping();
+				break;
+			case 'mysql':
+				$connected = mysql_ping($this->db);
+				break;
 		}
+
 		$connstr = ($connected ? "Connected" : "Disonnected");
 
 		$stamp1 = microtime(true);
@@ -219,10 +239,16 @@ class dba {
 			$sql = "/*".$a->callstack()." */ ".$sql;
 		}
 
-		if ($this->mysqli) {
-			$result = @$this->db->query($sql);
-		} else {
-			$result = @mysql_query($sql,$this->db);
+		switch ($this->driver) {
+			case 'pdo':
+				$result = @$this->db->query($sql);
+				break;
+			case 'mysqli':
+				$result = @$this->db->query($sql);
+				break;
+			case 'mysql':
+				$result = @mysql_query($sql,$this->db);
+				break;
 		}
 		$stamp2 = microtime(true);
 		$duration = (float)($stamp2-$stamp1);
@@ -243,16 +269,27 @@ class dba {
 			}
 		}
 
-		if ($this->mysqli) {
-			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);
+		switch ($this->driver) {
+			case 'pdo':
+				$errorInfo = $this->db->errorInfo();
+				if ($errorInfo) {
+					$this->error = $errorInfo[2];
+					$this->errorno = $errorInfo[1];
+				}
+				break;
+			case 'mysqli':
+				if ($this->db->errno) {
+					$this->error = $this->db->error;
+					$this->errorno = $this->db->errno;
+				}
+				break;
+			case 'mysql':
+				if (mysql_errno($this->db)) {
+					$this->error = mysql_error($this->db);
+					$this->errorno = mysql_errno($this->db);
+				}
+				break;
 		}
-
 		if (strlen($this->error)) {
 			logger('DB Error ('.$connstr.') '.$this->errorno.': '.$this->error);
 		}
@@ -266,10 +303,16 @@ class dba {
 			} elseif ($result === true) {
 				$mesg = 'true';
 			} else {
-				if ($this->mysqli) {
-					$mesg = $result->num_rows . ' results' . EOL;
-				} else {
-					$mesg = mysql_num_rows($result) . ' results' . EOL;
+				switch ($this->driver) {
+					case 'pdo':
+						$mesg = $result->rowCount().' results'.EOL;
+						break;
+					case 'mysqli':
+						$mesg = $result->num_rows.' results'.EOL;
+						break;
+					case 'mysql':
+						$mesg = mysql_num_rows($result).' results'.EOL;
+						break;
 				}
 			}
 
@@ -302,18 +345,28 @@ class dba {
 		}
 
 		$r = array();
-		if ($this->mysqli) {
-			if ($result->num_rows) {
-				while($x = $result->fetch_array(MYSQLI_ASSOC))
-					$r[] = $x;
-				$result->free_result();
-			}
-		} else {
-			if (mysql_num_rows($result)) {
-				while($x = mysql_fetch_array($result, MYSQL_ASSOC))
-					$r[] = $x;
-				mysql_free_result($result);
-			}
+		switch ($this->driver) {
+			case 'pdo':
+				if ($result->rowCount()) {
+					while($x = $result->fetch(PDO::FETCH_ASSOC))
+						$r[] = $x;
+					$result->closeCursor();
+				}
+				break;
+			case 'mysqli':
+				if ($result->num_rows) {
+					while($x = $result->fetch_array(MYSQLI_ASSOC))
+						$r[] = $x;
+					$result->free_result();
+				}
+				break;
+			case 'mysql':
+				if (mysql_num_rows($result)) {
+					while($x = mysql_fetch_array($result, MYSQL_ASSOC))
+						$r[] = $x;
+					mysql_free_result($result);
+				}
+				break;
 		}
 
 		//$a->save_timestamp($stamp1, "database");
@@ -328,12 +381,22 @@ class dba {
 		$x = false;
 
 		if ($this->result) {
-			if ($this->mysqli) {
-				if ($this->result->num_rows)
-					$x = $this->result->fetch_array(MYSQLI_ASSOC);
-			} else {
-				if (mysql_num_rows($this->result))
-					$x = mysql_fetch_array($this->result, MYSQL_ASSOC);
+			switch ($this->driver) {
+				case 'pdo':
+					if ($this->result->rowCount()) {
+						$x = $this->result->fetch(PDO::FETCH_ASSOC);
+					}
+					break;
+				case 'mysqli':
+					if ($this->result->num_rows) {
+						$x = $this->result->fetch_array(MYSQLI_ASSOC);
+					}
+					break;
+				case 'mysql':
+					if (mysql_num_rows($this->result)) {
+						$x = mysql_fetch_array($this->result, MYSQL_ASSOC);
+					}
+					break;
 			}
 		}
 		return($x);
@@ -341,10 +404,16 @@ class dba {
 
 	public function qclose() {
 		if ($this->result) {
-			if ($this->mysqli) {
-				$this->result->free_result();
-			} else {
-				mysql_free_result($this->result);
+			switch ($this->driver) {
+				case 'pdo':
+					$this->result->closeCursor();
+					break;
+				case 'mysqli':
+					$this->result->free_result();
+					break;
+				case 'mysql':
+					mysql_free_result($this->result);
+					break;
 			}
 		}
 	}
@@ -355,35 +424,65 @@ class dba {
 
 	public function escape($str) {
 		if ($this->db && $this->connected) {
-			if ($this->mysqli) {
-				return @$this->db->real_escape_string($str);
-			} else {
-				return @mysql_real_escape_string($str,$this->db);
+			switch ($this->driver) {
+				case 'pdo':
+					return substr(@$this->db->quote($str, PDO::PARAM_STR), 1, -1);
+				case 'mysqli':
+					return @$this->db->real_escape_string($str);
+				case 'mysql':
+					return @mysql_real_escape_string($str,$this->db);
 			}
 		}
 	}
 
 	function connected() {
-		if ($this->mysqli) {
-			$connected = $this->db->ping();
-		} else {
-			$connected = mysql_ping($this->db);
+		switch ($this->driver) {
+			case 'pdo':
+				// Not sure if this really is working like expected
+				$connected = ($this->db->getAttribute(PDO::ATTR_CONNECTION_STATUS) != "");
+				break;
+			case 'mysqli':
+				$connected = $this->db->ping();
+				break;
+			case 'mysql':
+				$connected = mysql_ping($this->db);
+				break;
 		}
 		return $connected;
 	}
 
+	function insert_id() {
+		switch ($this->driver) {
+			case 'pdo':
+				$id = $this->db->lastInsertId();
+				break;
+			case 'mysqli':
+				$id = $this->db->insert_id;
+				break;
+			case 'mysql':
+				$id = mysql_insert_id($this->db);
+				break;
+		}
+		return $id;
+	}
+
 	function __destruct() {
 		if ($this->db) {
-			if ($this->mysqli) {
-				$this->db->close();
-			} else {
-				mysql_close($this->db);
+			switch ($this->driver) {
+				case 'pdo':
+					$this->db = null;
+					break;
+				case 'mysqli':
+					$this->db->close();
+					break;
+				case 'mysql':
+					mysql_close($this->db);
+					break;
 			}
 		}
 	}
-}}
+}
 
-if (! function_exists('printable')) {
 function printable($s) {
 	$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
 	$s = str_replace("\x00",'.',$s);
@@ -391,37 +490,32 @@ function printable($s) {
 		$s = escape_tags($s);
 	}
 	return $s;
-}}
+}
 
 // Procedural functions
-if (! function_exists('dbg')) {
 function dbg($state) {
 	global $db;
+
 	if ($db) {
 		$db->dbg($state);
 	}
-}}
+}
 
-if (! function_exists('dbesc')) {
 function dbesc($str) {
 	global $db;
+
 	if ($db && $db->connected) {
 		return($db->escape($str));
 	} else {
 		return(str_replace("'","\\'",$str));
 	}
-}}
-
-
+}
 
 // Function: q($sql,$args);
 // Description: execute SQL query with printf style args.
 // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
 //                   'user', 1);
-
-if (! function_exists('q')) {
 function q($sql) {
-
 	global $db;
 	$args = func_get_args();
 	unset($args[0]);
@@ -445,8 +539,7 @@ function q($sql) {
 	 */
 	logger('dba: no database: ' . print_r($args,true));
 	return false;
-
-}}
+}
 
 /**
  * @brief Performs a query with "dirty reads"
@@ -458,8 +551,8 @@ function q($sql) {
  * @return array Query array
  */
 function qu($sql) {
-
 	global $db;
+
 	$args = func_get_args();
 	unset($args[0]);
 
@@ -484,7 +577,6 @@ function qu($sql) {
 	 */
 	logger('dba: no database: ' . print_r($args,true));
 	return false;
-
 }
 
 /**
@@ -492,40 +584,31 @@ function qu($sql) {
  * Raw db query, no arguments
  *
  */
-
-if (! function_exists('dbq')) {
 function dbq($sql) {
-
 	global $db;
+
 	if ($db && $db->connected) {
 		$ret = $db->q($sql);
 	} else {
 		$ret = false;
 	}
 	return $ret;
-}}
-
+}
 
 // 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.
-
-
-if (! function_exists('dbesc_array_cb')) {
 function dbesc_array_cb(&$item, $key) {
 	if (is_string($item))
 		$item = dbesc($item);
-}}
+}
 
-
-if (! function_exists('dbesc_array')) {
 function dbesc_array(&$arr) {
 	if (is_array($arr) && count($arr)) {
 		array_walk($arr,'dbesc_array_cb');
 	}
-}}
-
+}
 
 function dba_timer() {
 	return microtime(true);
diff --git a/include/uimport.php b/include/uimport.php
index b774d78c6..0d7ce5d27 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -11,14 +11,11 @@ define("IMPORT_DEBUG", False);
 
 function last_insert_id() {
 	global $db;
+
 	if (IMPORT_DEBUG)
 		return 1;
-	if ($db->mysqli) {
-		$thedb = $db->getdb();
-		return $thedb->insert_id;
-	} else {
-		return mysql_insert_id();
-	}
+
+	return $db->insert_id();
 }
 
 function last_error() {

From 2ea50d9c47bad0517513cb39dd5187fbb4ee0be0 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 5 Mar 2017 23:59:53 +0000
Subject: [PATCH 2/8] Emulation for the mysqli behaviour when executing insert,
 update, ...

---
 include/dba.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/dba.php b/include/dba.php
index 09d705cbd..000b5b49e 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -334,6 +334,9 @@ class dba {
 			if (file_exists('dbfail.out')) {
 				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
 			}
+		} elseif (($this->driver == 'pdo') AND (strtolower(substr($orig_sql, 0, 6)) != "select")) {
+			// mysqli separates the return value between "select" and "update" - pdo doesn't
+			$result = true;
 		}
 
 		if (($result === true) || ($result === false)) {

From d686bdcf0905c82780e0c4edd79638dcef67825c Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 6 Mar 2017 10:10:22 +0000
Subject: [PATCH 3/8] Quickfix for SQL commands that should return "true"
 instead of an empty array

---
 include/dba.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/include/dba.php b/include/dba.php
index 000b5b49e..3742ba701 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -63,18 +63,21 @@ class dba {
 			$this->db = @new mysqli($server,$user,$pass,$db);
 			if (!mysqli_connect_errno()) {
 				$this->connected = true;
-			}
-			if (isset($a->config["system"]["db_charset"])) {
-				$this->db->set_charset($a->config["system"]["db_charset"]);
+
+				if (isset($a->config["system"]["db_charset"])) {
+					$this->db->set_charset($a->config["system"]["db_charset"]);
+				}
 			}
 		} elseif (function_exists('mysql_connect')) {
 			$this->driver = 'mysql';
 			$this->db = mysql_connect($server,$user,$pass);
 			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 (isset($a->config["system"]["db_charset"]))
-				mysql_set_charset($a->config["system"]["db_charset"], $this->db);
 		} else {
 			// No suitable SQL driver was found.
 			if (!$install) {
@@ -334,9 +337,6 @@ class dba {
 			if (file_exists('dbfail.out')) {
 				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
 			}
-		} elseif (($this->driver == 'pdo') AND (strtolower(substr($orig_sql, 0, 6)) != "select")) {
-			// mysqli separates the return value between "select" and "update" - pdo doesn't
-			$result = true;
 		}
 
 		if (($result === true) || ($result === false)) {
@@ -372,6 +372,11 @@ class dba {
 				break;
 		}
 
+		if (($this->driver == 'pdo') AND (strtolower(substr($orig_sql, 0, 6)) != "select") AND (count($r) == 0)) {
+			// mysqli separates the return value between "select" and "update" - pdo doesn't
+			$r = true;
+		}
+
 		//$a->save_timestamp($stamp1, "database");
 
 		if ($this->debug) {

From f09a8609dff388a4344170ae61aea910361bd6a7 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 7 Mar 2017 17:16:17 +0000
Subject: [PATCH 4/8] Better separation between queries with or without result

---
 include/dba.php | 45 +++++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/include/dba.php b/include/dba.php
index 3742ba701..7a1e3a259 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -242,9 +242,13 @@ class dba {
 			$sql = "/*".$a->callstack()." */ ".$sql;
 		}
 
+		$columns = 0;
+
 		switch ($this->driver) {
 			case 'pdo':
 				$result = @$this->db->query($sql);
+				// Is used to separate between queries that returning data - or not
+				$columns = $result->columnCount();
 				break;
 			case 'mysqli':
 				$result = @$this->db->query($sql);
@@ -350,31 +354,30 @@ class dba {
 		$r = array();
 		switch ($this->driver) {
 			case 'pdo':
-				if ($result->rowCount()) {
-					while($x = $result->fetch(PDO::FETCH_ASSOC))
-						$r[] = $x;
-					$result->closeCursor();
+				while ($x = $result->fetch(PDO::FETCH_ASSOC)) {
+					$r[] = $x;
 				}
+				$result->closeCursor();
 				break;
 			case 'mysqli':
-				if ($result->num_rows) {
-					while($x = $result->fetch_array(MYSQLI_ASSOC))
-						$r[] = $x;
-					$result->free_result();
+				while ($x = $result->fetch_array(MYSQLI_ASSOC)) {
+					$r[] = $x;
 				}
+				$result->free_result();
 				break;
 			case 'mysql':
-				if (mysql_num_rows($result)) {
-					while($x = mysql_fetch_array($result, MYSQL_ASSOC))
-						$r[] = $x;
-					mysql_free_result($result);
+				while ($x = mysql_fetch_array($result, MYSQL_ASSOC)) {
+					$r[] = $x;
 				}
+				mysql_free_result($result);
 				break;
 		}
 
-		if (($this->driver == 'pdo') AND (strtolower(substr($orig_sql, 0, 6)) != "select") AND (count($r) == 0)) {
-			// mysqli separates the return value between "select" and "update" - pdo doesn't
-			$r = true;
+		// PDO doesn't return "true" on successful operations - like mysqli does
+		// Emulate this behaviour by checking if the query returned data and had columns
+		// This should be reliable enough
+		if (($this->driver == 'pdo') AND (count($r) == 0) AND ($columns == 0)) {
+			return true;
 		}
 
 		//$a->save_timestamp($stamp1, "database");
@@ -391,19 +394,13 @@ class dba {
 		if ($this->result) {
 			switch ($this->driver) {
 				case 'pdo':
-					if ($this->result->rowCount()) {
-						$x = $this->result->fetch(PDO::FETCH_ASSOC);
-					}
+					$x = $this->result->fetch(PDO::FETCH_ASSOC);
 					break;
 				case 'mysqli':
-					if ($this->result->num_rows) {
-						$x = $this->result->fetch_array(MYSQLI_ASSOC);
-					}
+					$x = $this->result->fetch_array(MYSQLI_ASSOC);
 					break;
 				case 'mysql':
-					if (mysql_num_rows($this->result)) {
-						$x = mysql_fetch_array($this->result, MYSQL_ASSOC);
-					}
+					$x = mysql_fetch_array($this->result, MYSQL_ASSOC);
 					break;
 			}
 		}

From acadb8ecdbb4b74b9fdc3d8d913b697f14753938 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Mon, 13 Mar 2017 06:09:00 +0000
Subject: [PATCH 5/8] Remove redundancies.

---
 include/dba.php | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/include/dba.php b/include/dba.php
index 7a1e3a259..4b0498ad3 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -218,21 +218,7 @@ class dba {
 
 		$this->error = '';
 
-		// Check the connection (This can reconnect the connection - if configured)
-		switch ($this->driver) {
-			case 'pdo':
-				// Not sure if this really is working like expected
-				$connected = ($this->db->getAttribute(PDO::ATTR_CONNECTION_STATUS) != "");
-				break;
-			case 'mysqli':
-				$connected = $this->db->ping();
-				break;
-			case 'mysql':
-				$connected = mysql_ping($this->db);
-				break;
-		}
-
-		$connstr = ($connected ? "Connected" : "Disonnected");
+		$connstr = ($this->connected() ? "Connected" : "Disonnected");
 
 		$stamp1 = microtime(true);
 

From 35ec1c8f266d944f1b4d0359cd80a35c2f120ffa Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 14 Mar 2017 21:14:09 +0000
Subject: [PATCH 6/8] Bugfix for pull request 3216 - feed items were mixed

---
 include/feed.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/feed.php b/include/feed.php
index e0fef50db..13833d22e 100644
--- a/include/feed.php
+++ b/include/feed.php
@@ -177,6 +177,10 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 	foreach (array_reverse($entrylist) AS $entry) {
 		$item = array_merge($header, $author);
 
+		$alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
+		if (!is_object($alternate))
+			$alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
+
 		if (is_object($alternate))
 			foreach($alternate AS $attributes)
 				if ($attributes->name == "href")
@@ -217,10 +221,6 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 		if ($item["title"] == "")
 			$item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue;
 
-		$alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
-		if (!is_object($alternate))
-			$alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
-
 		$published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
 
 		if ($published == "")

From dc3fcf0487f67c50e19d166a64229f63e577c42a Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 15 Mar 2017 06:00:22 +0000
Subject: [PATCH 7/8] Standard stuff

---
 include/feed.php | 203 +++++++++++++++++++++++++----------------------
 1 file changed, 108 insertions(+), 95 deletions(-)

diff --git a/include/feed.php b/include/feed.php
index 13833d22e..295993370 100644
--- a/include/feed.php
+++ b/include/feed.php
@@ -17,11 +17,11 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 
 	$a = get_app();
 
-	if (!$simulate)
+	if (!$simulate) {
 		logger("Import Atom/RSS feed '".$contact["name"]."' (Contact ".$contact["id"].") for user ".$importer["uid"], LOGGER_DEBUG);
-	else
+	} else {
 		logger("Test Atom/RSS feed", LOGGER_DEBUG);
-
+	}
 	if ($xml == "") {
 		logger('XML is empty.', LOGGER_DEBUG);
 		return;
@@ -45,63 +45,69 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 		$author["author-link"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:link/text()')->item(0)->nodeValue;
 		$author["author-name"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:title/text()')->item(0)->nodeValue;
 
-		if ($author["author-name"] == "")
+		if ($author["author-name"] == "") {
 			$author["author-name"] = $xpath->evaluate('/rdf:RDF/rss:channel/rss:description/text()')->item(0)->nodeValue;
-
+		}
 		$entries = $xpath->query('/rdf:RDF/rss:item');
 	}
 
 	// Is it Atom?
 	if ($xpath->query('/atom:feed')->length > 0) {
 		$alternate = $xpath->query("atom:link[@rel='alternate']")->item(0)->attributes;
-		if (is_object($alternate))
-			foreach($alternate AS $attributes)
-				if ($attributes->name == "href")
+		if (is_object($alternate)) {
+			foreach($alternate AS $attributes) {
+				if ($attributes->name == "href") {
 					$author["author-link"] = $attributes->textContent;
-
-		if ($author["author-link"] == "")
-			$author["author-link"] = $author["author-id"];
-
-		if ($author["author-link"] == "") {
-			$self = $xpath->query("atom:link[@rel='self']")->item(0)->attributes;
-			if (is_object($self))
-				foreach($self AS $attributes)
-					if ($attributes->name == "href")
-						$author["author-link"] = $attributes->textContent;
+				}
+			}
 		}
 
-		if ($author["author-link"] == "")
-			$author["author-link"] = $xpath->evaluate('/atom:feed/atom:id/text()')->item(0)->nodeValue;
+		if ($author["author-link"] == "") {
+			$author["author-link"] = $author["author-id"];
+		}
+		if ($author["author-link"] == "") {
+			$self = $xpath->query("atom:link[@rel='self']")->item(0)->attributes;
+			if (is_object($self)) {
+				foreach($self AS $attributes) {
+					if ($attributes->name == "href") {
+						$author["author-link"] = $attributes->textContent;
+					}
+				}
+			}
+		}
 
+		if ($author["author-link"] == "") {
+			$author["author-link"] = $xpath->evaluate('/atom:feed/atom:id/text()')->item(0)->nodeValue;
+		}
 		$author["author-avatar"] = $xpath->evaluate('/atom:feed/atom:logo/text()')->item(0)->nodeValue;
 
 		$author["author-name"] = $xpath->evaluate('/atom:feed/atom:title/text()')->item(0)->nodeValue;
 
-		if ($author["author-name"] == "")
+		if ($author["author-name"] == "") {
 			$author["author-name"] = $xpath->evaluate('/atom:feed/atom:subtitle/text()')->item(0)->nodeValue;
-
-		if ($author["author-name"] == "")
+		}
+		if ($author["author-name"] == "") {
 			$author["author-name"] = $xpath->evaluate('/atom:feed/atom:author/atom:name/text()')->item(0)->nodeValue;
-
+		}
 		$value = $xpath->evaluate('atom:author/poco:displayName/text()')->item(0)->nodeValue;
-		if ($value != "")
+		if ($value != "") {
 			$author["author-name"] = $value;
-
+		}
 		if ($simulate) {
 			$author["author-id"] = $xpath->evaluate('/atom:feed/atom:author/atom:uri/text()')->item(0)->nodeValue;
 
 			$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()')->item(0)->nodeValue;
-			if ($value != "")
+			if ($value != "") {
 				$author["author-nick"] = $value;
-
+			}
 			$value = $xpath->evaluate('atom:author/poco:address/poco:formatted/text()', $context)->item(0)->nodeValue;
-			if ($value != "")
+			if ($value != "") {
 				$author["author-location"] = $value;
-
+			}
 			$value = $xpath->evaluate('atom:author/poco:note/text()')->item(0)->nodeValue;
-			if ($value != "")
+			if ($value != "") {
 				$author["author-about"] = $value;
-
+			}
 		}
 
 		$author["edited"] = $author["created"] = $xpath->query('/atom:feed/atom:updated/text()')->item(0)->nodeValue;
@@ -118,12 +124,12 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 		$author["author-name"] = $xpath->evaluate('/rss/channel/title/text()')->item(0)->nodeValue;
 		$author["author-avatar"] = $xpath->evaluate('/rss/channel/image/url/text()')->item(0)->nodeValue;
 
-		if ($author["author-name"] == "")
+		if ($author["author-name"] == "") {
 			$author["author-name"] = $xpath->evaluate('/rss/channel/copyright/text()')->item(0)->nodeValue;
-
-		if ($author["author-name"] == "")
+		}
+		if ($author["author-name"] == "") {
 			$author["author-name"] = $xpath->evaluate('/rss/channel/description/text()')->item(0)->nodeValue;
-
+		}
 		$author["edited"] = $author["created"] = $xpath->query('/rss/channel/pubDate/text()')->item(0)->nodeValue;
 
 		$author["app"] = $xpath->evaluate('/rss/channel/generator/text()')->item(0)->nodeValue;
@@ -134,9 +140,9 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 	if (!$simulate) {
 		$author["author-link"] = $contact["url"];
 
-		if ($author["author-name"] == "")
+		if ($author["author-name"] == "") {
 			$author["author-name"] = $contact["name"];
-
+		}
 		$author["author-avatar"] = $contact["thumb"];
 
 		$author["owner-link"] = $contact["url"];
@@ -171,37 +177,39 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 
 	$entrylist = array();
 
-	foreach ($entries AS $entry)
+	foreach ($entries AS $entry) {
 		$entrylist[] = $entry;
-
+	}
 	foreach (array_reverse($entrylist) AS $entry) {
 		$item = array_merge($header, $author);
 
 		$alternate = $xpath->query("atom:link[@rel='alternate']", $entry)->item(0)->attributes;
-		if (!is_object($alternate))
+		if (!is_object($alternate)) {
 			$alternate = $xpath->query("atom:link", $entry)->item(0)->attributes;
-
-		if (is_object($alternate))
-			foreach($alternate AS $attributes)
-				if ($attributes->name == "href")
+		}
+		if (is_object($alternate)) {
+			foreach($alternate AS $attributes) {
+				if ($attributes->name == "href") {
 					$item["plink"] = $attributes->textContent;
-
-		if ($item["plink"] == "")
+				}
+			}
+		}
+		if ($item["plink"] == "") {
 			$item["plink"] = $xpath->evaluate('link/text()', $entry)->item(0)->nodeValue;
-
-		if ($item["plink"] == "")
+		}
+		if ($item["plink"] == "") {
 			$item["plink"] = $xpath->evaluate('rss:link/text()', $entry)->item(0)->nodeValue;
-
+		}
 		$item["plink"] = original_url($item["plink"]);
 
 		$item["uri"] = $xpath->evaluate('atom:id/text()', $entry)->item(0)->nodeValue;
 
-		if ($item["uri"] == "")
+		if ($item["uri"] == "") {
 			$item["uri"] = $xpath->evaluate('guid/text()', $entry)->item(0)->nodeValue;
-
-		if ($item["uri"] == "")
+		}
+		if ($item["uri"] == "") {
 			$item["uri"] = $item["plink"];
-
+		}
 		$item["parent-uri"] = $item["uri"];
 
 		if (!$simulate) {
@@ -215,50 +223,50 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 
 		$item["title"] = $xpath->evaluate('atom:title/text()', $entry)->item(0)->nodeValue;
 
-		if ($item["title"] == "")
+		if ($item["title"] == "") {
 			$item["title"] = $xpath->evaluate('title/text()', $entry)->item(0)->nodeValue;
-
-		if ($item["title"] == "")
+		}
+		if ($item["title"] == "") {
 			$item["title"] = $xpath->evaluate('rss:title/text()', $entry)->item(0)->nodeValue;
-
+		}
 		$published = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
 
-		if ($published == "")
+		if ($published == "") {
 			$published = $xpath->query('pubDate/text()', $entry)->item(0)->nodeValue;
-
-		if ($published == "")
+		}
+		if ($published == "") {
 			$published = $xpath->query('dc:date/text()', $entry)->item(0)->nodeValue;
-
+		}
 		$updated = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
 
-		if ($updated == "")
+		if ($updated == "") {
 			$updated = $published;
-
-		if ($published != "")
+		}
+		if ($published != "") {
 			$item["created"] = $published;
-
-		if ($updated != "")
+		}
+		if ($updated != "") {
 			$item["edited"] = $updated;
-
+		}
 		$creator = $xpath->query('author/text()', $entry)->item(0)->nodeValue;
 
-		if ($creator == "")
+		if ($creator == "") {
 			$creator = $xpath->query('atom:author/atom:name/text()', $entry)->item(0)->nodeValue;
-
-		if ($creator == "")
+		}
+		if ($creator == "") {
 			$creator = $xpath->query('dc:creator/text()', $entry)->item(0)->nodeValue;
-
-		if ($creator != "")
+		}
+		if ($creator != "") {
 			$item["author-name"] = $creator;
-
-		if ($pubDate != "")
+		}
+		if ($pubDate != "") {
 			$item["edited"] = $item["created"] = $pubDate;
-
+		}
 		$creator = $xpath->query('dc:creator/text()', $entry)->item(0)->nodeValue;
 
-		if ($creator != "")
+		if ($creator != "") {
 			$item["author-name"] = $creator;
-
+		}
 		/// @TODO ?
 		// <category>Ausland</category>
 		// <media:thumbnail width="152" height="76" url="http://www.taz.de/picture/667875/192/14388767.jpg"/>
@@ -273,12 +281,13 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 			$title = "";
 
 			foreach($enclosure->attributes AS $attributes) {
-				if ($attributes->name == "url")
+				if ($attributes->name == "url") {
 					$href = $attributes->textContent;
-				elseif ($attributes->name == "length")
+				} elseif ($attributes->name == "length") {
 					$length = $attributes->textContent;
-				elseif ($attributes->name == "type")
+				} elseif ($attributes->name == "type") {
 					$type = $attributes->textContent;
+				}
 			}
 			if(strlen($item["attach"]))
 				$item["attach"] .= ',';
@@ -292,9 +301,11 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 			$preview = "";
 
 			// Handle enclosures and treat them as preview picture
-			foreach ($attachments AS $attachment)
-				if ($attachment["type"] == "image/jpeg")
+			foreach ($attachments AS $attachment) {
+				if ($attachment["type"] == "image/jpeg") {
 					$preview = $attachment["link"];
+				}
+			}
 
 			$item["body"] = $item["title"].add_page_info($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
 			$item["tag"] = add_page_keywords($item["plink"], false, $preview, ($contact["fetch_further_information"] == 2), $contact["ffi_keyword_blacklist"]);
@@ -304,20 +315,20 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 		} else {
 			$body = trim($xpath->evaluate('atom:content/text()', $entry)->item(0)->nodeValue);
 
-			if ($body == "")
+			if ($body == "") {
 				$body = trim($xpath->evaluate('content:encoded/text()', $entry)->item(0)->nodeValue);
-
-			if ($body == "")
+			}
+			if ($body == "") {
 				$body = trim($xpath->evaluate('description/text()', $entry)->item(0)->nodeValue);
-
-			if ($body == "")
+			}
+			if ($body == "") {
 				$body = trim($xpath->evaluate('atom:summary/text()', $entry)->item(0)->nodeValue);
-
+			}
 			// remove the content of the title if it is identically to the body
 			// This helps with auto generated titles e.g. from tumblr
-			if (title_is_body($item["title"], $body))
+			if (title_is_body($item["title"], $body)) {
 				$item["title"] = "";
-
+			}
 			$item["body"] = html2bbcode($body);
 		}
 
@@ -336,14 +347,16 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 			$id = item_store($item, false, $notify);
 
 			logger("Feed for contact ".$contact["url"]." stored under id ".$id);
-		} else
+		} else {
 			$items[] = $item;
-
-		if ($simulate)
+		}
+		if ($simulate) {
 			break;
+		}
 	}
 
-	if ($simulate)
+	if ($simulate) {
 		return array("header" => $author, "items" => $items);
+	}
 }
 ?>

From 35ba3cce709d761fb396541fc5a6678efe44c780 Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <mrpetovan@gmail.com>
Date: Wed, 15 Mar 2017 14:42:34 -0400
Subject: [PATCH 8/8] Fix wrong deferred function name

---
 view/theme/frio/js/textedit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/frio/js/textedit.js b/view/theme/frio/js/textedit.js
index 02191f33d..d212ee003 100644
--- a/view/theme/frio/js/textedit.js
+++ b/view/theme/frio/js/textedit.js
@@ -181,7 +181,7 @@ function dropItem(url, elementId) {
 		$el.fadeTo('fast', 0.33, function () {
 			$.get(url).then(function() {
 				$el.remove();
-			}).error(function() {
+			}).fail(function() {
 				// @todo Show related error message
 				$el.show();
 			}).always(function() {