Merge pull request #3279 from Hypolite/improvement/add-composer

[friendica.git] / include / redir.php

diff --git a/include/redir.php b/include/redir.php
index ab4f3220cd7d1a1ace36ece544828db9ab96d0a6..76e30a6eaca2325950db232bfd119fda8f765d38 100644 (file)
--- a/include/redir.php
+++ b/include/redir.php
@@ -1,6 +1,6 @@
 <?php
 
-function auto_redir(&$a, $contact_nick) {
+function auto_redir(App $a, $contact_nick) {
 
        // prevent looping
 
@@ -20,25 +20,25 @@ 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 = $a->get_baseurl();
+               $baseurl = App::get_baseurl();
                $domain_st = strpos($baseurl, "://");
                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((!$r) || (! count($r)) || $r[0]['id'] == remote_user())
+               if ((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) {
                        return;
-
+               }
 
                $r = q("SELECT * FROM contact WHERE nick = '%s'
                        AND network = '%s' AND uid = %d  AND url LIKE '%%%s%%' LIMIT 1",
@@ -48,8 +48,9 @@ function auto_redir(&$a, $contact_nick) {
                       dbesc($baseurl)
                );
 
-               if(! ($r && count($r)))
+               if (! dbm::is_result($r)) {
                        return;
+               }
 
                $cid = $r[0]['id'];
 
@@ -69,7 +70,7 @@ function auto_redir(&$a, $contact_nick) {
 
                if(strlen($dfrn_id) < 3)
                        return;
-                       
+
                $sec = random_string();
 
                q("INSERT INTO `profile_check` ( `uid`, `cid`, `dfrn_id`, `sec`, `expire`)
@@ -83,9 +84,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 );
        }