X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpubsub.php;h=df27c6bc2b72d141c3b8e92117a442aeccb1698a;hb=c3cb3d75e593faa06e4050a016ef1893bd5a4a3a;hp=b47b2eedf3fc5cf3194e81ba55f558b0c77a3a6d;hpb=6d646e9df5ccd5c0b5a70f15e242b0c50a0b877b;p=friendica.git

diff --git a/mod/pubsub.php b/mod/pubsub.php
index b47b2eedf3..df27c6bc2b 100644
--- a/mod/pubsub.php
+++ b/mod/pubsub.php
@@ -29,20 +29,18 @@ function hub_post_return() {
 function pubsub_init(&$a) {
 
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
-	$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
 	if($_SERVER['REQUEST_METHOD'] === 'GET') {
 
-		$hub_mode = notags(trim($_GET['hub_mode']));
-		$hub_topic = notags(trim($_GET['hub_topic']));
-		$hub_challenge = notags(trim($_GET['hub_challenge']));
-		$hub_lease = notags(trim($_GET['hub_lease_seconds']));
-		$hub_verify = notags(trim($_GET['hub_verify_token']));
+		$hub_mode      = ((x($_GET,'hub_mode'))          ? notags(trim($_GET['hub_mode']))          : '');
+		$hub_topic     = ((x($_GET,'hub_topic'))         ? notags(trim($_GET['hub_topic']))         : '');
+		$hub_challenge = ((x($_GET,'hub_challenge'))     ? notags(trim($_GET['hub_challenge']))     : '');
+		$hub_lease     = ((x($_GET,'hub_lease_seconds')) ? notags(trim($_GET['hub_lease_seconds'])) : '');
+		$hub_verify    = ((x($_GET,'hub_verify_token'))  ? notags(trim($_GET['hub_verify_token']))  : '');
 
-		$debugging = get_config('system','debugging');
-		if($debugging) {
-			file_put_contents('pubsub.out', 'Pubsubhubbub subscription called from ' . $_SERVER['REMOTE_ADDR'] . ' at ' . datetime_convert() . "\n" . print_r($_GET,true), FILE_APPEND);
-		}
+		logger('pubsub: Subscription from ' . $_SERVER['REMOTE_ADDR']);
+		logger('pubsub: data: ' . print_r($_GET,true), LOGGER_DATA);
 
 		$subscribe = (($hub_mode === 'subscribe') ? 1 : 0);
 
@@ -78,23 +76,22 @@ function pubsub_init(&$a) {
 			intval($contact['id'])
 		);
 
- 		hub_return(true, $hub_challenge);
-		
+ 		hub_return(true, $hub_challenge);		
 	}
 }
 
+require_once('include/security.php');
 
 function pubsub_post(&$a) {
 
 	$xml = file_get_contents('php://input');
 
-	$debugging = get_config('system','debugging');
-	$remote_host = 'Pubsub feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' at ' . datetime_convert() . ' for ' .  $a->cmd . "\n\n";
-	if($debugging)
-		file_put_contents('pubsub.out', $remote_host . $xml, FILE_APPEND);
+	logger('pubsub: feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' .  $a->cmd );
+	logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] );
+	logger('pubsub: data: ' . $xml, LOGGER_DATA);
 
 	$nick       = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
-	$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+	$contact_id = (($a->argc > 2) ? intval($a->argv[2])       : 0 );
 
 	$r = q("SELECT * FROM `user` WHERE `nickname` = '%s' LIMIT 1",
 		dbesc($nick)
@@ -108,8 +105,10 @@ function pubsub_post(&$a) {
 		intval($contact_id),
 		intval($importer['uid'])
 	);
-	if(! count($r))
+	if(! count($r)) {
+		logger('pubsub: no contact record - ignored');
 		hub_post_return();
+	}
 
 	$contact = $r[0];
 
@@ -117,7 +116,11 @@ function pubsub_post(&$a) {
 
 	require_once('include/items.php');
 
-	consume_feed($xml,$importer,$contact,$feedhub);
+	consume_feed($xml,$importer,$contact,$feedhub,1);
+
+	// do it a second time so that any children find their parents.
+
+	consume_feed($xml,$importer,$contact,$feedhub,1);
 
 	hub_post_return();