X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=1cee91f4db1ef927fe7c9bea04ffaa2175cd539b;hb=3359f3f5c7ecc4b6a34c4fcfc095ab4dd5fab0f1;hp=15523e637a83da8d1c3e3c1e0d62385ef04317b9;hpb=0c764684bb32a9432fd161e62db907efb78af1a5;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index 15523e637a..1cee91f4db 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,6 +1,8 @@
 <?php
 
-if(! function_exists('hub_return')) {
+use Friendica\App;
+use Friendica\Database\DBM;
+
 function hub_return($valid,$body) {
 
 	if($valid) {
@@ -15,19 +17,19 @@ function hub_return($valid,$body) {
 
 	// NOTREACHED
 }
-}
 
 // when receiving an XML feed, always return OK
-if(! function_exists('hub_post_return')) {
+
 function hub_post_return() {
+
 	header($_SERVER["SERVER_PROTOCOL"] . ' 200 ' . 'OK');
 	killme();
-}
+
 }
 
 
-if(! function_exists('pubsub_init')) {
-function pubsub_init(&$a) {
+
+function pubsub_init(App $a) {
 
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
 	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
@@ -48,7 +50,7 @@ function pubsub_init(&$a) {
 		$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 			dbesc($nick)
 		);
-		if(! count($r)) {
+		if (! DBM::is_result($r)) {
 			logger('pubsub: local account not found: ' . $nick);
 			hub_return(false, '');
 		}
@@ -63,7 +65,7 @@ function pubsub_init(&$a) {
 			intval($contact_id),
 			intval($owner['uid'])
 		);
-		if(! count($r)) {
+		if (! DBM::is_result($r)) {
 			logger('pubsub: contact '.$contact_id.' not found.');
 			hub_return(false, '');
 		}
@@ -96,12 +98,10 @@ function pubsub_init(&$a) {
  		hub_return(true, $hub_challenge);
 	}
 }
-}
 
 require_once('include/security.php');
 
-if(! function_exists('pubsub_post')) {
-function pubsub_post(&$a) {
+function pubsub_post(App $a) {
 
 	$xml = file_get_contents('php://input');
 
@@ -120,13 +120,14 @@ function pubsub_post(&$a) {
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 AND `account_removed` = 0 LIMIT 1",
 		dbesc($nick)
 	);
-	if(! count($r))
+	if (! DBM::is_result($r)) {
 		hub_post_return();
+	}
 
 	$importer = $r[0];
 
-	$r = q("SELECT * FROM `contact` WHERE `subhub` = 1 AND `id` = %d AND `uid` = %d
-		AND ( `rel` = %d OR `rel` = %d OR network = '%s' ) AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+	$r = q("SELECT * FROM `contact` WHERE `subhub` AND `id` = %d AND `uid` = %d
+		AND (`rel` = %d OR `rel` = %d OR network = '%s') AND NOT `blocked` LIMIT 1",
 		intval($contact_id),
 		intval($importer['uid']),
 		intval(CONTACT_IS_SHARING),
@@ -134,7 +135,7 @@ function pubsub_post(&$a) {
 		dbesc(NETWORK_FEED)
 	);
 
-	if(! count($r)) {
+	if (! DBM::is_result($r)) {
 		logger('pubsub: no contact record for "'.$nick.' ('.$contact_id.')" - ignored. '.$xml);
 		hub_post_return();
 	}
@@ -158,5 +159,5 @@ function pubsub_post(&$a) {
 	consume_feed($xml,$importer,$contact,$feedhub,1,2);
 
 	hub_post_return();
-}
+
 }