Merge branch 'fabrixxm-master'

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index ea1aec6e906a0ed645f9a4393b941800570fade0..ac21aa17eb91c6c8e3ca1f006491837a4b59e893 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -4,18 +4,41 @@ function redir_init(&$a) {
 
        if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1])))
                goaway($a->get_baseurl());
-       $r = q("SELECT `issued-id`, `poll` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-               intval($a->argv[1]),
-               intval($_SESSION['uid']));
-       if(! count($r))
+       $cid = $a->argv[1];
+
+       $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+               intval($cid),
+               intval(local_user())
+       );
+
+       if((! count($r)) || ($r[0]['network'] !== 'dfrn'))
                goaway($a->get_baseurl());
-       q("INSERT INTO `profile_check` ( `uid`, `dfrn_id`, `expire`)
-               VALUES( %d, '%s', %d )",
-               intval($_SESSION['uid']),
-               dbesc($r[0]['issued-id']),
-               intval(time() + 45));
-       goaway ($r[0]['poll'] . '?dfrn_id=' . $r[0]['issued-id'] . '&type=profile');
 
+       $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;
+       }
+
+       $sec = random_string();
+
+       q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`)
+               VALUES( %d, %s, '%s', '%s', %d )",
+               intval(local_user()),
+               intval($cid),
+               dbesc($dfrn_id),
+               dbesc($sec),
+               intval(time() + 45)
+       );
+
+       logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
+
+       goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
+               . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec);
        
-       
-}
\ No newline at end of file
+}