Merge pull request #6969 from MrPetovan/task/router

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 646047ea551d08578fbded0834ef030bc0e7c5ff..5b72c0bf940cec4fa7d4ac0c643430c9b1e4c425 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -17,8 +17,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
-require_once 'include/items.php';
-
 function dfrn_poll_init(App $a)
 {
        Login::sessionAuth();
@@ -30,7 +28,6 @@ function dfrn_poll_init(App $a)
        $challenge       = defaults($_GET, 'challenge'      , '');
        $sec             = defaults($_GET, 'sec'            , '');
        $dfrn_version    = (float) defaults($_GET, 'dfrn_version'   , 2.0);
-       $perm            = defaults($_GET, 'perm'           , 'r');
        $quiet                   = !empty($_GET['quiet']);
 
        // Possibly it is an OStatus compatible server that requests a user feed
@@ -39,7 +36,7 @@ function dfrn_poll_init(App $a)
                $nickname = $a->argv[1];
                header("Content-type: application/atom+xml");
                echo OStatus::feed($nickname, $last_update, 10);
-               killme();
+               exit();
        }
 
        $direction = -1;
@@ -73,7 +70,7 @@ function dfrn_poll_init(App $a)
                Logger::log('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
                header("Content-type: application/atom+xml");
                echo DFRN::feed('', $user, $last_update, 0, $hidewall);
-               killme();
+               exit();
        }
 
        if (($type === 'profile') && (!strlen($sec))) {
@@ -200,7 +197,7 @@ function dfrn_poll_init(App $a)
 
                        header("Content-type: text/xml");
                        echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
-                       killme();
+                       exit();
                        // NOTREACHED
                } else {
                        // old protocol
@@ -292,7 +289,7 @@ function dfrn_poll_post(App $a)
 
                        header("Content-type: text/xml");
                        echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?><dfrn_poll><status>0</status><challenge>$decoded_challenge</challenge><sec>$sec</sec></dfrn_poll>";
-                       killme();
+                       exit();
                        // NOTREACHED
                }
        }
@@ -309,7 +306,7 @@ function dfrn_poll_post(App $a)
        );
 
        if (!DBA::isResult($r)) {
-               killme();
+               exit();
        }
 
        $type = $r[0]['type'];
@@ -321,15 +318,12 @@ function dfrn_poll_post(App $a)
        switch ($direction) {
                case -1:
                        $sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id));
-                       $my_id = $dfrn_id;
                        break;
                case 0:
                        $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
-                       $my_id = '1:' . $dfrn_id;
                        break;
                case 1:
                        $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
-                       $my_id = '0:' . $dfrn_id;
                        break;
                default:
                        $a->internalRedirect();
@@ -338,7 +332,7 @@ function dfrn_poll_post(App $a)
 
        $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1");
        if (!DBA::isResult($r)) {
-               killme();
+               exit();
        }
 
        $contact = $r[0];
@@ -370,7 +364,7 @@ function dfrn_poll_post(App $a)
                        <description>$text</description>
                </reputation>
                ";
-               killme();
+               exit();
                // NOTREACHED
        } else {
                // Update the writable flag if it changed
@@ -393,7 +387,7 @@ function dfrn_poll_post(App $a)
                header("Content-type: application/atom+xml");
                $o = DFRN::feed($dfrn_id, $a->argv[1], $last_update, $direction);
                echo $o;
-               killme();
+               exit();
        }
 }
 
@@ -422,7 +416,7 @@ function dfrn_poll_content(App $a)
                DBA::delete('challenge', ["`expire` < ?", time()]);
 
                if ($type !== 'profile') {
-                       $r = q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
+                       q("INSERT INTO `challenge` ( `challenge`, `dfrn-id`, `expire` , `type`, `last_update` )
                                VALUES( '%s', '%s', '%s', '%s', '%s' ) ",
                                DBA::escape($hash),
                                DBA::escape($dfrn_id),
@@ -436,7 +430,7 @@ function dfrn_poll_content(App $a)
                switch ($direction) {
                        case -1:
                                if ($type === 'profile') {
-                                       $sql_extra = sprintf(" AND ( `dfrn-id` = '%s' OR `issued-id` = '%s' ) ", DBA::escape($dfrn_id), DBA::escape($dfrn_id));
+                                       $sql_extra = sprintf(" AND (`dfrn-id` = '%s' OR `issued-id` = '%s') ", DBA::escape($dfrn_id), DBA::escape($dfrn_id));
                                } else {
                                        $sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id));
                                }
@@ -561,11 +555,7 @@ function dfrn_poll_content(App $a)
                                        break;
                                default:
                                        $appendix = (strstr($destination_url, '?') ? '&f=&redir=1' : '?f=&redir=1');
-                                       if (filter_var($url, FILTER_VALIDATE_URL)) {
-                                               System::externalRedirect($destination_url . $appendix);
-                                       } else {
-                                               $a->internalRedirect($destination_url . $appendix);
-                                       }
+                                       $a->redirect($destination_url . $appendix);
                                        break;
                        }
                        // NOTREACHED
@@ -579,7 +569,7 @@ function dfrn_poll_content(App $a)
                                . "\t" . '<dfrn_id>' . $encrypted_id . '</dfrn_id>' . "\r\n"
                                . "\t" . '<challenge>' . $challenge . '</challenge>' . "\r\n"
                                . '</dfrn_poll>' . "\r\n";
-                       killme();
+                       exit();
                        // NOTREACHED
                }
        }