Merge pull request #3630 from annando/dba-2

Several more replaced database calls

boot.php

@@ -42,7 +42,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5.3-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1233      );
+define ( 'DB_UPDATE_VERSION',      1234      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -1090,9 +1090,9 @@ function proc_run($cmd) {
 	array_shift($argv);
 
 	$parameters = json_encode($argv);
-	$found = dba::select('workerqueue', array('id'), array('parameter' => $parameters, 'done' => false), array('limit' => 1));
+	$found = dba::exists('workerqueue', array('parameter' => $parameters, 'done' => false));
 
-	if (!dbm::is_result($found)) {
+	if (!$found) {
 		dba::insert('workerqueue', array('parameter' => $parameters, 'created' => $created, 'priority' => $priority));
 	}
 

database.sql

@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.5.3-dev (Asparagus)
--- DB_UPDATE_VERSION 1233
+-- DB_UPDATE_VERSION 1234
 -- ------------------------------------------
 
 
@@ -1027,7 +1027,8 @@ CREATE TABLE IF NOT EXISTS `thread` (
 	 INDEX `authorid` (`author-id`),
 	 INDEX `uid_created` (`uid`,`created`),
 	 INDEX `uid_commented` (`uid`,`commented`),
-	 INDEX `uid_wall_created` (`uid`,`wall`,`created`)
+	 INDEX `uid_wall_created` (`uid`,`wall`,`created`),
+	 INDEX `private_wall_received` (`private`,`wall`,`received`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
 --

include/Contact.php

@@ -56,7 +56,7 @@ function contact_remove($id) {
 		return;
 	}
 
-	q("DELETE FROM `contact` WHERE `id` = %d", intval($id));
+	dba::delete('contact', array('id' => $id));
 
 	// Delete the rest in the background
 	proc_run(PRIORITY_LOW, 'include/remove_contact.php', $id);
@@ -206,26 +206,27 @@ function get_contact_details_by_url($url, $uid = -1, $default = array()) {
 	}
 
 	// Fetch contact data from the contact table for the given user
-	$r = q("SELECT `id`, `id` AS `cid`, 0 AS `gid`, 0 AS `zid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+	$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 `nurl` = '%s' AND `uid` = %d",
+		FROM `contact` WHERE `nurl` = ? AND `uid` = ?",
-			dbesc(normalise_link($url)), intval($uid));
+			normalise_link($url), $uid);
 
 	// Fetch the data from the contact table with "uid=0" (which is filled automatically)
-	if (!dbm::is_result($r))
+	if (!dbm::is_result($s))
-		$r = q("SELECT `id`, 0 AS `cid`, `id` AS `zid`, 0 AS `gid`, `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, `xmpp`,
+		$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` = '%s' AND `uid` = 0",
+			FROM `contact` WHERE `nurl` = ? AND `uid` = 0",
-				dbesc(normalise_link($url)));
+				normalise_link($url));
 
 	// Fetch the data from the gcontact table
-	if (!dbm::is_result($r))
+	if (!dbm::is_result($s))
-		$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`,
+		$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` = '%s'",
+			FROM `gcontact` WHERE `nurl` = ?",
-				dbesc(normalise_link($url)));
+				normalise_link($url));
 
-	if (dbm::is_result($r)) {
+	if (dbm::is_result($s)) {
+		$r = dba::inArray($s);
 		// If there is more than one entry we filter out the connector networks
 		if (count($r) > 1) {
 			foreach ($r AS $id => $result) {
@@ -616,8 +617,8 @@ function get_contact($url, $uid = 0, $no_update = false) {
 		}
 
 		if (count($contacts) > 1 && $uid == 0 && $contact_id != 0 && $data["url"] != "") {
-			dba::e("DELETE FROM `contact` WHERE `nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
+			dba::delete('contact', array("`nurl` = ? AND `uid` = 0 AND `id` != ? AND NOT `self`",
-				normalise_link($data["url"]), $contact_id);
+				normalise_link($data["url"]), $contact_id));
 		}
 	}
 

include/ForumManager.php

@@ -41,18 +41,18 @@ class ForumManager {
 			$select = '(`forum` OR `prv`)';
 		}
 
-		$contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro`, `contact`.`thumb` FROM `contact`
+		$contacts = dba::p("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro`, `contact`.`thumb` FROM `contact`
-				WHERE `network`= 'dfrn' AND $select AND `uid` = %d
+				WHERE `network`= 'dfrn' AND $select AND `uid` = ?
 				AND NOT `blocked` AND NOT `hidden` AND NOT `pending` AND NOT `archive`
 				AND `success_update` > `failure_update`
 				$order ",
-				intval($uid)
+				$uid
 		);
 
 		if (!$contacts)
 			return($forumlist);
 
-		foreach($contacts as $contact) {
+		while ($contact = dba::fetch($contacts)) {
 			$forumlist[] = array(
 				'url'	=> $contact['url'],
 				'name'	=> $contact['name'],
@@ -61,6 +61,8 @@ class ForumManager {
 				'thumb' => $contact['thumb'],
 			);
 		}
+		dba::close($contacts);
+
 		return($forumlist);
 	}
 

include/contact_widgets.php

@@ -108,19 +108,20 @@ function networks_widget($baseurl, $selected = '') {
 
 	$extra_sql = unavailable_networks();
 
-	$r = q("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = %d AND `network` != '' $extra_sql ORDER BY `network`",
+	$r = dba::p("SELECT DISTINCT(`network`) FROM `contact` WHERE `uid` = ? AND `network` != '' $extra_sql ORDER BY `network`",
-		intval(local_user())
+		local_user()
 	);
 
 	$nets = array();
 	if (dbm::is_result($r)) {
 		require_once 'include/contact_selectors.php';
-		foreach ($r as $rr) {
+		while ($rr = dba::fetch($r)) {
 			/// @TODO If 'network' is not there, this triggers an E_NOTICE
 			if ($rr['network']) {
 				$nets[] = array('ref' => $rr['network'], 'name' => network_to_name($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
 			}
 		}
+		dba::close($r);
 	}
 
 	if (count($nets) < 2) {
@@ -229,18 +230,14 @@ function common_friends_visitor_widget($profile_uid) {
 
 	if (! $cid) {
 		if (get_my_url()) {
-			$r = q("select id from contact where nurl = '%s' and uid = %d limit 1",
+			$r = dba::select('contact', array('id'),
-				dbesc(normalise_link(get_my_url())),
+					array('nurl' => normalise_link(get_my_url()), 'uid' => $profile_uid), array('limit' => 1));
-				intval($profile_uid)
-			);
 			if (dbm::is_result($r)) {
-				$cid = $r[0]['id'];
+				$cid = $r['id'];
 			} else {
-				$r = q("select id from gcontact where nurl = '%s' limit 1",
+				$r = dba::select('gcontact', array('id'), array('nurl' => normalise_link(get_my_url())), array('limit' => 1));
-					dbesc(normalise_link(get_my_url()))
-				);
 				if (dbm::is_result($r))
-					$zcid = $r[0]['id'];
+					$zcid = $r['id'];
 			}
 		}
 	}

include/conversation.php

@@ -680,11 +680,11 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 				$hashtags = array();
 				$mentions = array();
 
-				$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
+				$taglist = dba::select('term', array('type', 'term', 'url'),
-						intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
+							array("`otype` = ? AND `oid` = ? AND `type` IN (?, ?)", TERM_OBJ_POST, $item['id'], TERM_HASHTAG, TERM_MENTION),
-
+							array('order' => array('tid')));
-				foreach ($taglist as $tag) {
 
+				while ($tag = dba::fetch($taglist)) {
 					if ($tag["url"] == "") {
 						$tag["url"] = $searchpath . strtolower($tag["term"]);
 					}
@@ -698,6 +698,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
 					}
 					$tags[] = $prefix."<a href=\"" . $tag["url"] . "\" target=\"_blank\">" . $tag["term"] . "</a>";
 				}
+				dba::close($taglist);
 
 				$sp = false;
 				$profile_link = best_link_url($item,$sp);

include/cron.php

@@ -84,7 +84,7 @@ function cron_run(&$argv, &$argc){
 		proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_photo_albums");
 
 		// Delete all done workerqueue entries
-		dba::e('DELETE FROM `workerqueue` WHERE `done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 12 HOUR');
+		dba::delete('workerqueue', array('`done` AND `executed` < UTC_TIMESTAMP() - INTERVAL 12 HOUR'));
 	}
 
 	// Poll contacts

include/dba.php

@@ -412,21 +412,6 @@ class dba {
 		return $connected;
 	}
 
-	function insert_id() {
-		switch ($this->driver) {
-			case 'pdo':
-				$id = $this->db->lastInsertId();
-				break;
-			case 'mysqli':
-				$id = $this->db->insert_id;
-				break;
-			case 'mysql':
-				$id = mysql_insert_id($this->db);
-				break;
-		}
-		return $id;
-	}
-
 	function __destruct() {
 		if ($this->db) {
 			switch ($this->driver) {
@@ -767,13 +752,25 @@ class dba {
 	/**
 	 * @brief Check if data exists
 	 *
-	 * @param string $sql SQL statement
+	 * @param string $table Table name
-	 * @return boolean Are there rows for that query?
+	 * @param array $condition array of fields for condition
+	 *
+	 * @return boolean Are there rows for that condition?
 	 */
-	static public function exists($sql) {
+	static public function exists($table, $condition) {
-		$params = self::getParam(func_get_args());
+		if (empty($table)) {
+			return false;
+		}
 
-		$stmt = self::p($sql, $params);
+		$fields = array();
+
+		$array_element = each($condition);
+		$array_key = $array_element['key'];
+		if (!is_int($array_key)) {
+			$fields = array($array_key);
+		}
+
+		$stmt = self::select($table, $fields, $condition, array('limit' => 1, 'only_query' => true));
 
 		if (is_bool($stmt)) {
 			$retval = $stmt;
@@ -908,6 +905,26 @@ class dba {
 		return self::e($sql, $param);
 	}
 
+	/**
+	 * @brief Fetch the id of the last insert command
+	 *
+	 * @return integer Last inserted id
+	 */
+	function lastInsertId() {
+		switch (self::$dbo->driver) {
+			case 'pdo':
+				$id = self::$dbo->db->lastInsertId();
+				break;
+			case 'mysqli':
+				$id = self::$dbo->db->insert_id;
+				break;
+			case 'mysql':
+				$id = mysql_insert_id(self::$dbo);
+				break;
+		}
+		return $id;
+	}
+
 	/**
 	 * @brief Locks a table for exclusive write access
 	 *
@@ -1063,16 +1080,16 @@ class dba {
 				$callstack[$qkey] = true;
 
 				// Fetch all rows that are to be deleted
-				$sql = "SELECT ".self::$dbo->escape($field)." FROM `".$table."` WHERE `".
+				$data = self::select($table, array($field), $param);
-				implode("` = ? AND `", array_keys($param))."` = ?";
 
-				$data = self::p($sql, $param);
 				while ($row = self::fetch($data)) {
 					// Now we accumulate the delete commands
 					$retval = self::delete($table, array($field => $row[$field]), true, $callstack);
 					$commands = array_merge($commands, $retval);
 				}
 
+				self::close($data);
+
 				// Since we had split the delete command we don't need the original command anymore
 				unset($commands[$key]);
 			}
@@ -1088,14 +1105,22 @@ class dba {
 
 			$compacted = array();
 			$counter = array();
+
 			foreach ($commands AS $command) {
-				if (count($command['param']) > 1) {
+				$condition = $command['param'];
-					$sql = "DELETE FROM `".$command['table']."` WHERE `".
+				$array_element = each($condition);
-						implode("` = ? AND `", array_keys($command['param']))."` = ?";
+				$array_key = $array_element['key'];
+				if (is_int($array_key)) {
+					$condition_string = " WHERE ".array_shift($condition);
+				} else {
+					$condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?";
+				}
 
-					logger(self::replace_parameters($sql, $command['param']), LOGGER_DATA);
+				if ((count($command['param']) > 1) || is_int($array_key)) {
+					$sql = "DELETE FROM `".$command['table']."`".$condition_string;
+					logger(self::replace_parameters($sql, $condition), LOGGER_DATA);
 
-					if (!self::e($sql, $command['param'])) {
+					if (!self::e($sql, $condition)) {
 						if ($do_transaction) {
 							self::rollback();
 						}
@@ -1175,15 +1200,23 @@ class dba {
 
 		$table = self::$dbo->escape($table);
 
+		if (count($condition) > 0) {
+			$array_element = each($condition);
+			$array_key = $array_element['key'];
+			if (is_int($array_key)) {
+				$condition_string = " WHERE ".array_shift($condition);
+			} else {
+				$condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?";
+			}
+		} else {
+			$condition_string = "";
+		}
+
 		if (is_bool($old_fields)) {
-			$sql = "SELECT * FROM `".$table."` WHERE `".
-			implode("` = ? AND `", array_keys($condition))."` = ? LIMIT 1";
-
-			$params = array_values($condition);
-
 			$do_insert = $old_fields;
 
-			$old_fields = self::fetch_first($sql, $params);
+			$old_fields = self::select($table, array(), $condition, array('limit' => 1));
+
 			if (is_bool($old_fields)) {
 				if ($do_insert) {
 					$values = array_merge($condition, $fields);
@@ -1210,8 +1243,7 @@ class dba {
 		}
 
 		$sql = "UPDATE `".$table."` SET `".
-			implode("` = ?, `", array_keys($fields))."` = ? WHERE `".
+			implode("` = ?, `", array_keys($fields))."` = ?".$condition_string;
-			implode("` = ? AND `", array_keys($condition))."` = ?";
 
 		$params1 = array_values($fields);
 		$params2 = array_values($condition);
@@ -1250,7 +1282,13 @@ class dba {
 		}
 
 		if (count($condition) > 0) {
-			$condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?";
+			$array_element = each($condition);
+			$array_key = $array_element['key'];
+			if (is_int($array_key)) {
+				$condition_string = " WHERE ".array_shift($condition);
+			} else {
+				$condition_string = " WHERE `".implode("` = ? AND `", array_keys($condition))."` = ?";
+			}
 		} else {
 			$condition_string = "";
 		}
@@ -1270,11 +1308,13 @@ class dba {
 			$param_string = substr($param_string, 0, -2);
 		}
 
-		if (isset($params['limit'])) {
+		if (isset($params['limit']) && is_int($params['limit'])) {
-			if (is_int($params['limit'])) {
+			$param_string .= " LIMIT ".$params['limit'];
-				$param_string .= " LIMIT ".$params['limit'];
+			$single_row = ($params['limit'] == 1);
-				$single_row =($params['limit'] == 1);
+		}
-			}
+
+		if (isset($params['only_query']) && $params['only_query']) {
+			$single_row = !$params['only_query'];
 		}
 
 		$sql = "SELECT ".$select_fields." FROM `".$table."`".$condition_string.$param_string;
@@ -1290,6 +1330,24 @@ class dba {
 		}
 	}
 
+
+	/**
+	 * @brief Fills an array with data from a query
+	 *
+	 * @param object $stmt statement object
+	 * @return array Data array
+	 */
+	static public function inArray($stmt, $do_close = true) {
+		$data = array();
+		while ($row = self::fetch($stmt)) {
+			$data[] = $row;
+		}
+		if ($do_close) {
+			self::close($stmt);
+		}
+		return $data;
+	}
+
 	/**
 	 * @brief Closes the current statement
 	 *

include/dbstructure.php

@@ -1656,6 +1656,7 @@ function db_definition() {
 					"uid_created" => array("uid","created"),
 					"uid_commented" => array("uid","commented"),
 					"uid_wall_created" => array("uid","wall","created"),
+					"private_wall_received" => array("private","wall","received"),
 					)
 			);
 	$database["tokens"] = array(

include/identity.php

@@ -245,11 +245,7 @@ function profile_sidebar($profile, $block = 0) {
 			$profile_url = normalise_link(App::get_baseurl()."/profile/".$profile["nickname"]);
 		}
 
-		$r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'",
+		$connect = !dba::exists('contact', array('pending' => false, 'uid' => local_user(), 'nurl' => $profile_url));
-			local_user(), $profile_url);
-
-		if (dbm::is_result($r))
-			$connect = false;
 	}
 
 	if ($connect && ($profile['network'] != NETWORK_DFRN) && !isset($profile['remoteconnect']))
@@ -469,15 +465,16 @@ function get_birthdays() {
 	$cachekey = "get_birthdays:".local_user();
 	$r = Cache::get($cachekey);
 	if (is_null($r)) {
-		$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
+		$s = dba::p("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
 				INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
-				WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
+				WHERE `event`.`uid` = ? AND `type` = 'birthday' AND `start` < ? AND `finish` > ?
 				ORDER BY `start` ASC ",
-				intval(local_user()),
+				local_user(),
-				dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+				datetime_convert('UTC','UTC','now + 6 days'),
-				dbesc(datetime_convert('UTC','UTC','now'))
+				datetime_convert('UTC','UTC','now')
 		);
-		if (dbm::is_result($r)) {
+		if (dbm::is_result($s)) {
+			$r = dba::inArray($s);
 			Cache::set($cachekey, $r, CACHE_HOUR);
 		}
 	}
@@ -556,18 +553,21 @@ function get_events() {
 	$bd_format = t('g A l F d') ; // 8 AM Friday January 18
 	$bd_short = t('F d');
 
-	$r = q("SELECT `event`.* FROM `event`
+	$s = dba::p("SELECT `event`.* FROM `event`
-			WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` >= '%s'
+			WHERE `event`.`uid` = ? AND `type` != 'birthday' AND `start` < ? AND `start` >= ?
 			ORDER BY `start` ASC ",
-			intval(local_user()),
+			local_user(),
-			dbesc(datetime_convert('UTC','UTC','now + 7 days')),
+			datetime_convert('UTC','UTC','now + 7 days'),
-			dbesc(datetime_convert('UTC','UTC','now - 1 days'))
+			datetime_convert('UTC','UTC','now - 1 days')
 	);
 
-	if (dbm::is_result($r)) {
+	$r = array();
+
+	if (dbm::is_result($s)) {
 		$now = strtotime('now');
 		$istoday = false;
-		foreach ($r as $rr) {
+
+		while ($rr = dba::fetch($s)) {
 			if (strlen($rr['name'])) {
 				$total ++;
 			}
@@ -576,12 +576,7 @@ function get_events() {
 			if ($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
 				$istoday = true;
 			}
-		}
-		$classtoday = (($istoday) ? 'event-today' : '');
 
-		$skip = 0;
-
-		foreach ($r as &$rr) {
 			$title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
 
 			if (strlen($title) > 35) {
@@ -596,7 +591,6 @@ function get_events() {
 			$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
 
 			if (substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
-				$skip++;
 				continue;
 			}
 
@@ -607,14 +601,17 @@ function get_events() {
 			$rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
 			$rr['startime'] = $strt;
 			$rr['today'] = $today;
-		}
-	}
 
+			$r[] = $rr;
+		}
+		dba::close($s);
+		$classtoday = (($istoday) ? 'event-today' : '');
+	}
 	$tpl = get_markup_template("events_reminder.tpl");
 	return replace_macros($tpl, array(
 		'$baseurl' => App::get_baseurl(),
 		'$classtoday' => $classtoday,
-		'$count' => count($r) - $skip,
+		'$count' => count($r),
 		'$event_reminders' => t('Event Reminders'),
 		'$event_title' => t('Events this week:'),
 		'$events' => $r,

include/items.php

@@ -963,13 +963,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
 
 	// When the item was successfully stored we fetch the ID of the item.
 	if (dbm::is_result($r)) {
-		$r = q("SELECT LAST_INSERT_ID() AS `item-id`");
+		$current_post = dba::lastInsertId();
-		if (dbm::is_result($r)) {
-			$current_post = $r[0]['item-id'];
-		} else {
-			// This shouldn't happen
-			$current_post = 0;
-		}
 	} else {
 		// This can happen - for example - if there are locking timeouts.
 		dba::rollback();

include/network.php

@@ -220,8 +220,8 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
 	if (!$ret['success']) {
 		$ret['error'] = curl_error($ch);
 		$ret['debug'] = $curl_info;
-		logger('z_fetch_url: error: ' . $url . ': ' . $ret['error'], LOGGER_DEBUG);
+		logger('z_fetch_url: error: '.$url.': '.$ret['return_code'].' - '.$ret['error'], LOGGER_DEBUG);
-		logger('z_fetch_url: debug: ' . print_r($curl_info, true), LOGGER_DATA);
+		logger('z_fetch_url: debug: '.print_r($curl_info, true), LOGGER_DATA);
 	}
 
 	$ret['body'] = substr($s, strlen($header));

include/plugin.php

@@ -121,8 +121,7 @@ function reload_plugins() {
  * @return boolean
  */
 function plugin_enabled($plugin) {
-	$r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = '%s'", $plugin);
+	return dba::exists('addon', array('installed' => true, 'name' => $plugin));
-	return ((dbm::is_result($r)) && (count($r) > 0));
 }
 
 
@@ -545,6 +544,8 @@ function upgrade_bool_message($bbcode = false) {
  * @return string Path to the file or empty string if the file isn't found
  */
 function theme_include($file, $root = '') {
+	$file = basename($file);
+
 	// Make sure $root ends with a slash / if it's not blank
 	if ($root !== '' && $root[strlen($root)-1] !== '/') {
 		$root = $root . '/';

include/poller.php

@@ -474,8 +474,9 @@ function poller_max_connections_reached() {
  *
  */
 function poller_kill_stale_workers() {
-	$entries = dba::p("SELECT `id`, `pid`, `executed`, `priority`, `parameter` FROM `workerqueue` WHERE `executed` > ? AND NOT `done` AND `pid` != 0 ORDER BY `priority`, `created`", NULL_DATE);
+	$entries = dba::select('workerqueue', array('id', 'pid', 'executed', 'priority', 'parameter'),
-
+				array('`executed` > ? AND NOT `done` AND `pid` != 0', NULL_DATE),
+				array('order' => array('priority', 'created')));
 	while ($entry = dba::fetch($entries)) {
 		if (!posix_kill($entry["pid"], 0)) {
 			dba::update('workerqueue', array('executed' => NULL_DATE, 'pid' => 0),
@@ -698,10 +699,8 @@ function find_worker_processes(&$passing_slow) {
 
 	if (poller_passing_slow($highest_priority)) {
 		// Are there waiting processes with a higher priority than the currently highest?
-		$result = dba::p("SELECT `id` FROM `workerqueue`
+		$result = dba::select('workerqueue', array('id'), array("`executed` <= ? AND `priority` < ? AND NOT `done`", NULL_DATE, $highest_priority),
-					WHERE `executed` <= ? AND `priority` < ? AND NOT `done`
+				array('limit' => $limit, 'order' => array('priority', 'created'), 'only_query' => true));
-					ORDER BY `priority`, `created` LIMIT ".intval($limit),
-				NULL_DATE, $highest_priority);
 
 		while ($id = dba::fetch($result)) {
 			$ids[] = $id["id"];
@@ -712,10 +711,8 @@ function find_worker_processes(&$passing_slow) {
 
 		if (!$found) {
 			// Give slower processes some processing time
-			$result = dba::p("SELECT `id` FROM `workerqueue`
+			$result = dba::select('workerqueue', array('id'), array("`executed` <= ? AND `priority` > ? AND NOT `done`", NULL_DATE, $highest_priority),
-						WHERE `executed` <= ? AND `priority` > ? AND NOT `done`
+					array('limit' => $limit, 'order' => array('priority', 'created'), 'only_query' => true));
-						ORDER BY `priority`, `created` LIMIT ".intval($limit),
-					NULL_DATE, $highest_priority);
 
 			while ($id = dba::fetch($result)) {
 				$ids[] = $id["id"];
@@ -729,7 +726,8 @@ function find_worker_processes(&$passing_slow) {
 
 	// If there is no result (or we shouldn't pass lower processes) we check without priority limit
 	if (!$found) {
-		$result = dba::p("SELECT `id` FROM `workerqueue` WHERE `executed` <= ? AND NOT `done` ORDER BY `priority`, `created` LIMIT ".intval($limit), NULL_DATE);
+		$result = dba::select('workerqueue', array('id'), array("`executed` <= ? AND NOT `done`", NULL_DATE),
+				array('limit' => $limit, 'order' => array('priority', 'created'), 'only_query' => true));
 
 		while ($id = dba::fetch($result)) {
 			$ids[] = $id["id"];
@@ -740,9 +738,9 @@ function find_worker_processes(&$passing_slow) {
 	}
 
 	if ($found) {
-		$sql = "UPDATE `workerqueue` SET `executed` = ?, `pid` = ? WHERE `id` IN (".substr(str_repeat("?, ", count($ids)), 0, -2).") AND `pid` = 0 AND NOT `done`;";
+		$condition = "`id` IN (".substr(str_repeat("?, ", count($ids)), 0, -2).") AND `pid` = 0 AND NOT `done`";
-		array_unshift($ids, datetime_convert(), $mypid);
+		array_unshift($ids, $condition);
-		dba::e($sql, $ids);
+		dba::update('workerqueue', array('executed' => datetime_convert(), 'pid' => $mypid), $ids);
 	}
 
 	return $found;

include/remove_contact.php

@@ -14,8 +14,8 @@ function remove_contact_run($argv, $argc) {
 	$id = intval($argv[1]);
 
 	// Only delete if the contact doesn't exist (anymore)
-	$r = dba::select('contact', array('id'), array('id' => $id), array('limit' => 1));
+	$r = dba::exists('contact', array('id' => $id));
-	if (dbm::is_result($r)) {
+	if ($r) {
 		return;
 	}
 

include/security.php

@@ -81,32 +81,30 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 	$master_record = $a->user;
 
 	if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
-		$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+		$r = dba::fetch_first("SELECT * FROM `user` WHERE `uid` = ? LIMIT 1",
 			intval($_SESSION['submanage'])
 		);
 		if (dbm::is_result($r)) {
-			$master_record = $r[0];
+			$master_record = $r;
 		}
 	}
 
-	$r = q("SELECT `uid`,`username`,`nickname` FROM `user` WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0 ",
+	$r = dba::select('user', array('uid', 'username', 'nickname'),
-		dbesc($master_record['password']),
+		array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false));
-		dbesc($master_record['email'])
-	);
 	if (dbm::is_result($r)) {
-		$a->identities = $r;
+		$a->identities = dba::inArray($r);
 	} else {
 		$a->identities = array();
 	}
 
-	$r = q("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname`
+	$r = dba::p("SELECT `user`.`uid`, `user`.`username`, `user`.`nickname`
 		FROM `manage`
 		INNER JOIN `user` ON `manage`.`mid` = `user`.`uid`
-		WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = %d",
+		WHERE `user`.`account_removed` = 0 AND `manage`.`uid` = ?",
-		intval($master_record['uid'])
+		$master_record['uid']
 	);
 	if (dbm::is_result($r)) {
-		$a->identities = array_merge($a->identities,$r);
+		$a->identities = array_merge($a->identities, dba::inArray($r));
 	}
 
 	if ($login_initial) {
@@ -116,31 +114,21 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 		logger('auth_identities refresh: ' . print_r($a->identities,true), LOGGER_DEBUG);
 	}
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+	$r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $_SESSION['uid']);
-		intval($_SESSION['uid']));
 	if (dbm::is_result($r)) {
-		$a->contact = $r[0];
+		$a->contact = $r;
-		$a->cid = $r[0]['id'];
+		$a->cid = $r['id'];
 		$_SESSION['cid'] = $a->cid;
 	}
 
 	header('X-Account-Management-Status: active; name="' . $a->user['username'] . '"; id="' . $a->user['nickname'] .'"');
 
 	if ($login_initial || $login_refresh) {
-
+		dba::update('user', array('login_date' => datetime_convert()), array('uid' => $_SESSION['uid']));
-		q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d",
-			dbesc(datetime_convert()),
-			intval($_SESSION['uid'])
-		);
 
 		// Set the login date for all identities of the user
-		q("UPDATE `user` SET `login_date` = '%s' WHERE `password` = '%s' AND `email` = '%s' AND `account_removed` = 0",
+		dba::update('user', array('login_date' => datetime_convert()),
-			dbesc(datetime_convert()),
+			array('password' => $master_record['password'], 'email' => $master_record['email'], 'account_removed' => false));
-			dbesc($master_record['password']),
-			dbesc($master_record['email'])
-		);
-
-
 	}
 
 	if ($login_initial) {
@@ -155,8 +143,6 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 		}
 	}
 
-
-
 	if ($login_initial) {
 		call_hooks('logged_in', $a->user);
 
@@ -164,7 +150,6 @@ function authenticate_success($user_record, $login_initial = false, $interactive
 			goaway(App::get_baseurl() . '/' . $_SESSION['return_url']);
 		}
 	}
-
 }
 
 

include/socgraph.php

@@ -1025,7 +1025,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
 	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::p("UPDATE `gserver` SET `last_failure` = ? WHERE `nurl` = ?", datetime_convert(), normalise_link($server_url));
+		dba::update('gserver', array('last_failure' => datetime_convert()), array('nurl' => normalise_link($server_url)));
 		return false;
 	}
 
@@ -1040,7 +1040,7 @@ function poco_check_server($server_url, $network = "", $force = false) {
 		// Quit if there is a timeout
 		if ($serverret['errno'] == CURLE_OPERATION_TIMEDOUT) {
 			logger("Connection to server ".$server_url." timed out.", LOGGER_DEBUG);
-			dba::p("UPDATE `gserver` SET `last_failure` = ? WHERE `nurl` = ?", datetime_convert(), normalise_link($server_url));
+			dba::update('gserver', array('last_failure' => datetime_convert()), array('nurl' => normalise_link($server_url)));
 			return false;
 		}
 

include/text.php

@@ -488,8 +488,6 @@ if (! function_exists('item_new_uri')) {
 function item_new_uri($hostname, $uid, $guid = "") {
 
 	do {
-		$dups = false;
-
 		if ($guid == "") {
 			$hash = get_guid(32);
 		} else {
@@ -499,11 +497,7 @@ function item_new_uri($hostname, $uid, $guid = "") {
 
 		$uri = "urn:X-dfrn:" . $hostname . ':' . $uid . ':' . $hash;
 
-		$r = q("SELECT `id` FROM `item` WHERE `uri` = '%s' LIMIT 1",
+		$dups = dba::exists('item', array('uri' => $uri));
-			dbesc($uri));
-		if (dbm::is_result($r)) {
-			$dups = true;
-		}
 	} while ($dups == true);
 
 	return $uri;
@@ -1290,9 +1284,9 @@ function put_item_in_cache(&$item, $update = false) {
 		$item["rendered-hash"] = hash("md5", $item["body"]);
 		$item["body"] = $body;
 
-		if ($update && ($item["id"] != 0)) {
+		if ($update && ($item["id"] > 0)) {
-			q("UPDATE `item` SET `rendered-html` = '%s', `rendered-hash` = '%s' WHERE `id` = %d",
+			dba::update('item', array('rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]),
-				dbesc($item["rendered-html"]), dbesc($item["rendered-hash"]), intval($item["id"]));
+					array('id' => $item["id"]), false);
 		}
 	}
 }
@@ -1324,11 +1318,10 @@ function prepare_body(&$item, $attach = false, $preview = false) {
 	$mentions = array();
 
 	if (!get_config('system','suppress_tags')) {
-		$taglist = q("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = %d AND `oid` = %d AND `type` IN (%d, %d) ORDER BY `tid`",
+		$taglist = dba::p("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = ? AND `oid` = ? AND `type` IN (?, ?) ORDER BY `tid`",
 				intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
 
-		foreach ($taglist as $tag) {
+		while ($tag = dba::fetch($taglist)) {
-
 			if ($tag["url"] == "") {
 				$tag["url"] = $searchpath.strtolower($tag["term"]);
 			}
@@ -1342,6 +1335,7 @@ function prepare_body(&$item, $attach = false, $preview = false) {
 			}
 			$tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
 		}
+		dba::close($taglist);
 	}
 
 	$item['tags'] = $tags;
@@ -1665,7 +1659,7 @@ function generate_user_guid() {
 		if (! dbm::is_result($x)) {
 			$found = false;
 		}
-	} while ($found == true );
+	} while ($found == true);
 
 	return $guid;
 }

include/threads.php

@@ -262,7 +262,7 @@ function delete_thread($itemid, $itemuri = "") {
 function update_threads() {
 	logger("update_threads: start");
 
-	$messages = dba::p("SELECT `id` FROM `item` WHERE `id` = `parent`");
+	$messages = dba::select('item', array('id'), array("`id` = `parent`"));
 
 	logger("update_threads: fetched messages: ".dba::num_rows($messages));
 
@@ -292,9 +292,9 @@ function update_threads_mention() {
 function update_shadow_copy() {
 	logger("start");
 
-	$messages = dba::p("SELECT `iid` FROM `thread` WHERE `uid` != 0 AND `network` IN ('', ?, ?, ?)
+	$condition = "`uid` != 0 AND `network` IN ('', ?, ?, ?) AND `visible` AND NOT `deleted` AND NOT `moderated` AND NOT `private`";
-				AND `visible` AND NOT `deleted` AND NOT `moderated` AND NOT `private` ORDER BY `created`",
+	$messages = dba::select('thread', array('iid'), array($condition, NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS),
-				NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS);
+				array('order' => 'created'));
 
 	logger("fetched messages: ".dba::num_rows($messages));
 	while ($message = dba::fetch($messages))

include/uimport.php

@@ -6,13 +6,11 @@ require_once("include/Photo.php");
 define("IMPORT_DEBUG", False);
 
 function last_insert_id() {
-	global $db;
-
 	if (IMPORT_DEBUG) {
 		return 1;
 	}
 
-	return $db->insert_id();
+	return dba::lastInsertId();
 }
 
 function last_error() {

index.php

@@ -498,7 +498,7 @@ if (isset($_GET["mode"])) {
 }
 
 // If there is no page template use the default page template
-if (!$template) {
+if (empty($template)) {
 	$template = theme_include("default.php");
 }
 

mod/community.php

@@ -11,7 +11,6 @@ function community_init(App $a) {
 }
 
 function community_content(App $a, $update = 0) {
-
 	$o = '';
 
 	if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -92,34 +91,27 @@ function community_getitems($start, $itemspage) {
 	if (Config::get('system','community_page_style') == CP_GLOBAL_COMMUNITY) {
 		return(community_getpublicitems($start, $itemspage));
 	}
-	$r = qu("SELECT %s
+	$r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
-		FROM `thread`
 		INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`
 		INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
 		AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
-		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
+		AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''".
-		%s AND `contact`.`self`
+		item_joins()." AND `contact`.`self`
 		WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
 		AND NOT `thread`.`private` AND `thread`.`wall`
-		ORDER BY `thread`.`received` DESC LIMIT %d, %d",
+		ORDER BY `thread`.`received` DESC LIMIT ".intval($start).", ".intval($itemspage)
-		item_fieldlists(), item_joins(),
-		intval($start), intval($itemspage)
 	);
 
-	return($r);
+	return dba::inArray($r);
-
 }
 
 function community_getpublicitems($start, $itemspage) {
-
+	$r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
-	$r = qu("SELECT %s
+		INNER JOIN `item` ON `item`.`id` = `thread`.`iid` ".item_joins().
-		FROM `thread`
+		"WHERE `thread`.`uid` = 0 AND `verb` = ?
-		INNER JOIN `item` ON `item`.`id` = `thread`.`iid` %s
+		ORDER BY `thread`.`created` DESC LIMIT ".intval($start).", ".intval($itemspage),
-		WHERE `thread`.`uid` = 0 AND `verb` = '%s'
+		ACTIVITY_POST
-		ORDER BY `thread`.`created` DESC LIMIT %d, %d",
-		item_fieldlists(), item_joins(),
-		dbesc(ACTIVITY_POST), intval($start), intval($itemspage)
 	);
 
-	return($r);
+	return dba::inArray($r);
 }

mod/display.php

@@ -33,9 +33,9 @@ function display_init(App $a) {
 
 		// Does the local user have this item?
 		if (local_user()) {
-			$r = qu("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
+			$r = dba::fetch_first("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
 				WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-					AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
+					AND `guid` = ? AND `uid` = ? LIMIT 1", $a->argv[1], local_user());
 			if (dbm::is_result($r)) {
 				$nick = $a->user["nickname"];
 				$itemuid = local_user();
@@ -44,44 +44,44 @@ function display_init(App $a) {
 
 		// Or is it anywhere on the server?
 		if ($nick == "") {
-			$r = qu("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent`, `item`.`author-name`,
+			$r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id`, `item`.`parent`, `item`.`author-name`,
 				`item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
 				FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
 				WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 					AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
 					AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 					AND NOT `item`.`private` AND NOT `user`.`hidewall`
-					AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
+					AND `item`.`guid` = ? LIMIT 1", $a->argv[1]);
 			if (dbm::is_result($r)) {
-				$nick = $r[0]["nickname"];
+				$nick = $r["nickname"];
-				$itemuid = $r[0]["uid"];
+				$itemuid = $r["uid"];
 			}
 		}
 
 		// Is it an item with uid=0?
 		if ($nick == "") {
-			$r = qu("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
+			$r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`, `item`.`author-link`,
 				`item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`owner-link`, `item`.`body`
 				FROM `item` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 					AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
 					AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 					AND NOT `item`.`private` AND `item`.`uid` = 0
-					AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
+					AND `item`.`guid` = ? LIMIT 1", $a->argv[1]);
 		}
 		if (dbm::is_result($r)) {
-			if ($r[0]["id"] != $r[0]["parent"]) {
+			if ($r["id"] != $r["parent"]) {
-				$r = qu("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
+				$r = dba::fetch_first("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
 					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-						AND `id` = %d", $r[0]["parent"]);
+						AND `id` = ?", $r["parent"]);
 			}
 			if (($itemuid != local_user()) && local_user()) {
 				// Do we know this contact but we haven't got this item?
 				// Copy the wohle thread to our local storage so that we can interact.
 				// We really should change this need for the future since it scales very bad.
-				$contactid = get_contact($r[0]['owner-link'], local_user());
+				$contactid = get_contact($r['owner-link'], local_user());
 				if ($contactid) {
-					$items = qu("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id`", intval($r[0]["id"]));
+					$items = dba::select('item', array(), array('parent' => $r["id"]), array('order' => array('id')));
-					foreach ($items AS $item) {
+					while ($item = dba::fetch($items)) {
 						$itemcontactid = get_contact($item['owner-link'], local_user());
 						if (!$itemcontactid) {
 							$itemcontactid = $contactid;
@@ -93,22 +93,23 @@ function display_init(App $a) {
 						$local_copy = item_store($item, false, false, true);
 						logger("Stored local copy for post ".$item['guid']." under id ".$local_copy, LOGGER_DEBUG);
 					}
+					dba::close($items);
 				}
 			}
 
-			$profiledata = display_fetchauthor($a, $r[0]);
+			$profiledata = display_fetchauthor($a, $r);
 
 			if (strstr(normalise_link($profiledata["url"]), normalise_link(App::get_baseurl()))) {
 				$nickname = str_replace(normalise_link(App::get_baseurl())."/profile/", "", normalise_link($profiledata["url"]));
 
 				if (($nickname != $a->user["nickname"])) {
-					$r = qu("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+					$r = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
 						INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
-						WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
+						WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
-						dbesc($nickname)
+						$nickname
 					);
 					if (dbm::is_result($r)) {
-						$profiledata = $r[0];
+						$profiledata = $r;
 					}
 					$profiledata["network"] = NETWORK_DFRN;
 				} else {
@@ -240,48 +241,45 @@ function display_content(App $a, $update = 0) {
 			$nick = "";
 
 			if (local_user()) {
-				$r = qu("SELECT `id` FROM `item`
+				$r = dba::fetch_first("SELECT `id` FROM `item`
 					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
-						AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
+						AND `guid` = ? AND `uid` = ?", $a->argv[1], local_user());
 				if (dbm::is_result($r)) {
-					$item_id = $r[0]["id"];
+					$item_id = $r["id"];
 					$nick = $a->user["nickname"];
 				}
 			}
 
 			if ($nick == "") {
-				$r = qu("SELECT `user`.`nickname`, `item`.`id` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
+				$r = dba::fetch_first("SELECT `user`.`nickname`, `item`.`id` FROM `item` STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
 					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 						AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
 						AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 						AND NOT `item`.`private` AND NOT `user`.`hidewall`
-						AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
+						AND `item`.`guid` = ?", $a->argv[1]);
-					//	AND NOT `item`.`private` AND `item`.`wall`
 				if (dbm::is_result($r)) {
-					$item_id = $r[0]["id"];
+					$item_id = $r["id"];
-					$nick = $r[0]["nickname"];
+					$nick = $r["nickname"];
 				}
 			}
 			if ($nick == "") {
-				$r = qu("SELECT `item`.`id` FROM `item`
+				$r = dba::fetch_first("SELECT `item`.`id` FROM `item`
 					WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
 						AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
 						AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
 						AND NOT `item`.`private` AND `item`.`uid` = 0
-						AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
+						AND `item`.`guid` = ?", $a->argv[1]);
-					//	AND NOT `item`.`private` AND `item`.`wall`
 				if (dbm::is_result($r)) {
-					$item_id = $r[0]["id"];
+					$item_id = $r["id"];
 				}
 			}
 		}
 	}
 
 	if ($item_id && !is_numeric($item_id)) {
-		$r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
+		$r = dba::select('item', array('id'), array('uri' => $item_id, 'uid' => $a->profile['uid']), array('limit' => 1));
-			dbesc($item_id), intval($a->profile['uid']));
 		if (dbm::is_result($r)) {
-			$item_id = $r[0]["id"];
+			$item_id = $r["id"];
 		} else {
 			$item_id = false;
 		}
@@ -294,8 +292,8 @@ function display_content(App $a, $update = 0) {
 	}
 
 	// We are displaying an "alternate" link if that post was public. See issue 2864
-	$items = q("SELECT `id` FROM `item` WHERE `id` = %d AND NOT `private` AND `wall`", intval($item_id));
+	$is_public = dba::exists('item', array('id' => $item_id, 'private' => false, 'wall' => true));
-	if (dbm::is_result($items)) {
+	if ($is_public) {
 		$alternate = App::get_baseurl().'/display/'.$nick.'/'.$item_id.'.atom';
 	} else {
 		$alternate = '';
@@ -322,12 +320,12 @@ function display_content(App $a, $update = 0) {
 
 	if ($contact_id) {
 		$groups = init_groups_visitor($contact_id);
-		$r = qu("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		$r = dba::fetch_first("SELECT * FROM `contact` WHERE `id` = ? AND `uid` = ? LIMIT 1",
-			intval($contact_id),
+			$contact_id,
-			intval($a->profile['uid'])
+			$a->profile['uid']
 		);
 		if (dbm::is_result($r)) {
-			$contact = $r[0];
+			$contact = $r;
 			$remote_contact = true;
 		}
 	}
@@ -339,11 +337,9 @@ function display_content(App $a, $update = 0) {
 		}
 	}
 
-	$r = qu("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
+	$r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $a->profile['uid']);
-		intval($a->profile['uid'])
-	);
 	if (dbm::is_result($r)) {
-		$a->page_contact = $r[0];
+		$a->page_contact = $r;
 	}
 	$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
 
@@ -373,75 +369,72 @@ function display_content(App $a, $update = 0) {
 	$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
 
 	if ($update) {
-
+		$r = dba::p("SELECT `id` FROM `item` WHERE `item`.`uid` = ?
-		$r = qu("SELECT `id` FROM `item` WHERE `item`.`uid` = %d
+			AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
-			AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d)
 			$sql_extra AND `unseen`",
-			intval($a->profile['uid']),
+			$a->profile['uid'],
-			intval($item_id)
+			$item_id
 		);
 
-		if (!$r) {
+		if (dba::num_rows($r) == 0) {
 			return '';
 		}
 	}
 
-	$r = qu(item_query()." AND `item`.`uid` = %d
+	$r = dba::p(item_query()." AND `item`.`uid` = ?
-		AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d)
+		AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = ?)
 		$sql_extra
 		ORDER BY `parent` DESC, `gravity` ASC, `id` ASC",
-		intval($a->profile['uid']),
+		$a->profile['uid'],
-		intval($item_id)
+		$item_id
 	);
 
-
+	if (!dbm::is_result($r) && local_user()) {
-	if (!$r && local_user()) {
 		// Check if this is another person's link to a post that we have
-		$r = qu("SELECT `item`.uri FROM `item`
+		$r = dba::fetch_first("SELECT `item`.uri FROM `item`
-			WHERE (`item`.`id` = %d OR `item`.`uri` = '%s')
+			WHERE (`item`.`id` = ? OR `item`.`uri` = ?)
 			LIMIT 1",
-			intval($item_id),
+			$item_id,
-			dbesc($item_id)
+			$item_id
 		);
 		if (dbm::is_result($r)) {
-			$item_uri = $r[0]['uri'];
+			$item_uri = $r['uri'];
 
-			$r = qu(item_query()." AND `item`.`uid` = %d
+			$r = dba::p(item_query()." AND `item`.`uid` = ?
-				AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `uri` = '%s' AND uid = %d)
+				AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `uri` = ? AND uid = ?)
-				ORDER BY `parent` DESC, `gravity` ASC, `id` ASC ",
+				ORDER BY `parent` DESC, `gravity` ASC, `id` ASC",
-				intval(local_user()),
+				local_user(),
-				dbesc($item_uri),
+				$item_uri,
-				intval(local_user())
+				local_user()
 			);
 		}
 	}
 
-	if ($r) {
+	if (dbm::is_result($r)) {
+		$s = dba::inArray($r);
 
 		if ((local_user()) && (local_user() == $a->profile['uid'])) {
-			$unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `parent` = %d",
+			$unseen = dba::select('item', array('id'), array('parent' => $s[0]['parent'], 'unseen' => true), array('limit' => 1));
-					intval($r[0]['parent']));
+			if (dbm::is_result($unseen)) {
-
+				dba::update('item', array('unseen' => false), array('parent' => $s[0]['parent'], 'unseen' => true));
-			if ($unseen) {
-				dba::update('item', array('unseen' => false), array('parent' => $r[0]['parent'], 'unseen' => true));
 			}
 		}
 
-		$items = conv_sort($r,"`commented`");
+		$items = conv_sort($s, "`commented`");
 
 		if (!$update) {
 			$o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
 		}
-		$o .= conversation($a,$items,'display', $update);
+		$o .= conversation($a, $items, 'display', $update);
 
 		// Preparing the meta header
 		require_once('include/bbcode.php');
 		require_once("include/html2plain.php");
-		$description = trim(html2plain(bbcode($r[0]["body"], false, false), 0, true));
+		$description = trim(html2plain(bbcode($s[0]["body"], false, false), 0, true));
-		$title = trim(html2plain(bbcode($r[0]["title"], false, false), 0, true));
+		$title = trim(html2plain(bbcode($s[0]["title"], false, false), 0, true));
-		$author_name = $r[0]["author-name"];
+		$author_name = $s[0]["author-name"];
 
-		$image = $a->remove_baseurl($r[0]["author-thumb"]);
+		$image = $a->remove_baseurl($s[0]["author-thumb"]);
 
 		if ($title == "") {
 			$title = $author_name;
@@ -473,7 +466,7 @@ function display_content(App $a, $update = 0) {
 		$a->page['htmlhead'] .= '<meta name="twitter:title" content="'.$title.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="twitter:description" content="'.$description.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="twitter:image" content="'.$image.'" />'."\n";
-		$a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$r[0]["plink"].'" />'."\n";
+		$a->page['htmlhead'] .= '<meta name="twitter:url" content="'.$s[0]["plink"].'" />'."\n";
 
 		// Dublin Core
 		$a->page['htmlhead'] .= '<meta name="DC.title" content="'.$title.'" />'."\n";
@@ -483,7 +476,7 @@ function display_content(App $a, $update = 0) {
 		$a->page['htmlhead'] .= '<meta property="og:type" content="website" />'."\n";
 		$a->page['htmlhead'] .= '<meta property="og:title" content="'.$title.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta property="og:image" content="'.$image.'" />'."\n";
-		$a->page['htmlhead'] .= '<meta property="og:url" content="'.$r[0]["plink"].'" />'."\n";
+		$a->page['htmlhead'] .= '<meta property="og:url" content="'.$s[0]["plink"].'" />'."\n";
 		$a->page['htmlhead'] .= '<meta property="og:description" content="'.$description.'" />'."\n";
 		$a->page['htmlhead'] .= '<meta name="og:article:author" content="'.$author_name.'" />'."\n";
 		// article:tag
@@ -491,18 +484,18 @@ function display_content(App $a, $update = 0) {
 		return $o;
 	}
 
-	$r = qu("SELECT `id`,`deleted` FROM `item` WHERE `id` = '%s' OR `uri` = '%s' LIMIT 1",
+	$r = dba::fetch_first("SELECT `id`,`deleted` FROM `item` WHERE `id` = ? OR `uri` = ? LIMIT 1",
-		dbesc($item_id),
+		$item_id,
-		dbesc($item_id)
+		$item_id
 	);
 	if ($r) {
-		if ($r[0]['deleted']) {
+		if ($r['deleted']) {
-			notice(t('Item has been removed.') . EOL );
+			notice(t('Item has been removed.') . EOL);
 		} else {
-			notice(t('Permission denied.') . EOL );
+			notice(t('Permission denied.') . EOL);
 		}
 	} else {
-		notice(t('Item not found.') . EOL );
+		notice(t('Item not found.') . EOL);
 	}
 
 	return $o;

mod/item.php

@@ -887,12 +887,7 @@ function item_post(App $a) {
 	);
 
 	if (dbm::is_result($r)) {
-		$r = q("SELECT LAST_INSERT_ID() AS `item-id`");
+		$post_id = dba::lastInsertId();
-		if (dbm::is_result($r)) {
-			$post_id = $r[0]['item-id'];
-		} else {
-			$post_id = 0;
-		}
 	} else {
 		logger('mod_item: unable to create post.');
 		$post_id = 0;

mod/network.php

@@ -130,7 +130,7 @@ function network_init(App $a) {
 	$search = ((x($_GET, 'search')) ? escape_tags($_GET['search']) : '');
 
 	if (x($_GET, 'save')) {
-		$r = qu("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
+		$r = q("SELECT * FROM `search` WHERE `uid` = %d AND `term` = '%s' LIMIT 1",
 			intval(local_user()),
 			dbesc($search)
 		);
@@ -185,7 +185,7 @@ function saved_searches($search) {
 
 	$o = '';
 
-	$r = qu("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
+	$r = q("SELECT `id`,`term` FROM `search` WHERE `uid` = %d",
 		intval(local_user())
 	);
 
@@ -396,7 +396,7 @@ function network_content(App $a, $update = 0) {
 		$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
 	if($nets) {
-		$r = qu("SELECT `id` FROM `contact` WHERE `uid` = %d AND network = '%s' AND `self` = 0",
+		$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND network = '%s' AND `self` = 0",
 			intval(local_user()),
 			dbesc($nets)
 		);
@@ -429,7 +429,7 @@ function network_content(App $a, $update = 0) {
 
 		if ($cid) {
 			// If $cid belongs to a communitity forum or a privat goup,.add a mention to the status editor
-			$contact = qu("SELECT `nick` FROM `contact` WHERE `id` = %d AND `uid` = %d AND (`forum` OR `prv`) ",
+			$contact = q("SELECT `nick` FROM `contact` WHERE `id` = %d AND `uid` = %d AND (`forum` OR `prv`) ",
 				intval($cid),
 				intval(local_user())
 			);
@@ -480,7 +480,7 @@ function network_content(App $a, $update = 0) {
 	$sql_nets = (($nets) ? sprintf(" and $sql_table.`network` = '%s' ", dbesc($nets)) : '');
 
 	if($group) {
-		$r = qu("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		$r = q("SELECT `name`, `id` FROM `group` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($group),
 			intval($_SESSION['uid'])
 		);
@@ -501,7 +501,7 @@ function network_content(App $a, $update = 0) {
 
 			$contact_str = implode(',',$contacts);
 			$gcontact_str = implode(',',$gcontacts);
-			$self = qu("SELECT `contact`.`id`, `gcontact`.`id` AS `gid` FROM `contact`
+			$self = q("SELECT `contact`.`id`, `gcontact`.`id` AS `gid` FROM `contact`
 					INNER JOIN `gcontact` ON `gcontact`.`nurl` = `contact`.`nurl`
 					WHERE `uid` = %d AND `self`", intval($_SESSION['uid']));
 			if (count($self)) {
@@ -524,7 +524,7 @@ function network_content(App $a, $update = 0) {
 	}
 	elseif($cid) {
 
-		$r = qu("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `contact-type`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d
+		$r = q("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `contact-type`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d
 				AND (NOT `blocked` OR `pending`) LIMIT 1",
 			intval($cid)
 		);
@@ -641,7 +641,7 @@ function network_content(App $a, $update = 0) {
 			$sql_order = "`item`.`id`";
 
 		// "New Item View" - show all items unthreaded in reverse created date order
-		$items = qu("SELECT %s FROM $sql_table $sql_post_table %s
+		$items = q("SELECT %s FROM $sql_table $sql_post_table %s
 			WHERE %s AND `item`.`uid` = %d
 			$simple_update
 			$sql_extra $sql_nets
@@ -708,7 +708,7 @@ function network_content(App $a, $update = 0) {
 			else
 				$sql_extra4 = "";
 
-			$r = qu("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
+			$r = q("SELECT `item`.`parent` AS `item_id`, `item`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
 				FROM $sql_table $sql_post_table INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 				WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` $sql_extra4
@@ -718,7 +718,7 @@ function network_content(App $a, $update = 0) {
 				intval(local_user())
 			);
 		} else {
-			$r = qu("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
+			$r = q("SELECT `thread`.`iid` AS `item_id`, `thread`.`network` AS `item_network`, `contact`.`uid` AS `contact_uid`
 				FROM $sql_table $sql_post_table STRAIGHT_JOIN `contact` ON `contact`.`id` = `thread`.`contact-id`
 				AND (NOT `contact`.`blocked` OR `contact`.`pending`)
 				WHERE `thread`.`uid` = %d AND `thread`.`visible` AND NOT `thread`.`deleted`
@@ -752,16 +752,15 @@ function network_content(App $a, $update = 0) {
 			$items = array();
 
 			foreach ($parents_arr AS $parents) {
-				$thread_items = qu(item_query()." AND `item`.`uid` = %d
+				$thread_items = dba::p(item_query()." AND `item`.`uid` = ?
-					AND `item`.`parent` = %d
+					AND `item`.`parent` = ?
-					ORDER BY `item`.`commented` DESC LIMIT %d",
+					ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
-					intval(local_user()),
+					local_user(),
-					intval($parents),
+					$parents
-					intval($max_comments + 1)
 				);
 
 				if (dbm::is_result($thread_items))
-					$items = array_merge($items, $thread_items);
+					$items = array_merge($items, dba::inArray($thread_items));
 			}
 			$items = conv_sort($items,$ordering);
 		} else {
@@ -794,9 +793,9 @@ function network_content(App $a, $update = 0) {
 
 
 	if (!$group && !$cid && !$star) {
-		$unseen = dba::select('item', array('id'), array('unseen' => true, 'uid' => local_user()), array('limit' => 1));
+		$unseen = dba::exists('item', array('unseen' => true, 'uid' => local_user()));
 
-		if (dbm::is_result($unseen)) {
+		if ($unseen) {
 			$r = dba::update('item', array('unseen' => false), array('uid' => local_user(), 'unseen' => true));
 		}
 	} elseif ($update_unseen) {

mod/profile.php

@@ -333,11 +333,12 @@ function profile_content(App $a, $update = 0) {
 	}
 
 
-	if($is_owner) {
+	if ($is_owner) {
-		$r = q("UPDATE `item` SET `unseen` = 0
+		$unseen = dba::exists('item', array('wall' => true, 'unseen' => true, 'uid' => local_user()));
-			WHERE `wall` = 1 AND `unseen` = 1 AND `uid` = %d",
+		if ($unseen) {
-			intval(local_user())
+			$r = dba::update('item', array('unseen' => false),
-		);
+					array('wall' => true, 'unseen' => true, 'uid' => local_user()));
+		}
 	}
 
 	$o .= conversation($a, $items, 'profile', $update);

src/App.php

@@ -760,7 +760,11 @@ class App {
 
 		$callstack = array();
 		foreach ($trace AS $func) {
-			$callstack[] = $func['function'];
+			if (!empty($func['class'])) {
+				$callstack[] = $func['class'].'::'.$func['function'];
+			} else {
+				$callstack[] = $func['function'];
+			}
 		}
 
 		return implode(', ', $callstack);

update.php

@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1233);
+define('UPDATE_VERSION' , 1234);
 
 /**
  *