]> git.mxchange.org Git - friendica.git/blobdiff - mod/dfrn_poll.php
default value for firstDay in events page
[friendica.git] / mod / dfrn_poll.php
index a4023d1c02801e98d7900b1af0f17077314f5313..b5f60a0397e39020cd77253b925e2386136e0277 100644 (file)
 <?php
 
+
+
 require_once('include/items.php');
 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_id         = ((x($_GET,'dfrn_id'))         ? $_GET['dfrn_id']              : '');
+       $type            = ((x($_GET,'type'))            ? $_GET['type']                 : 'data');
+       $last_update     = ((x($_GET,'last_update'))     ? $_GET['last_update']          : '');
+       $destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url']      : '');
+       $challenge       = ((x($_GET,'challenge'))       ? $_GET['challenge']            : '');
+       $sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
+       $dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 2.0);
+       $perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
+       $quiet                   = ((x($_GET,'quiet'))                   ? true                                                  : false);
 
-       if(($dfrn_id == '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
-               $o = get_feed_for($a,'*', $a->argv[1],$last_update);
-               echo $o;
+       $direction = (-1);
+
+
+       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'))) {
+               if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+                       http_status_exit(403);
+               }
+
+               $user = '';
+               if($a->argc > 1) {
+                       $r = q("SELECT `hidewall`,`nickname` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
+                               dbesc($a->argv[1])
+                       );
+                       if(! $r)
+                               http_status_exit(404);
+                       if(($r[0]['hidewall']) && (! local_user()))
+                               http_status_exit(403);
+                       $user = $r[0]['nickname'];
+               }
+
+               logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
+               header("Content-type: application/atom+xml");
+               echo get_feed_for($a, '', $user,$last_update);
                killme();
        }
 
-       if((x($type)) && ($type == 'profile')) {
+       if(($type === 'profile') && (! strlen($sec))) {
+
+               $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(z_root());
+                               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 `issued-id` = '%s' LIMIT 1",
-                       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');
+
+                       logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
+
                        if(strlen($s)) {
-                               $xml = simplexml_load_string($s);
+
+                               $xml = parse_xml_string($s);
+
                                if((int) $xml->status == 1) {
                                        $_SESSION['authenticated'] = 1;
+                                       if(! x($_SESSION,'remote'))
+                                               $_SESSION['remote'] = array();
+
+                                       $_SESSION['remote'][] = array('cid' => $r[0]['id'],'uid' => $r[0]['uid'],'url' => $r[0]['url']);
+
                                        $_SESSION['visitor_id'] = $r[0]['id'];
-                                       notice( t('Hi ') . $r[0]['name'] . EOL);
+                                       $_SESSION['visitor_home'] = $r[0]['url'];
+                                       $_SESSION['visitor_handle'] = $r[0]['addr'];
+                                       $_SESSION['visitor_visiting'] = $r[0]['uid'];
+                                       if(!$quiet)
+                                               info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $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",
+                                       q("UPDATE `session` SET `expire` = '%s' WHERE `sid` = '%s'",
                                                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());
+               goaway(z_root());
+
        }
 
-       if((x($type)) && ($type == 'profile-check')) {
+       if($type === 'profile-check' && $dfrn_version < 2.2 ) {
 
-               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))
-                       xml_status(1);
-               xml_status(0);
-               return; // NOTREACHED
-       }
+               if((strlen($challenge)) && (strlen($sec))) {
+
+                       q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
+                       $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
+                               dbesc($sec)
+                       );
+                       if(! count($r)) {
+                               xml_status(3, 'No ticket');
+                               // NOTREACHED
+                       }
+                       $orig_id = $r[0]['dfrn_id'];
+                       if(strpos($orig_id, ':'))
+                               $orig_id = substr($orig_id,2);
+
+                       $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+                               intval($r[0]['cid'])
+                       );
+                       if(! count($c)) {
+                               xml_status(3, 'No profile');
+                       }
+                       $contact = $c[0];
+
+                       $sent_dfrn_id = hex2bin($dfrn_id);
+                       $challenge    = hex2bin($challenge);
 
+                       $final_dfrn_id = '';
+
+                       if(($contact['duplex']) && strlen($contact['prvkey'])) {
+                               openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
+                               openssl_private_decrypt($challenge,$decoded_challenge,$contact['prvkey']);
+                       }
+                       else {
+                               openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
+                               openssl_public_decrypt($challenge,$decoded_challenge,$contact['pubkey']);
+                       }
+
+                       $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
+
+                       if(strpos($final_dfrn_id,':') == 1)
+                               $final_dfrn_id = substr($final_dfrn_id,2);
+
+                       if($final_dfrn_id != $orig_id) {
+                               logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
+                               // did not decode properly - cannot trust this site 
+                               xml_status(3, 'Bad decryption');
+                       }
+
+                       header("Content-type: text/xml");
+                       echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
+                       killme();
+                       // NOTREACHED
+               }
+               else {
+                               // old protocol
+
+                       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)) {
+                               xml_status(1);
+                               return; // NOTREACHED
+                       }
+                       xml_status(0);
+                       return; // NOTREACHED
+               }
+       }
 
 }
 
