Merge pull request #4195 from zeroadam/ContactSelector-#3878

[friendica.git] / include / redir.php

diff --git a/include/redir.php b/include/redir.php
index d8bb7643965963c7ebe195e04e564bcc22b4a947..dac03f92c7e1153b5dc6dfda97e337cb2ea639c5 100644 (file)
--- a/include/redir.php
+++ b/include/redir.php
@@ -1,17 +1,21 @@
 <?php
 
-function auto_redir(&$a, $contact_nick) {
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
+function auto_redir(App $a, $contact_nick)
+{
        // prevent looping
-
-       if(x($_REQUEST,'redir') && intval($_REQUEST['redir']))
+       if (x($_REQUEST,'redir') && intval($_REQUEST['redir'])) {
                return;
+       }
 
-       if((! $contact_nick) || ($contact_nick === $a->user['nickname']))
+       if ((! $contact_nick) || ($contact_nick === $a->user['nickname'])) {
                return;
+       }
 
-       if(local_user()) {
-
+       if (local_user()) {
                // We need to find out if $contact_nick is a user on this hub, and if so, if I
                // am a contact of that user. However, that user may have other contacts with the
                // same nickname as me on other hubs or other networks. Exclude these by requiring
@@ -20,23 +24,23 @@ function auto_redir(&$a, $contact_nick) {
                //
                // We also have to make sure that I'm a legitimate contact--I'm not blocked or pending.
 
-               $baseurl = App::get_baseurl();
+               $baseurl = System::baseUrl();
                $domain_st = strpos($baseurl, "://");
-               if($domain_st === false)
+               if ($domain_st === false) {
                        return;
+               }
                $baseurl = substr($baseurl, $domain_st + 3);
                $nurl = normalise_link($baseurl);
 
-
-               $r = q("SELECT id FROM contact WHERE uid = ( SELECT uid FROM user WHERE nickname = '%s' LIMIT 1 )
-                       AND nick = '%s' AND self = 0 AND ( url LIKE '%%%s%%' or nurl LIKE '%%%s%%' ) AND blocked = 0 AND pending = 0 LIMIT 1",
-                          dbesc($contact_nick),
-                          dbesc($a->user['nickname']),
-                      dbesc($baseurl),
-               dbesc($nurl)
+               /// @todo Why is there a query for "url" *and* "nurl"? Especially this normalising is strange.
+               $r = q("SELECT `id` FROM `contact` WHERE `uid` = (SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1)
+                       AND `nick` = '%s' AND NOT `self` AND (`url` LIKE '%%%s%%' OR `nurl` LIKE '%%%s%%') AND NOT `blocked` AND NOT `pending` LIMIT 1",
+                               dbesc($contact_nick),
+                               dbesc($a->user['nickname']),
+                               dbesc($baseurl),
+                               dbesc($nurl)
                );
-
-               if ((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) {
+               if ((! DBM::is_result($r)) || $r[0]['id'] == remote_user()) {
                        return;
                }
 
@@ -47,20 +51,19 @@ function auto_redir(&$a, $contact_nick) {
                       intval(local_user()),
                       dbesc($baseurl)
                );
-
-               if (! dbm::is_result($r)) {
+               if (! DBM::is_result($r)) {
                        return;
                }
 
                $cid = $r[0]['id'];
 
-               $dfrn_id = $orig_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
+               $dfrn_id = (($r[0]['issued-id']) ? $r[0]['issued-id'] : $r[0]['dfrn-id']);
 
-               if($r[0]['duplex'] && $r[0]['issued-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']) {
+               if ($r[0]['duplex'] && $r[0]['dfrn-id']) {
                        $orig_id = $r[0]['dfrn-id'];
                        $dfrn_id = '0:' . $orig_id;
                }
@@ -68,9 +71,10 @@ function auto_redir(&$a, $contact_nick) {
                // ensure that we've got a valid ID. There may be some edge cases with forums and non-duplex mode
                // that may have triggered some of the "went to {profile/intro} and got an RSS feed" issues
 
-               if(strlen($dfrn_id) < 3)
+               if (strlen($dfrn_id) < 3) {
                        return;
-                       
+               }
+
                $sec = random_string();
 
                q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`)
@@ -84,9 +88,9 @@ function auto_redir(&$a, $contact_nick) {
 
                $url = curPageURL();
 
-               logger('auto_redir: ' . $r[0]['name'] . ' ' . $sec, LOGGER_DEBUG); 
+               logger('auto_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 );
        }