X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=e3da6c9526f718f5b99455902548ea04b36e57df;hb=557ebe4700c477aeba043594f7b929b1129be191;hp=042a15f5ebaa53341adafbb2afb03e55e906016c;hpb=95d0a9e2bfd7ae36a1b2f27cacb22290297c1128;p=friendica.git

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 042a15f5eb..e3da6c9526 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -1,5 +1,8 @@
 <?php
 
+require_once('include/items.php');
+require_once('include/auth.php');
+
 
 function dfrn_poll_init(&$a) {
 
@@ -16,6 +19,12 @@ function dfrn_poll_init(&$a) {
 		return;
 
 
+	if(($dfrn_id == '*') && ($a->argc > 1) && (intval($a->argv[1]))) {
+		$o = get_feed_for($a,'*', $a->argv[1],$last_update);
+		echo $o;
+		killme();
+	}
+
 	if((x($type)) && ($type == 'profile')) {
 
 		$r = q("SELECT `contact`.*, `user`.`nickname` 
@@ -56,37 +65,6 @@ function dfrn_poll_init(&$a) {
 	}
 
 
-	if($dfrn_id != '*') {
-		// initial communication from external contact
-		$hash = random_string();
-
-		$status = 0;
-
-		$r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time()));
-
-		$r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
-			VALUES( '%s', '%s', '%s', '%s', '%s' ) ",
-			dbesc($hash),
-			dbesc(notags(trim($_GET['dfrn_id']))),
-			intval(time() + 60 ),
-			dbesc($type),
-			dbesc($last_update)
-		);
-
-		$r = q("SELECT * FROM `contact` WHERE `issued-id` = '%s' AND `blocked` = 0 LIMIT 1",
-			dbesc($_GET['dfrn_id']));
-		if((! count($r)) || (! strlen($r[0]['prvkey'])))
-			$status = 1;
-
-		$challenge = '';
-
-		openssl_private_encrypt($hash,$challenge,$r[0]['prvkey']);
-		$challenge = bin2hex($challenge);
-		echo '<?xml version="1.0" encoding="UTF-8"?><dfrn_poll><status>' .$status . '</status><dfrn_id>' . $_GET['dfrn_id'] . '</dfrn_id>'
-			. '<challenge>' . $challenge . '</challenge></dfrn_poll>' . "\r\n" ;
-		session_write_close();
-		exit;		
-	}
 }
 
 
@@ -96,12 +74,13 @@ function dfrn_poll_post(&$a) {
 	$dfrn_id = notags(trim($_POST['dfrn_id']));
 	$challenge = notags(trim($_POST['challenge']));
 	$url = $_POST['url'];
+
 	$r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
 		dbesc($dfrn_id),
 		dbesc($challenge)
 	);
 	if(! count($r))
-		xml_status(3);
+		killme();
 
 	$type = $r[0]['type'];
 	$last_update = $r[0]['last_update'];
@@ -116,7 +95,7 @@ function dfrn_poll_post(&$a) {
 		dbesc($dfrn_id)
 	);
 	if(! count($r))
-		xml_status(3);
+		killme();
 
 	$owner_uid = $r[0]['uid'];
 	$contact_id = $r[0]['id']; 
@@ -150,17 +129,61 @@ function dfrn_poll_post(&$a) {
 		killme();
 		return; // NOTREACHED
 	}
+	else {
 
+		$o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update);
+		echo $o;
+		killme();
 
-
+	}
 }
 
+function dfrn_poll_content(&$a) {
+
+	if(x($_GET,'dfrn_id'))
+		$dfrn_id = $a->config['dfrn_poll_dfrn_id'] = $_GET['dfrn_id'];
+	if(x($_GET,'type'))
+		$type = $a->config['dfrn_poll_type'] = $_GET['type'];
+	if(x($_GET,'last_update'))
+		$last_update = $a->config['dfrn_poll_last_update'] = $_GET['last_update'];
 
 
+	if($dfrn_id != '*') {
+		// initial communication from external contact
+		$hash = random_string();
 
-function dfrn_poll_content(&$a) {
+		$status = 0;
 
+		$r = q("DELETE FROM `challenge` WHERE `expire` < " . intval(time()));
 
+		$r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
+			VALUES( '%s', '%s', '%s', '%s', '%s' ) ",
+			dbesc($hash),
+			dbesc(notags(trim($_GET['dfrn_id']))),
+			intval(time() + 60 ),
+			dbesc($type),
+			dbesc($last_update)
+		);
+
+		$r = q("SELECT * FROM `contact` WHERE `issued-id` = '%s' AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
+			dbesc($_GET['dfrn_id']));
+		if((! count($r)) || (! strlen($r[0]['prvkey'])))
+			$status = 1;
+
+		$challenge = '';
+
+		openssl_private_encrypt($hash,$challenge,$r[0]['prvkey']);
+		$challenge = bin2hex($challenge);
+		echo '<?xml version="1.0" encoding="UTF-8"?><dfrn_poll><status>' .$status . '</status><dfrn_id>' . $_GET['dfrn_id'] . '</dfrn_id>'
+			. '<challenge>' . $challenge . '</challenge></dfrn_poll>' . "\r\n" ;
+		session_write_close();
+		exit;		
+	}
+
+
+
+
+
+}
 
 
-}
\ No newline at end of file