Class file relocations

Issue #3878

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');

doc/Developer-How-To-Move-Classes-to-src.md

@@ -73,7 +73,7 @@ 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)) {
     ...
 }
 ````
@@ -82,7 +82,7 @@ namespace Friendica\Core;
 
 use \dbm;
 
-if (dbm::is_result($r)) {
+if (DBM::is_result($r)) {
     ...
 }
 ````

doc/autoloader.md

@@ -104,7 +104,7 @@ class Dfrn {
 
 mail_post($a){
 	...
-	Friendica\dfrn::mail($item, $owner);
+	Friendica\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);
 [...]
 ```
 

include/Contact.php

@@ -4,9 +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;
+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
@@ -49,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;
 	}
 
@@ -94,7 +95,7 @@ function terminate_friendship($user,$self,$contact) {
 	} elseif ($contact['network'] === NETWORK_DIASPORA) {
 		Diaspora::send_unshare($user,$contact);
 	} elseif ($contact['network'] === NETWORK_DFRN) {
-		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 '';
 	}
 

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;
 

include/NotificationsManager.php

@@ -1,866 +0,0 @@
-<?php
-/**
- * @file include/NotificationsManager.php
- * @brief Methods for read and write notifications from/to database
- *  or for formatting notifications
- */
-
-use Friendica\Core\Pconfig;
-use Friendica\Core\System;
-
-require_once 'include/html2plain.php';
-require_once 'include/datetime.php';
-require_once 'include/bbcode.php';
-require_once 'include/Contact.php';
-
-/**
- * @brief Methods for read and write notifications from/to database
- *  or for formatting notifications
- */
-class NotificationsManager {
-	private $a;
-
-	public function __construct() {
-		$this->a = get_app();
-	}
-
-	/**
-	 * @brief set some extra note properties
-	 *
-	 * @param array $notes array of note arrays from db
-	 * @return array Copy of input array with added properties
-	 *
-	 * Set some extra properties to note array from db:
-	 *  - timestamp as int in default TZ
-	 *  - date_rel : relative date string
-	 *  - msg_html: message as html string
-	 *  - msg_plain: message as plain text string
-	 */
-	private function _set_extra($notes) {
-		$rets = array();
-		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];
-
-			$rets[] = $n;
-		}
-		return $rets;
-	}
-
-
-	/**
-	 * @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
-	 *
-	 * @return array of results or false on errors
-	 */
-	public function getAll($filter = array(), $order="-date", $limit="") {
-		$filter_str = array();
-		$filter_sql = "";
-		foreach($filter as $column => $value) {
-			$filter_str[] = sprintf("`%s` = '%s'", $column, dbesc($value));
-		}
-		if (count($filter_str)>0) {
-			$filter_sql = "AND ".implode(" AND ", $filter_str);
-		}
-
-		$aOrder = explode(" ", $order);
-		$asOrder = array();
-		foreach($aOrder as $o) {
-			$dir = "asc";
-			if ($o[0]==="-") {
-				$dir = "desc";
-				$o = substr($o,1);
-			}
-			if ($o[0]==="+") {
-				$dir = "asc";
-				$o = substr($o,1);
-			}
-			$asOrder[] = "$o $dir";
-		}
-		$order_sql = implode(", ", $asOrder);
-
-		if($limit!="")
-			$limit = " LIMIT ".$limit;
-
-			$r = q("SELECT * FROM `notify` WHERE `uid` = %d $filter_sql ORDER BY $order_sql $limit",
-				intval(local_user())
-			);
-
-		if (dbm::is_result($r))
-			return $this->_set_extra($r);
-
-		return false;
-	}
-
-	/**
-	 * @brief Get one note for local_user() by $id value
-	 *
-	 * @param int $id
-	 * @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",
-			intval($id),
-			intval(local_user())
-		);
-		if (dbm::is_result($r)) {
-			return $this->_set_extra($r)[0];
-		}
-		return null;
-	}
-
-	/**
-	 * @brief set seen state of $note of local_user()
-	 *
-	 * @param array $note
-	 * @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",
-			intval($seen),
-			dbesc($note['link']),
-			intval($note['parent']),
-			dbesc($note['otype']),
-			intval(local_user())
-		);
-	}
-
-	/**
-	 * @brief set seen state of all notifications of local_user()
-	 *
-	 * @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",
-			intval($seen),
-			intval(local_user())
-		);
-	}
-
-	/**
-	 * @brief List of pages for the Notifications TabBar
-	 *
-	 * @return array with with notifications TabBar data
-	 */
-	public function getTabs() {
-		$tabs = array(
-			array(
-				'label' => t('System'),
-				'url'=>'notifications/system',
-				'sel'=> (($this->a->argv[1] == 'system') ? 'active' : ''),
-				'id' => 'system-tab',
-				'accesskey' => 'y',
-			),
-			array(
-				'label' => t('Network'),
-				'url'=>'notifications/network',
-				'sel'=> (($this->a->argv[1] == 'network') ? 'active' : ''),
-				'id' => 'network-tab',
-				'accesskey' => 'w',
-			),
-			array(
-				'label' => t('Personal'),
-				'url'=>'notifications/personal',
-				'sel'=> (($this->a->argv[1] == 'personal') ? 'active' : ''),
-				'id' => 'personal-tab',
-				'accesskey' => 'r',
-			),
-			array(
-				'label' => t('Home'),
-				'url' => 'notifications/home',
-				'sel'=> (($this->a->argv[1] == 'home') ? 'active' : ''),
-				'id' => 'home-tab',
-				'accesskey' => 'h',
-			),
-			array(
-				'label' => t('Introductions'),
-				'url' => 'notifications/intros',
-				'sel'=> (($this->a->argv[1] == 'intros') ? 'active' : ''),
-				'id' => 'intro-tab',
-				'accesskey' => 'i',
-			),
-		);
-
-		return $tabs;
-	}
-
-	/**
-	 * @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)
-	 * @return array
-	 *	string 'label' => The type of the notification
-	 *	string 'link' => URL to the source
-	 *	string 'image' => The avatar image
-	 *	string 'url' => The profile url of the contact
-	 *	string 'text' => The notification text
-	 *	string 'when' => The date of the notification
-	 *	string 'ago' => T relative date of the notification
-	 *	bool 'seen' => Is the notification marked as "seen"
-	 */
-	private function formatNotifs($notifs, $ident = "") {
-
-		$notif = array();
-		$arr = array();
-
-		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].
-				// So we will have to transform $it['unseen']
-				if (array_key_exists('unseen', $it)) {
-					$it['seen'] = ($it['unseen'] > 0 ? false : true);
-				}
-
-				// Depending on the identifier of the notification we need to use different defaults
-				switch ($ident) {
-					case 'system':
-						$default_item_label = 'notify';
-						$default_item_link = System::baseUrl(true).'/notify/view/'. $it['id'];
-						$default_item_image = proxy_url($it['photo'], false, PROXY_SIZE_MICRO);
-						$default_item_url = $it['url'];
-						$default_item_text = strip_tags(bbcode($it['msg']));
-						$default_item_when = datetime_convert('UTC', date_default_timezone_get(), $it['date'], 'r');
-						$default_item_ago = relative_date($it['date']);
-						break;
-
-					case 'home':
-						$default_item_label = 'comment';
-						$default_item_link = System::baseUrl(true).'/display/'.$it['pguid'];
-						$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
-						$default_item_url = $it['author-link'];
-						$default_item_text = 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']);
-						break;
-
-					default:
-						$default_item_label = (($it['id'] == $it['parent']) ? 'post' : 'comment');
-						$default_item_link = System::baseUrl(true).'/display/'.$it['pguid'];
-						$default_item_image = proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO);
-						$default_item_url = $it['author-link'];
-						$default_item_text = (($it['id'] == $it['parent'])
-									? sprintf(t("%s created a new post"), $it['author-name'])
-									: 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']){
-					case ACTIVITY_LIKE:
-						$notif = array(
-							'label' => 'like',
-							'link' => System::baseUrl(true).'/display/'.$it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => sprintf(t("%s liked %s's post"), $it['author-name'], $it['pname']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						);
-						break;
-
-					case ACTIVITY_DISLIKE:
-						$notif = array(
-							'label' => 'dislike',
-							'link' => System::baseUrl(true).'/display/'.$it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => sprintf(t("%s disliked %s's post"), $it['author-name'], $it['pname']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						);
-						break;
-
-					case ACTIVITY_ATTEND:
-						$notif = array(
-							'label' => 'attend',
-							'link' => System::baseUrl(true).'/display/'.$it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => sprintf(t("%s is attending %s's event"), $it['author-name'], $it['pname']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						);
-						break;
-
-					case ACTIVITY_ATTENDNO:
-						$notif = array(
-							'label' => 'attendno',
-							'link' => System::baseUrl(true).'/display/'.$it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => sprintf( t("%s is not attending %s's event"), $it['author-name'], $it['pname']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						);
-						break;
-
-					case ACTIVITY_ATTENDMAYBE:
-						$notif = array(
-							'label' => 'attendmaybe',
-							'link' => System::baseUrl(true).'/display/'.$it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => sprintf(t("%s may attend %s's event"), $it['author-name'], $it['pname']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						);
-						break;
-
-					case ACTIVITY_FRIEND:
-						$xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
-						$obj = parse_xml_string($xmlhead.$it['object']);
-						$it['fname'] = $obj->title;
-
-						$notif = array(
-							'label' => 'friend',
-							'link' => System::baseUrl(true).'/display/'.$it['pguid'],
-							'image' => proxy_url($it['author-avatar'], false, PROXY_SIZE_MICRO),
-							'url' => $it['author-link'],
-							'text' => sprintf(t("%s is now friends with %s"), $it['author-name'], $it['fname']),
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						);
-						break;
-
-					default:
-						$notif = array(
-							'label' => $default_item_label,
-							'link' => $default_item_link,
-							'image' => $default_item_image,
-							'url' => $default_item_url,
-							'text' => $default_item_text,
-							'when' => $default_item_when,
-							'ago' => $default_item_ago,
-							'seen' => $it['seen']
-						);
-				}
-
-				$arr[] = $notif;
-			}
-		}
-
-		return $arr;
-
-	}
-
-	/**
-	 * @brief Total number of network notifications
-	 * @param int|string $seen
-	 *	If 0 only include notifications into the query
-	 *	which aren't marked as "seen"
-	 * @return int Number of network notifications
-	 */
-	private function networkTotal($seen = 0) {
-		$sql_seen = "";
-
-		if($seen === 0)
-			$sql_seen = " AND `item`.`unseen` = 1 ";
-
-		$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
-				$sql_seen",
-			intval(local_user())
-		);
-
-		if (dbm::is_result($r))
-			return $r[0]['total'];
-
-		return 0;
-	}
-
-	/**
-	 * @brief Get network notifications
-	 *
-	 * @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
-	 *
-	 * @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) {
-		$ident = 'network';
-		$total = $this->networkTotal($seen);
-		$notifs = array();
-		$sql_seen = "";
-
-		if($seen === 0)
-			$sql_seen = " AND `item`.`unseen` = 1 ";
-
-
-		$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`
-			WHERE `item`.`visible` = 1 AND `pitem`.`parent` != 0 AND
-				 `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)
-		);
-
-		if (dbm::is_result($r))
-			$notifs = $this->formatNotifs($r, $ident);
-
-		$arr = array (
-			'notifications' => $notifs,
-			'ident' => $ident,
-			'total' => $total,
-		);
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Total number of system notifications
-	 * @param int|string $seen
-	 *	If 0 only include notifications into the query
-	 *	which aren't marked as "seen"
-	 * @return int Number of system notifications
-	 */
-	private function systemTotal($seen = 0) {
-		$sql_seen = "";
-
-		if($seen === 0)
-			$sql_seen = " AND `seen` = 0 ";
-
-		$r = q("SELECT COUNT(*) AS `total` FROM `notify` WHERE `uid` = %d $sql_seen",
-			intval(local_user())
-		);
-
-		if (dbm::is_result($r))
-			return $r[0]['total'];
-
-		return 0;
-	}
-
-	/**
-	 * @brief Get system notifications
-	 *
-	 * @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
-	 *
-	 * @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) {
-		$ident = 'system';
-		$total = $this->systemTotal($seen);
-		$notifs = array();
-		$sql_seen = "";
-
-		if($seen === 0)
-			$sql_seen = " AND `seen` = 0 ";
-
-		$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))
-			$notifs = $this->formatNotifs($r, $ident);
-
-		$arr = array (
-			'notifications' => $notifs,
-			'ident' => $ident,
-			'total' => $total,
-		);
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Addional SQL query string for the personal notifications
-	 *
-	 * @return string The additional sql query
-	 */
-	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' ) ",
-			dbesc($myurl . '$'),
-			dbesc($myurl . '\\]'),
-			dbesc($diasp_url . '\\]')
-		);
-
-		return $sql_extra;
-	}
-
-	/**
-	 * @brief Total number of personal notifications
-	 * @param int|string $seen
-	 *	If 0 only include notifications into the query
-	 *	which aren't marked as "seen"
-	 * @return int Number of personal notifications
-	 */
-	private function personalTotal($seen = 0) {
-		$sql_seen = "";
-		$sql_extra = $this->_personal_sql_extra();
-
-		if($seen === 0)
-			$sql_seen = " AND `item`.`unseen` = 1 ";
-
-		$r = q("SELECT COUNT(*) AS `total`
-				FROM `item` INNER JOIN `item` AS `pitem` ON  `pitem`.`id`=`item`.`parent`
-				WHERE `item`.`visible` = 1
-				$sql_extra
-				$sql_seen
-				AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 " ,
-			intval(local_user())
-		);
-
-		if (dbm::is_result($r))
-			return $r[0]['total'];
-
-		return 0;
-	}
-
-	/**
-	 * @brief Get personal notifications
-	 *
-	 * @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
-	 *
-	 * @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) {
-		$ident = 'personal';
-		$total = $this->personalTotal($seen);
-		$sql_extra = $this->_personal_sql_extra();
-		$notifs = array();
-		$sql_seen = "";
-
-		if($seen === 0)
-			$sql_seen = " AND `item`.`unseen` = 1 ";
-
-		$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`
-			WHERE `item`.`visible` = 1
-				$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)
-		);
-
-		if (dbm::is_result($r))
-			$notifs = $this->formatNotifs($r, $ident);
-
-		$arr = array (
-			'notifications' => $notifs,
-			'ident' => $ident,
-			'total' => $total,
-		);
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Total number of home notifications
-	 * @param int|string $seen
-	 *	If 0 only include notifications into the query
-	 *	which aren't marked as "seen"
-	 * @return int Number of home notifications
-	 */
-	private function homeTotal($seen = 0) {
-		$sql_seen = "";
-
-		if($seen === 0)
-			$sql_seen = " AND `item`.`unseen` = 1 ";
-
-		$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))
-			return $r[0]['total'];
-
-		return 0;
-	}
-
-	/**
-	 * @brief Get home notifications
-	 *
-	 * @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
-	 *
-	 * @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) {
-		$ident = 'home';
-		$total = $this->homeTotal($seen);
-		$notifs = array();
-		$sql_seen = "";
-
-		if($seen === 0)
-			$sql_seen = " AND `item`.`unseen` = 1 ";
-
-		$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`
-			WHERE `item`.`visible` = 1 AND
-				 `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)
-		);
-
-		if (dbm::is_result($r))
-			$notifs = $this->formatNotifs($r, $ident);
-
-		$arr = array (
-			'notifications' => $notifs,
-			'ident' => $ident,
-			'total' => $total,
-		);
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Total number of introductions
-	 * @param bool $all
-	 *	If false only include introductions into the query
-	 *	which aren't marked as ignored
-	 * @return int Number of introductions
-	 */
-	private function introTotal($all = false) {
-		$sql_extra = "";
-
-		if(!$all)
-			$sql_extra = " AND `ignore` = 0 ";
-
-		$r = q("SELECT COUNT(*) AS `total` FROM `intro`
-			WHERE `intro`.`uid` = %d $sql_extra AND `intro`.`blocked` = 0 ",
-				intval($_SESSION['uid'])
-		);
-
-		if (dbm::is_result($r))
-			return $r[0]['total'];
-
-		return 0;
-	}
-
-	/**
-	 * @brief Get introductions
-	 *
-	 * @param bool $all
-	 *	If false only include introductions into the query
-	 *	which aren't marked as ignored
-	 * @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 introductions
-	 *	array 'notifications' => Introductions
-	 */
-	public function introNotifs($all = false, $start = 0, $limit = 80) {
-		$ident = 'introductions';
-		$total = $this->introTotal($seen);
-		$notifs = array();
-		$sql_extra = "";
-
-		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`.*,
-				`fcontact`.`name` AS `fname`, `fcontact`.`url` AS `furl`,
-				`fcontact`.`photo` AS `fphoto`, `fcontact`.`request` AS `frequest`,
-				`gcontact`.`location` AS `glocation`, `gcontact`.`about` AS `gabout`,
-				`gcontact`.`keywords` AS `gkeywords`, `gcontact`.`gender` AS `ggender`,
-				`gcontact`.`network` AS `gnetwork`, `gcontact`.`addr` AS `gaddr`
-			FROM `intro`
-				LEFT JOIN `contact` ON `contact`.`id` = `intro`.`contact-id`
-				LEFT JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
-				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)
-		);
-
-		if (dbm::is_result($r))
-			$notifs = $this->formatIntros($r);
-
-		$arr = array (
-			'ident' => $ident,
-			'total' => $total,
-			'notifications' => $notifs,
-		);
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Format the notification query in an usable array
-	 *
-	 * @param array $intros The array from the db query
-	 * @return array with the introductions
-	 */
-	private function formatIntros($intros) {
-		$knowyou = '';
-
-		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']) {
-
-				$return_addr = bin2hex($this->a->user['nickname'] . '@' . $this->a->get_hostname() . (($this->a->path) ? '/' . $this->a->path : ''));
-
-				$intro = array(
-					'label' => 'friend_suggestion',
-					'notify_type' => t('Friend Suggestion'),
-					'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"),
-					'name' => $it['fname'],
-					'url' => zrl($it['furl']),
-					'hidden' => $it['hidden'] == 1,
-					'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
-			} else {
-
-				$it = $this->getMissingIntroData($it);
-
-				// Don't show these data until you are connected. Diaspora is doing the same.
-				if($it['gnetwork'] === NETWORK_DIASPORA) {
-					$it['glocation'] = "";
-					$it['gabout'] = "";
-					$it['ggender'] = "";
-				}
-				$intro = array(
-					'label' => (($it['network'] !== NETWORK_OSTATUS) ? 'friend_request' : 'follower'),
-					'notify_type' => (($it['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
-					'dfrn_id' => $it['issued-id'],
-					'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"),
-					'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),
-					'url' => $it['url'],
-					'zrl' => zrl($it['url']),
-					'addr' => $it['gaddr'],
-					'network' => $it['gnetwork'],
-					'knowyou' => $it['knowyou'],
-					'note' => $it['note'],
-				);
-			}
-
-			$arr[] = $intro;
-		}
-
-		return $arr;
-	}
-
-	/**
-	 * @brief Check for missing contact data and try to fetch the data from
-	 *     from other sources
-	 *
-	 * @param array $arr The input array with the intro data
-	 *
-	 * @return array The array with the intro data
-	 */
-	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'] == "") {
-			$arr['gnetwork'] = $arr['network'];
-		}
-		if ($arr['gaddr'] == "") {
-			$arr['gaddr'] = $arr['addr'];
-		}
-
-		// If the network and addr is still not available
-		// get the missing data data from other sources
-		if ($arr['gnetwork'] == "" || $arr['gaddr'] == "") {
-			$ret = get_contact_details_by_url($arr['url']);
-
-			if ($arr['gnetwork'] == "" && $ret['network'] != "") {
-				$arr['gnetwork'] = $ret['network'];
-			}
-			if ($arr['gaddr'] == "" && $ret['addr'] != "") {
-				$arr['gaddr'] = $ret['addr'];
-			}
-		}
-
-		return $arr;
-	}
-}

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());
 	}

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']);
 

include/api.php

@@ -11,6 +11,7 @@ use Friendica\Core\System;
 use Friendica\Core\Config;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 
 require_once 'include/HTTPExceptions.php';
 require_once 'include/bbcode.php';
@@ -211,7 +212,7 @@ $called_api = null;
 				dbesc(trim($user)),
 				dbesc($encrypted)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$record = $r[0];
 			}
 		}
@@ -460,7 +461,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 +592,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 +1093,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 +1114,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 +1135,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 +1164,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 +1259,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 +1357,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 +1429,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 +1682,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 +1737,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 +1770,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 +1828,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 +2094,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 +3005,7 @@ $called_api = null;
 			intval(api_user())
 		);
 
-		if (!dbm::is_result($r)) {
+		if (!DBM::is_result($r)) {
 			return;
 		}
 
@@ -3138,7 +3139,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 +3230,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 +3335,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 +3346,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 +3392,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 +3432,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 +3501,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 +3621,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 +3637,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 +3700,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 +3805,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 +4021,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 +4130,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 +4277,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 +4285,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 +4356,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 +4370,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 +4504,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 +4559,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 +4568,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 +4607,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 +4615,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 +4846,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 +4904,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 +4957,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 {

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];
 		}
 

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;
 		}

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);
 

include/contact_selectors.php

@@ -1,5 +1,6 @@
 <?php
 
+use Friendica\Database\DBM;
 use Friendica\Protocol\Diaspora;
 
 function contact_profile_assign($current,$foreign_net) {
@@ -13,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";
@@ -106,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'];
 		}
 	}

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'];
 			}
 		}

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'];

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;
 		}
 

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"]);
 		}

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;
 			}
 

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');
 				}

include/dbm.php

@@ -1,112 +0,0 @@
-<?php
-/**
- * @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 {
-	/**
-	 * @brief Return a list of database processes
-	 *
-	 * @return array
-	 *      'list' => List of processes, separated in their different states
-	 *      'amount' => Number of concurrent database processes
-	 */
-	public static function processlist() {
-		$r = q("SHOW PROCESSLIST");
-		$s = array();
-
-		$processes = 0;
-		$states = array();
-		foreach ($r AS $process) {
-			$state = trim($process["State"]);
-
-			// Filter out all non blocking processes
-			if (!in_array($state, array("", "init", "statistics", "updating"))) {
-				++$states[$state];
-				++$processes;
-			}
-		}
-
-		$statelist = "";
-		foreach ($states AS $state => $usage) {
-			if ($statelist != "")
-				$statelist .= ", ";
-			$statelist .= $state.": ".$usage;
-		}
-		return(array("list" => $statelist, "amount" => $processes));
-	}
-
-	/**
-	 * 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
-	 */
-	public static function is_result($array) {
-		// It could be a return value from an update statement
-		if (is_bool($array)) {
-			return $array;
-		}
-
-		if (is_object($array)) {
-			return dba::num_rows($array) > 0;
-		}
-
-		return (is_array($array) && (count($array) > 0));
-	}
-
-	/**
-	 * @brief Callback function for "esc_array"
-	 *
-	 * @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) {
-
-		if (!$add_quotation) {
-			if (is_bool($value)) {
-				$value = ($value ? '1' : '0');
-			} else {
-				$value = dbesc($value);
-			}
-			return;
-		}
-
-		if (is_bool($value)) {
-			$value = ($value ? 'true' : 'false');
-		} elseif (is_float($value) || is_integer($value)) {
-			$value = (string)$value;
-		} else {
-			 $value = "'".dbesc($value)."'";
-		}
-	}
-
-	/**
-	 * @brief Escapes a whole array
-	 *
-	 * @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) {
-		array_walk($arr, 'self::esc_array_callback', $add_quotation);
-	}
-
-	/**
-	 * 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') {
-		$timestamp = strtotime($date);
-
-		// Don't allow lower date strings as '0001-01-01 00:00:00'
-		if ($timestamp < -62135596800) {
-			$timestamp = -62135596800;
-		}
-
-		return date('Y-m-d H:i:s', (int)$timestamp);
-	}
-}

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;
 						}

include/delivery.php

@@ -3,8 +3,9 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
 use Friendica\Protocol\Diaspora;
-use Friendica\Protocol\Dfrn;
+use Friendica\Protocol\DFRN;
 
 require_once 'include/queue_fn.php';
 require_once 'include/html2plain.php';
@@ -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'];
 							}
 						}

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']);
 		}

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"]) &&

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;
 				}
 			}

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'];
 	}
 

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);

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'];
 	}
 

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;
 			}

include/follow.php

@@ -4,6 +4,7 @@ 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;
 
@@ -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();

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']));

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'];
 		}

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;
 

include/items.php

@@ -11,7 +11,8 @@ use Friendica\Util\Lock;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Protocol\Dfrn;
+use Friendica\Database\DBM;
+use Friendica\Protocol\DFRN;
 
 require_once 'include/bbcode.php';
 require_once 'include/oembed.php';
@@ -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;
 	}
 

include/like.php

@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Protocol\Diaspora;
 
 /**
@@ -71,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;
 	}
@@ -89,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']);
@@ -102,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);
@@ -119,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);
@@ -149,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

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;
 	}

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 {

include/notifier.php

@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
 
@@ -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) {

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;
 	}

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);

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'];
 							}
 						}

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;
 		}
 

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));

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) {

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;
 	}
 

include/queue.php

@@ -2,8 +2,9 @@
 
 use Friendica\Core\Config;
 use Friendica\Core\Worker;
+use Friendica\Database\DBM;
 use Friendica\Protocol\Diaspora;
-use Friendica\Protocol\Dfrn;
+use Friendica\Protocol\DFRN;
 
 require_once 'include/queue_fn.php';
 require_once 'include/datetime.php';
@@ -35,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);
@@ -51,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']);
@@ -68,7 +69,7 @@ function queue_run(&$argv, &$argc) {
 	$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']);

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;

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;
 		}
 

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'];
 	}

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 {

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;
 	}
 

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));
 	}

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);
 		}

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;
 	}

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;
 	}
 

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;
 	}
 

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'];
 	}
 }

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') {

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;
 	}

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];

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;
 	}

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);
 

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;
 	}
 

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;
 	}

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();
 		}
 

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);
 		}

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;
 	}

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;

mod/dfrn_confirm.php

@@ -23,6 +23,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;
 use Friendica\Protocol\Diaspora;
 
@@ -128,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 );
@@ -419,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);
 		}
@@ -429,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;
@@ -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';
 

mod/dfrn_notify.php

@@ -8,7 +8,8 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Protocol\Dfrn;
+use Friendica\Database\DBM;
+use Friendica\Protocol\DFRN;
 
 require_once('include/items.php');
 require_once('include/event.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;
 		}
 

mod/dfrn_poll.php

@@ -3,7 +3,8 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
-use Friendica\Protocol\Dfrn;
+use Friendica\Database\DBM;
+use Friendica\Protocol\DFRN;
 
 require_once('include/items.php');
 require_once('include/auth.php');
@@ -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':

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;
 			}
 		}

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';

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`

mod/display.php

@@ -3,7 +3,8 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\System;
-use Friendica\Protocol\Dfrn;
+use Friendica\Database\DBM;
+use Friendica\Protocol\DFRN;
 
 function display_init(App $a) {
 
@@ -40,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`
@@ -58,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`
@@ -69,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);
@@ -93,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;
@@ -229,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"];
@@ -243,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"];
@@ -256,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"];
 				}
@@ -266,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 {
@@ -316,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;
 		}
@@ -330,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);
@@ -379,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` = ?)
@@ -387,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` = ?
@@ -400,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));
 			}
 		}
@@ -477,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 {
@@ -491,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);
 	}

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;

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);
 		}
 

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'];
 			}

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;
 	}

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)) {

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();
 	}
 

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,

mod/item.php

@@ -19,6 +19,7 @@ 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;
 
@@ -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 .= ',';
 			}

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>';
 

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(

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"];
 		}
 

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'])) {

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'];
 

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();
 	}
 

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'];

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'],

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_received = DBM::date($_GET["last_received"]);
-		$last_commented = dbm::date($_GET["last_commented"]);
+		$last_commented = DBM::date($_GET["last_commented"]);
-		$last_created = dbm::date($_GET["last_created"]);
+		$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));
 			}
 		}

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);

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']);
 		}

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);

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);

mod/notifications.php

@@ -8,6 +8,7 @@
 use Friendica\App;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 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'];
 		}

mod/notify.php

@@ -3,6 +3,7 @@
 use Friendica\App;
 use Friendica\Core\NotificationsManager;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 
 function notify_init(App $a) {
 	if (! local_user()) {
@@ -55,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'],