X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=8a573c9565ddeef689e89e6f0264fecf1a07023f;hb=8c9aa975faeacbffce9314443aebe9ebc220aac3;hp=66e19684429a7a96974a3f0b8028d9e3f62a8498;hpb=a50947a4bc3f779df8fa4e6777bc025fcefc8d21;p=friendica.git

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 66e1968442..8a573c9565 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -6,16 +6,11 @@ require_once('include/auth.php');
 
 function dfrn_poll_init(&$a) {
 
-	$dfrn_id = '';
-
-	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'];
-	$dfrn_version    = ((x($_GET,'dfrn_version'))    ? $_GET['dfrn_version']    : '1.0');
-	$destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url'] : '');
+	$dfrn_id         = ((x($_GET,'dfrn_id'))         ? $_GET['dfrn_id']              : '');
+	$type            = ((x($_GET,'type'))            ? $_GET['type']                 : '');
+	$last_update     = ((x($_GET,'last_update'))     ? $_GET['last_update']          : '');
+	$destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url']      : '');
+	$dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 0);
 
 
 	$direction = (-1);
@@ -23,21 +18,22 @@ function dfrn_poll_init(&$a) {
 
 	if(strpos($dfrn_id,':') == 1) {
 		$direction = intval(substr($dfrn_id,0,1));
-		$dfrn_id = substr($dfrn_id,2);
+		$dfrn_id   = substr($dfrn_id,2);
 	}
 
-	if(($dfrn_id == '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
+	if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
+		header("Content-type: application/atom+xml");
 		$o = get_feed_for($a, '*', $a->argv[1],$last_update);
 		echo $o;
 		killme();
 	}
 
-	if((x($type)) && ($type == 'profile')) {
+	if((isset($type)) && ($type === 'profile')) {
 
 		$sql_extra = '';
 		switch($direction) {
 			case (-1):
-				$sql_extra = sprintf(" AND `dfrn-id` = '%s' ", dbesc($dfrn_id));
+				$sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id));
 				$my_id = $dfrn_id;
 				break;
 			case 0:
@@ -55,7 +51,10 @@ function dfrn_poll_init(&$a) {
 
 		$r = q("SELECT `contact`.*, `user`.`nickname` 
 			FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
-			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $sql_extra LIMIT 1");
+			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+			AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
+			dbesc($a->argv[1])
+		);
 		
 		if(count($r)) {
 
@@ -85,7 +84,7 @@ function dfrn_poll_init(&$a) {
 
 	}
 
-	if((x($type)) && ($type == 'profile-check')) {
+	if((isset($type)) && ($type === 'profile-check')) {
 
 		switch($direction) {
 			case 1:
@@ -115,20 +114,23 @@ function dfrn_poll_init(&$a) {
 
 function dfrn_poll_post(&$a) {
 
-	$dfrn_id = notags(trim($_POST['dfrn_id']));
-	$challenge = notags(trim($_POST['challenge']));
-	$url = $_POST['url'];
+	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? $_POST['dfrn_id']              : '');
+	$challenge    = ((x($_POST,'challenge'))    ? $_POST['challenge']            : '');
+	$url          = ((x($_POST,'url'))          ? $_POST['url']                  : '');
+	$dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 0);
 
-	$direction = (-1);
+	$direction    = (-1);
 	if(strpos($dfrn_id,':') == 1) {
 		$direction = intval(substr($dfrn_id,0,1));
-		$dfrn_id = substr($dfrn_id,2);
+		$dfrn_id   = substr($dfrn_id,2);
 	}
 
+
 	$r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
 		dbesc($dfrn_id),
 		dbesc($challenge)
 	);
+
 	if(! count($r))
 		killme();
 
@@ -171,7 +173,7 @@ function dfrn_poll_post(&$a) {
 	$contact_id = $r[0]['id']; 
 
 
-	if($type == 'reputation' && strlen($url)) {
+	if($type === 'reputation' && strlen($url)) {
 		$r = q("SELECT * FROM `contact` WHERE `url` = '%s' AND `uid` = %d LIMIT 1",
 			dbesc($url),
 			intval($owner_uid)
@@ -197,10 +199,10 @@ function dfrn_poll_post(&$a) {
 		</reputation>
 		";
 		killme();
-		return; // NOTREACHED
+		// NOTREACHED
 	}
 	else {
-
+		header("Content-type: application/atom+xml");
 		$o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update, $direction);
 		echo $o;
 		killme();
@@ -215,11 +217,13 @@ function dfrn_poll_content(&$a) {
 	$type = 'data';
 
 	if(x($_GET,'dfrn_id'))
-		$dfrn_id = $a->config['dfrn_poll_dfrn_id'] = $_GET['dfrn_id'];
+		$dfrn_id = $_GET['dfrn_id'];
 	if(x($_GET,'type'))
-		$type = $a->config['dfrn_poll_type'] = $_GET['type'];
+		$type = $_GET['type'];
 	if(x($_GET,'last_update'))
-		$last_update = $a->config['dfrn_poll_last_update'] = $_GET['last_update'];
+		$last_update = $_GET['last_update'];
+
+	$dfrn_version = (float) $_GET['dfrn_version'];
 
 	$direction = (-1);
 	if(strpos($dfrn_id,':') == 1) {
@@ -239,7 +243,7 @@ function dfrn_poll_content(&$a) {
 		$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']))),
+			dbesc($dfrn_id),
 			intval(time() + 60 ),
 			dbesc($type),
 			dbesc($last_update)
@@ -292,11 +296,15 @@ function dfrn_poll_content(&$a) {
 		else {
 			$status = 1;
 		}
-
-		echo '<?xml version="1.0" encoding="UTF-8"?><dfrn_poll><status>' .$status . '</status><dfrn_version>2.0</dfrn_version><dfrn_id>' . $encrypted_id . '</dfrn_id>'
-			. '<challenge>' . $challenge . '</challenge></dfrn_poll>' . "\r\n" ;
-		session_write_close();
-		exit;		
+		header("Content-type: text/xml");
+		echo '<?xml version="1.0" encoding="UTF-8"?>' . "\r\n"
+			. '<dfrn_poll>' . "\r\n"
+			. "\t" . '<status>' .$status . '</status>' . "\r\n"
+			. "\t" . '<dfrn_version>' . DFRN_PROTOCOL_VERSION . '</dfrn_version>' . "\r\n"
+			. "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n"
+			. "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n"
+			. '</dfrn_poll>' . "\r\n" ;
+		killme();
 	}
 }