X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=1cee91f4db1ef927fe7c9bea04ffaa2175cd539b;hb=56c3b3f653bfe2d789470c9bb8434845d3387745;hp=beb73b4e2c4ce53a9ed5a6fcaf3ea56108e2040c;hpb=04dceb955109eed93db5da1bd6c6d4cdd411a9be;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index beb73b4e2c..1cee91f4db 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -1,5 +1,8 @@
 <?php
 
+use Friendica\App;
+use Friendica\Database\DBM;
+
 function hub_return($valid,$body) {
 
 	if($valid) {
@@ -26,7 +29,7 @@ function hub_post_return() {
 
 
 
-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 );
@@ -47,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, '');
 		}
@@ -57,12 +60,12 @@ function pubsub_init(&$a) {
 
 		$sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : '');
 
-		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d 
+		$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d
 			AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1",
 			intval($contact_id),
 			intval($owner['uid'])
 		);
-		if(! count($r)) {
+		if (! DBM::is_result($r)) {
 			logger('pubsub: contact '.$contact_id.' not found.');
 			hub_return(false, '');
 		}
@@ -75,7 +78,7 @@ function pubsub_init(&$a) {
 
 		$contact = $r[0];
 
-		// We must initiate an unsubscribe request with a verify_token. 
+		// We must initiate an unsubscribe request with a verify_token.
 		// Don't allow outsiders to unsubscribe us.
 
 		if($hub_mode === 'unsubscribe') {
@@ -98,7 +101,7 @@ function pubsub_init(&$a) {
 
 require_once('include/security.php');
 
-function pubsub_post(&$a) {
+function pubsub_post(App $a) {
 
 	$xml = file_get_contents('php://input');
 
@@ -117,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),
@@ -131,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();
 	}
@@ -157,6 +161,3 @@ function pubsub_post(&$a) {
 	hub_post_return();
 
 }
-
-
-