Docs: add a note on adding `use` on theme.php

[friendica.git] / mod / redir.php

diff --git a/mod/redir.php b/mod/redir.php
index 5dc5ad372416e2788a376f8dafb1bc903615c217..b7292384268a4bc21f94e62b4c242701e54bd4f9 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -1,6 +1,10 @@
 <?php
 
-function redir_init(&$a) {
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+
+function redir_init(App $a) {
 
        $url = ((x($_GET,'url')) ? $_GET['url'] : '');
        $quiet = ((x($_GET,'quiet')) ? '&quiet=1' : '');
@@ -8,9 +12,9 @@ function redir_init(&$a) {
 
        // traditional DFRN
 
-       if( $con_url || (local_user() && $a->argc > 1 && intval($a->argv[1])) ) {
+       if ($con_url || (local_user() && $a->argc > 1 && intval($a->argv[1]))) {
 
-               if($con_url) {
+               if ($con_url) {
                        $con_url = str_replace('https', 'http', $con_url);
 
                        $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
@@ -18,12 +22,14 @@ function redir_init(&$a) {
                                intval(local_user())
                        );
 
-                       if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
-                               goaway(z_root());
-
+                       if (!DBM::is_result($r)) {
+                               goaway(System::baseUrl());
+                       }
+                       if ($r[0]['network'] !== NETWORK_DFRN) {
+                               goaway(($url != '' ? $url : $r[0]['url']));
+                       }
                        $cid = $r[0]['id'];
-               }
-               else {
+               } else {
                        $cid = $a->argv[1];
 
                        $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -31,17 +37,21 @@ function redir_init(&$a) {
                                intval(local_user())
                        );
 
-                       if((! dbm::is_result($r)) || ($r[0]['network'] !== NETWORK_DFRN))
-                               goaway(z_root());
+                       if (!DBM::is_result($r)) {
+                               goaway(System::baseUrl());
+                       }
+                       if ($r[0]['network'] !== NETWORK_DFRN) {
+                               goaway(($url != '' ? $url : $r[0]['url']));
+                       }
                }
 
                $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;
                }
@@ -57,21 +67,23 @@ 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 
-                       . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . '&type=profile&sec=' . $sec . $dest . $quiet );
+               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(System::baseUrl(),strpos(System::baseUrl(),'://')+3);
+       }
+       if (remote_user()) {
                $handle = $_SESSION['handle'];
+       }
 
-       if($url) {
+       if ($url) {
                $url = str_replace('{zid}','&zid=' . $handle,$url);
                goaway($url);
        }
 
-       goaway(z_root());
+       goaway(System::baseUrl());
 }