Merge pull request #2170 from fabrixxm/issue_1953

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 8d0c8f4b3a4c0bb3cb590035666e3d2a4f3b1ad5..632c39578696807b3dfd20e6f6658df50656cc99 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -2,44 +2,76 @@
 
 function redir_init(&$a) {
 
-       if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1])))
-               goaway($a->get_baseurl());
-       $cid = $a->argv[1];
        $url = ((x($_GET,'url')) ? $_GET['url'] : '');
+       $quiet = ((x($_GET,'quiet')) ? '&quiet=1' : '');
+       $con_url = ((x($_GET,'conurl')) ? $_GET['conurl'] : '');
 
-       $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-               intval($cid),
-               intval(local_user())
-       );
+       // traditional DFRN
 
-       if((! count($r)) || ($r[0]['network'] !== 'dfrn'))
-               goaway($a->get_baseurl());
+       if( $con_url || (local_user() && $a->argc > 1 && intval($a->argv[1])) ) {
 
-       $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+               if($con_url) {
+                       $con_url = str_replace('https', 'http', $con_url);
 
-       if($r[0]['duplex'] && $r[0]['issued-id']) {
-               $orig_id = $r[0]['issued-id'];
-               $dfrn_id = '1:' . $orig_id;
+                       $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+                               dbesc($con_url),
+                               intval(local_user())
+                       );
+
+                       if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
+                               goaway(z_root());
+
+                       $cid = $r[0]['id'];
+               }
+               else {
+                       $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'] !== NETWORK_DFRN))
+                               goaway(z_root());
+               }
+
+               $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); 
+               $dest = (($url) ? '&destination_url=' . $url : '');
+               goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
+                       . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet );
        }
-       if($r[0]['duplex'] && $r[0]['dfrn-id']) {
-               $orig_id = $r[0]['dfrn-id'];
-               $dfrn_id = '0:' . $orig_id;
+
+       if(local_user())
+               $handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
+       if(remote_user())
+               $handle = $_SESSION['handle'];
+
+       if($url) {
+               $url = str_replace('{zid}','&zid=' . $handle,$url);
+               goaway($url);
        }
 
-       $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); 
-       $dest = (($url) ? '&destination_url=' . $url : '');
-       goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
-               . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest );
-       
+       goaway(z_root());
 }