The Map class is now done

[friendica.git] / include / redir.php

diff --git a/include/redir.php b/include/redir.php
index 76e30a6eaca2325950db232bfd119fda8f765d38..060d0e9bf30deadf86fbed96d49ba2eb61ca5a4e 100644 (file)
--- a/include/redir.php
+++ b/include/redir.php
@@ -1,16 +1,20 @@
 <?php
 
+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
@@ -20,9 +24,9 @@ function auto_redir(App $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);
@@ -36,7 +40,7 @@ function auto_redir(App $a, $contact_nick) {
                                dbesc($nurl)
                );
 
-               if ((! dbm::is_result($r)) || $r[0]['id'] == remote_user()) {
+               if ((! DBM::is_result($r)) || $r[0]['id'] == remote_user()) {
                        return;
                }
 
@@ -48,7 +52,7 @@ function auto_redir(App $a, $contact_nick) {
                       dbesc($baseurl)
                );
 
-               if (! dbm::is_result($r)) {
+               if (! DBM::is_result($r)) {
                        return;
                }
 
@@ -56,11 +60,11 @@ function auto_redir(App $a, $contact_nick) {
 
                $dfrn_id = $orig_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,7 +72,7 @@ function auto_redir(App $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();