X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_poll.php;h=35b9861a52af4d2653fa30e8f8e4640f03a21a5a;hb=9513f1f1668a33be3fc2b241fe3662e9de42d84b;hp=84cb58da0d6a8da71fc5648a7d7baff8553e63d2;hpb=b49858b038a0a05bbe7685929e88071d0e125538;p=friendica.git
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 84cb58da0d..35b9861a52 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -6,59 +6,103 @@ require_once('include/auth.php');
function dfrn_poll_init(&$a) {
- $dfrn_id = '';
+ $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);
- 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 == '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
- $o = get_feed_for($a,'*', $a->argv[1],$last_update);
+ if(strpos($dfrn_id,':') == 1) {
+ $direction = intval(substr($dfrn_id,0,1));
+ $dfrn_id = substr($dfrn_id,2);
+ }
+
+ 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' OR `issued-id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id));
+ $my_id = $dfrn_id;
+ break;
+ case 0:
+ $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+ $my_id = '1:' . $dfrn_id;
+ break;
+ case 1:
+ $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+ $my_id = '0:' . $dfrn_id;
+ break;
+ default:
+ goaway($a->get_baseurl());
+ break; // NOTREACHED
+ }
- $r = q("SELECT `contact`.*, `user`.`nickname`
+ $r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname`
FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
- WHERE ( `dfrn-id` = '%s' OR ( `issued-id` = '%s' AND `duplex `= 1 )) LIMIT 1",
- dbesc($dfrn_id),
- dbesc($dfrn_id)
+ WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+ AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
+ dbesc($a->argv[1])
);
-
+
if(count($r)) {
- $s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $dfrn_id . '&type=profile-check');
+
+ $s = fetch_url($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');
+
if(strlen($s)) {
+
$xml = simplexml_load_string($s);
+
if((int) $xml->status == 1) {
$_SESSION['authenticated'] = 1;
$_SESSION['visitor_id'] = $r[0]['id'];
- notice( t('Hi ') . $r[0]['name'] . EOL);
+ notice( $r[0]['username'] . t(' welcomes ') . $r[0]['name'] . EOL);
// Visitors get 1 day session.
$session_id = session_id();
$expire = time() + 86400;
q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s' LIMIT 1",
dbesc($expire),
- dbesc($session_id));
+ dbesc($session_id)
+ );
}
}
- $profile = ((strlen($r[0]['nickname'])) ? $r[0]['nickname'] : $r[0]['uid']);
- goaway($a->get_baseurl() . "/profile/$profile/visit");
+ $profile = $r[0]['nickname'];
+ goaway((strlen($destination_url)) ? $destination_url : $a->get_baseurl() . '/profile/' . $profile);
}
goaway($a->get_baseurl());
- }
- if((x($type)) && ($type == 'profile-check')) {
+ }
+ if((isset($type)) && ($type === 'profile-check')) {
+
+ switch($direction) {
+ case 1:
+ $dfrn_id = '0:' . $dfrn_id;
+ break;
+ case 0:
+ $dfrn_id = '1:' . $dfrn_id;
+ break;
+ default:
+ break;
+ }
q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
$r = q("SELECT * FROM `profile_check` WHERE `dfrn_id` = '%s' ORDER BY `expire` DESC",
dbesc($dfrn_id));
- if(count($r))
+ if(count($r)) {
xml_status(1);
+ return; // NOTREACHED
+ }
xml_status(0);
return; // NOTREACHED
}
@@ -70,14 +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);
+ if(strpos($dfrn_id,':') == 1) {
+ $direction = intval(substr($dfrn_id,0,1));
+ $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();
@@ -90,10 +143,28 @@ function dfrn_poll_post(&$a) {
);
- $r = q("SELECT * FROM `contact` WHERE ( `issued-id` = '%s' OR ( `dfrn-id` = '%s' AND `duplex` = 1 )) LIMIT 1",
- dbesc($dfrn_id),
- dbesc($dfrn_id)
- );
+ $sql_extra = '';
+ switch($direction) {
+ case (-1):
+ $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
+ $my_id = $dfrn_id;
+ break;
+ case 0:
+ $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+ $my_id = '1:' . $dfrn_id;
+ break;
+ case 1:
+ $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+ $my_id = '0:' . $dfrn_id;
+ break;
+ default:
+ goaway($a->get_baseurl());
+ break; // NOTREACHED
+ }
+
+
+ $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
+
if(! count($r))
killme();
@@ -102,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)
@@ -128,11 +199,11 @@ function dfrn_poll_post(&$a) {
";
killme();
- return; // NOTREACHED
+ // NOTREACHED
}
else {
-
- $o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update);
+ header("Content-type: application/atom+xml");
+ $o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update, $direction);
echo $o;
killme();
@@ -146,11 +217,19 @@ 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) {
+ $direction = intval(substr($dfrn_id,0,1));
+ $dfrn_id = substr($dfrn_id,2);
+ }
if($dfrn_id != '') {
@@ -164,25 +243,45 @@ 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)
);
- $r = q("SELECT * FROM `contact` WHERE ( `issued-id` = '%s' OR ( `dfrn-id` = '%s' AND `duplex` = 1 ))
- AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
- dbesc($_GET['dfrn_id']),
- dbesc($_GET['dfrn_id'])
- );
+
+ $sql_extra = '';
+ switch($direction) {
+ case (-1):
+ $sql_extra = sprintf(" AND `issued-id` = '%s' ", dbesc($dfrn_id));
+ $my_id = $dfrn_id;
+ break;
+ case 0:
+ $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+ $my_id = '1:' . $dfrn_id;
+ break;
+ case 1:
+ $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", dbesc($dfrn_id));
+ $my_id = '0:' . $dfrn_id;
+ break;
+ default:
+ goaway($a->get_baseurl());
+ break; // NOTREACHED
+ }
+
+
+
+
+ $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
+
if(count($r)) {
$challenge = '';
$encrypted_id = '';
- $id_str = $_GET['dfrn_id'] . '.' . mt_rand(1000,9999);
+ $id_str = $my_id . '.' . mt_rand(1000,9999);
- if($r[0]['duplex']) {
+ if($r[0]['duplex'] && strlen($r[0]['pubkey'])) {
openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']);
openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']);
}
@@ -197,11 +296,15 @@ function dfrn_poll_content(&$a) {
else {
$status = 1;
}
-
- echo '' .$status . '' . $encrypted_id . ''
- . '' . $challenge . '' . "\r\n" ;
- session_write_close();
- exit;
+ header("Content-type: text/xml");
+ echo '' . "\r\n"
+ . '' . "\r\n"
+ . "\t" . '' .$status . '' . "\r\n"
+ . "\t" . '' . DFRN_PROTOCOL_VERSION . '' . "\r\n"
+ . "\t" . '' . $encrypted_id . '' . "\r\n"
+ . "\t" . '' . $challenge . '' . "\r\n"
+ . '' . "\r\n" ;
+ killme();
}
}