X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsubhubbub.php;h=da2f94748943887d7fe3c3dc8a710ac0ce820209;hb=83e4141639d026dfa93c4c2c0f9fe00a7cf56446;hp=b0e3ef30998ec3b891291d7b5392bba1df1aac20;hpb=0c67c89715df801e0c887be50c9739db3bae7ca3;p=friendica.git

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index b0e3ef3099..da2f947489 100644
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -1,13 +1,12 @@
 <?php
 
-if(! function_exists('post_var')) {
+use Friendica\App;
+
 function post_var($name) {
 	return (x($_POST, $name)) ? notags(trim($_POST[$name])) : '';
 }
-}
 
-if(! function_exists('pubsubhubbub_init')) {
-function pubsubhubbub_init(&$a) {
+function pubsubhubbub_init(App $a) {
 	// PuSH subscription must be considered "public" so just block it
 	// if public access isn't enabled.
 	if (get_config('system', 'block_public')) {
@@ -58,7 +57,7 @@ function pubsubhubbub_init(&$a) {
 			   " AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 			   dbesc($nick));
 
-		if(!count($r)) {
+		if (!dbm::is_result($r)) {
 			logger('pubsubhubbub: local account not found: ' . $nick);
 			http_status_exit(404);
 		}
@@ -76,7 +75,7 @@ function pubsubhubbub_init(&$a) {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked`".
 			   " AND NOT `pending` AND `self` LIMIT 1",
 			   intval($owner['uid']));
-		if(!count($r)) {
+		if (!dbm::is_result($r)) {
 			logger('pubsubhubbub: contact not found.');
 			http_status_exit(404);
 		}
@@ -135,7 +134,7 @@ function pubsubhubbub_init(&$a) {
 
 			// if we are just updating an old subscription, keep the
 			// old values for push and last_update
-			if (count($r)) {
+			if (dbm::is_result($r)) {
 				$last_update = $r[0]['last_update'];
 				$push_flag = $r[0]['push'];
 			}
@@ -161,5 +160,3 @@ function pubsubhubbub_init(&$a) {
 
 	killme();
 }
-}
-?>