diff --git a/buffer/buffer.php b/buffer/buffer.php
index 97373f30..932789da 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -239,18 +239,21 @@ function buffer_post_local(&$a,&$b) {
 
 function buffer_send(App $a, &$b)
 {
-	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
+	}
 
-	if(! strstr($b['postopts'],'buffer'))
+	if(! strstr($b['postopts'],'buffer')) {
 		return;
+	}
 
-	if($b['parent'] != $b['id'])
+	if($b['parent'] != $b['id']) {
 		return;
+	}
 
 	// Dont't post if the post doesn't belong to us.
 	// This is a check for forum postings
-	$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index 04ed24ca..db4cc46e 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -275,18 +275,21 @@ function diaspora_send(&$a,&$b) {
 
 	logger('diaspora_send: invoked');
 
-	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
+	}
 
-	if(! strstr($b['postopts'],'diaspora'))
+	if(! strstr($b['postopts'],'diaspora')) {
 		return;
+	}
 
-	if($b['parent'] != $b['id'])
+	if($b['parent'] != $b['id']) {
 		return;
+	}
 
 	// Dont't post if the post doesn't belong to us.
 	// This is a check for forum postings
-	$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 384b955c..199aace4 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -97,7 +97,7 @@ function ifttt_post(App $a)
 
 	$nickname = $a->argv[1];
 
-	$user = dba::select('user', ['uid'], ['nickname' => $nickname], ['limit' => 1]);
+	$user = dba::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 	if (!DBM::is_result($user)) {
 		logger('User ' . $nickname . ' not found.', LOGGER_DEBUG);
 		return;
diff --git a/libertree/libertree.php b/libertree/libertree.php
index 95def07a..f5a157ec 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -155,18 +155,21 @@ function libertree_send(&$a,&$b) {
 
 	logger('libertree_send: invoked');
 
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
+	}
 
-	if (! strstr($b['postopts'],'libertree'))
+	if (! strstr($b['postopts'],'libertree')) {
 		return;
+	}
 
-	if ($b['parent'] != $b['id'])
+	if ($b['parent'] != $b['id']) {
 		return;
+	}
 
 	// Dont't post if the post doesn't belong to us.
 	// This is a check for forum postings
-	$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index f5bf6496..3f6f8a87 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -413,12 +413,13 @@ function pumpio_send(&$a,&$b) {
 
 		logger("pumpio_send: receiver ".print_r($receiver, true));
 
-		if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio')))
+		if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio'))) {
 			return;
+		}
 
 		// Dont't post if the post doesn't belong to us.
 		// This is a check for forum postings
-		$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+		$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 		if ($b['contact-id'] != $self['id']) {
 			return;
 		}
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 659ddaef..34bbf20c 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -568,19 +568,21 @@ function statusnet_post_hook(App $a, &$b)
 		$nicknameplain = "@" . $nick;
 
 		logger("statusnet_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], LOGGER_DEBUG);
-		if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false))
+		if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false)) {
 			$b["body"] = $nickname . " " . $b["body"];
+		}
 
 		logger("statusnet_post_hook: parent found " . print_r($orig_post, true), LOGGER_DEBUG);
 	} else {
 		$iscomment = false;
 
-		if ($b['private'] || !strstr($b['postopts'], 'statusnet'))
+		if ($b['private'] || !strstr($b['postopts'], 'statusnet')) {
 			return;
+		}
 
 		// Dont't post if the post doesn't belong to us.
 		// This is a check for forum postings
-		$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+		$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 		if ($b['contact-id'] != $self['id']) {
 			return;
 		}
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 77d98aca..78c12a5f 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -316,18 +316,21 @@ function tumblr_post_local(&$a, &$b) {
 
 function tumblr_send(&$a,&$b) {
 
-	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
+	}
 
-	if(! strstr($b['postopts'],'tumblr'))
+	if(! strstr($b['postopts'],'tumblr')) {
 		return;
+	}
 
-	if($b['parent'] != $b['id'])
+	if($b['parent'] != $b['id']) {
 		return;
+	}
 
 	// Dont't post if the post doesn't belong to us.
 	// This is a check for forum postings
-	$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 43aee0fe..ccfdeb1f 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -468,7 +468,7 @@ function twitter_post_hook(App $a, &$b)
 
 		// Dont't post if the post doesn't belong to us.
 		// This is a check for forum postings
-		$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+		$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 		if ($b['contact-id'] != $self['id']) {
 			return;
 		}
diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index baa4c656..ca615205 100644
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -458,7 +458,7 @@ function windowsphonepush_login(App $a)
 	$user_id = User::authenticate($_SERVER['PHP_AUTH_USER'], trim($_SERVER['PHP_AUTH_PW']));
 
 	if ($user_id) {
-		$record = dba::select('user', [], ['uid' => $user_id], ['limit' => 1]);
+		$record = dba::selectFirst('user', [], ['uid' => $user_id]);
 	} else {
 		logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
 		header('WWW-Authenticate: Basic realm="Friendica"');
diff --git a/wppost/wppost.php b/wppost/wppost.php
index ea26ae45..323fcef0 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -191,18 +191,21 @@ function wppost_post_local(&$a, &$b) {
 
 function wppost_send(&$a,&$b) {
 
-	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
+	}
 
-	if(! strstr($b['postopts'],'wppost'))
+	if(! strstr($b['postopts'],'wppost')) {
 		return;
+	}
 
-	if($b['parent'] != $b['id'])
+	if($b['parent'] != $b['id']) {
 		return;
+	}
 
 	// Dont't post if the post doesn't belong to us.
 	// This is a check for forum postings
-	$self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+	$self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}