25 files changed, 516 insertions, 405 deletions

diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index b7e18f954..3dab85410 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -204,7 +204,7 @@ class Channel extends \Zotlabs\Web\Controller {
 				$_SESSION['loadtime'] = datetime_convert();
 			}
 			else {
-				$r = q("SELECT distinct parent AS item_id, created from item
+				$r = q("SELECT distinct parent AS item_id from item
 					left join abook on ( item.owner_xchan = abook.abook_xchan $abook_uids )
 					WHERE uid = %d $item_normal_update
 					AND item_wall = 1 $simple_update
@@ -249,13 +249,13 @@ class Channel extends \Zotlabs\Web\Controller {
 					}
 				}
 				else {
-					$r = q("SELECT id AS item_id FROM item 
-						left join abook on item.author_xchan = abook.abook_xchan
-						WHERE uid = %d $item_normal
-						AND item_wall = 1 and item_thread_top = 1
-						AND (abook_blocked = 0 or abook.abook_flags is null)
+					$r = q("SELECT item.parent AS item_id FROM item 
+						left join abook on ( item.author_xchan = abook.abook_xchan $abook_uids )
+						WHERE true and uid = %d $item_normal
+						AND (abook.abook_blocked = 0 or abook.abook_flags is null)
+						AND item.item_wall = 1 AND item.item_thread_top = 1 
 						$sql_extra $sql_extra2
-						ORDER BY created DESC, id $pager_sql ",
+						ORDER BY created DESC $pager_sql ",
 						intval(\App::$profile['profile_uid'])
 					);
 				}
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index 2e86804ac..96ade22c0 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -148,8 +148,8 @@ class Ping extends \Zotlabs\Web\Controller {
 
 			$pubs = q("SELECT count(id) as total from item
 				WHERE uid = %d
-				AND author_xchan != '%s'
 				AND item_unseen = 1
+				AND author_xchan != '%s'
 				AND created > '" . datetime_convert('UTC','UTC',$_SESSION['static_loadtime']) . "'
 				$item_normal",
 				intval($sys['channel_id']),
@@ -166,8 +166,8 @@ class Ping extends \Zotlabs\Web\Controller {
 
 			$r = q("SELECT * FROM item
 				WHERE uid = %d
-				AND author_xchan != '%s'
 				AND item_unseen = 1
+				AND author_xchan != '%s'
 				AND created > '" . datetime_convert('UTC','UTC',$_SESSION['static_loadtime']) . "'
 				$item_normal
 				ORDER BY created DESC
@@ -208,22 +208,22 @@ class Ping extends \Zotlabs\Web\Controller {
 		if(x($_REQUEST, 'markRead') && local_channel()) {
 			switch($_REQUEST['markRead']) {
 				case 'network':
-					$r = q("update item set item_unseen = 0 where item_unseen = 1 and uid = %d",
+					$r = q("UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1",
 						intval(local_channel())
 					);
 					break;
 				case 'home':
-					$r = q("update item set item_unseen = 0 where item_unseen = 1 and item_wall = 1  and uid = %d",
+					$r = q("UPDATE item SET item_unseen = 0 WHERE uid = %d AND item_unseen = 1 AND item_wall = 1",
 						intval(local_channel())
 					);
 					break;
 				case 'mail':
-					$r = q("update mail set mail_seen = 1 where mail_seen = 0 and channel_id = %d ",
+					$r = q("UPDATE mail SET mail_seen = 1 WHERE channel_id = %d AND mail_seen = 0",
 						intval(local_channel())
 					);
 					break;
 				case 'all_events':
-					$r = q("update event set dismissed = 1 where dismissed = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ",
+					$r = q("UPDATE event SET dismissed = 1 WHERE uid = %d AND dismissed = 0 AND dtstart < '%s' AND dtstart > '%s' ",
 						intval(local_channel()),
 						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
 						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
@@ -243,9 +243,9 @@ class Ping extends \Zotlabs\Web\Controller {
 		}
 
 		if(x($_REQUEST, 'markItemRead') && local_channel()) {
-			$r = q("update item set item_unseen = 0 where parent = %d and uid = %d",
-				intval($_REQUEST['markItemRead']),
-				intval(local_channel())
+			$r = q("UPDATE item SET item_unseen = 0 WHERE  uid = %d AND parent = %d",
+				intval(local_channel()),
+				intval($_REQUEST['markItemRead'])
 			);
 		}
 
@@ -254,7 +254,7 @@ class Ping extends \Zotlabs\Web\Controller {
 		 * dropdown menu.
 		 */
 		if(argc() > 1 && argv(1) === 'notify') {
-			$t = q("select * from notify where uid = %d and seen = 0 order by created desc",
+			$t = q("SELECT * FROM notify WHERE uid = %d AND seen = 0 ORDER BY CREATED DESC",
 				intval(local_channel())
 			);
 
@@ -320,10 +320,10 @@ class Ping extends \Zotlabs\Web\Controller {
 
 			$r = q("SELECT * FROM item 
 				WHERE uid = %d
-				AND author_xchan != '%s'
 				AND item_unseen = 1
+				AND author_xchan != '%s'
 				$item_normal
-				ORDER BY created DESC, id
+				ORDER BY created DESC
 				LIMIT 300",
 				intval(local_channel()),
 				dbesc($ob_hash)
@@ -495,7 +495,7 @@ class Ping extends \Zotlabs\Web\Controller {
 		if($vnotify & (VNOTIFY_NETWORK|VNOTIFY_CHANNEL)) {
 
 			$r = q("SELECT id, item_wall FROM item 
-				WHERE item_unseen = 1 and uid = %d
+				WHERE uid = %d and item_unseen = 1 
 				$item_normal
 				AND author_xchan != '%s'",
 				intval(local_channel()),
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
index 322a7b60a..d51cb0113 100644
--- a/Zotlabs/Widget/Notifications.php
+++ b/Zotlabs/Widget/Notifications.php
@@ -67,7 +67,7 @@ class Notifications {
 				'label' => t('New Events'),
 				'title' => t('New Events Notifications'),
 				'viewall' => [
-					'url' => 'mail/combined',
+					'url' => 'events',
 					'label' => t('View events')
 				],
 				'markall' => [
diff --git a/boot.php b/boot.php
index 184ff6ea2..7e061e163 100755
--- a/boot.php
+++ b/boot.php
@@ -50,10 +50,10 @@ require_once('include/attach.php');
 require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '3.1.7' );
+define ( 'STD_VERSION',             '3.1.9' );
 define ( 'ZOT_REVISION',            '1.3' );
 
-define ( 'DB_UPDATE_VERSION',       1200  );
+define ( 'DB_UPDATE_VERSION',       1201  );
 
 define ( 'PROJECT_BASE',   __DIR__ );
 
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index deec9adfd..b3298b673 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -1,15 +1,20 @@
 <?php
+/**
+ * @file dba_driver.php
+ * @brief Some database related functions and database classes.
+ *
+ * This file contains the abstract database driver class dba_driver, the
+ * database class DBA and some functions for working with databases.
+ */
 
+/**
+ * @brief Database classs with database factory method.
+ *
+ * The factory will return a database driver which is an implementation of the
+ * abstract dba_driver class.
+ */
 class DBA {
 
-	/**
-	 * @file dba_driver.php
-	 * @brief some database related functions and abstract driver class.
-	 *
-	 * This file contains the abstract database driver class dba_driver and some
-	 * functions for working with databases.
-	 */
-
 	static public $dba = null;
 	static public $dbtype = null;
 	static public $scheme = 'mysql';
@@ -21,7 +26,6 @@ class DBA {
 	static public $tquot = "`";
 
 
-
 	/**
 	 * @brief Returns the database driver object.
 	 *
@@ -34,14 +38,11 @@ class DBA {
 	 * @param bool $install Defaults to false
 	 * @return null|dba_driver A database driver object (dba_pdo) or null if no driver found.
 	 */
-
 	static public function dba_factory($server,$port,$user,$pass,$db,$dbtype,$install = false) {
 
 		self::$dba = null;
-
 		self::$dbtype = intval($dbtype);
 
-
 		if(self::$dbtype == DBTYPE_POSTGRES) {
 			if(!($port))
 				$port = 5432;
@@ -50,7 +51,6 @@ class DBA {
 			self::$utc_now = "now() at time zone 'UTC'";
 			self::$tquot = '"';
 			self::$scheme = 'pgsql';
-
 		}
 		else {
 
@@ -66,40 +66,27 @@ class DBA {
 
 		require_once('include/dba/dba_pdo.php');
 		self::$dba = new dba_pdo($server,self::$scheme,$port,$user,$pass,$db,$install);
-		
-		if(is_object(self::$dba) && self::$dba->connected) {
-
-			if(strpbrk($server,':;')) {
-				$dsn = $server;
-			}
-			else {
-				$dsn = self::$scheme . ':host=' . $server . (intval($port) ? '' : ';port=' . $port);
-			}
-			$dsn .= ';dbname=' . $db;
-
-
-			self::$dba->pdo_set(array($dsn,$user,$pass));
-		}
 
 		define('NULL_DATE', self::$null_date);
 		define('ACTIVE_DBTYPE', self::$dbtype);
 		define('TQUOT', self::$tquot);
+
 		return self::$dba;
 	}
 
 }
 
 /**
- * @brief abstract database driver class.
+ * @brief Abstract database driver class.
  *
- * This class gets extended by the real database driver classes, e.g. dba_mysql,
- * dba_mysqli.
+ * This class gets extended by the real database driver class. We used to have
+ * dba_mysql, dba_mysqli or dba_postgres, but we moved to PDO and the only
+ * implemented driver is dba_pdo.
  */
 abstract class dba_driver {
 	// legacy behavior
 
 	public $db;
-	protected $pdo = array();
 
 	public  $debug = 0;
 	public  $connected = false;
@@ -111,6 +98,7 @@ abstract class dba_driver {
 	 * This abstract function needs to be implemented in the real driver.
 	 *
 	 * @param string $server DB server name
+	 * @param string $scheme DB scheme
 	 * @param string $port DB port
 	 * @param string $user DB username
 	 * @param string $pass DB password
@@ -166,6 +154,7 @@ abstract class dba_driver {
 		$platform_name = \Zotlabs\Lib\System::get_platform_name();
 		if(file_exists('install/' . $platform_name . '/' . \DBA::$install_script))
 			 return 'install/' . $platform_name . '/' . \DBA::$install_script;
+
 		return 'install/' . \DBA::$install_script;
 	}
 
@@ -173,7 +162,6 @@ abstract class dba_driver {
 		return \DBA::$tquot;
 	}
 
-
 	function utcnow() {
 		return \DBA::$utc_now;
 	}
@@ -232,19 +220,12 @@ abstract class dba_driver {
 		return $str;
 	}
 
-	function pdo_set($x) {
-		$this->pdo = $x;
-	}
-
-	function pdo_get() {
-		return $this->pdo;
-	}
-
 } // end abstract dba_driver class
 
 
-
+//
 // Procedural functions
+//
 
 function printable($s) {
 	$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
@@ -275,7 +256,7 @@ function dbg($state) {
  * wrapping with intval().
  *
  * @param string $str A string to pass to a DB query
- * @return Return an escaped string of the value to pass to a DB query.
+ * @return string Return an escaped string of the value to pass to a DB query.
  */
 function dbesc($str) {
 
@@ -298,6 +279,7 @@ function dbunescbin($str) {
 function dbescdate($date) {
 	if(is_null_date($date))
 		return \DBA::$dba->escape(NULL_DATE);
+
 	return \DBA::$dba->escape($date);
 }
 
@@ -330,17 +312,17 @@ function db_use_index($str) {
  *
  * printf style arguments %s and %d are replaced with variable arguments, which
  * should each be appropriately dbesc() or intval().
+ *
  * SELECT queries return an array of results or false if SQL or DB error. Other
  * queries return true if the command was successful or false if it wasn't.
  *
  * Example:
- *  $r = q("SELECT * FROM %s WHERE `uid` = %d",
- *         'user', 1);
+ * @code{.php}$r = q("SELECT * FROM %s WHERE `uid` = %d",
+ *         'user', 1);@endcode
  *
  * @param string $sql The SQL query to execute
  * @return bool|array
  */
-
 function q($sql) {
 
 	$args = func_get_args();
@@ -359,8 +341,8 @@ 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
 	 */
 
 	db_logger('dba: no database: ' . print_r($args,true),LOGGER_NORMAL,LOG_CRIT);
@@ -389,8 +371,8 @@ function dbq($sql) {
 
 // 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.
 
 function dbesc_array_cb(&$item, $key) {
 	if(is_string($item)) {
@@ -423,7 +405,7 @@ function dbesc_array(&$arr) {
 function db_getfunc($f) {
 	$lookup = array(
 		'rand'=>array(
-			DBTYPE_MYSQL=>'RAND()', 
+			DBTYPE_MYSQL=>'RAND()',
 			DBTYPE_POSTGRES=>'RANDOM()'
 		),
 		'utc_timestamp'=>array(
diff --git a/include/dba/dba_mysql.php b/include/dba/dba_mysql.php
deleted file mode 100755
index 8b51cf578..000000000
--- a/include/dba/dba_mysql.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-require_once('include/dba/dba_driver.php');
-
-
-class dba_mysql extends dba_driver {
-
-	function connect($server, $scheme, $port, $user,$pass,$db) {
-		$this->db = mysql_connect($server.":".$port,$user,$pass);
-		if($this->db && mysql_select_db($db,$this->db)) {
-			$this->connected = true;
-		}
-		if($this->connected) {
-			return true;
-		}
-		return false;
-	}
-
-
-	function q($sql) {
-		if((! $this->db) || (! $this->connected))
-			return false;
-
-		$this->error = '';
-		$result = @mysql_query($sql,$this->db);
-
-
-		if(mysql_errno($this->db))
-			$this->error = mysql_error($this->db);
-
-		if($result === false || $this->error) {
-			logger('dba_mysql: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
-			if(file_exists('dbfail.out'))
-				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
-		}
-
-		if(($result === true) || ($result === false))
-			return $result;
-
-		$r = array();
-		if(mysql_num_rows($result)) {
-			while($x = mysql_fetch_array($result,MYSQL_ASSOC))
-				$r[] = $x;
-			mysql_free_result($result);
-			if($this->debug)
-				logger('dba_mysql: ' . printable(print_r($r,true)));
-		}
-		return $r;
-	}
-
-	function escape($str) {
-		if($this->db && $this->connected) {
-			return @mysql_real_escape_string($str,$this->db);
-		}
-	}
-
-	function close() {
-		if($this->db)
-			mysql_close($this->db);
-		$this->connected = false;
-	}
-	
-	function getdriver() {
-		return 'mysql';
-	}
-
-}	
diff --git a/include/dba/dba_mysqli.php b/include/dba/dba_mysqli.php
deleted file mode 100755
index 165c8e969..000000000
--- a/include/dba/dba_mysqli.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php /** @file */
-
-require_once('include/dba/dba_driver.php');
-
-class dba_mysqli extends dba_driver {
-
-	function connect($server,$scheme,$port,$user,$pass,$db) {
-		if($port)
-			$this->db = new mysqli($server,$user,$pass,$db, $port);
-		else
-			$this->db = new mysqli($server,$user,$pass,$db);
-
-		if($this->db->connect_error) {
-			$this->connected = false;
-			$this->error = $this->db->connect_error;
-
-			if(file_exists('dbfail.out')) {
-				file_put_contents('dbfail.out', datetime_convert() . "\nConnect: " . $this->error . "\n", FILE_APPEND);
-			}
-
-			return false;
-		}
-		else {
-			$this->connected = true;
-			return true;
-		}
-	}
-
-	function q($sql) {
-		if((! $this->db) || (! $this->connected))
-			return false;
-
-		$this->error = '';
-		$result = $this->db->query($sql);
-
-		if($this->db->errno)
-			$this->error = $this->db->error;
-
-
-		if($this->error) {
-			db_logger('dba_mysqli: ERROR: ' . printable($sql) . "\n" . $this->error, LOGGER_NORMAL, LOG_ERR);
-			if(file_exists('dbfail.out')) {
-				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . "\n" . $this->error . "\n", FILE_APPEND);
-			}
-		}
-
-		if(($result === true) || ($result === false)) {
-			if($this->debug) {
-				db_logger('dba_mysqli: DEBUG: ' . printable($sql) . ' returns ' . (($result) ? 'true' : 'false'), LOGGER_NORMAL,(($result) ? LOG_INFO : LOG_ERR));
-			}
-			return $result;
-		}
-
-		if($this->debug) {
-			db_logger('dba_mysqli: DEBUG: ' . printable($sql) . ' returned ' . $result->num_rows . ' results.', LOGGER_NORMAL, LOG_INFO); 
-		}
-
-		$r = array();
-		if($result->num_rows) {
-			while($x = $result->fetch_array(MYSQLI_ASSOC))
-				$r[] = $x;
-			$result->free_result();
-			if($this->debug) {
-				db_logger('dba_mysqli: ' . printable(print_r($r,true)), LOGGER_NORMAL, LOG_INFO);
-			}
-		}
-		return $r;
-	}
-
-	function escape($str) {
-		if($this->db && $this->connected) {
-			return @$this->db->real_escape_string($str);
-		}
-	}
-
-	function close() {
-		if($this->db)
-			$this->db->close();
-		$this->connected = false;
-	}
-	
-	function getdriver() {
-		return 'mysqli';
-	}
-
-}
\ No newline at end of file
diff --git a/include/dba/dba_pdo.php b/include/dba/dba_pdo.php
index a9d824a50..f24c5381a 100755
--- a/include/dba/dba_pdo.php
+++ b/include/dba/dba_pdo.php
@@ -1,14 +1,21 @@
-<?php /** @file */
+<?php
 
-require_once('include/dba/dba_driver.php');
+require_once 'include/dba/dba_driver.php';
 
+/**
+ * @brief PDO based database driver.
+ *
+ */
 class dba_pdo extends dba_driver {
 
-
 	public $driver_dbtype = null;
 
-	function connect($server,$scheme,$port,$user,$pass,$db) {
-		
+	/**
+	 * {@inheritDoc}
+	 * @see dba_driver::connect()
+	 */
+	function connect($server, $scheme, $port, $user, $pass, $db) {
+
 		$this->driver_dbtype = $scheme;
 
 		if(strpbrk($server,':;')) {
@@ -17,7 +24,7 @@ class dba_pdo extends dba_driver {
 		else {
 			$dsn = $this->driver_dbtype . ':host=' . $server . (intval($port) ? ';port=' . $port : '');
 		}
-		
+
 		$dsn .= ';dbname=' . $db;
 
 		try {
@@ -36,10 +43,19 @@ class dba_pdo extends dba_driver {
 			$this->q("SET standard_conforming_strings = 'off'; SET backslash_quote = 'on';");
 
 		$this->connected = true;
-		return true;
 
+		return true;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @see dba_driver::q()
+	 *
+	 * @return bool|array|PDOStatement
+	 *   - \b false if not connected or PDOException occured on query
+	 *   - \b array with results on a SELECT query
+	 *   - \b PDOStatement on a non SELECT SQL query
+	 */
 	function q($sql) {
 		if((! $this->db) || (! $this->connected))
 			return false;
@@ -50,14 +66,15 @@ class dba_pdo extends dba_driver {
 			}
 		}
 
+		$result = null;
 		$this->error = '';
-		$select = ((stripos($sql,'select') === 0) ? true : false);
+		$select = ((stripos($sql, 'select') === 0) ? true : false);
 
 		try {
 			$result = $this->db->query($sql, PDO::FETCH_ASSOC);
 		}
 		catch(PDOException $e) {
-	
+
 			$this->error = $e->getMessage();
 			if($this->error) {
 				db_logger('dba_pdo: ERROR: ' . printable($sql) . "\n" . $this->error, LOGGER_NORMAL, LOG_ERR);
@@ -82,11 +99,10 @@ class dba_pdo extends dba_driver {
 		}
 
 		if($this->debug) {
-			db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($r) . ' results.', LOGGER_NORMAL, LOG_INFO); 
+			db_logger('dba_pdo: DEBUG: ' . printable($sql) . ' returned ' . count($r) . ' results.', LOGGER_NORMAL, LOG_INFO);
 			db_logger('dba_pdo: ' . printable(print_r($r,true)), LOGGER_NORMAL, LOG_INFO);
 		}
 
-
 		return (($this->error) ? false : $r);
 	}
 
@@ -99,9 +115,10 @@ class dba_pdo extends dba_driver {
 	function close() {
 		if($this->db)
 			$this->db = null;
+
 		$this->connected = false;
 	}
-	
+
 	function concat($fld,$sep) {
 		if($this->driver_dbtype === 'pgsql') {
 			return 'string_agg(' . $fld . ',\'' . $sep . '\')';
@@ -140,7 +157,7 @@ class dba_pdo extends dba_driver {
 			return $this->escape($str);
 		}
 	}
-	
+
 	function unescapebin($str) {
 		if($this->driver_dbtype === 'pgsql' && (! is_null($str))) {
 			$x = '';
diff --git a/include/dba/dba_postgres.php b/include/dba/dba_postgres.php
deleted file mode 100644
index 560d8da60..000000000
--- a/include/dba/dba_postgres.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-require_once('include/dba/dba_driver.php');
-
-
-class dba_postgres extends dba_driver {
-	const INSTALL_SCRIPT='install/schema_postgres.sql';
-	const NULL_DATE = '0001-01-01 00:00:00';
-	const UTC_NOW = "now() at time zone 'UTC'";
-	const TQUOT = '"';
-	
-	function connect($server,$scheme,$port,$user,$pass,$db) {
-		if(!$port) $port = 5432;
-		$connstr = 'host=' . $server . ' port='.$port . ' user=' . $user . ' password=' . $pass . ' dbname='. $db;
-		$this->db = pg_connect($connstr);
-		if($this->db !== false) {
-			$this->connected = true;
-		} else {
-			$this->connected = false;
-		}
-		$this->q("SET standard_conforming_strings = 'off'; SET backslash_quote = 'on';"); // emulate mysql string escaping to prevent massive code-clobber
-		return $this->connected;
-	}
-	
-	function q($sql) {
-		if((! $this->db) || (! $this->connected))
-			return false;
-		
-		if(!strpos($sql, ';'))
-			$sql .= ';';
-			
-		if(strpos($sql, '`')) // this is a hack. quoted identifiers should be replaced everywhere in the code with dbesc_identifier(), remove this once it is
-			$sql = str_replace('`', '"', $sql);
-			
-		$this->error = '';
-		$result = @pg_query($this->db, $sql);
-		if(file_exists('db-allqueries.out')) {
-			$bt = debug_backtrace();
-			$trace = array();
-			foreach($bt as $frame) {
-				if(!empty($frame['file']) && @strstr($frame['file'], $_SERVER['DOCUMENT_ROOT']))
-					$frame['file'] = substr($frame['file'], strlen($_SERVER['DOCUMENT_ROOT'])+1);
-					
-				$trace[] = $frame['file'] . ':' . $frame['function'] . '():' . $frame['line'] ;
-			}
-			$compact = join(', ', $trace);
-			file_put_contents('db-allqueries.out', datetime_convert() . ": " . $sql . ' is_resource: '.var_export(is_resource($result), true).', backtrace: '.$compact."\n\n", FILE_APPEND);
-		}
-
-		if($result === false)
-			$this->error = pg_last_error($this->db);
-
-		if($result === false || $this->error) {
-			//db_logger('dba_postgres: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
-			if(file_exists('dbfail.out'))
-				file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
-		}
-			
-		if(($result === true) || ($result === false))
-			return $result;
-		
-		if(pg_result_status($result) == PGSQL_COMMAND_OK)
-			return true;
-			
-		$r = array();
-		if(pg_num_rows($result)) {
-			while($x = pg_fetch_array($result, null, PGSQL_ASSOC))
-				$r[] = $x;
-			pg_free_result($result);
-			if($this->debug)
-				db_logger('dba_postgres: ' . printable(print_r($r,true)));
-		}
-		return $r;
-	}
-	
-	function escape($str) {
-		if($this->db && $this->connected) {
-			$x = @pg_escape_string($this->db, $str);
-			return $x;
-		}
-	}
-	
-	function escapebin($str) {
-		return pg_escape_bytea($str);
-	}
-	
-	function unescapebin($str) {
-		return pg_unescape_bytea($str);
-	}
-	
-	function close() {
-		if($this->db)
-			pg_close($this->db);
-		$this->connected = false;
-	}
-	
-	function quote_interval($txt) {
-		return "'$txt'";
-	}
-	
-	function escape_identifier($str) {
-		return pg_escape_identifier($this->db, $str);
-	}
-	
-	function optimize_table($table) {
-		// perhaps do some equivalent thing here, vacuum, etc? I think this is the DBA's domain anyway. Applications should not need to muss with this.
-		// for now do nothing without a compelling reason. function overrides default legacy mysql.
-	}
-	
-	function concat($fld, $sep) {
-		return 'string_agg(' . $fld . ',\'' . $sep . '\')';
-	}
-	
-	function getdriver() {
-		return 'pgsql';
-	}
-}
\ No newline at end of file
diff --git a/include/feedutils.php b/include/feedutils.php
index 986248c53..c4e9790de 100644
--- a/include/feedutils.php
+++ b/include/feedutils.php
@@ -503,7 +503,7 @@ function get_atom_elements($feed, $item) {
 			$res['item_private'] = 1;
 	}
 
-	logger('ostatus_protocol: ' . intval($ostatus_protocol));
+	logger('ostatus_protocol: ' . intval($ostatus_protocol), LOGGER_DEBUG);
 
 	$apps = $item->get_item_tags(NAMESPACE_STATUSNET, 'notice_info');
 	if($apps && $apps[0]['attribs']['']['source']) {
diff --git a/include/items.php b/include/items.php
index 42f147eec..6a6308da1 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3467,7 +3467,7 @@ function item_expire($uid,$days) {
 		AND item_thread_top = 1
 		AND resource_type = ''
 		AND item_starred = 0
-		$sql_extra $item_normal LIMIT $expire_limit ",
+		$sql_extra $item_normal ORDER BY created ASC LIMIT $expire_limit ",
 		intval($uid),
 		db_utcnow(),
 		db_quoteinterval(intval($days).' DAY')
diff --git a/include/js_strings.php b/include/js_strings.php
index 1b4668061..936594291 100644
--- a/include/js_strings.php
+++ b/include/js_strings.php
@@ -24,10 +24,16 @@ function js_strings() {
 		'$leavethispage' => t('Unsaved changes. Are you sure you wish to leave this page?'),
 		'$location'    => t('Location'),
 
-		'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : ''),
-		'$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''),
-		'$t03' => t('ago'),
-		'$t04' => t('from now'),
+		// translatable prefix and suffix strings for jquery.timeago -
+		// using the defaults set below if left untranslated, empty strings if
+		// translated to "NONE" and the corresponding language strings
+		// if translated to anything else
+		'$t01' => ((t('timeago.prefixAgo') == 'timeago.prefixAgo') ? '' : ((t('timeago.prefixAgo') == 'NONE') ? '' : t('timeago.prefixAgo'))),
+		'$t02' => ((t('timeago.prefixFromNow') == 'timeago.prefixFromNow') ? '' : ((t('timeago.prefixFromNow') == 'NONE') ? '' : t('timeago.prefixFromNow'))),
+		'$t03' => ((t('timeago.suffixAgo') == 'timeago.suffixAgo') ? 'ago' : ((t('timeago.suffixAgo') == 'NONE') ? '' : t('timeago.suffixAgo'))),
+		'$t04' => ((t('timeago.suffixFromNow') == 'timeago.suffixFromNow') ? 'from now' : ((t('timeago.suffixFromNow') == 'NONE') ? '' : t('timeago.suffixFromNow'))),
+
+		// translatable main strings for jquery.timeago
 		'$t05' => t('less than a minute'),
 		'$t06' => t('about a minute'),
 		'$t07' => t('%d minutes'),
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index ea13e0de6..aa0ea0178 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -651,6 +651,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `uid_commented` (`uid`, `commented`),
   KEY `uid_created` (`uid`, `created`),
   KEY `uid_item_unseen` (`uid`, `item_unseen`),
+  KEY `uid_item_type` (`uid`, `item_type`),
   KEY `aid` (`aid`),
   KEY `owner_xchan` (`owner_xchan`),
   KEY `author_xchan` (`author_xchan`),
@@ -689,8 +690,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `item_verified` (`item_verified`),
   KEY `item_retained` (`item_retained`),
   KEY `item_rss` (`item_rss`),
-  KEY `item_consensus` (`item_consensus`),
-  KEY `item_type` (`item_type`)
+  KEY `item_consensus` (`item_consensus`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `item_id` (
diff --git a/install/update.php b/install/update.php
index ceaccdfa3..d5ad394f4 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1200 );
+define( 'UPDATE_VERSION' , 1201 );
 
 /**
  *
@@ -3099,3 +3099,17 @@ function update_r1199() {
 
 	return UPDATE_SUCCESS;
 }
+
+function update_r1200() {
+
+	if(ACTIVE_DBTYPE == DBTYPE_MYSQL) {
+		$r = q("ALTER TABLE item 
+			DROP INDEX item_type,
+			ADD INDEX uid_item_type (uid, item_type)
+		");
+	}
+
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}
diff --git a/tests/phpunit-pgsql.xml b/tests/phpunit-pgsql.xml
index ec4a6fc2d..078056d56 100644
--- a/tests/phpunit-pgsql.xml
+++ b/tests/phpunit-pgsql.xml
@@ -32,4 +32,15 @@
         highLowerBound="70"/>
         <log type="testdox-text" target="./results/testdox.txt"/>
     </logging>
+    <php>
+        <!-- Default test database config, only used if no environment variables
+             with same names are set.
+             !!! Never run against a real database, it will truncate all tables -->
+        <env name="hz_db_server" value="127.0.0.1"/>
+        <env name="hz_db_scheme" value="pgsql"/>
+        <env name="hz_db_port" value="5432"/>
+        <env name="hz_db_user" value="travis_hz"/>
+        <env name="hz_db_pass" value="hubzilla"/>
+        <env name="hz_db_database" value="travis_hubzilla"/>
+    </php>
 </phpunit>
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
index a22317b08..97c84fb81 100644
--- a/tests/phpunit.xml.dist
+++ b/tests/phpunit.xml.dist
@@ -35,4 +35,15 @@
         highLowerBound="70"/>
         <log type="testdox-text" target="./results/testdox.txt"/>
     </logging>
+    <php>
+        <!-- Default test database config, only used if no environment variables
+             with same names are set.
+             !!! Never run against a real database, it will truncate all tables -->
+        <env name="hz_db_server" value="127.0.0.1"/>
+        <env name="hz_db_scheme" value="mysql"/>
+        <env name="hz_db_port" value="3306"/>
+        <env name="hz_db_user" value="travis_hz"/>
+        <env name="hz_db_pass" value="hubzilla"/>
+        <env name="hz_db_database" value="travis_hubzilla"/>
+    </php>
 </phpunit>
diff --git a/tests/travis/prepare_mysql.sh b/tests/travis/prepare_mysql.sh
index 095ad7e25..5b1c96d78 100755
--- a/tests/travis/prepare_mysql.sh
+++ b/tests/travis/prepare_mysql.sh
@@ -25,7 +25,7 @@
 # Exit if anything fails
 set -e
 
-echo "Preparing for MySQL ..."
+echo "Preparing for MySQL/MariaDB ..."
 
 if [[ "$MYSQL_VERSION" == "5.7" ]]; then
 	echo "Using MySQL 5.7 in Docker container, need to use TCP"
@@ -41,13 +41,13 @@ mysql $PROTO -e "SHOW VARIABLES LIKE 'character_set%';"
 mysql $PROTO -e "SELECT @@sql_mode;"
 
 # Create Hubzilla database
-mysql $PROTO -u root -e "CREATE DATABASE IF NOT EXISTS hubzilla;";
-mysql $PROTO -u root -e "CREATE USER 'hubzilla'@'localhost' IDENTIFIED BY 'hubzilla';"
-mysql $PROTO -u root -e "GRANT ALL ON hubzilla.* TO 'hubzilla'@'localhost';"
+mysql $PROTO -u root -e "CREATE DATABASE IF NOT EXISTS travis_hubzilla;";
+mysql $PROTO -u root -e "CREATE USER 'travis_hz'@'%' IDENTIFIED BY 'hubzilla';"
+mysql $PROTO -u root -e "GRANT ALL ON travis_hubzilla.* TO 'travis_hz'@'%';"
 
 # Import table structure
-mysql $PROTO -u root hubzilla < ./install/schema_mysql.sql
+mysql $PROTO -u root travis_hubzilla < ./install/schema_mysql.sql
 
 # Show databases and tables
 mysql $PROTO -u root -e "SHOW DATABASES;"
-mysql $PROTO -u root -e "USE hubzilla; SHOW TABLES;"
+mysql $PROTO -u root -e "USE travis_hubzilla; SHOW TABLES;"
diff --git a/tests/travis/prepare_pgsql.sh b/tests/travis/prepare_pgsql.sh
index 63c7388cb..0175b9858 100755
--- a/tests/travis/prepare_pgsql.sh
+++ b/tests/travis/prepare_pgsql.sh
@@ -33,12 +33,17 @@ psql --version
 psql -U postgres -c "SELECT VERSION();"
 
 # Create Hubzilla database
-psql -U postgres -c "DROP DATABASE IF EXISTS hubzilla;"
-psql -U postgres -c "CREATE DATABASE hubzilla;"
+psql -U postgres -c "DROP DATABASE IF EXISTS travis_hubzilla;"
+psql -U postgres -v ON_ERROR_STOP=1 <<-EOSQL
+    CREATE USER travis_hz WITH PASSWORD 'hubzilla';
+    CREATE DATABASE travis_hubzilla;
+    ALTER DATABASE travis_hubzilla OWNER TO travis_hz;
+    GRANT ALL PRIVILEGES ON DATABASE travis_hubzilla TO travis_hz;
+EOSQL
 
 # Import table structure
-psql -U postgres -v ON_ERROR_STOP=1 hubzilla < ./install/schema_postgres.sql
+psql -U travis_hz -v ON_ERROR_STOP=1 travis_hubzilla < ./install/schema_postgres.sql
 
 # Show databases and tables
 psql -U postgres -l
-psql -U postgres -d hubzilla -c "\dt;"
+psql -U postgres -d travis_hubzilla -c "\dt;"
diff --git a/tests/unit/DatabaseTestCase.php b/tests/unit/DatabaseTestCase.php
new file mode 100644
index 000000000..18c1cfb17
--- /dev/null
+++ b/tests/unit/DatabaseTestCase.php
@@ -0,0 +1,68 @@
+<?php
+/* Copyright (c) 2017 Hubzilla
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Zotlabs\Tests\Unit;
+
+use PHPUnit\DbUnit\TestCaseTrait;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @brief Base class for our Database Unit Tests.
+ *
+ * @warning Never run these tests against a production database, because all
+ * tables will get truncated and there is no way to recover without a backup.
+ *
+ * @author Klaus Weidenbach
+ */
+abstract class DatabaseTestCase extends TestCase {
+
+	use TestCaseTrait;
+
+	/**
+	 * Only instantiate PDO once for test clean-up/fixture load.
+	 *
+	 * @var \PDO
+	 */
+	static private $pdo = null;
+
+	/**
+	 * Only instantiate \PHPUnit\DbUnit\Database\Connection once per test.
+	 *
+	 * @var \PHPUnit\DbUnit\Database\Connection
+	 */
+	private $conn = null;
+
+
+	final public function getConnection() {
+		if ($this->conn === null) {
+			if (self::$pdo === null) {
+				$dsn = \getenv('hz_db_scheme') . ':host=' . \getenv('hz_db_server')
+					. ';port=' . \getenv('hz_db_port') . ';dbname=' . \getenv('hz_db_database');
+
+				self::$pdo = new \PDO($dsn, \getenv('hz_db_user'), \getenv('hz_db_pass'));
+			}
+			$this->conn = $this->createDefaultDBConnection(self::$pdo, \getenv('hz_db_database'));
+		}
+
+		return $this->conn;
+	}
+}
diff --git a/tests/unit/includes/dba/DBATest.php b/tests/unit/includes/dba/DBATest.php
new file mode 100644
index 000000000..900d13083
--- /dev/null
+++ b/tests/unit/includes/dba/DBATest.php
@@ -0,0 +1,67 @@
+<?php
+/*
+ * Copyright (c) 2017 Hubzilla
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Zotlabs\Tests\Unit\includes;
+
+use Zotlabs\Tests\Unit\UnitTestCase;
+
+// required because of process isolation and no autoloading
+require_once 'include/dba/dba_driver.php';
+
+/**
+ * @brief Unit Test case for include/dba/DBA.php file.
+ *
+ * This test needs process isolation because of static \DBA.
+ * @runTestsInSeparateProcesses
+ */
+class DBATest extends UnitTestCase {
+
+	public function testDbaFactoryMysql() {
+		$this->assertNull(\DBA::$dba);
+
+		$ret = \DBA::dba_factory('server', 'port', 'user', 'pass', 'db', '0');
+		$this->assertInstanceOf('dba_pdo', $ret);
+		$this->assertFalse($ret->connected);
+
+		$this->assertSame('mysql', \DBA::$scheme);
+		$this->assertSame('schema_mysql.sql', \DBA::$install_script);
+		$this->assertSame('0001-01-01 00:00:00', \DBA::$null_date);
+		$this->assertSame('UTC_TIMESTAMP()', \DBA::$utc_now);
+		$this->assertSame('`', \DBA::$tquot);
+	}
+
+	public function testDbaFactoryPostgresql() {
+		$this->assertNull(\DBA::$dba);
+
+		$ret = \DBA::dba_factory('server', 'port', 'user', 'pass', 'db', '1');
+		$this->assertInstanceOf('dba_pdo', $ret);
+		$this->assertFalse($ret->connected);
+
+		$this->assertSame('pgsql', \DBA::$scheme);
+		$this->assertSame('schema_postgres.sql', \DBA::$install_script);
+		$this->assertSame('0001-01-01 00:00:00', \DBA::$null_date);
+		$this->assertSame("now() at time zone 'UTC'", \DBA::$utc_now);
+		$this->assertSame('"', \DBA::$tquot);
+	}
+
+}
diff --git a/tests/unit/includes/dba/_files/account.yml b/tests/unit/includes/dba/_files/account.yml
new file mode 100644
index 000000000..344bdb799
--- /dev/null
+++ b/tests/unit/includes/dba/_files/account.yml
@@ -0,0 +1,9 @@
+account:
+  -
+    account_id: 42
+    account_email: "hubzilla@example.com"
+    account_language: "no"
+  -
+    account_id: 43
+    account_email: "hubzilla@example.org"
+    account_language: "de"
diff --git a/tests/unit/includes/dba/dba_pdoTest.php b/tests/unit/includes/dba/dba_pdoTest.php
new file mode 100644
index 000000000..12e574d42
--- /dev/null
+++ b/tests/unit/includes/dba/dba_pdoTest.php
@@ -0,0 +1,189 @@
+<?php
+/*
+ * Copyright (c) 2017 Hubzilla
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Zotlabs\Tests\Unit\includes;
+
+use Zotlabs\Tests\Unit\DatabaseTestCase;
+use PHPUnit\DbUnit\TestCaseTrait;
+use PHPUnit\DbUnit\DataSet\YamlDataSet;
+
+require_once 'include/dba/dba_pdo.php';
+
+/**
+ * @brief Unit Test case for include/dba/dba_pdo.php file.
+ *
+ * Some very basic tests to see if our database layer can connect to a real
+ * database.
+ */
+class dba_pdoTest extends DatabaseTestCase {
+
+	use TestCaseTrait;
+
+	/**
+	 * @var \dba_driver
+	 */
+	protected $dba;
+
+
+	/**
+	 * Set initial state of the database before each test is executed.
+	 * Load database fixtures.
+	 *
+	 * @return \PHPUnit\DbUnit\DataSet\IDataSet
+	 */
+	public function getDataSet() {
+		return new YamlDataSet(dirname(__FILE__) . '/_files/account.yml');
+	}
+
+	protected function setUp() {
+		// Will invoke getDataSet() to load fixtures into DB
+		parent::setUp();
+
+		$this->dba = new \dba_pdo(
+				\getenv('hz_db_server'),
+				\getenv('hz_db_scheme'),
+				\getenv('hz_db_port'),
+				\getenv('hz_db_user'),
+				\getenv('hz_db_pass'),
+				\getenv('hz_db_database')
+		);
+	}
+	protected function assertPreConditions() {
+		$this->assertSame('pdo', $this->dba->getdriver(), "Driver is expected to be 'pdo'.");
+		$this->assertInstanceOf('dba_driver', $this->dba);
+		$this->assertTrue($this->dba->connected, 'Pre condition failed, DB is not connected.');
+		$this->assertInstanceOf('PDO', $this->dba->db);
+	}
+	protected function tearDown() {
+		$this->dba = null;
+	}
+
+
+	/**
+	 * @group mysql
+	 */
+	public function testQuoteintervalOnMysql() {
+		$this->assertSame('value', $this->dba->quote_interval('value'));
+	}
+	/**
+	 * @group postgresql
+	 */
+	public function testQuoteintervalOnPostgresql() {
+		$this->assertSame("'value'", $this->dba->quote_interval('value'));
+	}
+
+	/**
+	 * @group mysql
+	 */
+	public function testGenerateMysqlConcatSql() {
+		$this->assertSame('GROUP_CONCAT(DISTINCT field SEPARATOR \';\')', $this->dba->concat('field', ';'));
+		$this->assertSame('GROUP_CONCAT(DISTINCT field2 SEPARATOR \' \')', $this->dba->concat('field2', ' '));
+	}
+	/**
+	 * @group postgresql
+	 */
+	public function testGeneratePostgresqlConcatSql() {
+		$this->assertSame('string_agg(field,\';\')', $this->dba->concat('field', ';'));
+		$this->assertSame('string_agg(field2,\' \')', $this->dba->concat('field2', ' '));
+	}
+
+
+	public function testConnectToSqlServer() {
+		// connect() is done in dba_pdo constructor which is called in setUp()
+		$this->assertTrue($this->dba->connected);
+	}
+
+	/**
+	 * @depends testConnectToSqlServer
+	 */
+	public function testCloseSqlServerConnection() {
+		$this->dba->close();
+
+		$this->assertNull($this->dba->db);
+		$this->assertFalse($this->dba->connected);
+	}
+
+	/**
+	 * @depends testConnectToSqlServer
+	 */
+	public function testSelectQueryShouldReturnArray() {
+		$ret = $this->dba->q('SELECT * FROM account');
+
+		$this->assertTrue(is_array($ret));
+	}
+
+	/**
+	 * @depends testConnectToSqlServer
+	 */
+	public function testInsertQueryShouldReturnPdostatement() {
+		// Fixture account.yml adds two entries to account table
+		$this->assertEquals(2, $this->getConnection()->getRowCount('account'), 'Pre-Condition');
+
+		$ret = $this->dba->q('INSERT INTO account
+				(account_id, account_email, account_language)
+				 VALUES (100, \'insert@example.com\', \'de\')
+		');
+		$this->assertInstanceOf('PDOStatement', $ret);
+
+		$this->assertEquals(3, $this->getConnection()->getRowCount('account'), 'Inserting failed');
+	}
+
+
+	public function testConnectToWrongSqlServer() {
+		$nodba = new \dba_pdo('wrongserver',
+				\getenv('hz_db_scheme'), \getenv('hz_db_port'),
+				\getenv('hz_db_user'), \getenv('hz_db_pass'),
+				\getenv('hz_db_database')
+		);
+
+		$this->assertSame('pdo', $nodba->getdriver());
+		$this->assertInstanceOf('dba_pdo', $nodba);
+		$this->assertFalse($nodba->connected);
+		$this->assertNull($nodba->db);
+
+		$this->assertFalse($nodba->q('SELECT * FROM account'));
+	}
+
+	/**
+	 * @depends testConnectToSqlServer
+	 */
+	public function testSelectQueryToNonExistentTableShouldReturnFalse() {
+		$ret = $this->dba->q('SELECT * FROM non_existent_table');
+
+		$this->assertFalse($ret);
+	}
+
+	/**
+	 * @depends testConnectToSqlServer
+	 */
+	public function testInsertQueryToNonExistentTableShouldReturnEmptyArray() {
+		$ret = $this->dba->q('INSERT INTO non_existent_table
+				(account_email, account_language)
+				 VALUES (\'email@example.com\', \'en\')
+		');
+
+		$this->assertNotInstanceOf('PDOStatement', $ret);
+		$this->isEmpty($ret);
+	}
+
+}
diff --git a/view/de-de/hmessages.po b/view/de-de/hmessages.po
index e7c962bbd..f68a96c22 100644
--- a/view/de-de/hmessages.po
+++ b/view/de-de/hmessages.po
@@ -12377,27 +12377,27 @@ msgstr "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlasse
 
 #: ../../include/js_strings.php:27
 msgid "timeago.prefixAgo"
-msgstr "timeago.prefixAgo"
+msgstr "vor"
 
 #: ../../include/js_strings.php:28
 msgid "timeago.prefixFromNow"
-msgstr " "
+msgstr "in"
 
 #: ../../include/js_strings.php:29
-msgid "ago"
-msgstr "her"
+msgid "timeago.suffixAgo"
+msgstr "NONE"
 
 #: ../../include/js_strings.php:30
-msgid "from now"
-msgstr "von jetzt"
+msgid "timeago.suffixFromNow"
+msgstr "NONE"
 
 #: ../../include/js_strings.php:31
 msgid "less than a minute"
-msgstr "weniger als eine Minute"
+msgstr "weniger als einer Minute"
 
 #: ../../include/js_strings.php:32
 msgid "about a minute"
-msgstr "ungefähr eine Minute"
+msgstr "ungefähr einer Minute"
 
 #: ../../include/js_strings.php:33
 #, php-format
@@ -12406,7 +12406,7 @@ msgstr "%d Minuten"
 
 #: ../../include/js_strings.php:34
 msgid "about an hour"
-msgstr "ungefähr eine Stunde"
+msgstr "ungefähr einer Stunde"
 
 #: ../../include/js_strings.php:35
 #, php-format
@@ -12415,30 +12415,30 @@ msgstr "ungefähr %d Stunden"
 
 #: ../../include/js_strings.php:36
 msgid "a day"
-msgstr "ein Tag"
+msgstr "einem Tag"
 
 #: ../../include/js_strings.php:37
 #, php-format
 msgid "%d days"
-msgstr "%d Tage"
+msgstr "%d Tagen"
 
 #: ../../include/js_strings.php:38
 msgid "about a month"
-msgstr "ungefähr einen Monat"
+msgstr "ungefähr einem Monat"
 
 #: ../../include/js_strings.php:39
 #, php-format
 msgid "%d months"
-msgstr "%d Monate"
+msgstr "%d Monaten"
 
 #: ../../include/js_strings.php:40
 msgid "about a year"
-msgstr "ungefähr ein Jahr"
+msgstr "ungefähr einem Jahr"
 
 #: ../../include/js_strings.php:41
 #, php-format
 msgid "%d years"
-msgstr "%d Jahre"
+msgstr "%d Jahren"
 
 #: ../../include/js_strings.php:42
 msgid " "
diff --git a/view/de-de/hstrings.php b/view/de-de/hstrings.php
index 61db3fb5d..e87f660f0 100644
--- a/view/de-de/hstrings.php
+++ b/view/de-de/hstrings.php
@@ -1,7 +1,7 @@
 <?php
 
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
+if(! function_exists("string_plural_select_de_de")) {
+function string_plural_select_de_de($n){
 	return ($n != 1);;
 }}
 App::$rtl = 0;
@@ -2790,21 +2790,21 @@ App::$strings["Rate This Channel (this is public)"] = "Diesen Kanal bewerten (ö
 App::$strings["Describe (optional)"] = "Beschreibung (optional)";
 App::$strings["Please enter a link URL"] = "Gib eine URL ein:";
 App::$strings["Unsaved changes. Are you sure you wish to leave this page?"] = "Ungespeicherte Änderungen. Bist Du sicher, dass Du diese Seite verlassen möchtest?";
-App::$strings["timeago.prefixAgo"] = "timeago.prefixAgo";
-App::$strings["timeago.prefixFromNow"] = " ";
-App::$strings["ago"] = "her";
-App::$strings["from now"] = "von jetzt";
-App::$strings["less than a minute"] = "weniger als eine Minute";
-App::$strings["about a minute"] = "ungefähr eine Minute";
+App::$strings["timeago.prefixAgo"] = "vor";
+App::$strings["timeago.prefixFromNow"] = "in";
+App::$strings["timeago.suffixAgo"] = "NONE";
+App::$strings["timeago.suffixFromNow"] = "NONE";
+App::$strings["less than a minute"] = "weniger als einer Minute";
+App::$strings["about a minute"] = "ungefähr einer Minute";
 App::$strings["%d minutes"] = "%d Minuten";
-App::$strings["about an hour"] = "ungefähr eine Stunde";
+App::$strings["about an hour"] = "ungefähr einer Stunde";
 App::$strings["about %d hours"] = "ungefähr %d Stunden";
-App::$strings["a day"] = "ein Tag";
-App::$strings["%d days"] = "%d Tage";
-App::$strings["about a month"] = "ungefähr einen Monat";
-App::$strings["%d months"] = "%d Monate";
-App::$strings["about a year"] = "ungefähr ein Jahr";
-App::$strings["%d years"] = "%d Jahre";
+App::$strings["a day"] = "einem Tag";
+App::$strings["%d days"] = "%d Tagen";
+App::$strings["about a month"] = "ungefähr einem Monat";
+App::$strings["%d months"] = "%d Monaten";
+App::$strings["about a year"] = "ungefähr einem Jahr";
+App::$strings["%d years"] = "%d Jahren";
 App::$strings[" "] = " ";
 App::$strings["timeago.numbers"] = "timeago.numbers";
 App::$strings["__ctx:long__ May"] = "Mai";
diff --git a/view/js/main.js b/view/js/main.js
index 02b0f125c..4a2bae802 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -357,6 +357,7 @@ function closeMenu(theID) {
 function markRead(notifType) {
 	$.get('ping?f=&markRead='+notifType);
 	$('.' + notifType + '-button').hide();
+	sessionStorage.removeItem(notifType + '_notifications_cache');
 	if(timer) clearTimeout(timer);
 	timer = setTimeout(updateInit,2000);
 }
@@ -436,6 +437,7 @@ function handleNotifications(data) {
 
 		if(item == 0) {
 			$('.' + index + '-button').fadeOut();
+			sessionStorage.removeItem(index + '_notifications_cache');
 		} else {
 			$('.' + index + '-button').fadeIn();
 			$('.' + index + '-update').html(item);