diff --git a/boot.php b/boot.php
index 2511f1d1ac..95d1b52fd1 100644
--- a/boot.php
+++ b/boot.php
@@ -25,6 +25,7 @@ use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Util\Lock;
 
 require_once 'include/network.php';
@@ -769,7 +770,7 @@ function run_update_function($x) {
 function check_plugins(App $a) {
 
 	$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$installed = $r;
 	} else {
 		$installed = array();
@@ -1055,7 +1056,7 @@ function current_theme() {
 		$r = q("select theme from user where uid = %d limit 1",
 			intval($a->profile_uid)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$page_theme = $r[0]['theme'];
 		}
 	}
@@ -1177,7 +1178,7 @@ function feed_birthday($uid, $tz) {
 			intval($uid)
 	);
 
-	if (dbm::is_result($p)) {
+	if (DBM::is_result($p)) {
 		$tmp_dob = substr($p[0]['dob'], 5);
 		if (intval($tmp_dob)) {
 			$y = datetime_convert($tz, $tz, 'now', 'Y');
diff --git a/doc/Developer-How-To-Move-Classes-to-src.md b/doc/Developer-How-To-Move-Classes-to-src.md
index 25eb393721..134c2a1f5e 100644
--- a/doc/Developer-How-To-Move-Classes-to-src.md
+++ b/doc/Developer-How-To-Move-Classes-to-src.md
@@ -73,16 +73,16 @@ If there are only a handful of references to a single non-namespaced class, just
 ````php
 namespace Friendica\Core;
 ...
-if (\dbm::is_result($r)) {
+if (\DBM::is_result($r)) {
     ...
 }
 ````
 ````php
 namespace Friendica\Core;
 
-use \dbm;
+use Friendica\Database\DBM;
 
-if (dbm::is_result($r)) {
+if (DBM::is_result($r)) {
     ...
 }
 ````
diff --git a/doc/autoloader.md b/doc/autoloader.md
index 1a3b9a55b1..29d3a005fd 100644
--- a/doc/autoloader.md
+++ b/doc/autoloader.md
@@ -104,7 +104,7 @@ class Dfrn {
 
 mail_post($a){
 	...
-	Friendica\dfrn::mail($item, $owner);
+	Friendica\Protocol\DFRN::mail($item, $owner);
 	...
 }
 ```
@@ -125,12 +125,12 @@ switch($contact['network']) {
 	case NETWORK_DFRN:
 		if ($mail) {
 			$item['body'] = ...
-			$atom = Dfrn::mail($item, $owner);
+			$atom = DFRN::mail($item, $owner);
 		} elseif ($fsuggest) {
-			$atom = Dfrn::fsuggest($item, $owner);
+			$atom = DFRN::fsuggest($item, $owner);
 			q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id']));
 		} elseif ($relocate)
-			$atom = Dfrn::relocate($owner, $uid);
+			$atom = DFRN::relocate($owner, $uid);
 [...]
 ```
 
diff --git a/include/Contact.php b/include/Contact.php
index a7a22671fe..cd77bb3bb9 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -4,7 +4,10 @@ use Friendica\App;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\DFRN;
 
 // Included here for completeness, but this is a very dangerous operation.
 // It is the caller's responsibility to confirm the requestor's intent and
@@ -47,7 +50,7 @@ function contact_remove($id) {
 	$r = q("SELECT `uid` FROM `contact` WHERE `id` = %d AND NOT `self` LIMIT 1",
 		intval($id)
 	);
-	if (!dbm::is_result($r) || !intval($r[0]['uid'])) {
+	if (!DBM::is_result($r) || !intval($r[0]['uid'])) {
 		return;
 	}
 
@@ -90,11 +93,9 @@ function terminate_friendship($user,$self,$contact) {
 			slapper($user,$contact['notify'],$slap);
 		}
 	} elseif ($contact['network'] === NETWORK_DIASPORA) {
-		require_once 'include/diaspora.php';
 		Diaspora::send_unshare($user,$contact);
 	} elseif ($contact['network'] === NETWORK_DFRN) {
-		require_once 'include/dfrn.php';
-		dfrn::deliver($user,$contact,'placeholder', 1);
+		DFRN::deliver($user,$contact,'placeholder', 1);
 	}
 
 }
@@ -163,7 +164,7 @@ function unmark_for_death($contact) {
 	);
 
 	// We don't need to update, we never marked this contact as dead
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
@@ -213,7 +214,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 	$r = dba::inArray($s);
 
 	// Fetch contact data from the contact table for the given user, checking with the alias
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		$s = dba::p("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
 				`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, `self`
 			FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ?",
@@ -222,7 +223,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 	}
 
 	// Fetch the data from the contact table with "uid=0" (which is filled automatically)
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		$s = dba::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
 			`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
 			FROM `contact` WHERE `nurl` = ? AND `uid` = 0",
@@ -231,7 +232,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 	}
 
 	// Fetch the data from the contact table with "uid=0" (which is filled automatically) - checked with the alias
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		$s = dba::p("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
 			`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
 			FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = 0",
@@ -240,7 +241,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 	}
 
 	// Fetch the data from the gcontact table
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		$s = dba::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
 			`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
 			FROM `gcontact` WHERE `nurl` = ?",
@@ -248,7 +249,7 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 		$r = dba::inArray($s);
 	}
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		// If there is more than one entry we filter out the connector networks
 		if (count($r) > 1) {
 			foreach ($r AS $id => $result) {
@@ -351,20 +352,20 @@ function get_contact_details_by_addr($addr, $uid = -1) {
 			dbesc($addr), intval($uid));
 
 	// Fetch the data from the contact table with "uid=0" (which is filled automatically)
-	if (!dbm::is_result($r))
+	if (!DBM::is_result($r))
 		$r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
 			`keywords`, `gender`, `photo`, `thumb`, `micro`, `forum`, `prv`, (`forum` | `prv`) AS `community`, `contact-type`, `bd` AS `birthday`, 0 AS `self`
 			FROM `contact` WHERE `addr` = '%s' AND `uid` = 0",
 				dbesc($addr));
 
 	// Fetch the data from the gcontact table
-	if (!dbm::is_result($r))
+	if (!DBM::is_result($r))
 		$r = q("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`,
 			`keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self`
 			FROM `gcontact` WHERE `addr` = '%s'",
 				dbesc($addr));
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		$data = Probe::uri($addr);
 
 		$profile = get_contact_details_by_url($data['url'], $uid);
@@ -486,7 +487,7 @@ function random_profile() {
 			ORDER BY rand() LIMIT 1",
 		dbesc(NETWORK_DFRN));
 
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		return dirname($r[0]['url']);
 	return '';
 }
@@ -553,12 +554,12 @@ function get_contact($url, $uid = 0, $no_update = false) {
 	$contact = dba::select('contact', array('id', 'avatar-date'), array('nurl' => normalise_link($url), 'uid' => $uid), array('limit' => 1));
 
 	// Then the addr (nick@server.tld)
-	if (!dbm::is_result($contact)) {
+	if (!DBM::is_result($contact)) {
 		$contact = dba::select('contact', array('id', 'avatar-date'), array('addr' => $url, 'uid' => $uid), array('limit' => 1));
 	}
 
 	// Then the alias (which could be anything)
-	if (!dbm::is_result($contact)) {
+	if (!DBM::is_result($contact)) {
 		// The link could be provided as http although we stored it as https
 		$ssl_url = str_replace('http://', 'https://', $url);
 		$r = dba::p("SELECT `id`, `avatar-date` FROM `contact` WHERE `alias` IN (?, ?, ?) AND `uid` = ? LIMIT 1",
@@ -567,7 +568,7 @@ function get_contact($url, $uid = 0, $no_update = false) {
 		dba::close($r);
 	}
 
-	if (dbm::is_result($contact)) {
+	if (DBM::is_result($contact)) {
 		$contact_id = $contact["id"];
 
 		// Update the contact every 7 days
@@ -597,7 +598,7 @@ function get_contact($url, $uid = 0, $no_update = false) {
 		// Get data from the gcontact table
 		$gcontacts = dba::select('gcontact', array('name', 'nick', 'url', 'photo', 'addr', 'alias', 'network'),
 						array('nurl' => normalise_link($url)), array('limit' => 1));
-		if (!dbm::is_result($gcontacts)) {
+		if (!DBM::is_result($gcontacts)) {
 			return 0;
 		}
 
@@ -626,7 +627,7 @@ function get_contact($url, $uid = 0, $no_update = false) {
 		$contacts = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d ORDER BY `id` LIMIT 2",
 				dbesc(normalise_link($data["url"])),
 				intval($uid));
-		if (!dbm::is_result($contacts)) {
+		if (!DBM::is_result($contacts)) {
 			return 0;
 		}
 
@@ -635,7 +636,7 @@ function get_contact($url, $uid = 0, $no_update = false) {
 		// Update the newly created contact from data in the gcontact table
 		$gcontact = dba::select('gcontact', array('location', 'about', 'keywords', 'gender'),
 					array('nurl' => normalise_link($data["url"])), array('limit' => 1));
-		if (dbm::is_result($gcontact)) {
+		if (DBM::is_result($gcontact)) {
 			// Only use the information when the probing hadn't fetched these values
 			if ($data['keywords'] != '') {
 				unset($gcontact['keywords']);
@@ -663,7 +664,7 @@ function get_contact($url, $uid = 0, $no_update = false) {
 				array('id' => $contact_id), array('limit' => 1));
 
 	// This condition should always be true
-	if (!dbm::is_result($contact)) {
+	if (!DBM::is_result($contact)) {
 		return $contact_id;
 	}
 
@@ -711,7 +712,7 @@ function blockedContact($cid) {
 	}
 
 	$blocked = dba::select('contact', array('blocked'), array('id' => $cid), array('limit' => 1));
-	if (!dbm::is_result($blocked)) {
+	if (!DBM::is_result($blocked)) {
 		return false;
 	}
 	return (bool)$blocked['blocked'];
@@ -730,7 +731,7 @@ function hiddenContact($cid) {
 	}
 
 	$hidden = dba::select('contact', array('hidden'), array('id' => $cid), array('limit' => 1));
-	if (!dbm::is_result($hidden)) {
+	if (!DBM::is_result($hidden)) {
 		return false;
 	}
 	return (bool)$hidden['hidden'];
@@ -793,7 +794,7 @@ function posts_from_contact_url(App $a, $contact_url) {
 		WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
 		dbesc(normalise_link($contact_url)));
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return '';
 	}
 
diff --git a/include/ForumManager.php b/include/ForumManager.php
index 8473035aff..039b4f5d24 100644
--- a/include/ForumManager.php
+++ b/include/ForumManager.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 /**
  * @file include/ForumManager.php
@@ -93,7 +94,7 @@ class ForumManager {
 		$total = count($contacts);
 		$visible_forums = 10;
 
-		if (dbm::is_result($contacts)) {
+		if (DBM::is_result($contacts)) {
 
 			$id = 0;
 
diff --git a/include/Photo.php b/include/Photo.php
index 9b9e02142b..1ed90bbf83 100644
--- a/include/Photo.php
+++ b/include/Photo.php
@@ -7,6 +7,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once("include/photos.php");
 
@@ -630,7 +631,7 @@ class Photo {
 	public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '', $desc = '') {
 
 		$r = dba::select('photo', array('guid'), array("`resource-id` = ? AND `guid` != ?", $rid, ''), array('limit' => 1));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$guid = $r['guid'];
 		} else {
 			$guid = get_guid();
@@ -643,7 +644,7 @@ class Photo {
 				'datasize' => strlen($this->imageString()), 'data' => $this->imageString(), 'scale' => $scale, 'profile' => $profile,
 				'allow_cid' => $allow_cid, 'allow_gid' => $allow_gid, 'deny_cid' => $deny_cid, 'deny_gid' => $deny_gid, 'desc' => $desc);
 
-		if (dbm::is_result($x)) {
+		if (DBM::is_result($x)) {
 			$r = dba::update('photo', $fields, array('id' => $x['id']));
 		} else {
 			$r = dba::insert('photo', $fields);
@@ -713,7 +714,7 @@ function guess_image_type($filename, $fromcurl=false) {
  */
 function update_contact_avatar($avatar, $uid, $cid, $force = false) {
 	$r = q("SELECT `avatar`, `photo`, `thumb`, `micro`, `nurl` FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return false;
 	} else {
 		$data = array($r[0]["photo"], $r[0]["thumb"], $r[0]["micro"]);
@@ -730,7 +731,7 @@ function update_contact_avatar($avatar, $uid, $cid, $force = false) {
 			// Update the public contact (contact id = 0)
 			if ($uid != 0) {
 				$pcontact = dba::select('contact', array('id'), array('nurl' => $r[0]['nurl']), array('limit' => 1));
-				if (dbm::is_result($pcontact)) {
+				if (DBM::is_result($pcontact)) {
 					update_contact_avatar($avatar, 0, $pcontact['id'], $force);
 				}
 			}
@@ -748,7 +749,7 @@ function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {
 		intval($uid),
 		intval($cid)
 	);
-	if (dbm::is_result($r) && strlen($r[0]['resource-id'])) {
+	if (DBM::is_result($r) && strlen($r[0]['resource-id'])) {
 		$hash = $r[0]['resource-id'];
 	} else {
 		$hash = photo_new_resource();
@@ -919,7 +920,7 @@ function store_photo(App $a, $uid, $imagedata = "", $url = "") {
 		WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 AND `contact`.`self` = 1 LIMIT 1",
 		intval($uid));
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
 		return(array());
 	}
diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index a5bb1a9cd0..956c2a9f6d 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -6,6 +6,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once "include/contact_selectors.php";
 require_once "include/contact_widgets.php";
@@ -36,7 +37,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 	call_hooks($a->module . '_pre_' . $selname, $arr);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
 				$selected = " selected=\"selected\" ";
@@ -159,7 +160,7 @@ function contact_selector($selname, $selclass, $preselected = false, $options) {
 
 	call_hooks($a->module . '_pre_' . $selname, $arr);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
 				$selected = " selected=\"selected\" ";
@@ -239,7 +240,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 
 	$receiverlist = array();
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			if ((is_array($preselected)) && in_array($rr['id'], $preselected)) {
 				$selected = " selected=\"selected\" ";
@@ -286,7 +287,7 @@ function prune_deadguys($arr) {
 
 	$r = q("SELECT `id` FROM `contact` WHERE `id` IN ( " . $str . ") AND `blocked` = 0 AND `pending` = 0 AND `archive` = 0 ");
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$ret = array();
 		foreach ($r as $rr) {
 			$ret[] = intval($rr['id']);
@@ -342,7 +343,7 @@ function populate_acl($user = null, $show_jotnets = false) {
 			$r = q("SELECT `pubmail` FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 				intval(local_user())
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$mail_enabled = true;
 				if (intval($r[0]['pubmail'])) {
 					$pubmail_enabled = true;
@@ -635,7 +636,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 	}
 
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$forums = array();
 		foreach ($r as $g) {
 			$entry = array(
@@ -689,7 +690,7 @@ function acl_lookup(App $a, $out_type = 'json') {
 				dbesc($search),
 				implode("', '", $known_contacts)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $row) {
 				$contact = get_contact_details_by_url($row['author-link']);
 
diff --git a/include/api.php b/include/api.php
index d677206b47..594e68d519 100644
--- a/include/api.php
+++ b/include/api.php
@@ -9,7 +9,10 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Core\NotificationsManager;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 require_once 'include/HTTPExceptions.php';
 require_once 'include/bbcode.php';
@@ -28,7 +31,6 @@ require_once 'mod/proxy.php';
 require_once 'include/message.php';
 require_once 'include/group.php';
 require_once 'include/like.php';
-require_once 'include/NotificationsManager.php';
 require_once 'include/plaintext.php';
 require_once 'include/xml.php';
 
@@ -211,7 +213,7 @@ $called_api = null;
 				dbesc(trim($user)),
 				dbesc($encrypted)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$record = $r[0];
 			}
 		}
@@ -460,7 +462,7 @@ $called_api = null;
 	function api_unique_id_to_url($id) {
 		$r = dba::select('contact', array('url'), array('uid' => 0, 'id' => $id), array('limit' => 1));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			return $r["url"];
 		} else {
 			return false;
@@ -591,14 +593,14 @@ $called_api = null;
 		api_best_nickname($uinfo);
 
 		// if the contact wasn't found, fetch it from the contacts with uid = 0
-		if (!dbm::is_result($uinfo)) {
+		if (!DBM::is_result($uinfo)) {
 			$r = array();
 
 			if ($url != "") {
 				$r = q("SELECT * FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' LIMIT 1", dbesc(normalise_link($url)));
 			}
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$network_name = network_to_name($r[0]['network'], $r[0]['url']);
 
 				// If no nick where given, extract it from the address
@@ -1092,7 +1094,7 @@ $called_api = null;
 					AND `created` > '%s' AND `id` = `parent`",
 					intval(api_user()), dbesc($datefrom));
 
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$posts_day = $r[0]["posts_day"];
 				} else {
 					$posts_day = 0;
@@ -1113,7 +1115,7 @@ $called_api = null;
 					AND `created` > '%s' AND `id` = `parent`",
 					intval(api_user()), dbesc($datefrom));
 
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$posts_week = $r[0]["posts_week"];
 				} else {
 					$posts_week = 0;
@@ -1134,7 +1136,7 @@ $called_api = null;
 					AND `created` > '%s' AND `id` = `parent`",
 					intval(api_user()), dbesc($datefrom));
 
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$posts_month = $r[0]["posts_month"];
 				} else {
 					$posts_month = 0;
@@ -1163,7 +1165,7 @@ $called_api = null;
 		if (requestdata('media_ids')) {
 			$r = q("SELECT `resource-id`, `scale`, `nickname`, `type` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1",
 				intval(requestdata('media_ids')), api_user());
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$phototypes = Photo::supportedTypes();
 				$ext = $phototypes[$r[0]['type']];
 				$_REQUEST['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']';
@@ -1258,7 +1260,7 @@ $called_api = null;
 				dbesc(normalise_link($user_info['url']))
 		);
 
-		if (dbm::is_result($lastwall)) {
+		if (DBM::is_result($lastwall)) {
 			$lastwall = $lastwall[0];
 
 			$in_reply_to = api_in_reply_to($lastwall);
@@ -1356,7 +1358,7 @@ $called_api = null;
 				dbesc(normalise_link($user_info['url']))
 		);
 
-		if (dbm::is_result($lastwall)) {
+		if (DBM::is_result($lastwall)) {
 			$lastwall = $lastwall[0];
 
 			$in_reply_to = api_in_reply_to($lastwall);
@@ -1428,11 +1430,11 @@ $called_api = null;
 		if (x($_GET, 'q')) {
 			$r = q("SELECT id FROM `contact` WHERE `uid` = 0 AND `name` = '%s'", dbesc($_GET["q"]));
 
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				$r = q("SELECT `id` FROM `contact` WHERE `uid` = 0 AND `nick` = '%s'", dbesc($_GET["q"]));
 			}
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$k = 0;
 				foreach ($r AS $user) {
 					$user_info = api_get_user($a, $user["id"], "json");
@@ -1681,7 +1683,7 @@ $called_api = null;
 		);
 
 		/// @TODO How about copying this to above methods which don't check $r ?
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			throw new BadRequestException("There is no status with this id.");
 		}
 
@@ -1736,7 +1738,7 @@ $called_api = null;
 		logger('API: api_conversation_show: '.$id);
 
 		$r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($id));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$id = $r[0]["parent"];
 		}
 
@@ -1769,7 +1771,7 @@ $called_api = null;
 			intval($start), intval($count)
 		);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			throw new BadRequestException("There is no status with this id.");
 		}
 
@@ -1827,7 +1829,7 @@ $called_api = null;
 		);
 
 		/// @TODO other style than above functions!
-		if (dbm::is_result($r) && $r[0]['body'] != "") {
+		if (DBM::is_result($r) && $r[0]['body'] != "") {
 			if (strpos($r[0]['body'], "[/share]") !== false) {
 				$pos = strpos($r[0]['body'], "[share");
 				$post = substr($r[0]['body'], $pos);
@@ -2093,7 +2095,7 @@ $called_api = null;
 		$item = q("SELECT * FROM `item` WHERE `id`=%d AND `uid`=%d LIMIT 1",
 				$itemid, api_user());
 
-		if (!dbm::is_result($item) || count($item) == 0) {
+		if (!DBM::is_result($item) || count($item) == 0) {
 			throw new BadRequestException("Invalid item.");
 		}
 
@@ -3004,7 +3006,7 @@ $called_api = null;
 			intval(api_user())
 		);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return;
 		}
 
@@ -3138,7 +3140,7 @@ $called_api = null;
 			intval($id));
 
 		// error message if specified id is not in database
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			if ($verbose == "true") {
 				$answer = array('result' => 'error', 'message' => 'message id not in database');
 				return api_format_data("direct_messages_delete", $type, array('$result' => $answer));
@@ -3229,7 +3231,7 @@ $called_api = null;
 				intval($since_id),
 				intval($start),	intval($count)
 		);
-		if ($verbose == "true" && !dbm::is_result($r)) {
+		if ($verbose == "true" && !DBM::is_result($r)) {
 			$answer = array('result' => 'error', 'message' => 'no mails available');
 			return api_format_data("direct_messages_all", $type, array('$result' => $answer));
 		}
@@ -3334,7 +3336,7 @@ $called_api = null;
 		$r = q("SELECT DISTINCT `resource-id` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
 				intval(api_user()),
 				dbesc($album));
-		if (!dbm::is_result($r))
+		if (!DBM::is_result($r))
 			throw new BadRequestException("album not available");
 
 		// function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore
@@ -3345,7 +3347,7 @@ $called_api = null;
 						dbesc($rr['resource-id'])
 						);
 
-			if (!dbm::is_result($photo_item)) {
+			if (!DBM::is_result($photo_item)) {
 				throw new InternalServerErrorException("problem with deleting items occured");
 			}
 			drop_item($photo_item[0]['id'],false);
@@ -3391,7 +3393,7 @@ $called_api = null;
 		$r = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
 				intval(api_user()),
 				dbesc($album));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			throw new BadRequestException("album not available");
 		}
 		// now let's update all photos to the albumname
@@ -3431,7 +3433,7 @@ $called_api = null;
 			'image/gif' => 'gif'
 		);
 		$data = array('photo'=>array());
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				$photo = array();
 				$photo['id'] = $rr['resource-id'];
@@ -3500,7 +3502,7 @@ $called_api = null;
 					intval(api_user()),
 					dbesc($photo_id),
 					dbesc($album));
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				throw new BadRequestException("photo not available");
 			}
 		}
@@ -3620,7 +3622,7 @@ $called_api = null;
 				intval(api_user()),
 				dbesc($photo_id)
 			);
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			throw new BadRequestException("photo not available");
 		}
 		// now we can perform on the deletion of the photo
@@ -3636,7 +3638,7 @@ $called_api = null;
 				dbesc($photo_id)
 				);
 
-			if (!dbm::is_result($photo_item)) {
+			if (!DBM::is_result($photo_item)) {
 				throw new InternalServerErrorException("problem with deleting items occured");
 			}
 			// function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore
@@ -3699,7 +3701,7 @@ $called_api = null;
 				intval(api_user()),
 				intval($profileid));
 			// error message if specified profile id is not in database
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				throw new BadRequestException("profile_id not available");
 			}
 			$is_default_profile = $r['profile'];
@@ -3804,7 +3806,7 @@ $called_api = null;
 			$contact = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d",
 							intval($cid),
 							intval(api_user()));
-			$contact_not_found |= !dbm::is_result($contact);
+			$contact_not_found |= !DBM::is_result($contact);
 		}
 		return $contact_not_found;
 	}
@@ -4020,7 +4022,7 @@ $called_api = null;
 		);
 
 		// prepare output data for photo
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$data = array('photo' => $r[0]);
 			$data['photo']['id'] = $data['photo']['resource-id'];
 			if ($scale !== false) {
@@ -4129,7 +4131,7 @@ $called_api = null;
 			intval(api_user())
 		);
 
-		if ((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN)) {
+		if ((! DBM::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN)) {
 			throw new BadRequestException("Unknown contact");
 		}
 
@@ -4276,7 +4278,7 @@ $called_api = null;
 		$r = q("SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
 			dbesc(normalise_link($profile)));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$nick = $r[0]["nick"];
 		}
 
@@ -4284,7 +4286,7 @@ $called_api = null;
 			$r = q("SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
 				dbesc(normalise_link($profile)));
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$nick = $r[0]["nick"];
 			}
 		}
@@ -4355,7 +4357,7 @@ $called_api = null;
 				intval($item['uid']),
 				dbesc($item['thr-parent']));
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$in_reply_to['status_id'] = intval($r[0]['id']);
 			} else {
 				$in_reply_to['status_id'] = intval($item['parent']);
@@ -4369,7 +4371,7 @@ $called_api = null;
 				intval($in_reply_to['status_id'])
 			);
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				if ($r[0]['nick'] == "") {
 					$r[0]['nick'] = api_get_nick($r[0]["url"]);
 				}
@@ -4503,7 +4505,7 @@ $called_api = null;
 				intval($uid),
 				intval($gid));
 			// error message if specified gid is not in database
-			if (!dbm::is_result($r))
+			if (!DBM::is_result($r))
 				throw new BadRequestException("gid not available");
 		}
 		else
@@ -4558,7 +4560,7 @@ $called_api = null;
 			intval($uid),
 			intval($gid));
 		// error message if specified gid is not in database
-		if (!dbm::is_result($r))
+		if (!DBM::is_result($r))
 			throw new BadRequestException('gid not available');
 
 		// get data of the specified group id and group name
@@ -4567,7 +4569,7 @@ $called_api = null;
 			intval($gid),
 			dbesc($name));
 		// error message if specified gid is not in database
-		if (!dbm::is_result($rname))
+		if (!DBM::is_result($rname))
 			throw new BadRequestException('wrong group name');
 
 		// delete group
@@ -4606,7 +4608,7 @@ $called_api = null;
 			intval($uid),
 			dbesc($name));
 		// error message if specified group name already exists
-		if (dbm::is_result($rname))
+		if (DBM::is_result($rname))
 			throw new BadRequestException('group name already exists');
 
 		// check if specified group name is a deleted group
@@ -4614,7 +4616,7 @@ $called_api = null;
 			intval($uid),
 			dbesc($name));
 		// error message if specified group name already exists
-		if (dbm::is_result($rname))
+		if (DBM::is_result($rname))
 			$reactivate_group = true;
 
 		// create group
@@ -4845,7 +4847,7 @@ $called_api = null;
 			intval($uid));
 
 		// error message if specified id is not in database
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			$answer = array('result' => 'error', 'message' => 'message id not in database');
 			return api_format_data("direct_messages_setseen", $type, array('$result' => $answer));
 		}
@@ -4903,7 +4905,7 @@ $called_api = null;
 		$profile_url = $user_info["url"];
 
 		// message if nothing was found
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			$success = array('success' => false, 'search_results' => 'problem with query');
 		} elseif (count($r) == 0) {
 			$success = array('success' => false, 'search_results' => 'nothing found');
@@ -4956,7 +4958,7 @@ $called_api = null;
 				intval($profileid));
 
 			// error message if specified gid is not in database
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				throw new BadRequestException("profile_id not available");
 			}
 		} else {
diff --git a/include/auth.php b/include/auth.php
index 763596365a..f852ea28a5 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once('include/security.php');
 require_once('include/datetime.php');
@@ -58,7 +59,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 			intval($_SESSION['visitor_id'])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$a->contact = $r[0];
 		}
 	}
@@ -81,7 +82,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 			intval($_SESSION['uid'])
 		);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			nuke_session();
 			goaway(System::baseUrl());
 		}
@@ -177,7 +178,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
 				dbesc(trim($_POST['username'])),
 				dbesc($encrypted)
 			);
-			if (dbm::is_result($r))
+			if (DBM::is_result($r))
 				$record = $r[0];
 		}
 
diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php
index 998c6fe3d9..fff2bab327 100755
--- a/include/auth_ejabberd.php
+++ b/include/auth_ejabberd.php
@@ -34,6 +34,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 if (sizeof($_SERVER["argv"]) == 0)
 	die();
@@ -152,7 +153,7 @@ class exAuth {
 			$sQuery = "SELECT `uid` FROM `user` WHERE `nickname`='".dbesc($sUser)."'";
 			$this->writeLog(LOG_DEBUG, "using query ". $sQuery);
 			$r = q($sQuery);
-			$found = dbm::is_result($r);
+			$found = DBM::is_result($r);
 		} else {
 			$found = false;
 		}
diff --git a/include/cache.php b/include/cache.php
index 9571eb8d9f..6bdb3e2f66 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -7,6 +7,7 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 class Cache {
 	/**
@@ -104,7 +105,7 @@ class Cache {
 			dbesc($key)
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$cached = $r[0]['v'];
 			$value = @unserialize($cached);
 
diff --git a/include/contact_selectors.php b/include/contact_selectors.php
index 48f2fb005e..1e754ac9f7 100644
--- a/include/contact_selectors.php
+++ b/include/contact_selectors.php
@@ -1,5 +1,7 @@
 <?php
-require_once('include/diaspora.php');
+
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 function contact_profile_assign($current,$foreign_net) {
 
@@ -12,7 +14,7 @@ function contact_profile_assign($current,$foreign_net) {
 	$r = q("SELECT `id`, `profile-name`, `is-default` FROM `profile` WHERE `uid` = %d",
 			intval($_SESSION['uid']));
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$selected = (($rr['id'] == $current || ($current == 0 && $rr['is-default'] == 1)) ? " selected=\"selected\" " : "");
 			$o .= "<option value=\"{$rr['id']}\" $selected >{$rr['profile-name']}</option>\r\n";
@@ -105,7 +107,7 @@ function network_to_name($s, $profile = "") {
 				INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
 				WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$networkname = $r['platform'];
 		}
 	}
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 01329513bb..d47cf86c35 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 require_once 'include/contact_selectors.php';
 
@@ -233,11 +234,11 @@ function common_friends_visitor_widget($profile_uid) {
 		if (get_my_url()) {
 			$r = dba::select('contact', array('id'),
 					array('nurl' => normalise_link(get_my_url()), 'uid' => $profile_uid), array('limit' => 1));
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$cid = $r['id'];
 			} else {
 				$r = dba::select('gcontact', array('id'), array('nurl' => normalise_link(get_my_url())), array('limit' => 1));
-				if (dbm::is_result($r))
+				if (DBM::is_result($r))
 					$zcid = $r['id'];
 			}
 		}
diff --git a/include/conversation.php b/include/conversation.php
index d4fc2a40e5..0e814c6665 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once "include/bbcode.php";
 require_once "include/acl_selectors.php";
@@ -122,7 +123,7 @@ function localize_item(&$item) {
 			WHERE `item`.`contact-id`=`contact`.`id`
 			AND `item`.`uri`='%s'",
 			dbesc($item['parent-uri']));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return;
 		}
 		$obj = $r[0];
@@ -273,7 +274,7 @@ function localize_item(&$item) {
 			AND `item`.`uri`='%s'",
 			dbesc($item['parent-uri']));
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return;
 		}
 
@@ -329,7 +330,7 @@ function localize_item(&$item) {
 					intval($item['uid'])
 			);
 
-			if (dbm::is_result($r) && $r[0]['plink']) {
+			if (DBM::is_result($r) && $r[0]['plink']) {
 				$target = $r[0];
 				$Bname = $target['author-name'];
 				$Blink = $target['author-link'];
@@ -941,7 +942,7 @@ function best_link_url($item, &$sparkle, $url = '') {
 		$r = dba::select('contact', array('id'),
 			array('network' => NETWORK_DFRN, 'uid' => local_user(), 'nurl' => normalise_link($clean_url), 'pending' => false),
 			array('limit' => 1));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$best_url = 'redir/' . $r['id'];
 			$sparkle = true;
 			if ($url != '') {
@@ -992,7 +993,7 @@ function item_photo_menu($item) {
 	$network = '';
 	$rel = 0;
 	$r = dba::select('contact', array('id', 'network', 'rel'), array('uid' => local_user(), 'nurl' => normalise_link($item['author-link'])), array('limit' => 1));
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$cid = $r['id'];
 		$network = $r['network'];
 		$rel = $r['rel'];
diff --git a/include/cron.php b/include/cron.php
index 4b5aac831c..e7c6701514 100644
--- a/include/cron.php
+++ b/include/cron.php
@@ -2,6 +2,7 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 function cron_run(&$argv, &$argc){
 	global $a;
@@ -161,7 +162,7 @@ function cron_poll_contacts($argc, $argv) {
 		dbesc(NETWORK_MAIL2)
 	);
 
-	if (!dbm::is_result($contacts)) {
+	if (!DBM::is_result($contacts)) {
 		return;
 	}
 
@@ -171,7 +172,7 @@ function cron_poll_contacts($argc, $argv) {
 			intval($c['id'])
 		);
 
-		if (!dbm::is_result($res)) {
+		if (!DBM::is_result($res)) {
 			continue;
 		}
 
diff --git a/include/cronjobs.php b/include/cronjobs.php
index e4eb48e770..453db6d014 100644
--- a/include/cronjobs.php
+++ b/include/cronjobs.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 
 function cronjobs_run(&$argv, &$argc){
@@ -78,7 +79,7 @@ function cronjobs_run(&$argv, &$argc){
  */
 function cron_update_photo_albums() {
 	$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND NOT `account_removed`");
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
@@ -98,7 +99,7 @@ function cron_expire_and_remove_users() {
 
 	// delete user records for recently removed accounts
 	$r = q("SELECT * FROM `user` WHERE `account_removed` AND `account_expires_on` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $user) {
 			dba::delete('user', array('uid' => $user['uid']));
 		}
@@ -211,7 +212,7 @@ function cron_repair_diaspora(App $a) {
 	$r = q("SELECT `id`, `url` FROM `contact`
 		WHERE `network` = '%s' AND (`batch` = '' OR `notify` = '' OR `poll` = '' OR pubkey = '')
 			ORDER BY RAND() LIMIT 50", dbesc(NETWORK_DIASPORA));
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
@@ -246,7 +247,7 @@ function cron_repair_database() {
 	// Sometimes there seem to be issues where the "self" contact vanishes.
 	// We haven't found the origin of the problem by now.
 	$r = q("SELECT `uid` FROM `user` WHERE NOT EXISTS (SELECT `uid` FROM `contact` WHERE `contact`.`uid` = `user`.`uid` AND `contact`.`self`)");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r AS $user) {
 			logger('Create missing self contact for user '.$user['uid']);
 			user_create_self_contact($user['uid']);
@@ -262,7 +263,7 @@ function cron_repair_database() {
 
 	// Update the global contacts for local users
 	$r = q("SELECT `uid` FROM `user` WHERE `verified` AND NOT `blocked` AND NOT `account_removed` AND NOT `account_expired`");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r AS $user) {
 			update_gcontact_for_user($user["uid"]);
 		}
diff --git a/include/datetime.php b/include/datetime.php
index faedaf33dc..cb27799798 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -6,6 +6,7 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 /**
  * @brief Two-level sort for timezones.
@@ -589,7 +590,7 @@ function update_contact_birthdays() {
 	// In-network birthdays are handled within local_delivery
 
 	$r = q("SELECT * FROM `contact` WHERE `bd` != '' AND `bd` > '0001-01-01' AND SUBSTRING(`bd`, 1, 4) != `bdyear` ");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 
 			logger('update_contact_birthday: ' . $rr['bd']);
@@ -611,7 +612,7 @@ function update_contact_birthdays() {
 				dbesc(datetime_convert('UTC','UTC', $nextbd)),
 				dbesc('birthday'));
 
-			if (dbm::is_result($s)) {
+			if (DBM::is_result($s)) {
 				continue;
 			}
 
diff --git a/include/dba.php b/include/dba.php
index 74e9d7c061..070722b9ba 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -1,7 +1,7 @@
 <?php
 use \Friendica\Core\System;
+use Friendica\Database\DBM;
 
-require_once("dbm.php");
 require_once('include/datetime.php');
 
 /**
@@ -176,7 +176,7 @@ class dba {
 		}
 
 		$r = self::p("EXPLAIN ".$query);
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return;
 		}
 
@@ -227,7 +227,7 @@ class dba {
 		switch (self::$driver) {
 			case 'pdo':
 				$r = dba::p("SELECT 1");
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$row = dba::inArray($r);
 					$connected = ($row[0]['1'] == '1');
 				}
diff --git a/include/dbstructure.php b/include/dbstructure.php
index 6a881cdf7f..1df82b1bed 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once "boot.php";
 require_once "include/text.php";
@@ -20,7 +21,7 @@ function convert_to_innodb() {
 	$r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'",
 		dbesc(dba::database_name()));
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		echo t('There are no tables on MyISAM.')."\n";
 		return;
 	}
@@ -30,7 +31,7 @@ function convert_to_innodb() {
 		echo $sql."\n";
 
 		$result = dba::e($sql);
-		if (!dbm::is_result($result)) {
+		if (!DBM::is_result($result)) {
 			print_update_error($sql);
 		}
 	}
@@ -50,7 +51,7 @@ function update_fail($update_id, $error_message) {
 	);
 
 	// No valid result?
-	if (!dbm::is_result($adminlist)) {
+	if (!DBM::is_result($adminlist)) {
 		logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_NORMAL);
 
 		// Don't continue
@@ -114,7 +115,7 @@ function table_structure($table) {
 
 	$table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table);
 
-	if (dbm::is_result($table_status)) {
+	if (DBM::is_result($table_status)) {
 		$table_status = $table_status[0];
 	} else {
 		$table_status = array();
@@ -123,7 +124,7 @@ function table_structure($table) {
 	$fielddata = array();
 	$indexdata = array();
 
-	if (dbm::is_result($indexes))
+	if (DBM::is_result($indexes))
 		foreach ($indexes AS $index) {
 			if ($index['Key_name'] != 'PRIMARY' && $index['Non_unique'] == '0' && !isset($indexdata[$index["Key_name"]])) {
 				$indexdata[$index["Key_name"]] = array('UNIQUE');
@@ -137,7 +138,7 @@ function table_structure($table) {
 
 			$indexdata[$index["Key_name"]][] = $column;
 		}
-	if (dbm::is_result($structures)) {
+	if (DBM::is_result($structures)) {
 		foreach ($structures AS $field) {
 			$fielddata[$field["Field"]]["type"] = $field["Type"];
 			if ($field["Null"] == "NO") {
@@ -157,7 +158,7 @@ function table_structure($table) {
 			}
 		}
 	}
-	if (dbm::is_result($full_columns)) {
+	if (DBM::is_result($full_columns)) {
 		foreach ($full_columns AS $column) {
 			$fielddata[$column["Field"]]["Collation"] = $column["Collation"];
 		}
@@ -200,7 +201,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 
 	if ($action) {
 		Config::set('system', 'maintenance', 1);
-		Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), dbm::date().' '.date('e')));
+		Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), DBM::date().' '.date('e')));
 	}
 
 	$errors = false;
@@ -214,7 +215,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 		$tables = q("SHOW TABLES");
 	}
 
-	if (dbm::is_result($tables)) {
+	if (DBM::is_result($tables)) {
 		foreach ($tables AS $table) {
 			$table = current($table);
 
@@ -243,7 +244,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 		$sql3 = "";
 		if (!isset($database[$name])) {
 			$r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']);
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				$errors .= print_update_error($name);
 			}
 			$is_new_table = True;
@@ -433,7 +434,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 			}
 
 			if ($action) {
-				Config::set('system', 'maintenance_reason', sprintf(t('%s: updating %s table.'), dbm::date().' '.date('e'), $name));
+				Config::set('system', 'maintenance_reason', sprintf(t('%s: updating %s table.'), DBM::date().' '.date('e'), $name));
 
 				// Ensure index conversion to unique removes duplicates
 				if ($is_unique && ($temp_name != $name)) {
@@ -441,13 +442,13 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 						dba::e("SET session old_alter_table=1;");
 					} else {
 						dba::e("DROP TABLE IF EXISTS `".$temp_name."`;");
-						if (!dbm::is_result($r)) {
+						if (!DBM::is_result($r)) {
 							$errors .= print_update_error($sql3);
 							return $errors;
 						}
 
 						$r = dba::e("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
-						if (!dbm::is_result($r)) {
+						if (!DBM::is_result($r)) {
 							$errors .= print_update_error($sql3);
 							return $errors;
 						}
@@ -455,7 +456,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 				}
 
 				$r = @dba::e($sql3);
-				if (!dbm::is_result($r)) {
+				if (!DBM::is_result($r)) {
 					$errors .= print_update_error($sql3);
 				}
 				if ($is_unique && ($temp_name != $name)) {
@@ -463,17 +464,17 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 						dba::e("SET session old_alter_table=0;");
 					} else {
 						$r = dba::e("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
-						if (!dbm::is_result($r)) {
+						if (!DBM::is_result($r)) {
 							$errors .= print_update_error($sql3);
 							return $errors;
 						}
 						$r = dba::e("DROP TABLE `".$name."`;");
-						if (!dbm::is_result($r)) {
+						if (!DBM::is_result($r)) {
 							$errors .= print_update_error($sql3);
 							return $errors;
 						}
 						$r = dba::e("RENAME TABLE `".$temp_name."` TO `".$name."`;");
-						if (!dbm::is_result($r)) {
+						if (!DBM::is_result($r)) {
 							$errors .= print_update_error($sql3);
 							return $errors;
 						}
diff --git a/include/delivery.php b/include/delivery.php
index 97453ae905..7c5f4648c6 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -3,12 +3,13 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\DFRN;
 
 require_once 'include/queue_fn.php';
 require_once 'include/html2plain.php';
-require_once 'include/diaspora.php';
 require_once 'include/ostatus.php';
-require_once 'include/dfrn.php';
 
 function delivery_run(&$argv, &$argc){
 	global $a;
@@ -95,7 +96,7 @@ function delivery_run(&$argv, &$argc){
 				intval($item_id)
 			);
 
-			if ((!dbm::is_result($r)) || (!intval($r[0]['parent']))) {
+			if ((!DBM::is_result($r)) || (!intval($r[0]['parent']))) {
 				continue;
 			}
 
@@ -155,7 +156,7 @@ function delivery_run(&$argv, &$argc){
 			intval($uid)
 		);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			continue;
 		}
 
@@ -226,7 +227,7 @@ function delivery_run(&$argv, &$argc){
 			intval($contact_id)
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact = $r[0];
 		}
 		if ($contact['self']) {
@@ -243,12 +244,12 @@ function delivery_run(&$argv, &$argc){
 
 				if ($mail) {
 					$item['body'] = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
-					$atom = dfrn::mail($item, $owner);
+					$atom = DFRN::mail($item, $owner);
 				} elseif ($fsuggest) {
-					$atom = dfrn::fsuggest($item, $owner);
+					$atom = DFRN::fsuggest($item, $owner);
 					q("DELETE FROM `fsuggest` WHERE `id` = %d LIMIT 1", intval($item['id']));
 				} elseif ($relocate) {
-					$atom = dfrn::relocate($owner, $uid);
+					$atom = DFRN::relocate($owner, $uid);
 				} elseif ($followup) {
 					$msgitems = array();
 					foreach ($items as $item) {  // there is only one item
@@ -260,7 +261,7 @@ function delivery_run(&$argv, &$argc){
 							$msgitems[] = $item;
 						}
 					}
-					$atom = dfrn::entries($msgitems,$owner);
+					$atom = DFRN::entries($msgitems,$owner);
 				} else {
 					$msgitems = array();
 					foreach ($items as $item) {
@@ -289,7 +290,7 @@ function delivery_run(&$argv, &$argc){
 							$msgitems[] = $item;
 						}
 					}
-					$atom = dfrn::entries($msgitems,$owner);
+					$atom = DFRN::entries($msgitems,$owner);
 				}
 
 				logger('notifier entry: '.$contact["url"].' '.$target_item["guid"].' entry: '.$atom, LOGGER_DEBUG);
@@ -343,13 +344,13 @@ function delivery_run(&$argv, &$argc){
 							break;
 						}
 						logger('mod-delivery: local delivery');
-						dfrn::import($atom, $x[0]);
+						DFRN::import($atom, $x[0]);
 						break;
 					}
 				}
 
 				if (!was_recently_delayed($contact['id'])) {
-					$deliver_status = dfrn::deliver($owner,$contact,$atom);
+					$deliver_status = DFRN::deliver($owner,$contact,$atom);
 				} else {
 					$deliver_status = (-1);
 				}
@@ -405,7 +406,7 @@ function delivery_run(&$argv, &$argc){
 							intval($argv[2]),
 							intval($uid)
 						);
-						if (dbm::is_result($r))
+						if (DBM::is_result($r))
 							$it = $r[0];
 					}
 					if (!$it)
@@ -462,14 +463,14 @@ function delivery_run(&$argv, &$argc){
 								dbesc($it['parent-uri']),
 								intval($uid));
 
-							if (dbm::is_result($r) && ($r[0]['title'] != '')) {
+							if (DBM::is_result($r) && ($r[0]['title'] != '')) {
 								$subject = $r[0]['title'];
 							} else {
 								$r = q("SELECT `title` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d LIMIT 1",
 									dbesc($it['parent-uri']),
 									intval($uid));
 
-								if (dbm::is_result($r) && ($r[0]['title'] != ''))
+								if (DBM::is_result($r) && ($r[0]['title'] != ''))
 									$subject = $r[0]['title'];
 							}
 						}
diff --git a/include/directory.php b/include/directory.php
index a2ccacf125..f56e8dbaa4 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -2,6 +2,7 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 function directory_run(&$argv, &$argc){
 	$dir = Config::get('system', 'directory');
@@ -36,7 +37,7 @@ function directory_update_all() {
 			WHERE `contact`.`self` AND `profile`.`net-publish` AND `profile`.`is-default` AND
 				NOT `user`.`account_expired` AND `user`.`verified`");
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r AS $user) {
 			Worker::add(PRIORITY_LOW, 'directory', $user['url']);
 		}
diff --git a/include/discover_poco.php b/include/discover_poco.php
index 0a41c28027..c0ff2a6554 100644
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -2,6 +2,7 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 
 require_once 'include/socgraph.php';
@@ -107,7 +108,7 @@ function discover_poco_run(&$argv, &$argc) {
 function update_server() {
 	$r = q("SELECT `url`, `created`, `last_failure`, `last_contact` FROM `gserver` ORDER BY rand()");
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
@@ -213,7 +214,7 @@ function discover_directory($search) {
 		foreach ($j->results as $jj) {
 			// Check if the contact already exists
 			$exists = q("SELECT `id`, `last_contact`, `last_failure`, `updated` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($jj->url));
-			if (dbm::is_result($exists)) {
+			if (DBM::is_result($exists)) {
 				logger("Profile ".$jj->url." already exists (".$search.")", LOGGER_DEBUG);
 
 				if (($exists[0]["last_contact"] < $exists[0]["last_failure"]) &&
diff --git a/include/enotify.php b/include/enotify.php
index d823a1ae8c..7de2027ca8 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/Emailer.php');
 require_once('include/email.php');
@@ -52,7 +53,7 @@ function notification($params) {
 			array('uid' => $params['uid']), array('limit' => 1));
 
 		// There is no need to create notifications for forum accounts
-		if (!dbm::is_result($user) || in_array($user["page-flags"], array(PAGE_COMMUNITY, PAGE_PRVGROUP))) {
+		if (!DBM::is_result($user) || in_array($user["page-flags"], array(PAGE_COMMUNITY, PAGE_PRVGROUP))) {
 			return;
 		}
 	}
@@ -423,7 +424,7 @@ function notification($params) {
 			$hash = random_string();
 			$r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1",
 				dbesc($hash));
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$dups = true;
 			}
 		} while ($dups == true);
@@ -743,17 +744,17 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
 			intval($item[0]['contact-id']),
 			intval($uid)
 		);
-		$send_notification = dbm::is_result($r);
+		$send_notification = DBM::is_result($r);
 
 		if (!$send_notification) {
 			$tags = q("SELECT `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` = %d AND `uid` = %d",
 				intval(TERM_OBJ_POST), intval($itemid), intval(TERM_MENTION), intval($uid));
 
-			if (dbm::is_result($tags)) {
+			if (DBM::is_result($tags)) {
 				foreach ($tags AS $tag) {
 					$r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `notify_new_posts`",
 						normalise_link($tag["url"]), intval($uid));
-					if (dbm::is_result($r))
+					if (DBM::is_result($r))
 						$send_notification = true;
 				}
 			}
diff --git a/include/event.php b/include/event.php
index ff67a5766e..8d47b5fba5 100644
--- a/include/event.php
+++ b/include/event.php
@@ -7,6 +7,7 @@
 use Friendica\App;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once 'include/bbcode.php';
 require_once 'include/map.php';
@@ -254,7 +255,7 @@ function event_store($arr) {
 		);
 	}
 
-	if (dbm::is_result($c)) {
+	if (DBM::is_result($c)) {
 		$contact = $c[0];
 	}
 
@@ -269,7 +270,7 @@ function event_store($arr) {
 			intval($arr['id']),
 			intval($arr['uid'])
 		);
-		if ((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
+		if ((! DBM::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
 
 			// Nothing has changed. Grab the item id to return.
 
@@ -277,7 +278,7 @@ function event_store($arr) {
 				intval($arr['id']),
 				intval($arr['uid'])
 			);
-			return ((dbm::is_result($r)) ? $r[0]['id'] : 0);
+			return ((DBM::is_result($r)) ? $r[0]['id'] : 0);
 		}
 
 		// The event changed. Update it.
@@ -310,7 +311,7 @@ function event_store($arr) {
 			intval($arr['id']),
 			intval($arr['uid'])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$object = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($arr['uri']) . '</id>';
 			$object .= '<content>' . xmlify(format_event_bbcode($arr)) . '</content>';
 			$object .= '</object>' . "\n";
@@ -361,7 +362,7 @@ function event_store($arr) {
 			dbesc($arr['uri']),
 			intval($arr['uid'])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$event = $r[0];
 		}
 
@@ -404,7 +405,7 @@ function event_store($arr) {
 		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 			intval($arr['uid'])
 		);
-		//if (dbm::is_result($r))
+		//if (DBM::is_result($r))
 		//	$plink = System::baseUrl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
 
 
@@ -547,7 +548,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
 		intval($event_params["event_id"])
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		return event_remove_duplicates($r);
 	}
 }
@@ -591,7 +592,7 @@ function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
 			dbesc($event_params["adjust_finish"])
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		return event_remove_duplicates($r);
 	}
 }
@@ -805,7 +806,7 @@ function events_by_uid($uid = 0, $sql_extra = '') {
 		);
 	}
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		return $r;
 	}
 }
@@ -829,7 +830,7 @@ function event_export($uid, $format = 'ical') {
 	// We are allowed to show events.
 	// Get the timezone the user is in.
 	$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$timezone = $r[0]['timezone'];
 	}
 
diff --git a/include/expire.php b/include/expire.php
index f9f38afacb..7a3549ada6 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -2,6 +2,7 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 function expire_run(&$argv, &$argc){
 	global $a;
@@ -30,7 +31,7 @@ function expire_run(&$argv, &$argc){
 		return;
 	} elseif (($argc == 2) && (intval($argv[1]) > 0)) {
 		$user = dba::select('user', array('uid', 'username', 'expire'), array('uid' => $argv[1]), array('limit' => 1));
-		if (dbm::is_result($user)) {
+		if (DBM::is_result($user)) {
 			logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - interval: '.$user['expire'], LOGGER_DEBUG);
 			item_expire($user['uid'], $user['expire']);
 			logger('Expire items for user '.$user['uid'].' ('.$user['username'].') - done ', LOGGER_DEBUG);
diff --git a/include/fcontact.php b/include/fcontact.php
index a559ede300..7e93d067f3 100644
--- a/include/fcontact.php
+++ b/include/fcontact.php
@@ -1,6 +1,6 @@
 <?php
 
-
+use Friendica\Database\DBM;
 
 function fcontact_store($url,$name,$photo) {
 
@@ -10,16 +10,16 @@ function fcontact_store($url,$name,$photo) {
 		dbesc($nurl)
 	);
 
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		return $r[0]['id'];
 
 	$r = dba::insert('fcontact', array('url' => $nurl, 'name' => $name, 'photo' => $photo));
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' LIMIT 1",
 			dbesc($nurl)
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			return $r[0]['id'];
 	}
 
diff --git a/include/feed.php b/include/feed.php
index fb97c14ba1..22deff535a 100644
--- a/include/feed.php
+++ b/include/feed.php
@@ -1,4 +1,5 @@
 <?php
+use Friendica\Database\DBM;
 require_once("include/html2bbcode.php");
 require_once("include/items.php");
 
@@ -235,7 +236,7 @@ function feed_import($xml,$importer,&$contact, &$hub, $simulate = false) {
 		if (!$simulate) {
 			$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' AND `network` IN ('%s', '%s')",
 				intval($importer["uid"]), dbesc($item["uri"]), dbesc(NETWORK_FEED), dbesc(NETWORK_DFRN));
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
 				continue;
 			}
diff --git a/include/follow.php b/include/follow.php
index d602147a4c..e34ae92fd4 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -4,14 +4,15 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Protocol\Diaspora;
 
 require_once 'include/socgraph.php';
 require_once 'include/group.php';
 require_once 'include/salmon.php';
 require_once 'include/ostatus.php';
 require_once 'include/Photo.php';
-require_once 'include/diaspora.php';
 
 function update_contact($id) {
 	/*
@@ -186,12 +187,12 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
 		dbesc($ret['network'])
 	);
 
-	if (!dbm::is_result($r))
+	if (!DBM::is_result($r))
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
 			intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		// update contact
 		$new_relation = (($r[0]['rel'] == CONTACT_IS_FOLLOWER) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
@@ -232,7 +233,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
 		intval($uid)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		$result['message'] .=  t('Unable to retrieve contact information.') . EOL;
 		return $result;
 	}
@@ -258,7 +259,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
 			intval($uid)
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		if (($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
 			// create a follow slap
 			$item = array();
diff --git a/include/gprobe.php b/include/gprobe.php
index edc124cf89..dbc11dee0b 100644
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 
 require_once 'include/socgraph.php';
@@ -18,7 +19,7 @@ function gprobe_run(&$argv, &$argc){
 
 	logger("gprobe start for ".normalise_link($url), LOGGER_DEBUG);
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 
 		// Is it a DDoS attempt?
 		$urlparts = parse_url($url);
@@ -45,7 +46,7 @@ function gprobe_run(&$argv, &$argc){
 			dbesc(normalise_link($url))
 		);
 	}
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		// Check for accessibility and do a poco discovery
 		if (poco_last_updated($r[0]['url'], true) && ($r[0]["network"] == NETWORK_DFRN))
 			poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
diff --git a/include/group.php b/include/group.php
index ce8bc217cd..d3c3a81710 100644
--- a/include/group.php
+++ b/include/group.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 function group_add($uid,$name) {
 
@@ -41,7 +42,7 @@ function group_rmv($uid,$name) {
 			intval($uid),
 			dbesc($name)
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$group_id = $r[0]['id'];
 		if (! $group_id)
 			return false;
@@ -103,7 +104,7 @@ function group_byname($uid,$name) {
 		intval($uid),
 		dbesc($name)
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		return $r[0]['id'];
 	return false;
 }
@@ -136,11 +137,11 @@ function group_add_member($uid,$name,$member,$gid = 0) {
 		intval($gid),
 		intval($member)
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		return true;	// You might question this, but
 				// we indicate success because the group member was in fact created
 				// -- It was just created at another time
- 	if (! dbm::is_result($r)) {
+ 	if (! DBM::is_result($r)) {
 		$r = dba::insert('group_member', array('uid' => $uid, 'gid' => $gid, 'contact-id' => $member));
 	}
 	return $r;
@@ -157,7 +158,7 @@ function group_get_members($gid) {
 			intval($gid),
 			intval(local_user())
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$ret = $r;
 	}
 	return $ret;
@@ -174,7 +175,7 @@ function group_public_members($gid) {
 			intval(local_user()),
 			dbesc(NETWORK_OSTATUS)
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$ret = count($r);
 	}
 	return $ret;
@@ -190,7 +191,7 @@ function mini_group_select($uid,$gid = 0, $label = "") {
 		intval($uid)
 	);
 	$grps[] = array('name' => '', 'id' => '0', 'selected' => '');
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$grps[] = array('name' => $rr['name'], 'id' => $rr['id'], 'selected' => (($gid == $rr['id']) ? 'true' : ''));
 		}
@@ -248,7 +249,7 @@ function group_side($every="contacts",$each="group",$editmode = "standard", $gro
 		$member_of = groups_containing(local_user(),$cid);
 	}
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$selected = (($group_id == $rr['id']) ? ' group-selected' : '');
 
@@ -309,7 +310,7 @@ function expand_groups($a,$check_dead = false, $use_gcontact = false) {
 
 
 	$ret = array();
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		foreach ($r as $rr)
 			$ret[] = $rr['contact-id'];
 	if ($check_dead && !$use_gcontact) {
@@ -338,7 +339,7 @@ function groups_containing($uid,$c) {
 	);
 
 	$ret = array();
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$ret[] = $rr['gid'];
 		}
diff --git a/include/identity.php b/include/identity.php
index ad709841b8..f336891a3c 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -8,6 +8,7 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once 'include/ForumManager.php';
 require_once 'include/bbcode.php';
@@ -143,7 +144,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
 		foreach ($_SESSION['remote'] as $visitor) {
 			if ($visitor['uid'] == $uid) {
 				$r = dba::select('contact', array('profile-id'), array('id' => $visitor['cid']), array('limit' => 1));
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$profile = $r['profile-id'];
 				}
 				break;
@@ -167,7 +168,7 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
 				$profile_int
 		);
 	}
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		$r = dba::fetch_first("SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`,
 				`contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
 				`profile`.`uid` AS `profile_uid`, `profile`.*,
@@ -303,7 +304,7 @@ function profile_sidebar($profile, $block = 0) {
 			'entries' => array(),
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			foreach ($r as $rr) {
 				$profile['menu']['entries'][] = array(
@@ -382,7 +383,7 @@ function profile_sidebar($profile, $block = 0) {
 		if (is_array($a->profile) && !$a->profile['hide-friends']) {
 			$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
 				intval($a->profile['uid']));
-			if (dbm::is_result($r))
+			if (DBM::is_result($r))
 				$updated =  date("c", strtotime($r[0]['updated']));
 
 			$r = q("SELECT COUNT(*) AS `total` FROM `contact`
@@ -395,7 +396,7 @@ function profile_sidebar($profile, $block = 0) {
 				dbesc(NETWORK_DIASPORA),
 				dbesc(NETWORK_OSTATUS)
 			);
-			if (dbm::is_result($r))
+			if (DBM::is_result($r))
 				$contacts = intval($r[0]['total']);
 		}
 	}
@@ -479,12 +480,12 @@ function get_birthdays() {
 				datetime_convert('UTC','UTC','now + 6 days'),
 				datetime_convert('UTC','UTC','now')
 		);
-		if (dbm::is_result($s)) {
+		if (DBM::is_result($s)) {
 			$r = dba::inArray($s);
 			Cache::set($cachekey, $r, CACHE_HOUR);
 		}
 	}
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$total = 0;
 		$now = strtotime('now');
 		$cids = array();
@@ -569,7 +570,7 @@ function get_events() {
 
 	$r = array();
 
-	if (dbm::is_result($s)) {
+	if (DBM::is_result($s)) {
 		$now = strtotime('now');
 		$istoday = false;
 
diff --git a/include/items.php b/include/items.php
index 1dae871f8b..64aeabceab 100644
--- a/include/items.php
+++ b/include/items.php
@@ -11,6 +11,8 @@ use Friendica\Util\Lock;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Protocol\DFRN;
 
 require_once 'include/bbcode.php';
 require_once 'include/oembed.php';
@@ -29,7 +31,6 @@ require_once 'include/feed.php';
 require_once 'include/Contact.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
-require_once 'include/dfrn.php';
 require_once 'include/group.php';
 
 /// @TODO one day with composer autoloader no more needed
@@ -429,7 +430,7 @@ function uri_to_guid($uri, $host = "") {
  */
 function store_conversation($arr) {
 	if (in_array($arr['network'], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
-		$conversation = array('item-uri' => $arr['uri'], 'received' => dbm::date());
+		$conversation = array('item-uri' => $arr['uri'], 'received' => DBM::date());
 
 		if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
 			$conversation['reply-to-uri'] = $arr['parent-uri'];
@@ -456,7 +457,7 @@ function store_conversation($arr) {
 
 		$old_conv = dba::fetch_first("SELECT `item-uri`, `reply-to-uri`, `conversation-uri`, `conversation-href`, `protocol`, `source`
 				FROM `conversation` WHERE `item-uri` = ?", $conversation['item-uri']);
-		if (dbm::is_result($old_conv)) {
+		if (DBM::is_result($old_conv)) {
 			// Don't update when only the source has changed.
 			// Only do this when there had been no source before.
 			if ($old_conv['source'] != '') {
@@ -570,7 +571,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	$expire_interval = Config::get('system', 'dbclean-expire-days', 0);
 
 	$r = dba::select('user', array('expire'), array('uid' => $uid), array("limit" => 1));
-	if (dbm::is_result($r) && ($r['expire'] > 0) && (($r['expire'] < $expire_interval) || ($expire_interval == 0))) {
+	if (DBM::is_result($r) && ($r['expire'] > 0) && (($r['expire'] < $expire_interval) || ($expire_interval == 0))) {
 		$expire_interval = $r['expire'];
 	}
 
@@ -596,7 +597,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 				dbesc(NETWORK_DFRN),
 				dbesc(NETWORK_OSTATUS)
 			);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			// We only log the entries with a different user id than 0. Otherwise we would have too many false positives
 			if ($uid != 0) {
 				logger("Item with uri ".$arr['uri']." already existed for user ".$uid." with id ".$r[0]["id"]." target network ".$r[0]["network"]." - new network: ".$arr['network']);
@@ -688,20 +689,20 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 			intval($arr['uid'])
 		);
 
-		if (!dbm::is_result($r))
+		if (!DBM::is_result($r))
 			$r = q("SELECT `network` FROM `gcontact` WHERE `network` IN ('%s', '%s', '%s') AND `nurl` = '%s' LIMIT 1",
 				dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS),
 				dbesc(normalise_link($arr['author-link']))
 			);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			$r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 				intval($arr['contact-id']),
 				intval($arr['uid'])
 			);
 		}
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$arr['network'] = $r[0]["network"];
 		}
 
@@ -732,7 +733,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 		if ($arr["contact-id"] == 0) {
 			$r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid` = %d", intval($uid));
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$arr["contact-id"] = $r[0]["id"];
 			}
 		}
@@ -779,7 +780,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 		$r = q("SELECT `guid` FROM `item` WHERE `guid` = '%s' AND `network` = '%s' AND `uid` = '%d' LIMIT 1",
 			dbesc($arr['guid']), dbesc($arr['network']), intval($arr['uid']));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger('found item with guid '.$arr['guid'].' for user '.$arr['uid'].' on network '.$arr['network'], LOGGER_DEBUG);
 			return 0;
 		}
@@ -808,7 +809,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 			intval($arr['uid'])
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			// is the new message multi-level threaded?
 			// even though we don't support it now, preserve the info
@@ -823,7 +824,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 					intval($arr['uid'])
 				);
 
-				if (dbm::is_result($z)) {
+				if (DBM::is_result($z)) {
 					$r = $z;
 				}
 			}
@@ -858,7 +859,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 			// If its a post from myself then tag the thread as "mention"
 			logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG);
 			$u = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($arr['uid']));
-			if (dbm::is_result($u)) {
+			if (DBM::is_result($u)) {
 				$a = get_app();
 				$self = normalise_link(System::baseUrl() . '/profile/' . $u[0]['nickname']);
 				logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG);
@@ -892,7 +893,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 		dbesc(NETWORK_DFRN),
 		intval($arr['uid'])
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		logger('duplicated item with the same uri found. '.print_r($arr,true));
 		return 0;
 	}
@@ -903,7 +904,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 			dbesc($arr['guid']),
 			intval($arr['uid'])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger('duplicated item with the same guid found. '.print_r($arr,true));
 			return 0;
 		}
@@ -916,7 +917,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 			intval($arr['contact-id']),
 			intval($arr['uid'])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger('duplicated item with the same body found. '.print_r($arr,true));
 			return 0;
 		}
@@ -931,7 +932,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	} else {
 		$isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"]));
 
-		$arr["global"] = (dbm::is_result($isglobal) && count($isglobal) > 0);
+		$arr["global"] = (DBM::is_result($isglobal) && count($isglobal) > 0);
 	}
 
 	// ACL settings
@@ -973,7 +974,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	 */
 	if ($arr["uid"] == 0) {
 		$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc(trim($arr['uri'])));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger('Global item already stored. URI: '.$arr['uri'].' on network '.$arr['network'], LOGGER_DEBUG);
 			return 0;
 		}
@@ -985,7 +986,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	$r = dba::insert('item', $arr);
 
 	// When the item was successfully stored we fetch the ID of the item.
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$current_post = dba::lastInsertId();
 	} else {
 		// This can happen - for example - if there are locking timeouts.
@@ -1026,7 +1027,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 		dbesc($arr['network'])
 	);
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		// This shouldn't happen, since COUNT always works when the database connection is there.
 		logger("We couldn't count the stored entries. Very strange ...");
 		dba::rollback();
@@ -1093,7 +1094,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 	if (!$deleted && !$dontcache) {
 
 		$r = q('SELECT * FROM `item` WHERE `id` = %d', intval($current_post));
-		if ((dbm::is_result($r)) && (count($r) == 1)) {
+		if ((DBM::is_result($r)) && (count($r) == 1)) {
 			if ($notify) {
 				call_hooks('post_local_end', $r[0]);
 			} else {
@@ -1163,7 +1164,7 @@ function item_set_last_item($arr) {
 	if (!$update && ($arr["network"] == NETWORK_DFRN) && ($arr["parent-uri"] === $arr["uri"])) {
 		$isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`",
 				intval($arr['contact-id']));
-		if (dbm::is_result($isforum)) {
+		if (DBM::is_result($isforum)) {
 			$update = true;
 		}
 	}
@@ -1255,7 +1256,7 @@ function item_body_set_hashtags(&$item) {
 
 function get_item_guid($id) {
 	$r = q("SELECT `guid` FROM `item` WHERE `id` = %d LIMIT 1", intval($id));
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		return $r[0]["guid"];
 	} else {
 		/// @TODO This else-block can be elimited again
@@ -1277,7 +1278,7 @@ function get_item_id($guid, $uid = 0) {
 		$r = q("SELECT `item`.`id`, `user`.`nickname` FROM `item` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
 			WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 AND `item`.`moderated` = 0
 				AND `item`.`guid` = '%s' AND `item`.`uid` = %d", dbesc($guid), intval($uid));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$id = $r[0]["id"];
 			$nick = $r[0]["nickname"];
 		}
@@ -1291,7 +1292,7 @@ function get_item_id($guid, $uid = 0) {
 				AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 				AND `item`.`private` = 0 AND `item`.`wall` = 1
 				AND `item`.`guid` = '%s'", dbesc($guid));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$id = $r[0]["id"];
 			$nick = $r[0]["nickname"];
 		}
@@ -1329,7 +1330,7 @@ function tag_deliver($uid, $item_id) {
 		intval($uid)
 	);
 
-	if (! dbm::is_result($u)) {
+	if (! DBM::is_result($u)) {
 		return;
 	}
 
@@ -1341,7 +1342,7 @@ function tag_deliver($uid, $item_id) {
 		intval($item_id),
 		intval($uid)
 	);
-	if (! dbm::is_result($i)) {
+	if (! DBM::is_result($i)) {
 		return;
 	}
 
@@ -1398,7 +1399,7 @@ function tag_deliver($uid, $item_id) {
 	$c = q("SELECT `name`, `url`, `thumb` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 		intval($u[0]['uid'])
 	);
-	if (! dbm::is_result($c)) {
+	if (! DBM::is_result($c)) {
 		return;
 	}
 
@@ -1443,7 +1444,7 @@ function tgroup_check($uid, $item) {
 	$u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($uid)
 	);
-	if (! dbm::is_result($u)) {
+	if (! DBM::is_result($u)) {
 		return false;
 	}
 
@@ -1562,9 +1563,9 @@ function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0
 			WHERE `contact`.`id` = %d AND `user`.`uid` = %d",
 			dbesc($contact["id"]), dbesc($importer["uid"])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger("Now import the DFRN feed");
-			dfrn::import($xml, $r[0], true);
+			DFRN::import($xml, $r[0], true);
 			return;
 		}
 	}
@@ -1602,7 +1603,7 @@ function item_is_remote_self($contact, &$datarray) {
 	if ($contact['remote_self'] == 2) {
 		$r = q("SELECT `id`,`url`,`name`,`thumb` FROM `contact` WHERE `uid` = %d AND `self`",
 			intval($contact['uid']));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$datarray['contact-id'] = $r[0]["id"];
 
 			$datarray['owner-name'] = $r[0]["name"];
@@ -1691,7 +1692,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
 				intval($importer['uid']),
 				dbesc($url)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact_record = $r[0];
 			update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true);
 		}
@@ -1701,7 +1702,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
 			intval($importer['uid'])
 		);
 
-		if (dbm::is_result($r) && !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
+		if (DBM::is_result($r) && !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
 
 			// create notification
 			$hash = random_string();
@@ -1737,7 +1738,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
 				));
 
 			}
-		} elseif (dbm::is_result($r) && in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
+		} elseif (DBM::is_result($r) && in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_COMMUNITY))) {
 			$r = q("UPDATE `contact` SET `pending` = 0 WHERE `uid` = %d AND `url` = '%s' AND `pending` LIMIT 1",
 					intval($importer['uid']),
 					dbesc($url)
@@ -1780,7 +1781,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
 	 * through the direct Diaspora protocol. If we try and use
 	 * the feed, we'll get duplicates. So don't.
 	 */
-	if ((! dbm::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) {
+	if ((! DBM::is_result($r)) || $contact['network'] === NETWORK_DIASPORA) {
 		return;
 	}
 
@@ -1846,7 +1847,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
 					intval($uid)
 
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					/*
 					 * Check to see if we should replace this photo link with an embedded image
 					 * 1. No need to do so if the photo is public
@@ -2017,7 +2018,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
 		intval($days)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		return;
 	}
 
@@ -2094,7 +2095,7 @@ function drop_item($id, $interactive = true) {
 		intval($id)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		if (! $interactive) {
 			return 0;
 		}
@@ -2261,7 +2262,7 @@ function drop_item($id, $interactive = true) {
 				dbesc($item['parent-uri']),
 				intval($item['uid'])
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				dba::update('item', array('last-child' => true), array('id' => $r[0]['id']));
 			}
 		}
@@ -2298,7 +2299,7 @@ function first_post_date($uid, $wall = false) {
 		intval($uid),
 		intval($wall ? 1 : 0)
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		// logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA);
 		return substr(datetime_convert('',date_default_timezone_get(), $r[0]['created']),0,10);
 	}
@@ -2391,7 +2392,7 @@ function posted_date_widget($url, $uid, $wall) {
 
 	$ret = list_post_dates($uid, $wall);
 
-	if (! dbm::is_result($ret)) {
+	if (! DBM::is_result($ret)) {
 		return $o;
 	}
 
diff --git a/include/like.php b/include/like.php
index 69dfa5cda1..eee89168a9 100644
--- a/include/like.php
+++ b/include/like.php
@@ -3,8 +3,8 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-
-require_once("include/diaspora.php");
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 /**
  * @brief add/remove activity to an item
@@ -72,7 +72,7 @@ function do_like($item_id, $verb) {
 		dbesc($item_id)
 	);
 
-	if (! $item_id || ! dbm::is_result($items)) {
+	if (! $item_id || ! DBM::is_result($items)) {
 		logger('like: unknown item ' . $item_id);
 		return false;
 	}
@@ -90,7 +90,7 @@ function do_like($item_id, $verb) {
 		AND `contact`.`uid` = %d",
 		intval($item['uid'])
 	);
-	if (dbm::is_result($owners)) {
+	if (DBM::is_result($owners)) {
 		$owner_self_contact = $owners[0];
 	} else {
 		logger('like: unknown owner ' . $item['uid']);
@@ -103,7 +103,7 @@ function do_like($item_id, $verb) {
 	$contacts = q("SELECT * FROM `contact` WHERE `id` = %d",
 		intval($author_id)
 	);
-	if (dbm::is_result($contacts)) {
+	if (DBM::is_result($contacts)) {
 		$author_contact = $contacts[0];
 	} else {
 		logger('like: unknown author ' . $author_id);
@@ -120,7 +120,7 @@ function do_like($item_id, $verb) {
 		$contacts = q("SELECT * FROM `contact` WHERE `id` = %d",
 			intval($item_contact_id)
 		);
-		if (dbm::is_result($contacts)) {
+		if (DBM::is_result($contacts)) {
 			$item_contact = $contacts[0];
 		} else {
 			logger('like: unknown item contact ' . $item_contact_id);
@@ -150,7 +150,7 @@ function do_like($item_id, $verb) {
 	);
 
 	// If it exists, mark it as deleted
-	if (dbm::is_result($existing_like)) {
+	if (DBM::is_result($existing_like)) {
 		$like_item = $existing_like[0];
 
 		// Already voted, undo it
diff --git a/include/message.php b/include/message.php
index 0202604b70..dcc1fbc12e 100644
--- a/include/message.php
+++ b/include/message.php
@@ -5,6 +5,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 function send_message($recipient=0, $body='', $subject='', $replyto=''){
 
@@ -42,7 +43,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 			dbesc($replyto),
 			dbesc($replyto)
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$convid = $r[0]['convid'];
 	}
 
@@ -67,7 +68,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		$r = dba::insert('conv', $fields);
 
 		$r = dba::select('conv', array('id'), array('guid' => $conv_guid, 'uid' => local_user()), array('limit' => 1));
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$convid = $r['id'];
 	}
 
@@ -106,7 +107,7 @@ function send_message($recipient=0, $body='', $subject='', $replyto=''){
 		dbesc($uri),
 		intval(local_user())
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		$post_id = $r[0]['id'];
 
 	/**
@@ -191,7 +192,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
 	$r = dba::insert('conv', $fields);
 
 	$r = dba::select('conv', array('id'), array('guid' => $conv_guid, 'uid' => $recipient['uid']), array('limit' => 1));
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		logger('send message: conversation not found.');
 		return -4;
 	}
diff --git a/include/nav.php b/include/nav.php
index 478213b4e0..411f0ac5da 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function nav(App $a) {
 
@@ -92,7 +93,7 @@ function nav_info(App $a)
 		// user info
 		$r = dba::select('contact', array('micro'), array('uid' => $a->user['uid'], 'self' => true), array('limit' => 1));
 		$userinfo = array(
-			'icon' => (dbm::is_result($r) ? $a->remove_baseurl($r['micro']) : 'images/person-48.jpg'),
+			'icon' => (DBM::is_result($r) ? $a->remove_baseurl($r['micro']) : 'images/person-48.jpg'),
 			'name' => $a->user['username'],
 		);
 	} else {
diff --git a/include/notifier.php b/include/notifier.php
index 317a9ffcad..3e9ea66f2c 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -3,11 +3,12 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Protocol\Diaspora;
 
 require_once 'include/queue_fn.php';
 require_once 'include/html2plain.php';
-require_once 'include/diaspora.php';
 require_once 'include/ostatus.php';
 require_once 'include/salmon.php';
 
@@ -158,7 +159,7 @@ function notifier_run(&$argv, &$argc){
 			intval($item_id)
 		);
 
-		if ((! dbm::is_result($r)) || (! intval($r[0]['parent']))) {
+		if ((! DBM::is_result($r)) || (! intval($r[0]['parent']))) {
 			return;
 		}
 
@@ -199,7 +200,7 @@ function notifier_run(&$argv, &$argc){
 		intval($uid)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		return;
 	}
 
@@ -298,7 +299,7 @@ function notifier_run(&$argv, &$argc){
 			$fields = array('forum', 'prv');
 			$condition = array('id' => $target_item['contact-id']);
 			$contact = dba::select('contact', $fields, $condition, array('limit' => 1));
-			if (!dbm::is_result($contact)) {
+			if (!DBM::is_result($contact)) {
 				// Should never happen
 				return false;
 			}
@@ -335,7 +336,7 @@ function notifier_run(&$argv, &$argc){
 						intval($uid),
 						dbesc(NETWORK_DFRN)
 					);
-					if (dbm::is_result($r)) {
+					if (DBM::is_result($r)) {
 						foreach ($r as $rr) {
 							$recipients_followup[] = $rr['id'];
 						}
@@ -423,7 +424,7 @@ function notifier_run(&$argv, &$argc){
 			$r = q("SELECT `url`, `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
 				dbesc(normalise_link($thr_parent[0]['author-link'])),
 				intval($uid));
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$probed_contact = $r[0];
 			} else {
 				$probed_contact = Probe::uri($thr_parent[0]['author-link']);
@@ -438,7 +439,7 @@ function notifier_run(&$argv, &$argc){
 			$r = q("SELECT `url`, `notify` FROM `contact` WHERE `nurl`='%s' AND `uid` IN (0, %d) AND `notify` != ''",
 				dbesc(normalise_link($thr_parent[0]['owner-link'])),
 				intval($uid));
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$probed_contact = $r[0];
 			} else {
 				$probed_contact = Probe::uri($thr_parent[0]['owner-link']);
@@ -484,7 +485,7 @@ function notifier_run(&$argv, &$argc){
 				intval($uid),
 				dbesc(NETWORK_MAIL)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				foreach ($r as $rr) {
 					$recipients[] = $rr['id'];
 				}
@@ -508,7 +509,7 @@ function notifier_run(&$argv, &$argc){
 
 	// delivery loop
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $contact) {
 			if ($contact['self']) {
 				continue;
@@ -565,7 +566,7 @@ function notifier_run(&$argv, &$argc){
 
 		$r = array_merge($r2,$r1,$r0);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger('pubdeliver '.$target_item["guid"].': '.print_r($r,true), LOGGER_DEBUG);
 
 			foreach ($r as $rr) {
diff --git a/include/oauth.php b/include/oauth.php
index f89aedf6b7..bb12278685 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -9,6 +9,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 define('REQUEST_TOKEN_DURATION', 300);
 define('ACCESS_TOKEN_DURATION', 31536000);
@@ -28,7 +29,7 @@ class FKOAuthDataStore extends OAuthDataStore {
 		$r = q("SELECT client_id, pw, redirect_uri FROM clients WHERE client_id='%s'",
 			dbesc($consumer_key)
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			return new OAuthConsumer($r[0]['client_id'],$r[0]['pw'],$r[0]['redirect_uri']);
 		return null;
   }
@@ -40,7 +41,7 @@ class FKOAuthDataStore extends OAuthDataStore {
 			dbesc($token_type),
 			dbesc($token)
 		);
-		if (dbm::is_result($r)){
+		if (DBM::is_result($r)){
 			$ot=new OAuthToken($r[0]['id'],$r[0]['secret']);
 			$ot->scope=$r[0]['scope'];
 			$ot->expires = $r[0]['expires'];
@@ -57,7 +58,7 @@ class FKOAuthDataStore extends OAuthDataStore {
 			dbesc($nonce),
 			intval($timestamp)
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			return new OAuthToken($r[0]['id'],$r[0]['secret']);
 		return null;
   }
@@ -141,7 +142,7 @@ class FKOAuth1 extends OAuthServer {
 		$r = q("SELECT * FROM `user` WHERE uid=%d AND `blocked` = 0 AND `account_expired` = 0 AND `account_removed` = 0 AND `verified` = 1 LIMIT 1",
 			intval($uid)
 		);
-		if (dbm::is_result($r)){
+		if (DBM::is_result($r)){
 			$record = $r[0];
 		} else {
 		   logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER,true), LOGGER_DEBUG);
@@ -167,7 +168,7 @@ class FKOAuth1 extends OAuthServer {
 
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
 			intval($_SESSION['uid']));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$a->contact = $r[0];
 			$a->cid = $r[0]['id'];
 			$_SESSION['cid'] = $a->cid;
@@ -224,7 +225,7 @@ class FKOAuth2 extends OAuth2 {
 		$r = q("SELECT client_id, expires, scope FROM tokens WHERE id = '%s'",
 				dbesc($oauth_token));
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			return $r[0];
 		return null;
 	}
@@ -252,7 +253,7 @@ class FKOAuth2 extends OAuth2 {
 		$r = q("SELECT id, client_id, redirect_uri, expires, scope FROM auth_codes WHERE id = '%s'",
 				dbesc($code));
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			return $r[0];
 		return null;
 	}
diff --git a/include/oembed.php b/include/oembed.php
index 715a0ba5bd..18230fe87a 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -8,6 +8,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\ParseUrl;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 function oembed_replacecb($matches){
 	$embedurl=$matches[1];
@@ -35,7 +36,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){
 	$r = q("SELECT * FROM `oembed` WHERE `url` = '%s'",
 		dbesc(normalise_link($embedurl)));
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$txt = $r[0]["content"];
 	} else {
 		$txt = Cache::get($a->videowidth . $embedurl);
diff --git a/include/onepoll.php b/include/onepoll.php
index f64ea40ecb..c9fbb1610e 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -2,6 +2,7 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 require_once 'include/follow.php';
 
@@ -78,7 +79,7 @@ function onepoll_run(&$argv, &$argc) {
 			WHERE `cid` = %d AND updated > UTC_TIMESTAMP() - INTERVAL 1 DAY",
 			intval($contact['id'])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			if (!$r[0]['total']) {
 				poco_load($contact['id'], $importer_uid, 0, $contact['poco']);
 			}
@@ -147,7 +148,7 @@ function onepoll_run(&$argv, &$argc) {
 		intval($importer_uid)
 	);
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		logger('No self contact for user '.$importer_uid);
 		return;
 	}
@@ -331,7 +332,7 @@ function onepoll_run(&$argv, &$argc) {
 
 		$condition = array("`server` != '' AND `uid` = ?", $importer_uid);
 		$mailconf = dba::select('mailacct', array(), $condition, array('limit' => 1));
-		if (dbm::is_result($x) && dbm::is_result($mailconf)) {
+		if (DBM::is_result($x) && DBM::is_result($mailconf)) {
 			$mailbox = construct_mailbox_name($mailconf);
 			$password = '';
 			openssl_private_decrypt(hex2bin($mailconf['pass']), $password, $x['prvkey']);
@@ -375,7 +376,7 @@ function onepoll_run(&$argv, &$argc) {
 						$condition = array('uid' => $importer_uid, 'uri' => $datarray['uri']);
 						$r = dba::select('item', $fields, $condition, array('limit' => 1));
 
-						if (dbm::is_result($r)) {
+						if (DBM::is_result($r)) {
 							logger("Mail: Seen before ".$msg_uid." for ".$mailconf['user']." UID: ".$importer_uid." URI: ".$datarray['uri'],LOGGER_DEBUG);
 
 							// Only delete when mails aren't automatically moved or deleted
@@ -427,7 +428,7 @@ function onepoll_run(&$argv, &$argc) {
 							$r = q("SELECT `parent-uri` FROM `item` USE INDEX (`uid_uri`) WHERE `uri` IN ($qstr) AND `uid` = %d LIMIT 1",
 								intval($importer_uid)
 							);
-							if (dbm::is_result($r)) {
+							if (DBM::is_result($r)) {
 								$datarray['parent-uri'] = $r[0]['parent-uri'];  // Set the parent as the top-level item
 							}
 						}
@@ -461,7 +462,7 @@ function onepoll_run(&$argv, &$argc) {
 								dbesc(protect_sprintf($datarray['title'])),
 								intval($importer_uid),
 								dbesc(NETWORK_MAIL));
-							if (dbm::is_result($r)) {
+							if (DBM::is_result($r)) {
 								$datarray['parent-uri'] = $r[0]['parent-uri'];
 							}
 						}
diff --git a/include/ostatus.php b/include/ostatus.php
index bafa2ddc5d..51ca6e2356 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -6,6 +6,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 use Friendica\Util\Lock;
 
@@ -70,7 +71,7 @@ class ostatus {
 					$importer["uid"], $aliaslink, NETWORK_STATUSNET);
 			$r = dba::select('contact', array(), $condition, array('limit' => 1));
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$found = true;
 				if ($r['blocked']) {
 					$r['id'] = -1;
@@ -89,7 +90,7 @@ class ostatus {
 					normalise_link($author["author-link"]), normalise_link($aliaslink), NETWORK_STATUSNET);
 			$r = dba::select('contact', array(), $condition, array('limit' => 1));
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$found = true;
 				if ($r['blocked']) {
 					$r['id'] = -1;
@@ -104,7 +105,7 @@ class ostatus {
 					$importer["uid"], $addr, NETWORK_STATUSNET);
 			$r = dba::select('contact', array(), $condition, array('limit' => 1));
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$found = true;
 				if ($r['blocked']) {
 					$r['id'] = -1;
@@ -529,7 +530,7 @@ class ostatus {
 
 		$condition = array('uid' => $item['uid'], 'author-link' => $item['author-link'], 'uri' => $item['uri']);
 		$deleted = dba::select('item', array('id', 'parent-uri'), $condition, array('limit' => 1));
-		if (!dbm::is_result($deleted)) {
+		if (!DBM::is_result($deleted)) {
 			logger('Item from '.$item['author-link'].' with uri '.$item['uri'].' for user '.$item['uid']." wasn't found. We don't delete it. ");
 			return;
 		}
@@ -868,7 +869,7 @@ class ostatus {
 	private static function fetchRelated($related, $related_uri, $importer) {
 		$condition = array('`item-uri` = ? AND `protocol` IN (?, ?)', $related_uri, PROTOCOL_DFRN, PROTOCOL_OSTATUS_SALMON);
 		$conversation = dba::select('conversation', array('source', 'protocol'), $condition,  array('limit' => 1));
-		if (dbm::is_result($conversation)) {
+		if (DBM::is_result($conversation)) {
 			$stored = true;
 			$xml = $conversation['source'];
 			if (self::process($xml, $importer, $contact, $hub, $stored, false)) {
@@ -948,7 +949,7 @@ class ostatus {
 		if ($xml == '') {
 			$condition = array('item-uri' => $related_uri, 'protocol' => PROTOCOL_SPLITTED_CONV);
 			$conversation = dba::select('conversation', array('source'), $condition,  array('limit' => 1));
-			if (dbm::is_result($conversation)) {
+			if (DBM::is_result($conversation)) {
 				$stored = true;
 				logger('Got cached XML from conversation for URI '.$related_uri, LOGGER_DEBUG);
 				$xml = $conversation['source'];
@@ -1336,7 +1337,7 @@ class ostatus {
 	private static function add_author($doc, $owner) {
 
 		$r = q("SELECT `homepage`, `publish` FROM `profile` WHERE `uid` = %d AND `is-default` LIMIT 1", intval($owner["uid"]));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$profile = $r[0];
 		}
 		$author = $doc->createElement("author");
@@ -1493,22 +1494,22 @@ class ostatus {
 
 		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` IN (0, %d) ORDER BY `uid` DESC LIMIT 1",
 			dbesc(normalise_link($url)), intval($owner["uid"]));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact = $r[0];
 			$contact["uid"] = -1;
 		}
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			$r = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
 				dbesc(normalise_link($url)));
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$contact = $r[0];
 				$contact["uid"] = -1;
 				$contact["success_update"] = $contact["updated"];
 			}
 		}
 
-		if (!dbm::is_result($r))
+		if (!DBM::is_result($r))
 			$contact = owner;
 
 		if (!isset($contact["poll"])) {
@@ -1547,7 +1548,7 @@ class ostatus {
 		$r = q("SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1",
 			intval($owner["uid"]), dbesc($repeated_guid),
 			dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$repeated_item = $r[0];
 		} else {
 			return false;
@@ -1702,7 +1703,7 @@ class ostatus {
 		$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
 			intval($owner['uid']), dbesc(normalise_link($contact["url"])));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$connect_id = $r[0]['id'];
 		} else {
 			$connect_id = 0;
@@ -1886,7 +1887,7 @@ class ostatus {
 
 			if (isset($parent_item)) {
 				$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $parent_item);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					if ($r['conversation-uri'] != '') {
 						$conversation_uri = $r['conversation-uri'];
 					}
@@ -1996,7 +1997,7 @@ class ostatus {
 				FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
 				WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
 				dbesc($owner_nick));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return;
 		}
 
diff --git a/include/plugin.php b/include/plugin.php
index c4daa6c020..2814b24647 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -8,6 +8,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 /**
  * @brief uninstalls an addon.
@@ -77,7 +78,7 @@ function reload_plugins() {
 	if (strlen($plugins)) {
 
 		$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$installed = $r;
 		else
 			$installed = array();
@@ -144,7 +145,7 @@ function register_hook($hook,$file,$function,$priority=0) {
 		dbesc($file),
 		dbesc($function)
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		return true;
 
 	$r = dba::insert('hook', array('hook' => $hook, 'file' => $file, 'function' => $function, 'priority' => $priority));
diff --git a/include/post_update.php b/include/post_update.php
index 210ab79fec..1d27f33996 100644
--- a/include/post_update.php
+++ b/include/post_update.php
@@ -4,6 +4,7 @@
  */
 
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 /**
  * @brief Calls the post update functions
@@ -187,7 +188,7 @@ function post_update_1198() {
 				(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
 
 		logger("Updated threads", LOGGER_DEBUG);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			Config::set("system", "post_update_version", 1198);
 			logger("Done", LOGGER_DEBUG);
 			return true;
@@ -245,7 +246,7 @@ function post_update_1206() {
 		FROM `user`
 		INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`");
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return false;
 	}
 	foreach ($r AS $user) {
diff --git a/include/profile_update.php b/include/profile_update.php
index 69484e8fe0..0c5de0156d 100644
--- a/include/profile_update.php
+++ b/include/profile_update.php
@@ -1,5 +1,5 @@
 <?php
-require_once('include/diaspora.php');
+use Friendica\Protocol\Diaspora;
 
 function profile_update_run(&$argv, &$argc) {
 	if ($argc != 2) {
diff --git a/include/pubsubpublish.php b/include/pubsubpublish.php
index c662198abd..52a707b8bc 100644
--- a/include/pubsubpublish.php
+++ b/include/pubsubpublish.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once('include/items.php');
 require_once('include/ostatus.php');
@@ -34,7 +35,7 @@ function handle_pubsubhubbub($id) {
 	global $a;
 
 	$r = q("SELECT * FROM `push_subscriber` WHERE `id` = %d", intval($id));
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
diff --git a/include/queue.php b/include/queue.php
index c398300c44..c930cd9cff 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -2,9 +2,11 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\DFRN;
 
 require_once 'include/queue_fn.php';
-require_once 'include/dfrn.php';
 require_once 'include/datetime.php';
 require_once 'include/items.php';
 require_once 'include/bbcode.php';
@@ -34,7 +36,7 @@ function queue_run(&$argv, &$argc) {
 			INNER JOIN `contact` ON `queue`.`cid` = `contact`.`id`
 			WHERE `queue`.`created` < UTC_TIMESTAMP() - INTERVAL 3 DAY");
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				logger('Removing expired queue item for ' . $rr['name'] . ', uid=' . $rr['uid']);
 				logger('Expired queue data: ' . $rr['content'], LOGGER_DATA);
@@ -50,7 +52,7 @@ function queue_run(&$argv, &$argc) {
 
 		call_hooks('queue_predeliver', $a, $r);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $q_item) {
 				logger('Call queue for id '.$q_item['id']);
 				Worker::add(array('priority' => PRIORITY_LOW, 'dont_fork' => true), "queue", (int)$q_item['id']);
@@ -63,12 +65,11 @@ function queue_run(&$argv, &$argc) {
 	// delivering
 
 	require_once 'include/salmon.php';
-	require_once 'include/diaspora.php';
 
 	$r = q("SELECT * FROM `queue` WHERE `id` = %d LIMIT 1",
 		intval($queue_id));
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
@@ -78,7 +79,7 @@ function queue_run(&$argv, &$argc) {
 		intval($q_item['cid'])
 	);
 
-	if (!dbm::is_result($c)) {
+	if (!DBM::is_result($c)) {
 		remove_queue_item($q_item['id']);
 		return;
 	}
@@ -114,7 +115,7 @@ function queue_run(&$argv, &$argc) {
 		FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($c[0]['uid'])
 	);
-	if (!dbm::is_result($u)) {
+	if (!DBM::is_result($u)) {
 		remove_queue_item($q_item['id']);
 		return;
 	}
@@ -129,7 +130,7 @@ function queue_run(&$argv, &$argc) {
 	switch ($contact['network']) {
 		case NETWORK_DFRN:
 			logger('queue: dfrndelivery: item '.$q_item['id'].' for '.$contact['name'].' <'.$contact['url'].'>');
-			$deliver_status = dfrn::deliver($owner, $contact, $data);
+			$deliver_status = DFRN::deliver($owner, $contact, $data);
 
 			if ($deliver_status == (-1)) {
 				update_queue_time($q_item['id']);
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 475ac1eb09..e6fd14e07c 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 function update_queue_time($id) {
 	logger('queue: requeue item ' . $id);
@@ -33,7 +34,7 @@ function was_recently_delayed($cid) {
 		intval($cid)
 	);
 
-	$was_delayed = dbm::is_result($r);
+	$was_delayed = DBM::is_result($r);
 
 	// We set "term-date" to a current date if the communication has problems.
 	// If the communication works again we reset this value.
@@ -41,7 +42,7 @@ function was_recently_delayed($cid) {
 		$r = q("SELECT `term-date` FROM `contact` WHERE `id` = %d AND `term-date` <= '1000-01-01' LIMIT 1",
 			intval($cid)
 		);
-		$was_delayed = !dbm::is_result($r);
+		$was_delayed = !DBM::is_result($r);
 	}
 
 	return $was_delayed;
@@ -64,7 +65,7 @@ function add_to_queue($cid,$network,$msg,$batch = false) {
 		WHERE `queue`.`cid` = %d AND `contact`.`self` = 0 ",
 		intval($cid)
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		if ($batch &&  ($r[0]['total'] > $batch_queue)) {
 			logger('add_to_queue: too many queued items for batch server ' . $cid . ' - discarding message');
 			return;
diff --git a/include/redir.php b/include/redir.php
index 8c04d711ed..060d0e9bf3 100644
--- a/include/redir.php
+++ b/include/redir.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function auto_redir(App $a, $contact_nick) {
 
@@ -39,7 +40,7 @@ function auto_redir(App $a, $contact_nick) {
 				dbesc($nurl)
 		);
 
-		if ((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) {
+		if ((! DBM::is_result($r)) || $r[0]['id'] == remote_user()) {
 			return;
 		}
 
@@ -51,7 +52,7 @@ function auto_redir(App $a, $contact_nick) {
 		       dbesc($baseurl)
 		);
 
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			return;
 		}
 
diff --git a/include/security.php b/include/security.php
index c885a7b1b9..18793ce060 100644
--- a/include/security.php
+++ b/include/security.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 /**
  * @brief Calculate the hash that is needed for the "Friendica" cookie
@@ -87,14 +88,14 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 		$r = dba::fetch_first("SELECT * FROM `user` WHERE `uid` = ? LIMIT 1",
 			intval($_SESSION['submanage'])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$master_record = $r;
 		}
 	}
 
 	$r = dba::select('user', array('uid', 'username', 'nickname'),
 		array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false));
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$a->identities = dba::inArray($r);
 	} else {
 		$a->identities = array();
@@ -106,7 +107,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 		WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?",
 		$master_record['uid']
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$a->identities = array_merge($a->identities, dba::inArray($r));
 	}
 
@@ -118,7 +119,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	}
 
 	$r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $_SESSION['uid']);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$a->contact = $r;
 		$a->cid = $r['id'];
 		$_SESSION['cid'] = $a->cid;
@@ -209,7 +210,7 @@ function can_write_wall(App $a, $owner) {
 				intval(PAGE_COMMUNITY)
 			);
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$verified = 2;
 				return true;
 			}
@@ -259,7 +260,7 @@ function permissions_sql($owner_id, $remote_verified = false, $groups = null) {
 				intval($remote_user),
 				intval($owner_id)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$remote_verified = true;
 				$groups = init_groups_visitor($remote_user);
 			}
@@ -338,7 +339,7 @@ function item_permissions_sql($owner_id, $remote_verified = false, $groups = nul
 				intval($remote_user),
 				intval($owner_id)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$remote_verified = true;
 				$groups = init_groups_visitor($remote_user);
 			}
@@ -456,7 +457,7 @@ function init_groups_visitor($contact_id) {
 		WHERE `contact-id` = %d ",
 		intval($contact_id)
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr)
 			$groups[] = $rr['gid'];
 	}
diff --git a/include/session.php b/include/session.php
index f53465501c..812de547c4 100644
--- a/include/session.php
+++ b/include/session.php
@@ -3,6 +3,7 @@
 // session info.
 
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once('include/cache.php');
 
@@ -32,7 +33,7 @@ function ref_session_read($id) {
 	}
 
 	$r = dba::select('session', array('data'), array('sid' => $id), array('limit' => 1));
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$session_exists = true;
 		return $r['data'];
 	} else {
diff --git a/include/socgraph.php b/include/socgraph.php
index e5c612e827..e1c0e13856 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -11,6 +11,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 
 require_once 'include/datetime.php';
@@ -59,7 +60,7 @@ function poco_load_worker($cid, $uid, $zcid, $url) {
 			$r = q("select `poco`, `uid` from `contact` where `id` = %d limit 1",
 				intval($cid)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$url = $r[0]['poco'];
 				$uid = $r[0]['uid'];
 			}
@@ -252,7 +253,7 @@ function sanitize_gcontact($gcontact) {
 		$r = q("SELECT `network` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s' AND `network` != '' AND `network` != '%s' LIMIT 1",
 			dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$gcontact['network'] = $r[0]["network"];
 		}
 
@@ -260,7 +261,7 @@ function sanitize_gcontact($gcontact) {
 			$r = q("SELECT `network`, `url` FROM `contact` WHERE `uid` = 0 AND `alias` IN ('%s', '%s') AND `network` != '' AND `network` != '%s' LIMIT 1",
 				dbesc($gcontact['url']), dbesc(normalise_link($gcontact['url'])), dbesc(NETWORK_STATUSNET)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$gcontact['network'] = $r[0]["network"];
 			}
 		}
@@ -273,7 +274,7 @@ function sanitize_gcontact($gcontact) {
 		dbesc(normalise_link($gcontact['url']))
 	);
 
-	if (dbm::is_result($x)) {
+	if (DBM::is_result($x)) {
 		if (!isset($gcontact['network']) && ($x[0]["network"] != NETWORK_STATUSNET)) {
 			$gcontact['network'] = $x[0]["network"];
 		}
@@ -305,7 +306,7 @@ function sanitize_gcontact($gcontact) {
 		if ($alternate && ($gcontact['network'] == NETWORK_OSTATUS)) {
 			// Delete the old entry - if it exists
 			$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
 				q("DELETE FROM `glink` WHERE `gcid` = %d", intval($r[0]["id"]));
 			}
@@ -360,7 +361,7 @@ function link_gcontact($gcid, $uid = 0, $cid = 0, $zcid = 0) {
 		intval($zcid)
 	);
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		q("INSERT INTO `glink` (`cid`, `uid`, `gcid`, `zcid`, `updated`) VALUES (%d, %d, %d, %d, '%s') ",
 			intval($cid),
 			intval($uid),
@@ -454,7 +455,7 @@ function poco_detect_server($profile) {
 
 	$r = q("SELECT `id` FROM `gserver` WHERE `nurl` = '%s' AND `last_contact` > `last_failure`",
 		dbesc(normalise_link($server_url)));
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		return $server_url;
 	}
 
@@ -476,7 +477,7 @@ function poco_last_updated($profile, $force = false) {
 	$gcontacts = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'",
 			dbesc(normalise_link($profile)));
 
-	if (!dbm::is_result($gcontacts)) {
+	if (!DBM::is_result($gcontacts)) {
 		return false;
 	}
 
@@ -688,7 +689,7 @@ function poco_last_updated($profile, $force = false) {
 		}
 	}
 	q("UPDATE `gcontact` SET `updated` = '%s', `last_contact` = '%s' WHERE `nurl` = '%s'",
-		dbesc(dbm::date($last_updated)), dbesc(dbm::date()), dbesc(normalise_link($profile)));
+		dbesc(DBM::date($last_updated)), dbesc(DBM::date()), dbesc(normalise_link($profile)));
 
 	if (($gcontacts[0]["generation"] == 0)) {
 		q("UPDATE `gcontact` SET `generation` = 9 WHERE `nurl` = '%s'",
@@ -970,7 +971,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
 	}
 
 	$servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
-	if (dbm::is_result($servers)) {
+	if (DBM::is_result($servers)) {
 
 		if ($servers[0]["created"] <= NULL_DATE) {
 			q("UPDATE `gserver` SET `created` = '%s' WHERE `nurl` = '%s'",
@@ -1023,7 +1024,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
 
 	// Quit if there is a timeout.
 	// But we want to make sure to only quit if we are mostly sure that this server url fits.
-	if (dbm::is_result($servers) && ($orig_server_url == $server_url) &&
+	if (DBM::is_result($servers) && ($orig_server_url == $server_url) &&
 		($serverret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 		logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
 		dba::update('gserver', array('last_failure' => datetime_convert()), array('nurl' => normalise_link($server_url)));
@@ -1417,7 +1418,7 @@ function count_common_friends($uid, $cid) {
 	);
 
 	// logger("count_common_friends: $uid $cid {$r[0]['total']}");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		return $r[0]['total'];
 	}
 	return 0;
@@ -1450,7 +1451,7 @@ function common_friends($uid, $cid, $start = 0, $limit = 9999, $shuffle = false)
 		intval($limit)
 	);
 
-	/// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
+	/// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
 	return $r;
 
 }
@@ -1466,7 +1467,7 @@ function count_common_friends_zcid($uid, $zcid) {
 		intval($uid)
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		return $r[0]['total'];
 	}
 	return 0;
@@ -1492,7 +1493,7 @@ function common_friends_zcid($uid, $zcid, $start = 0, $limit = 9999, $shuffle =
 		intval($limit)
 	);
 
-	/// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
+	/// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
 	return $r;
 
 }
@@ -1508,7 +1509,7 @@ function count_all_friends($uid, $cid) {
 		intval($uid)
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		return $r[0]['total'];
 	}
 	return 0;
@@ -1532,7 +1533,7 @@ function all_friends($uid, $cid, $start = 0, $limit = 80) {
 		intval($limit)
 	);
 
-	/// @TODO Check all calling-findings of this function if they properly use dbm::is_result()
+	/// @TODO Check all calling-findings of this function if they properly use DBM::is_result()
 	return $r;
 }
 
@@ -1587,7 +1588,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 		intval($limit)
 	);
 
-	if (dbm::is_result($r) && count($r) >= ($limit -1)) {
+	if (DBM::is_result($r) && count($r) >= ($limit -1)) {
 		/*
 		 * Uncommented because the result of the queries are to big to store it in the cache.
 		 * We need to decide if we want to change the db column type or if we want to delete it.
@@ -1670,7 +1671,7 @@ function update_suggestions() {
 		dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA)
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
 			if (! in_array($base,$done)) {
@@ -1700,7 +1701,7 @@ function poco_fetch_serverlist($poco) {
 		$server_url = str_replace("/index.php", "", $server->url);
 
 		$r = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			logger("Call server check for server ".$server_url, LOGGER_DEBUG);
 			Worker::add(PRIORITY_LOW, "discover_poco", "server", $server_url);
 		}
@@ -1762,7 +1763,7 @@ function poco_discover_federation() {
 
 function poco_discover_single_server($id) {
 	$r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `id` = %d", intval($id));
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return false;
 	}
 
@@ -1837,7 +1838,7 @@ function poco_discover($complete = false) {
 	$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
 
 	$r = q("SELECT `id`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $server) {
 
 			if (!poco_check_server($server["url"], $server["network"])) {
@@ -2083,7 +2084,7 @@ function get_gcontact_id($contact) {
 	$r = q("SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
 		dbesc(normalise_link($contact["url"])));
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$gcontact_id = $r[0]["id"];
 
 		// Update every 90 days
@@ -2115,7 +2116,7 @@ function get_gcontact_id($contact) {
 		$r = q("SELECT `id`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
 			dbesc(normalise_link($contact["url"])));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$gcontact_id = $r[0]["id"];
 
 			$doprobing = in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""));
@@ -2198,7 +2199,7 @@ function update_gcontact($contact) {
 	fix_alternate_contact_address($contact);
 
 	if (!isset($contact["updated"])) {
-		$contact["updated"] = dbm::date();
+		$contact["updated"] = DBM::date();
 	}
 
 	if ($contact["network"] == NETWORK_TWITTER) {
@@ -2241,7 +2242,7 @@ function update_gcontact($contact) {
 		logger("Update gcontact for ".$contact["url"], LOGGER_DEBUG);
 		$condition = array('`nurl` = ? AND (`generation` = 0 OR `generation` >= ?)',
 				normalise_link($contact["url"]), $contact["generation"]);
-		$contact["updated"] = dbm::date($contact["updated"]);
+		$contact["updated"] = DBM::date($contact["updated"]);
 
 		$updated = array('photo' => $contact['photo'], 'name' => $contact['name'],
 				'nick' => $contact['nick'], 'addr' => $contact['addr'],
@@ -2261,7 +2262,7 @@ function update_gcontact($contact) {
 		$r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0 ORDER BY `id` LIMIT 1",
 			dbesc(normalise_link($contact["url"])));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger("Update public contact ".$r[0]["id"], LOGGER_DEBUG);
 
 			update_contact_avatar($contact["photo"], 0, $r[0]["id"]);
@@ -2416,7 +2417,7 @@ function gs_discover() {
 	$r = q("SELECT `nurl`, `url` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `network` = '%s' AND `last_poco_query` < '%s' ORDER BY RAND() LIMIT 5",
 		dbesc(NETWORK_OSTATUS), dbesc($last_update));
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
@@ -2436,7 +2437,7 @@ function poco_serverlist() {
 		ORDER BY `last_contact`
 		LIMIT 1000",
 		dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return false;
 	}
 
diff --git a/include/text.php b/include/text.php
index 90d569c62b..9dc3c871fb 100644
--- a/include/text.php
+++ b/include/text.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once "include/template_processor.php";
 require_once "include/friendica_smarty.php";
@@ -525,7 +526,7 @@ function photo_new_resource() {
 			dbesc($resource)
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$found = true;
 		}
 	} while ($found == true);
@@ -956,7 +957,7 @@ function contact_block() {
 			dbesc(NETWORK_OSTATUS),
 			dbesc(NETWORK_DIASPORA)
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$total = intval($r[0]['total']);
 	}
 	if (! $total) {
@@ -975,7 +976,7 @@ function contact_block() {
 				dbesc(NETWORK_DIASPORA),
 				intval($shown)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contacts = array();
 			foreach ($r AS $contact) {
 				$contacts[] = $contact["id"];
@@ -983,7 +984,7 @@ function contact_block() {
 			$r = q("SELECT `id`, `uid`, `addr`, `url`, `name`, `thumb`, `network` FROM `contact` WHERE `id` IN (%s)",
 				dbesc(implode(",", $contacts)));
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total);
 				$micropro = Array();
 				foreach ($r as $rr) {
@@ -1669,7 +1670,7 @@ function generate_user_guid() {
 		$x = q("SELECT `uid` FROM `user` WHERE `guid` = '%s' LIMIT 1",
 			dbesc($guid)
 		);
-		if (! dbm::is_result($x)) {
+		if (! DBM::is_result($x)) {
 			$found = false;
 		}
 	} while ($found == true);
@@ -2023,7 +2024,7 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
 				intval($termtype),
 				intval($uid));
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				unset($deleted_tags[$key]);
 			}
 			else {
@@ -2053,7 +2054,7 @@ function file_tag_save_file($uid, $item, $file) {
 		intval($item),
 		intval($uid)
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		if (! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']')) {
 			q("UPDATE `item` SET `file` = '%s' WHERE `id` = %d AND `uid` = %d",
 				dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
@@ -2093,7 +2094,7 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
 		intval($item),
 		intval($uid)
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		return false;
 	}
 
@@ -2111,7 +2112,7 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
 		intval($termtype),
 		intval($uid));
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		$saved = PConfig::get($uid,'system','filetags');
 		PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
 	}
diff --git a/include/threads.php b/include/threads.php
index 169a63c7ca..16d4915fdf 100644
--- a/include/threads.php
+++ b/include/threads.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function add_thread($itemid, $onlyshadow = false) {
 	$items = q("SELECT `uid`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`,
@@ -35,7 +36,7 @@ function add_shadow_thread($itemid) {
 	$items = q("SELECT `uid`, `wall`, `private`, `moderated`, `visible`, `contact-id`, `deleted`, `network`, `author-id`, `owner-id`
 		FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
-	if (!dbm::is_result($items)) {
+	if (!DBM::is_result($items)) {
 		return;
 	}
 
@@ -67,7 +68,7 @@ function add_shadow_thread($itemid) {
 		$r = q("SELECT `hide-friends` FROM `profile` WHERE `is-default` AND `uid` = %d AND NOT `hide-friends`",
 			$item['uid']);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return;
 		}
 
@@ -75,14 +76,14 @@ function add_shadow_thread($itemid) {
 		$r = q("SELECT `id` FROM `contact` WHERE NOT `hidden` AND NOT `blocked` AND `id` = %d",
 			$item['contact-id']);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return;
 		}
 	}
 
 	// Only add a shadow, if the profile isn't hidden
 	$r = q("SELECT `uid` FROM `user` where `uid` = %d AND NOT `hidewall`", $item['uid']);
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
@@ -94,7 +95,7 @@ function add_shadow_thread($itemid) {
 		$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1",
 			dbesc($item['uri']));
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			// Preparing public shadow (removing user specific data)
 			require_once("include/items.php");
 			require_once("include/Contact.php");
@@ -129,7 +130,7 @@ function add_shadow_entry($itemid) {
 
 	$items = q("SELECT * FROM `item` WHERE `id` = %d", intval($itemid));
 
-	if (!dbm::is_result($items)) {
+	if (!DBM::is_result($items)) {
 		return;
 	}
 
@@ -147,12 +148,12 @@ function add_shadow_entry($itemid) {
 
 	// Is there a shadow parent?
 	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['parent-uri']));
-	if (!dbm::is_result($r))
+	if (!DBM::is_result($r))
 		return;
 
 	// Is there already a shadow entry?
 	$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item['uri']));
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		return;
 
 	// Preparing public shadow (removing user specific data)
@@ -179,7 +180,7 @@ function add_shadow_entry($itemid) {
 function update_thread_uri($itemuri, $uid) {
 	$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-	if (dbm::is_result($messages)) {
+	if (DBM::is_result($messages)) {
 		foreach ($messages as $message) {
 			update_thread($message["id"]);
 		}
@@ -190,7 +191,7 @@ function update_thread($itemid, $setmention = false) {
 	$items = q("SELECT `uid`, `guid`, `title`, `body`, `created`, `edited`, `commented`, `received`, `changed`, `wall`, `private`, `pubmail`, `moderated`, `visible`, `spam`, `starred`, `bookmark`, `contact-id`, `gcontact-id`,
 			`deleted`, `origin`, `forum_mode`, `network`, `rendered-html`, `rendered-hash` FROM `item` WHERE `id` = %d AND (`parent` = %d OR `parent` = 0) LIMIT 1", intval($itemid), intval($itemid));
 
-	if (!dbm::is_result($items)) {
+	if (!DBM::is_result($items)) {
 		return;
 	}
 
@@ -218,7 +219,7 @@ function update_thread($itemid, $setmention = false) {
 	// Updating a shadow item entry
 	$items = q("SELECT `id` FROM `item` WHERE `guid` = '%s' AND `uid` = 0 LIMIT 1", dbesc($item["guid"]));
 
-	if (!dbm::is_result($items)) {
+	if (!DBM::is_result($items)) {
 		return;
 	}
 
@@ -235,7 +236,7 @@ function update_thread($itemid, $setmention = false) {
 function delete_thread_uri($itemuri, $uid) {
 	$messages = q("SELECT `id` FROM `item` WHERE uri ='%s' AND uid=%d", dbesc($itemuri), intval($uid));
 
-	if (dbm::is_result($messages)) {
+	if (DBM::is_result($messages)) {
 		foreach ($messages as $message) {
 			delete_thread($message["id"], $itemuri);
 		}
@@ -245,7 +246,7 @@ function delete_thread_uri($itemuri, $uid) {
 function delete_thread($itemid, $itemuri = "") {
 	$item = q("SELECT `uid` FROM `thread` WHERE `iid` = %d", intval($itemid));
 
-	if (!dbm::is_result($item)) {
+	if (!DBM::is_result($item)) {
 		logger('No thread found for id '.$itemid, LOGGER_DEBUG);
 		return;
 	}
@@ -260,7 +261,7 @@ function delete_thread($itemid, $itemuri = "") {
 				dbesc($itemuri),
 				intval($item["uid"])
 			);
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			dba::delete('item', array('uri' => $itemuri, 'uid' => 0));
 			logger("delete_thread: Deleted shadow for item ".$itemuri, LOGGER_DEBUG);
 		}
diff --git a/include/uimport.php b/include/uimport.php
index fbdbeb58c6..af4f434d4b 100644
--- a/include/uimport.php
+++ b/include/uimport.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once("include/Photo.php");
 define("IMPORT_DEBUG", False);
@@ -104,7 +105,7 @@ function import_account(App $a, $file) {
 		notice(t('Error! Cannot check nickname'));
 		return;
 	}
-	if (dbm::is_result($r) > 0) {
+	if (DBM::is_result($r) > 0) {
 		notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
 		return;
 	}
@@ -115,7 +116,7 @@ function import_account(App $a, $file) {
 		notice(t('Error! Cannot check nickname'));
 		return;
 	}
-	if (dbm::is_result($r) > 0) {
+	if (DBM::is_result($r) > 0) {
 		notice(sprintf(t("User '%s' already exists on this server!"), $account['user']['nickname']));
 		return;
 	}
diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index e407466743..cd7a9366fb 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -2,6 +2,7 @@
 
 use Friendica\Core\Config;
 use Friendica\Network\Probe;
+use Friendica\Database\DBM;
 
 function update_gcontact_run(&$argv, &$argc) {
 	global $a;
@@ -21,7 +22,7 @@ function update_gcontact_run(&$argv, &$argc) {
 
 	$r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
diff --git a/include/user.php b/include/user.php
index 7eb1058dc0..be03637df9 100644
--- a/include/user.php
+++ b/include/user.php
@@ -2,6 +2,7 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/network.php');
 require_once('include/plugin.php');
@@ -125,7 +126,7 @@ function create_user($arr) {
 		$r = q("SELECT * FROM `user` WHERE `email` = '%s' LIMIT 1",
 			dbesc($email)
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$result['message'] .= t('Cannot use that email.') . EOL;
 	}
 
@@ -138,7 +139,7 @@ function create_user($arr) {
 		WHERE `nickname` = '%s' LIMIT 1",
 		dbesc($nickname)
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
 
 	// Check deleted accounts that had this nickname. Doesn't matter to us,
@@ -148,7 +149,7 @@ function create_user($arr) {
 		WHERE `username` = '%s' LIMIT 1",
 		dbesc($nickname)
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		$result['message'] .= t('Nickname was once registered here and may not be re-used. Please choose another.') . EOL;
 
 	if(strlen($result['message'])) {
@@ -201,7 +202,7 @@ function create_user($arr) {
 			dbesc($username),
 			dbesc($new_password_encoded)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$u = $r[0];
 			$newuid = intval($r[0]['uid']);
 		}
@@ -220,7 +221,7 @@ function create_user($arr) {
 		WHERE `nickname` = '%s' ",
 		dbesc($nickname)
 	);
-	if ((dbm::is_result($r)) && (count($r) > 1) && $newuid) {
+	if ((DBM::is_result($r)) && (count($r) > 1) && $newuid) {
 		$result['message'] .= t('Nickname is already registered. Please choose another.') . EOL;
 		dba::delete('user', array('uid' => $newuid));
 		return $result;
@@ -259,7 +260,7 @@ function create_user($arr) {
 			intval($newuid),
 			dbesc(t('Friends'))
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$def_gid = $r[0]['id'];
 
 			q("UPDATE `user` SET `def_gid` = %d WHERE `uid` = %d",
@@ -346,12 +347,12 @@ function user_create_self_contact($uid) {
 
 	// Only create the entry if it doesn't exist yet
 	$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self`", intval($uid));
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		return;
 	}
 
 	$r = q("SELECT `uid`, `username`, `nickname` FROM `user` WHERE `uid` = %d", intval($uid));
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
diff --git a/index.php b/index.php
index 2cd5e7cba5..5915498904 100644
--- a/index.php
+++ b/index.php
@@ -17,6 +17,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once 'boot.php';
 require_once 'object/BaseObject.php';
@@ -117,7 +118,7 @@ if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
 	// we didn't loaded user data yet, but we need user language
 	$r = dba::select('user', array('language'), array('uid' => $_SESSION['uid']), array('limit' => 1));
 	$_SESSION['language'] = $lang;
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$_SESSION['language'] = $r['language'];
 	}
 }
diff --git a/mod/admin.php b/mod/admin.php
index 005473070e..78e37afef6 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -10,6 +10,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once("include/enotify.php");
 require_once("include/text.php");
@@ -612,7 +613,7 @@ function admin_page_summary(App $a) {
 		dbesc(dba::database_name()));
 	$showwarning = false;
 	$warningtext = array();
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$showwarning = true;
 		$warningtext[] = sprintf(t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See <a href="%s">here</a> for a guide that may be helpful converting the table engines. You may also use the command <tt>php include/dbstructure.php toinnodb</tt> of your Friendica installation for an automatic conversion.<br />'), 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html');
 	}
@@ -1337,7 +1338,7 @@ function admin_page_dbsync(App $a) {
 
 	$failed = array();
 	$r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' ");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$upd = intval(substr($rr['k'],7));
 			if ($upd < 1139 || $rr['v'] === 'success') {
diff --git a/mod/allfriends.php b/mod/allfriends.php
index 8d849d3755..ce9e68f010 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/socgraph.php');
 require_once('include/Contact.php');
@@ -31,7 +32,7 @@ function allfriends_content(App $a) {
 		intval(local_user())
 	);
 
-	if (! dbm::is_result($c)) {
+	if (! DBM::is_result($c)) {
 		return;
 	}
 
@@ -45,7 +46,7 @@ function allfriends_content(App $a) {
 
 	$r = all_friends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		$o .= t('No friends to display.');
 		return $o;
 	}
diff --git a/mod/api.php b/mod/api.php
index beb7d71c42..cda97c729c 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once('include/api.php');
 
@@ -17,7 +18,7 @@ function oauth_get_client($request){
 			AND `tokens`.`id`='%s' AND `tokens`.`scope`='request'",
 			dbesc($token));
 
-	if (!dbm::is_result($r))
+	if (!DBM::is_result($r))
 		return null;
 
 	return $r[0];
diff --git a/mod/attach.php b/mod/attach.php
index 6155a3f99e..6dd9135e51 100644
--- a/mod/attach.php
+++ b/mod/attach.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 require_once('include/security.php');
 
@@ -18,7 +19,7 @@ function attach_init(App $a) {
 	$r = q("SELECT * FROM `attach` WHERE `id` = %d LIMIT 1",
 		intval($item_id)
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		notice( t('Item was not found.'). EOL);
 		return;
 	}
@@ -31,7 +32,7 @@ function attach_init(App $a) {
 		dbesc($item_id)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
diff --git a/mod/cal.php b/mod/cal.php
index 4f5bde5d58..1bfc8d95d9 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -10,6 +10,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/event.php');
 require_once('include/redir.php');
@@ -130,7 +131,7 @@ function cal_content(App $a) {
 			intval($contact_id),
 			intval($a->profile['profile_uid'])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact = $r[0];
 			$remote_contact = true;
 		}
@@ -225,7 +226,7 @@ function cal_content(App $a) {
 
 		$links = array();
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$r = sort_by_date($r);
 			foreach ($r as $rr) {
 				$j = (($rr['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$rr['start'], 'j') : datetime_convert('UTC','UTC',$rr['start'],'j'));
@@ -239,7 +240,7 @@ function cal_content(App $a) {
 		$events=array();
 
 		// transform the event in a usable array
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$r = sort_by_date($r);
 			$events = process_events($r);
 
diff --git a/mod/common.php b/mod/common.php
index 87e305e68d..12f1ba2737 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 require_once('include/socgraph.php');
 require_once('include/Contact.php');
@@ -34,14 +35,14 @@ function common_content(App $a) {
 			intval($cid),
 			intval($uid)
 		);
-		/// @TODO Handle $c with dbm::is_result()
+		/// @TODO Handle $c with DBM::is_result()
 		$a->page['aside'] = "";
 		profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
 	} else {
 		$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 			intval($uid)
 		);
-		/// @TODO Handle $c with dbm::is_result()
+		/// @TODO Handle $c with DBM::is_result()
 
 		$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
 			'$name' => htmlentities($c[0]['name']),
@@ -55,7 +56,7 @@ function common_content(App $a) {
 		$a->page['aside'] .= $vcard_widget;
 	}
 
-	if (! dbm::is_result($c)) {
+	if (! DBM::is_result($c)) {
 		return;
 	}
 
@@ -65,13 +66,13 @@ function common_content(App $a) {
 				dbesc(normalise_link(get_my_url())),
 				intval($profile_uid)
 			);
-			if (dbm::is_result($r))
+			if (DBM::is_result($r))
 				$cid = $r[0]['id'];
 			else {
 				$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
 					dbesc(normalise_link(get_my_url()))
 				);
-				if (dbm::is_result($r))
+				if (DBM::is_result($r))
 					$zcid = $r[0]['id'];
 			}
 		}
@@ -102,7 +103,7 @@ function common_content(App $a) {
 	}
 
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		return $o;
 	}
 
diff --git a/mod/community.php b/mod/community.php
index 83a2fdebf5..d428bddf8c 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 function community_init(App $a) {
 	if (! local_user()) {
@@ -45,7 +46,7 @@ function community_content(App $a, $update = 0) {
 
 	$r = community_getitems($a->pager['start'], $a->pager['itemspage']);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		info( t('No results.') . EOL);
 		return $o;
 	}
diff --git a/mod/contactgroup.php b/mod/contactgroup.php
index 2a44e28896..0c2d6a0cbe 100644
--- a/mod/contactgroup.php
+++ b/mod/contactgroup.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 require_once('include/group.php');
 
@@ -14,7 +15,7 @@ function contactgroup_content(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$change = intval($a->argv[2]);
 	}
 
@@ -24,7 +25,7 @@ function contactgroup_content(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			killme();
 		}
 
diff --git a/mod/contacts.php b/mod/contacts.php
index 66fbedebef..5c810b179a 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 
 require_once 'include/Contact.php';
@@ -24,7 +25,7 @@ function contacts_init(App $a) {
 			intval(local_user()),
 			intval($contact_id)
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			$contact_id = 0;
 		}
 	}
@@ -183,7 +184,7 @@ function contacts_post(App $a) {
 			intval($profile_id),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			notice( t('Could not locate selected profile.') . EOL);
 			return;
 		}
@@ -225,7 +226,7 @@ function contacts_post(App $a) {
 		intval($contact_id),
 		intval(local_user())
 	);
-	if($r && dbm::is_result($r))
+	if($r && DBM::is_result($r))
 		$a->data['contact'] = $r[0];
 
 	return;
@@ -352,7 +353,7 @@ function _contact_drop($contact_id, $orig_record) {
 		WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
 		intval($a->user['uid'])
 	);
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		return;
 	}
 
@@ -794,7 +795,7 @@ function contacts_content(App $a) {
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact`
 		WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
 		intval($_SESSION['uid']));
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$a->set_pager_total($r[0]['total']);
 		$total = $r[0]['total'];
 	}
@@ -809,7 +810,7 @@ function contacts_content(App $a) {
 
 	$contacts = array();
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$contacts[] = _contact_detail_for_template($rr);
 		}
diff --git a/mod/crepair.php b/mod/crepair.php
index cc930a2f3a..a73429e157 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once("include/contact_selectors.php");
 require_once("mod/contacts.php");
@@ -19,7 +20,7 @@ function crepair_init(App $a) {
 			intval(local_user()),
 			intval($contact_id)
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			$contact_id = 0;
 		}
 	}
@@ -48,7 +49,7 @@ function crepair_post(App $a) {
 		);
 	}
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		return;
 	}
 
@@ -116,7 +117,7 @@ function crepair_content(App $a) {
 		);
 	}
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		notice( t('Contact not found.') . EOL);
 		return;
 	}
diff --git a/mod/delegate.php b/mod/delegate.php
index 4bccf1142a..684ae19a8a 100644
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('mod/settings.php');
 
@@ -29,12 +30,12 @@ function delegate_content(App $a) {
 		$r = q("select `nickname` from user where uid = %d limit 1",
 			intval($id)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$r = q("select id from contact where uid = %d and nurl = '%s' limit 1",
 				intval(local_user()),
 				dbesc(normalise_link(System::baseUrl() . '/profile/' . $r[0]['nickname']))
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				dba::insert('manage', array('uid' => $a->argv[2], 'mid' => local_user()));
 			}
 		}
@@ -64,7 +65,7 @@ function delegate_content(App $a) {
 		dbesc($a->user['email']),
 		dbesc($a->user['password'])
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		$full_managers = $r;
 
 	$delegates = array();
@@ -75,7 +76,7 @@ function delegate_content(App $a) {
 		intval(local_user())
 	);
 
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		$delegates = $r;
 
 	$uids = array();
@@ -97,14 +98,14 @@ function delegate_content(App $a) {
 		dbesc(NETWORK_DFRN)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		notice( t('No potential page delegates located.') . EOL);
 		return;
 	}
 
 	$nicknames = array();
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'";
 		}
@@ -118,7 +119,7 @@ function delegate_content(App $a) {
 
 	$r = q("select `uid`, `username`, `nickname` from user where nickname in ( $nicks )");
 
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		foreach($r as $rr)
 			if(! in_array($rr['uid'],$uids))
 				$potentials[] = $rr;
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index e53abd2206..98bdfbe150 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -23,7 +23,9 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Protocol\Diaspora;
 
 require_once 'include/enotify.php';
 require_once 'include/group.php';
@@ -127,7 +129,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 			intval($uid)
 		);
 
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			logger('Contact not found in DB.');
 			notice( t('Contact not found.') . EOL );
 			notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL );
@@ -418,7 +420,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 			);
 		}
 
-		/// @TODO is dbm::is_result() working here?
+		/// @TODO is DBM::is_result() working here?
 		if ($r === false) {
 			notice( t('Unable to set contact photo.') . EOL);
 		}
@@ -428,7 +430,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 		$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 			intval($contact_id)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact = $r[0];
 		} else {
 			$contact = null;
@@ -438,7 +440,6 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 		if ((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND)) {
 
 			if (($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
-				require_once 'include/diaspora.php';
 				$ret = Diaspora::send_share($user[0],$r[0]);
 				logger('share returns: ' . $ret);
 			}
@@ -449,7 +450,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 				intval($uid)
 			);
 
-			if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) {
+			if((DBM::is_result($r)) && ($r[0]['hide-friends'] == 0) && ($activity) && (! $hidden)) {
 
 				require_once 'include/items.php';
 
@@ -560,7 +561,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
 			dbesc($node));
 
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			$message = sprintf(t('No user record found for \'%s\' '), $node);
 			xml_status(3,$message); // failure
 			// NOTREACHED
@@ -591,7 +592,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 			dbesc($decrypted_source_url),
 			intval($local_uid)
 		);
-		if (!dbm::is_result($ret)) {
+		if (!DBM::is_result($ret)) {
 			if (strstr($decrypted_source_url,'http:')) {
 				$newurl = str_replace('http:','https:',$decrypted_source_url);
 			} else {
@@ -602,7 +603,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 				dbesc($newurl),
 				intval($local_uid)
 			);
-			if (!dbm::is_result($ret)) {
+			if (!DBM::is_result($ret)) {
 				// this is either a bogus confirmation (?) or we deleted the original introduction.
 				$message = t('Contact record was not found for you on our site.');
 				xml_status(3,$message);
@@ -637,7 +638,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 		$r = q("SELECT * FROM `contact` WHERE `dfrn-id` = '%s' LIMIT 1",
 			dbesc($decrypted_dfrn_id)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$message = t('The ID provided by your system is a duplicate on our system. It should work if you try again.');
 			xml_status(1,$message); // Birthday paradox - duplicate dfrn-id
 			// NOTREACHED
@@ -648,7 +649,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 			dbesc($dfrn_pubkey),
 			intval($dfrn_record)
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			$message = t('Unable to set your contact credentials on our system.');
 			xml_status(3,$message);
 		}
@@ -669,7 +670,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 		$r = q("SELECT `photo` FROM `contact` WHERE `id` = %d LIMIT 1",
 			intval($dfrn_record));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$photo = $r[0]['photo'];
 		} else {
 			$photo = System::baseUrl() . '/images/person-175.jpg';
@@ -725,10 +726,10 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 			intval($dfrn_record)
 		);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$combined = $r[0];
 
-		if((dbm::is_result($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
+		if((DBM::is_result($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
 			$mutual = ($new_relation == CONTACT_IS_FRIEND);
 			notification(array(
 				'type'         => NOTIFY_CONFIRM,
@@ -753,7 +754,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
 				intval($local_uid)
 			);
 
-			if((dbm::is_result($r)) && ($r[0]['hide-friends'] == 0)) {
+			if((DBM::is_result($r)) && ($r[0]['hide-friends'] == 0)) {
 
 				require_once 'include/items.php';
 
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 5ff90d4851..e0e30a2488 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -8,9 +8,10 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Protocol\DFRN;
 
 require_once('include/items.php');
-require_once('include/dfrn.php');
 require_once('include/event.php');
 
 require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
@@ -46,7 +47,7 @@ function dfrn_notify_post(App $a) {
 		dbesc($dfrn_id),
 		dbesc($challenge)
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		logger('dfrn_notify: could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
 		xml_status(3, 'Could not match challenge');
 	}
@@ -94,7 +95,7 @@ function dfrn_notify_post(App $a) {
 		dbesc($a->argv[1])
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		logger('dfrn_notify: contact not found for dfrn_id ' . $dfrn_id);
 		xml_status(3, 'Contact not found');
 		//NOTREACHED
@@ -180,7 +181,7 @@ function dfrn_notify_post(App $a) {
 				 *we got a key. old code send only the key, without RINO version.
 				 * we assume RINO 1 if key and no RINO version
 				 */
-				$data = dfrn::aes_decrypt(hex2bin($data), $final_key);
+				$data = DFRN::aes_decrypt(hex2bin($data), $final_key);
 				break;
 			case 2:
 				try {
@@ -212,7 +213,7 @@ function dfrn_notify_post(App $a) {
 		logger('rino: decrypted data: ' . $data, LOGGER_DATA);
 	}
 
-	$ret = dfrn::import($data, $importer);
+	$ret = DFRN::import($data, $importer);
 	xml_status($ret, 'Processed');
 
 	// NOTREACHED
@@ -284,7 +285,7 @@ function dfrn_notify_content(App $a) {
 				dbesc($a->argv[1])
 		);
 
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			$status = 1;
 		}
 
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 2a5eff5667..0e967301eb 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -3,10 +3,11 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Protocol\DFRN;
 
 require_once('include/items.php');
 require_once('include/auth.php');
-require_once('include/dfrn.php');
 require_once('include/ostatus.php');
 
 function dfrn_poll_init(App $a) {
@@ -58,7 +59,7 @@ function dfrn_poll_init(App $a) {
 
 		logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
 		header("Content-type: application/atom+xml");
-		echo dfrn::feed('', $user,$last_update, 0, $hidewall);
+		echo DFRN::feed('', $user,$last_update, 0, $hidewall);
 		killme();
 	}
 
@@ -90,7 +91,7 @@ function dfrn_poll_init(App $a) {
 			dbesc($a->argv[1])
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			$s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
 
@@ -137,7 +138,7 @@ function dfrn_poll_init(App $a) {
 			$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
 				dbesc($sec)
 			);
-			if (! dbm::is_result($r)) {
+			if (! DBM::is_result($r)) {
 				xml_status(3, 'No ticket');
 				// NOTREACHED
 			}
@@ -148,7 +149,7 @@ function dfrn_poll_init(App $a) {
 			$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 				intval($r[0]['cid'])
 			);
-			if (! dbm::is_result($c)) {
+			if (! DBM::is_result($c)) {
 				xml_status(3, 'No profile');
 			}
 			$contact = $c[0];
@@ -201,7 +202,7 @@ function dfrn_poll_init(App $a) {
 			q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
 			$r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
 				dbesc($dfrn_id));
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				xml_status(1);
 				return; // NOTREACHED
 			}
@@ -234,7 +235,7 @@ function dfrn_poll_post(App $a) {
 			$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
 				dbesc($sec)
 			);
-			if (! dbm::is_result($r)) {
+			if (! DBM::is_result($r)) {
 				xml_status(3, 'No ticket');
 				// NOTREACHED
 			}
@@ -245,7 +246,7 @@ function dfrn_poll_post(App $a) {
 			$c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
 				intval($r[0]['cid'])
 			);
-			if (! dbm::is_result($c)) {
+			if (! DBM::is_result($c)) {
 				xml_status(3, 'No profile');
 			}
 			$contact = $c[0];
@@ -295,7 +296,7 @@ function dfrn_poll_post(App $a) {
 		dbesc($challenge)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		killme();
 	}
 
@@ -331,7 +332,7 @@ function dfrn_poll_post(App $a) {
 	$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
 
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		killme();
 	}
 
@@ -348,7 +349,7 @@ function dfrn_poll_post(App $a) {
 		$reputation = 0;
 		$text = '';
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$reputation = $r[0]['rating'];
 			$text = $r[0]['reason'];
 
@@ -387,7 +388,7 @@ function dfrn_poll_post(App $a) {
 		}
 
 		header("Content-type: application/atom+xml");
-		$o = dfrn::feed($dfrn_id, $a->argv[1], $last_update, $direction);
+		$o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
 		echo $o;
 		killme();
 
@@ -461,7 +462,7 @@ function dfrn_poll_content(App $a) {
 			dbesc($nickname)
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			$challenge = '';
 			$encrypted_id = '';
@@ -508,7 +509,7 @@ function dfrn_poll_content(App $a) {
 				));
 			}
 
-			$profile = ((dbm::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
+			$profile = ((DBM::is_result($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
 
 			switch($destination_url) {
 				case 'profile':
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index de48207a64..39b212fbdd 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -16,6 +16,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 
 require_once 'include/enotify.php';
@@ -95,7 +96,7 @@ function dfrn_request_post(App $a) {
 					dbesc(normalise_link($dfrn_url))
 				);
 
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					if(strlen($r[0]['dfrn-id'])) {
 
 						/*
@@ -149,7 +150,7 @@ function dfrn_request_post(App $a) {
 					$photo = $parms["photo"];
 
 					// Escape the entire array
-					dbm::esc_array($parms);
+					DBM::esc_array($parms);
 
 					/*
 					 * Create a contact record on our site for the other person
@@ -189,7 +190,7 @@ function dfrn_request_post(App $a) {
 					dbesc($dfrn_url),
 					$parms['key'] // this was already escaped
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$def_gid = get_default_group(local_user(), $r[0]["network"]);
 					if(intval($def_gid))
 						group_add_member(local_user(), '', $r[0]['id'], $def_gid);
@@ -280,7 +281,7 @@ function dfrn_request_post(App $a) {
 				dbesc(datetime_convert('UTC','UTC','now - 24 hours')),
 				intval($uid)
 			);
-			if (dbm::is_result($r) && count($r) > $maxreq) {
+			if (DBM::is_result($r) && count($r) > $maxreq) {
 				notice( sprintf( t('%s has received too many connection requests today.'),  $a->profile['name']) . EOL);
 				notice( t('Spam protection measures have been invoked.') . EOL);
 				notice( t('Friends are advised to please try again in 24 hours.') . EOL);
@@ -302,7 +303,7 @@ function dfrn_request_post(App $a) {
 			AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ",
 			dbesc(NETWORK_MAIL2)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				if(! $rr['rel']) {
 					q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
@@ -327,7 +328,7 @@ function dfrn_request_post(App $a) {
 			AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ",
 			dbesc(NETWORK_MAIL2)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				if(! $rr['rel']) {
 					q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
@@ -378,7 +379,7 @@ function dfrn_request_post(App $a) {
 					intval($uid)
 				);
 
-				if (! dbm::is_result($r)) {
+				if (! DBM::is_result($r)) {
 					notice( t('This account has not been configured for email. Request failed.') . EOL);
 					return;
 				}
@@ -405,7 +406,7 @@ function dfrn_request_post(App $a) {
 				dbesc($poll),
 				intval($uid)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$contact_id = $r[0]['id'];
 
 				$def_gid = get_default_group($uid, $r[0]["network"]);
@@ -480,7 +481,7 @@ function dfrn_request_post(App $a) {
 				dbesc($url)
 			);
 
-			if (dbm::is_result($ret)) {
+			if (DBM::is_result($ret)) {
 				if(strlen($ret[0]['issued-id'])) {
 					notice( t('You have already introduced yourself here.') . EOL );
 					return;
@@ -552,7 +553,7 @@ function dfrn_request_post(App $a) {
 				$parms['issued-id'] = $issued_id;
 				$photo = $parms["photo"];
 
-				dbm::esc_array($parms);
+				DBM::esc_array($parms);
 				$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
 					`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `blocked`, `pending` )
 					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",
@@ -584,7 +585,7 @@ function dfrn_request_post(App $a) {
 						$parms['url'],
 						$parms['issued-id']
 					);
-					if (dbm::is_result($r)) {
+					if (DBM::is_result($r)) {
 						$contact_record = $r[0];
 						update_contact_avatar($photo, $uid, $contact_record["id"], true);
 					}
@@ -735,7 +736,7 @@ function dfrn_request_content(App $a) {
 			dbesc($_GET['confirm_key'])
 		);
 
-		if (dbm::is_result($intro)) {
+		if (DBM::is_result($intro)) {
 
 			$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
 				WHERE `contact`.`id` = %d LIMIT 1",
@@ -744,7 +745,7 @@ function dfrn_request_content(App $a) {
 
 			$auto_confirm = false;
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
 					$auto_confirm = true;
 
@@ -861,7 +862,7 @@ function dfrn_request_content(App $a) {
 			$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 				intval($a->profile['uid'])
 			);
-			if (! dbm::is_result($r)) {
+			if (! DBM::is_result($r)) {
 				$mail_disabled = 1;
 			}
 		}
diff --git a/mod/directory.php b/mod/directory.php
index 98afad77cf..b32a58b359 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 function directory_init(App $a) {
 	$a->set_pager_itemspage(60);
@@ -73,7 +74,7 @@ function directory_content(App $a) {
 	$r = q("SELECT COUNT(*) AS `total` FROM `profile`
 			LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ");
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		$a->set_pager_total($r[0]['total']);
 
 	$order = " ORDER BY `name` ASC ";
@@ -85,7 +86,7 @@ function directory_content(App $a) {
 			LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
 			WHERE `is-default` $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 
 		if (in_array('small', $a->argv)) {
 			$photo = 'thumb';
diff --git a/mod/dirfind.php b/mod/dirfind.php
index da2f1396ef..5d65813e3c 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -105,7 +105,7 @@ function dirfind_content(App $a, $prefix = "") {
 
 			$search2 = "%".$search."%";
 
-			/// @TODO These 2 SELECTs are not checked on validity with dbm::is_result()
+			/// @TODO These 2 SELECTs are not checked on validity with DBM::is_result()
 			$count = q("SELECT count(*) AS `total` FROM `gcontact`
 					LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
 						AND `contact`.`network` = `gcontact`.`network`
diff --git a/mod/display.php b/mod/display.php
index d2ee12c570..570582343a 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -3,8 +3,8 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
-
-require_once('include/dfrn.php');
+use Friendica\Database\DBM;
+use Friendica\Protocol\DFRN;
 
 function display_init(App $a) {
 
@@ -41,14 +41,14 @@ function display_init(App $a) {
 						`author-avatar`, `network`, `body`, `uid`, `owner-link`
 				FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
 					AND `guid` = ? AND `uid` = ? LIMIT 1", $a->argv[1], local_user());
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$nick = $a->user["nickname"];
 				$itemuid = local_user();
 			}
 		}
 
 		// Is it an item with uid=0?
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			$r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`,
 						`author-avatar`, `network`, `body`, `uid`, `owner-link`
 				FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated`
@@ -59,7 +59,7 @@ function display_init(App $a) {
 		}
 
 		// Or is it anywhere on the server?
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			$r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
 				`item`.`author-avatar`, `item`.`network`, `item`.`body`, `item`.`uid`, `item`.`owner-link`
 				FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
@@ -70,7 +70,7 @@ function display_init(App $a) {
 					AND `item`.`guid` = ? LIMIT 1", $a->argv[1]);
 		}
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
 				logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG);
@@ -94,7 +94,7 @@ function display_init(App $a) {
 						WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
 						$nickname
 					);
-					if (dbm::is_result($r)) {
+					if (DBM::is_result($r)) {
 						$profiledata = $r;
 					}
 					$profiledata["network"] = NETWORK_DFRN;
@@ -230,7 +230,7 @@ function display_content(App $a, $update = 0) {
 				$r = dba::fetch_first("SELECT `id`, `parent` FROM `item`
 					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 						AND `guid` = ? AND `uid` = ?", $a->argv[1], local_user());
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$item_id = $r["id"];
 					$item_parent = $r["parent"];
 					$nick = $a->user["nickname"];
@@ -244,7 +244,7 @@ function display_content(App $a, $update = 0) {
 						AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 						AND NOT `item`.`private` AND NOT `user`.`hidewall`
 						AND `item`.`guid` = ?", $a->argv[1]);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$item_id = $r["id"];
 					$item_parent = $r["parent"];
 					$nick = $r["nickname"];
@@ -257,7 +257,7 @@ function display_content(App $a, $update = 0) {
 						AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 						AND NOT `item`.`private` AND `item`.`uid` = 0
 						AND `item`.`guid` = ?", $a->argv[1]);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$item_id = $r["id"];
 					$item_parent = $r["parent"];
 				}
@@ -267,7 +267,7 @@ function display_content(App $a, $update = 0) {
 
 	if ($item_id && !is_numeric($item_id)) {
 		$r = dba::select('item', array('id', 'parent'), array('uri' => $item_id, 'uid' => $a->profile['uid']), array('limit' => 1));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$item_id = $r["id"];
 			$item_parent = $r["parent"];
 		} else {
@@ -317,7 +317,7 @@ function display_content(App $a, $update = 0) {
 			$contact_id,
 			$a->profile['uid']
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact = $r;
 			$remote_contact = true;
 		}
@@ -331,7 +331,7 @@ function display_content(App $a, $update = 0) {
 	}
 
 	$r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $a->profile['uid']);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$a->page_contact = $r;
 	}
 	$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
@@ -380,7 +380,7 @@ function display_content(App $a, $update = 0) {
 		$item_id
 	);
 
-	if (!dbm::is_result($r) && local_user()) {
+	if (!DBM::is_result($r) && local_user()) {
 		// Check if this is another person's link to a post that we have
 		$r = dba::fetch_first("SELECT `item`.uri FROM `item`
 			WHERE (`item`.`id` = ? OR `item`.`uri` = ?)
@@ -388,7 +388,7 @@ function display_content(App $a, $update = 0) {
 			$item_id,
 			$item_id
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$item_uri = $r['uri'];
 
 			$r = dba::p(item_query()." AND `item`.`uid` = ?
@@ -401,12 +401,12 @@ function display_content(App $a, $update = 0) {
 		}
 	}
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$s = dba::inArray($r);
 
 		if ((local_user()) && (local_user() == $a->profile['uid'])) {
 			$unseen = dba::select('item', array('id'), array('parent' => $s[0]['parent'], 'unseen' => true), array('limit' => 1));
-			if (dbm::is_result($unseen)) {
+			if (DBM::is_result($unseen)) {
 				dba::update('item', array('unseen' => false), array('parent' => $s[0]['parent'], 'unseen' => true));
 			}
 		}
@@ -478,7 +478,7 @@ function display_content(App $a, $update = 0) {
 		$item_id,
 		$item_id
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		if ($r['deleted']) {
 			notice(t('Item has been removed.') . EOL);
 		} else {
@@ -492,7 +492,7 @@ function display_content(App $a, $update = 0) {
 }
 
 function displayShowFeed($item_id, $conversation) {
-	$xml = dfrn::itemFeed($item_id, $conversation);
+	$xml = DFRN::itemFeed($item_id, $conversation);
 	if ($xml == '') {
 		http_status_exit(500);
 	}
diff --git a/mod/editpost.php b/mod/editpost.php
index cdeb7966e3..57c9339047 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/acl_selectors.php');
 
@@ -27,7 +28,7 @@ function editpost_content(App $a) {
 		intval(local_user())
 	);
 
-	if (! dbm::is_result($itm)) {
+	if (! DBM::is_result($itm)) {
 		notice( t('Item not found') . EOL);
 		return;
 	}
@@ -72,7 +73,7 @@ function editpost_content(App $a) {
 		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$mail_enabled = true;
 			if(intval($r[0]['pubmail']))
 				$pubmail_enabled = true;
diff --git a/mod/events.php b/mod/events.php
index 056a584e56..b72c8f1884 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -8,6 +8,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once 'include/bbcode.php';
 require_once 'include/datetime.php';
@@ -339,7 +340,7 @@ function events_content(App $a) {
 
 		$links = array();
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$r = sort_by_date($r);
 			foreach ($r as $rr) {
 				$j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j'));
@@ -352,7 +353,7 @@ function events_content(App $a) {
 		$events = array();
 
 		// transform the event in a usable array
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$r = sort_by_date($r);
 			$events = process_events($r);
 		}
@@ -410,7 +411,7 @@ function events_content(App $a) {
 			intval($event_id),
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$orig_event = $r[0];
 		}
 	}
@@ -545,7 +546,7 @@ function events_content(App $a) {
 		$ev = event_by_id(local_user(), $params);
 
 		// Delete only real events (no birthdays)
-		if (dbm::is_result($ev) && $ev[0]['type'] == 'event') {
+		if (DBM::is_result($ev) && $ev[0]['type'] == 'event') {
 			$del = drop_item($ev[0]['itemid'], false);
 		}
 
diff --git a/mod/fetch.php b/mod/fetch.php
index 30c38bf543..9587afbf0e 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -5,9 +5,9 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Protocol\Diaspora;
 
 require_once("include/crypto.php");
-require_once("include/diaspora.php");
 require_once("include/xml.php");
 
 function fetch_init(App $a) {
diff --git a/mod/friendica.php b/mod/friendica.php
index a617c101dc..36fb18c0ac 100644
--- a/mod/friendica.php
+++ b/mod/friendica.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 function friendica_init(App $a) {
 	if ($a->argv[1] == "json"){
@@ -27,7 +28,7 @@ function friendica_init(App $a) {
 		$visible_plugins = array();
 		if (is_array($a->plugins) && count($a->plugins)) {
 			$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				foreach($r as $rr) {
 					$visible_plugins[] = $rr['name'];
 				}
@@ -85,7 +86,7 @@ function friendica_content(App $a) {
 	$visible_plugins = array();
 	if (is_array($a->plugins) && count($a->plugins)) {
 		$r = q("SELECT * FROM `addon` WHERE `hidden` = 0");
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach($r as $rr) {
 				$visible_plugins[] = $rr['name'];
 			}
diff --git a/mod/fsuggest.php b/mod/fsuggest.php
index efaf100efc..124abd464b 100644
--- a/mod/fsuggest.php
+++ b/mod/fsuggest.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 function fsuggest_post(App $a) {
 
@@ -19,7 +20,7 @@ function fsuggest_post(App $a) {
 		intval($contact_id),
 		intval(local_user())
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		notice( t('Contact not found.') . EOL);
 		return;
 	}
@@ -36,7 +37,7 @@ function fsuggest_post(App $a) {
 			intval($new_contact),
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			$x = q("INSERT INTO `fsuggest` ( `uid`,`cid`,`name`,`url`,`request`,`photo`,`note`,`created`)
 				VALUES ( %d, %d, '%s','%s','%s','%s','%s','%s')",
@@ -53,7 +54,7 @@ function fsuggest_post(App $a) {
 				dbesc($hash),
 				intval(local_user())
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$fsuggest_id = $r[0]['id'];
 				q("UPDATE `fsuggest` SET `note` = '%s' WHERE `id` = %d AND `uid` = %d",
 					dbesc($note),
@@ -91,7 +92,7 @@ function fsuggest_content(App $a) {
 		intval($contact_id),
 		intval(local_user())
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		notice( t('Contact not found.') . EOL);
 		return;
 	}
diff --git a/mod/group.php b/mod/group.php
index 5d624e90e4..4b64964cc6 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -9,6 +9,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function group_init(App $a) {
 	if (local_user()) {
@@ -49,7 +50,7 @@ function group_post(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			notice(t('Group not found.') . EOL);
 			goaway(System::baseUrl() . '/contacts');
 			return; // NOTREACHED
@@ -116,7 +117,7 @@ function group_content(App $a) {
 
 			$result = null;
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$result = group_rmv(local_user(), $r[0]['name']);
 			}
 
@@ -137,7 +138,7 @@ function group_content(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$change = intval($a->argv[2]);
 		}
 	}
@@ -151,7 +152,7 @@ function group_content(App $a) {
 			intval(local_user())
 		);
 
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			notice(t('Group not found.') . EOL);
 			goaway(System::baseUrl() . '/contacts');
 		}
@@ -240,7 +241,7 @@ function group_content(App $a) {
 		intval(local_user())
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		// Format the data of the contacts who aren't in the contact group
 		foreach ($r as $member) {
 			if (! in_array($member['id'], $preselected)) {
diff --git a/mod/ignored.php b/mod/ignored.php
index 5c304c2950..9931a556a6 100644
--- a/mod/ignored.php
+++ b/mod/ignored.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function ignored_init(App $a) {
 
@@ -21,7 +22,7 @@ function ignored_init(App $a) {
 		intval(local_user()),
 		intval($message_id)
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		killme();
 	}
 
diff --git a/mod/install.php b/mod/install.php
index ed75e624b5..2d0362c952 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once "include/Photo.php";
 
@@ -133,7 +134,7 @@ function install_content(App $a) {
 
 	if (dba::$connected) {
 		$r = q("SELECT COUNT(*) as `total` FROM `user`");
-		if (dbm::is_result($r) && $r[0]['total']) {
+		if (DBM::is_result($r) && $r[0]['total']) {
 			$tpl = get_markup_template('install.tpl');
 			return replace_macros($tpl, array(
 				'$title' => $install_title,
diff --git a/mod/item.php b/mod/item.php
index 51488fa728..587bd90ced 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -19,7 +19,9 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Protocol\Diaspora;
 
 require_once 'include/crypto.php';
 require_once 'include/enotify.php';
@@ -29,7 +31,6 @@ require_once 'include/files.php';
 require_once 'include/threads.php';
 require_once 'include/text.php';
 require_once 'include/items.php';
-require_once 'include/diaspora.php';
 require_once 'include/Contact.php';
 
 function item_post(App $a) {
@@ -107,7 +108,7 @@ function item_post(App $a) {
 		}
 
 		// if this isn't the real parent of the conversation, find it
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$parid = $r[0]['parent'];
 			$parent_uri = $r[0]['uri'];
 			if ($r[0]['id'] != $r[0]['parent']) {
@@ -117,7 +118,7 @@ function item_post(App $a) {
 			}
 		}
 
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			notice( t('Unable to locate original post.') . EOL);
 			if (x($_REQUEST, 'return')) {
 				goaway($return_path);
@@ -136,13 +137,13 @@ function item_post(App $a) {
 				intval($parent_item['contact-id']),
 				intval($uid)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$parent_contact = $r[0];
 			}
 
 			// If the contact id doesn't fit with the contact, then set the contact to null
 			$thrparent = q("SELECT `author-link`, `network` FROM `item` WHERE `uri` = '%s' LIMIT 1", dbesc($thr_parent));
-			if (dbm::is_result($thrparent) && ($thrparent[0]["network"] === NETWORK_OSTATUS)
+			if (DBM::is_result($thrparent) && ($thrparent[0]["network"] === NETWORK_OSTATUS)
 				&& (normalise_link($parent_contact["url"]) != normalise_link($thrparent[0]["author-link"]))) {
 				$parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]);
 
@@ -184,7 +185,7 @@ function item_post(App $a) {
 			intval($profile_uid)
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG);
 			return;
 		}
@@ -226,7 +227,7 @@ function item_post(App $a) {
 			intval($profile_uid),
 			intval($post_id)
 		);
-		if (! dbm::is_result($i)) {
+		if (! DBM::is_result($i)) {
 			killme();
 		}
 		$orig_post = $i[0];
@@ -237,7 +238,7 @@ function item_post(App $a) {
 	$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
 		intval($profile_uid)
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$user = $r[0];
 	}
 
@@ -335,7 +336,7 @@ function item_post(App $a) {
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1",
 					intval(local_user())
 				);
-				if (dbm::is_result($r) && intval($r[0]['pubmail'])) {
+				if (DBM::is_result($r) && intval($r[0]['pubmail'])) {
 					$pubmail_enabled = true;
 				}
 			}
@@ -392,7 +393,7 @@ function item_post(App $a) {
 		}
 	}
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$author = $r[0];
 		$contact_id = $author['id'];
 	}
@@ -405,7 +406,7 @@ function item_post(App $a) {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
 			intval($profile_uid)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact_record = $r[0];
 		}
 	}
@@ -456,7 +457,7 @@ function item_post(App $a) {
 					intval($profile_uid)
 				);
 
-				if (! dbm::is_result($r)) {
+				if (! DBM::is_result($r)) {
 					continue;
 				}
 
@@ -488,7 +489,7 @@ function item_post(App $a) {
 					intval($profile_uid),
 					intval($attach)
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$r = q("UPDATE `attach` SET `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s'
 						WHERE `uid` = %d AND `id` = %d",
 						dbesc($str_contact_allow),
@@ -558,7 +559,7 @@ function item_post(App $a) {
 		$toplevel_parent = q("SELECT `contact`.* FROM `contact`
 						INNER JOIN `item` ON `item`.`contact-id` = `contact`.`id` AND `contact`.`url` = `item`.`author-link`
 						WHERE `item`.`id` = `item`.`parent` AND `item`.`parent` = %d", intval($parent));
-		if (dbm::is_result($toplevel_parent)) {
+		if (DBM::is_result($toplevel_parent)) {
 			if (!empty($toplevel_parent[0]['addr'])) {
 				$toplevel_contact = '@' . $toplevel_parent[0]['addr'];
 			} else {
@@ -651,7 +652,7 @@ function item_post(App $a) {
 				intval($profile_uid),
 				intval($mtch)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				if (strlen($attachments)) {
 					$attachments .= ',';
 				}
@@ -760,7 +761,7 @@ function item_post(App $a) {
 	$datarray['protocol'] = PROTOCOL_DFRN;
 
 	$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $datarray['parent-uri']);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		if ($r['conversation-uri'] != '') {
 			$datarray['conversation-uri'] = $r['conversation-uri'];
 		}
@@ -919,7 +920,7 @@ function item_post(App $a) {
 		intval($datarray['visible'])
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$post_id = dba::lastInsertId();
 	} else {
 		logger('mod_item: unable to create post.');
@@ -1157,11 +1158,11 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 
 				$r = q("SELECT `alias`, `name` FROM `contact` WHERE `nurl` = '%s' AND `alias` != '' AND `uid` = 0",
 					normalise_link($matches[1]));
-				if (!dbm::is_result($r)) {
+				if (!DBM::is_result($r)) {
 					$r = q("SELECT `alias`, `name` FROM `gcontact` WHERE `nurl` = '%s' AND `alias` != ''",
 						normalise_link($matches[1]));
 				}
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$data = $r[0];
 				} else {
 					$data = Probe::uri($matches[1]);
@@ -1204,7 +1205,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			);
 
 			// Then check in the contact table for the url
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify`, `forum`, `prv` FROM `contact`
 					WHERE `nurl` = '%s' AND `uid` = %d AND
 						(`network` != '%s' OR (`notify` != '' AND `alias` != ''))
@@ -1216,7 +1217,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			}
 
 			// Then check in the global contacts for the address
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				$r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact`
 					WHERE `addr` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
 					LIMIT 1",
@@ -1226,7 +1227,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			}
 
 			// Then check in the global contacts for the url
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				$r = q("SELECT `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `gcontact`
 					WHERE `nurl` = '%s' AND (`network` != '%s' OR (`notify` != '' AND `alias` != ''))
 					LIMIT 1",
@@ -1235,7 +1236,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 				);
 			}
 
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				$probed = Probe::uri($name);
 				if ($result['network'] != NETWORK_PHANTOM) {
 					update_gcontact($probed);
@@ -1256,7 +1257,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			}
 
 			// select someone by attag or nick and the name passed in the current network
-			if(!dbm::is_result($r) && ($network != ""))
+			if(!DBM::is_result($r) && ($network != ""))
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `network` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
 						dbesc($name),
 						dbesc($name),
@@ -1265,7 +1266,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 				);
 
 			//select someone from this user's contacts by name in the current network
-			if (!dbm::is_result($r) && ($network != "")) {
+			if (!DBM::is_result($r) && ($network != "")) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `network` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($name),
 						dbesc($network),
@@ -1274,7 +1275,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			}
 
 			// select someone by attag or nick and the name passed in
-			if(!dbm::is_result($r)) {
+			if(!DBM::is_result($r)) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
 						dbesc($name),
 						dbesc($name),
@@ -1283,7 +1284,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			}
 
 			// select someone from this user's contacts by name
-			if(!dbm::is_result($r)) {
+			if(!DBM::is_result($r)) {
 				$r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network` FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($name),
 						intval($profile_uid)
@@ -1291,7 +1292,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n
 			}
 		}
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			if (strlen($inform) && (isset($r[0]["notify"]) || isset($r[0]["id"]))) {
 				$inform .= ',';
 			}
diff --git a/mod/lockview.php b/mod/lockview.php
index 48227cc1ea..a8cccd955c 100644
--- a/mod/lockview.php
+++ b/mod/lockview.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 function lockview_content(App $a) {
 
@@ -22,7 +23,7 @@ function lockview_content(App $a) {
 		dbesc($type),
 		intval($item_id)
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		killme();
 	}
 	$item = $r[0];
@@ -54,7 +55,7 @@ function lockview_content(App $a) {
 		$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
 			dbesc(implode(', ', $allowed_groups))
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			foreach($r as $rr)
 				$l[] = '<b>' . $rr['name'] . '</b>';
 	}
@@ -62,7 +63,7 @@ function lockview_content(App $a) {
 		$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
 			dbesc(implode(', ',$allowed_users))
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			foreach($r as $rr)
 				$l[] = $rr['name'];
 
@@ -72,7 +73,7 @@ function lockview_content(App $a) {
 		$r = q("SELECT `name` FROM `group` WHERE `id` IN ( %s )",
 			dbesc(implode(', ', $deny_groups))
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			foreach($r as $rr)
 				$l[] = '<b><strike>' . $rr['name'] . '</strike></b>';
 	}
@@ -80,7 +81,7 @@ function lockview_content(App $a) {
 		$r = q("SELECT `name` FROM `contact` WHERE `id` IN ( %s )",
 			dbesc(implode(', ',$deny_users))
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			foreach($r as $rr)
 				$l[] = '<strike>' . $rr['name'] . '</strike>';
 
diff --git a/mod/lostpass.php b/mod/lostpass.php
index e7e1a33bd0..1a30effd4e 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/email.php');
 require_once('include/enotify.php');
@@ -18,7 +19,7 @@ function lostpass_post(App $a) {
 		dbesc($loginame)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		notice( t('No valid account found.') . EOL);
 		goaway(System::baseUrl());
 	}
@@ -90,7 +91,7 @@ function lostpass_content(App $a) {
 		$r = q("SELECT * FROM `user` WHERE `pwdreset` = '%s' LIMIT 1",
 			dbesc($hash)
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			$o =  t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.");
 			return $o;
 		}
@@ -106,7 +107,7 @@ function lostpass_content(App $a) {
 			intval($uid)
 		);
 
-		/// @TODO Is dbm::is_result() okay here?
+		/// @TODO Is DBM::is_result() okay here?
 		if ($r) {
 			$tpl = get_markup_template('pwdreset.tpl');
 			$o .= replace_macros($tpl,array(
diff --git a/mod/manage.php b/mod/manage.php
index 04ead0bb72..72de332fc7 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once("include/text.php");
 
@@ -18,7 +19,7 @@ function manage_post(App $a) {
 		$r = q("select * from user where uid = %d limit 1",
 			intval($_SESSION['submanage'])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$uid = intval($r[0]['uid']);
 			$orig_record = $r[0];
 		}
@@ -38,7 +39,7 @@ function manage_post(App $a) {
 	$limited_id = 0;
 	$original_id = $uid;
 
-	if (dbm::is_result($submanage)) {
+	if (DBM::is_result($submanage)) {
 		foreach ($submanage as $m) {
 			if ($identity == $m['mid']) {
 				$limited_id = $m['mid'];
@@ -59,7 +60,7 @@ function manage_post(App $a) {
 		);
 	}
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		return;
 	}
 
@@ -128,21 +129,21 @@ function manage_content(App $a) {
 		$r = q("SELECT DISTINCT(`parent`) FROM `notify` WHERE `uid` = %d AND NOT `seen` AND NOT (`type` IN (%d, %d))",
 			intval($id['uid']), intval(NOTIFY_INTRO), intval(NOTIFY_MAIL));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$notifications = sizeof($r);
 		}
 
 		$r = q("SELECT DISTINCT(`convid`) FROM `mail` WHERE `uid` = %d AND NOT `seen`",
 			intval($id['uid']));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$notifications = $notifications + sizeof($r);
 		}
 
 		$r = q("SELECT COUNT(*) AS `introductions` FROM `intro` WHERE NOT `blocked` AND NOT `ignore` AND `uid` = %d",
 			intval($id['uid']));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$notifications = $notifications + $r[0]["introductions"];
 		}
 
diff --git a/mod/match.php b/mod/match.php
index f268fbc8a4..2824e6b71d 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/text.php');
 require_once('include/socgraph.php');
@@ -33,7 +34,7 @@ function match_content(App $a) {
 	$r = q("SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
 		intval(local_user())
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		return;
 	}
 	if(! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
diff --git a/mod/message.php b/mod/message.php
index f358ba975a..50ceec704d 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/acl_selectors.php');
 require_once('include/message.php');
@@ -231,7 +232,7 @@ function message_content(App $a) {
 				intval($a->argv[2]),
 				intval(local_user())
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$parent = $r[0]['parent-uri'];
 				$convid = $r[0]['convid'];
 
@@ -288,21 +289,21 @@ function message_content(App $a) {
 				intval(local_user()),
 				intval($a->argv[2])
 			);
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
 					intval(local_user()),
 					dbesc(normalise_link(base64_decode($a->argv[2])))
 				);
 			}
 
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				$r = q("SELECT `name`, `url`, `id` FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
 					intval(local_user()),
 					dbesc(base64_decode($a->argv[2]))
 				);
 			}
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$prename = $r[0]['name'];
 				$preurl = $r[0]['url'];
 				$preid = $r[0]['id'];
@@ -354,13 +355,13 @@ function message_content(App $a) {
 			intval(local_user())
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$a->set_pager_total($r[0]['total']);
 		}
 
 		$r = get_messages(local_user(), $a->pager['start'], $a->pager['itemspage']);
 
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			info( t('No messages.') . EOL);
 			return $o;
 		}
@@ -382,7 +383,7 @@ function message_content(App $a) {
 			intval(local_user()),
 			intval($a->argv[1])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact_id = $r[0]['contact-id'];
 			$convid = $r[0]['convid'];
 
diff --git a/mod/modexp.php b/mod/modexp.php
index 3c5d1e3581..f64df0f9cb 100644
--- a/mod/modexp.php
+++ b/mod/modexp.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 require_once('library/asn1.php');
 
@@ -14,7 +15,7 @@ function modexp_init(App $a) {
 			dbesc($nick)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		killme();
 	}
 
diff --git a/mod/mood.php b/mod/mood.php
index 26eb736d19..084750ef80 100644
--- a/mod/mood.php
+++ b/mod/mood.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
@@ -40,7 +41,7 @@ function mood_init(App $a) {
 			intval($parent),
 			intval($uid)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$parent_uri = $r[0]['uri'];
 			$private    = $r[0]['private'];
 			$allow_cid  = $r[0]['allow_cid'];
diff --git a/mod/msearch.php b/mod/msearch.php
index 675a94fe39..a652bc8ed8 100644
--- a/mod/msearch.php
+++ b/mod/msearch.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function msearch_post(App $a) {
 
@@ -17,7 +18,7 @@ function msearch_post(App $a) {
 		dbesc($search)
 	);
 
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		$total = $r[0]['total'];
 
 	$results = array();
@@ -28,7 +29,7 @@ function msearch_post(App $a) {
 		intval($perpage)
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach($r as $rr)
 			$results[] = array(
 				'name' => $rr['name'],
diff --git a/mod/network.php b/mod/network.php
index e09fdd8fec..662c306f59 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 require_once 'include/conversation.php';
 require_once 'include/group.php';
@@ -497,9 +498,9 @@ function networkThreadedView(App $a, $update = 0) {
 	$rawmode = (isset($_GET["mode"]) AND ($_GET["mode"] == "raw"));
 
 	if (isset($_GET["last_received"]) && isset($_GET["last_commented"]) && isset($_GET["last_created"]) && isset($_GET["last_id"])) {
-		$last_received = dbm::date($_GET["last_received"]);
-		$last_commented = dbm::date($_GET["last_commented"]);
-		$last_created = dbm::date($_GET["last_created"]);
+		$last_received = DBM::date($_GET["last_received"]);
+		$last_commented = DBM::date($_GET["last_commented"]);
+		$last_created = DBM::date($_GET["last_created"]);
 		$last_id = intval($_GET["last_id"]);
 	} else {
 		$last_received = '';
@@ -575,7 +576,7 @@ function networkThreadedView(App $a, $update = 0) {
 			// If $cid belongs to a communitity forum or a privat goup,.add a mention to the status editor
 			$condition = array("`id` = ? AND (`forum` OR `prv`)", $cid);
 			$contact = dba::select('contact', array('addr', 'nick'), $condition, array('limit' => 1));
-			if (dbm::is_result($contact)) {
+			if (DBM::is_result($contact)) {
 				if ($contact["addr"] != '') {
 					$content = "!".$contact["addr"];
 				} else {
@@ -628,7 +629,7 @@ function networkThreadedView(App $a, $update = 0) {
 
 	if ($group) {
 		$r = dba::select('group', array('name'), array('id' => $group, 'uid' => $_SESSION['uid']), array('limit' => 1));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			if ($update)
 				killme();
 			notice(t('No such group') . EOL);
@@ -643,7 +644,7 @@ function networkThreadedView(App $a, $update = 0) {
 
 			$contact_str = implode(',',$contacts);
 			$self = dba::select('contact', array('id'), array('uid' => $_SESSION['uid'], 'self' => true), array('limit' => 1));
-			if (dbm::is_result($self)) {
+			if (DBM::is_result($self)) {
 				$contact_str_self = $self["id"];
 			}
 
@@ -664,7 +665,7 @@ function networkThreadedView(App $a, $update = 0) {
 				'forum', 'prv', 'contact-type', 'addr', 'thumb', 'location');
 		$condition = array("`id` = ? AND (NOT `blocked` OR `pending`)", $cid);
 		$r = dba::select('contact', $fields, $condition, array('limit' => 1));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$sql_extra = " AND ".$sql_table.".`contact-id` = ".intval($cid);
 
 			$entries[0] = array(
@@ -808,7 +809,7 @@ function networkThreadedView(App $a, $update = 0) {
 	$parents_str = '';
 	$date_offset = "";
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			if (!in_array($rr['item_id'],$parents_arr)) {
 				$parents_arr[] = $rr['item_id'];
@@ -835,7 +836,7 @@ function networkThreadedView(App $a, $update = 0) {
 				$parents
 			);
 
-			if (dbm::is_result($thread_items)) {
+			if (DBM::is_result($thread_items)) {
 				$items = array_merge($items, dba::inArray($thread_items));
 			}
 		}
diff --git a/mod/nogroup.php b/mod/nogroup.php
index ecbfb9176e..0486663282 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 require_once('include/Contact.php');
 require_once('include/socgraph.php');
@@ -32,11 +33,11 @@ function nogroup_content(App $a) {
 
 	require_once('include/Contact.php');
 	$r = contacts_not_grouped(local_user());
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$a->set_pager_total($r[0]['total']);
 	}
 	$r = contacts_not_grouped(local_user(),$a->pager['start'],$a->pager['itemspage']);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 
 			$contact_details = get_contact_details_by_url($rr['url'], local_user(), $rr);
diff --git a/mod/noscrape.php b/mod/noscrape.php
index 113ad87462..0269c3f77e 100644
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function noscrape_init(App $a) {
 
@@ -48,7 +49,7 @@ function noscrape_init(App $a) {
 		/// @todo What should this value tell us?
 		$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
 			intval($a->profile['uid']));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$json_info["updated"] =  date("c", strtotime($r[0]['updated']));
 		}
 
@@ -59,7 +60,7 @@ function noscrape_init(App $a) {
 			dbesc(NETWORK_DIASPORA),
 			dbesc(NETWORK_OSTATUS)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$json_info["contacts"] = intval($r[0]['total']);
 		}
 	}
@@ -68,13 +69,13 @@ function noscrape_init(App $a) {
 	$last_active = 0;
 	$condition = array('uid' => $a->profile['uid'], 'self' => true);
 	$contact = dba::select('contact', array('last-item'), $condition, array('limit' => 1));
-	if (dbm::is_result($contact)) {
+	if (DBM::is_result($contact)) {
 		$last_active = strtotime($contact['last-item']);
 	}
 
 	$condition = array('uid' => $a->profile['uid']);
 	$user = dba::select('user', array('login_date'), $condition, array('limit' => 1));
-	if (dbm::is_result($user)) {
+	if (DBM::is_result($user)) {
 		if ($last_active < strtotime($user['login_date'])) {
 			$last_active = strtotime($user['login_date']);
 		}
diff --git a/mod/notes.php b/mod/notes.php
index d1810604ca..c5c45be724 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 function notes_init(App $a) {
 
@@ -85,7 +86,7 @@ function notes_content(App $a, $update = false) {
 
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$a->set_pager_total($r[0]['total']);
 		$a->set_pager_itemspage(40);
 	}
@@ -105,7 +106,7 @@ function notes_content(App $a, $update = false) {
 	$parents_arr = array();
 	$parents_str = '';
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach($r as $rr)
 			$parents_arr[] = $rr['item_id'];
 		$parents_str = implode(', ', $parents_arr);
@@ -119,7 +120,7 @@ function notes_content(App $a, $update = false) {
 			dbesc($parents_str)
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$items = conv_sort($r,"`commented`");
 
 			$o .= conversation($a,$items,'notes',$update);
diff --git a/mod/notice.php b/mod/notice.php
index ff8bed1800..54618bdf8f 100644
--- a/mod/notice.php
+++ b/mod/notice.php
@@ -4,12 +4,13 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function notice_init(App $a) {
 
 	$id = $a->argv[1];
 	$r = q("SELECT `user`.`nickname` FROM `user` LEFT JOIN `item` ON `item`.`uid` = `user`.`uid` WHERE `item`.`id` = %d", intval($id));
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$nick = $r[0]['nickname'];
 		$url = System::baseUrl() . "/display/$nick/$id";
 		goaway($url);
diff --git a/mod/notifications.php b/mod/notifications.php
index 95467a584f..fe8422cc4a 100644
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -6,9 +6,10 @@
  */
 
 use Friendica\App;
+use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
-require_once("include/NotificationsManager.php");
 require_once("include/contact_selectors.php");
 require_once("include/network.php");
 
@@ -30,7 +31,7 @@ function notifications_post(App $a) {
 			intval(local_user())
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$intro_id = $r[0]['id'];
 			$contact_id = $r[0]['contact-id'];
 		}
diff --git a/mod/notify.php b/mod/notify.php
index 867ead9fa7..fae7ebb39b 100644
--- a/mod/notify.php
+++ b/mod/notify.php
@@ -1,9 +1,9 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
-
-require_once('include/NotificationsManager.php');
+use Friendica\Database\DBM;
 
 function notify_init(App $a) {
 	if (! local_user()) {
@@ -56,7 +56,7 @@ function notify_content(App $a) {
 	require_once('include/bbcode.php');
 
 	$r = $nm->getAll(array('seen'=>0));
-	if (dbm::is_result($r) > 0) {
+	if (DBM::is_result($r) > 0) {
 		foreach ($r as $it) {
 			$notif_content .= replace_macros($not_tpl,array(
 				'$item_link' => System::baseUrl(true).'/notify/view/'. $it['id'],
diff --git a/mod/openid.php b/mod/openid.php
index 62a7e98e84..45b80638d5 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('library/openid.php');
 
@@ -40,7 +41,7 @@ function openid_content(App $a) {
 				dbesc($authid), dbesc(normalise_openid($authid))
 			);
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 
 				// successful OpenID login
 
diff --git a/mod/p.php b/mod/p.php
index 3ea810614e..9c1c2b71de 100644
--- a/mod/p.php
+++ b/mod/p.php
@@ -5,8 +5,8 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
 
 use Friendica\App;
 use Friendica\Core\System;
-
-require_once("include/diaspora.php");
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 function p_init($a){
 	if ($a->argc != 2) {
@@ -52,7 +52,7 @@ function p_init($a){
 	$r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
 		INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
 		WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
 		killme();
 	}
diff --git a/mod/photo.php b/mod/photo.php
index 72b7e8e95a..ece784baec 100644
--- a/mod/photo.php
+++ b/mod/photo.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 require_once('include/security.php');
 require_once('include/Photo.php');
@@ -80,7 +81,7 @@ function photo_init(App $a) {
 			intval($resolution),
 			intval($uid)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$data = $r[0]['data'];
 			$mimetype = $r[0]['type'];
 		}
@@ -111,7 +112,7 @@ function photo_init(App $a) {
 			dbesc($photo),
 			intval($resolution)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			$sql_extra = permissions_sql($r[0]['uid']);
 
@@ -122,9 +123,9 @@ function photo_init(App $a) {
 				intval($resolution)
 			);
 
-			$public = (dbm::is_result($r)) && ($r[0]['allow_cid'] == '') && ($r[0]['allow_gid'] == '') && ($r[0]['deny_cid']  == '') && ($r[0]['deny_gid']  == '');
+			$public = (DBM::is_result($r)) && ($r[0]['allow_cid'] == '') && ($r[0]['allow_gid'] == '') && ($r[0]['deny_cid']  == '') && ($r[0]['deny_gid']  == '');
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$resolution = $r[0]['scale'];
 				$data = $r[0]['data'];
 				$mimetype = $r[0]['type'];
diff --git a/mod/photos.php b/mod/photos.php
index 4110e80577..f18ce38af5 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 
 require_once 'include/Photo.php';
@@ -34,7 +35,7 @@ function photos_init(App $a) {
 			dbesc($nick)
 		);
 
-		if (! dbm::is_result($user)) {
+		if (! DBM::is_result($user)) {
 			return;
 		}
 
@@ -158,7 +159,7 @@ function photos_post(App $a) {
 					intval($contact_id),
 					intval($page_owner_uid)
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$can_post = true;
 					$visitor = $contact_id;
 				}
@@ -176,7 +177,7 @@ function photos_post(App $a) {
 		intval($page_owner_uid)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		notice( t('Contact information unavailable') . EOL);
 		logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
 		killme();
@@ -197,7 +198,7 @@ function photos_post(App $a) {
 			dbesc($album),
 			intval($page_owner_uid)
 		);
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			notice( t('Album not found.') . EOL);
 			goaway($_SESSION['photo_return']);
 			return; // NOTREACHED
@@ -268,7 +269,7 @@ function photos_post(App $a) {
 					dbesc($album)
 				);
 			}
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				foreach ($r as $rr) {
 					$res[] = "'" . dbesc($rr['rid']) . "'" ;
 				}
@@ -290,7 +291,7 @@ function photos_post(App $a) {
 			$r = q("SELECT `parent-uri` FROM `item` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
 				intval($page_owner_uid)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				foreach ($r as $rr) {
 					q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
 						dbesc(datetime_convert()),
@@ -356,7 +357,7 @@ function photos_post(App $a) {
 				dbesc($a->argv[2])
 			);
 		}
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
 				intval($page_owner_uid),
 				dbesc($r[0]['resource-id'])
@@ -365,7 +366,7 @@ function photos_post(App $a) {
 				dbesc($r[0]['resource-id']),
 				intval($page_owner_uid)
 			);
-			if (dbm::is_result($i)) {
+			if (DBM::is_result($i)) {
 				q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
 					dbesc(datetime_convert()),
 					dbesc(datetime_convert()),
@@ -418,7 +419,7 @@ function photos_post(App $a) {
 				dbesc($resource_id),
 				intval($page_owner_uid)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$ph = new Photo($r[0]['data'], $r[0]['type']);
 				if ($ph->is_valid()) {
 					$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
@@ -470,7 +471,7 @@ function photos_post(App $a) {
 			dbesc($resource_id),
 			intval($page_owner_uid)
 		);
-		if (dbm::is_result($p)) {
+		if (DBM::is_result($p)) {
 			$ext = $phototypes[$p[0]['type']];
 			$r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
 				dbesc($desc),
@@ -541,7 +542,7 @@ function photos_post(App $a) {
 				intval($page_owner_uid)
 			);
 		}
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$old_tag    = $r[0]['tag'];
 			$old_inform = $r[0]['inform'];
 		}
@@ -608,7 +609,7 @@ function photos_post(App $a) {
 										intval($page_owner_uid)
 								);
 
-								if (! dbm::is_result($r)) {
+								if (! DBM::is_result($r)) {
 									//select someone by attag or nick and the name passed in
 									$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
 											dbesc($name),
@@ -618,7 +619,7 @@ function photos_post(App $a) {
 								}
 							}
 
-							if (dbm::is_result($r)) {
+							if (DBM::is_result($r)) {
 								$newname = $r[0]['name'];
 								$profile = $r[0]['url'];
 								$notify = 'cid:' . $r[0]['id'];
@@ -775,7 +776,7 @@ function photos_post(App $a) {
 		dbesc($album),
 		intval($page_owner_uid)
 	);
-	if ((! dbm::is_result($r)) || ($album == t('Profile Photos'))) {
+	if ((! DBM::is_result($r)) || ($album == t('Profile Photos'))) {
 		$visible = 1;
 	} else {
 		$visible = 0;
@@ -1030,7 +1031,7 @@ function photos_content(App $a) {
 					intval($contact_id),
 					intval($owner_uid)
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$can_post = true;
 					$contact = $r[0];
 					$remote_contact = true;
@@ -1058,7 +1059,7 @@ function photos_content(App $a) {
 				intval($contact_id),
 				intval($owner_uid)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$contact = $r[0];
 				$remote_contact = true;
 			}
@@ -1205,7 +1206,7 @@ function photos_content(App $a) {
 			intval($owner_uid),
 			dbesc($album)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$a->set_pager_total(count($r));
 			$a->set_pager_itemspage(20);
 		}
@@ -1264,7 +1265,7 @@ function photos_content(App $a) {
 
 		$photos = array();
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$twist = 'rotright';
 			foreach ($r as $rr) {
 				if ($twist == 'rotright') {
@@ -1326,13 +1327,13 @@ function photos_content(App $a) {
 			dbesc($datum)
 		);
 
-		if (! dbm::is_result($ph)) {
+		if (! DBM::is_result($ph)) {
 			$ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
 				LIMIT 1",
 				intval($owner_uid),
 				dbesc($datum)
 			);
-			if (dbm::is_result($ph)) {
+			if (DBM::is_result($ph)) {
 				notice(t('Permission denied. Access to this item may be restricted.'));
 			} else {
 				notice(t('Photo not available') . EOL );
@@ -1358,7 +1359,7 @@ function photos_content(App $a) {
 				intval($owner_uid)
 			);
 
-			if (dbm::is_result($prvnxt)) {
+			if (DBM::is_result($prvnxt)) {
 				foreach ($prvnxt as $z => $entry) {
 					if ($entry['resource-id'] == $ph[0]['resource-id']) {
 						$prv = $z - 1;
@@ -1449,7 +1450,7 @@ function photos_content(App $a) {
 
 		$map = null;
 
-		if (dbm::is_result($linked_items)) {
+		if (DBM::is_result($linked_items)) {
 			$link_item = $linked_items[0];
 
 			$r = q("SELECT COUNT(*) AS `total`
@@ -1464,7 +1465,7 @@ function photos_content(App $a) {
 
 			);
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$a->set_pager_total($r[0]['total']);
 			}
 
@@ -1607,7 +1608,7 @@ function photos_content(App $a) {
 			}
 
 			$comments = '';
-			if (! dbm::is_result($r)) {
+			if (! DBM::is_result($r)) {
 				if (($can_post || can_write_wall($a, $owner_uid)) && $link_item['last-child']) {
 					$comments .= replace_macros($cmnt_tpl, array(
 						'$return_path' => '',
@@ -1641,7 +1642,7 @@ function photos_content(App $a) {
 			);
 
 			// display comments
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 
 				foreach ($r as $item) {
 					builtin_activity_puller($item, $conv_responses);
@@ -1815,7 +1816,7 @@ function photos_content(App $a) {
 		dbesc('Contact Photos'),
 		dbesc( t('Contact Photos'))
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$a->set_pager_total(count($r));
 		$a->set_pager_itemspage(20);
 	}
@@ -1833,7 +1834,7 @@ function photos_content(App $a) {
 	);
 
 	$photos = array();
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$twist = 'rotright';
 		foreach ($r as $rr) {
 			//hide profile photos to others
diff --git a/mod/ping.php b/mod/ping.php
index f6d5e8cf02..00620ddeb5 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 require_once('include/datetime.php');
 require_once('include/bbcode.php');
@@ -130,7 +131,7 @@ function ping_init(App $a)
 			intval(local_user()), intval(local_user())
 		);
 
-		if (dbm::is_result($items_unseen)) {
+		if (DBM::is_result($items_unseen)) {
 			$arr = array('items' => $items_unseen);
 			call_hooks('network_ping', $arr);
 
@@ -147,7 +148,7 @@ function ping_init(App $a)
 			if (intval(feature_enabled(local_user(), 'groups'))) {
 				// Find out how unseen network posts are spread across groups
 				$group_counts = groups_count_unseen();
-				if (dbm::is_result($group_counts)) {
+				if (DBM::is_result($group_counts)) {
 					foreach ($group_counts as $group_count) {
 						if ($group_count['count'] > 0) {
 							$groups_unseen[] = $group_count;
@@ -158,7 +159,7 @@ function ping_init(App $a)
 
 			if (intval(feature_enabled(local_user(), 'forumlist_widget'))) {
 				$forum_counts = ForumManager::count_unseen_items();
-				if (dbm::is_result($forums_counts)) {
+				if (DBM::is_result($forums_counts)) {
 					foreach ($forums_counts as $forum_count) {
 						if ($forum_count['count'] > 0) {
 							$forums_unseen[] = $forum_count;
@@ -197,7 +198,7 @@ function ping_init(App $a)
 				FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
 				WHERE `contact`.`self` = 1");
 
-			if (dbm::is_result($regs)) {
+			if (DBM::is_result($regs)) {
 				$register_count = $regs[0]['total'];
 			}
 		}
@@ -212,12 +213,12 @@ function ping_init(App $a)
 				dbesc(datetime_convert('UTC', 'UTC', 'now + 7 days')),
 				dbesc(datetime_convert('UTC', 'UTC', 'now'))
 			);
-			if (dbm::is_result($ev)) {
+			if (DBM::is_result($ev)) {
 				Cache::set($cachekey, $ev, CACHE_HOUR);
 			}
 		}
 
-		if (dbm::is_result($ev)) {
+		if (DBM::is_result($ev)) {
 			$all_events = count($ev);
 
 			if ($all_events) {
@@ -255,7 +256,7 @@ function ping_init(App $a)
 		$data['birthdays']        = $birthdays;
 		$data['birthdays-today']  = $birthdays_today;
 
-		if (dbm::is_result($notifs)) {
+		if (DBM::is_result($notifs)) {
 			foreach ($notifs as $notif) {
 				if ($notif['seen'] == 0) {
 					$sysnotify_count ++;
@@ -264,7 +265,7 @@ function ping_init(App $a)
 		}
 
 		// merge all notification types in one array
-		if (dbm::is_result($intros)) {
+		if (DBM::is_result($intros)) {
 			foreach ($intros as $intro) {
 				$notif = array(
 					'href'    => System::baseUrl() . '/notifications/intros/' . $intro['id'],
@@ -279,7 +280,7 @@ function ping_init(App $a)
 			}
 		}
 
-		if (dbm::is_result($mails)) {
+		if (DBM::is_result($mails)) {
 			foreach ($mails as $mail) {
 				$notif = array(
 					'href'    => System::baseUrl() . '/message/' . $mail['id'],
@@ -294,7 +295,7 @@ function ping_init(App $a)
 			}
 		}
 
-		if (dbm::is_result($regs)) {
+		if (DBM::is_result($regs)) {
 			foreach ($regs as $reg) {
 				$notif = array(
 					'href'    => System::baseUrl() . '/admin/users/',
@@ -330,7 +331,7 @@ function ping_init(App $a)
 		};
 		usort($notifs, $sort_function);
 
-		if (dbm::is_result($notifs)) {
+		if (DBM::is_result($notifs)) {
 			// Are the nofications called from the regular process or via the friendica app?
 			$regularnotifications = (intval($_GET['uid']) && intval($_GET['_']));
 
diff --git a/mod/poco.php b/mod/poco.php
index 5610190dc2..c5c5ef4c83 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -5,6 +5,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 function poco_init(App $a) {
 	$system_mode = false;
@@ -18,7 +19,7 @@ function poco_init(App $a) {
 	}
 	if (! x($user)) {
 		$c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1");
-		if (! dbm::is_result($c)) {
+		if (! DBM::is_result($c)) {
 			http_status_exit(401);
 		}
 		$system_mode = true;
@@ -60,7 +61,7 @@ function poco_init(App $a) {
 			where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1",
 			dbesc($user)
 		);
-		if (! dbm::is_result($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
+		if (! DBM::is_result($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
 			http_status_exit(404);
 		}
 
@@ -100,7 +101,7 @@ function poco_init(App $a) {
 			dbesc(NETWORK_STATUSNET)
 		);
 	}
-	if (dbm::is_result($contacts)) {
+	if (DBM::is_result($contacts)) {
 		$totalResults = intval($contacts[0]['total']);
 	} else {
 		$totalResults = 0;
@@ -195,7 +196,7 @@ function poco_init(App $a) {
 	}
 
 	if (is_array($contacts)) {
-		if (dbm::is_result($contacts)) {
+		if (DBM::is_result($contacts)) {
 			foreach ($contacts as $contact) {
 				if (! isset($contact['generation'])) {
 					if ($global) {
diff --git a/mod/poke.php b/mod/poke.php
index c02d59c460..848ed817d6 100644
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -17,6 +17,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
@@ -59,7 +60,7 @@ function poke_init(App $a) {
 		intval($uid)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		logger('poke: no contact ' . $contact_id);
 		return;
 	}
@@ -73,7 +74,7 @@ function poke_init(App $a) {
 			intval($parent),
 			intval($uid)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$parent_uri = $r[0]['uri'];
 			$private    = $r[0]['private'];
 			$allow_cid  = $r[0]['allow_cid'];
@@ -166,7 +167,7 @@ function poke_content(App $a) {
 			intval($_GET['c']),
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$name = $r[0]['name'];
 			$id = $r[0]['id'];
 		}
diff --git a/mod/post.php b/mod/post.php
index bfdc62ab79..8e279644bd 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -5,6 +5,7 @@
  */
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 require_once('include/salmon.php');
 require_once('include/crypto.php');
@@ -24,7 +25,7 @@ function post_post(App $a) {
 				AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 			dbesc($nickname)
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			http_status_exit(500);
 		}
 
diff --git a/mod/profile.php b/mod/profile.php
index be95fd2509..8a9b8b6666 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/contact_widgets.php');
 require_once('include/redir.php');
@@ -17,7 +18,7 @@ function profile_init(App $a) {
 		$which = htmlspecialchars($a->argv[1]);
 	else {
 		$r = q("select nickname from user where blocked = 0 and account_expired = 0 and account_removed = 0 and verified = 1 order by rand() limit 1");
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			goaway(System::baseUrl() . '/profile/' . $r[0]['nickname']);
 		}
 		else {
@@ -139,7 +140,7 @@ function profile_content(App $a, $update = 0) {
 			intval($contact_id),
 			intval($a->profile['profile_uid'])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact = $r[0];
 			$remote_contact = true;
 		}
@@ -240,7 +241,7 @@ function profile_content(App $a, $update = 0) {
 			intval($a->profile['profile_uid'])
 		);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return '';
 		}
 
@@ -267,7 +268,7 @@ function profile_content(App $a, $update = 0) {
 			intval(PAGE_COMMUNITY),
 			intval(PAGE_PRVGROUP));
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			$sql_extra3 = sprintf(" AND `thread`.`contact-id` = %d ", intval(intval($a->profile['contact_id'])));
 		}
 
@@ -313,7 +314,7 @@ function profile_content(App $a, $update = 0) {
 	// search for new items (update routine)
 	$_SESSION['last_updated'][$last_updated_key] = time();
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach($r as $rr)
 			$parents_arr[] = $rr['item_id'];
 		$parents_str = implode(', ', $parents_arr);
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index c68655b756..5f52451414 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once("include/Photo.php");
 
@@ -35,7 +36,7 @@ function profile_photo_post(App $a) {
 				intval($_REQUEST['profile']),
 				intval(local_user())
 			);
-			if (dbm::is_result($r) && (! intval($r[0]['is-default'])))
+			if (DBM::is_result($r) && (! intval($r[0]['is-default'])))
 				$is_default_profile = 0;
 		}
 
@@ -66,7 +67,7 @@ function profile_photo_post(App $a) {
 			dbesc(local_user()),
 			intval($scale));
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			$base_image = $r[0];
 
@@ -202,7 +203,7 @@ function profile_photo_content(App $a) {
 			intval(local_user()),
 			dbesc($resource_id)
 			);
-		if (!dbm::is_result($r)){
+		if (!DBM::is_result($r)){
 			notice( t('Permission denied.') . EOL );
 			return;
 		}
diff --git a/mod/profiles.php b/mod/profiles.php
index b787bc1548..fe26d8f561 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -5,6 +5,7 @@ use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 
 require_once 'include/Contact.php';
@@ -23,7 +24,7 @@ function profiles_init(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			notice( t('Profile not found.') . EOL);
 			goaway('profiles');
 			return; // NOTREACHED
@@ -42,7 +43,7 @@ function profiles_init(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			info(t('Profile deleted.').EOL);
 		}
 
@@ -57,7 +58,7 @@ function profiles_init(App $a) {
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
 
-		$num_profiles = (dbm::is_result($r0) ? count($r0) : 0);
+		$num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
 
 		$name = t('Profile-') . ($num_profiles + 1);
 
@@ -79,7 +80,7 @@ function profiles_init(App $a) {
 		);
 
 		info( t('New profile created.') . EOL);
-		if (dbm::is_result($r3) && count($r3) == 1) {
+		if (DBM::is_result($r3) && count($r3) == 1) {
 			goaway('profiles/' . $r3[0]['id']);
 		}
 
@@ -93,14 +94,14 @@ function profiles_init(App $a) {
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
 
-		$num_profiles = (dbm::is_result($r0) ? count($r0) : 0);
+		$num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
 
 		$name = t('Profile-') . ($num_profiles + 1);
 		$r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
 			intval(local_user()),
 			intval($a->argv[2])
 		);
-		if(! dbm::is_result($r1)) {
+		if(! DBM::is_result($r1)) {
 			notice( t('Profile unavailable to clone.') . EOL);
 			killme();
 			return;
@@ -118,7 +119,7 @@ function profiles_init(App $a) {
 			dbesc($name)
 		);
 		info( t('New profile created.') . EOL);
-		if ((dbm::is_result($r3)) && (count($r3) == 1)) {
+		if ((DBM::is_result($r3)) && (count($r3) == 1)) {
 			goaway('profiles/'.$r3[0]['id']);
 		}
 
@@ -133,7 +134,7 @@ function profiles_init(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			notice( t('Profile not found.') . EOL);
 			killme();
 			return;
@@ -180,7 +181,7 @@ function profiles_post(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($orig)) {
+		if (! DBM::is_result($orig)) {
 			notice( t('Profile not found.') . EOL);
 			return;
 		}
@@ -274,13 +275,13 @@ function profiles_post(App $a) {
 						dbesc($newname),
 						intval(local_user())
 					);
-					if (! dbm::is_result($r)) {
+					if (! DBM::is_result($r)) {
 						$r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
 							dbesc($lookup),
 							intval(local_user())
 						);
 					}
-					if (dbm::is_result($r)) {
+					if (DBM::is_result($r)) {
 						$prf = $r[0]['url'];
 						$newname = $r[0]['name'];
 					}
@@ -533,7 +534,7 @@ function profile_activity($changed, $value) {
 		intval(local_user())
 	);
 
-	if (! dbm::is_result($self)) {
+	if (! DBM::is_result($self)) {
 		return;
 	}
 
@@ -616,7 +617,7 @@ function profiles_content(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			notice( t('Profile not found.') . EOL);
 			return;
 		}
@@ -757,7 +758,7 @@ function profiles_content(App $a) {
 			$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
 				local_user()
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				//Go to the default profile.
 				goaway('profiles/' . $r[0]['id']);
 			}
@@ -766,7 +767,7 @@ function profiles_content(App $a) {
 		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
 			local_user());
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			$tpl = get_markup_template('profile_entry.tpl');
 
diff --git a/mod/profperm.php b/mod/profperm.php
index c49fb7f282..99b58516d3 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 function profperm_init(App $a) {
 
@@ -45,7 +46,7 @@ function profperm_content(App $a) {
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$change = intval($a->argv[2]);
 	}
 
@@ -55,7 +56,7 @@ function profperm_content(App $a) {
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			notice( t('Invalid profile identifier.') . EOL );
 			return;
 		}
@@ -67,7 +68,7 @@ function profperm_content(App $a) {
 		);
 
 		$ingroup = array();
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			foreach($r as $member)
 				$ingroup[] = $member['id'];
 
@@ -97,7 +98,7 @@ function profperm_content(App $a) {
 			$members = $r;
 
 			$ingroup = array();
-			if (dbm::is_result($r))
+			if (DBM::is_result($r))
 				foreach($r as $member)
 					$ingroup[] = $member['id'];
 		}
@@ -141,7 +142,7 @@ function profperm_content(App $a) {
 			dbesc(NETWORK_DFRN)
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
 			foreach($r as $member) {
 				if(! in_array($member['id'],$ingroup)) {
diff --git a/mod/proxy.php b/mod/proxy.php
index 601fb79637..8b5f0834f2 100644
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -4,6 +4,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 define('PROXY_DEFAULT_TIME', 86400); // 1 Day
 
@@ -144,7 +145,7 @@ function proxy_init(App $a) {
 
 	if (!$direct_cache && ($cachefile == '')) {
 		$r = dba::select('photo', array('data', 'desc'), array('resource-id' => $urlhash), array('limit' => 1));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$img_str = $r['data'];
 			$mime = $r['desc'];
 			if ($mime == '') {
@@ -153,7 +154,7 @@ function proxy_init(App $a) {
 		}
 	}
 
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		// It shouldn't happen but it does - spaces in URL
 		$_REQUEST['url'] = str_replace(' ', '+', $_REQUEST['url']);
 		$redirects = 0;
diff --git a/mod/pubsub.php b/mod/pubsub.php
index 60df449b53..1cee91f4db 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 function hub_return($valid,$body) {
 
@@ -49,7 +50,7 @@ function pubsub_init(App $a) {
 		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 			dbesc($nick)
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			logger('pubsub: local account not found: ' . $nick);
 			hub_return(false, '');
 		}
@@ -64,7 +65,7 @@ function pubsub_init(App $a) {
 			intval($contact_id),
 			intval($owner['uid'])
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			logger('pubsub: contact '.$contact_id.' not found.');
 			hub_return(false, '');
 		}
@@ -119,7 +120,7 @@ function pubsub_post(App $a) {
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 		dbesc($nick)
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		hub_post_return();
 	}
 
@@ -134,7 +135,7 @@ function pubsub_post(App $a) {
 		dbesc(NETWORK_FEED)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
 		hub_post_return();
 	}
diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index 77f27dff5f..f3134308fb 100644
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 function post_var($name) {
 	return (x($_POST, $name)) ? notags(trim($_POST[$name])) : '';
@@ -63,7 +64,7 @@ function pubsubhubbub_init(App $a) {
 			   " AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 			   dbesc($nick));
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			logger('pubsubhubbub: local account not found: ' . $nick);
 			http_status_exit(404);
 		}
@@ -81,7 +82,7 @@ function pubsubhubbub_init(App $a) {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked`".
 			   " AND NOT `pending` AND `self` LIMIT 1",
 			   intval($owner['uid']));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			logger('pubsubhubbub: contact not found.');
 			http_status_exit(404);
 		}
@@ -140,7 +141,7 @@ function pubsubhubbub_init(App $a) {
 
 			// if we are just updating an old subscription, keep the
 			// old values for push and last_update
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$last_update = $r[0]['last_update'];
 				$push_flag = $r[0]['push'];
 			}
diff --git a/mod/qsearch.php b/mod/qsearch.php
index c79d1dcf8f..167ee41512 100644
--- a/mod/qsearch.php
+++ b/mod/qsearch.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 function qsearch_init(App $a) {
 
@@ -27,7 +28,7 @@ function qsearch_init(App $a) {
 		intval($limit)
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 
 		foreach($r as $rr)
 			$results[] = array( 0, (int) $rr['id'], $rr['name'], '', '');
@@ -42,7 +43,7 @@ function qsearch_init(App $a) {
 	);
 
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 
 		foreach($r as $rr)
 			$results[] = array( (int) $rr['id'], 0, $rr['name'],$rr['url'],$rr['photo']);
diff --git a/mod/receive.php b/mod/receive.php
index 68d304ae70..a1cb5f48fa 100644
--- a/mod/receive.php
+++ b/mod/receive.php
@@ -6,10 +6,11 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 require_once('include/salmon.php');
 require_once('include/crypto.php');
-require_once('include/diaspora.php');
 
 function receive_post(App $a) {
 	$enabled = intval(Config::get('system', 'diaspora_enabled'));
@@ -30,7 +31,7 @@ function receive_post(App $a) {
 		$guid = $a->argv[2];
 
 		$importer = dba::select('user', array(), array('guid' => $guid, 'account_expired' => false, 'account_removed' => false), array('limit' => 1));
-		if (!dbm::is_result($importer)) {
+		if (!DBM::is_result($importer)) {
 			http_status_exit(500);
 		}
 	}
diff --git a/mod/redir.php b/mod/redir.php
index 998e9cc0bd..b729238426 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function redir_init(App $a) {
 
@@ -21,7 +22,7 @@ function redir_init(App $a) {
 				intval(local_user())
 			);
 
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				goaway(System::baseUrl());
 			}
 			if ($r[0]['network'] !== NETWORK_DFRN) {
@@ -36,7 +37,7 @@ function redir_init(App $a) {
 				intval(local_user())
 			);
 
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				goaway(System::baseUrl());
 			}
 			if ($r[0]['network'] !== NETWORK_DFRN) {
diff --git a/mod/regmod.php b/mod/regmod.php
index 03cb7fa8fa..d6e122a286 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once('include/enotify.php');
 require_once('include/user.php');
@@ -17,7 +18,7 @@ function user_allow($hash) {
 	);
 
 
-	if (! dbm::is_result($register)) {
+	if (! DBM::is_result($register)) {
 		return false;
 	}
 
@@ -25,7 +26,7 @@ function user_allow($hash) {
 		intval($register[0]['uid'])
 	);
 
-	if (! dbm::is_result($user)) {
+	if (! DBM::is_result($user)) {
 		killme();
 	}
 
@@ -41,7 +42,7 @@ function user_allow($hash) {
 	$r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1",
 		intval($user[0]['uid'])
 	);
-	if (dbm::is_result($r) && $r[0]['net-publish']) {
+	if (DBM::is_result($r) && $r[0]['net-publish']) {
 		$url = System::baseUrl() . '/profile/' . $user[0]['nickname'];
 		if ($url && strlen(Config::get('system','directory'))) {
 			Worker::add(PRIORITY_LOW, "directory", $url);
@@ -77,7 +78,7 @@ function user_deny($hash) {
 		dbesc($hash)
 	);
 
-	if (!dbm::is_result($register)) {
+	if (!DBM::is_result($register)) {
 		return false;
 	}
 
diff --git a/mod/salmon.php b/mod/salmon.php
index 508cd4de65..e664946bb0 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 require_once('include/salmon.php');
 require_once('include/ostatus.php');
@@ -34,7 +35,7 @@ function salmon_post(App $a) {
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 		dbesc($nick)
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		http_status_exit(500);
 	}
 
@@ -158,7 +159,7 @@ function salmon_post(App $a) {
 		dbesc(normalise_link($author_link)),
 		intval($importer['uid'])
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		logger('mod-salmon: Author unknown to us.');
 		if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) {
 			$result = new_contact($importer['uid'],$author_link);
@@ -177,8 +178,8 @@ function salmon_post(App $a) {
 	// Have we ignored the person?
 	// If so we can not accept this post.
 
-	//if((dbm::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
-	if (dbm::is_result($r) && $r[0]['blocked']) {
+	//if((DBM::is_result($r)) && (($r[0]['readonly']) || ($r[0]['rel'] == CONTACT_IS_FOLLOWER) || ($r[0]['blocked']))) {
+	if (DBM::is_result($r) && $r[0]['blocked']) {
 		logger('mod-salmon: Ignoring this author.');
 		http_status_exit(202);
 		// NOTREACHED
@@ -187,7 +188,7 @@ function salmon_post(App $a) {
 	// Placeholder for hub discovery.
 	$hub = '';
 
-	$contact_rec = ((dbm::is_result($r)) ? $r[0] : null);
+	$contact_rec = ((DBM::is_result($r)) ? $r[0] : null);
 
 	ostatus::import($data,$importer,$contact_rec, $hub);
 
diff --git a/mod/search.php b/mod/search.php
index 4abca77bb4..4c3d4586d1 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once("include/bbcode.php");
 require_once('include/security.php');
@@ -19,7 +20,7 @@ function search_saved_searches() {
 		intval(local_user())
 	);
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$saved = array();
 		foreach ($r as $rr) {
 			$saved[] = array(
@@ -57,7 +58,7 @@ function search_init(App $a) {
 				intval(local_user()),
 				dbesc($search)
 			);
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				dba::insert('search', array('uid' => local_user(), 'term' => $search));
 			}
 		}
@@ -212,7 +213,7 @@ function search_content(App $a) {
 				intval($a->pager['start']), intval($a->pager['itemspage']));
 	}
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		info( t('No results.') . EOL);
 		return $o;
 	}
diff --git a/mod/settings.php b/mod/settings.php
index 37daa359c1..ff846688e7 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -5,6 +5,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 require_once('include/group.php');
 require_once('include/socgraph.php');
@@ -228,7 +229,7 @@ function settings_post(App $a) {
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 					intval(local_user())
 				);
-				if (!dbm::is_result($r)) {
+				if (!DBM::is_result($r)) {
 					dba::insert('mailacct', array('uid' => local_user()));
 				}
 				if (strlen($mail_pass)) {
@@ -253,7 +254,7 @@ function settings_post(App $a) {
 				$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 					intval(local_user())
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$eacct = $r[0];
 					require_once('include/email.php');
 					$mb = construct_mailbox_name($eacct);
@@ -704,7 +705,7 @@ function settings_content(App $a) {
 					dbesc($a->argv[3]),
 					local_user());
 
-			if (!dbm::is_result($r)) {
+			if (!DBM::is_result($r)) {
 				notice(t("You can't edit this application."));
 				return;
 			}
@@ -735,7 +736,7 @@ function settings_content(App $a) {
 			return;
 		}
 
-		/// @TODO validate result with dbm::is_result()
+		/// @TODO validate result with DBM::is_result()
 		$r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
 				FROM clients
 				LEFT JOIN tokens ON clients.client_id=tokens.client_id
@@ -765,7 +766,7 @@ function settings_content(App $a) {
 		$settings_addons = "";
 
 		$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			$settings_addons = t('No Plugin settings configured');
 		}
 
@@ -874,15 +875,15 @@ function settings_content(App $a) {
 			$r = null;
 		}
 
-		$mail_server       = ((dbm::is_result($r)) ? $r[0]['server'] : '');
-		$mail_port         = ((dbm::is_result($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
-		$mail_ssl          = ((dbm::is_result($r)) ? $r[0]['ssltype'] : '');
-		$mail_user         = ((dbm::is_result($r)) ? $r[0]['user'] : '');
-		$mail_replyto      = ((dbm::is_result($r)) ? $r[0]['reply_to'] : '');
-		$mail_pubmail      = ((dbm::is_result($r)) ? $r[0]['pubmail'] : 0);
-		$mail_action       = ((dbm::is_result($r)) ? $r[0]['action'] : 0);
-		$mail_movetofolder = ((dbm::is_result($r)) ? $r[0]['movetofolder'] : '');
-		$mail_chk          = ((dbm::is_result($r)) ? $r[0]['last_check'] : NULL_DATE);
+		$mail_server       = ((DBM::is_result($r)) ? $r[0]['server'] : '');
+		$mail_port         = ((DBM::is_result($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
+		$mail_ssl          = ((DBM::is_result($r)) ? $r[0]['ssltype'] : '');
+		$mail_user         = ((DBM::is_result($r)) ? $r[0]['user'] : '');
+		$mail_replyto      = ((DBM::is_result($r)) ? $r[0]['reply_to'] : '');
+		$mail_pubmail      = ((DBM::is_result($r)) ? $r[0]['pubmail'] : 0);
+		$mail_action       = ((DBM::is_result($r)) ? $r[0]['action'] : 0);
+		$mail_movetofolder = ((DBM::is_result($r)) ? $r[0]['movetofolder'] : '');
+		$mail_chk          = ((DBM::is_result($r)) ? $r[0]['last_check'] : NULL_DATE);
 
 
 		$tpl = get_markup_template("settings_connectors.tpl");
diff --git a/mod/share.php b/mod/share.php
index 7ddca0f30b..864199f01a 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 function share_init(App $a) {
 
@@ -15,7 +16,7 @@ function share_init(App $a) {
 		intval($post_id),
 		intval(local_user())
 	);
-	if(! dbm::is_result($r) || ($r[0]['private'] == 1))
+	if(! DBM::is_result($r) || ($r[0]['private'] == 1))
 		killme();
 
 	if (strpos($r[0]['body'], "[/share]") !== false) {
diff --git a/mod/starred.php b/mod/starred.php
index f8e845bc6e..5cd9c0fe18 100644
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function starred_init(App $a) {
 
@@ -23,7 +24,7 @@ function starred_init(App $a) {
 		intval(local_user()),
 		intval($message_id)
 	);
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		killme();
 	}
 
diff --git a/mod/subthread.php b/mod/subthread.php
index d4b861baab..a597b16987 100644
--- a/mod/subthread.php
+++ b/mod/subthread.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
@@ -22,7 +23,7 @@ function subthread_content(App $a) {
 		dbesc($item_id)
 	);
 
-	if(! $item_id || (! dbm::is_result($r))) {
+	if(! $item_id || (! DBM::is_result($r))) {
 		logger('subthread: no item ' . $item_id);
 		return;
 	}
@@ -43,7 +44,7 @@ function subthread_content(App $a) {
 			intval($item['contact-id']),
 			intval($item['uid'])
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			return;
 		}
 		if (! $r[0]['self']) {
@@ -57,7 +58,7 @@ function subthread_content(App $a) {
 		WHERE `contact`.`self` = 1 AND `contact`.`uid` = %d LIMIT 1",
 		intval($owner_uid)
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		$owner = $r[0];
 
 	if (! $owner) {
@@ -78,7 +79,7 @@ function subthread_content(App $a) {
 			intval($_SESSION['visitor_id']),
 			intval($owner_uid)
 		);
-		if (dbm::is_result($r))
+		if (DBM::is_result($r))
 			$contact = $r[0];
 	}
 	if (! $contact) {
diff --git a/mod/suggest.php b/mod/suggest.php
index e71c726952..6bc9d0e565 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/socgraph.php');
 require_once('include/contact_widgets.php');
@@ -67,7 +68,7 @@ function suggest_content(App $a) {
 
 	$r = suggestion_query(local_user());
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		$o .= t('No suggestions available. If this is a new site, please try again in 24 hours.');
 		return $o;
 	}
diff --git a/mod/tagger.php b/mod/tagger.php
index 84e5e5615c..c91fb4abaa 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once('include/security.php');
 require_once('include/bbcode.php');
@@ -30,7 +31,7 @@ function tagger_content(App $a) {
 		dbesc($item_id)
 	);
 
-	if(! $item_id || (! dbm::is_result($r))) {
+	if(! $item_id || (! DBM::is_result($r))) {
 		logger('tagger: no item ' . $item_id);
 		return;
 	}
@@ -42,7 +43,7 @@ function tagger_content(App $a) {
 	$r = q("select `nickname`,`blocktags` from user where uid = %d limit 1",
 		intval($owner_uid)
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$owner_nick = $r[0]['nickname'];
 		$blocktags = $r[0]['blocktags'];
 	}
@@ -53,7 +54,7 @@ function tagger_content(App $a) {
 	$r = q("select * from contact where self = 1 and uid = %d limit 1",
 		intval(local_user())
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 			$contact = $r[0];
 	else {
 		logger('tagger: no contact_id');
@@ -182,7 +183,7 @@ EOT;
 	$r = q("select `tag`,`id`,`uid` from item where `origin` = 1 AND `uri` = '%s' LIMIT 1",
 		dbesc($item['uri'])
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$x = q("SELECT `blocktags` FROM `user` WHERE `uid` = %d limit 1",
 			intval($r[0]['uid'])
 		);
diff --git a/mod/tagrm.php b/mod/tagrm.php
index a952b613b1..cf76f621b0 100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/bbcode.php');
 
@@ -23,7 +24,7 @@ function tagrm_post(App $a) {
 		intval(local_user())
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 	}
 
@@ -72,7 +73,7 @@ function tagrm_content(App $a) {
 		intval(local_user())
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		goaway(System::baseUrl() . '/' . $_SESSION['photo_return']);
 	}
 
diff --git a/mod/uexport.php b/mod/uexport.php
index e0b9be91f3..2ada9bc289 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function uexport_init(App $a) {
 	if (!local_user()) {
@@ -52,7 +53,7 @@ function uexport_content(App $a) {
 function _uexport_multirow($query) {
 	$result = array();
 	$r = q($query);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$p = array();
 			foreach ($rr as $k => $v) {
@@ -67,7 +68,7 @@ function _uexport_multirow($query) {
 function _uexport_row($query) {
 	$result = array();
 	$r = q($query);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			foreach ($rr as $k => $v) {
 				$result[$k] = $v;
@@ -139,7 +140,7 @@ function uexport_all(App $a) {
 	$r = q("SELECT count(*) as `total` FROM `item` WHERE `uid` = %d ",
 		intval(local_user())
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$total = $r[0]['total'];
 	}
 	// chunk the output to avoid exhausting memory
diff --git a/mod/unfollow.php b/mod/unfollow.php
index 607c17d277..58b4397ca5 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once 'include/follow.php';
 require_once 'include/Contact.php';
@@ -28,7 +29,7 @@ function unfollow_post(App $a) {
 			normalise_link($url), $url, NETWORK_STATUSNET);
 	$contact = dba::select('contact', array(), $condition, array('limit' => 1));
 
-	if (!dbm::is_result($contact)) {
+	if (!DBM::is_result($contact)) {
 		notice(t("Contact wasn't found or can't be unfollowed."));
 	} else {
 		if (in_array($contact['network'], array(NETWORK_OSTATUS, NETWORK_DIASPORA))) {
@@ -36,7 +37,7 @@ function unfollow_post(App $a) {
 				WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
 				intval($uid)
 			);
- 			if (dbm::is_result($r)) {
+ 			if (DBM::is_result($r)) {
 				$self = ""; // Unused parameter
 				terminate_friendship($r[0], $self, $contact);
 			}
@@ -68,7 +69,7 @@ function unfollow_content(App $a) {
 			normalise_link($url), $url, NETWORK_STATUSNET);
 	$contact = dba::select('contact', array('url', 'network', 'addr', 'name'), $condition, array('limit' => 1));
 
-	if (!dbm::is_result($contact)) {
+	if (!DBM::is_result($contact)) {
 		notice(t("You aren't a friend of this contact.").EOL);
 		$submit = "";
 		// NOTREACHED
diff --git a/mod/videos.php b/mod/videos.php
index 88d35ea834..bea315c590 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -4,6 +4,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once('include/items.php');
 require_once('include/acl_selectors.php');
@@ -148,7 +149,7 @@ function videos_post(App $a) {
 			dbesc($video_id)
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'",
 				intval(local_user()),
 				dbesc($video_id)
@@ -158,7 +159,7 @@ function videos_post(App $a) {
 				intval(local_user())
 			);
 			//echo "<pre>"; var_dump($i); killme();
-			if (dbm::is_result($i)) {
+			if (DBM::is_result($i)) {
 				q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
 					dbesc(datetime_convert()),
 					dbesc(datetime_convert()),
@@ -268,7 +269,7 @@ function videos_content(App $a) {
 					intval($contact_id),
 					intval($owner_uid)
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$can_post = true;
 					$contact = $r[0];
 					$remote_contact = true;
@@ -296,7 +297,7 @@ function videos_content(App $a) {
 				intval($contact_id),
 				intval($owner_uid)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$contact = $r[0];
 				$remote_contact = true;
 			}
@@ -356,7 +357,7 @@ function videos_content(App $a) {
 		$sql_extra GROUP BY hash",
 		intval($a->data['user']['uid'])
 	);
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		$a->set_pager_total(count($r));
 		$a->set_pager_itemspage(20);
 	}
@@ -374,7 +375,7 @@ function videos_content(App $a) {
 
 
 	$videos = array();
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			if ($a->theme['template_engine'] === 'internal') {
 				$alt_e = template_escape($rr['filename']);
diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index 51104c4783..8c35be77d8 100644
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
@@ -20,7 +21,7 @@ function viewcontacts_init(App $a) {
 			dbesc($nick)
 		);
 
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			return;
 		}
 
@@ -60,7 +61,7 @@ function viewcontacts_content(App $a) {
 		dbesc(NETWORK_DIASPORA),
 		dbesc(NETWORK_OSTATUS)
 	);
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		$a->set_pager_total($r[0]['total']);
 
 	$r = q("SELECT * FROM `contact`
@@ -75,7 +76,7 @@ function viewcontacts_content(App $a) {
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		info(t('No contacts.').EOL);
 		return $o;
 	}
diff --git a/mod/viewsrc.php b/mod/viewsrc.php
index 0915895906..a607498442 100644
--- a/mod/viewsrc.php
+++ b/mod/viewsrc.php
@@ -1,6 +1,7 @@
 <?php
 
 use Friendica\App;
+use Friendica\Database\DBM;
 
 function viewsrc_content(App $a) {
 
@@ -25,7 +26,7 @@ function viewsrc_content(App $a) {
 		dbesc($item_id)
 	);
 
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		if(is_ajax()) {
 			echo str_replace("\n",'<br />',$r[0]['body']);
 			killme();
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index a060c253cf..931dcb7200 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once('include/attach.php');
 require_once('include/datetime.php');
@@ -15,7 +16,7 @@ function wall_attach_post(App $a) {
 		$r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid`  WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1",
 			dbesc($nick)
 		);
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			if ($r_json) {
 				echo json_encode(array('error'=>t('Invalid request.')));
 				killme();
@@ -58,7 +59,7 @@ function wall_attach_post(App $a) {
 					intval($contact_id),
 					intval($page_owner_uid)
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$can_post = true;
 					$visitor = $contact_id;
 				}
@@ -144,7 +145,7 @@ function wall_attach_post(App $a) {
 		dbesc($hash)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		$msg = t('File upload failed.');
 		if ($r_json) {
 			echo json_encode(array('error'=>$msg));
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index cbd1b28445..d6cb0c2e1a 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -12,6 +12,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 require_once 'include/Photo.php';
 
@@ -32,7 +33,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 				dbesc($nick)
 			);
 
-			if (! dbm::is_result($r)) {
+			if (! DBM::is_result($r)) {
 				if ($r_json) {
 					echo json_encode(array('error'=>t('Invalid request.')));
 					killme();
@@ -88,7 +89,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
 					intval($contact_id),
 					intval($page_owner_uid)
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$can_post = true;
 					$visitor = $contact_id;
 				}
diff --git a/mod/wallmessage.php b/mod/wallmessage.php
index fe3b9a82a6..1ac54c9f8a 100644
--- a/mod/wallmessage.php
+++ b/mod/wallmessage.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use \Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/message.php');
 
@@ -25,7 +26,7 @@ function wallmessage_post(App $a) {
 		dbesc($recipient)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		logger('wallmessage: no recipient');
 		return;
 	}
@@ -88,7 +89,7 @@ function wallmessage_content(App $a) {
 		dbesc($recipient)
 	);
 
-	if (! dbm::is_result($r)) {
+	if (! DBM::is_result($r)) {
 		notice( t('No recipient.') . EOL);
 		logger('wallmessage: no recipient');
 		return;
diff --git a/mod/xrd.php b/mod/xrd.php
index 60f78ed27c..9f88d85eaf 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -2,6 +2,7 @@
 
 use Friendica\App;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once('include/crypto.php');
 
@@ -33,7 +34,7 @@ function xrd_init(App $a) {
 	}
 
 	$r = dba::select('user', array(), array('nickname' => $name), array('limit' => 1));
-	if (!dbm::is_result($r)) {
+	if (!DBM::is_result($r)) {
 		killme();
 	}
 
diff --git a/object/Item.php b/object/Item.php
index 6d2d35f345..80bbf255dd 100644
--- a/object/Item.php
+++ b/object/Item.php
@@ -4,10 +4,11 @@ if(class_exists('Item'))
 
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 require_once('object/BaseObject.php');
 require_once('include/text.php');
-require_once('include/diaspora.php');
 require_once('boot.php');
 
 /**
@@ -255,7 +256,7 @@ class Item extends BaseObject {
 					'starred'   =>  t('starred'),
 				);
 				$r = dba::select('thread', array('ignored'), array('uid' => $item['uid'], 'iid' => $item['id']), array('limit' => 1));
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$ignore = array(
 						'do'        => t("ignore thread"),
 						'undo'      => t("unignore thread"),
diff --git a/src/App.php b/src/App.php
index 5c1c2bb9c1..ea44738571 100644
--- a/src/App.php
+++ b/src/App.php
@@ -5,10 +5,10 @@ namespace Friendica;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
+use Friendica\Database\DBM;
 
 use Cache;
 use dba;
-use dbm;
 
 use Detection\MobileDetect;
 
@@ -706,7 +706,7 @@ class App {
 		dba::transaction();
 
 		$r = q('SELECT `pid` FROM `process` WHERE `pid` = %d', intval(getmypid()));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			dba::insert('process', array('pid' => getmypid(), 'command' => $command, 'created' => datetime_convert()));
 		}
 		dba::commit();
@@ -719,7 +719,7 @@ class App {
 		dba::transaction();
 
 		$r = q('SELECT `pid` FROM `process`');
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r AS $process) {
 				if (!posix_kill($process['pid'], 0)) {
 					q('DELETE FROM `process` WHERE `pid` = %d', intval($process['pid']));
@@ -806,7 +806,7 @@ class App {
 			}
 		}
 
-		$processlist = dbm::processlist();
+		$processlist = DBM::processlist();
 		if ($processlist['list'] != '') {
 			logger('Processcheck: Processes: ' . $processlist['amount'] . ' - Processlist: ' . $processlist['list'], LOGGER_DEBUG);
 
diff --git a/src/Core/Config.php b/src/Core/Config.php
index be0d0def16..56b85dba46 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -1,15 +1,15 @@
 <?php
-namespace Friendica\Core;
-
-use dba;
-use dbm;
-
 /**
+ * System Configuration Class
+ *
  * @file include/Core/Config.php
  *
- *  @brief Contains the class with methods for system configuration
+ * @brief Contains the class with methods for system configuration
  */
+namespace Friendica\Core;
 
+use Friendica\Database\DBM;
+use dba;
 
 /**
  * @brief Arbitrary sytem configuration storage
@@ -87,7 +87,6 @@ class Config {
 		$a = get_app();
 
 		if (!$refresh) {
-
 			// Do we have the cached value? Then return it
 			if (isset(self::$cache[$family][$key])) {
 				if (self::$cache[$family][$key] === '!<unset>!') {
@@ -99,7 +98,7 @@ class Config {
 		}
 
 		$ret = dba::select('config', array('v'), array('cat' => $family, 'k' => $key), array('limit' => 1));
-		if (dbm::is_result($ret)) {
+		if (DBM::is_result($ret)) {
 			// manage array value
 			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret['v']) ? unserialize($ret['v']) : $ret['v']);
 
@@ -108,7 +107,6 @@ class Config {
 			self::$in_db[$family][$key] = true;
 			return $val;
 		} elseif (isset($a->config[$family][$key])) {
-
 			// Assign the value (mostly) from the .htconfig.php to the cache
 			self::$cache[$family][$key] = $a->config[$family][$key];
 			self::$in_db[$family][$key] = false;
diff --git a/include/NotificationsManager.php b/src/Core/NotificationsManager.php
similarity index 79%
rename from include/NotificationsManager.php
rename to src/Core/NotificationsManager.php
index 5f9419e836..ea3d4c0cc7 100644
--- a/include/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -1,12 +1,14 @@
 <?php
 /**
- * @file include/NotificationsManager.php
+ * @file src/Core/NotificationsManager.php
  * @brief Methods for read and write notifications from/to database
  *  or for formatting notifications
  */
+namespace Friendica\Core;
 
 use Friendica\Core\Pconfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once 'include/html2plain.php';
 require_once 'include/datetime.php';
@@ -17,10 +19,15 @@ require_once 'include/Contact.php';
  * @brief Methods for read and write notifications from/to database
  *  or for formatting notifications
  */
-class NotificationsManager {
+class NotificationsManager
+{
 	private $a;
 
-	public function __construct() {
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
 		$this->a = get_app();
 	}
 
@@ -36,14 +43,15 @@ class NotificationsManager {
 	 *  - msg_html: message as html string
 	 *  - msg_plain: message as plain text string
 	 */
-	private function _set_extra($notes) {
+	private function _set_extra($notes)
+	{
 		$rets = array();
-		foreach($notes as $n) {
-			$local_time = datetime_convert('UTC',date_default_timezone_get(),$n['date']);
+		foreach ($notes as $n) {
+			$local_time = datetime_convert('UTC', date_default_timezone_get(), $n['date']);
 			$n['timestamp'] = strtotime($local_time);
 			$n['date_rel'] = relative_date($n['date']);
 				$n['msg_html'] = bbcode($n['msg'], false, false, false, false);
-				$n['msg_plain'] = explode("\n",trim(html2plain($n['msg_html'], 0)))[0];
+				$n['msg_plain'] = explode("\n", trim(html2plain($n['msg_html'], 0)))[0];
 
 			$rets[] = $n;
 		}
@@ -54,16 +62,18 @@ class NotificationsManager {
 	/**
 	 * @brief Get all notifications for local_user()
 	 *
-	 * @param array $filter optional Array "column name"=>value: filter query by columns values
-	 * @param string $order optional Space separated list of column to sort by. prepend name with "+" to sort ASC, "-" to sort DESC. Default to "-date"
-	 * @param string $limit optional Query limits
+	 * @param array  $filter optional Array "column name"=>value: filter query by columns values
+	 * @param string $order  optional Space separated list of column to sort by.
+	 *                       Prepend name with "+" to sort ASC, "-" to sort DESC. Default to "-date"
+	 * @param string $limit  optional Query limits
 	 *
 	 * @return array of results or false on errors
 	 */
-	public function getAll($filter = array(), $order="-date", $limit="") {
+	public function getAll($filter = array(), $order = "-date", $limit = "")
+	{
 		$filter_str = array();
 		$filter_sql = "";
-		foreach($filter as $column => $value) {
+		foreach ($filter as $column => $value) {
 			$filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value));
 		}
 		if (count($filter_str)>0) {
@@ -72,29 +82,31 @@ class NotificationsManager {
 
 		$aOrder = explode(" ", $order);
 		$asOrder = array();
-		foreach($aOrder as $o) {
+		foreach ($aOrder as $o) {
 			$dir = "asc";
 			if ($o[0]==="-") {
 				$dir = "desc";
-				$o = substr($o,1);
+				$o = substr($o, 1);
 			}
 			if ($o[0]==="+") {
 				$dir = "asc";
-				$o = substr($o,1);
+				$o = substr($o, 1);
 			}
 			$asOrder[] = "$o $dir";
 		}
 		$order_sql = implode(", ", $asOrder);
 
-		if($limit!="")
+		if ($limit != "") {
 			$limit = " LIMIT ".$limit;
-
-			$r = q("SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit",
+		}
+			$r = q(
+				"SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit",
 				intval(local_user())
 			);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r)) {
 			return $this->_set_extra($r);
+		}
 
 		return false;
 	}
@@ -102,15 +114,17 @@ class NotificationsManager {
 	/**
 	 * @brief Get one note for local_user() by $id value
 	 *
-	 * @param int $id
+	 * @param int $id identity
 	 * @return array note values or null if not found
 	 */
-	public function getByID($id) {
-		$r = q("SELECT * FROM `notify` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+	public function getByID($id)
+	{
+		$r = q(
+			"SELECT * FROM `notify` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($id),
 			intval(local_user())
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			return $this->_set_extra($r)[0];
 		}
 		return null;
@@ -119,12 +133,14 @@ class NotificationsManager {
 	/**
 	 * @brief set seen state of $note of local_user()
 	 *
-	 * @param array $note
-	 * @param bool $seen optional true or false, default true
+	 * @param array $note note array
+	 * @param bool  $seen optional true or false, default true
 	 * @return bool true on success, false on errors
 	 */
-	public function setSeen($note, $seen = true) {
-		return q("UPDATE `notify` SET `seen` = %d WHERE ( `link` = '%s' OR ( `parent` != 0 AND `parent` = %d AND `otype` = '%s' )) AND `uid` = %d",
+	public function setSeen($note, $seen = true)
+	{
+		return q(
+			"UPDATE `notify` SET `seen` = %d WHERE ( `link` = '%s' OR ( `parent` != 0 AND `parent` = %d AND `otype` = '%s' )) AND `uid` = %d",
 			intval($seen),
 			dbesc($note['link']),
 			intval($note['parent']),
@@ -139,8 +155,10 @@ class NotificationsManager {
 	 * @param bool $seen optional true or false. default true
 	 * @return bool true on success, false on error
 	 */
-	public function setAllSeen($seen = true) {
-		return q("UPDATE `notify` SET `seen` = %d WHERE `uid` = %d",
+	public function setAllSeen($seen = true)
+	{
+		return q(
+			"UPDATE `notify` SET `seen` = %d WHERE `uid` = %d",
 			intval($seen),
 			intval(local_user())
 		);
@@ -151,7 +169,8 @@ class NotificationsManager {
 	 *
 	 * @return array with with notifications TabBar data
 	 */
-	public function getTabs() {
+	public function getTabs()
+	{
 		$tabs = array(
 			array(
 				'label' => t('System'),
@@ -196,8 +215,8 @@ class NotificationsManager {
 	/**
 	 * @brief Format the notification query in an usable array
 	 *
-	 * @param array $notifs The array from the db query
-	 * @param string $ident The notifications identifier (e.g. network)
+	 * @param array  $notifs The array from the db query
+	 * @param string $ident  The notifications identifier (e.g. network)
 	 * @return array
 	 *	string 'label' => The type of the notification
 	 *	string 'link' => URL to the source
@@ -208,13 +227,12 @@ class NotificationsManager {
 	 *	string 'ago' => T relative date of the notification
 	 *	bool 'seen' => Is the notification marked as "seen"
 	 */
-	private function formatNotifs($notifs, $ident = "") {
-
+	private function formatNotifs($notifs, $ident = "")
+	{
 		$notif = array();
 		$arr = array();
 
-		if (dbm::is_result($notifs)) {
-
+		if (DBM::is_result($notifs)) {
 			foreach ($notifs as $it) {
 				// Because we use different db tables for the notification query
 				// we have sometimes $it['unseen'] and sometimes $it['seen].
@@ -255,11 +273,10 @@ class NotificationsManager {
 									: sprintf(t("%s commented on %s's post"), $it['author-name'], $it['pname']));
 						$default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['created'], 'r');
 						$default_item_ago = relative_date($it['created']);
-
 				}
 
 				// Transform the different types of notification in an usable array
-				switch ($it['verb']){
+				switch ($it['verb']) {
 					case ACTIVITY_LIKE:
 						$notif = array(
 							'label' => 'like',
@@ -360,7 +377,6 @@ class NotificationsManager {
 		}
 
 		return $arr;
-
 	}
 
 	/**
@@ -370,13 +386,16 @@ class NotificationsManager {
 	 *	which aren't marked as "seen"
 	 * @return int Number of network notifications
 	 */
-	private function networkTotal($seen = 0) {
+	private function networkTotal($seen = 0)
+	{
 		$sql_seen = "";
 
-		if($seen === 0)
+		if ($seen === 0) {
 			$sql_seen = " AND `item`.`unseen` = 1 ";
+		}
 
-		$r = q("SELECT COUNT(*) AS `total`
+		$r = q(
+			"SELECT COUNT(*) AS `total`
 				FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
 				WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND
 				 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
@@ -384,8 +403,9 @@ class NotificationsManager {
 			intval(local_user())
 		);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r)) {
 			return $r[0]['total'];
+		}
 
 		return 0;
 	}
@@ -396,25 +416,28 @@ class NotificationsManager {
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
-	 * @param int $start Start the query at this point
-	 * @param int $limit Maximum number of query results
+	 * @param int        $start Start the query at this point
+	 * @param int        $limit Maximum number of query results
 	 *
 	 * @return array with
 	 *	string 'ident' => Notification identifier
 	 *	int 'total' => Total number of available network notifications
 	 *	array 'notifications' => Network notifications
 	 */
-	public function networkNotifs($seen = 0, $start = 0, $limit = 80) {
+	public function networkNotifs($seen = 0, $start = 0, $limit = 80)
+	{
 		$ident = 'network';
 		$total = $this->networkTotal($seen);
 		$notifs = array();
 		$sql_seen = "";
 
-		if($seen === 0)
+		if ($seen === 0) {
 			$sql_seen = " AND `item`.`unseen` = 1 ";
+		}
 
 
-		$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
+		$r = q(
+			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
 				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
 				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
 			FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
@@ -422,13 +445,14 @@ class NotificationsManager {
 				 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
 				$sql_seen
 			ORDER BY `item`.`created` DESC LIMIT %d, %d ",
-				intval(local_user()),
-				intval($start),
-				intval($limit)
+			intval(local_user()),
+			intval($start),
+			intval($limit)
 		);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r)) {
 			$notifs = $this->formatNotifs($r, $ident);
+		}
 
 		$arr = array (
 			'notifications' => $notifs,
@@ -446,18 +470,22 @@ class NotificationsManager {
 	 *	which aren't marked as "seen"
 	 * @return int Number of system notifications
 	 */
-	private function systemTotal($seen = 0) {
+	private function systemTotal($seen = 0)
+	{
 		$sql_seen = "";
 
-		if($seen === 0)
+		if ($seen === 0) {
 			$sql_seen = " AND `seen` = 0 ";
+		}
 
-		$r = q("SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen",
+		$r = q(
+			"SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen",
 			intval(local_user())
 		);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r)) {
 			return $r[0]['total'];
+		}
 
 		return 0;
 	}
@@ -468,32 +496,36 @@ class NotificationsManager {
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
-	 * @param int $start Start the query at this point
-	 * @param int $limit Maximum number of query results
+	 * @param int        $start Start the query at this point
+	 * @param int        $limit Maximum number of query results
 	 *
 	 * @return array with
 	 *	string 'ident' => Notification identifier
 	 *	int 'total' => Total number of available system notifications
 	 *	array 'notifications' => System notifications
 	 */
-	public function systemNotifs($seen = 0, $start = 0, $limit = 80) {
+	public function systemNotifs($seen = 0, $start = 0, $limit = 80)
+	{
 		$ident = 'system';
 		$total = $this->systemTotal($seen);
 		$notifs = array();
 		$sql_seen = "";
 
-		if($seen === 0)
+		if ($seen === 0) {
 			$sql_seen = " AND `seen` = 0 ";
+		}
 
-		$r = q("SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
+		$r = q(
+			"SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
 				WHERE `uid` = %d $sql_seen ORDER BY `date` DESC LIMIT %d, %d ",
 			intval(local_user()),
 			intval($start),
 			intval($limit)
 		);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r)) {
 			$notifs = $this->formatNotifs($r, $ident);
+		}
 
 		$arr = array (
 			'notifications' => $notifs,
@@ -509,12 +541,14 @@ class NotificationsManager {
 	 *
 	 * @return string The additional sql query
 	 */
-	private function _personal_sql_extra() {
+	private function _personal_sql_extra()
+	{
 		$myurl = System::baseUrl(true) . '/profile/'. $this->a->user['nickname'];
-		$myurl = substr($myurl,strpos($myurl,'://')+3);
-		$myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
-		$diasp_url = str_replace('/profile/','/u/',$myurl);
-		$sql_extra = sprintf(" AND ( `item`.`author-link` regexp '%s' OR `item`.`tag` regexp '%s' OR `item`.`tag` regexp '%s' ) ",
+		$myurl = substr($myurl, strpos($myurl, '://') + 3);
+		$myurl = str_replace(array('www.','.'), array('','\\.'), $myurl);
+		$diasp_url = str_replace('/profile/', '/u/', $myurl);
+		$sql_extra = sprintf(
+			" AND ( `item`.`author-link` regexp '%s' OR `item`.`tag` regexp '%s' OR `item`.`tag` regexp '%s' ) ",
 			dbesc($myurl . '$'),
 			dbesc($myurl . '\\]'),
 			dbesc($diasp_url . '\\]')
@@ -530,14 +564,17 @@ class NotificationsManager {
 	 *	which aren't marked as "seen"
 	 * @return int Number of personal notifications
 	 */
-	private function personalTotal($seen = 0) {
+	private function personalTotal($seen = 0)
+	{
 		$sql_seen = "";
 		$sql_extra = $this->_personal_sql_extra();
 
-		if($seen === 0)
+		if ($seen === 0) {
 			$sql_seen = " AND `item`.`unseen` = 1 ";
+		}
 
-		$r = q("SELECT COUNT(*) AS `total`
+		$r = q(
+			"SELECT COUNT(*) AS `total`
 				FROM `item` INNER JOIN `item` AS `pitem` ON  `pitem`.`id`=`item`.`parent`
 				WHERE `item`.`visible` = 1
 				$sql_extra
@@ -546,8 +583,9 @@ class NotificationsManager {
 			intval(local_user())
 		);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r)) {
 			return $r[0]['total'];
+		}
 
 		return 0;
 	}
@@ -558,25 +596,28 @@ class NotificationsManager {
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
-	 * @param int $start Start the query at this point
-	 * @param int $limit Maximum number of query results
+	 * @param int        $start Start the query at this point
+	 * @param int        $limit Maximum number of query results
 	 *
 	 * @return array with
 	 *	string 'ident' => Notification identifier
 	 *	int 'total' => Total number of available personal notifications
 	 *	array 'notifications' => Personal notifications
 	 */
-	public function personalNotifs($seen = 0, $start = 0, $limit = 80) {
+	public function personalNotifs($seen = 0, $start = 0, $limit = 80)
+	{
 		$ident = 'personal';
 		$total = $this->personalTotal($seen);
 		$sql_extra = $this->_personal_sql_extra();
 		$notifs = array();
 		$sql_seen = "";
 
-		if($seen === 0)
+		if ($seen === 0) {
 			$sql_seen = " AND `item`.`unseen` = 1 ";
+		}
 
-		$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
+		$r = q(
+			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
 				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
 				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
 			FROM `item` INNER JOIN `item` AS `pitem` ON  `pitem`.`id`=`item`.`parent`
@@ -584,14 +625,15 @@ class NotificationsManager {
 				$sql_extra
 				$sql_seen
 				AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0
-			ORDER BY `item`.`created` DESC LIMIT %d, %d " ,
-				intval(local_user()),
-				intval($start),
-				intval($limit)
+			ORDER BY `item`.`created` DESC LIMIT %d, %d ",
+			intval(local_user()),
+			intval($start),
+			intval($limit)
 		);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r)) {
 			$notifs = $this->formatNotifs($r, $ident);
+		}
 
 		$arr = array (
 			'notifications' => $notifs,
@@ -609,21 +651,25 @@ class NotificationsManager {
 	 *	which aren't marked as "seen"
 	 * @return int Number of home notifications
 	 */
-	private function homeTotal($seen = 0) {
+	private function homeTotal($seen = 0)
+	{
 		$sql_seen = "";
 
-		if($seen === 0)
+		if ($seen === 0) {
 			$sql_seen = " AND `item`.`unseen` = 1 ";
+		}
 
-		$r = q("SELECT COUNT(*) AS `total` FROM `item`
+		$r = q(
+			"SELECT COUNT(*) AS `total` FROM `item`
 				WHERE `item`.`visible` = 1 AND
 				 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1
 				$sql_seen",
 			intval(local_user())
 		);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r)) {
 			return $r[0]['total'];
+		}
 
 		return 0;
 	}
@@ -634,24 +680,27 @@ class NotificationsManager {
 	 * @param int|string $seen
 	 *	If 0 only include notifications into the query
 	 *	which aren't marked as "seen"
-	 * @param int $start Start the query at this point
-	 * @param int $limit Maximum number of query results
+	 * @param int        $start Start the query at this point
+	 * @param int        $limit Maximum number of query results
 	 *
 	 * @return array with
 	 *	string 'ident' => Notification identifier
 	 *	int 'total' => Total number of available home notifications
 	 *	array 'notifications' => Home notifications
 	 */
-	public function homeNotifs($seen = 0, $start = 0, $limit = 80) {
+	public function homeNotifs($seen = 0, $start = 0, $limit = 80)
+	{
 		$ident = 'home';
 		$total = $this->homeTotal($seen);
 		$notifs = array();
 		$sql_seen = "";
 
-		if($seen === 0)
+		if ($seen === 0) {
 			$sql_seen = " AND `item`.`unseen` = 1 ";
+		}
 
-		$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
+		$r = q(
+			"SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, `item`.`unseen`,
 				`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` AS `object`,
 				`pitem`.`author-name` AS `pname`, `pitem`.`author-link` AS `plink`, `pitem`.`guid` AS `pguid`
 			FROM `item` INNER JOIN `item` AS `pitem` ON `pitem`.`id`=`item`.`parent`
@@ -659,13 +708,14 @@ class NotificationsManager {
 				 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 1
 				$sql_seen
 			ORDER BY `item`.`created` DESC LIMIT %d, %d ",
-				intval(local_user()),
-				intval($start),
-				intval($limit)
+			intval(local_user()),
+			intval($start),
+			intval($limit)
 		);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r)) {
 			$notifs = $this->formatNotifs($r, $ident);
+		}
 
 		$arr = array (
 			'notifications' => $notifs,
@@ -683,19 +733,23 @@ class NotificationsManager {
 	 *	which aren't marked as ignored
 	 * @return int Number of introductions
 	 */
-	private function introTotal($all = false) {
+	private function introTotal($all = false)
+	{
 		$sql_extra = "";
 
-		if(!$all)
+		if (!$all) {
 			$sql_extra = " AND `ignore` = 0 ";
+		}
 
-		$r = q("SELECT COUNT(*) AS `total` FROM `intro`
+		$r = q(
+			"SELECT COUNT(*) AS `total` FROM `intro`
 			WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
-				intval($_SESSION['uid'])
+			intval($_SESSION['uid'])
 		);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r)) {
 			return $r[0]['total'];
+		}
 
 		return 0;
 	}
@@ -720,11 +774,13 @@ class NotificationsManager {
 		$notifs = array();
 		$sql_extra = "";
 
-		if(!$all)
+		if (!$all) {
 			$sql_extra = " AND `ignore` = 0 ";
+		}
 
 		/// @todo Fetch contact details by "get_contact_details_by_url" instead of queries to contact, fcontact and gcontact
-		$r = q("SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*,
+		$r = q(
+			"SELECT `intro`.`id` AS `intro_id`, `intro`.*, `contact`.*,
 				`fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`,
 				`fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`,
 				`gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`,
@@ -736,13 +792,14 @@ class NotificationsManager {
 				LEFT JOIN `fcontact` ON `intro`.`fid` = `fcontact`.`id`
 			WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0
 			LIMIT %d, %d",
-				intval($_SESSION['uid']),
-				intval($start),
-				intval($limit)
+			intval($_SESSION['uid']),
+			intval($start),
+			intval($limit)
 		);
 
-		if (dbm::is_result($r))
+		if (DBM::is_result($r)) {
 			$notifs = $this->formatIntros($r);
+		}
 
 		$arr = array (
 			'ident' => $ident,
@@ -759,16 +816,16 @@ class NotificationsManager {
 	 * @param array $intros The array from the db query
 	 * @return array with the introductions
 	 */
-	private function formatIntros($intros) {
+	private function formatIntros($intros)
+	{
 		$knowyou = '';
 
-		foreach($intros as $it) {
+		foreach ($intros as $it) {
 			// There are two kind of introduction. Contacts suggested by other contacts and normal connection requests.
 			// We have to distinguish between these two because they use different data.
 
 			// Contact suggestions
-			if($it['fid']) {
-
+			if ($it['fid']) {
 				$return_addr = bin2hex($this->a->user['nickname'] . '@' . $this->a->get_hostname() . (($this->a->path) ? '/' . $this->a->path : ''));
 
 				$intro = array(
@@ -777,25 +834,23 @@ class NotificationsManager {
 					'intro_id' => $it['intro_id'],
 					'madeby' => $it['name'],
 					'contact_id' => $it['contact-id'],
-					'photo' => ((x($it,'fphoto')) ? proxy_url($it['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
+					'photo' => ((x($it, 'fphoto')) ? proxy_url($it['fphoto'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
 					'name' => $it['fname'],
 					'url' => zrl($it['furl']),
 					'hidden' => $it['hidden'] == 1,
-					'post_newfriend' => (intval(PConfig::get(local_user(),'system','post_newfriend')) ? '1' : 0),
-
+					'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
 					'knowyou' => $knowyou,
 					'note' => $it['note'],
 					'request' => $it['frequest'] . '?addr=' . $return_addr,
 
 				);
 
-			// Normal connection requests
+				// Normal connection requests
 			} else {
-
 				$it = $this->getMissingIntroData($it);
 
 				// Don't show these data until you are connected. Diaspora is doing the same.
-				if($it['gnetwork'] === NETWORK_DIASPORA) {
+				if ($it['gnetwork'] === NETWORK_DIASPORA) {
 					$it['glocation'] = "";
 					$it['gabout'] = "";
 					$it['ggender'] = "";
@@ -807,14 +862,14 @@ class NotificationsManager {
 					'uid' => $_SESSION['uid'],
 					'intro_id' => $it['intro_id'],
 					'contact_id' => $it['contact-id'],
-					'photo' => ((x($it,'photo')) ? proxy_url($it['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
+					'photo' => ((x($it, 'photo')) ? proxy_url($it['photo'], false, PROXY_SIZE_SMALL) : "images/person-175.jpg"),
 					'name' => $it['name'],
 					'location' => bbcode($it['glocation'], false, false),
 					'about' => bbcode($it['gabout'], false, false),
 					'keywords' => $it['gkeywords'],
 					'gender' => $it['ggender'],
 					'hidden' => $it['hidden'] == 1,
-					'post_newfriend' => (intval(PConfig::get(local_user(),'system','post_newfriend')) ? '1' : 0),
+					'post_newfriend' => (intval(PConfig::get(local_user(), 'system', 'post_newfriend')) ? '1' : 0),
 					'url' => $it['url'],
 					'zrl' => zrl($it['url']),
 					'addr' => $it['gaddr'],
@@ -838,7 +893,8 @@ class NotificationsManager {
 	 *
 	 * @return array The array with the intro data
 	 */
-	private function getMissingIntroData($arr) {
+	private function getMissingIntroData($arr)
+	{
 		// If the network and the addr isn't available from the gcontact
 		// table entry, take the one of the contact table entry
 		if ($arr['gnetwork'] == "") {
diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 1c64888247..b60dcd1b32 100644
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -1,8 +1,8 @@
 <?php
 namespace Friendica\Core;
 
+use Friendica\Database\DBM;
 use dba;
-use dbm;
 
 /**
  * @file include/Core/PConfig.php
@@ -37,7 +37,7 @@ class PConfig {
 		$a = get_app();
 
 		$r = dba::select('pconfig', array('v', 'k'), array('cat' => $family, 'uid' => $uid));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			while ($rr = dba::fetch($r)) {
 				$k = $rr['k'];
 				$a->config[$uid][$family][$k] = $rr['v'];
@@ -90,7 +90,7 @@ class PConfig {
 		}
 
 		$ret = dba::select('pconfig', array('v'), array('uid' => $uid, 'cat' => $family, 'k' => $key), array('limit' => 1));
-		if (dbm::is_result($ret)) {
+		if (DBM::is_result($ret)) {
 			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret['v']) ? unserialize($ret['v']) : $ret['v']);
 			$a->config[$uid][$family][$key] = $val;
 			self::$in_db[$uid][$family][$key] = true;
diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index e1787071cb..76bd9fd077 100644
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -5,10 +5,10 @@ use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Util\Lock;
 
 use dba;
-use dbm;
 
 /**
  * @file src/Core/Worker.php
@@ -142,7 +142,7 @@ class Worker {
 	 */
 	private static function totalEntries() {
 		$s = dba::fetch_first("SELECT COUNT(*) AS `total` FROM `workerqueue` WHERE `executed` <= ? AND NOT `done`", NULL_DATE);
-		if (dbm::is_result($s)) {
+		if (DBM::is_result($s)) {
 			return $s["total"];
 		} else {
 			return 0;
@@ -157,7 +157,7 @@ class Worker {
 	private static function highestPriority() {
 		$condition = array("`executed` <= ? AND NOT `done`", NULL_DATE);
 		$s = dba::select('workerqueue', array('priority'), $condition, array('limit' => 1, 'order' => array('priority')));
-		if (dbm::is_result($s)) {
+		if (DBM::is_result($s)) {
 			return $s["priority"];
 		} else {
 			return 0;
@@ -405,7 +405,7 @@ class Worker {
 		if ($max == 0) {
 			// the maximum number of possible user connections can be a system variable
 			$r = dba::fetch_first("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'");
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$max = $r["Value"];
 			}
 			// Or it can be granted. This overrides the system variable
@@ -441,7 +441,7 @@ class Worker {
 		// We will now check for the system values.
 		// This limit could be reached although the user limits are fine.
 		$r = dba::fetch_first("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return false;
 		}
 		$max = intval($r["Value"]);
@@ -449,7 +449,7 @@ class Worker {
 			return false;
 		}
 		$r = dba::fetch_first("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return false;
 		}
 		$used = intval($r["Value"]);
@@ -631,7 +631,7 @@ class Worker {
 				INNER JOIN `workerqueue` ON `workerqueue`.`pid` = `process`.`pid` AND NOT `done`");
 
 		// No active processes at all? Fine
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return false;
 		}
 		$priorities = array();
@@ -754,7 +754,7 @@ class Worker {
 
 		// There can already be jobs for us in the queue.
 		$r = dba::select('workerqueue', array(), array('pid' => getmypid(), 'done' => false));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			self::$db_duration += (microtime(true) - $stamp);
 			return dba::inArray($r);
 		}
diff --git a/include/dbm.php b/src/Database/DBM.php
similarity index 80%
rename from include/dbm.php
rename to src/Database/DBM.php
index 1be1647a46..9495a264cc 100644
--- a/include/dbm.php
+++ b/src/Database/DBM.php
@@ -1,10 +1,18 @@
 <?php
+/**
+ * @file src/Database/DBM.php
+ */
+namespace Friendica\Database;
+
+use dba;
+
 /**
  * @brief This class contain functions for the database management
  *
  * This class contains functions that doesn't need to know if pdo, mysqli or whatever is used.
  */
-class dbm {
+class DBM
+{
 	/**
 	 * @brief Return a list of database processes
 	 *
@@ -12,7 +20,8 @@ class dbm {
 	 *      'list' => List of processes, separated in their different states
 	 *      'amount' => Number of concurrent database processes
 	 */
-	public static function processlist() {
+	public static function processlist()
+	{
 		$r = q("SHOW PROCESSLIST");
 		$s = array();
 
@@ -30,8 +39,9 @@ class dbm {
 
 		$statelist = "";
 		foreach ($states AS $state => $usage) {
-			if ($statelist != "")
+			if ($statelist != "") {
 				$statelist .= ", ";
+			}
 			$statelist .= $state.": ".$usage;
 		}
 		return(array("list" => $statelist, "amount" => $processes));
@@ -40,10 +50,12 @@ class dbm {
 	/**
 	 * Checks if $array is a filled array with at least one entry.
 	 *
-	 * @param       $array  mixed   A filled array with at least one entry
-	 * @return      Whether $array is a filled array or an object with rows
+	 * @param mixed $array A filled array with at least one entry
+	 *
+	 * @return boolean Whether $array is a filled array or an object with rows
 	 */
-	public static function is_result($array) {
+	public static function is_result($array)
+	{
 		// It could be a return value from an update statement
 		if (is_bool($array)) {
 			return $array;
@@ -59,12 +71,12 @@ class dbm {
 	/**
 	 * @brief Callback function for "esc_array"
 	 *
-	 * @param mixed $value Array value
-	 * @param string $key Array key
+	 * @param mixed   $value         Array value
+	 * @param string  $key           Array key
 	 * @param boolean $add_quotation add quotation marks for string values
 	 */
-	private static function esc_array_callback(&$value, $key, $add_quotation) {
-
+	private static function esc_array_callback(&$value, $key, $add_quotation)
+	{
 		if (!$add_quotation) {
 			if (is_bool($value)) {
 				$value = ($value ? '1' : '0');
@@ -86,10 +98,11 @@ class dbm {
 	/**
 	 * @brief Escapes a whole array
 	 *
-	 * @param mixed $arr Array with values to be escaped
+	 * @param mixed   $arr           Array with values to be escaped
 	 * @param boolean $add_quotation add quotation marks for string values
 	 */
-	public static function esc_array(&$arr, $add_quotation = false) {
+	public static function esc_array(&$arr, $add_quotation = false)
+	{
 		array_walk($arr, 'self::esc_array_callback', $add_quotation);
 	}
 
@@ -97,9 +110,11 @@ class dbm {
 	 * Checks Converts any date string into a SQL compatible date string
 	 *
 	 * @param string $date a date string in any format
+	 *
 	 * @return string SQL style date string
 	 */
-	public static function date($date = 'now') {
+	public static function date($date = 'now')
+	{
 		$timestamp = strtotime($date);
 
 		// Don't allow lower date strings as '0001-01-01 00:00:00'
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 2f79fe80e1..84a0344f32 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -11,9 +11,9 @@ namespace Friendica\Network;
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 
 use dba;
-use dbm;
 use Cache;
 use xml;
 
@@ -397,7 +397,7 @@ class Probe {
 					}
 				}
 
-				$fields['updated'] = dbm::date();
+				$fields['updated'] = DBM::date();
 
 				$condition = array('nurl' => normalise_link($data["url"]));
 
@@ -420,7 +420,7 @@ class Probe {
 						'confirm' => $data['confirm'],
 						'poco' => $data['poco'],
 						'network' => $data['network'],
-						'success_update' => dbm::date());
+						'success_update' => DBM::date());
 
 				$fieldnames = array();
 
@@ -1501,7 +1501,7 @@ class Probe {
 
 			$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
 
-			if (dbm::is_result($x) && dbm::is_result($r)) {
+			if (DBM::is_result($x) && DBM::is_result($r)) {
 				$mailbox = construct_mailbox_name($r[0]);
 				$password = '';
 				openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
diff --git a/src/ParseUrl.php b/src/ParseUrl.php
index d6b6b60272..217ca25d9f 100644
--- a/src/ParseUrl.php
+++ b/src/ParseUrl.php
@@ -1,10 +1,8 @@
 <?php
-
 /**
  * @file include/ParseUrl.php
  * @brief Get informations about a given URL
  */
-
 namespace Friendica;
 
 use Friendica\Core\Config;
@@ -15,24 +13,23 @@ use dba;
 use DomXPath;
 use DOMDocument;
 
-require_once("include/network.php");
-require_once("include/Photo.php");
-require_once("include/oembed.php");
-require_once("include/xml.php");
+require_once "include/network.php";
+require_once "include/Photo.php";
+require_once "include/oembed.php";
 
 /**
  * @brief Class with methods for extracting certain content from an url
  */
-class ParseUrl {
-
+class ParseUrl
+{
 	/**
 	 * @brief Search for chached embeddable data of an url otherwise fetch it
 	 *
-	 * @param type $url The url of the page which should be scraped
+	 * @param type $url         The url of the page which should be scraped
 	 * @param type $no_guessing If true the parse doens't search for
-	 *    preview pictures
-	 * @param type $do_oembed The false option is used by the function fetch_oembed()
-	 *    to avoid endless loops
+	 *                          preview pictures
+	 * @param type $do_oembed   The false option is used by the function fetch_oembed()
+	 *                          to avoid endless loops
 	 *
 	 * @return array which contains needed data for embedding
 	 *    string 'url' => The url of the parsed page
@@ -47,14 +44,18 @@ class ParseUrl {
 	 * @see ParseUrl::getSiteinfo() for more information about scraping
 	 * embeddable content
 	 */
-	public static function getSiteinfoCached($url, $no_guessing = false, $do_oembed = true) {
-
+	public static function getSiteinfoCached($url, $no_guessing = false, $do_oembed = true)
+	{
 		if ($url == "") {
 			return false;
 		}
 
-		$r = q("SELECT * FROM `parsed_url` WHERE `url` = '%s' AND `guessing` = %d AND `oembed` = %d",
-			dbesc(normalise_link($url)), intval(!$no_guessing), intval($do_oembed));
+		$r = q(
+			"SELECT * FROM `parsed_url` WHERE `url` = '%s' AND `guessing` = %d AND `oembed` = %d",
+			dbesc(normalise_link($url)),
+			intval(!$no_guessing),
+			intval($do_oembed)
+		);
 
 		if ($r) {
 			$data = $r[0]["content"];
@@ -67,9 +68,14 @@ class ParseUrl {
 
 		$data = self::getSiteinfo($url, $no_guessing, $do_oembed);
 
-		dba::insert('parsed_url', array('url' => normalise_link($url), 'guessing' => !$no_guessing,
+		dba::insert(
+			'parsed_url',
+			array(
+				'url' => normalise_link($url), 'guessing' => !$no_guessing,
 				'oembed' => $do_oembed, 'content' => serialize($data),
-				'created' => datetime_convert()), true);
+				'created' => datetime_convert()),
+			true
+		);
 
 		return $data;
 	}
@@ -83,12 +89,12 @@ class ParseUrl {
 	 * like \<title\>Awesome Title\</title\> or
 	 * \<meta name="description" content="An awesome description"\>
 	 *
-	 * @param type $url The url of the page which should be scraped
+	 * @param type $url         The url of the page which should be scraped
 	 * @param type $no_guessing If true the parse doens't search for
-	 *    preview pictures
-	 * @param type $do_oembed The false option is used by the function fetch_oembed()
-	 *    to avoid endless loops
-	 * @param type $count Internal counter to avoid endless loops
+	 *                          preview pictures
+	 * @param type $do_oembed   The false option is used by the function fetch_oembed()
+	 *                          to avoid endless loops
+	 * @param type $count       Internal counter to avoid endless loops
 	 *
 	 * @return array which contains needed data for embedding
 	 *    string 'url' => The url of the parsed page
@@ -113,8 +119,8 @@ class ParseUrl {
 	 * </body>
 	 * @endverbatim
 	 */
-	public static function getSiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1) {
-
+	public static function getSiteinfo($url, $no_guessing = false, $do_oembed = true, $count = 1)
+	{
 		$a = get_app();
 
 		$siteinfo = array();
@@ -158,7 +164,6 @@ class ParseUrl {
 		$body = $data["body"];
 
 		if ($do_oembed) {
-
 			$oembed_data = oembed_fetch_url($url);
 
 			if (!in_array($oembed_data->type, array("error", "rich", ""))) {
@@ -364,8 +369,7 @@ class ParseUrl {
 									"width" => $photodata[0],
 									"height" => $photodata[1]);
 				}
-
-				}
+			}
 		} elseif ($siteinfo["image"] != "") {
 			$src = self::completeUrl($siteinfo["image"], $url);
 
@@ -433,7 +437,8 @@ class ParseUrl {
 	 * @param string $string Tags
 	 * @return array with formatted Hashtags
 	 */
-	public static function convertTagsToArray($string) {
+	public static function convertTagsToArray($string)
+	{
 		$arr_tags = str_getcsv($string);
 		if (count($arr_tags)) {
 			// add the # sign to every tag
@@ -449,9 +454,10 @@ class ParseUrl {
 	 *  This method is used as callback function
 	 *
 	 * @param string $tag The pure tag name
-	 * @param int $k Counter for internal use
+	 * @param int    $k   Counter for internal use
 	 */
-	private static function arrAddHashes(&$tag, $k) {
+	private static function arrAddHashes(&$tag, $k)
+	{
 		$tag = "#" . $tag;
 	}
 
@@ -462,14 +468,15 @@ class ParseUrl {
 	 * can miss the scheme so we need to add the correct
 	 * scheme
 	 *
-	 * @param string $url The url which possibly does have
-	 *    a missing scheme (a link to an image)
+	 * @param string $url    The url which possibly does have
+	 *                       a missing scheme (a link to an image)
 	 * @param string $scheme The url with a correct scheme
-	 *    (e.g. the url from the webpage which does contain the image)
+	 *                       (e.g. the url from the webpage which does contain the image)
 	 *
 	 * @return string The url with a scheme
 	 */
-	private static function completeUrl($url, $scheme) {
+	private static function completeUrl($url, $scheme)
+	{
 		$urlarr = parse_url($url);
 
 		// If the url does allready have an scheme
@@ -486,7 +493,7 @@ class ParseUrl {
 			$complete .= ":".$schemearr["port"];
 		}
 
-		if (strpos($urlarr["path"],"/") !== 0) {
+		if (strpos($urlarr["path"], "/") !== 0) {
 			$complete .= "/";
 		}
 
diff --git a/include/dfrn.php b/src/Protocol/DFRN.php
similarity index 82%
rename from include/dfrn.php
rename to src/Protocol/DFRN.php
index b4a29615d3..f400d033ea 100644
--- a/include/dfrn.php
+++ b/src/Protocol/DFRN.php
@@ -6,32 +6,38 @@
  * @see https://github.com/friendica/friendica/wiki/Protocol and
  * https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
  */
+namespace Friendica\Protocol;
 
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
-require_once("include/Contact.php");
-require_once("include/ostatus.php");
-require_once("include/enotify.php");
-require_once("include/threads.php");
-require_once("include/socgraph.php");
-require_once("include/items.php");
-require_once("include/tags.php");
-require_once("include/files.php");
-require_once("include/event.php");
-require_once("include/text.php");
-require_once("include/oembed.php");
-require_once("include/html2bbcode.php");
-require_once("include/bbcode.php");
-require_once("include/xml.php");
+use dba;
+use DOMDocument;
+use DomXPath;
+use ostatus;
+use xml;
+
+require_once "include/Contact.php";
+require_once "include/enotify.php";
+require_once "include/threads.php";
+require_once "include/socgraph.php";
+require_once "include/items.php";
+require_once "include/tags.php";
+require_once "include/files.php";
+require_once "include/event.php";
+require_once "include/text.php";
+require_once "include/oembed.php";
+require_once "include/html2bbcode.php";
+require_once "include/bbcode.php";
 
 /**
  * @brief This class contain functions to create and send DFRN XML files
- *
  */
-class dfrn {
+class DFRN
+{
 
 	const DFRN_TOP_LEVEL = 0;	// Top level posting
 	const DFRN_REPLY = 1;		// Regular reply that is stored locally
@@ -48,8 +54,8 @@ class dfrn {
 	 * @return string DFRN entries
 	 * @todo Add type-hints
 	 */
-	public static function entries($items,$owner) {
-
+	public static function entries($items, $owner)
+	{
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;
 
@@ -72,16 +78,16 @@ class dfrn {
 	 *
 	 * This function is called when another server is pulling data from the user feed.
 	 *
-	 * @param string $dfrn_id DFRN ID from the requesting party
-	 * @param string $owner_nick Owner nick name
-	 * @param string $last_update Date of the last update
-	 * @param int $direction Can be -1, 0 or 1.
-	 * @param boolean $onlyheader Output only the header without content? (Default is "no")
+	 * @param string  $dfrn_id     DFRN ID from the requesting party
+	 * @param string  $owner_nick  Owner nick name
+	 * @param string  $last_update Date of the last update
+	 * @param int     $direction   Can be -1, 0 or 1.
+	 * @param boolean $onlyheader  Output only the header without content? (Default is "no")
 	 *
 	 * @return string DFRN feed entries
 	 */
-	public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false) {
-
+	public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false)
+	{
 		$a = get_app();
 
 		$sitefeed    = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
@@ -109,13 +115,14 @@ class dfrn {
 
 		$sql_extra = " AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = '' ";
 
-		$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
+		$r = q(
+			"SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
 			FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
 			WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
 			dbesc($owner_nick)
 		);
 
-		if (! dbm::is_result($r)) {
+		if (! DBM::is_result($r)) {
 			killme();
 		}
 
@@ -126,9 +133,8 @@ class dfrn {
 		$sql_post_table = "";
 
 		if (! $public_feed) {
-
 			$sql_extra = '';
-			switch($direction) {
+			switch ($direction) {
 				case (-1):
 					$sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
 					$my_id = $dfrn_id;
@@ -146,16 +152,17 @@ class dfrn {
 					break; // NOTREACHED
 			}
 
-			$r = q("SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1",
+			$r = q(
+				"SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1",
 				intval($owner_id)
 			);
 
-			if (! dbm::is_result($r)) {
+			if (! DBM::is_result($r)) {
 				killme();
 			}
 
 			$contact = $r[0];
-			require_once('include/security.php');
+			include_once 'include/security.php';
 			$groups = init_groups_visitor($contact['id']);
 
 			if (count($groups)) {
@@ -166,7 +173,8 @@ class dfrn {
 				$gs = '<<>>' ; // Impossible to match
 			}
 
-			$sql_extra = sprintf("
+			$sql_extra = sprintf(
+				"
 				AND ( `allow_cid` = '' OR     `allow_cid` REGEXP '<%d>' )
 				AND ( `deny_cid`  = '' OR NOT `deny_cid`  REGEXP '<%d>' )
 				AND ( `allow_gid` = '' OR     `allow_gid` REGEXP '%s' )
@@ -190,8 +198,13 @@ class dfrn {
 		}
 
 		if (isset($category)) {
-			$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
-					dbesc(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($owner_id));
+			$sql_post_table = sprintf(
+				"INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
+				dbesc(protect_sprintf($category)),
+				intval(TERM_OBJ_POST),
+				intval(TERM_CATEGORY),
+				intval($owner_id)
+			);
 			//$sql_extra .= file_tag_file_query('item',$category,'category');
 		}
 
@@ -201,9 +214,10 @@ class dfrn {
 			}
 		}
 
-		$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
+		$check_date = datetime_convert('UTC', 'UTC', $last_update, 'Y-m-d H:i:s');
 
-		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+		$r = q(
+			"SELECT `item`.*, `item`.`id` AS `item_id`,
 			`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
 			`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
 			`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
@@ -248,7 +262,7 @@ class dfrn {
 		/// @TODO This hook can't work anymore
 		//	call_hooks('atom_feed', $atom);
 
-		if (!dbm::is_result($items) || $onlyheader) {
+		if (!DBM::is_result($items) || $onlyheader) {
 			$atom = trim($doc->saveXML());
 
 			call_hooks('atom_feed_end', $atom);
@@ -257,7 +271,6 @@ class dfrn {
 		}
 
 		foreach ($items as $item) {
-
 			// prevent private email from leaking.
 			if ($item['network'] == NETWORK_MAIL) {
 				continue;
@@ -277,7 +290,6 @@ class dfrn {
 
 			$entry = self::entry($doc, $type, $item, $owner, true);
 			$root->appendChild($entry);
-
 		}
 
 		$atom = trim($doc->saveXML());
@@ -290,19 +302,21 @@ class dfrn {
 	/**
 	 * @brief Generate an atom entry for a given item id
 	 *
-	 * @param int $item_id The item id
+	 * @param int     $item_id      The item id
 	 * @param boolean $conversation Show the conversation. If false show the single post.
 	 *
 	 * @return string DFRN feed entry
 	 */
-	public static function itemFeed($item_id, $conversation = false) {
+	public static function itemFeed($item_id, $conversation = false)
+	{
 		if ($conversation) {
 			$condition = '`item`.`parent`';
 		} else {
 			$condition = '`item`.`id`';
 		}
 
-		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
+		$r = q(
+			"SELECT `item`.*, `item`.`id` AS `item_id`,
 			`contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`,
 			`contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`,
 			`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
@@ -317,20 +331,21 @@ class dfrn {
 			intval($item_id)
 		);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			killme();
 		}
 
 		$items = $r;
 		$item = $r[0];
 
-		$r = q("SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
+		$r = q(
+			"SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
 			FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
 			WHERE `contact`.`self` AND `user`.`uid` = %d LIMIT 1",
 			intval($item['uid'])
 		);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			killme();
 		}
 
@@ -371,13 +386,14 @@ class dfrn {
 	/**
 	 * @brief Create XML text for DFRN mails
 	 *
-	 * @param array $item message elements
+	 * @param array $item  message elements
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN mail
 	 * @todo Add type-hints
 	 */
-	public static function mail($item, $owner) {
+	public static function mail($item, $owner)
+	{
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;
 
@@ -406,13 +422,14 @@ class dfrn {
 	/**
 	 * @brief Create XML text for DFRN friend suggestions
 	 *
-	 * @param array $item suggestion elements
+	 * @param array $item  suggestion elements
 	 * @param array $owner Owner record
 	 *
 	 * @return string DFRN suggestions
 	 * @todo Add type-hints
 	 */
-	public static function fsuggest($item, $owner) {
+	public static function fsuggest($item, $owner)
+	{
 		$doc = new DOMDocument('1.0', 'utf-8');
 		$doc->formatOutput = true;
 
@@ -435,23 +452,27 @@ class dfrn {
 	 * @brief Create XML text for DFRN relocations
 	 *
 	 * @param array $owner Owner record
-	 * @param int $uid User ID
+	 * @param int   $uid   User ID
 	 *
 	 * @return string DFRN relocations
 	 * @todo Add type-hints
 	 */
-	public static function relocate($owner, $uid) {
+	public static function relocate($owner, $uid)
+	{
 
 		/* get site pubkey. this could be a new installation with no site keys*/
-		$pubkey = Config::get('system','site_pubkey');
+		$pubkey = Config::get('system', 'site_pubkey');
 		if (! $pubkey) {
 			$res = new_keypair(1024);
-			Config::set('system','site_prvkey', $res['prvkey']);
-			Config::set('system','site_pubkey', $res['pubkey']);
+			Config::set('system', 'site_prvkey', $res['prvkey']);
+			Config::set('system', 'site_pubkey', $res['pubkey']);
 		}
 
-		$rp = q("SELECT `resource-id` , `scale`, type FROM `photo`
-				WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid);
+		$rp = q(
+			"SELECT `resource-id` , `scale`, type FROM `photo`
+				WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;",
+			$uid
+		);
 		$photos = array();
 		$ext = Photo::supportedTypes();
 
@@ -489,16 +510,17 @@ class dfrn {
 	/**
 	 * @brief Adds the header elements for the DFRN protocol
 	 *
-	 * @param object $doc XML document
-	 * @param array $owner Owner record
+	 * @param object $doc           XML document
+	 * @param array  $owner         Owner record
 	 * @param string $authorelement Element name for the author
 	 * @param string $alternatelink link to profile or category
-	 * @param bool $public Is it a header for public posts?
+	 * @param bool   $public        Is it a header for public posts?
 	 *
 	 * @return object XML root object
 	 * @todo Add type-hints
 	 */
-	private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) {
+	private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false)
+	{
 
 		if ($alternatelink == "") {
 			$alternatelink = $owner['url'];
@@ -565,20 +587,22 @@ class dfrn {
 	/**
 	 * @brief Adds the author element in the header for the DFRN protocol
 	 *
-	 * @param object $doc XML document
-	 * @param array $owner Owner record
+	 * @param object $doc           XML document
+	 * @param array  $owner         Owner record
 	 * @param string $authorelement Element name for the author
 	 *
 	 * @return object XML author object
 	 * @todo Add type-hints
 	 */
-	private static function add_author($doc, $owner, $authorelement, $public) {
-
+	private static function add_author($doc, $owner, $authorelement, $public)
+	{
 		// Is the profile hidden or shouldn't be published in the net? Then add the "hide" element
-		$r = q("SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
+		$r = q(
+			"SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
 				WHERE (`hidewall` OR NOT `net-publish`) AND `user`.`uid` = %d",
-			intval($owner['uid']));
-		if (dbm::is_result($r)) {
+			intval($owner['uid'])
+		);
+		if (DBM::is_result($r)) {
 			$hidewall = true;
 		} else {
 			$hidewall = false;
@@ -623,18 +647,21 @@ class dfrn {
 
 		$birthday = feed_birthday($owner['uid'], $owner['timezone']);
 
-		if ($birthday)
+		if ($birthday) {
 			xml::add_element($doc, $author, "dfrn:birthday", $birthday);
+		}
 
 		// Only show contact details when we are allowed to
-		$r = q("SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`,
+		$r = q(
+			"SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`,
 				`user`.`timezone`, `profile`.`locality`, `profile`.`region`, `profile`.`country-name`,
 				`profile`.`pub_keywords`, `profile`.`xmpp`, `profile`.`dob`
 			FROM `profile`
 				INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
 				WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d",
-			intval($owner['uid']));
-		if (dbm::is_result($r)) {
+			intval($owner['uid'])
+		);
+		if (DBM::is_result($r)) {
 			$profile = $r[0];
 
 			xml::add_element($doc, $author, "poco:displayName", $profile["name"]);
@@ -666,7 +693,6 @@ class dfrn {
 				foreach ($keywords AS $keyword) {
 					xml::add_element($doc, $author, "poco:tags", trim($keyword));
 				}
-
 			}
 
 			if (trim($profile["xmpp"]) != "") {
@@ -704,15 +730,16 @@ class dfrn {
 	/**
 	 * @brief Adds the author elements in the "entry" elements of the DFRN protocol
 	 *
-	 * @param object $doc XML document
-	 * @param string $element Element name for the author
+	 * @param object $doc         XML document
+	 * @param string $element     Element name for the author
 	 * @param string $contact_url Link of the contact
-	 * @param array $items Item elements
+	 * @param array  $item        Item elements
 	 *
 	 * @return object XML author object
 	 * @todo Add type-hints
 	 */
-	private static function add_entry_author($doc, $element, $contact_url, $item) {
+	private static function add_entry_author($doc, $element, $contact_url, $item)
+	{
 
 		$contact = get_contact_details_by_url($contact_url, $item["uid"]);
 
@@ -746,15 +773,15 @@ class dfrn {
 	/**
 	 * @brief Adds the activity elements
 	 *
-	 * @param object $doc XML document
-	 * @param string $element Element name for the activity
+	 * @param object $doc      XML document
+	 * @param string $element  Element name for the activity
 	 * @param string $activity activity value
 	 *
 	 * @return object XML activity object
 	 * @todo Add type-hints
 	 */
-	private static function create_activity($doc, $element, $activity) {
-
+	private static function create_activity($doc, $element, $activity)
+	{
 		if ($activity) {
 			$entry = $doc->createElement($element);
 
@@ -809,19 +836,20 @@ class dfrn {
 	/**
 	 * @brief Adds the elements for attachments
 	 *
-	 * @param object $doc XML document
+	 * @param object $doc  XML document
 	 * @param object $root XML root
-	 * @param array $item Item element
+	 * @param array  $item Item element
 	 *
 	 * @return object XML attachment object
 	 * @todo Add type-hints
 	 */
-	private static function get_attachment($doc, $root, $item) {
-		$arr = explode('[/attach],',$item['attach']);
+	private static function get_attachment($doc, $root, $item)
+	{
+		$arr = explode('[/attach],', $item['attach']);
 		if (count($arr)) {
 			foreach ($arr as $r) {
 				$matches = false;
-				$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
+				$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches);
 				if ($cnt) {
 					$attributes = array("rel" => "enclosure",
 							"href" => $matches[1],
@@ -844,19 +872,19 @@ class dfrn {
 	/**
 	 * @brief Adds the "entry" elements for the DFRN protocol
 	 *
-	 * @param object $doc XML document
-	 * @param string $type "text" or "html"
-	 * @param array $item Item element
-	 * @param array $owner Owner record
-	 * @param bool $comment Trigger the sending of the "comment" element
-	 * @param int $cid Contact ID of the recipient
-	 * @param bool $single If set, the entry is created as an XML document with a single "entry" element
+	 * @param object $doc     XML document
+	 * @param string $type    "text" or "html"
+	 * @param array  $item    Item element
+	 * @param array  $owner   Owner record
+	 * @param bool   $comment Trigger the sending of the "comment" element
+	 * @param int    $cid     Contact ID of the recipient
+	 * @param bool   $single  If set, the entry is created as an XML document with a single "entry" element
 	 *
 	 * @return object XML entry object
 	 * @todo Add type-hints
 	 */
-	private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false) {
-
+	private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0, $single = false)
+	{
 		$mentioned = array();
 
 		if (!$item['parent']) {
@@ -864,7 +892,7 @@ class dfrn {
 		}
 
 		if ($item['deleted']) {
-			$attributes = array("ref" => $item['uri'], "when" => datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME));
+			$attributes = array("ref" => $item['uri'], "when" => datetime_convert('UTC', 'UTC', $item['edited'] . '+00:00', ATOM_TIME));
 			return xml::create_element($doc, "at:deleted-entry", "", $attributes);
 		}
 
@@ -886,7 +914,7 @@ class dfrn {
 		}
 
 		if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
-			$body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
+			$body = fix_private_photos($item['body'], $owner['uid'], $item, $cid);
 		} else {
 			$body = $item['body'];
 		}
@@ -925,7 +953,7 @@ class dfrn {
 
 		if (isset($parent_item)) {
 			$r = dba::fetch_first("SELECT `conversation-uri`, `conversation-href` FROM `conversation` WHERE `item-uri` = ?", $item['parent-uri']);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				if ($r['conversation-uri'] != '') {
 					$conversation_uri = $r['conversation-uri'];
 				}
@@ -944,8 +972,8 @@ class dfrn {
 		xml::add_element($doc, $entry, "id", $item["uri"]);
 		xml::add_element($doc, $entry, "title", $item["title"]);
 
-		xml::add_element($doc, $entry, "published", datetime_convert("UTC","UTC",$item["created"]."+00:00",ATOM_TIME));
-		xml::add_element($doc, $entry, "updated", datetime_convert("UTC","UTC",$item["edited"]."+00:00",ATOM_TIME));
+		xml::add_element($doc, $entry, "published", datetime_convert("UTC", "UTC", $item["created"] . "+00:00", ATOM_TIME));
+		xml::add_element($doc, $entry, "updated", datetime_convert("UTC", "UTC", $item["edited"] . "+00:00", ATOM_TIME));
 
 		// "dfrn:env" is used to read the content
 		xml::add_element($doc, $entry, "dfrn:env", base64url_encode($body, true));
@@ -955,8 +983,14 @@ class dfrn {
 		xml::add_element($doc, $entry, "content", (($type == 'html') ? $htmlbody : $body), array("type" => $type));
 
 		// We save this value in "plink". Maybe we should read it from there as well?
-		xml::add_element($doc, $entry, "link", "", array("rel" => "alternate", "type" => "text/html",
-								"href" => System::baseUrl()."/display/".$item["guid"]));
+		xml::add_element(
+			$doc,
+			$entry,
+			"link",
+			"",
+			array("rel" => "alternate", "type" => "text/html",
+				 "href" => System::baseUrl() . "/display/" . $item["guid"])
+		);
 
 		// "comment-allow" is some old fashioned stuff for old Friendica versions.
 		// It is included in the rewritten code for completeness
@@ -1036,18 +1070,32 @@ class dfrn {
 		}
 
 		foreach ($mentioned AS $mention) {
-			$r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
+			$r = q(
+				"SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
 				intval($owner["uid"]),
-				dbesc(normalise_link($mention)));
+				dbesc(normalise_link($mention))
+			);
 
-			if (dbm::is_result($r) && ($r[0]["forum"] || $r[0]["prv"])) {
-				xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
-											"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
-											"href" => $mention));
+			if (DBM::is_result($r) && ($r[0]["forum"] || $r[0]["prv"])) {
+				xml::add_element(
+					$doc,
+					$entry,
+					"link",
+					"",
+					array("rel" => "mentioned",
+							"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
+							"href" => $mention)
+				);
 			} else {
-				xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
-											"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
-											"href" => $mention));
+				xml::add_element(
+					$doc,
+					$entry,
+					"link",
+					"",
+					array("rel" => "mentioned",
+							"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
+							"href" => $mention)
+				);
 			}
 		}
 
@@ -1060,11 +1108,12 @@ class dfrn {
 	 * @brief encrypts data via AES
 	 *
 	 * @param string $data The data that is to be encrypted
-	 * @param string $key The AES key
+	 * @param string $key  The AES key
 	 *
 	 * @return string encrypted data
 	 */
-	private static function aes_encrypt($data, $key) {
+	private static function aes_encrypt($data, $key)
+	{
 		return openssl_encrypt($data, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
 	}
 
@@ -1072,27 +1121,28 @@ class dfrn {
 	 * @brief decrypts data via AES
 	 *
 	 * @param string $encrypted The encrypted data
-	 * @param string $key The AES key
+	 * @param string $key       The AES key
 	 *
 	 * @return string decrypted data
 	 */
-	public static function aes_decrypt($encrypted, $key) {
+	public static function aes_decrypt($encrypted, $key)
+	{
 		return openssl_decrypt($encrypted, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
 	}
 
 	/**
 	 * @brief Delivers the atom content to the contacts
 	 *
-	 * @param array $owner Owner record
-	 * @param array $contactr Contact record of the receiver
-	 * @param string $atom Content that will be transmitted
-	 * @param bool $dissolve (to be documented)
+	 * @param array  $owner    Owner record
+	 * @param array  $contact  Contact record of the receiver
+	 * @param string $atom     Content that will be transmitted
+	 * @param bool   $dissolve (to be documented)
 	 *
 	 * @return int Deliver status. -1 means an error.
 	 * @todo Add array type-hint for $owner, $contact
 	 */
-	public static function deliver($owner,$contact,$atom, $dissolve = false) {
-
+	public static function deliver($owner, $contact, $atom, $dissolve = false)
+	{
 		$a = get_app();
 
 		$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
@@ -1109,7 +1159,7 @@ class dfrn {
 
 		logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
-		$ssl_val = intval(Config::get('system','ssl_policy'));
+		$ssl_val = intval(Config::get('system', 'ssl_policy'));
 		$ssl_policy = '';
 
 		switch ($ssl_val) {
@@ -1148,7 +1198,7 @@ class dfrn {
 			return 3;
 		}
 
-		if (strpos($xml,'<?xml') === false) {
+		if (strpos($xml, '<?xml') === false) {
 			logger('dfrn_deliver: no valid XML returned');
 			logger('dfrn_deliver: returned XML: ' . $xml, LOGGER_DATA);
 			return 3;
@@ -1178,8 +1228,10 @@ class dfrn {
 
 		if ($perm) {
 			if ((($perm == 'rw') && (! intval($contact['writable'])))
-				|| (($perm == 'r') && (intval($contact['writable'])))) {
-				q("update contact set writable = %d where id = %d",
+				|| (($perm == 'r') && (intval($contact['writable'])))
+			) {
+				q(
+					"update contact set writable = %d where id = %d",
 					intval(($perm == 'rw') ? 1 : 0),
 					intval($contact['id'])
 				);
@@ -1189,18 +1241,19 @@ class dfrn {
 
 		if (($contact['duplex'] && strlen($contact['pubkey']))
 			|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
-			|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
-			openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
-			openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']);
+			|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))
+		) {
+			openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
+			openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']);
 		} else {
-			openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
-			openssl_private_decrypt($challenge,$postvars['challenge'],$contact['prvkey']);
+			openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']);
+			openssl_private_decrypt($challenge, $postvars['challenge'], $contact['prvkey']);
 		}
 
 		$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
 
-		if (strpos($final_dfrn_id,':') == 1) {
-			$final_dfrn_id = substr($final_dfrn_id,2);
+		if (strpos($final_dfrn_id, ':') == 1) {
+			$final_dfrn_id = substr($final_dfrn_id, 2);
 		}
 
 		if ($final_dfrn_id != $orig_id) {
@@ -1220,7 +1273,7 @@ class dfrn {
 			$postvars['data'] = $atom;
 			$postvars['perm'] = 'rw';
 		} else {
-			$postvars['data'] = str_replace('<dfrn:comment-allow>1','<dfrn:comment-allow>0',$atom);
+			$postvars['data'] = str_replace('<dfrn:comment-allow>1', '<dfrn:comment-allow>0', $atom);
 			$postvars['perm'] = 'r';
 		}
 
@@ -1274,20 +1327,19 @@ class dfrn {
 
 			if ($dfrn_version >= 2.1) {
 				if (($contact['duplex'] && strlen($contact['pubkey']))
-						|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
-						|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
-					openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
+					|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
+					|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))
+				) {
+					openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']);
 				} else {
-					openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
+					openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
 				}
-
 			} else {
 				if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
-					openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
+					openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
 				} else {
-					openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
+					openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']);
 				}
-
 			}
 
 			logger('md5 rawkey ' . md5($postvars['key']));
@@ -1296,7 +1348,7 @@ class dfrn {
 		}
 
 
-		logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA);
+		logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars, true), LOGGER_DATA);
 
 		$xml = post_url($contact['notify'], $postvars);
 
@@ -1307,11 +1359,11 @@ class dfrn {
 			return -9; // timed out
 		}
 
-		if (($curl_stat == 503) && (stristr($a->get_curl_headers(),'retry-after'))) {
+		if (($curl_stat == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
 			return -10;
 		}
 
-		if (strpos($xml,'<?xml') === false) {
+		if (strpos($xml, '<?xml') === false) {
 			logger('dfrn_deliver: phase 2: no valid XML returned');
 			logger('dfrn_deliver: phase 2: returned XML: ' . $xml, LOGGER_DATA);
 			return 3;
@@ -1319,7 +1371,7 @@ class dfrn {
 
 		if ($contact['term-date'] > NULL_DATE) {
 			logger("dfrn_deliver: $url back from the dead - removing mark for death");
-			require_once('include/Contact.php');
+			include_once 'include/Contact.php';
 			unmark_for_death($contact);
 		}
 
@@ -1339,20 +1391,22 @@ class dfrn {
 	/**
 	 * @brief Add new birthday event for this person
 	 *
-	 * @param array $contact Contact record
+	 * @param array  $contact  Contact record
 	 * @param string $birthday Birthday of the contact
 	 * @todo Add array type-hint for $contact
 	 */
-	private static function birthday_event($contact, $birthday) {
-
+	private static function birthday_event($contact, $birthday)
+	{
 		// Check for duplicates
-		$r = q("SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
+		$r = q(
+			"SELECT `id` FROM `event` WHERE `uid` = %d AND `cid` = %d AND `start` = '%s' AND `type` = '%s' LIMIT 1",
 			intval($contact["uid"]),
 			intval($contact["id"]),
-			dbesc(datetime_convert("UTC","UTC", $birthday)),
-			dbesc("birthday"));
+			dbesc(datetime_convert("UTC", "UTC", $birthday)),
+			dbesc("birthday")
+		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			return;
 		}
 
@@ -1361,14 +1415,15 @@ class dfrn {
 		$bdtext = sprintf(t("%s\'s birthday"), $contact["name"]);
 		$bdtext2 = sprintf(t("Happy Birthday %s"), " [url=".$contact["url"]."]".$contact["name"]."[/url]") ;
 
-		$r = q("INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
+		$r = q(
+			"INSERT INTO `event` (`uid`,`cid`,`created`,`edited`,`start`,`finish`,`summary`,`desc`,`type`)
 			VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s') ",
 			intval($contact["uid"]),
 			intval($contact["id"]),
 			dbesc(datetime_convert()),
 			dbesc(datetime_convert()),
-			dbesc(datetime_convert("UTC","UTC", $birthday)),
-			dbesc(datetime_convert("UTC","UTC", $birthday." + 1 day ")),
+			dbesc(datetime_convert("UTC", "UTC", $birthday)),
+			dbesc(datetime_convert("UTC", "UTC", $birthday . " + 1 day ")),
 			dbesc($bdtext),
 			dbesc($bdtext2),
 			dbesc("birthday")
@@ -1378,27 +1433,31 @@ class dfrn {
 	/**
 	 * @brief Fetch the author data from head or entry items
 	 *
-	 * @param object $xpath XPath object
-	 * @param object $context In which context should the data be searched
-	 * @param array $importer Record of the importer user mixed with contact of the content
-	 * @param string $element Element name from which the data is fetched
-	 * @param bool $onlyfetch Should the data only be fetched or should it update the contact record as well
+	 * @param object $xpath     XPath object
+	 * @param object $context   In which context should the data be searched
+	 * @param array  $importer  Record of the importer user mixed with contact of the content
+	 * @param string $element   Element name from which the data is fetched
+	 * @param bool   $onlyfetch Should the data only be fetched or should it update the contact record as well
 	 *
 	 * @return Returns an array with relevant data of the author
 	 * @todo Find good type-hints for all parameter
 	 */
-	private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "") {
-
+	private static function fetchauthor($xpath, $context, $importer, $element, $onlyfetch, $xml = "")
+	{
 		$author = array();
 		$author["name"] = $xpath->evaluate($element."/atom:name/text()", $context)->item(0)->nodeValue;
 		$author["link"] = $xpath->evaluate($element."/atom:uri/text()", $context)->item(0)->nodeValue;
 
-		$r = q("SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
+		$r = q(
+			"SELECT `id`, `uid`, `url`, `network`, `avatar-date`, `name-date`, `uri-date`, `addr`,
 				`name`, `nick`, `about`, `location`, `keywords`, `xmpp`, `bdyear`, `bd`, `hidden`, `contact-type`
 				FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` != '%s'",
-			intval($importer["uid"]), dbesc(normalise_link($author["link"])), dbesc(NETWORK_STATUSNET));
+			intval($importer["uid"]),
+			dbesc(normalise_link($author["link"])),
+			dbesc(NETWORK_STATUSNET)
+		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact = $r[0];
 			$author["contact-id"] = $r[0]["id"];
 			$author["network"] = $r[0]["network"];
@@ -1440,7 +1499,7 @@ class dfrn {
 			$author["avatar"] = current($avatarlist);
 		}
 
-		if (dbm::is_result($r) && !$onlyfetch) {
+		if (DBM::is_result($r) && !$onlyfetch) {
 			logger("Check if contact details for contact " . $r[0]["id"] . " (" . $r[0]["nick"] . ") have to be updated.", LOGGER_DEBUG);
 
 			$poco = array("url" => $contact["url"]);
@@ -1585,19 +1644,25 @@ class dfrn {
 			if ($update) {
 				logger("Update contact data for contact " . $contact["id"] . " (" . $contact["nick"] . ")", LOGGER_DEBUG);
 
-				q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s',
+				q(
+					"UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s',
 					`addr` = '%s', `keywords` = '%s', `bdyear` = '%s', `bd` = '%s', `hidden` = %d,
 					`xmpp` = '%s', `name-date`  = '%s', `uri-date` = '%s'
 					WHERE `id` = %d AND `network` = '%s'",
-					dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]), dbesc($contact["location"]),
+					dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["about"]),	dbesc($contact["location"]),
 					dbesc($contact["addr"]), dbesc($contact["keywords"]), dbesc($contact["bdyear"]),
 					dbesc($contact["bd"]), intval($contact["hidden"]), dbesc($contact["xmpp"]),
-					dbesc(dbm::date($contact["name-date"])), dbesc(dbm::date($contact["uri-date"])),
-					intval($contact["id"]), dbesc($contact["network"]));
+					dbesc(DBM::date($contact["name-date"])), dbesc(DBM::date($contact["uri-date"])),
+					intval($contact["id"]),	dbesc($contact["network"])
+				);
 			}
 
-			update_contact_avatar($author["avatar"], $importer["uid"], $contact["id"],
-						(strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"])));
+			update_contact_avatar(
+				$author["avatar"],
+				$importer["uid"],
+				$contact["id"],
+				(strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"]))
+			);
 
 			/*
 			 * The generation is a sign for the reliability of the provided data.
@@ -1621,14 +1686,15 @@ class dfrn {
 	/**
 	 * @brief Transforms activity objects into an XML string
 	 *
-	 * @param object $xpath XPath object
+	 * @param object $xpath    XPath object
 	 * @param object $activity Activity object
-	 * @param text $element element name
+	 * @param text   $element  element name
 	 *
 	 * @return string XML string
 	 * @todo Find good type-hints for all parameter
 	 */
-	private static function transform_activity($xpath, $activity, $element) {
+	private static function transform_activity($xpath, $activity, $element)
+	{
 		if (!is_object($activity)) {
 			return "";
 		}
@@ -1675,13 +1741,13 @@ class dfrn {
 	/**
 	 * @brief Processes the mail elements
 	 *
-	 * @param object $xpath XPath object
-	 * @param object $mail mail elements
-	 * @param array $importer Record of the importer user mixed with contact of the content
+	 * @param object $xpath    XPath object
+	 * @param object $mail     mail elements
+	 * @param array  $importer Record of the importer user mixed with contact of the content
 	 * @todo Find good type-hints for all parameter
 	 */
-	private static function process_mail($xpath, $mail, $importer) {
-
+	private static function process_mail($xpath, $mail, $importer)
+	{
 		logger("Processing mails");
 
 		/// @TODO Rewrite this to one statement
@@ -1726,12 +1792,13 @@ class dfrn {
 	/**
 	 * @brief Processes the suggestion elements
 	 *
-	 * @param object $xpath XPath object
+	 * @param object $xpath      XPath object
 	 * @param object $suggestion suggestion elements
-	 * @param array $importer Record of the importer user mixed with contact of the content
+	 * @param array  $importer   Record of the importer user mixed with contact of the content
 	 * @todo Find good type-hints for all parameter
 	 */
-	private static function process_suggestion($xpath, $suggestion, $importer) {
+	private static function process_suggestion($xpath, $suggestion, $importer)
+	{
 		$a = get_app();
 
 		logger("Processing suggestions");
@@ -1748,7 +1815,8 @@ class dfrn {
 
 		// Does our member already have a friend matching this description?
 
-		$r = q("SELECT `id` FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
+		$r = q(
+			"SELECT `id` FROM `contact` WHERE `name` = '%s' AND `nurl` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($suggest["name"]),
 			dbesc(normalise_link($suggest["url"])),
 			intval($suggest["uid"])
@@ -1761,23 +1829,25 @@ class dfrn {
 		 *
 		 * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
 		 */
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			return false;
 		}
 
 		// Do we already have an fcontact record for this person?
 
 		$fid = 0;
-		$r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
+		$r = q(
+			"SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
 			dbesc($suggest["url"]),
 			dbesc($suggest["name"]),
 			dbesc($suggest["request"])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$fid = $r[0]["id"];
 
 			// OK, we do. Do we already have an introduction for this person ?
-			$r = q("SELECT `id` FROM `intro` WHERE `uid` = %d AND `fid` = %d LIMIT 1",
+			$r = q(
+				"SELECT `id` FROM `intro` WHERE `uid` = %d AND `fid` = %d LIMIT 1",
 				intval($suggest["uid"]),
 				intval($fid)
 			);
@@ -1789,19 +1859,21 @@ class dfrn {
 			 *
 			 * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
 			 */
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				return false;
 			}
 		}
 		if (!$fid) {
-			$r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
+			$r = q(
+				"INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
 				dbesc($suggest["name"]),
 				dbesc($suggest["url"]),
 				dbesc($suggest["photo"]),
 				dbesc($suggest["request"])
 			);
 		}
-		$r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
+		$r = q(
+			"SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
 			dbesc($suggest["url"]),
 			dbesc($suggest["name"]),
 			dbesc($suggest["request"])
@@ -1811,7 +1883,7 @@ class dfrn {
 		 * If no record in fcontact is found, below INSERT statement will not
 		 * link an introduction to it.
 		 */
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			// database record did not get created. Quietly give up.
 			killme();
 		}
@@ -1820,7 +1892,8 @@ class dfrn {
 
 		$hash = random_string();
 
-		$r = q("INSERT INTO `intro` (`uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked`)
+		$r = q(
+			"INSERT INTO `intro` (`uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked`)
 			VALUES(%d, %d, %d, '%s', '%s', '%s', %d)",
 			intval($suggest["uid"]),
 			intval($fid),
@@ -1844,23 +1917,22 @@ class dfrn {
 			"source_link"  => $importer["url"],
 			"source_photo" => $importer["photo"],
 			"verb"         => ACTIVITY_REQ_FRIEND,
-			"otype"        => "intro"
-		));
+			"otype"        => "intro")
+		);
 
 		return true;
-
 	}
 
 	/**
 	 * @brief Processes the relocation elements
 	 *
-	 * @param object $xpath XPath object
+	 * @param object $xpath      XPath object
 	 * @param object $relocation relocation elements
-	 * @param array $importer Record of the importer user mixed with contact of the content
+	 * @param array  $importer   Record of the importer user mixed with contact of the content
 	 * @todo Find good type-hints for all parameter
 	 */
-	private static function process_relocation($xpath, $relocation, $importer) {
-
+	private static function process_relocation($xpath, $relocation, $importer)
+	{
 		logger("Processing relocations");
 
 		/// @TODO Rewrite this to one statement
@@ -1889,11 +1961,13 @@ class dfrn {
 		}
 
 		// update contact
-		$r = q("SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
+		$r = q(
+			"SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
 			intval($importer["id"]),
-			intval($importer["importer_uid"]));
+			intval($importer["importer_uid"])
+		);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			logger("Query failed to execute, no result returned in " . __FUNCTION__);
 			return false;
 		}
@@ -1903,7 +1977,8 @@ class dfrn {
 		// Update the gcontact entry
 		$relocate["server_url"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$1$2", $relocate["url"]);
 
-		$x = q("UPDATE `gcontact` SET
+		$x = q(
+			"UPDATE `gcontact` SET
 					`name` = '%s',
 					`photo` = '%s',
 					`url` = '%s',
@@ -1913,18 +1988,20 @@ class dfrn {
 					`notify` = '%s',
 					`server_url` = '%s'
 			WHERE `nurl` = '%s';",
-					dbesc($relocate["name"]),
-					dbesc($relocate["avatar"]),
-					dbesc($relocate["url"]),
-					dbesc(normalise_link($relocate["url"])),
-					dbesc($relocate["addr"]),
-					dbesc($relocate["addr"]),
-					dbesc($relocate["notify"]),
-					dbesc($relocate["server_url"]),
-					dbesc(normalise_link($old["url"])));
+			dbesc($relocate["name"]),
+			dbesc($relocate["avatar"]),
+			dbesc($relocate["url"]),
+			dbesc(normalise_link($relocate["url"])),
+			dbesc($relocate["addr"]),
+			dbesc($relocate["addr"]),
+			dbesc($relocate["notify"]),
+			dbesc($relocate["server_url"]),
+			dbesc(normalise_link($old["url"]))
+		);
 
 		// Update the contact table. We try to find every entry.
-		$x = q("UPDATE `contact` SET
+		$x = q(
+			"UPDATE `contact` SET
 					`name` = '%s',
 					`avatar` = '%s',
 					`url` = '%s',
@@ -1936,19 +2013,20 @@ class dfrn {
 					`poll` = '%s',
 					`site-pubkey` = '%s'
 			WHERE (`id` = %d AND `uid` = %d) OR (`nurl` = '%s');",
-					dbesc($relocate["name"]),
-					dbesc($relocate["avatar"]),
-					dbesc($relocate["url"]),
-					dbesc(normalise_link($relocate["url"])),
-					dbesc($relocate["addr"]),
-					dbesc($relocate["request"]),
-					dbesc($relocate["confirm"]),
-					dbesc($relocate["notify"]),
-					dbesc($relocate["poll"]),
-					dbesc($relocate["sitepubkey"]),
-					intval($importer["id"]),
-					intval($importer["importer_uid"]),
-					dbesc(normalise_link($old["url"])));
+			dbesc($relocate["name"]),
+			dbesc($relocate["avatar"]),
+			dbesc($relocate["url"]),
+			dbesc(normalise_link($relocate["url"])),
+			dbesc($relocate["addr"]),
+			dbesc($relocate["request"]),
+			dbesc($relocate["confirm"]),
+			dbesc($relocate["notify"]),
+			dbesc($relocate["poll"]),
+			dbesc($relocate["sitepubkey"]),
+			intval($importer["id"]),
+			intval($importer["importer_uid"]),
+			dbesc(normalise_link($old["url"]))
+		);
 
 		update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
 
@@ -1964,20 +2042,27 @@ class dfrn {
 			//'owner-avatar' => array($old["photo"], $relocate["photo"]),
 			//'author-avatar' => array($old["photo"], $relocate["photo"]),
 		);
-		foreach ($fields as $n=>$f) {
-			$r = q("SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
-					$n, dbesc($f[0]),
-					intval($importer["importer_uid"]));
+		foreach ($fields as $n => $f) {
+			$r = q(
+				"SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
+				$n,
+				dbesc($f[0]),
+				intval($importer["importer_uid"])
+			);
 
-			if (dbm::is_result($r)) {
-				$x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
-						$n, dbesc($f[1]),
-						$n, dbesc($f[0]),
-						intval($importer["importer_uid"]));
+			if (DBM::is_result($r)) {
+				$x = q(
+					"UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
+					$n,
+					dbesc($f[1]),
+					$n,
+					dbesc($f[0]),
+					intval($importer["importer_uid"])
+				);
 
-					if ($x === false) {
-						return false;
-					}
+				if ($x === false) {
+					return false;
+				}
 			}
 		}
 
@@ -1992,19 +2077,19 @@ class dfrn {
 	/**
 	 * @brief Updates an item
 	 *
-	 * @param array $current the current item record
-	 * @param array $item the new item record
-	 * @param array $importer Record of the importer user mixed with contact of the content
-	 * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
+	 * @param array $current   the current item record
+	 * @param array $item      the new item record
+	 * @param array $importer  Record of the importer user mixed with contact of the content
+	 * @param int   $entrytype Is it a toplevel entry, a comment or a relayed comment?
 	 * @todo set proper type-hints (array?)
 	 */
-	private static function update_content($current, $item, $importer, $entrytype) {
+	private static function update_content($current, $item, $importer, $entrytype)
+	{
 		$changed = false;
 
 		if (edited_timestamp_is_newer($current, $item)) {
-
 			// do not accept (ignore) an earlier edit than one we currently have.
-			if (datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"]) {
+			if (datetime_convert("UTC", "UTC", $item["edited"]) < $current["edited"]) {
 				return false;
 			}
 
@@ -2021,18 +2106,20 @@ class dfrn {
 			$changed = true;
 
 			if ($entrytype == DFRN_REPLY_RC) {
-				Worker::add(PRIORITY_HIGH, "notifier","comment-import", $current["id"]);
+				Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $current["id"]);
 			}
 		}
 
 		// update last-child if it changes
 		if ($item["last-child"] && ($item["last-child"] != $current["last-child"])) {
-			$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
+			$r = q(
+				"UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
 				dbesc(datetime_convert()),
 				dbesc($item["parent-uri"]),
 				intval($importer["importer_uid"])
 			);
-			$r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)",
+			$r = q(
+				"UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` IN (0, %d)",
 				intval($item["last-child"]),
 				dbesc(datetime_convert()),
 				dbesc($item["uri"]),
@@ -2046,12 +2133,13 @@ class dfrn {
 	 * @brief Detects the entry type of the item
 	 *
 	 * @param array $importer Record of the importer user mixed with contact of the content
-	 * @param array $item the new item record
+	 * @param array $item     the new item record
 	 *
 	 * @return int Is it a toplevel entry, a comment or a relayed comment?
 	 * @todo set proper type-hints (array?)
 	 */
-	private static function get_entry_type($importer, $item) {
+	private static function get_entry_type($importer, $item)
+	{
 		if ($item["parent-uri"] != $item["uri"]) {
 			$community = false;
 
@@ -2068,13 +2156,15 @@ class dfrn {
 
 			$is_a_remote_action = false;
 
-			$r = q("SELECT `item`.`parent-uri` FROM `item`
+			$r = q(
+				"SELECT `item`.`parent-uri` FROM `item`
 				WHERE `item`.`uri` = '%s'
 				LIMIT 1",
 				dbesc($item["parent-uri"])
 			);
-			if (dbm::is_result($r)) {
-				$r = q("SELECT `item`.`forum_mode`, `item`.`wall` FROM `item`
+			if (DBM::is_result($r)) {
+				$r = q(
+					"SELECT `item`.`forum_mode`, `item`.`wall` FROM `item`
 					INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 					WHERE `item`.`uri` = '%s' AND (`item`.`parent-uri` = '%s' OR `item`.`thr-parent` = '%s')
 					AND `item`.`uid` = %d
@@ -2085,7 +2175,7 @@ class dfrn {
 					dbesc($r[0]["parent-uri"]),
 					intval($importer["importer_uid"])
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$is_a_remote_action = true;
 				}
 			}
@@ -2111,26 +2201,25 @@ class dfrn {
 		} else {
 			return DFRN_TOP_LEVEL;
 		}
-
 	}
 
 	/**
 	 * @brief Send a "poke"
 	 *
-	 * @param array $item the new item record
-	 * @param array $importer Record of the importer user mixed with contact of the content
-	 * @param int $posted_id The record number of item record that was just posted
+	 * @param array $item      the new item record
+	 * @param array $importer  Record of the importer user mixed with contact of the content
+	 * @param int   $posted_id The record number of item record that was just posted
 	 * @todo set proper type-hints (array?)
 	 */
-	private static function do_poke($item, $importer, $posted_id) {
-		$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
+	private static function do_poke($item, $importer, $posted_id)
+	{
+		$verb = urldecode(substr($item["verb"], strpos($item["verb"], "#")+1));
 		if (!$verb) {
 			return;
 		}
-		$xo = parse_xml_string($item["object"],false);
+		$xo = parse_xml_string($item["object"], false);
 
 		if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
-
 			// somebody was poked/prodded. Was it me?
 			foreach ($xo->link as $l) {
 				$atts = $l->attributes();
@@ -2144,9 +2233,9 @@ class dfrn {
 			}
 
 			if ($Blink && link_compare($Blink, System::baseUrl() . "/profile/" . $importer["nickname"])) {
-
 				// send a notification
-				notification(array(
+				notification(
+					array(
 					"type"         => NOTIFY_POKE,
 					"notify_flags" => $importer["notify-flags"],
 					"language"     => $importer["language"],
@@ -2162,8 +2251,8 @@ class dfrn {
 					"verb"         => $item["verb"],
 					"otype"        => "person",
 					"activity"     => $verb,
-					"parent"       => $item["parent"]
-				));
+					"parent"       => $item["parent"])
+				);
 			}
 		}
 	}
@@ -2171,16 +2260,16 @@ class dfrn {
 	/**
 	 * @brief Processes several actions, depending on the verb
 	 *
-	 * @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
-	 * @param array $importer Record of the importer user mixed with contact of the content
-	 * @param array $item the new item record
-	 * @param bool $is_like Is the verb a "like"?
+	 * @param int   $entrytype Is it a toplevel entry, a comment or a relayed comment?
+	 * @param array $importer  Record of the importer user mixed with contact of the content
+	 * @param array $item      the new item record
+	 * @param bool  $is_like   Is the verb a "like"?
 	 *
 	 * @return bool Should the processing of the entries be continued?
 	 * @todo set proper type-hints (array?)
 	 */
-	private static function process_verbs($entrytype, $importer, &$item, &$is_like) {
-
+	private static function process_verbs($entrytype, $importer, &$item, &$is_like)
+	{
 		logger("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, LOGGER_DEBUG);
 
 		if (($entrytype == DFRN_TOP_LEVEL)) {
@@ -2197,7 +2286,7 @@ class dfrn {
 				new_follower($importer, $contact, $item, $nickname);
 				return false;
 			}
-			if (activity_match($item["verb"], ACTIVITY_UNFOLLOW))  {
+			if (activity_match($item["verb"], ACTIVITY_UNFOLLOW)) {
 				logger("Lost follower");
 				lose_follower($importer, $contact, $item);
 				return false;
@@ -2207,7 +2296,7 @@ class dfrn {
 				new_follower($importer, $contact, $item, $nickname, true);
 				return false;
 			}
-			if (activity_match($item["verb"], ACTIVITY_UNFRIEND))  {
+			if (activity_match($item["verb"], ACTIVITY_UNFRIEND)) {
 				logger("Lost sharer");
 				lose_sharer($importer, $contact, $item);
 				return false;
@@ -2217,29 +2306,32 @@ class dfrn {
 				|| ($item["verb"] == ACTIVITY_DISLIKE)
 				|| ($item["verb"] == ACTIVITY_ATTEND)
 				|| ($item["verb"] == ACTIVITY_ATTENDNO)
-				|| ($item["verb"] == ACTIVITY_ATTENDMAYBE)) {
+				|| ($item["verb"] == ACTIVITY_ATTENDMAYBE)
+			) {
 				$is_like = true;
 				$item["type"] = "activity";
 				$item["gravity"] = GRAVITY_LIKE;
 				// only one like or dislike per person
 				// splitted into two queries for performance issues
-				$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `parent-uri` = '%s' AND NOT `deleted` LIMIT 1",
+				$r = q(
+					"SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `parent-uri` = '%s' AND NOT `deleted` LIMIT 1",
 					intval($item["uid"]),
 					dbesc($item["author-link"]),
 					dbesc($item["verb"]),
 					dbesc($item["parent-uri"])
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					return false;
 				}
 
-				$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
+				$r = q(
+					"SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
 					intval($item["uid"]),
 					dbesc($item["author-link"]),
 					dbesc($item["verb"]),
 					dbesc($item["parent-uri"])
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					return false;
 				}
 			} else {
@@ -2248,16 +2340,17 @@ class dfrn {
 
 			if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
 
-				$xo = parse_xml_string($item["object"],false);
-				$xt = parse_xml_string($item["target"],false);
+				$xo = parse_xml_string($item["object"], false);
+				$xt = parse_xml_string($item["target"], false);
 
 				if ($xt->type == ACTIVITY_OBJ_NOTE) {
-					$r = q("SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					$r = q(
+						"SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($xt->id),
 						intval($importer["importer_uid"])
 					);
 
-					if (!dbm::is_result($r)) {
+					if (!DBM::is_result($r)) {
 						logger("Query failed to execute, no result returned in " . __FUNCTION__);
 						return false;
 					}
@@ -2282,10 +2375,11 @@ class dfrn {
 	 * @brief Processes the link elements
 	 *
 	 * @param object $links link elements
-	 * @param array $item the item record
+	 * @param array  $item  the item record
 	 * @todo set proper type-hints
 	 */
-	private static function parse_links($links, &$item) {
+	private static function parse_links($links, &$item)
+	{
 		$rel = "";
 		$href = "";
 		$type = "";
@@ -2337,8 +2431,8 @@ class dfrn {
 	 * @param array $importer Record of the importer user mixed with contact of the content
 	 * @todo Add type-hints
 	 */
-	private static function process_entry($header, $xpath, $entry, $importer, $xml) {
-
+	private static function process_entry($header, $xpath, $entry, $importer, $xml)
+	{
 		logger("Processing entries");
 
 		$item = $header;
@@ -2352,14 +2446,16 @@ class dfrn {
 
 		$item["edited"] = $xpath->query("atom:updated/text()", $entry)->item(0)->nodeValue;
 
-		$current = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+		$current = q(
+			"SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($item["uri"]),
 			intval($importer["importer_uid"])
 		);
 
 		// Is there an existing item?
-		if (dbm::is_result($current) && edited_timestamp_is_newer($current[0], $item) &&
-			(datetime_convert("UTC","UTC",$item["edited"]) < $current[0]["edited"])) {
+		if (DBM::is_result($current) && edited_timestamp_is_newer($current[0], $item)
+			&& (datetime_convert("UTC", "UTC", $item["edited"]) < $current[0]["edited"])
+		) {
 			logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
 			return;
 		}
@@ -2383,16 +2479,15 @@ class dfrn {
 		$item["created"] = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
 
 		$item["body"] = $xpath->query("dfrn:env/text()", $entry)->item(0)->nodeValue;
-		$item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''),$item["body"]);
+		$item["body"] = str_replace(array(' ',"\t","\r","\n"), array('','','',''), $item["body"]);
 		// make sure nobody is trying to sneak some html tags by us
 		$item["body"] = notags(base64url_decode($item["body"]));
 
 		$item["body"] = limit_body_size($item["body"]);
 
 		/// @todo Do we really need this check for HTML elements? (It was copied from the old function)
-		if ((strpos($item['body'],'<') !== false) && (strpos($item['body'],'>') !== false)) {
-
-			$item['body'] = reltoabs($item['body'],$base_url);
+		if ((strpos($item['body'], '<') !== false) && (strpos($item['body'], '>') !== false)) {
+			$item['body'] = reltoabs($item['body'], $base_url);
 
 			$item['body'] = html2bb_video($item['body']);
 
@@ -2589,11 +2684,12 @@ class dfrn {
 					$ev['private'] = $item['private'];
 					$ev["guid"] = $item["guid"];
 
-					$r = q("SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					$r = q(
+						"SELECT `id` FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($item["uri"]),
 						intval($importer["uid"])
 					);
-					if (dbm::is_result($r)) {
+					if (DBM::is_result($r)) {
 						$ev["id"] = $r[0]["id"];
 					}
 
@@ -2610,7 +2706,7 @@ class dfrn {
 		}
 
 		// Update content if 'updated' changes
-		if (dbm::is_result($current)) {
+		if (DBM::is_result($current)) {
 			if (self::update_content($r[0], $item, $importer, $entrytype)) {
 				logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
 			} else {
@@ -2624,28 +2720,30 @@ class dfrn {
 			$parent = 0;
 
 			if ($posted_id) {
-
 				logger("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, LOGGER_DEBUG);
 
 				$item["id"] = $posted_id;
 
-				$r = q("SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+				$r = q(
+					"SELECT `parent`, `parent-uri` FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 					intval($posted_id),
 					intval($importer["importer_uid"])
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$parent = $r[0]["parent"];
 					$parent_uri = $r[0]["parent-uri"];
 				}
 
 				if (!$is_like) {
-					$r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
+					$r1 = q(
+						"UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
 						dbesc(datetime_convert()),
 						intval($importer["importer_uid"]),
 						intval($r[0]["parent"])
 					);
 
-					$r2 = q("UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d",
+					$r2 = q(
+						"UPDATE `item` SET `last-child` = 1, `changed` = '%s' WHERE `uid` = %d AND `id` = %d",
 						dbesc(datetime_convert()),
 						intval($importer["importer_uid"]),
 						intval($posted_id)
@@ -2660,7 +2758,7 @@ class dfrn {
 				return true;
 			}
 		} else { // $entrytype == DFRN_TOP_LEVEL
-			if (!link_compare($item["owner-link"],$importer["url"])) {
+			if (!link_compare($item["owner-link"], $importer["url"])) {
 				/*
 				 * The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
 				 * but otherwise there's a possible data mixup on the sender's system.
@@ -2694,13 +2792,13 @@ class dfrn {
 	/**
 	 * @brief Deletes items
 	 *
-	 * @param object $xpath XPath object
+	 * @param object $xpath    XPath object
 	 * @param object $deletion deletion elements
-	 * @param array $importer Record of the importer user mixed with contact of the content
+	 * @param array  $importer Record of the importer user mixed with contact of the content
 	 * @todo set proper type-hints
 	 */
-	private static function process_deletion($xpath, $deletion, $importer) {
-
+	private static function process_deletion($xpath, $deletion, $importer)
+	{
 		logger("Processing deletions");
 
 		foreach ($deletion->attributes AS $attributes) {
@@ -2722,17 +2820,17 @@ class dfrn {
 		}
 
 		/// @todo Only select the used fields
-		$r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
-				WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
-				dbesc($uri),
-				intval($importer["uid"]),
-				intval($importer["id"])
-			);
-		if (!dbm::is_result($r)) {
+		$r = q(
+			"SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
+			WHERE `uri` = '%s' AND `item`.`uid` = %d AND `contact-id` = %d AND NOT `item`.`file` LIKE '%%[%%' LIMIT 1",
+			dbesc($uri),
+			intval($importer["uid"]),
+			intval($importer["id"])
+		);
+		if (!DBM::is_result($r)) {
 			logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG);
 			return;
 		} else {
-
 			$item = $r[0];
 
 			$entrytype = self::get_entry_type($importer, $item);
@@ -2750,16 +2848,16 @@ class dfrn {
 
 			if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
 
-				$xo = parse_xml_string($item["object"],false);
-				$xt = parse_xml_string($item["target"],false);
+				$xo = parse_xml_string($item["object"], false);
+				$xt = parse_xml_string($item["target"], false);
 
 				if ($xt->type == ACTIVITY_OBJ_NOTE) {
-					$i = q("SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+					$i = q(
+						"SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
 						dbesc($xt->id),
 						intval($importer["importer_uid"])
 					);
-					if (dbm::is_result($i)) {
-
+					if (DBM::is_result($i)) {
 						// For tags, the owner cannot remove the tag on the author's copy of the post.
 
 						$owner_remove = (($item["contact-id"] == $i[0]["contact-id"]) ? true: false);
@@ -2770,7 +2868,7 @@ class dfrn {
 							return;
 						}
 						if ($author_remove || $owner_remove) {
-							$tags = explode(',',$i[0]["tag"]);
+							$tags = explode(',', $i[0]["tag"]);
 							$newtags = array();
 							if (count($tags)) {
 								foreach ($tags as $tag) {
@@ -2779,7 +2877,8 @@ class dfrn {
 									}
 								}
 							}
-							q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
+							q(
+								"UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
 								dbesc(implode(',', $newtags)),
 								intval($i[0]["id"])
 							);
@@ -2790,44 +2889,49 @@ class dfrn {
 			}
 
 			if ($entrytype == DFRN_TOP_LEVEL) {
-				$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
+				$r = q(
+					"UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
 						`body` = '', `title` = ''
 					WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
-						dbesc($when),
-						dbesc(datetime_convert()),
-						dbesc($uri),
-						intval($importer["uid"])
-					);
+					dbesc($when),
+					dbesc(datetime_convert()),
+					dbesc($uri),
+					intval($importer["uid"])
+				);
 				create_tags_from_itemuri($uri, $importer["uid"]);
 				create_files_from_itemuri($uri, $importer["uid"]);
 				update_thread_uri($uri, $importer["uid"]);
 			} else {
-				$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
+				$r = q(
+					"UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
 						`body` = '', `title` = ''
 					WHERE `uri` = '%s' AND `uid` IN (0, %d)",
-						dbesc($when),
-						dbesc(datetime_convert()),
-						dbesc($uri),
-						intval($importer["uid"])
-					);
+					dbesc($when),
+					dbesc(datetime_convert()),
+					dbesc($uri),
+					intval($importer["uid"])
+				);
 				create_tags_from_itemuri($uri, $importer["uid"]);
 				create_files_from_itemuri($uri, $importer["uid"]);
 				update_thread_uri($uri, $importer["importer_uid"]);
 				if ($item["last-child"]) {
 					// ensure that last-child is set in case the comment that had it just got wiped.
-					q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
+					q(
+						"UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` IN (0, %d)",
 						dbesc(datetime_convert()),
 						dbesc($item["parent-uri"]),
 						intval($item["uid"])
 					);
 					// who is the last child now?
-					$r = q("SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d
+					$r = q(
+						"SELECT `id` FROM `item` WHERE `parent-uri` = '%s' AND `type` != 'activity' AND `deleted` = 0 AND `moderated` = 0 AND `uid` = %d
 						ORDER BY `created` DESC LIMIT 1",
-							dbesc($item["parent-uri"]),
-							intval($importer["uid"])
+						dbesc($item["parent-uri"]),
+						intval($importer["uid"])
 					);
-					if (dbm::is_result($r)) {
-						q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
+					if (DBM::is_result($r)) {
+						q(
+							"UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
 							intval($r[0]["id"])
 						);
 					}
@@ -2836,7 +2940,7 @@ class dfrn {
 
 				if ($entrytype == DFRN_REPLY_RC) {
 					logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
-					Worker::add(PRIORITY_HIGH, "notifier","drop", $item["id"]);
+					Worker::add(PRIORITY_HIGH, "notifier", "drop", $item["id"]);
 				}
 			}
 		}
@@ -2845,14 +2949,14 @@ class dfrn {
 	/**
 	 * @brief Imports a DFRN message
 	 *
-	 * @param text $xml The DFRN message
-	 * @param array $importer Record of the importer user mixed with contact of the content
-	 * @param bool $sort_by_date Is used when feeds are polled
+	 * @param text  $xml          The DFRN message
+	 * @param array $importer     Record of the importer user mixed with contact of the content
+	 * @param bool  $sort_by_date Is used when feeds are polled
 	 * @return integer Import status
 	 * @todo set proper type-hints
 	 */
-	public static function import($xml, $importer, $sort_by_date = false) {
-
+	public static function import($xml, $importer, $sort_by_date = false)
+	{
 		if ($xml == "") {
 			return 400;
 		}
diff --git a/include/diaspora.php b/src/Protocol/Diaspora.php
similarity index 79%
rename from include/diaspora.php
rename to src/Protocol/Diaspora.php
index ea32295275..23d9adca6b 100644
--- a/include/diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -7,30 +7,36 @@
  * This implementation here interprets the old and the new protocol and sends the new one.
  * In the future we will remove most stuff from "valid_posting" and interpret only the new protocol.
  */
+namespace Friendica\Protocol;
 
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 
+use Cache;
+use dba;
+use SimpleXMLElement;
+use xml;
+
 require_once 'include/items.php';
 require_once 'include/bb2diaspora.php';
 require_once 'include/Contact.php';
 require_once 'include/Photo.php';
 require_once 'include/socgraph.php';
 require_once 'include/group.php';
-require_once 'include/xml.php';
 require_once 'include/datetime.php';
 require_once 'include/queue_fn.php';
-require_once 'include/cache.php';
 
 /**
  * @brief This class contain functions to create and send Diaspora XML files
  *
  */
-class Diaspora {
+class Diaspora
+{
 
 	/**
 	 * @brief Return a list of relay servers
@@ -39,26 +45,32 @@ class Diaspora {
 	 *
 	 * @return array of relay servers
 	 */
-	public static function relay_list() {
-
+	public static function relay_list()
+	{
 		$serverdata = Config::get("system", "relay_server");
-		if ($serverdata == "")
+		if ($serverdata == "") {
 			return array();
+		}
 
 		$relay = array();
 
 		$servers = explode(",", $serverdata);
 
-		foreach ($servers AS $server) {
+		foreach ($servers as $server) {
 			$server = trim($server);
 			$addr = "relay@".str_replace("http://", "", normalise_link($server));
 			$batch = $server."/receive/public";
 
-			$relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' AND `addr` = '%s' AND `nurl` = '%s' LIMIT 1",
-					dbesc($batch), dbesc($addr), dbesc(normalise_link($server)));
+			$relais = q(
+				"SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' AND `addr` = '%s' AND `nurl` = '%s' LIMIT 1",
+				dbesc($batch),
+				dbesc($addr),
+				dbesc(normalise_link($server))
+			);
 
 			if (!$relais) {
-				$r = q("INSERT INTO `contact` (`uid`, `created`, `name`, `nick`, `addr`, `url`, `nurl`, `batch`, `network`, `rel`, `blocked`, `pending`, `writable`, `name-date`, `uri-date`, `avatar-date`)
+				$r = q(
+					"INSERT INTO `contact` (`uid`, `created`, `name`, `nick`, `addr`, `url`, `nurl`, `batch`, `network`, `rel`, `blocked`, `pending`, `writable`, `name-date`, `uri-date`, `avatar-date`)
 					VALUES (0, '%s', '%s', 'relay', '%s', '%s', '%s', '%s', '%s', %d, 0, 0, 1, '%s', '%s', '%s')",
 					datetime_convert(),
 					dbesc($addr),
@@ -74,10 +86,12 @@ class Diaspora {
 				);
 
 				$relais = q("SELECT `batch`, `id`, `name`,`network` FROM `contact` WHERE `uid` = 0 AND `batch` = '%s' LIMIT 1", dbesc($batch));
-				if ($relais)
+				if ($relais) {
 					$relay[] = $relais[0];
-			} else
+				}
+			} else {
 				$relay[] = $relais[0];
+			}
 		}
 
 		return $relay;
@@ -88,24 +102,26 @@ class Diaspora {
 	 *
 	 * The function is unused at the moment. It was copied from the old implementation.
 	 *
-	 * @param string $signature The signature
-	 * @param string $handle The handle of the signature owner
-	 * @param integer $level This value is only set inside this function to avoid endless loops
+	 * @param string  $signature The signature
+	 * @param string  $handle    The handle of the signature owner
+	 * @param integer $level     This value is only set inside this function to avoid endless loops
 	 *
 	 * @return string the repaired signature
 	 */
-	private static function repair_signature($signature, $handle = "", $level = 1) {
-
-		if ($signature == "")
+	private static function repair_signature($signature, $handle = "", $level = 1)
+	{
+		if ($signature == "") {
 			return ($signature);
+		}
 
 		if (base64_encode(base64_decode(base64_decode($signature))) == base64_decode($signature)) {
 			$signature = base64_decode($signature);
 			logger("Repaired double encoded signature from Diaspora/Hubzilla handle ".$handle." - level ".$level, LOGGER_DEBUG);
 
 			// Do a recursive call to be able to fix even multiple levels
-			if ($level < 10)
+			if ($level < 10) {
 				$signature = self::repair_signature($signature, $handle, ++$level);
+			}
 		}
 
 		return($signature);
@@ -118,8 +134,8 @@ class Diaspora {
 	 *
 	 * @return string verified data
 	 */
-	private static function verify_magic_envelope($envelope) {
-
+	private static function verify_magic_envelope($envelope)
+	{
 		$basedom = parse_xml_string($envelope);
 
 		if (!is_object($basedom)) {
@@ -145,8 +161,9 @@ class Diaspora {
 
 		$sig = base64url_decode($children->sig);
 		$key_id = $children->sig->attributes()->key_id[0];
-		if ($key_id != "")
+		if ($key_id != "") {
 			$handle = base64url_decode($key_id);
+		}
 
 		$b64url_data = base64url_encode($data);
 		$msg = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
@@ -167,41 +184,44 @@ class Diaspora {
 	/**
 	 * @brief encrypts data via AES
 	 *
-	 * @param string $key The AES key
-	 * @param string $iv The IV (is used for CBC encoding)
+	 * @param string $key  The AES key
+	 * @param string $iv   The IV (is used for CBC encoding)
 	 * @param string $data The data that is to be encrypted
 	 *
 	 * @return string encrypted data
 	 */
-	private static function aes_encrypt($key, $iv, $data) {
+	private static function aes_encrypt($key, $iv, $data)
+	{
 		return openssl_encrypt($data, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
 	}
 
 	/**
 	 * @brief decrypts data via AES
 	 *
-	 * @param string $key The AES key
-	 * @param string $iv The IV (is used for CBC encoding)
+	 * @param string $key       The AES key
+	 * @param string $iv        The IV (is used for CBC encoding)
 	 * @param string $encrypted The encrypted data
 	 *
 	 * @return string decrypted data
 	 */
-	private static function aes_decrypt($key, $iv, $encrypted) {
-		return openssl_decrypt($encrypted,'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA,str_pad($iv, 16, "\0"));
+	private static function aes_decrypt($key, $iv, $encrypted)
+	{
+		return openssl_decrypt($encrypted, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
 	}
 
 	/**
 	 * @brief: Decodes incoming Diaspora message in the new format
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param string $raw raw post message
+	 * @param array  $importer Array of the importer user
+	 * @param string $raw      raw post message
 	 *
 	 * @return array
 	 * 'message' -> decoded Diaspora XML message
 	 * 'author' -> author diaspora handle
 	 * 'key' -> author public key (converted to pkcs#8)
 	 */
-	public static function decode_raw($importer, $raw) {
+	public static function decode_raw($importer, $raw)
+	{
 		$data = json_decode($raw);
 
 		// Is it a private post? Then decrypt the outer Salmon
@@ -221,7 +241,7 @@ class Diaspora {
 			$outer_iv = base64_decode($j_outer_key_bundle->iv);
 			$outer_key = base64_decode($j_outer_key_bundle->key);
 
-			$xml = diaspora::aes_decrypt($outer_key, $outer_iv, $ciphertext);
+			$xml = self::aes_decrypt($outer_key, $outer_iv, $ciphertext);
 		} else {
 			$xml = $raw;
 		}
@@ -250,7 +270,7 @@ class Diaspora {
 		// Get the senders' public key
 		$key_id = $base->sig[0]->attributes()->key_id[0];
 		$author_addr = base64_decode($key_id);
-		$key = diaspora::key($author_addr);
+		$key = self::key($author_addr);
 
 		$verify = rsa_verify($signed_data, $signature, $key);
 		if (!$verify) {
@@ -266,16 +286,16 @@ class Diaspora {
 	/**
 	 * @brief: Decodes incoming Diaspora message in the deprecated format
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param string $xml urldecoded Diaspora salmon
+	 * @param array  $importer Array of the importer user
+	 * @param string $xml      urldecoded Diaspora salmon
 	 *
 	 * @return array
 	 * 'message' -> decoded Diaspora XML message
 	 * 'author' -> author diaspora handle
 	 * 'key' -> author public key (converted to pkcs#8)
 	 */
-	public static function decode($importer, $xml) {
-
+	public static function decode($importer, $xml)
+	{
 		$public = false;
 		$basedom = parse_xml_string($xml);
 
@@ -287,7 +307,7 @@ class Diaspora {
 
 		if ($children->header) {
 			$public = true;
-			$author_link = str_replace('acct:','',$children->header->author_id);
+			$author_link = str_replace('acct:', '', $children->header->author_id);
 		} else {
 			// This happens with posts from a relais
 			if (!$importer) {
@@ -301,7 +321,7 @@ class Diaspora {
 			$ciphertext = base64_decode($encrypted_header->ciphertext);
 
 			$outer_key_bundle = '';
-			openssl_private_decrypt($encrypted_aes_key_bundle,$outer_key_bundle,$importer['prvkey']);
+			openssl_private_decrypt($encrypted_aes_key_bundle, $outer_key_bundle, $importer['prvkey']);
 
 			$j_outer_key_bundle = json_decode($outer_key_bundle);
 
@@ -316,19 +336,20 @@ class Diaspora {
 			$inner_iv = base64_decode($idom->iv);
 			$inner_aes_key = base64_decode($idom->aes_key);
 
-			$author_link = str_replace('acct:','',$idom->author_id);
+			$author_link = str_replace('acct:', '', $idom->author_id);
 		}
 
 		$dom = $basedom->children(NAMESPACE_SALMON_ME);
 
 		// figure out where in the DOM tree our data is hiding
 
-		if ($dom->provenance->data)
+		if ($dom->provenance->data) {
 			$base = $dom->provenance;
-		elseif ($dom->env->data)
+		} elseif ($dom->env->data) {
 			$base = $dom->env;
-		elseif ($dom->data)
+		} elseif ($dom->data) {
 			$base = $dom;
+		}
 
 		if (!$base) {
 			logger('unable to locate salmon data in xml');
@@ -342,7 +363,7 @@ class Diaspora {
 		// unpack the  data
 
 		// strip whitespace so our data element will return to one big base64 blob
-		$data = str_replace(array(" ","\t","\r","\n"),array("","","",""),$base->data);
+		$data = str_replace(array(" ", "\t", "\r", "\n"), array("", "", "", ""), $base->data);
 
 
 		// stash away some other stuff for later
@@ -360,12 +381,10 @@ class Diaspora {
 		$data = base64url_decode($data);
 
 
-		if ($public)
+		if ($public) {
 			$inner_decrypted = $data;
-		else {
-
+		} else {
 			// Decode the encrypted blob
-
 			$inner_encrypted = base64_decode($data);
 			$inner_decrypted = self::aes_decrypt($inner_aes_key, $inner_iv, $inner_encrypted);
 		}
@@ -386,7 +405,7 @@ class Diaspora {
 			http_status_exit(400);
 		}
 
-		$verify = rsa_verify($signed_data,$signature,$key);
+		$verify = rsa_verify($signed_data, $signature, $key);
 
 		if (!$verify) {
 			logger('Message did not verify. Discarding.');
@@ -408,8 +427,8 @@ class Diaspora {
 	 *
 	 * @return int The message id of the generated message, "true" or "false" if there was an error
 	 */
-	public static function dispatch_public($msg) {
-
+	public static function dispatch_public($msg)
+	{
 		$enabled = intval(Config::get("system", "diaspora_enabled"));
 		if (!$enabled) {
 			logger("diaspora is disabled");
@@ -447,14 +466,15 @@ class Diaspora {
 		}
 
 		// Now distribute it to the followers
-		$r = q("SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
+		$r = q(
+			"SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
 			(SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s')
 			AND NOT `account_expired` AND NOT `account_removed`",
 			dbesc(NETWORK_DIASPORA),
 			dbesc($msg["author"])
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				logger("delivering to: ".$rr["username"]);
 				self::dispatch($rr, $msg, $fields);
@@ -473,14 +493,14 @@ class Diaspora {
 	/**
 	 * @brief Dispatches the different message types to the different functions
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param array $msg The post that will be dispatched
-	 * @param object $fields SimpleXML object that contains the message
+	 * @param array  $importer Array of the importer user
+	 * @param array  $msg      The post that will be dispatched
+	 * @param object $fields   SimpleXML object that contains the message
 	 *
 	 * @return int The message id of the generated message, "true" or "false" if there was an error
 	 */
-	public static function dispatch($importer, $msg, $fields = null) {
-
+	public static function dispatch($importer, $msg, $fields = null)
+	{
 		// The sender is the handle of the contact that sent the message.
 		// This will often be different with relayed messages (for example "like" and "comment")
 		$sender = $msg["author"];
@@ -559,8 +579,8 @@ class Diaspora {
 	 *
 	 * @return bool|array If the posting is valid then an array with an SimpleXML object is returned
 	 */
-	private static function valid_posting($msg) {
-
+	private static function valid_posting($msg)
+	{
 		$data = parse_xml_string($msg["message"]);
 
 		if (!is_object($data)) {
@@ -573,8 +593,9 @@ class Diaspora {
 		// Is this the new or the old version?
 		if ($data->getName() == "XML") {
 			$oldXML = true;
-			foreach ($data->post->children() as $child)
+			foreach ($data->post->children() as $child) {
 				$element = $child;
+			}
 		} else {
 			$oldXML = false;
 			$element = $data;
@@ -590,14 +611,15 @@ class Diaspora {
 		if (in_array($type, array("signed_retraction", "relayable_retraction")))
 			$type = "retraction";
 
-		if ($type == "request")
+		if ($type == "request") {
 			$type = "contact";
+		}
 
 		$fields = new SimpleXMLElement("<".$type."/>");
 
 		$signed_data = "";
 
-		foreach ($element->children() AS $fieldname => $entry) {
+		foreach ($element->children() as $fieldname => $entry) {
 			if ($oldXML) {
 				// Translation for the old XML structure
 				if ($fieldname == "diaspora_handle") {
@@ -635,11 +657,11 @@ class Diaspora {
 				}
 			}
 
-			if (($fieldname == "author_signature") && ($entry != ""))
+			if (($fieldname == "author_signature") && ($entry != "")) {
 				$author_signature = base64_decode($entry);
-			elseif (($fieldname == "parent_author_signature") && ($entry != ""))
+			} elseif (($fieldname == "parent_author_signature") && ($entry != "")) {
 				$parent_author_signature = base64_decode($entry);
-			elseif (!in_array($fieldname, array("author_signature", "parent_author_signature", "target_author_signature"))) {
+			} elseif (!in_array($fieldname, array("author_signature", "parent_author_signature", "target_author_signature"))) {
 				if ($signed_data != "") {
 					$signed_data .= ";";
 					$signed_data_parent .= ";";
@@ -647,17 +669,20 @@ class Diaspora {
 
 				$signed_data .= $entry;
 			}
-			if (!in_array($fieldname, array("parent_author_signature", "target_author_signature")) ||
-				($orig_type == "relayable_retraction"))
+			if (!in_array($fieldname, array("parent_author_signature", "target_author_signature"))
+				|| ($orig_type == "relayable_retraction")
+			) {
 				xml::copy($entry, $fields, $fieldname);
+			}
 		}
 
 		// This is something that shouldn't happen at all.
-		if (in_array($type, array("status_message", "reshare", "profile")))
+		if (in_array($type, array("status_message", "reshare", "profile"))) {
 			if ($msg["author"] != $fields->author) {
 				logger("Message handle is not the same as envelope sender. Quitting this message.");
 				return false;
 			}
+		}
 
 		// Only some message types have signatures. So we quit here for the other types.
 		if (!in_array($type, array("comment", "like"))) {
@@ -699,14 +724,16 @@ class Diaspora {
 	 *
 	 * @return string The public key
 	 */
-	private static function key($handle) {
+	private static function key($handle)
+	{
 		$handle = strval($handle);
 
 		logger("Fetching diaspora key for: ".$handle);
 
 		$r = self::person_by_handle($handle);
-		if ($r)
+		if ($r) {
 			return $r["pubkey"];
+		}
 
 		return "";
 	}
@@ -718,23 +745,26 @@ class Diaspora {
 	 *
 	 * @return array the queried data
 	 */
-	public static function person_by_handle($handle) {
-
-		$r = q("SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
+	public static function person_by_handle($handle)
+	{
+		$r = q(
+			"SELECT * FROM `fcontact` WHERE `network` = '%s' AND `addr` = '%s' LIMIT 1",
 			dbesc(NETWORK_DIASPORA),
 			dbesc($handle)
 		);
 		if ($r) {
 			$person = $r[0];
-			logger("In cache ".print_r($r,true), LOGGER_DEBUG);
+			logger("In cache " . print_r($r, true), LOGGER_DEBUG);
 
 			// update record occasionally so it doesn't get stale
 			$d = strtotime($person["updated"]." +00:00");
-			if ($d < strtotime("now - 14 days"))
+			if ($d < strtotime("now - 14 days")) {
 				$update = true;
+			}
 
-			if ($person["guid"] == "")
+			if ($person["guid"] == "") {
 				$update = true;
+			}
 		}
 
 		if (!$person || $update) {
@@ -754,15 +784,16 @@ class Diaspora {
 	/**
 	 * @brief Updates the fcontact table
 	 *
-	 * @param array $arr The fcontact data
-	 * @param bool $update Update or insert?
+	 * @param array $arr    The fcontact data
+	 * @param bool  $update Update or insert?
 	 *
 	 * @return string The id of the fcontact entry
 	 */
-	private static function add_fcontact($arr, $update = false) {
-
+	private static function add_fcontact($arr, $update = false)
+	{
 		if ($update) {
-			$r = q("UPDATE `fcontact` SET
+			$r = q(
+				"UPDATE `fcontact` SET
 					`name` = '%s',
 					`photo` = '%s',
 					`request` = '%s',
@@ -777,42 +808,43 @@ class Diaspora {
 					`pubkey` = '%s',
 					`updated` = '%s'
 				WHERE `url` = '%s' AND `network` = '%s'",
-					dbesc($arr["name"]),
-					dbesc($arr["photo"]),
-					dbesc($arr["request"]),
-					dbesc($arr["nick"]),
-					dbesc(strtolower($arr["addr"])),
-					dbesc($arr["guid"]),
-					dbesc($arr["batch"]),
-					dbesc($arr["notify"]),
-					dbesc($arr["poll"]),
-					dbesc($arr["confirm"]),
-					dbesc($arr["alias"]),
-					dbesc($arr["pubkey"]),
-					dbesc(datetime_convert()),
-					dbesc($arr["url"]),
-					dbesc($arr["network"])
-				);
+				dbesc($arr["name"]),
+				dbesc($arr["photo"]),
+				dbesc($arr["request"]),
+				dbesc($arr["nick"]),
+				dbesc(strtolower($arr["addr"])),
+				dbesc($arr["guid"]),
+				dbesc($arr["batch"]),
+				dbesc($arr["notify"]),
+				dbesc($arr["poll"]),
+				dbesc($arr["confirm"]),
+				dbesc($arr["alias"]),
+				dbesc($arr["pubkey"]),
+				dbesc(datetime_convert()),
+				dbesc($arr["url"]),
+				dbesc($arr["network"])
+			);
 		} else {
-			$r = q("INSERT INTO `fcontact` (`url`,`name`,`photo`,`request`,`nick`,`addr`, `guid`,
+			$r = q(
+				"INSERT INTO `fcontact` (`url`,`name`,`photo`,`request`,`nick`,`addr`, `guid`,
 					`batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated`)
 				VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
-					dbesc($arr["url"]),
-					dbesc($arr["name"]),
-					dbesc($arr["photo"]),
-					dbesc($arr["request"]),
-					dbesc($arr["nick"]),
-					dbesc($arr["addr"]),
-					dbesc($arr["guid"]),
-					dbesc($arr["batch"]),
-					dbesc($arr["notify"]),
-					dbesc($arr["poll"]),
-					dbesc($arr["confirm"]),
-					dbesc($arr["network"]),
-					dbesc($arr["alias"]),
-					dbesc($arr["pubkey"]),
-					dbesc(datetime_convert())
-				);
+				dbesc($arr["url"]),
+				dbesc($arr["name"]),
+				dbesc($arr["photo"]),
+				dbesc($arr["request"]),
+				dbesc($arr["nick"]),
+				dbesc($arr["addr"]),
+				dbesc($arr["guid"]),
+				dbesc($arr["batch"]),
+				dbesc($arr["notify"]),
+				dbesc($arr["poll"]),
+				dbesc($arr["confirm"]),
+				dbesc($arr["network"]),
+				dbesc($arr["alias"]),
+				dbesc($arr["pubkey"]),
+				dbesc(datetime_convert())
+			);
 		}
 
 		return $r;
@@ -821,29 +853,34 @@ class Diaspora {
 	/**
 	 * @brief get a handle (user@domain.tld) from a given contact id or gcontact id
 	 *
-	 * @param int $contact_id The id in the contact table
+	 * @param int $contact_id  The id in the contact table
 	 * @param int $gcontact_id The id in the gcontact table
 	 *
 	 * @return string the handle
 	 */
-	public static function handle_from_contact($contact_id, $gcontact_id = 0) {
+	public static function handle_from_contact($contact_id, $gcontact_id = 0)
+	{
 		$handle = false;
 
 		logger("contact id is ".$contact_id." - gcontact id is ".$gcontact_id, LOGGER_DEBUG);
 
 		if ($gcontact_id != 0) {
-			$r = q("SELECT `addr` FROM `gcontact` WHERE `id` = %d AND `addr` != ''",
-				intval($gcontact_id));
+			$r = q(
+				"SELECT `addr` FROM `gcontact` WHERE `id` = %d AND `addr` != ''",
+				intval($gcontact_id)
+			);
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				return strtolower($r[0]["addr"]);
 			}
 		}
 
-		$r = q("SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
-			intval($contact_id));
+		$r = q(
+			"SELECT `network`, `addr`, `self`, `url`, `nick` FROM `contact` WHERE `id` = %d",
+			intval($contact_id)
+		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$contact = $r[0];
 
 			logger("contact 'self' = ".$contact['self']." 'url' = ".$contact['url'], LOGGER_DEBUG);
@@ -851,8 +888,9 @@ class Diaspora {
 			if ($contact['addr'] != "") {
 				$handle = $contact['addr'];
 			} else {
-				$baseurl_start = strpos($contact['url'],'://') + 3;
-				$baseurl_length = strpos($contact['url'],'/profile') - $baseurl_start; // allows installations in a subdirectory--not sure how Diaspora will handle
+				$baseurl_start = strpos($contact['url'], '://') + 3;
+				// allows installations in a subdirectory--not sure how Diaspora will handle
+				$baseurl_length = strpos($contact['url'], '/profile') - $baseurl_start;
 				$baseurl = substr($contact['url'], $baseurl_start, $baseurl_length);
 				$handle = $contact['nick'].'@'.$baseurl;
 			}
@@ -869,15 +907,17 @@ class Diaspora {
 	 *
 	 * @return string the contact url or null
 	 */
-	public static function url_from_contact_guid($fcontact_guid) {
+	public static function url_from_contact_guid($fcontact_guid)
+	{
 		logger("fcontact guid is ".$fcontact_guid, LOGGER_DEBUG);
 
-		$r = q("SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
+		$r = q(
+			"SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
 			dbesc(NETWORK_DIASPORA),
 			dbesc($fcontact_guid)
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			return $r[0]['url'];
 		}
 
@@ -887,20 +927,21 @@ class Diaspora {
 	/**
 	 * @brief Get a contact id for a given handle
 	 *
-	 * @param int $uid The user id
+	 * @param int    $uid    The user id
 	 * @param string $handle The handle in the format user@domain.tld
 	 *
 	 * @return The contact id
 	 */
-	private static function contact_by_handle($uid, $handle) {
-
+	private static function contact_by_handle($uid, $handle)
+	{
 		// First do a direct search on the contact table
-		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
+		$r = q(
+			"SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
 			intval($uid),
 			dbesc($handle)
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			return $r[0];
 		} else {
 			/*
@@ -913,7 +954,7 @@ class Diaspora {
 				/// @TODO Contact retrieval should be encapsulated into an "entity" class like `Contact`
 				$r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
 
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					return $r[0];
 				}
 			}
@@ -921,12 +962,13 @@ class Diaspora {
 
 		$handle_parts = explode("@", $handle);
 		$nurl_sql = "%%://".$handle_parts[1]."%%/profile/".$handle_parts[0];
-		$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` LIKE '%s' LIMIT 1",
+		$r = q(
+			"SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` LIKE '%s' LIMIT 1",
 			dbesc(NETWORK_DFRN),
 			intval($uid),
 			dbesc($nurl_sql)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			return $r[0];
 		}
 
@@ -937,9 +979,9 @@ class Diaspora {
 	/**
 	 * @brief Check if posting is allowed for this contact
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param array $contact The contact that is checked
-	 * @param bool $is_comment Is the check for a comment?
+	 * @param array $importer   Array of the importer user
+	 * @param array $contact    The contact that is checked
+	 * @param bool  $is_comment Is the check for a comment?
 	 *
 	 * @return bool is the contact allowed to post?
 	 */
@@ -951,8 +993,11 @@ class Diaspora {
 		 * Normally this should have handled by getting a request - but this could get lost
 		 */
 		if ($contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
-			dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
-					array('id' => $contact["id"], 'uid' => $contact["uid"]));
+			dba::update(
+				'contact',
+				array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
+				array('id' => $contact["id"], 'uid' => $contact["uid"])
+			);
 
 			$contact["rel"] = CONTACT_IS_FRIEND;
 			logger("defining user ".$contact["nick"]." as friend");
@@ -982,13 +1027,14 @@ class Diaspora {
 	/**
 	 * @brief Fetches the contact id for a handle and checks if posting is allowed
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param string $handle The checked handle in the format user@domain.tld
-	 * @param bool $is_comment Is the check for a comment?
+	 * @param array  $importer   Array of the importer user
+	 * @param string $handle     The checked handle in the format user@domain.tld
+	 * @param bool   $is_comment Is the check for a comment?
 	 *
 	 * @return array The contact data
 	 */
-	private static function allowed_contact_by_handle($importer, $handle, $is_comment = false) {
+	private static function allowed_contact_by_handle($importer, $handle, $is_comment = false)
+	{
 		$contact = self::contact_by_handle($importer["uid"], $handle);
 		if (!$contact) {
 			logger("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
@@ -1010,18 +1056,20 @@ class Diaspora {
 	/**
 	 * @brief Does the message already exists on the system?
 	 *
-	 * @param int $uid The user id
+	 * @param int    $uid  The user id
 	 * @param string $guid The guid of the message
 	 *
 	 * @return int|bool message id if the message already was stored into the system - or false.
 	 */
-	private static function message_exists($uid, $guid) {
-		$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+	private static function message_exists($uid, $guid)
+	{
+		$r = q(
+			"SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
 			intval($uid),
 			dbesc($guid)
 		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger("message ".$guid." already exists for user ".$uid);
 			return $r[0]["id"];
 		}
@@ -1034,30 +1082,39 @@ class Diaspora {
 	 *
 	 * @param array $item The item array
 	 */
-	private static function fetch_guid($item) {
+	private static function fetch_guid($item)
+	{
 		$expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
-		preg_replace_callback($expression,
+		preg_replace_callback(
+			$expression,
 			function ($match) use ($item) {
 				return self::fetch_guid_sub($match, $item);
-			}, $item["body"]);
+			},
+			$item["body"]
+		);
 
-		preg_replace_callback("&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
+		preg_replace_callback(
+			"&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
 			function ($match) use ($item) {
 				return self::fetch_guid_sub($match, $item);
-			}, $item["body"]);
+			},
+			$item["body"]
+		);
 	}
 
 	/**
 	 * @brief Checks for relative /people/* links in an item body to match local
 	 * contacts or prepends the remote host taken from the author link.
 	 *
-	 * @param string $body The item body to replace links from
+	 * @param string $body        The item body to replace links from
 	 * @param string $author_link The author link for missing local contact fallback
 	 *
 	 * @return the replaced string
 	 */
-	public static function replace_people_guid($body, $author_link) {
-		$return = preg_replace_callback("&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
+	public static function replace_people_guid($body, $author_link)
+	{
+		$return = preg_replace_callback(
+			"&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
 			function ($match) use ($author_link) {
 				// $match
 				// 0 => '[url=/people/0123456789abcdef]Foo Bar[/url]'
@@ -1074,7 +1131,9 @@ class Diaspora {
 				}
 
 				return $return;
-			}, $body);
+			},
+			$body
+		);
 
 		return $return;
 	}
@@ -1083,23 +1142,26 @@ class Diaspora {
 	 * @brief sub function of "fetch_guid" which checks for links in messages
 	 *
 	 * @param array $match array containing a link that has to be checked for a message link
-	 * @param array $item The item array
+	 * @param array $item  The item array
 	 */
-	private static function fetch_guid_sub($match, $item) {
-		if (!self::store_by_guid($match[1], $item["author-link"]))
+	private static function fetch_guid_sub($match, $item)
+	{
+		if (!self::store_by_guid($match[1], $item["author-link"])) {
 			self::store_by_guid($match[1], $item["owner-link"]);
+		}
 	}
 
 	/**
 	 * @brief Fetches an item with a given guid from a given server
 	 *
-	 * @param string $guid the message guid
+	 * @param string $guid   the message guid
 	 * @param string $server The server address
-	 * @param int $uid The user id of the user
+	 * @param int    $uid    The user id of the user
 	 *
 	 * @return int the message id of the stored message or false
 	 */
-	private static function store_by_guid($guid, $server, $uid = 0) {
+	private static function store_by_guid($guid, $server, $uid = 0)
+	{
 		$serverparts = parse_url($server);
 		$server = $serverparts["scheme"]."://".$serverparts["host"];
 
@@ -1107,8 +1169,9 @@ class Diaspora {
 
 		$msg = self::message($guid, $server);
 
-		if (!$msg)
+		if (!$msg) {
 			return false;
+		}
 
 		logger("Successfully fetched item ".$guid." from ".$server, LOGGER_DEBUG);
 
@@ -1119,19 +1182,20 @@ class Diaspora {
 	/**
 	 * @brief Fetches a message from a server
 	 *
-	 * @param string $guid message guid
+	 * @param string $guid   message guid
 	 * @param string $server The url of the server
-	 * @param int $level Endless loop prevention
+	 * @param int    $level  Endless loop prevention
 	 *
 	 * @return array
 	 *      'message' => The message XML
 	 *      'author' => The author handle
 	 *      'key' => The public key of the author
 	 */
-	private static function message($guid, $server, $level = 0) {
-
-		if ($level > 5)
+	private static function message($guid, $server, $level = 0)
+	{
+		if ($level > 5) {
 			return false;
+		}
 
 		// This will work for new Diaspora servers and Friendica servers from 3.5
 		$source_url = $server."/fetch/post/".urlencode($guid);
@@ -1142,12 +1206,14 @@ class Diaspora {
 		if ($envelope) {
 			logger("Envelope was fetched.", LOGGER_DEBUG);
 			$x = self::verify_magic_envelope($envelope);
-			if (!$x)
+			if (!$x) {
 				logger("Envelope could not be verified.", LOGGER_DEBUG);
-			else
+			} else {
 				logger("Envelope was verified.", LOGGER_DEBUG);
-		} else
+			}
+		} else {
 			$x = false;
+		}
 
 		// This will work for older Diaspora and Friendica servers
 		if (!$x) {
@@ -1155,14 +1221,16 @@ class Diaspora {
 			logger("Fetch post from ".$source_url, LOGGER_DEBUG);
 
 			$x = fetch_url($source_url);
-			if (!$x)
+			if (!$x) {
 				return false;
+			}
 		}
 
 		$source_xml = parse_xml_string($x);
 
-		if (!is_object($source_xml))
+		if (!is_object($source_xml)) {
 			return false;
+		}
 
 		if ($source_xml->post->reshare) {
 			// Reshare of a reshare - old Diaspora version
@@ -1177,10 +1245,11 @@ class Diaspora {
 		$author = "";
 
 		// Fetch the author - for the old and the new Diaspora version
-		if ($source_xml->post->status_message->diaspora_handle)
+		if ($source_xml->post->status_message->diaspora_handle) {
 			$author = (string)$source_xml->post->status_message->diaspora_handle;
-		elseif ($source_xml->author && ($source_xml->getName() == "status_message"))
+		} elseif ($source_xml->author && ($source_xml->getName() == "status_message")) {
 			$author = (string)$source_xml->author;
+		}
 
 		// If this isn't a "status_message" then quit
 		if (!$author) {
@@ -1198,19 +1267,23 @@ class Diaspora {
 	/**
 	 * @brief Fetches the item record of a given guid
 	 *
-	 * @param int $uid The user id
-	 * @param string $guid message guid
-	 * @param string $author The handle of the item
-	 * @param array $contact The contact of the item owner
+	 * @param int    $uid     The user id
+	 * @param string $guid    message guid
+	 * @param string $author  The handle of the item
+	 * @param array  $contact The contact of the item owner
 	 *
 	 * @return array the item record
 	 */
-	private static function parent_item($uid, $guid, $author, $contact) {
-		$r = q("SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
+	private static function parent_item($uid, $guid, $author, $contact)
+	{
+		$r = q(
+			"SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
 				`author-name`, `author-link`, `author-avatar`,
 				`owner-name`, `owner-link`, `owner-avatar`
 			FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
-			intval($uid), dbesc($guid));
+			intval($uid),
+			dbesc($guid)
+		);
 
 		if (!$r) {
 			$result = self::store_by_guid($guid, $contact["url"], $uid);
@@ -1223,11 +1296,14 @@ class Diaspora {
 			if ($result) {
 				logger("Fetched missing item ".$guid." - result: ".$result, LOGGER_DEBUG);
 
-				$r = q("SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
+				$r = q(
+					"SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
 						`author-name`, `author-link`, `author-avatar`,
 						`owner-name`, `owner-link`, `owner-avatar`
 					FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
-					intval($uid), dbesc($guid));
+					intval($uid),
+					dbesc($guid)
+				);
 			}
 		}
 
@@ -1244,17 +1320,20 @@ class Diaspora {
 	 * @brief returns contact details
 	 *
 	 * @param array $contact The default contact if the person isn't found
-	 * @param array $person The record of the person
-	 * @param int $uid The user id
+	 * @param array $person  The record of the person
+	 * @param int   $uid     The user id
 	 *
 	 * @return array
 	 *      'cid' => contact id
 	 *      'network' => network type
 	 */
-	private static function author_contact_by_url($contact, $person, $uid) {
-
-		$r = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
-			dbesc(normalise_link($person["url"])), intval($uid));
+	private static function author_contact_by_url($contact, $person, $uid)
+	{
+		$r = q(
+			"SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+			dbesc(normalise_link($person["url"])),
+			intval($uid)
+		);
 		if ($r) {
 			$cid = $r[0]["id"];
 			$network = $r[0]["network"];
@@ -1277,34 +1356,37 @@ class Diaspora {
 	 *
 	 * @return bool is it a hubzilla server?
 	 */
-	public static function is_redmatrix($url) {
+	public static function is_redmatrix($url)
+	{
 		return(strstr($url, "/channel/"));
 	}
 
 	/**
 	 * @brief Generate a post link with a given handle and message guid
 	 *
-	 * @param string $addr The user handle
-	 * @param string $guid message guid
+	 * @param string $addr        The user handle
+	 * @param string $guid        message guid
+	 * @param string $parent_guid optional parent guid
 	 *
 	 * @return string the post link
 	 */
-	private static function plink($addr, $guid, $parent_guid = '') {
+	private static function plink($addr, $guid, $parent_guid = '')
+	{
 		$r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
 
 		// Fallback
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			if ($parent_guid != '') {
-				return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$parent_guid."#".$guid;
+				return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
 			} else {
-				return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$guid;
+				return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
 			}
 		}
 
 		// Friendica contacts are often detected as Diaspora contacts in the "fcontact" table
 		// So we try another way as well.
 		$s = q("SELECT `network` FROM `gcontact` WHERE `nurl`='%s' LIMIT 1", dbesc(normalise_link($r[0]["url"])));
-		if (dbm::is_result($s)) {
+		if (DBM::is_result($s)) {
 			$r[0]["network"] = $s[0]["network"];
 		}
 
@@ -1317,21 +1399,22 @@ class Diaspora {
 		}
 
 		if ($parent_guid != '') {
-			return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$parent_guid."#".$guid;
+			return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
 		} else {
-			return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+			return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
 		}
 	}
 
 	/**
 	 * @brief Receives account migration
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param object $data     The message object
 	 *
 	 * @return bool Success
 	 */
-	private static function receiveAccountMigration($importer, $data) {
+	private static function receiveAccountMigration($importer, $data)
+	{
 		$old_handle = notags(unxmlify($data->author));
 		$new_handle = notags(unxmlify($data->profile->author));
 		$signature = notags(unxmlify($data->signature));
@@ -1386,16 +1469,23 @@ class Diaspora {
 			'owner-link' => array($contact["url"], $data["url"]),
 			'author-link' => array($contact["url"], $data["url"]),
 		);
-		foreach ($fields as $n=>$f) {
-			$r = q("SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
-					$n, dbesc($f[0]),
-					intval($importer["uid"]));
+		foreach ($fields as $n => $f) {
+			$r = q(
+				"SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
+				$n,
+				dbesc($f[0]),
+				intval($importer["uid"])
+			);
 
-			if (dbm::is_result($r)) {
-				$x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
-						$n, dbesc($f[1]),
-						$n, dbesc($f[0]),
-						intval($importer["uid"]));
+			if (DBM::is_result($r)) {
+				$x = q(
+					"UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
+					$n,
+					dbesc($f[1]),
+					$n,
+					dbesc($f[0]),
+					intval($importer["uid"])
+				);
 
 				if ($x === false) {
 					return false;
@@ -1411,13 +1501,13 @@ class Diaspora {
 	/**
 	 * @brief Processes an account deletion
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param object $data     The message object
 	 *
 	 * @return bool Success
 	 */
-	private static function receive_account_deletion($importer, $data) {
-
+	private static function receive_account_deletion($importer, $data)
+	{
 		/// @todo Account deletion should remove the contact from the global contacts as well
 
 		$author = notags(unxmlify($data->author));
@@ -1436,16 +1526,16 @@ class Diaspora {
 	/**
 	 * @brief Fetch the uri from our database if we already have this item (maybe from ourselves)
 	 *
-	 * @param string $author Author handle
-	 * @param string $guid Message guid
+	 * @param string  $author    Author handle
+	 * @param string  $guid      Message guid
 	 * @param boolean $onlyfound Only return uri when found in the database
 	 *
 	 * @return string The constructed uri or the one from our database
 	 */
-	private static function get_uri_from_guid($author, $guid, $onlyfound = false) {
-
+	private static function get_uri_from_guid($author, $guid, $onlyfound = false)
+	{
 		$r = q("SELECT `uri` FROM `item` WHERE `guid` = '%s' LIMIT 1", dbesc($guid));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			return $r[0]["uri"];
 		} elseif (!$onlyfound) {
 			return $author.":".$guid;
@@ -1457,15 +1547,15 @@ class Diaspora {
 	/**
 	 * @brief Fetch the guid from our database with a given uri
 	 *
-	 * @param string $author Author handle
 	 * @param string $uri Message uri
+	 * @param string $uid Author handle
 	 *
 	 * @return string The post guid
 	 */
-	private static function get_guid_from_uri($uri, $uid) {
-
+	private static function get_guid_from_uri($uri, $uid)
+	{
 		$r = q("SELECT `guid` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($uri), intval($uid));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			return $r[0]["guid"];
 		} else {
 			return false;
@@ -1479,13 +1569,14 @@ class Diaspora {
 	 *
 	 * @return array|boolean the origin owner of that post - or false
 	 */
-	private static function importer_for_guid($guid) {
+	private static function importer_for_guid($guid)
+	{
 		$item = dba::fetch_first("SELECT `uid` FROM `item` WHERE `origin` AND `guid` = ? LIMIT 1", $guid);
 
-		if (dbm::is_result($item)) {
+		if (DBM::is_result($item)) {
 			logger("Found user ".$item['uid']." as owner of item ".$guid, LOGGER_DEBUG);
 			$contact = dba::fetch_first("SELECT * FROM `contact` WHERE `self` AND `uid` = ?", $item['uid']);
-			if (dbm::is_result($contact)) {
+			if (DBM::is_result($contact)) {
 				return $contact;
 			}
 		}
@@ -1495,14 +1586,15 @@ class Diaspora {
 	/**
 	 * @brief Processes an incoming comment
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param string $sender The sender of the message
-	 * @param object $data The message object
-	 * @param string $xml The original XML of the message
+	 * @param array  $importer Array of the importer user
+	 * @param string $sender   The sender of the message
+	 * @param object $data     The message object
+	 * @param string $xml      The original XML of the message
 	 *
 	 * @return int The message id of the generated comment or "false" if there was an error
 	 */
-	private static function receive_comment($importer, $sender, $data, $xml) {
+	private static function receive_comment($importer, $sender, $data, $xml)
+	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
 		$parent_guid = notags(unxmlify($data->parent_guid));
@@ -1553,11 +1645,11 @@ class Diaspora {
 
 		$datarray["author-name"] = $person["name"];
 		$datarray["author-link"] = $person["url"];
-		$datarray["author-avatar"] = ((x($person,"thumb")) ? $person["thumb"] : $person["photo"]);
+		$datarray["author-avatar"] = ((x($person, "thumb")) ? $person["thumb"] : $person["photo"]);
 
 		$datarray["owner-name"] = $contact["name"];
 		$datarray["owner-link"] = $contact["url"];
-		$datarray["owner-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
+		$datarray["owner-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
 
 		$datarray["guid"] = $guid;
 		$datarray["uri"] = self::get_uri_from_guid($author, $guid);
@@ -1599,7 +1691,6 @@ class Diaspora {
 
 		// If we are the origin of the parent we store the original data and notify our followers
 		if ($message_id && $parent_item["origin"]) {
-
 			// Formerly we stored the signed text, the signature and the author in different fields.
 			// We now store the raw data so that we are more flexible.
 			dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
@@ -1614,16 +1705,17 @@ class Diaspora {
 	/**
 	 * @brief processes and stores private messages
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param array $contact The contact of the message
-	 * @param object $data The message object
-	 * @param array $msg Array of the processed message, author handle and key
-	 * @param object $mesg The private message
-	 * @param array $conversation The conversation record to which this message belongs
+	 * @param array  $importer     Array of the importer user
+	 * @param array  $contact      The contact of the message
+	 * @param object $data         The message object
+	 * @param array  $msg          Array of the processed message, author handle and key
+	 * @param object $mesg         The private message
+	 * @param array  $conversation The conversation record to which this message belongs
 	 *
 	 * @return bool "true" if it was successful
 	 */
-	private static function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation) {
+	private static function receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation)
+	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
 		$subject = notags(unxmlify($data->subject));
@@ -1655,16 +1747,18 @@ class Diaspora {
 
 		dba::lock('mail');
 
-		$r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+		$r = q(
+			"SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($msg_guid),
 			intval($importer["uid"])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger("duplicate message already delivered.", LOGGER_DEBUG);
 			return false;
 		}
 
-		q("INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
+		q(
+			"INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
 			VALUES (%d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
 			intval($importer["uid"]),
 			dbesc($msg_guid),
@@ -1686,7 +1780,8 @@ class Diaspora {
 
 		dba::update('conv', array('updated' => datetime_convert()), array('id' => $conversation["id"]));
 
-		notification(array(
+		notification(
+			array(
 			"type" => NOTIFY_MAIL,
 			"notify_flags" => $importer["notify-flags"],
 			"language" => $importer["language"],
@@ -1706,13 +1801,14 @@ class Diaspora {
 	/**
 	 * @brief Processes new private messages (answers to private messages are processed elsewhere)
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param array $msg Array of the processed message, author handle and key
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param array  $msg      Array of the processed message, author handle and key
+	 * @param object $data     The message object
 	 *
 	 * @return bool Success
 	 */
-	private static function receive_conversation($importer, $msg, $data) {
+	private static function receive_conversation($importer, $msg, $data)
+	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
 		$subject = notags(unxmlify($data->subject));
@@ -1727,19 +1823,22 @@ class Diaspora {
 		}
 
 		$contact = self::allowed_contact_by_handle($importer, $msg["author"], true);
-		if (!$contact)
+		if (!$contact) {
 			return false;
+		}
 
 		$conversation = null;
 
-		$c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+		$c = q(
+			"SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
 			intval($importer["uid"]),
 			dbesc($guid)
 		);
 		if ($c)
 			$conversation = $c[0];
 		else {
-			$r = q("INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
+			$r = q(
+				"INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
 				VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s')",
 				intval($importer["uid"]),
 				dbesc($guid),
@@ -1749,22 +1848,26 @@ class Diaspora {
 				dbesc($subject),
 				dbesc($participants)
 			);
-			if ($r)
-				$c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+			if ($r) {
+				$c = q(
+					"SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
 					intval($importer["uid"]),
 					dbesc($guid)
 				);
+			}
 
-			if ($c)
+			if ($c) {
 				$conversation = $c[0];
+			}
 		}
 		if (!$conversation) {
 			logger("unable to create conversation.");
 			return false;
 		}
 
-		foreach ($messages as $mesg)
+		foreach ($messages as $mesg) {
 			self::receive_conversation_message($importer, $contact, $data, $msg, $mesg, $conversation);
+		}
 
 		return true;
 	}
@@ -1772,9 +1875,9 @@ class Diaspora {
 	/**
 	 * @brief Creates the body for a "like" message
 	 *
-	 * @param array $contact The contact that send us the "like"
-	 * @param array $parent_item The item array of the parent item
-	 * @param string $guid message guid
+	 * @param array  $contact     The contact that send us the "like"
+	 * @param array  $parent_item The item array of the parent item
+	 * @param string $guid        message guid
 	 *
 	 * @return string the body
 	 */
@@ -1791,12 +1894,13 @@ class Diaspora {
 	/**
 	 * @brief Creates a XML object for a "like"
 	 *
-	 * @param array $importer Array of the importer user
+	 * @param array $importer    Array of the importer user
 	 * @param array $parent_item The item array of the parent item
 	 *
 	 * @return string The XML
 	 */
-	private static function construct_like_object($importer, $parent_item) {
+	private static function construct_like_object($importer, $parent_item)
+	{
 		$objtype = ACTIVITY_OBJ_NOTE;
 		$link = '<link rel="alternate" type="text/html" href="'.System::baseUrl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
 		$parent_body = $parent_item["body"];
@@ -1814,13 +1918,14 @@ class Diaspora {
 	/**
 	 * @brief Processes "like" messages
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param string $sender The sender of the message
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param string $sender   The sender of the message
+	 * @param object $data     The message object
 	 *
 	 * @return int The message id of the generated like or "false" if there was an error
 	 */
-	private static function receive_like($importer, $sender, $data) {
+	private static function receive_like($importer, $sender, $data)
+	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
 		$parent_guid = notags(unxmlify($data->parent_guid));
@@ -1829,20 +1934,24 @@ class Diaspora {
 
 		// likes on comments aren't supported by Diaspora - only on posts
 		// But maybe this will be supported in the future, so we will accept it.
-		if (!in_array($parent_type, array("Post", "Comment")))
+		if (!in_array($parent_type, array("Post", "Comment"))) {
 			return false;
+		}
 
 		$contact = self::allowed_contact_by_handle($importer, $sender, true);
-		if (!$contact)
+		if (!$contact) {
 			return false;
+		}
 
 		$message_id = self::message_exists($importer["uid"], $guid);
-		if ($message_id)
+		if ($message_id) {
 			return true;
+		}
 
 		$parent_item = self::parent_item($importer["uid"], $parent_guid, $author, $contact);
-		if (!$parent_item)
+		if (!$parent_item) {
 			return false;
+		}
 
 		$person = self::person_by_handle($author);
 		if (!is_array($person)) {
@@ -1855,10 +1964,11 @@ class Diaspora {
 
 		// "positive" = "false" would be a Dislike - wich isn't currently supported by Diaspora
 		// We would accept this anyhow.
-		if ($positive == "true")
+		if ($positive == "true") {
 			$verb = ACTIVITY_LIKE;
-		else
+		} else {
 			$verb = ACTIVITY_DISLIKE;
+		}
 
 		$datarray = array();
 
@@ -1870,11 +1980,11 @@ class Diaspora {
 
 		$datarray["author-name"] = $person["name"];
 		$datarray["author-link"] = $person["url"];
-		$datarray["author-avatar"] = ((x($person,"thumb")) ? $person["thumb"] : $person["photo"]);
+		$datarray["author-avatar"] = ((x($person, "thumb")) ? $person["thumb"] : $person["photo"]);
 
 		$datarray["owner-name"] = $contact["name"];
 		$datarray["owner-link"] = $contact["url"];
-		$datarray["owner-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
+		$datarray["owner-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
 
 		$datarray["guid"] = $guid;
 		$datarray["uri"] = self::get_uri_from_guid($author, $guid);
@@ -1909,7 +2019,6 @@ class Diaspora {
 
 		// If we are the origin of the parent we store the original data and notify our followers
 		if ($message_id && $origin) {
-
 			// Formerly we stored the signed text, the signature and the author in different fields.
 			// We now store the raw data so that we are more flexible.
 			dba::insert('sign', array('iid' => $message_id, 'signed_text' => json_encode($data)));
@@ -1924,12 +2033,13 @@ class Diaspora {
 	/**
 	 * @brief Processes private messages
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param object $data     The message object
 	 *
 	 * @return bool Success?
 	 */
-	private static function receive_message($importer, $data) {
+	private static function receive_message($importer, $data)
+	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
 		$conversation_guid = notags(unxmlify($data->conversation_guid));
@@ -1943,7 +2053,8 @@ class Diaspora {
 
 		$conversation = null;
 
-		$c = q("SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
+		$c = q(
+			"SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
 			intval($importer["uid"]),
 			dbesc($conversation_guid)
 		);
@@ -1968,16 +2079,18 @@ class Diaspora {
 
 		dba::lock('mail');
 
-		$r = q("SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
+		$r = q(
+			"SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($guid),
 			intval($importer["uid"])
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger("duplicate message already delivered.", LOGGER_DEBUG);
 			return false;
 		}
 
-		q("INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
+		q(
+			"INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
 				VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
 			intval($importer["uid"]),
 			dbesc($guid),
@@ -2004,12 +2117,13 @@ class Diaspora {
 	/**
 	 * @brief Processes participations - unsupported by now
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param object $data     The message object
 	 *
 	 * @return bool always true
 	 */
-	private static function receive_participation($importer, $data) {
+	private static function receive_participation($importer, $data)
+	{
 		// I'm not sure if we can fully support this message type
 		return true;
 	}
@@ -2017,25 +2131,28 @@ class Diaspora {
 	/**
 	 * @brief Processes photos - unneeded
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param object $data     The message object
 	 *
 	 * @return bool always true
 	 */
-	private static function receive_photo($importer, $data) {
-		// There doesn't seem to be a reason for this function, since the photo data is transmitted in the status message as well
+	private static function receive_photo($importer, $data)
+	{
+		// There doesn't seem to be a reason for this function,
+		// since the photo data is transmitted in the status message as well
 		return true;
 	}
 
 	/**
 	 * @brief Processes poll participations - unssupported
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param object $data     The message object
 	 *
 	 * @return bool always true
 	 */
-	private static function receive_poll_participation($importer, $data) {
+	private static function receive_poll_participation($importer, $data)
+	{
 		// We don't support polls by now
 		return true;
 	}
@@ -2043,17 +2160,19 @@ class Diaspora {
 	/**
 	 * @brief Processes incoming profile updates
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param object $data     The message object
 	 *
 	 * @return bool Success
 	 */
-	private static function receive_profile($importer, $data) {
+	private static function receive_profile($importer, $data)
+	{
 		$author = strtolower(notags(unxmlify($data->author)));
 
 		$contact = self::contact_by_handle($importer["uid"], $author);
-		if (!$contact)
+		if (!$contact) {
 			return false;
+		}
 
 		$name = unxmlify($data->first_name).((strlen($data->last_name)) ? " ".unxmlify($data->last_name) : "");
 		$image_url = unxmlify($data->image_url);
@@ -2070,8 +2189,9 @@ class Diaspora {
 		$keywords = array();
 		foreach ($tags as $tag) {
 			$tag = trim(strtolower($tag));
-			if ($tag != "")
+			if ($tag != "") {
 				$keywords[] = $tag;
+			}
 		}
 
 		$keywords = implode(", ", $keywords);
@@ -2079,11 +2199,13 @@ class Diaspora {
 		$handle_parts = explode("@", $author);
 		$nick = $handle_parts[0];
 
-		if ($name === "")
+		if ($name === "") {
 			$name = $handle_parts[0];
+		}
 
-		if ( preg_match("|^https?://|", $image_url) === 0)
+		if (preg_match("|^https?://|", $image_url) === 0) {
 			$image_url = "http://".$handle_parts[1].$image_url;
+		}
 
 		update_contact_avatar($image_url, $importer["uid"], $contact["id"]);
 
@@ -2091,16 +2213,19 @@ class Diaspora {
 
 		$birthday = str_replace("1000", "1901", $birthday);
 
-		if ($birthday != "")
+		if ($birthday != "") {
 			$birthday = datetime_convert("UTC", "UTC", $birthday, "Y-m-d");
+		}
 
 		// this is to prevent multiple birthday notifications in a single year
 		// if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year
 
-		if (substr($birthday,5) === substr($contact["bd"],5))
+		if (substr($birthday, 5) === substr($contact["bd"], 5)) {
 			$birthday = $contact["bd"];
+		}
 
-		$r = q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s',
+		$r = q(
+			"UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s',
 				`location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d AND `uid` = %d",
 			dbesc($name),
 			dbesc($nick),
@@ -2134,32 +2259,36 @@ class Diaspora {
 	 * @brief Processes incoming friend requests
 	 *
 	 * @param array $importer Array of the importer user
-	 * @param array $contact The contact that send the request
+	 * @param array $contact  The contact that send the request
 	 */
-	private static function receive_request_make_friend($importer, $contact) {
-
+	private static function receive_request_make_friend($importer, $contact)
+	{
 		$a = get_app();
 
 		if ($contact["rel"] == CONTACT_IS_SHARING) {
-			dba::update('contact', array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
-					array('id' => $contact["id"], 'uid' => $importer["uid"]));
+			dba::update(
+				'contact',
+				array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
+				array('id' => $contact["id"], 'uid' => $importer["uid"])
+			);
 		}
 		// send notification
 
-		$r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
+		$r = q(
+			"SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
 			intval($importer["uid"])
 		);
 
 		if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(PConfig::get($importer["uid"], "system", "post_newfriend"))) {
 
-			$self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
+			$self = q(
+				"SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
 				intval($importer["uid"])
 			);
 
 			// they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array
 
 			if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
-
 				$arr = array();
 				$arr["protocol"] = PROTOCOL_DIASPORA;
 				$arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]);
@@ -2190,8 +2319,9 @@ class Diaspora {
 				$arr["deny_gid"]  = $user[0]["deny_gid"];
 
 				$i = item_store($arr);
-				if ($i)
+				if ($i) {
 					Worker::add(PRIORITY_HIGH, "notifier", "activity", $i);
+				}
 			}
 		}
 	}
@@ -2203,7 +2333,8 @@ class Diaspora {
 	 *
 	 * @return string The XML
 	 */
-	private static function construct_new_friend_object($contact) {
+	private static function construct_new_friend_object($contact)
+	{
 		$objtype = ACTIVITY_OBJ_PERSON;
 		$link = '<link rel="alternate" type="text/html" href="'.$contact["url"].'" />'."\n".
 			'<link rel="photo" type="image/jpeg" href="'.$contact["thumb"].'" />'."\n";
@@ -2219,12 +2350,13 @@ class Diaspora {
 	/**
 	 * @brief Processes incoming sharing notification
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param object $data     The message object
 	 *
 	 * @return bool Success
 	 */
-	private static function receive_contact_request($importer, $data) {
+	private static function receive_contact_request($importer, $data)
+	{
 		$author = unxmlify($data->author);
 		$recipient = unxmlify($data->recipient);
 
@@ -2246,7 +2378,7 @@ class Diaspora {
 			$sharing = true;
 		}
 
-		$contact = self::contact_by_handle($importer["uid"],$author);
+		$contact = self::contact_by_handle($importer["uid"], $author);
 
 		// perhaps we were already sharing with this person. Now they're sharing with us.
 		// That makes us friends.
@@ -2256,7 +2388,7 @@ class Diaspora {
 				self::receive_request_make_friend($importer, $contact);
 
 				// refetch the contact array
-				$contact = self::contact_by_handle($importer["uid"],$author);
+				$contact = self::contact_by_handle($importer["uid"], $author);
 
 				// If we are now friends, we are sending a share message.
 				// Normally we needn't to do so, but the first message could have been vanished.
@@ -2298,7 +2430,8 @@ class Diaspora {
 
 		$batch = (($ret["batch"]) ? $ret["batch"] : implode("/", array_slice(explode("/", $ret["url"]), 0, 3))."/receive/public");
 
-		$r = q("INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
+		$r = q(
+			"INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
 			VALUES (%d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d)",
 			intval($importer["uid"]),
 			dbesc($ret["network"]),
@@ -2319,7 +2452,7 @@ class Diaspora {
 
 		// find the contact record we just created
 
-		$contact_record = self::contact_by_handle($importer["uid"],$author);
+		$contact_record = self::contact_by_handle($importer["uid"], $author);
 
 		if (!$contact_record) {
 			logger("unable to locate newly created contact record.");
@@ -2330,18 +2463,19 @@ class Diaspora {
 
 		$def_gid = get_default_group($importer['uid'], $ret["network"]);
 
-		if (intval($def_gid))
+		if (intval($def_gid)) {
 			group_add_member($importer["uid"], "", $contact_record["id"], $def_gid);
+		}
 
 		update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
 
 		if ($importer["page-flags"] == PAGE_NORMAL) {
-
 			logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
 
 			$hash = random_string().(string)time();   // Generate a confirm_key
 
-			$ret = q("INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
+			$ret = q(
+				"INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
 				VALUES (%d, %d, %d, %d, '%s', '%s', '%s')",
 				intval($importer["uid"]),
 				intval($contact_record["id"]),
@@ -2352,25 +2486,26 @@ class Diaspora {
 				dbesc(datetime_convert())
 			);
 		} else {
-
 			// automatic friend approval
 
 			logger("Does an automatic friend approval for author ".$author.".", LOGGER_DEBUG);
 
-			update_contact_avatar($contact_record["photo"],$importer["uid"],$contact_record["id"]);
+			update_contact_avatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
 
 			// technically they are sharing with us (CONTACT_IS_SHARING),
 			// but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
 			// we are going to change the relationship and make them a follower.
 
-			if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following)
+			if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following) {
 				$new_relation = CONTACT_IS_FRIEND;
-			elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing)
+			} elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing) {
 				$new_relation = CONTACT_IS_SHARING;
-			else
+			} else {
 				$new_relation = CONTACT_IS_FOLLOWER;
+			}
 
-			$r = q("UPDATE `contact` SET `rel` = %d,
+			$r = q(
+				"UPDATE `contact` SET `rel` = %d,
 				`name-date` = '%s',
 				`uri-date` = '%s',
 				`blocked` = 0,
@@ -2400,21 +2535,23 @@ class Diaspora {
 	/**
 	 * @brief Fetches a message with a given guid
 	 *
-	 * @param string $guid message guid
+	 * @param string $guid        message guid
 	 * @param string $orig_author handle of the original post
-	 * @param string $author handle of the sharer
+	 * @param string $author      handle of the sharer
 	 *
 	 * @return array The fetched item
 	 */
-	private static function original_item($guid, $orig_author, $author) {
-
+	private static function original_item($guid, $orig_author, $author)
+	{
 		// Do we already have this item?
-		$r = q("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
+		$r = q(
+			"SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
 				`author-name`, `author-link`, `author-avatar`
 				FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
-			dbesc($guid));
+			dbesc($guid)
+		);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			logger("reshared message ".$guid." already exists on system.");
 
 			// Maybe it is already a reshared item?
@@ -2436,7 +2573,7 @@ class Diaspora {
 			}
 		}
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			$server = "https://".substr($orig_author, strpos($orig_author, "@") + 1);
 			logger("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
 			$item_id = self::store_by_guid($guid, $server);
@@ -2448,12 +2585,14 @@ class Diaspora {
 			}
 
 			if ($item_id) {
-				$r = q("SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
+				$r = q(
+					"SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
 						`author-name`, `author-link`, `author-avatar`
 					FROM `item` WHERE `id` = %d AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
-					intval($item_id));
+					intval($item_id)
+				);
 
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					// If it is a reshared post from another network then reformat to avoid display problems with two share elements
 					if (self::is_reshare($r[0]["body"], false)) {
 						$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
@@ -2462,7 +2601,6 @@ class Diaspora {
 
 					return $r[0];
 				}
-
 			}
 		}
 		return false;
@@ -2471,13 +2609,14 @@ class Diaspora {
 	/**
 	 * @brief Processes a reshare message
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param object $data The message object
-	 * @param string $xml The original XML of the message
+	 * @param array  $importer Array of the importer user
+	 * @param object $data     The message object
+	 * @param string $xml      The original XML of the message
 	 *
 	 * @return int the message id
 	 */
-	private static function receive_reshare($importer, $data, $xml) {
+	private static function receive_reshare($importer, $data, $xml)
+	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
 		$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
@@ -2511,7 +2650,7 @@ class Diaspora {
 
 		$datarray["author-name"] = $contact["name"];
 		$datarray["author-link"] = $contact["url"];
-		$datarray["author-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
+		$datarray["author-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
 
 		$datarray["owner-name"] = $datarray["author-name"];
 		$datarray["owner-link"] = $datarray["author-link"];
@@ -2526,8 +2665,14 @@ class Diaspora {
 		$datarray["protocol"] = PROTOCOL_DIASPORA;
 		$datarray["source"] = $xml;
 
-		$prefix = share_header($original_item["author-name"], $original_item["author-link"], $original_item["author-avatar"],
-					$original_item["guid"], $original_item["created"], $orig_url);
+		$prefix = share_header(
+			$original_item["author-name"],
+			$original_item["author-link"],
+			$original_item["author-avatar"],
+			$original_item["guid"],
+			$original_item["created"],
+			$orig_url
+		);
 		$datarray["body"] = $prefix.$original_item["body"]."[/share]";
 
 		$datarray["tag"] = $original_item["tag"];
@@ -2553,13 +2698,14 @@ class Diaspora {
 	/**
 	 * @brief Processes retractions
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param array $contact The contact of the item owner
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param array  $contact  The contact of the item owner
+	 * @param object $data     The message object
 	 *
 	 * @return bool success
 	 */
-	private static function item_retraction($importer, $contact, $data) {
+	private static function item_retraction($importer, $contact, $data)
+	{
 		$author = notags(unxmlify($data->author));
 		$target_guid = notags(unxmlify($data->target_guid));
 		$target_type = notags(unxmlify($data->target_type));
@@ -2584,7 +2730,7 @@ class Diaspora {
 			$condition = array("`guid` = ? AND `uid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid, $importer['uid']);
 		}
 		$r = dba::select('item', $fields, $condition);
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			logger("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");
 			return false;
 		}
@@ -2599,10 +2745,18 @@ class Diaspora {
 				continue;
 			}
 
-			// Currently we don't have a central deletion function that we could use in this case. The function "item_drop" doesn't work for that case
-			dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
-						'edited' => datetime_convert(), 'changed' => datetime_convert()),
-					array('id' => $item["id"]));
+			// Currently we don't have a central deletion function that we could use in this case.
+			// The function "item_drop" doesn't work for that case
+			dba::update(
+				'item',
+				array(
+					'deleted' => true,
+					'title' => '',
+					'body' => '',
+					'edited' => datetime_convert(),
+					'changed' => datetime_convert()),
+				array('id' => $item["id"])
+			);
 
 			// Delete the thread - if it is a starting post and not a comment
 			if ($target_type != 'Comment') {
@@ -2624,13 +2778,14 @@ class Diaspora {
 	/**
 	 * @brief Receives retraction messages
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param string $sender The sender of the message
-	 * @param object $data The message object
+	 * @param array  $importer Array of the importer user
+	 * @param string $sender   The sender of the message
+	 * @param object $data     The message object
 	 *
 	 * @return bool Success
 	 */
-	private static function receive_retraction($importer, $sender, $data) {
+	private static function receive_retraction($importer, $sender, $data)
+	{
 		$target_type = notags(unxmlify($data->target_type));
 
 		$contact = self::contact_by_handle($importer["uid"], $sender);
@@ -2666,13 +2821,14 @@ class Diaspora {
 	/**
 	 * @brief Receives status messages
 	 *
-	 * @param array $importer Array of the importer user
-	 * @param object $data The message object
-	 * @param string $xml The original XML of the message
+	 * @param array  $importer Array of the importer user
+	 * @param object $data     The message object
+	 * @param string $xml      The original XML of the message
 	 *
 	 * @return int The message id of the newly created item
 	 */
-	private static function receive_status_message($importer, $data, $xml) {
+	private static function receive_status_message($importer, $data, $xml)
+	{
 		$author = notags(unxmlify($data->author));
 		$guid = notags(unxmlify($data->guid));
 		$created_at = datetime_convert("UTC", "UTC", notags(unxmlify($data->created_at)));
@@ -2692,7 +2848,7 @@ class Diaspora {
 
 		$address = array();
 		if ($data->location) {
-			foreach ($data->location->children() AS $fieldname => $data) {
+			foreach ($data->location->children() as $fieldname => $data) {
 				$address[$fieldname] = notags(unxmlify($data));
 			}
 		}
@@ -2703,7 +2859,7 @@ class Diaspora {
 
 		// Attach embedded pictures to the body
 		if ($data->photo) {
-			foreach ($data->photo AS $photo) {
+			foreach ($data->photo as $photo) {
 				$body = "[img]".unxmlify($photo->remote_photo_path).
 					unxmlify($photo->remote_photo_name)."[/img]\n".$body;
 			}
@@ -2733,7 +2889,7 @@ class Diaspora {
 
 		$datarray["author-name"] = $contact["name"];
 		$datarray["author-link"] = $contact["url"];
-		$datarray["author-avatar"] = ((x($contact,"thumb")) ? $contact["thumb"] : $contact["photo"]);
+		$datarray["author-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
 
 		$datarray["owner-name"] = $datarray["author-name"];
 		$datarray["owner-link"] = $datarray["author-link"];
@@ -2784,11 +2940,12 @@ class Diaspora {
 	/**
 	 * @brief returnes the handle of a contact
 	 *
-	 * @param array $me contact array
+	 * @param array $contact contact array
 	 *
 	 * @return string the handle in the format user@domain.tld
 	 */
-	private static function my_handle($contact) {
+	private static function my_handle($contact)
+	{
 		if ($contact["addr"] != "") {
 			return $contact["addr"];
 		}
@@ -2801,23 +2958,23 @@ class Diaspora {
 			$nick = $contact["nick"];
 		}
 
-		return $nick."@".substr(System::baseUrl(), strpos(System::baseUrl(),"://") + 3);
+		return $nick."@".substr(System::baseUrl(), strpos(System::baseUrl(), "://") + 3);
 	}
 
 
 	/**
 	 * @brief Creates the data for a private message in the new format
 	 *
-	 * @param string $msg The message that is to be transmitted
-	 * @param array $user The record of the sender
-	 * @param array $contact Target of the communication
-	 * @param string $prvkey The private key of the sender
-	 * @param string $pubkey The public key of the receiver
+	 * @param string $msg     The message that is to be transmitted
+	 * @param array  $user    The record of the sender
+	 * @param array  $contact Target of the communication
+	 * @param string $prvkey  The private key of the sender
+	 * @param string $pubkey  The public key of the receiver
 	 *
 	 * @return string The encrypted data
 	 */
-	public static function encode_private_data($msg, $user, $contact, $prvkey, $pubkey) {
-
+	public static function encode_private_data($msg, $user, $contact, $prvkey, $pubkey)
+	{
 		logger("Message: ".$msg, LOGGER_DATA);
 
 		// without a public key nothing will work
@@ -2838,8 +2995,10 @@ class Diaspora {
 		$encrypted_key_bundle = "";
 		openssl_public_encrypt($json, $encrypted_key_bundle, $pubkey);
 
-		$json_object = json_encode(array("aes_key" => base64_encode($encrypted_key_bundle),
-						"encrypted_magic_envelope" => base64_encode($ciphertext)));
+		$json_object = json_encode(
+			array("aes_key" => base64_encode($encrypted_key_bundle),
+					"encrypted_magic_envelope" => base64_encode($ciphertext))
+		);
 
 		return $json_object;
 	}
@@ -2847,13 +3006,13 @@ class Diaspora {
 	/**
 	 * @brief Creates the envelope for the "fetch" endpoint and for the new format
 	 *
-	 * @param string $msg The message that is to be transmitted
-	 * @param array $user The record of the sender
+	 * @param string $msg  The message that is to be transmitted
+	 * @param array  $user The record of the sender
 	 *
 	 * @return string The envelope
 	 */
-	public static function build_magic_envelope($msg, $user) {
-
+	public static function build_magic_envelope($msg, $user)
+	{
 		$b64url_data = base64url_encode($msg);
 		$data = str_replace(array("\n", "\r", " ", "\t"), array("", "", "", ""), $b64url_data);
 
@@ -2864,8 +3023,9 @@ class Diaspora {
 		$signable_data = $data.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
 
 		// Fallback if the private key wasn't transmitted in the expected field
-		if ($user['uprvkey'] == "")
+		if ($user['uprvkey'] == "") {
 			$user['uprvkey'] = $user['prvkey'];
+		}
 
 		$signature = rsa_sign($signable_data, $user["uprvkey"]);
 		$sig = base64url_encode($signature);
@@ -2885,17 +3045,17 @@ class Diaspora {
 	/**
 	 * @brief Create the envelope for a message
 	 *
-	 * @param string $msg The message that is to be transmitted
-	 * @param array $user The record of the sender
-	 * @param array $contact Target of the communication
-	 * @param string $prvkey The private key of the sender
-	 * @param string $pubkey The public key of the receiver
-	 * @param bool $public Is the message public?
+	 * @param string $msg     The message that is to be transmitted
+	 * @param array  $user    The record of the sender
+	 * @param array  $contact Target of the communication
+	 * @param string $prvkey  The private key of the sender
+	 * @param string $pubkey  The public key of the receiver
+	 * @param bool   $public  Is the message public?
 	 *
 	 * @return string The message that will be transmitted to other servers
 	 */
-	private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false) {
-
+	private static function build_message($msg, $user, $contact, $prvkey, $pubkey, $public = false)
+	{
 		// The message is put into an envelope with the sender's signature
 		$envelope = self::build_magic_envelope($msg, $user);
 
@@ -2910,12 +3070,13 @@ class Diaspora {
 	/**
 	 * @brief Creates a signature for a message
 	 *
-	 * @param array $owner the array of the owner of the message
+	 * @param array $owner   the array of the owner of the message
 	 * @param array $message The message that is to be signed
 	 *
 	 * @return string The signature
 	 */
-	private static function signature($owner, $message) {
+	private static function signature($owner, $message)
+	{
 		$sigmsg = $message;
 		unset($sigmsg["author_signature"]);
 		unset($sigmsg["parent_author_signature"]);
@@ -2928,22 +3089,23 @@ class Diaspora {
 	/**
 	 * @brief Transmit a message to a target server
 	 *
-	 * @param array $owner the array of the item owner
-	 * @param array $contact Target of the communication
-	 * @param string $envelope The message that is to be transmitted
-	 * @param bool $public_batch Is it a public post?
-	 * @param bool $queue_run Is the transmission called from the queue?
-	 * @param string $guid message guid
+	 * @param array  $owner        the array of the item owner
+	 * @param array  $contact      Target of the communication
+	 * @param string $envelope     The message that is to be transmitted
+	 * @param bool   $public_batch Is it a public post?
+	 * @param bool   $queue_run    Is the transmission called from the queue?
+	 * @param string $guid         message guid
 	 *
 	 * @return int Result of the transmission
 	 */
-	public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run=false, $guid = "") {
-
+	public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run = false, $guid = "")
+	{
 		$a = get_app();
 
 		$enabled = intval(Config::get("system", "diaspora_enabled"));
-		if (!$enabled)
+		if (!$enabled) {
 			return 200;
+		}
 
 		$logid = random_string(4);
 		$dest_url = (($public_batch) ? $contact["batch"] : $contact["notify"]);
@@ -2973,7 +3135,8 @@ class Diaspora {
 		if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
 			logger("queue message");
 
-			$r = q("SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
+			$r = q(
+				"SELECT `id` FROM `queue` WHERE `cid` = %d AND `network` = '%s' AND `content` = '%s' AND `batch` = %d LIMIT 1",
 				intval($contact["id"]),
 				dbesc(NETWORK_DIASPORA),
 				dbesc($envelope),
@@ -3000,13 +3163,13 @@ class Diaspora {
 	/**
 	 * @brief Build the post xml
 	 *
-	 * @param string $type The message type
-	 * @param array $message The message data
+	 * @param string $type    The message type
+	 * @param array  $message The message data
 	 *
 	 * @return string The post XML
 	 */
-	public static function build_post_xml($type, $message) {
-
+	public static function build_post_xml($type, $message)
+	{
 		$data = array($type => $message);
 
 		return xml::from_array($data, $xml);
@@ -3015,34 +3178,36 @@ class Diaspora {
 	/**
 	 * @brief Builds and transmit messages
 	 *
-	 * @param array $owner the array of the item owner
-	 * @param array $contact Target of the communication
-	 * @param string $type The message type
-	 * @param array $message The message data
-	 * @param bool $public_batch Is it a public post?
-	 * @param string $guid message guid
-	 * @param bool $spool Should the transmission be spooled or transmitted?
+	 * @param array  $owner        the array of the item owner
+	 * @param array  $contact      Target of the communication
+	 * @param string $type         The message type
+	 * @param array  $message      The message data
+	 * @param bool   $public_batch Is it a public post?
+	 * @param string $guid         message guid
+	 * @param bool   $spool        Should the transmission be spooled or transmitted?
 	 *
 	 * @return int Result of the transmission
 	 */
-	private static function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false) {
-
+	private static function build_and_transmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
+	{
 		$msg = self::build_post_xml($type, $message);
 
 		logger('message: '.$msg, LOGGER_DATA);
 		logger('send guid '.$guid, LOGGER_DEBUG);
 
 		// Fallback if the private key wasn't transmitted in the expected field
-		if ($owner['uprvkey'] == "")
+		if ($owner['uprvkey'] == "") {
 			$owner['uprvkey'] = $owner['prvkey'];
+		}
 
 		$envelope = self::build_message($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
 
 		if ($spool) {
 			add_to_queue($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch);
 			return true;
-		} else
+		} else {
 			$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
+		}
 
 		logger("guid: ".$item["guid"]." result ".$return_code, LOGGER_DEBUG);
 
@@ -3052,14 +3217,14 @@ class Diaspora {
 	/**
 	 * @brief sends an account migration
 	 *
-	 * @param array $owner the array of the item owner
+	 * @param array $owner   the array of the item owner
 	 * @param array $contact Target of the communication
-	 * @param int $uid User ID
+	 * @param int 	$uid     User ID
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function sendAccountMigration($owner, $contact, $uid) {
-
+	public static function sendAccountMigration($owner, $contact, $uid)
+	{
 		$old_handle = PConfig::get($uid, 'system', 'previous_addr');
 		$profile = self::createProfileData($uid);
 
@@ -3078,13 +3243,13 @@ class Diaspora {
 	/**
 	 * @brief Sends a "share" message
 	 *
-	 * @param array $owner the array of the item owner
+	 * @param array $owner   the array of the item owner
 	 * @param array $contact Target of the communication
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function send_share($owner, $contact) {
-
+	public static function send_share($owner, $contact)
+	{
 		/**
 		 * @todo support the different possible combinations of "following" and "sharing"
 		 * Currently, Diaspora only interprets the "sharing" field
@@ -3119,13 +3284,13 @@ class Diaspora {
 	/**
 	 * @brief sends an "unshare"
 	 *
-	 * @param array $owner the array of the item owner
+	 * @param array $owner   the array of the item owner
 	 * @param array $contact Target of the communication
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function send_unshare($owner, $contact) {
-
+	public static function send_unshare($owner, $contact)
+	{
 		$message = array("author" => self::my_handle($owner),
 				"recipient" => $contact["addr"],
 				"following" => "false",
@@ -3139,44 +3304,55 @@ class Diaspora {
 	/**
 	 * @brief Checks a message body if it is a reshare
 	 *
-	 * @param string $body The message body that is to be check
-	 * @param bool $complete Should it be a complete check or a simple check?
+	 * @param string $body     The message body that is to be check
+	 * @param bool   $complete Should it be a complete check or a simple check?
 	 *
 	 * @return array|bool Reshare details or "false" if no reshare
 	 */
-	public static function is_reshare($body, $complete = true) {
+	public static function is_reshare($body, $complete = true)
+	{
 		$body = trim($body);
 
 		// Skip if it isn't a pure repeated messages
 		// Does it start with a share?
-		if ((strpos($body, "[share") > 0) && $complete)
+		if ((strpos($body, "[share") > 0) && $complete) {
 			return(false);
+		}
 
 		// Does it end with a share?
-		if (strlen($body) > (strrpos($body, "[/share]") + 8))
+		if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
 			return(false);
+		}
 
-		$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
+		$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
 		// Skip if there is no shared message in there
-		if ($body == $attributes)
+		if ($body == $attributes) {
 			return(false);
+		}
 
 		// If we don't do the complete check we quit here
-		if (!$complete)
+		if (!$complete) {
 			return true;
+		}
 
 		$guid = "";
 		preg_match("/guid='(.*?)'/ism", $attributes, $matches);
-		if ($matches[1] != "")
+		if ($matches[1] != "") {
 			$guid = $matches[1];
+		}
 
 		preg_match('/guid="(.*?)"/ism', $attributes, $matches);
-		if ($matches[1] != "")
+		if ($matches[1] != "") {
 			$guid = $matches[1];
+		}
 
 		if ($guid != "") {
-			$r = q("SELECT `contact-id` FROM `item` WHERE `guid` = '%s' AND `network` IN ('%s', '%s') LIMIT 1",
-				dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
+			$r = q(
+				"SELECT `contact-id` FROM `item` WHERE `guid` = '%s' AND `network` IN ('%s', '%s') LIMIT 1",
+				dbesc($guid),
+				NETWORK_DFRN,
+				NETWORK_DIASPORA
+			);
 			if ($r) {
 				$ret= array();
 				$ret["root_handle"] = self::handle_from_contact($r[0]["contact-id"]);
@@ -3187,31 +3363,37 @@ class Diaspora {
 
 		$profile = "";
 		preg_match("/profile='(.*?)'/ism", $attributes, $matches);
-		if ($matches[1] != "")
+		if ($matches[1] != "") {
 			$profile = $matches[1];
+		}
 
 		preg_match('/profile="(.*?)"/ism', $attributes, $matches);
-		if ($matches[1] != "")
+		if ($matches[1] != "") {
 			$profile = $matches[1];
+		}
 
 		$ret= array();
 
 		$ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
-		if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == ""))
+		if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == "")) {
 			return(false);
+		}
 
 		$link = "";
 		preg_match("/link='(.*?)'/ism", $attributes, $matches);
-		if ($matches[1] != "")
+		if ($matches[1] != "") {
 			$link = $matches[1];
+		}
 
 		preg_match('/link="(.*?)"/ism', $attributes, $matches);
-		if ($matches[1] != "")
+		if ($matches[1] != "") {
 			$link = $matches[1];
+		}
 
 		$ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link);
-		if (($ret["root_guid"] == $link) || (trim($ret["root_guid"]) == ""))
+		if (($ret["root_guid"] == $link) || (trim($ret["root_guid"]) == "")) {
 			return(false);
+		}
 
 		return($ret);
 	}
@@ -3223,10 +3405,10 @@ class Diaspora {
 	 *
 	 * @return array with event data
 	 */
-	private static function build_event($event_id) {
-
+	private static function build_event($event_id)
+	{
 		$r = q("SELECT `guid`, `uid`, `start`, `finish`, `nofinish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return array();
 		}
 
@@ -3235,14 +3417,14 @@ class Diaspora {
 		$eventdata = array();
 
 		$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d", intval($event['uid']));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return array();
 		}
 
 		$user = $r[0];
 
 		$r = q("SELECT `addr`, `nick` FROM `contact` WHERE `uid` = %d AND `self`", intval($event['uid']));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return array();
 		}
 
@@ -3293,15 +3475,15 @@ class Diaspora {
 	/**
 	 * @brief Create a post (status message or reshare)
 	 *
-	 * @param array $item The item that will be exported
+	 * @param array $item  The item that will be exported
 	 * @param array $owner the array of the item owner
 	 *
 	 * @return array
 	 * 'type' -> Message type ("status_message" or "reshare")
 	 * 'message' -> Array of XML elements of the status
 	 */
-	public static function build_status($item, $owner) {
-
+	public static function build_status($item, $owner)
+	{
 		$cachekey = "diaspora:build_status:".$item['guid'];
 
 		$result = Cache::get($cachekey);
@@ -3334,15 +3516,17 @@ class Diaspora {
 			$body = html_entity_decode(bb2diaspora($body));
 
 			// Adding the title
-			if (strlen($title))
+			if (strlen($title)) {
 				$body = "## ".html_entity_decode($title)."\n\n".$body;
+			}
 
 			if ($item["attach"]) {
 				$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
 				if (cnt) {
 					$body .= "\n".t("Attachments:")."\n";
-					foreach ($matches as $mtch)
+					foreach ($matches as $mtch) {
 						$body .= "[".$mtch[3]."](".$mtch[1].")\n";
+					}
 				}
 			}
 
@@ -3393,15 +3577,15 @@ class Diaspora {
 	/**
 	 * @brief Sends a post
 	 *
-	 * @param array $item The item that will be exported
-	 * @param array $owner the array of the item owner
-	 * @param array $contact Target of the communication
-	 * @param bool $public_batch Is it a public post?
+	 * @param array $item         The item that will be exported
+	 * @param array $owner        the array of the item owner
+	 * @param array $contact      Target of the communication
+	 * @param bool  $public_batch Is it a public post?
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function send_status($item, $owner, $contact, $public_batch = false) {
-
+	public static function send_status($item, $owner, $contact, $public_batch = false)
+	{
 		$status = self::build_status($item, $owner);
 
 		return self::build_and_transmit($owner, $contact, $status["type"], $status["message"], $public_batch, $item["guid"]);
@@ -3410,17 +3594,20 @@ class Diaspora {
 	/**
 	 * @brief Creates a "like" object
 	 *
-	 * @param array $item The item that will be exported
+	 * @param array $item  The item that will be exported
 	 * @param array $owner the array of the item owner
 	 *
 	 * @return array The data for a "like"
 	 */
-	private static function construct_like($item, $owner) {
-
-		$p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
-			dbesc($item["thr-parent"]));
-		if (!dbm::is_result($p))
+	private static function construct_like($item, $owner)
+	{
+		$p = q(
+			"SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
+			dbesc($item["thr-parent"])
+		);
+		if (!DBM::is_result($p)) {
 			return false;
+		}
 
 		$parent = $p[0];
 
@@ -3442,17 +3629,20 @@ class Diaspora {
 	/**
 	 * @brief Creates an "EventParticipation" object
 	 *
-	 * @param array $item The item that will be exported
+	 * @param array $item  The item that will be exported
 	 * @param array $owner the array of the item owner
 	 *
 	 * @return array The data for an "EventParticipation"
 	 */
 	private static function construct_attend($item, $owner) {
 
-		$p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
-			dbesc($item["thr-parent"]));
-		if (!dbm::is_result($p))
+		$p = q(
+			"SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
+			dbesc($item["thr-parent"])
+		);
+		if (!DBM::is_result($p)) {
 			return false;
+		}
 
 		$parent = $p[0];
 
@@ -3481,13 +3671,13 @@ class Diaspora {
 	/**
 	 * @brief Creates the object for a comment
 	 *
-	 * @param array $item The item that will be exported
+	 * @param array $item  The item that will be exported
 	 * @param array $owner the array of the item owner
 	 *
 	 * @return array The data for a comment
 	 */
-	private static function construct_comment($item, $owner) {
-
+	private static function construct_comment($item, $owner)
+	{
 		$cachekey = "diaspora:construct_comment:".$item['guid'];
 
 		$result = Cache::get($cachekey);
@@ -3495,13 +3685,15 @@ class Diaspora {
 			return $result;
 		}
 
-		$p = q("SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
+		$p = q(
+			"SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
 			intval($item["parent"]),
 			intval($item["parent"])
 		);
 
-		if (!dbm::is_result($p))
+		if (!DBM::is_result($p)) {
 			return false;
+		}
 
 		$parent = $p[0];
 
@@ -3528,15 +3720,15 @@ class Diaspora {
 	/**
 	 * @brief Send a like or a comment
 	 *
-	 * @param array $item The item that will be exported
-	 * @param array $owner the array of the item owner
-	 * @param array $contact Target of the communication
-	 * @param bool $public_batch Is it a public post?
+	 * @param array $item         The item that will be exported
+	 * @param array $owner        the array of the item owner
+	 * @param array $contact      Target of the communication
+	 * @param bool  $public_batch Is it a public post?
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function send_followup($item,$owner,$contact,$public_batch = false) {
-
+	public static function send_followup($item, $owner, $contact, $public_batch = false)
+	{
 		if (in_array($item['verb'], array(ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE))) {
 			$message = self::construct_attend($item, $owner);
 			$type = "event_participation";
@@ -3548,8 +3740,9 @@ class Diaspora {
 			$type = "comment";
 		}
 
-		if (!$message)
+		if (!$message) {
 			return false;
+		}
 
 		$message["author_signature"] = self::signature($owner, $message);
 
@@ -3559,13 +3752,13 @@ class Diaspora {
 	/**
 	 * @brief Creates a message from a signature record entry
 	 *
-	 * @param array $item The item that will be exported
+	 * @param array $item      The item that will be exported
 	 * @param array $signature The entry of the "sign" record
 	 *
 	 * @return string The message
 	 */
-	private static function message_from_signature($item, $signature) {
-
+	private static function message_from_signature($item, $signature)
+	{
 		// Split the signed text
 		$signed_parts = explode(";", $signature['signed_text']);
 
@@ -3607,15 +3800,15 @@ class Diaspora {
 	/**
 	 * @brief Relays messages (like, comment, retraction) to other servers if we are the thread owner
 	 *
-	 * @param array $item The item that will be exported
-	 * @param array $owner the array of the item owner
-	 * @param array $contact Target of the communication
-	 * @param bool $public_batch Is it a public post?
+	 * @param array $item         The item that will be exported
+	 * @param array $owner        the array of the item owner
+	 * @param array $contact      Target of the communication
+	 * @param bool  $public_batch Is it a public post?
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function send_relay($item, $owner, $contact, $public_batch = false) {
-
+	public static function send_relay($item, $owner, $contact, $public_batch = false)
+	{
 		if ($item["deleted"]) {
 			return self::send_retraction($item, $owner, $contact, $public_batch, true);
 		} elseif (in_array($item["verb"], array(ACTIVITY_LIKE, ACTIVITY_DISLIKE))) {
@@ -3628,8 +3821,10 @@ class Diaspora {
 
 		// fetch the original signature
 
-		$r = q("SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `iid` = %d LIMIT 1",
-			intval($item["id"]));
+		$r = q(
+			"SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `iid` = %d LIMIT 1",
+			intval($item["id"])
+		);
 
 		if (!$r) {
 			logger("Couldn't fetch signatur for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG);
@@ -3640,9 +3835,9 @@ class Diaspora {
 
 		// Old way - is used by the internal Friendica functions
 		/// @todo Change all signatur storing functions to the new format
-		if ($signature['signed_text'] && $signature['signature'] && $signature['signer'])
+		if ($signature['signed_text'] && $signature['signature'] && $signature['signer']) {
 			$message = self::message_from_signature($item, $signature);
-		else {// New way
+		} else {// New way
 			$msg = json_decode($signature['signed_text'], true);
 
 			$message = array();
@@ -3659,8 +3854,9 @@ class Diaspora {
 
 					$message[$field] = $data;
 				}
-			} else
+			} else {
 				logger("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$signature['signed_text'], LOGGER_DEBUG);
+			}
 		}
 
 		$message["parent_author_signature"] = self::signature($owner, $message);
@@ -3673,16 +3869,16 @@ class Diaspora {
 	/**
 	 * @brief Sends a retraction (deletion) of a message, like or comment
 	 *
-	 * @param array $item The item that will be exported
-	 * @param array $owner the array of the item owner
-	 * @param array $contact Target of the communication
-	 * @param bool $public_batch Is it a public post?
-	 * @param bool $relay Is the retraction transmitted from a relay?
+	 * @param array $item         The item that will be exported
+	 * @param array $owner        the array of the item owner
+	 * @param array $contact      Target of the communication
+	 * @param bool  $public_batch Is it a public post?
+	 * @param bool  $relay        Is the retraction transmitted from a relay?
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function send_retraction($item, $owner, $contact, $public_batch = false, $relay = false) {
-
+	public static function send_retraction($item, $owner, $contact, $public_batch = false, $relay = false)
+	{
 		$itemaddr = self::handle_from_contact($item["contact-id"], $item["gcontact-id"]);
 
 		$msg_type = "retraction";
@@ -3707,22 +3903,23 @@ class Diaspora {
 	/**
 	 * @brief Sends a mail
 	 *
-	 * @param array $item The item that will be exported
-	 * @param array $owner The owner
+	 * @param array $item    The item that will be exported
+	 * @param array $owner   The owner
 	 * @param array $contact Target of the communication
 	 *
 	 * @return int The result of the transmission
 	 */
-	public static function send_mail($item, $owner, $contact) {
-
+	public static function send_mail($item, $owner, $contact)
+	{
 		$myaddr = self::my_handle($owner);
 
-		$r = q("SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		$r = q(
+			"SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($item["convid"]),
 			intval($item["uid"])
 		);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			logger("conversation not found.");
 			return;
 		}
@@ -3772,8 +3969,10 @@ class Diaspora {
 	 *
 	 * @return array The profile data
 	 */
-	private static function createProfileData($uid) {
-		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.*, `user`.`prvkey` AS `uprvkey`, `contact`.`addr`
+	private static function createProfileData($uid)
+	{
+		$r = q(
+			"SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.*, `user`.`prvkey` AS `uprvkey`, `contact`.`addr`
 			FROM `profile`
 			INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
 			INNER JOIN `contact` ON `profile`.`uid` = `contact`.`uid`
@@ -3788,8 +3987,8 @@ class Diaspora {
 		$profile = $r[0];
 
 		$handle = $profile["addr"];
-		$first = ((strpos($profile['name'],' ')
-			? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']));
+		$first = ((strpos($profile['name'], ' ')
+			? trim(substr($profile['name'], 0, strpos($profile['name'], ' '))) : $profile['name']));
 		$last = (($first === $profile['name']) ? '' : trim(substr($profile['name'], strlen($first))));
 		$large = System::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg';
 		$medium = System::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg';
@@ -3799,8 +3998,9 @@ class Diaspora {
 		if ($searchable === 'true') {
 			$dob = '1000-00-00';
 
-			if (($profile['dob']) && ($profile['dob'] > '0001-01-01'))
-				$dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC','UTC',$profile['dob'],'m-d');
+			if (($profile['dob']) && ($profile['dob'] > '0001-01-01')) {
+				$dob = ((intval($profile['dob'])) ? intval($profile['dob']) : '1000') .'-'. datetime_convert('UTC', 'UTC', $profile['dob'],'m-d');
+			}
 
 			$about = $profile['about'];
 			$about = strip_tags(bbcode($about));
@@ -3808,13 +4008,14 @@ class Diaspora {
 			$location = formatted_location($profile);
 			$tags = '';
 			if ($profile['pub_keywords']) {
-				$kw = str_replace(',',' ',$profile['pub_keywords']);
-				$kw = str_replace('  ',' ',$kw);
-				$arr = explode(' ',$profile['pub_keywords']);
+				$kw = str_replace(',', ' ', $profile['pub_keywords']);
+				$kw = str_replace('  ', ' ', $kw);
+				$arr = explode(' ', $profile['pub_keywords']);
 				if (count($arr)) {
 					for ($x = 0; $x < 5; $x ++) {
-						if (trim($arr[$x]))
+						if (trim($arr[$x])) {
 							$tags .= '#'. trim($arr[$x]) .' ';
+						}
 					}
 				}
 			}
@@ -3841,20 +4042,25 @@ class Diaspora {
 	 *
 	 * @param int $uid The user id
 	 */
-	public static function send_profile($uid, $recips = false) {
-
-		if (!$uid)
+	public static function send_profile($uid, $recips = false)
+	{
+		if (!$uid) {
 			return;
+		}
 
-		if (!$recips)
-			$recips = q("SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
+		if (!$recips) {
+			$recips = q(
+				"SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
 				AND `uid` = %d AND `rel` != %d",
 				dbesc(NETWORK_DIASPORA),
 				intval($uid),
 				intval(CONTACT_IS_SHARING)
 			);
-		if (!$recips)
+		}
+
+		if (!$recips) {
 			return;
+		}
 
 		$message = self::createProfileData($uid);
 
@@ -3868,12 +4074,12 @@ class Diaspora {
 	 * @brief Stores the signature for likes that are created on our system
 	 *
 	 * @param array $contact The contact array of the "like"
-	 * @param int $post_id The post id of the "like"
+	 * @param int   $post_id The post id of the "like"
 	 *
 	 * @return bool Success
 	 */
-	public static function store_like_signature($contact, $post_id) {
-
+	public static function store_like_signature($contact, $post_id)
+	{
 		// Is the contact the owner? Then fetch the private key
 		if (!$contact['self'] || ($contact['uid'] == 0)) {
 			logger("No owner post, so not storing signature", LOGGER_DEBUG);
@@ -3881,14 +4087,14 @@ class Diaspora {
 		}
 
 		$r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid']));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return false;
 		}
 
 		$contact["uprvkey"] = $r[0]['prvkey'];
 
 		$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id));
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return false;
 		}
 
@@ -3912,15 +4118,15 @@ class Diaspora {
 	/**
 	 * @brief Stores the signature for comments that are created on our system
 	 *
-	 * @param array $item The item array of the comment
-	 * @param array $contact The contact array of the item owner
-	 * @param string $uprvkey The private key of the sender
-	 * @param int $message_id The message id of the comment
+	 * @param array  $item       The item array of the comment
+	 * @param array  $contact    The contact array of the item owner
+	 * @param string $uprvkey    The private key of the sender
+	 * @param int    $message_id The message id of the comment
 	 *
 	 * @return bool Success
 	 */
-	public static function store_comment_signature($item, $contact, $uprvkey, $message_id) {
-
+	public static function store_comment_signature($item, $contact, $uprvkey, $message_id)
+	{
 		if ($uprvkey == "") {
 			logger('No private key, so not storing comment signature', LOGGER_DEBUG);
 			return false;
diff --git a/src/Util/Lock.php b/src/Util/Lock.php
index 8cd38066d1..9d96962964 100644
--- a/src/Util/Lock.php
+++ b/src/Util/Lock.php
@@ -9,9 +9,9 @@ namespace Friendica\Util;
  */
 
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 use Memcache;
 use dba;
-use dbm;
 
 /**
  * @brief This class contain Functions for preventing parallel execution of functions
@@ -121,7 +121,7 @@ class Lock {
 			dba::lock('locks');
 			$lock = dba::select('locks', array('locked', 'pid'), array('name' => $fn_name), array('limit' => 1));
 
-			if (dbm::is_result($lock)) {
+			if (DBM::is_result($lock)) {
 				if ($lock['locked']) {
 					// When the process id isn't used anymore, we can safely claim the lock for us.
 					if (!posix_kill($lock['pid'], 0)) {
@@ -136,7 +136,7 @@ class Lock {
 					dba::update('locks', array('locked' => true, 'pid' => getmypid()), array('name' => $fn_name));
 					$got_lock = true;
 				}
-			} elseif (!dbm::is_result($lock)) {
+			} elseif (!DBM::is_result($lock)) {
 				dba::insert('locks', array('name' => $fn_name, 'locked' => true, 'pid' => getmypid()));
 				$got_lock = true;
 			}
diff --git a/update.php b/update.php
index e1c5a0de08..0b482535df 100644
--- a/update.php
+++ b/update.php
@@ -5,6 +5,7 @@ define('UPDATE_VERSION' , 1235);
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 /**
  *
@@ -89,7 +90,7 @@ function update_1006() {
 	// create 's' keys for everybody that does not have one
 
 	$r = q("SELECT * FROM `user` WHERE `spubkey` = '' ");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$sres=openssl_pkey_new(array('encrypt_key' => false ));
 			$sprvkey = '';
@@ -126,7 +127,7 @@ function update_1010() {
 function update_1011() {
 	q("ALTER TABLE `contact` ADD `nick` CHAR( 255 ) NOT NULL AFTER `name` ");
 	$r = q("SELECT * FROM `contact` WHERE 1");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 				q("UPDATE `contact` SET `nick` = '%s' WHERE `id` = %d",
 					dbesc(basename($rr['url'])),
@@ -149,7 +150,7 @@ function update_1014() {
 	require_once('include/Photo.php');
 	q("ALTER TABLE `contact` ADD `micro` TEXT NOT NULL AFTER `thumb` ");
 	$r = q("SELECT * FROM `photo` WHERE `scale` = 4");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$ph = new Photo($rr['data']);
 			if ($ph->is_valid()) {
@@ -159,7 +160,7 @@ function update_1014() {
 		}
 	}
 	$r = q("SELECT * FROM `contact` WHERE 1");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			if(stristr($rr['thumb'],'avatar'))
 				q("UPDATE `contact` SET `micro` = '%s' WHERE `id` = %d",
@@ -312,7 +313,7 @@ function update_1030() {
 function update_1031() {
 	// Repair any bad links that slipped into the item table
 	$r = q("SELECT `id`, `object` FROM `item` WHERE `object` != '' ");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			if (strstr($rr['object'],'type=&quot;http')) {
 				q("UPDATE `item` SET `object` = '%s' WHERE `id` = %d",
@@ -361,7 +362,7 @@ function update_1035() {
 function update_1036() {
 
 	$r = dbq("SELECT * FROM `contact` WHERE `network` = 'dfrn' AND `photo` LIKE '%include/photo%' ");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `id` = %d",
 				dbesc(str_replace('include/photo','photo',$rr['photo'])),
@@ -599,7 +600,7 @@ function update_1073() {
 function update_1074() {
 	q("ALTER TABLE `user` ADD `hidewall` TINYINT( 1) NOT NULL DEFAULT '0' AFTER `blockwall` ");
 	$r = q("SELECT `uid` FROM `profile` WHERE `is-default` = 1 AND `hidewall` = 1");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach($r as $rr)
 			q("UPDATE `user` SET `hidewall` = 1 WHERE `uid` = %d",
 				intval($rr['uid'])
@@ -611,7 +612,7 @@ function update_1074() {
 function update_1075() {
 	q("ALTER TABLE `user` ADD `guid` CHAR( 16 ) NOT NULL AFTER `uid` ");
 	$r = q("SELECT `uid` FROM `user` WHERE 1");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$found = true;
 			do {
@@ -690,10 +691,10 @@ function update_1082() {
 		ADD INDEX ( `guid` )  ");
 	// make certain the following code is only executed once
 	$r = q("select `id` from `photo` where `guid` != '' limit 1");
-	if (dbm::is_result($r))
+	if (DBM::is_result($r))
 		return;
 	$r = q("SELECT distinct(`resource-id`) FROM `photo` WHERE 1 group by `id`");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$guid = get_guid();
 			q("update `photo` set `guid` = '%s' where `resource-id` = '%s'",
@@ -736,7 +737,7 @@ function update_1087() {
 	q("ALTER TABLE `item` ADD `commented` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' AFTER `edited` ");
 
 	$r = q("SELECT `id` FROM `item` WHERE `parent` = `id` ");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$x = q("SELECT max(`created`) AS `cdate` FROM `item` WHERE `parent` = %d LIMIT 1",
 				intval($rr['id'])
@@ -859,7 +860,7 @@ function update_1100() {
 	require_once('include/text.php');
 
 	$r = q("select id, url from contact where url != '' and nurl = '' ");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			q("update contact set nurl = '%s' where id = %d",
 				dbesc(normalise_link($rr['url'])),
@@ -1035,7 +1036,7 @@ function update_1120() {
 	// might be missing on new installs. We'll check.
 
 	$r = q("describe item");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach($r as $rr)
 			if($rr['Field'] == 'spam')
 				return;
@@ -1173,7 +1174,7 @@ function update_1136() {
 	// order in reverse so that we save the newest entry
 
 	$r = q("select * from config where 1 order by id desc");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$found = false;
 			foreach($arr as $x) {
@@ -1192,7 +1193,7 @@ function update_1136() {
 
 	$arr = array();
 	$r = q("select * from pconfig where 1 order by id desc");
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$found = false;
 			foreach($arr as $x) {
@@ -1697,7 +1698,7 @@ function update_1190() {
 	);
 
 	// convert old forumlist addon entries in new config entries
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 		foreach ($r as $rr) {
 			$uid = $rr['uid'];
 			$family = $rr['cat'];
diff --git a/vendor/pear/text_languagedetect/phpcs.xml b/vendor/pear/text_languagedetect/phpcs.xml
index c32ea19a8b..5dd24befea 100644
--- a/vendor/pear/text_languagedetect/phpcs.xml
+++ b/vendor/pear/text_languagedetect/phpcs.xml
@@ -4,5 +4,22 @@
   <!-- we keep the old php4-style variable names for now -->
   <exclude name="PEAR.NamingConventions.ValidFunctionName.PublicUnderscore"/>
   <exclude name="PEAR.NamingConventions.ValidVariableName.PublicUnderscore"/>
+  <exclude name="PEAR.NamingConventions.ValidVariableName.PrivateNoUnderscore"/>
+  <exclude name="PEAR.NamingConventions.ValidFunctionName.PrivateNoUnderscore"/>
+  <exclude name="PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps"/>
+  <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
+ </rule>
+ <description>PSR2 with tabs instead of spaces.</description>
+ <arg name="tab-width" value="4"/>
+ <rule ref="PSR2">
+     <exclude name="Generic.WhiteSpace.DisallowTabIndent"/>
+     <exclude name="Generic.Commenting.DocComment.MissingShort"/>
+ </rule>
+ <rule ref="Generic.WhiteSpace.DisallowSpaceIndent"/>
+ <rule ref="Generic.WhiteSpace.ScopeIndent">
+     <properties>
+         <property name="indent" value="4"/>
+         <property name="tabIndent" value="true"/>
+     </properties>
  </rule>
 </ruleset>
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 60bf65042f..70cac3b3a8 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -11,6 +11,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 $frio = "view/theme/frio";
 
@@ -225,7 +226,7 @@ function frio_remote_nav($a,&$nav) {
 		// user info
 		$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid']));
 
-		$r[0]['photo'] = (dbm::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg");
+		$r[0]['photo'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg");
 		$r[0]['name'] = $a->user['username'];
 
 	} elseif (!local_user() && remote_user()) {
@@ -241,9 +242,9 @@ function frio_remote_nav($a,&$nav) {
 		$r = false;
 	}
 
-	if (dbm::is_result($r)) {
+	if (DBM::is_result($r)) {
 			$nav['userinfo'] = array(
-				'icon' => (dbm::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"),
+				'icon' => (DBM::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"),
 				'name' => $r[0]['name'],
 			);
 		}
@@ -306,7 +307,7 @@ function frio_acl_lookup(App $a, &$results) {
 		$r = q("SELECT COUNT(*) AS `total` FROM `contact`
 			WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra $sql_extra2 ",
 			intval($_SESSION['uid']));
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			$total = $r[0]["total"];
 		}
 
@@ -318,7 +319,7 @@ function frio_acl_lookup(App $a, &$results) {
 
 		$contacts = array();
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				$contacts[] = _contact_detail_for_template($rr);
 			}
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 8aaa1ee0ac..e0c385e5e6 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -13,6 +13,7 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 require_once "include/plugin.php";
 require_once "include/socgraph.php";
@@ -141,7 +142,7 @@ function vier_community_info() {
 		$r = suggestion_query(local_user(), 0, 9);
 
 		$tpl = get_markup_template('ch_directory_item.tpl');
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			$aside['$comunity_profiles_title'] = t('Community Profiles');
 			$aside['$comunity_profiles_items'] = array();
@@ -171,7 +172,7 @@ function vier_community_info() {
 				WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
 				0, 9);
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			$aside['$lastusers_title'] = t('Last users');
 			$aside['$lastusers_items'] = array();
@@ -381,7 +382,7 @@ function vier_community_info() {
 
 		$tpl = get_markup_template('ch_connectors.tpl');
 
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 
 			$con_services = array();
 			$con_services['title'] = array("", t('Connect Services'), "", "");