Merge remote-tracking branch 'friendica/master'

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 5427d8c786e93f5be407bca3b099f4f8fc071314..eb9702b0415a31525b5d0e68f691f68f0c207a1a 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -3,13 +3,17 @@
 function redir_init(&$a) {
 
        if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1])))
-               goaway($a->get_baseurl());
-       $r = q("SELECT `network`, `issued-id`, `dfrn-id`, `duplex`, `poll` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-               intval($a->argv[1]),
+               goaway(z_root());
+       $cid = $a->argv[1];
+       $url = ((x($_GET,'url')) ? $_GET['url'] : '');
+
+       $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());
+               goaway(z_root());
 
        $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
 
@@ -21,12 +25,21 @@ function redir_init(&$a) {
                $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']),
+
+       $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),
-               intval(time() + 45));
+               dbesc($sec),
+               intval(time() + 45)
+       );
+
+       logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
+       $dest = (($url) ? '&destination_url=' . $url : '');
        goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
-               . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile');
+               . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest );
        
 }