remove "online reputation" section on contact editing - nobody ever uses it, and...

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index ac21aa17eb91c6c8e3ca1f006491837a4b59e893..eb9702b0415a31525b5d0e68f691f68f0c207a1a 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -3,8 +3,9 @@
 function redir_init(&$a) {
 
        if((! local_user()) || (! ($a->argc == 2)) || (! intval($a->argv[1])))
-               goaway($a->get_baseurl());
+               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),
@@ -12,7 +13,7 @@ function redir_init(&$a) {
        );
 
        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']);
 
@@ -37,8 +38,8 @@ function redir_init(&$a) {
        );
 
        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);
+               . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest );
        
 }