@@ -67,37 +204,129 @@ 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']                  : '');
+       $sec          = ((x($_POST,'sec'))          ? $_POST['sec']                  : '');
+       $ptype        = ((x($_POST,'type'))         ? $_POST['type']                 : '');
+       $dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
+       $perm         = ((x($_POST,'perm'))         ? $_POST['perm']                 : 'r');
+
+       if($ptype === 'profile-check') {
+
+               if((strlen($challenge)) && (strlen($sec))) {
+
+                       logger('dfrn_poll: POST: profile-check');
+
+                       q("DELETE FROM `profile_check` WHERE `expire` < " . intval(time()));
+                       $r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
+                               dbesc($sec)
+                       );
+                       if(! count($r)) {
+                               xml_status(3, 'No ticket');
+                               // NOTREACHED
+                       }
+                       $orig_id = $r[0]['dfrn_id'];
+                       if(strpos($orig_id, ':'))
+                               $orig_id = substr($orig_id,2);
+
+                       $c = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1",
+                               intval($r[0]['cid'])
+                       );
+                       if(! count($c)) {
+                               xml_status(3, 'No profile');
+                       }
+                       $contact = $c[0];
+
+                       $sent_dfrn_id = hex2bin($dfrn_id);
+                       $challenge    = hex2bin($challenge);
+
+                       $final_dfrn_id = '';
+
+                       if(($contact['duplex']) && strlen($contact['prvkey'])) {
+                               openssl_private_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['prvkey']);
+                               openssl_private_decrypt($challenge,$decoded_challenge,$contact['prvkey']);
+                       }
+                       else {
+                               openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
+                               openssl_public_decrypt($challenge,$decoded_challenge,$contact['pubkey']);
+                       }
+
+                       $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
+
+                       if(strpos($final_dfrn_id,':') == 1)
+                               $final_dfrn_id = substr($final_dfrn_id,2);
+
+                       if($final_dfrn_id != $orig_id) {
+                               logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
+                               // did not decode properly - cannot trust this site 
+                               xml_status(3, 'Bad decryption');
+                       }
+
+                       header("Content-type: text/xml");
+                       echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
+                       killme();
+                       // NOTREACHED
+               }
+
+       }
+
+       $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();
 
        $type = $r[0]['type'];
        $last_update = $r[0]['last_update'];
 
-       $r = q("DELETE FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
+       $r = q("DELETE FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s'",
                dbesc($dfrn_id),
                dbesc($challenge)
        );
 
 
-       $r = q("SELECT * FROM `contact` WHERE `issued-id` = '%s' LIMIT 1",
-               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(z_root());
+                       break; // NOTREACHED
+       }
+
+
+       $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
+
+
        if(! count($r))
                killme();
 
+       $contact = $r[0];
        $owner_uid = $r[0]['uid'];
-       $contact_id = $r[0]['id']; 
+       $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)
@@ -123,11 +352,28 @@ function dfrn_poll_post(&$a) {
                </reputation>
                ";
                killme();
-               return; // NOTREACHED
+               // NOTREACHED
        }
        else {
 
-               $o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update);
+               // Update the writable flag if it changed
+               logger('dfrn_poll: post request feed: ' . print_r($_POST,true),LOGGER_DATA);
+               if($dfrn_version >= 2.21) {
+                       if($perm === 'rw')
+                               $writable = 1;
+                       else
+                               $writable = 0;
+
+                       if($writable !=  $contact['writable']) {
+                               q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d",
+                                       intval($writable),
+                                       intval($contact_id)
+                               );
+                       }
+               }
+
+               header("Content-type: application/atom+xml");
+               $o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update, $direction);
                echo $o;
                killme();
 
