Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 7687bfbe7030b2cff7c1392e9f9011f7248a2795..12f53900a7528c8826788aad408b384c23f4d176 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,23 +1,39 @@
 <?php
 
-function redir_init(&$a) {
+function redir_init(App $a) {
 
        $url = ((x($_GET,'url')) ? $_GET['url'] : '');
        $quiet = ((x($_GET,'quiet')) ? '&quiet=1' : '');
+       $con_url = ((x($_GET,'conurl')) ? $_GET['conurl'] : '');
 
        // traditional DFRN
 
-       if(local_user() && $a->argc > 1 && intval($a->argv[1])) {
+       if( $con_url || (local_user() && $a->argc > 1 && intval($a->argv[1])) ) {
 
-               $cid = $a->argv[1];
+               if($con_url) {
+                       $con_url = str_replace('https', 'http', $con_url);
 
-               $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($cid),
-                       intval(local_user())
-               );
+                       $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+                               dbesc($con_url),
+                               intval(local_user())
+                       );
+
+                       if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
+                               goaway(z_root());
+
+                       $cid = $r[0]['id'];
+               }
+               else {
+                       $cid = $a->argv[1];
 
-               if((! count($r)) || ($r[0]['network'] !== NETWORK_DFRN))
-                       goaway(z_root());
+                       $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                               intval($cid),
+                               intval(local_user())
+                       );
+
+                       if((! dbm::is_result($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']);
 
@@ -41,18 +57,20 @@ function redir_init(&$a) {
                        intval(time() + 45)
                );
 
-               logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
+               logger('mod_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG);
                $dest = (($url) ? '&destination_url=' . $url : '');
-               goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id 
+               goaway ($r[0]['poll'] . '?dfrn_id=' . $dfrn_id
                        . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet );
        }
 
-       if(local_user())
-               $handle = $a->user['nickname'] . '@' . substr($a->get_baseurl(),strpos($a->get_baseurl(),'://')+3);
-       if(remote_user())
+       if (local_user()) {
+               $handle = $a->user['nickname'] . '@' . substr(App::get_baseurl(),strpos(App::get_baseurl(),'://')+3);
+       }
+       if (remote_user()) {
                $handle = $_SESSION['handle'];
+       }
 
-       if($url) {
+       if ($url) {
                $url = str_replace('{zid}','&zid=' . $handle,$url);
                goaway($url);
        }