report failure to generate keys

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 688e516ab1636482e67f631d9aeb96c3d9b2b3e7..5427d8c786e93f5be407bca3b099f4f8fc071314 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -4,22 +4,29 @@ function redir_init(&$a) {
 
        if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1])))
                goaway($a->get_baseurl());
-       $r = q("SELECT `issued-id`, `dfrn-id`, `duplex`, `poll` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+       $r = q("SELECT `network`, `issued-id`, `dfrn-id`, `duplex`, `poll` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                intval($a->argv[1]),
-               intval($_SESSION['uid']));
-       if(! count($r))
+               intval(local_user())
+       );
+       if((! count($r)) || ($r[0]['network'] !== 'dfrn'))
                goaway($a->get_baseurl());
 
-       $dfrn_id = $r[0]['issued-id'];
-       if((! $dfrn_id) && ($r[0]['duplex']))
-               $dfrn_id = $r[0]['dfrn-id'];
+       $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
 
+       if($r[0]['duplex'] && $r[0]['issued-id']) {
+               $orig_id = $r[0]['issued-id'];
+               $dfrn_id = '1:' . $orig_id;
+       }
+       if($r[0]['duplex'] && $r[0]['dfrn-id']) {
+               $orig_id = $r[0]['dfrn-id'];
+               $dfrn_id = '0:' . $orig_id;
+       }
        q("INSERT INTO `profile_check` ( `uid`, `dfrn_id`, `expire`)
                VALUES( %d, '%s', %d )",
                intval($_SESSION['uid']),
                dbesc($dfrn_id),
                intval(time() + 45));
-       goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id . '&type=profile');
-
+       goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
+               . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile');
        
-}
\ No newline at end of file
+}