@@ -136,16 +382,20 @@ function dfrn_poll_post(&$a) {
 
 function dfrn_poll_content(&$a) {
 
-
-       $dfrn_id = '';
-       $type = 'data';
-
-       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_id         = ((x($_GET,'dfrn_id'))         ? $_GET['dfrn_id']              : '');
+       $type            = ((x($_GET,'type'))            ? $_GET['type']                 : 'data');
+       $last_update     = ((x($_GET,'last_update'))     ? $_GET['last_update']          : '');
+       $destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url']      : '');
+       $sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
+       $dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 2.0);
+       $perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
+       $quiet           = ((x($_GET,'quiet'))           ? true                          : false);
+
+       $direction = (-1);
+       if(strpos($dfrn_id,':') == 1) {
+               $direction = intval(substr($dfrn_id,0,1));
+               $dfrn_id = substr($dfrn_id,2);
+       }
 
 
        if($dfrn_id != '') {
@@ -156,42 +406,163 @@ function dfrn_poll_content(&$a) {
 
                $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)
+               if($type !== 'profile') {
+                       $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
+                               VALUES( '%s', '%s', '%s', '%s', '%s' ) ",
+                               dbesc($hash),
+                               dbesc($dfrn_id),
+                               intval(time() + 60 ),
+                               dbesc($type),
+                               dbesc($last_update)
+                       );
+               }
+               $sql_extra = '';
+               switch($direction) {
+                       case (-1):
+                               if($type === 'profile')
+                                       $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", dbesc($dfrn_id),dbesc($dfrn_id));
+                               else
+                                       $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(z_root());
+                               break; // NOTREACHED
+               }
+
+               $nickname = $a->argv[1];
+
+               $r = q("SELECT `contact`.*, `user`.`username`, `user`.`nickname`
+                       FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
+                       WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+                       AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
+                       dbesc($nickname)
                );
 
-               $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'])))
+               if(count($r)) {
+
+                       $challenge = '';
+                       $encrypted_id = '';
+                       $id_str = $my_id . '.' . mt_rand(1000,9999);
+
+                       if(($r[0]['duplex'] && strlen($r[0]['pubkey'])) || (! strlen($r[0]['prvkey']))) {
+                               openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']);
+                               openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']);
+                       }
+                       else {
+                               openssl_private_encrypt($hash,$challenge,$r[0]['prvkey']);
+                               openssl_private_encrypt($id_str,$encrypted_id,$r[0]['prvkey']);
+                       }
+
+                       $challenge = bin2hex($challenge);
+                       $encrypted_id = bin2hex($encrypted_id);
+               }
+               else {
                        $status = 1;
+                       $challenge = '';
+                       $encrypted_id = '';
+               }
 
-               $challenge = '';
+               if(($type === 'profile') && (strlen($sec))) {
 
-               openssl_private_encrypt($hash,$challenge,$r[0]['prvkey']);
-               $challenge = bin2hex($challenge);
+                       // URL reply
+
+                       if($dfrn_version < 2.2) {
+                               $s = fetch_url($r[0]['poll'] 
+                                       . '?dfrn_id=' . $encrypted_id 
+                                       . '&type=profile-check'
+                                       . '&dfrn_version=' . DFRN_PROTOCOL_VERSION
+                                       . '&challenge=' . $challenge
+                                       . '&sec=' . $sec
+                               );
+                       }
+                       else {
+                               $s = post_url($r[0]['poll'], array(
+                                       'dfrn_id' => $encrypted_id,
+                                       'type' => 'profile-check',
+                                       'dfrn_version' => DFRN_PROTOCOL_VERSION,
+                                       'challenge' => $challenge,
+                                       'sec' => $sec
+                               ));
+                       }
+                       
+                       $profile = ((count($r) && $r[0]['nickname']) ? $r[0]['nickname'] : $nickname);
+
+                       switch($destination_url) {
+                               case 'profile':
+                                       $dest = $a->get_baseurl() . '/profile/' . $profile . '?f=&tab=profile';
+                                       break;
+                               case 'photos':
+                                       $dest = $a->get_baseurl() . '/photos/' . $profile;
+                                       break;
+                               case 'status':
+                               case '':
+                                       $dest = $a->get_baseurl() . '/profile/' . $profile;
+                                       break;          
+                               default:
+                                       $dest = $destination_url . '?f=&redir=1';
+                                       break;
+                       }
 
-               $encrypted_id = '';
-               $id_str = $_GET['dfrn_id'] . '.' . mt_rand(1000,9999);
+                       logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA);
 
-               openssl_private_encrypt($id_str,$encrypted_id,$r[0]['prvkey']);
-               $encrypted_id = bin2hex($encrypted_id);
+                       if(strlen($s) && strstr($s,'<?xml')) {
 
+                               $xml = parse_xml_string($s);
 
-               echo '<?xml version="1.0" encoding="UTF-8"?><dfrn_poll><status>' .$status . '</status><dfrn_id>' . $encrypted_id . '</dfrn_id>'
-                       . '<challenge>' . $challenge . '</challenge></dfrn_poll>' . "\r\n" ;
-               session_write_close();
-               exit;           
-       }
+                               logger('dfrn_poll: profile: parsed xml: ' . print_r($xml,true), LOGGER_DATA);
 
+                               logger('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash);
+                               logger('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec);
 
 
+                               if(((int) $xml->status == 0) && ($xml->challenge == $hash)  && ($xml->sec == $sec)) {
+                                       $_SESSION['authenticated'] = 1;
+                                       if(! x($_SESSION,'remote'))
+                                               $_SESSION['remote'] = array();
+                                       $_SESSION['remote'][] = array('cid' => $r[0]['id'],'uid' => $r[0]['uid'],'url' => $r[0]['url']);
+                                       $_SESSION['visitor_id'] = $r[0]['id'];
+                                       $_SESSION['visitor_home'] = $r[0]['url'];
+                                       $_SESSION['visitor_visiting'] = $r[0]['uid'];
+                                       if(!$quiet)
+                                               info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $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'",
+                                               dbesc($expire),
+                                               dbesc($session_id)
+                                       );
+                               }
 
+                               goaway($dest);
+                       }
+                       goaway($dest);
+                       // NOTREACHED
 
+               }
+               else {
+                       // XML reply
+                       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();
+                       // NOTREACHED
+               }
+       }
 }